Changeset 979c5729 in mainline

Timestamp:

2011-12-09T17:32:42Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f44ba92

Parents:

dd28c1a

Message:

i8042: Rework name assignment.

NOTE: The code still works as a device service.

File:

• uspace/drv/char/i8042/i8042.c (modified) (2 diffs)

uspace/drv/char/i8042/i8042.c

@@ -116 +116 @@
 int main(int argc, char *argv[])
 {
-        char name[16];
-        int i, rc;
-        const char dchar[MAX_DEVS] = { 'a', 'b' };
-
         printf(NAME ": i8042 PS/2 port driver\n");
 
-        rc = loc_server_register(NAME, i8042_connection);
+        int rc = loc_server_register(NAME, i8042_connection);
         if (rc < 0) {
                 printf(NAME ": Unable to register server.\n");
@@ -131 +127 @@
                 return -1;
 
-        for (i = 0; i < MAX_DEVS; i++) {
+        for (int i = 0; i < MAX_DEVS; i++) {
                 device.port[i].client_sess = NULL;
 
-                snprintf(name, 16, "%s/ps2%c", NAMESPACE, dchar[i]);
-                rc = loc_service_register(name, &device.port[i].service_id);
+                static const char *names[MAX_DEVS] = {
+                    NAMESPACE "/ps2a", NAMESPACE "/ps2b"};
+                rc = loc_service_register(names[i], &device.port[i].service_id);
                 if (rc != EOK) {
-                        printf(NAME ": Unable to register device %s.\n", name);
+                        printf(NAME ": Unable to register device %s.\n",
+                            names[i]);
                         return rc;
                 }
-                printf(NAME ": Registered device %s\n", name);
+                printf(NAME ": Registered device %s\n", names[i]);
         }