[PATCH v2] dix: move config_init into the DDX.

Dan Nicholson dbn.lists at gmail.com
Thu Feb 11 05:52:52 PST 2010


On Wed, Feb 10, 2010 at 9:10 PM, Peter Hutterer
<peter.hutterer at who-t.net> wrote:
> 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 at who-t.net>
> ---
>  dix/main.c                   |    3 +--
>  hw/dmx/dmxinput.c            |    4 ++++
>  hw/kdrive/ephyr/ephyrinit.c  |    5 +++++
>  hw/kdrive/fake/fakeinit.c    |    5 +++++
>  hw/kdrive/fbdev/fbinit.c     |    5 +++++
>  hw/vfb/InitInput.c           |    6 ++++++
>  hw/xfree86/common/xf86Init.c |   10 ++++++++++
>  hw/xnest/Init.c              |    5 +++++
>  hw/xwin/InitInput.c          |    6 ++++++
>  include/input.h              |    1 +
>  10 files changed, 48 insertions(+), 2 deletions(-)
>
> diff --git a/dix/main.c b/dix/main.c
> index da910fe..f023536 100644
> --- a/dix/main.c
> +++ b/dix/main.c
> @@ -257,7 +257,6 @@ int main(int argc, char *argv[], char *envp[])
>         InitCoreDevices();
>        InitInput(argc, argv);
>        InitAndStartDevices();
> -       config_init();

Does it matter that config_init will be called before
InitAndStartDevices? Doesn't seem like it, but I thought I'd ask.
Assuming the answer is no,

Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>

--
Dan


More information about the xorg-devel mailing list