Changeset fdbc3ff in mainline for uspace/srv/hid/console/console.c

Timestamp:

2010-11-19T23:50:06Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

46d4d9f

Parents:

b4c9c61 (diff), a9c6b966 (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/console/console.c (modified) (3 diffs)

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);