diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-01-15 15:22:02 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-02-15 09:15:18 +1000 |
| commit | d33adcdf03c69407d151e732fa0cf9947151eb19 (patch) | |
| tree | b9df4fcf47d7fcbf80215af4568e2b70ce49ccc6 /hw/xfree86/common/xf86Init.c | |
| parent | 001ce71dc11287dc94cc2fbc5d35677c046e6c04 (diff) | |
dix: move config_init into the DDX.
The only DDX currently using hotplugging is the xfree86 one and it looks
like it'll stay that way for a bit. Move the initialization to the DDX,
since Xephyr, Xnest, and friends don't need HAL or udev notifications.
Add CloseInput (counterpart to InitInput) to be able to clean up the config
initialization from the DDX as well.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Diffstat (limited to 'hw/xfree86/common/xf86Init.c')
| -rw-r--r-- | hw/xfree86/common/xf86Init.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 670744802..2c206ff47 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -90,6 +90,8 @@ #include "Pci.h" #include "xf86Bus.h" +#include <hotplug.h> + /* forward declarations */ static Bool probe_devices_from_device_sections(DriverPtr drvp); static Bool add_matching_devices_to_configure_list(DriverPtr drvp); @@ -1138,6 +1140,14 @@ InitInput(int argc, char **argv) if (xf86NewInputDevice(*pDev, &dev, TRUE) == BadAlloc) break; } + + config_init(); +} + +void +CloseInput (void) +{ + config_fini(); } /* |