diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2019-02-21 15:35:38 -0800 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2020-01-13 22:25:39 +0000 |
| commit | f778e76eb4bc6b9219a8b1a903a2fb1a30c2c92a (patch) | |
| tree | 088248d9cbd0594bb3ac6d0ad9c7daad1ca77d30 | |
| parent | e3f26605d85d987da434640f52646d728f1fe919 (diff) | |
Add xf86OSInputThreadInit call from common layer into os-support layer
Allows os backends to run additional code as necessary to set up the
input thread.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
(cherry picked from commit ea1527a8a662dcc5ac3ed49135740aa5f24f74bc)
| -rw-r--r-- | hw/xfree86/common/xf86Init.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/os-support/bsd/bsd_init.c | 6 | ||||
| -rw-r--r-- | hw/xfree86/os-support/hurd/hurd_init.c | 6 | ||||
| -rw-r--r-- | hw/xfree86/os-support/linux/lnx_init.c | 6 | ||||
| -rw-r--r-- | hw/xfree86/os-support/solaris/sun_vid.c | 6 | ||||
| -rw-r--r-- | hw/xfree86/os-support/xf86_OSproc.h | 1 |
6 files changed, 26 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 0b5724d67..2ec6b2f8b 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -1451,5 +1451,6 @@ ddxBeforeReset(void) void ddxInputThreadInit(void) { + xf86OSInputThreadInit(); } #endif diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c index 75a719fc2..2cd2b57c7 100644 --- a/hw/xfree86/os-support/bsd/bsd_init.c +++ b/hw/xfree86/os-support/bsd/bsd_init.c @@ -661,3 +661,9 @@ xf86UseMsg() ErrorF("don't detach controlling tty (for debugging only)\n"); return; } + +void +xf86OSInputThreadInit() +{ + return; +} diff --git a/hw/xfree86/os-support/hurd/hurd_init.c b/hw/xfree86/os-support/hurd/hurd_init.c index fe1a76413..ee8fe92c0 100644 --- a/hw/xfree86/os-support/hurd/hurd_init.c +++ b/hw/xfree86/os-support/hurd/hurd_init.c @@ -87,3 +87,9 @@ xf86CloseConsole() close(xf86Info.consoleFd); return; } + +void +xf86OSInputThreadInit() +{ + return; +} diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c index 039dc4a4d..5c0367c6f 100644 --- a/hw/xfree86/os-support/linux/lnx_init.c +++ b/hw/xfree86/os-support/linux/lnx_init.c @@ -397,3 +397,9 @@ xf86UseMsg(void) ErrorF("don't detach controlling tty (for debugging only)\n"); ErrorF("-masterfd <fd> use the specified fd as the DRM master fd (not if setuid/gid)\n"); } + +void +xf86OSInputThreadInit() +{ + return; +} diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c index 9601d039b..553010cc1 100644 --- a/hw/xfree86/os-support/solaris/sun_vid.c +++ b/hw/xfree86/os-support/solaris/sun_vid.c @@ -73,6 +73,12 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem) /* I/O Permissions section */ /***************************************************************************/ +void +xf86OSInputThreadInit() +{ + return; +} + Bool xf86EnableIO(void) { diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h index 99ca90249..17607b04b 100644 --- a/hw/xfree86/os-support/xf86_OSproc.h +++ b/hw/xfree86/os-support/xf86_OSproc.h @@ -136,6 +136,7 @@ extern _X_EXPORT int xf86GetSerialModemState(int fd); extern _X_EXPORT int xf86SerialModemSetBits(int fd, int bits); extern _X_EXPORT int xf86SerialModemClearBits(int fd, int bits); extern _X_EXPORT int xf86LoadKernelModule(const char *pathname); +extern _X_EXPORT void xf86OSInputThreadInit(void); /* AGP GART interface */ |