diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2019-02-21 15:35:38 -0800 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2019-02-25 15:48:03 +0000 |
| commit | ea1527a8a662dcc5ac3ed49135740aa5f24f74bc (patch) | |
| tree | 49b8317494479fb01d6dbd18fd5512c3be6c39d1 | |
| parent | 4ad21c3247d98ac6c5ad71fa36be60ed04f7c92c (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>
| -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 9e666643e..7d53987cb 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -1347,5 +1347,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 358d89f0f..9ef6a39b5 100644 --- a/hw/xfree86/os-support/linux/lnx_init.c +++ b/hw/xfree86/os-support/linux/lnx_init.c @@ -407,3 +407,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 42ef16aba..c6a201aea 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 */ |