From d33adcdf03c69407d151e732fa0cf9947151eb19 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 15 Jan 2010 15:22:02 +1000 Subject: 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 Reviewed-by: Julien Cristau Reviewed-by: Dan Nicholson --- hw/kdrive/ephyr/ephyrinit.c | 5 +++++ hw/kdrive/fake/fakeinit.c | 5 +++++ hw/kdrive/fbdev/fbinit.c | 5 +++++ 3 files changed, 15 insertions(+) (limited to 'hw/kdrive') diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index c7bfb5bec..27cab3b63 100644 --- a/hw/kdrive/ephyr/ephyrinit.c +++ b/hw/kdrive/ephyr/ephyrinit.c @@ -94,6 +94,11 @@ InitInput (int argc, char **argv) KdInitInput(); } +void +CloseInput (void) +{ +} + #ifdef DDXBEFORERESET void ddxBeforeReset (void) diff --git a/hw/kdrive/fake/fakeinit.c b/hw/kdrive/fake/fakeinit.c index 87c221d37..ba61959ef 100644 --- a/hw/kdrive/fake/fakeinit.c +++ b/hw/kdrive/fake/fakeinit.c @@ -58,6 +58,11 @@ InitInput (int argc, char **argv) KdInitInput (); } +void +CloseInput (void) +{ +} + #ifdef DDXBEFORERESET void ddxBeforeReset (void) diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c index 93646f6d7..51e7e00d9 100644 --- a/hw/kdrive/fbdev/fbinit.c +++ b/hw/kdrive/fbdev/fbinit.c @@ -44,6 +44,11 @@ InitInput (int argc, char **argv) KdInitInput (); } +void +CloseInput (void) +{ +} + void ddxUseMsg (void) { -- cgit v1.2.3