Changeset 46c20c8 in mainline for uspace/srv/hid/kbd/generic/kbd.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/srv/hid/kbd/generic/kbd.c (modified) (3 diffs)

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

@@ -212 +212 @@
 int main(int argc, char **argv)
 {
-        printf(NAME ": HelenOS Keyboard service\n");
-        
-        if (sysinfo_value("kbd.cir.fhc") == 1)
+        printf("%s: HelenOS Keyboard service\n", NAME);
+        
+        sysarg_t fhc;
+        sysarg_t obio;
+        
+        if ((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc))
                 cir_service = SERVICE_FHC;
-        else if (sysinfo_value("kbd.cir.obio") == 1)
+        else if ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio))
                 cir_service = SERVICE_OBIO;
         
@@ -240 +243 @@
         int rc = devmap_driver_register(NAME, client_connection);
         if (rc < 0) {
-                printf(NAME ": Unable to register driver (%d)\n", rc);
+                printf("%s: Unable to register driver (%d)\n", NAME, rc);
                 return -1;
         }
@@ -247 +250 @@
         snprintf(kbd, DEVMAP_NAME_MAXLEN, "%s/%s", NAMESPACE, NAME);
         
-        dev_handle_t dev_handle;
-        if (devmap_device_register(kbd, &dev_handle) != EOK) {
-                printf(NAME ": Unable to register device %s\n", kbd);
+        devmap_handle_t devmap_handle;
+        if (devmap_device_register(kbd, &devmap_handle) != EOK) {
+                printf("%s: Unable to register device %s\n", NAME, kbd);
                 return -1;
         }