mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-25 19:19:13 +00:00
1
This commit is contained in:
@@ -54,7 +54,6 @@
|
||||
#include "xf86Bus.h"
|
||||
#include "Pci.h"
|
||||
#include "xf86platformBus_priv.h"
|
||||
#include "xf86platformBus.h"
|
||||
#include "xf86Xinput_priv.h"
|
||||
#include "xf86Config.h"
|
||||
#include "xf86Crtc.h"
|
||||
@@ -785,38 +784,4 @@ void xf86platformPrimary(void)
|
||||
}
|
||||
}
|
||||
|
||||
char *
|
||||
_xf86_get_platform_device_attrib(struct xf86_platform_device *device, int attrib, int (*fake)[0])
|
||||
{
|
||||
switch (attrib) {
|
||||
case ODEV_ATTRIB_PATH:
|
||||
return xf86_platform_device_odev_attributes(device)->path;
|
||||
case ODEV_ATTRIB_SYSPATH:
|
||||
return xf86_platform_device_odev_attributes(device)->syspath;
|
||||
case ODEV_ATTRIB_BUSID:
|
||||
return xf86_platform_device_odev_attributes(device)->busid;
|
||||
case ODEV_ATTRIB_DRIVER:
|
||||
return xf86_platform_device_odev_attributes(device)->driver;
|
||||
default:
|
||||
assert(FALSE);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
int
|
||||
_xf86_get_platform_device_int_attrib(struct xf86_platform_device *device, int attrib, int (*fake)[0])
|
||||
{
|
||||
switch (attrib) {
|
||||
case ODEV_ATTRIB_FD:
|
||||
return xf86_platform_device_odev_attributes(device)->fd;
|
||||
case ODEV_ATTRIB_MAJOR:
|
||||
return xf86_platform_device_odev_attributes(device)->major;
|
||||
case ODEV_ATTRIB_MINOR:
|
||||
return xf86_platform_device_odev_attributes(device)->minor;
|
||||
default:
|
||||
assert(FALSE);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* XSERVER_PLATFORM_BUS */
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
#define _XSERVER_XF86_PLATFORM_BUS_PRIV_H_
|
||||
|
||||
#include "xf86platformBus.h"
|
||||
#include "config/hotplug_priv.h"
|
||||
|
||||
/* xf86_platform_device flags */
|
||||
#define XF86_PDEV_UNOWNED 0x01
|
||||
@@ -141,10 +142,10 @@ _xf86_get_platform_device_int_attrib(struct xf86_platform_device *device, int at
|
||||
}
|
||||
}
|
||||
|
||||
#define xf86_get_platform_device_int_attrib(device, attrib, def) _xf86_get_platform_device_int_attrib(device,attrib,_ODEV_ATTRIB_INT_CHECK(attrib,def))
|
||||
|
||||
#endif /* _XORG_CONFIG_H_ */
|
||||
|
||||
#define xf86_get_platform_device_int_attrib(device, attrib, def) _xf86_get_platform_device_int_attrib(device,attrib,_ODEV_ATTRIB_INT_CHECK(attrib,def))
|
||||
|
||||
extern void xf86platformVTProbe(void);
|
||||
extern void xf86platformPrimary(void);
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
#include "xf86xv.h"
|
||||
#include <xorg-config.h>
|
||||
#ifdef XSERVER_PLATFORM_BUS
|
||||
#include "xf86platformBus.h"
|
||||
#include "xf86platformBus_priv.h"
|
||||
#endif
|
||||
#ifdef XSERVER_LIBPCIACCESS
|
||||
#include <pciaccess.h>
|
||||
|
||||
Reference in New Issue
Block a user