Changeset f2f99ae in mainline for uspace/srv

Timestamp:

2011-06-12T11:27:57Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

af897ff0

Parents:

4f3f9659

Message:

Route USB keyboard through kbd server (new device polling needs fixing).

Location:

uspace/srv/hid

Files:

• console/console.c (modified) (1 diff)
• kbd/Makefile (modified) (1 diff)
• kbd/generic/kbd.c (modified) (5 diffs)
• kbd/include/kbd_ctl.h (modified) (1 diff)

uspace/srv/hid/console/console.c

@@ -973 +973 @@
         
         /* Start fibril for checking on hot-plugged keyboards. */
-        check_new_devices_in_background(connect_keyboard, "keyboard");
+//      check_new_devices_in_background(connect_keyboard, "keyboard");
         check_new_devices_in_background(connect_mouse, "mouse");
         

uspace/srv/hid/kbd/Makefile

@@ -62 +62 @@
         ctl/apple.c \
         ctl/gxe_fb.c \
+        ctl/kbdev.c \
         ctl/pc.c \
         ctl/stty.c \

uspace/srv/hid/kbd/generic/kbd.c

@@ -239 +239 @@
 
         /* Initialize port driver. */
-        if ((*kdev->port_ops->init)(kdev) != 0)
-                goto fail;
+        if (kdev->port_ops != NULL) {
+                if ((*kdev->port_ops->init)(kdev) != 0)
+                        goto fail;
+        }
 
         /* Initialize controller driver. */
@@ -307 +309 @@
         kbd_add_dev(&ns16550_port, &sun_ctl);
 #endif
-        /* Silence warning on abs32le about kbd_add_dev() being unused */
-        (void) kbd_add_dev;
 }
 
@@ -319 +319 @@
 
                 /* Yield port */
-                (*kdev->port_ops->yield)();
+                if (kdev->port_ops != NULL)
+                        (*kdev->port_ops->yield)();
         }
 }
@@ -331 +332 @@
 
                 /* Reclaim port */
-                (*kdev->port_ops->reclaim)();
+                if (kdev->port_ops != NULL)
+                        (*kdev->port_ops->reclaim)();
         }
 }
@@ -355 +357 @@
         /* Add legacy devices. */
         kbd_add_legacy_devs();
+
+        /* Add kbdev device */
+        kbd_add_dev(NULL, &kbdev_ctl);
 
         /* Initialize (reset) layout. */

uspace/srv/hid/kbd/include/kbd_ctl.h

@@ -50 +50 @@
 extern kbd_ctl_ops_t apple_ctl;
 extern kbd_ctl_ops_t gxe_fb_ctl;
+extern kbd_ctl_ops_t kbdev_ctl;
 extern kbd_ctl_ops_t pc_ctl;
 extern kbd_ctl_ops_t stty_ctl;