Changeset 7eaeec1 in mainline for uspace/srv/hid/input/input.c

Timestamp:

2012-08-20T21:27:38Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

6a97f2e

Parents:

f3a37e28 (diff), dd13349 (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/input/input.c (moved) (moved from uspace/srv/hid/input/generic/input.c ) (4 diffs)

uspace/srv/hid/input/input.c

@@ -54 +54 @@
 #include <io/keycode.h>
 #include <loc.h>
-#include <input.h>
-#include <kbd.h>
-#include <kbd_port.h>
-#include <kbd_ctl.h>
-#include <mouse_proto.h>
-#include <layout.h>
-#include <mouse.h>
+#include "layout.h"
+#include "kbd.h"
+#include "kbd_port.h"
+#include "kbd_ctl.h"
+#include "mouse.h"
+#include "mouse_proto.h"
+#include "input.h"
 
 #define NUM_LAYOUTS  3
@@ -646 +646 @@
 }
 
+static void usage(char *name)
+{
+        printf("Usage: %s <service_name>\n", name);
+}
+
 int main(int argc, char **argv)
 {
+        if (argc < 2) {
+                usage(argv[0]);
+                return 1;
+        }
+        
         printf("%s: HelenOS input service\n", NAME);
         
@@ -678 +688 @@
         }
         
-        char kbd[LOC_NAME_MAXLEN + 1];
-        snprintf(kbd, LOC_NAME_MAXLEN, "%s/%s", NAMESPACE, NAME);
-        
         service_id_t service_id;
-        rc = loc_service_register(kbd, &service_id);
-        if (rc != EOK) {
-                printf("%s: Unable to register service %s\n", NAME, kbd);
+        rc = loc_service_register(argv[1], &service_id);
+        if (rc != EOK) {
+                printf("%s: Unable to register service %s\n", NAME, argv[1]);
                 return rc;
         }
@@ -692 +699 @@
         
         printf("%s: Accepting connections\n", NAME);
+        task_retval(0);
         async_manager();