xf86-input-joystick: Changes to 'master'

Peter Hutterer whot at kemper.freedesktop.org
Mon Dec 20 00:28:21 PST 2010


 configure.ac          |    2 
 src/jstk.c            |  287 ++++++++---------------------
 src/jstk.h            |   13 -
 src/jstk_axis.c       |   14 -
 src/jstk_axis.h       |    8 
 src/jstk_key.c        |  481 +++++++++++---------------------------------------
 src/jstk_key.h        |    9 
 src/jstk_properties.c |    6 
 8 files changed, 210 insertions(+), 610 deletions(-)

New commits:
commit 8c7ad54d6d869bb4202aee8408c72ed72bf929a7
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Dec 14 17:00:28 2010 +1000

    Support input ABI 12
    
    This commit adds support for input ABI 12, consisting of a number of
    changes:
    - requires an X server with an ABI of 12
    - valuators have a per-mode setting
    - new PreInit prototype.
    
    Because of the new PreInit prototype, the hotplug system has been switched
    around too (should have probably been done in a separate commit before,
    but...).
    
    The old hotplug mechanism added a separate ModuleInfoRec for the keyboard
    part of the driver. This isn't feasable for InputClass configurations, the
    driver part may get overwritten.
    
    On entering the driver, after checking a few default values, hotplug the
    keyboard device (wacom-style) and let it initialize. Because NIDR calls
    DEVICE_INIT and DEVICE_ON the keyboard must initialise the private pointer
    and pass it back to the original device.
    
    Call order is:
    NewInputDeviceRequest
     - jstkCorePreInit
       - jstkKeyboardHotplug
         - NewInputDeviceRequest
           - jstkCorePreInit
             immediately return jstkKeyboardPreInit()
           - keyboard DEVICE_INIT
           - keyboard DEVICE_ON
         return keyboard device
       - copy keyboard->priv to joystick->priv
       - finish jstkCorePreInit as normal
       - joystick DEVICE_INIT
       - joystick DEVICE_ON
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Trevor Woerner <twoerner at gmail.com>

commit f2050e6be5b6b3f8c429060992cc3ead0cfe86c1
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Dec 14 16:51:15 2010 +1000

    Get the option values from pInfo instead of from the IDevRec.
    
    Doesn't matter which one we take, but ABI 12 dropped the IDevRec.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Trevor Woerner <twoerner at gmail.com>

commit df0567d2fa2d67a00dce78a89803e8925d20e324
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Dec 14 16:48:50 2010 +1000

    Don't call xf86OptionListReport()
    
    All options used by the driver will show up in the log anyway.
    And new xserver versions will call this for debugging purposes for us.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Trevor Woerner <twoerner at gmail.com>

commit 135aaf612bcb591ae1692ae47b2d36a814230cbe
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Dec 14 15:19:08 2010 +1000

    Purge use of XI_PRIVATE macro.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Trevor Woerner <twoerner at gmail.com>

commit 29a486ba56bc6279297a716b018ba24880680e82
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Dec 14 15:14:47 2010 +1000

    Drop close_proc, conversion_proc, reverse_conversion_proc
    
    All three aren't called by the server.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Trevor Woerner <twoerner at gmail.com>

commit 0674bdfdb67e9195af7cb5982ae2eda0fa03ce57
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Dec 14 15:09:32 2010 +1000

    Don't handle history_size in the driver.
    
    This has been handled in the server for quite a while now, just initialize
    with the defaults and ignore it otherwise.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Trevor Woerner <twoerner at gmail.com>

commit 39205d76cb45242ee9b47594ec5be7edc509edc7
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Dec 14 15:08:49 2010 +1000

    Require server 1.9, drop pre-ABI 11 support.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Trevor Woerner <twoerner at gmail.com>

commit 074dc4a2a06aebae144afc21de5c4f8bc365937d
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Dec 14 15:04:44 2010 +1000

    Remove usage of XI86_POINTER_CAPABLE flag.
    
    Flag was write-only for a number of server generations already.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Trevor Woerner <twoerner at gmail.com>

commit 107e4b14d90d06864247c7878ee0cc5f59e4bc5a
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Dec 14 14:47:31 2010 +1000

    Replace LocalDevicePtr with InputInfoPtr
    
    Both typedefs describe the same struct, LocalDevicePtr has been removed with
    input ABI 12.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Trevor Woerner <twoerner at gmail.com>



More information about the xorg-commit mailing list