Changeset f66ca57f in mainline

Timestamp:

2012-08-15T15:10:53Z (12 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

affaf2e

Parents:

1499564

Message:

Rename wacomdump to isdv4_tablet and register with unique service name.

Files:

• boot/Makefile.common (modified) (2 diffs)
• uspace/Makefile (modified) (2 diffs)
• uspace/srv/hid/isdv4_tablet/Makefile (moved) (moved from uspace/app/wacomdump/Makefile ) (1 diff)
• uspace/srv/hid/isdv4_tablet/isdv4.c (moved) (moved from uspace/app/wacomdump/isdv4.c )
• uspace/srv/hid/isdv4_tablet/isdv4.h (moved) (moved from uspace/app/wacomdump/isdv4.h )
• uspace/srv/hid/isdv4_tablet/main.c (moved) (moved from uspace/app/wacomdump/wacomdump.c ) (7 diffs)

boot/Makefile.common

@@ -107 +107 @@
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
         $(USPACE_PATH)/srv/hid/remcons/remcons \
+        $(USPACE_PATH)/srv/hid/isdv4_tablet/isdv4_tablet \
         $(USPACE_PATH)/srv/net/ethip/ethip \
         $(USPACE_PATH)/srv/net/inetsrv/inetsrv \
@@ -187 +188 @@
         $(USPACE_PATH)/app/vuhid/vuh \
         $(USPACE_PATH)/app/mkbd/mkbd \
-        $(USPACE_PATH)/app/wacomdump/wacomdump \
         $(USPACE_PATH)/app/websrv/websrv
 

uspace/Makefile

@@ -70 +70 @@
         app/sysinfo \
         app/mkbd \
-        app/wacomdump \
         app/websrv \
         srv/clipboard \
@@ -100 +99 @@
         srv/hid/console \
         srv/hid/s3c24xx_ts \
+        srv/hid/isdv4_tablet \
         srv/hid/fb \
         srv/hid/input \

uspace/srv/hid/isdv4_tablet/Makefile

@@ -27 +27 @@
 #
 
-USPACE_PREFIX = ../..
+USPACE_PREFIX = ../../..
 #LIBS = 
 #EXTRA_CFLAGS = 
-BINARY = wacomdump
+BINARY = isdv4_tablet
 
 SOURCES = \
-        wacomdump.c \
+        main.c \
         isdv4.c
 

uspace/srv/hid/isdv4_tablet/main.c

@@ -35 +35 @@
 #include <abi/ipc/methods.h>
 #include <ipc/mouseev.h>
+#include <inttypes.h>
 
 #include "isdv4.h"
 
-#define NAME "wacomdump"
+#define NAME "isdv4_tablet"
 
 static async_sess_t *client_sess = NULL;
@@ -46 +47 @@
 static void syntax_print(void)
 {
-        fprintf(stderr, "Usage: wacomdump [--baud=<baud>] [--print-events] [device_service]\n");
+        fprintf(stderr, "Usage: %s [--baud=<baud>] [--print-events] [device_service]\n", NAME);
 }
 
@@ -175 +176 @@
         sysarg_t baud = 38400;
         service_id_t svc_id;
+        char *serial_port_name = NULL;
 
         int arg = 1;
@@ -205 +207 @@
 
         if (argc > arg) {
-                rc = loc_service_get_id(argv[arg], &svc_id, 0);
+                serial_port_name = argv[arg];
+                rc = loc_service_get_id(serial_port_name, &svc_id, 0);
                 if (rc != EOK) {
                         fprintf(stderr, "Cannot find device service %s\n",
@@ -238 +241 @@
 
                 svc_id = svc_ids[0];
+
+                rc = loc_service_get_name(svc_id, &serial_port_name);
+                if (rc != EOK) {
+                        fprintf(stderr, "Failed getting name of serial service\n");
+                        return 1;
+                }
+
                 free(svc_ids);
         }
@@ -248 +258 @@
 
         fibril_mutex_initialize(&client_mutex);
+
+        printf(NAME ": Using serial port %s\n", serial_port_name);
 
         async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE, svc_id,
@@ -301 +313 @@
 
         service_id_t service_id;
-        rc = loc_service_register("mouse/wacom", &service_id);
-        if (rc != EOK) {
-                printf(NAME ": Unable to register device mouse/wacom.\n");
+        char *service_name;
+        rc = asprintf(&service_name, "mouse/isdv4-%" PRIun, svc_id);
+        if (rc < 0) {
+                printf(NAME ": Unable to create service name\n");
+                return rc;
+        }
+
+        rc = loc_service_register(service_name, &service_id);
+        if (rc != EOK) {
+                printf(NAME ": Unable to register service %s.\n", service_name);
                 return rc;
         }