xfree86: sbus: unexport struct sbus_devtable

Not used by any drivers, so no need to keep it exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

hw/xfree86/common/xf86AutoConfig.c

@@ -44,7 +44,7 @@
 #include "xf86platformBus.h"
 #include "xf86pciBus.h"
 #ifdef __sparc__
-#include "xf86sbusBus.h"
+#include "xf86sbusBus_priv.h"
 #endif
 
 #ifdef __sun

hw/xfree86/common/xf86Bus.c

@@ -47,6 +47,7 @@
 /* Bus-specific headers */
 
 #include "xf86Bus.h"
+#include "xf86sbusBus_priv.h"
 
 #include "xf86_OSproc.h"
 #ifdef XSERVER_LIBPCIACCESS

hw/xfree86/common/xf86sbusBus.c

@@ -37,7 +37,7 @@
 
 #include "xf86Bus.h"
 
-#include "xf86sbusBus.h"
+#include "xf86sbusBus_priv.h"
 #include "xf86Sbus.h"
 
 Bool sbusSlotClaimed = FALSE;

hw/xfree86/common/xf86sbusBus.h

@@ -56,18 +56,6 @@ typedef struct sbus_device {
     const char *device;
 } sbusDevice, *sbusDevicePtr;
 
-struct sbus_devtable {
-    int devId;
-    int fbType;
-    const char *promName;
-    const char *driverName;
-    const char *descr;
-};
-
-extern _X_EXPORT void xf86SbusProbe(void);
-extern _X_EXPORT sbusDevicePtr *xf86SbusInfo;
-extern _X_EXPORT struct sbus_devtable sbusDeviceTable[];
-
 extern _X_EXPORT int xf86MatchSbusInstances(const char *driverName,
                                             int sbusDevId, GDevPtr * devList,
                                             int numDevs, DriverPtr drvp,
@@ -96,12 +84,6 @@ extern _X_EXPORT int promGetBool(const char *prop);
 
 extern _X_EXPORT int sparcPromInit(void);
 extern _X_EXPORT void sparcPromClose(void);
-extern _X_EXPORT char *sparcPromGetProperty(sbusPromNodePtr pnode,
-                                            const char *prop, int *lenp);
 extern _X_EXPORT int sparcPromGetBool(sbusPromNodePtr pnode, const char *prop);
-extern _X_EXPORT void sparcPromAssignNodes(void);
-extern _X_EXPORT char *sparcPromNode2Pathname(sbusPromNodePtr pnode);
-extern _X_EXPORT int sparcPromPathname2Node(const char *pathName);
-extern _X_EXPORT char *sparcDriverName(void);
 
 #endif                          /* _XF86_SBUSBUS_H */

hw/xfree86/common/xf86sbusBus_priv.h

@@ -10,7 +10,25 @@
 
 #include "xf86sbusBus.h"
 
+struct sbus_devtable {
+    int devId;
+    int fbType;
+    const char *promName;
+    const char *driverName;
+    const char *descr;
+};
+
+extern sbusDevicePtr *xf86SbusInfo;
+extern struct sbus_devtable sbusDeviceTable[];
+
 Bool xf86SbusConfigure(void *busData, sbusDevicePtr sBus);
 void xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec* GDev);
+void xf86SbusProbe(void);
+
+char *sparcPromGetProperty(sbusPromNodePtr pnode, const char *prop, int *lenp);
+void sparcPromAssignNodes(void);
+char *sparcPromNode2Pathname(sbusPromNodePtr pnode);
+int sparcPromPathname2Node(const char *pathName);
+char *sparcDriverName(void);
 
 #endif /* _XSERVER_XF86_SBUSBUS_H */

hw/xfree86/os-support/bus/Sbus.c

@@ -38,7 +38,7 @@
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
 
-#include "xf86sbusBus.h"
+#include "xf86sbusBus_priv.h"
 #include "xf86Sbus.h"
 
 int promRootNode;