diff options
| author | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-03-14 13:54:07 +0100 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-04-18 00:40:39 +0000 |
| commit | 16a3790d607f98932508ed8028e197b3ec75eb44 (patch) | |
| tree | bbb4019f91abca9d8e30f91b50ee9a0e0532dbe6 | |
| parent | 5b23578f93761f816cbe3d93ba946b3a682933b0 (diff) | |
xfree86: os-support: move unexported stuff out of xf86_OSproc.h
It's cleaner to have public headers only holding public stuff and
xf86_os_support seems to be much more appropriate place for this.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1456>
| -rw-r--r-- | hw/xfree86/common/xf86platformBus.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/os-support/shared/drm_platform.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/os-support/shared/platform_noop.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/os-support/xf86_OSproc.h | 9 | ||||
| -rw-r--r-- | hw/xfree86/os-support/xf86_os_support.h | 9 |
5 files changed, 12 insertions, 9 deletions
diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c index ba6f39984..eeeff2b88 100644 --- a/hw/xfree86/common/xf86platformBus.c +++ b/hw/xfree86/common/xf86platformBus.c @@ -45,6 +45,7 @@ #include "loaderProcs.h" #include "xf86.h" +#include "xf86_os_support.h" #include "xf86_OSproc.h" #include "xf86Priv.h" #include "xf86str.h" diff --git a/hw/xfree86/os-support/shared/drm_platform.c b/hw/xfree86/os-support/shared/drm_platform.c index 90013573c..a404aadcc 100644 --- a/hw/xfree86/os-support/shared/drm_platform.c +++ b/hw/xfree86/os-support/shared/drm_platform.c @@ -14,6 +14,7 @@ #include "xf86_OSproc.h" #include "xf86.h" +#include "xf86_os_support.h" #include "xf86platformBus.h" #include "xf86Bus.h" diff --git a/hw/xfree86/os-support/shared/platform_noop.c b/hw/xfree86/os-support/shared/platform_noop.c index 199ae5e8e..2ff1deafa 100644 --- a/hw/xfree86/os-support/shared/platform_noop.c +++ b/hw/xfree86/os-support/shared/platform_noop.c @@ -8,6 +8,7 @@ #include "xf86_OSproc.h" #include "xf86.h" +#include "xf86_os_support.h" #include "xf86platformBus.h" Bool diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h index 0e3362512..a83b57bd1 100644 --- a/hw/xfree86/os-support/xf86_OSproc.h +++ b/hw/xfree86/os-support/xf86_OSproc.h @@ -163,14 +163,5 @@ extern _X_EXPORT Bool xf86GARTCloseScreen(int screenNum); extern _X_EXPORT int xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *); -#ifdef XSERVER_PLATFORM_BUS -#include "hotplug.h" -void -xf86PlatformDeviceProbe(struct OdevAttributes *attribs); - -void -xf86PlatformReprobeDevice(int index, struct OdevAttributes *attribs); -#endif - _XFUNCPROTOEND #endif /* _XF86_OSPROC_H */ diff --git a/hw/xfree86/os-support/xf86_os_support.h b/hw/xfree86/os-support/xf86_os_support.h index a9c1861ac..db02ffeee 100644 --- a/hw/xfree86/os-support/xf86_os_support.h +++ b/hw/xfree86/os-support/xf86_os_support.h @@ -35,4 +35,13 @@ typedef struct { void xf86OSInitVidMem(VidMemInfoPtr); +#ifdef XSERVER_PLATFORM_BUS +#include "hotplug.h" +void +xf86PlatformDeviceProbe(struct OdevAttributes *attribs); + +void +xf86PlatformReprobeDevice(int index, struct OdevAttributes *attribs); +#endif + #endif /* _XSERVER_XF86_OS_SUPPORT */ |