Changeset a2afd8f in mainline for uspace/srv

Timestamp:

2017-11-13T18:07:46Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0dd4779

Parents:

56763a4

Message:

Move ADB keyboard and mouse support to separate drivers.

Location:

uspace/srv/hid/input

Files:

• Makefile (modified) (1 diff)
• input.c (modified) (4 diffs)
• kbd_ctl.h (modified) (1 diff)
• kbd_port.h (modified) (1 diff)
• mouse_port.h (modified) (1 diff)
• mouse_proto.h (modified) (1 diff)
• port/adb.c (deleted)
• port/adb_mouse.c (deleted)

uspace/srv/hid/input/Makefile

@@ -37 +37 @@
         layout/us_dvorak.c \
         layout/ar.c \
-        port/adb.c \
-        port/adb_mouse.c \
         port/chardev.c \
-        proto/adb.c \
         proto/mousedev.c \
-        ctl/apple.c \
         ctl/kbdev.c \
         ctl/stty.c \

uspace/srv/hid/input/input.c

@@ -458 +458 @@
 }
 
-/** Add new legacy mouse device. */
-static void mouse_add_dev(mouse_port_ops_t *port, mouse_proto_ops_t *proto)
-{
-        mouse_dev_t *mdev = mouse_dev_new();
-        if (mdev == NULL)
-                return;
-        
-        mdev->port_ops = port;
-        mdev->proto_ops = proto;
-        mdev->svc_id = 0;
-        
-        /* Initialize port driver. */
-        if ((*mdev->port_ops->init)(mdev) != 0)
-                goto fail;
-        
-        /* Initialize protocol driver. */
-        if ((*mdev->proto_ops->init)(mdev) != 0) {
-                /* XXX Uninit port */
-                goto fail;
-        }
-        
-        list_append(&mdev->link, &mouse_devs);
-        return;
-        
-fail:
-        free(mdev);
-}
-
 /** Add new kbdev device.
  *
@@ -643 +615 @@
         kbd_add_dev(&chardev_port, &stty_ctl);
 #endif
-#if defined(UARCH_ppc32)
-        kbd_add_dev(&adb_port, &apple_ctl);
-#endif
 #if defined(UARCH_sparc64) && defined(PROCESSOR_sun4v)
         kbd_add_dev(&chardev_port, &stty_ctl);
@@ -651 +620 @@
         /* Silence warning on abs32le about kbd_add_dev() being unused */
         (void) kbd_add_dev;
-}
-
-/** Add legacy drivers/devices. */
-static void mouse_add_legacy_devs(void)
-{
-        /*
-         * Need to add these drivers based on config unless we can probe
-         * them automatically.
-         */
-#if defined(UARCH_ppc32)
-        mouse_add_dev(&adb_mouse_port, &adb_proto);
-#endif
-        /* Silence warning on abs32le about mouse_add_dev() being unused */
-        (void) mouse_add_dev;
 }
 
@@ -895 +850 @@
         kbd_add_legacy_devs();
         
-        /* Add legacy mouse devices. */
-        mouse_add_legacy_devs();
-        
         /* Register driver */
         async_set_client_data_constructor(client_data_create);

uspace/srv/hid/input/kbd_ctl.h

@@ -48 +48 @@
 } kbd_ctl_ops_t;
 
-extern kbd_ctl_ops_t apple_ctl;
 extern kbd_ctl_ops_t kbdev_ctl;
 extern kbd_ctl_ops_t stty_ctl;

uspace/srv/hid/input/kbd_port.h

@@ -47 +47 @@
 } kbd_port_ops_t;
 
-extern kbd_port_ops_t adb_port;
 extern kbd_port_ops_t chardev_port;
 extern kbd_port_ops_t ns16550_port;

uspace/srv/hid/input/mouse_port.h

@@ -47 +47 @@
 } mouse_port_ops_t;
 
-extern mouse_port_ops_t adb_mouse_port;
 extern mouse_port_ops_t chardev_mouse_port;
 

uspace/srv/hid/input/mouse_proto.h

@@ -47 +47 @@
 } mouse_proto_ops_t;
 
-extern mouse_proto_ops_t adb_proto;
 extern mouse_proto_ops_t mousedev_proto;