Changeset 676e833 in mainline for uspace/srv/hid

Timestamp:

2017-11-10T14:15:41Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ee98e81

Parents:

7654f3e

Message:

Move receiving side of Msim console to a separate driver. Work around possibility that console character device is not available at the moment input server starts.

Location:

uspace/srv/hid/input

Files:

• Makefile (modified) (1 diff)
• input.c (modified) (1 diff)
• kbd_port.h (modified) (1 diff)
• port/chardev.c (modified) (4 diffs)

uspace/srv/hid/input/Makefile

@@ -40 +40 @@
         port/adb_mouse.c \
         port/chardev.c \
-        port/msim.c \
         port/niagara.c \
         proto/adb.c \

uspace/srv/hid/input/input.c

@@ -641 +641 @@
 #endif
 #if defined(MACHINE_msim)
-        kbd_add_dev(&msim_port, &stty_ctl);
+        kbd_add_dev(&chardev_port, &stty_ctl);
 #endif
 #if defined(UARCH_ppc32)

uspace/srv/hid/input/kbd_port.h

@@ -49 +49 @@
 extern kbd_port_ops_t adb_port;
 extern kbd_port_ops_t chardev_port;
-extern kbd_port_ops_t msim_port;
 extern kbd_port_ops_t niagara_port;
 extern kbd_port_ops_t ns16550_port;

uspace/srv/hid/input/port/chardev.c

@@ -61 +61 @@
         /** S3C24xx UART - Openmoko debug console */
         "char/s3c24xx_uart",
-        /** Ski console */
+        /** Ski console, MSIM console */
         "devices/\\hw\\console\\a"
 };
@@ -75 +75 @@
         
         kbd_dev = kdev;
-        
+again:
         for (i = 0; i < num_devs; i++) {
                 rc = loc_service_get_id(in_devs[i], &service_id, 0);
@@ -83 +83 @@
         
         if (i >= num_devs) {
-                printf("%s: Could not find any suitable input device\n", NAME);
-                return -1;
+                /* XXX This is just a hack. */
+                printf("%s: No input device found, sleep for retry.\n", NAME);
+                async_usleep(1000 * 1000);
+                goto again;
         }
         
@@ -113 +115 @@
         }
         
+        printf("%s: Found input device '%s'\n", NAME, in_devs[i]);
         return 0;
 }