frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: common: move private defs out of xf86sbusBus.h 

public server module API headers shouldn't be clobbered with non-exported
definitions, so move them out to private header file.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-09 16:26:32 +01:00
parent ac7b49b45c
commit 96d01009a2
2 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/xfree86/common/xf86sbusBus.h
View File

@ -40,21 +40,8 @@
#define SBUS_DEVICE_GT 0x000c
#define SBUS_DEVICE_MGX 0x000d
typedef struct sbus_prom_node {
int node;
/* Because of misdesigned openpromio */
int cookie[2];
} sbusPromNode, *sbusPromNodePtr;
typedef struct sbus_device {
int devId;
int fbNum;
int fd;
int width, height;
sbusPromNode node;
const char *descr;
const char *device;
} sbusDevice, *sbusDevicePtr;
typedef struct sbus_prom_node *sbusPromNodePtr;
typedef struct sbus_device *sbusDevicePtr;
struct sbus_devtable {
int devId;
@ -104,8 +91,4 @@ extern _X_EXPORT char *sparcPromNode2Pathname(sbusPromNodePtr pnode);
extern _X_EXPORT int sparcPromPathname2Node(const char *pathName);
extern _X_EXPORT char *sparcDriverName(void);
extern Bool xf86SbusConfigure(void *busData, sbusDevicePtr sBus);
extern void xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus,
GDevRec * GDev);
#endif /* _XF86_SBUSBUS_H */

32
hw/xfree86/common/xf86sbusBus_priv.h Normal file
View File

@ -0,0 +1,32 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
* Copyright © 2000 Jakub Jelinek (jakub@redhat.com)
*/
#ifndef _XSERVER_XF86_SBUSBUS_H
#define _XSERVER_XF86_SBUSBUS_H
#include <X11/Xdefs.h>
#include "xf86sbusBus.h"
typedef struct sbus_prom_node {
int node;
/* Because of misdesigned openpromio */
int cookie[2];
} sbusPromNode, *sbusPromNodePtr;
typedef struct sbus_device {
int devId;
int fbNum;
int fd;
int width, height;
sbusPromNode node;
const char *descr;
const char *device;
} sbusDevice, *sbusDevicePtr;
Bool xf86SbusConfigure(void *busData, sbusDevicePtr sBus);
void xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec* GDev);
#endif /* _XSERVER_XF86_SBUSBUS_H */