Changeset 8fb1bf82 in mainline for uspace/srv/hid

Timestamp:

2010-11-25T13:42:50Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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.

Location:

uspace/srv/hid

Files:

• adb_mouse/adb_mouse.c (modified) (1 diff)
• char_mouse/char_mouse.c (modified) (1 diff)
• console/console.c (modified) (3 diffs)
• kbd/genarch/gsp.c (modified) (1 diff)
• kbd/generic/kbd.c (modified) (1 diff)
• s3c24xx_ts/s3c24xx_ts.c (modified) (1 diff)
• s3c24xx_ts/s3c24xx_ts.h (modified) (1 diff)

uspace/srv/hid/adb_mouse/adb_mouse.c

@@ -78 +78 @@
         snprintf(dev_path, DEVMAP_NAME_MAXLEN, "%s/mouse", NAMESPACE);
 
-        dev_handle_t dev_handle;
-        if (devmap_device_register(dev_path, &dev_handle) != EOK) {
+        devmap_handle_t devmap_handle;
+        if (devmap_device_register(dev_path, &devmap_handle) != EOK) {
                 printf(NAME ": Unable to register device %s\n", dev_path);
                 return -1;

uspace/srv/hid/char_mouse/char_mouse.c

@@ -134 +134 @@
         snprintf(dev_path, DEVMAP_NAME_MAXLEN, "%s/%s", NAMESPACE, NAME);
 
-        dev_handle_t dev_handle;
-        if (devmap_device_register(dev_path, &dev_handle) != EOK) {
+        devmap_handle_t devmap_handle;
+        if (devmap_device_register(dev_path, &devmap_handle) != EOK) {
                 printf(NAME ": Unable to register device %s\n", dev_path);
                 return -1;

uspace/srv/hid/console/console.c

@@ -82 +82 @@
         size_t index;             /**< Console index */
         size_t refcount;          /**< Connection reference count */
-        dev_handle_t dev_handle;  /**< Device handle */
+        devmap_handle_t devmap_handle;  /**< Device handle */
         keybuffer_t keybuffer;    /**< Buffer for incoming keys. */
         screenbuffer_t scr;       /**< Screenbuffer for saving screen
@@ -571 +571 @@
                         continue;
                 
-                if (consoles[i].dev_handle == (dev_handle_t) IPC_GET_ARG1(*icall)) {
+                if (consoles[i].devmap_handle == (devmap_handle_t) IPC_GET_ARG1(*icall)) {
                         cons = &consoles[i];
                         break;
@@ -815 +815 @@
                         snprintf(vc, DEVMAP_NAME_MAXLEN, "%s/vc%u", NAMESPACE, i);
                         
-                        if (devmap_device_register(vc, &consoles[i].dev_handle) != EOK) {
+                        if (devmap_device_register(vc, &consoles[i].devmap_handle) != EOK) {
                                 devmap_hangup_phone(DEVMAP_DRIVER);
                                 printf(NAME ": Unable to register device %s\n", vc);

uspace/srv/hid/kbd/genarch/gsp.c

@@ -198 +198 @@
         if (t == NULL) {
                 printf("gsp_step: not found\n");
-                *mods = NULL;
-                *key = NULL;
+                *mods = 0;
+                *key = 0;
                 return 0;
         }

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

@@ -250 +250 @@
         snprintf(kbd, DEVMAP_NAME_MAXLEN, "%s/%s", NAMESPACE, NAME);
         
-        dev_handle_t dev_handle;
-        if (devmap_device_register(kbd, &dev_handle) != EOK) {
+        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;

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -99 +99 @@
                 return -1;
 
-        rc = devmap_device_register(NAMESPACE "/mouse", &ts->dev_handle);
+        rc = devmap_device_register(NAMESPACE "/mouse", &ts->devmap_handle);
         if (rc != EOK) {
                 devmap_hangup_phone(DEVMAP_DRIVER);

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.h

@@ -125 +125 @@
 
         /** Device handle */
-        dev_handle_t dev_handle;
+        devmap_handle_t devmap_handle;
 
         /** Device/driver state */