Changeset 0773396 in mainline for uspace/srv/hid/input/input.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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 (modified) (4 diffs)

uspace/srv/hid/input/input.c

@@ -470 +470 @@
 {
         /* For each keyboard device */
-        list_foreach(kbd_devs, kdev_link) {
-                kbd_dev_t *kdev = list_get_instance(kdev_link, kbd_dev_t,
-                    kbd_devs);
-                
+        list_foreach(kbd_devs, kbd_devs, kbd_dev_t, kdev) {
                 /* Yield port */
                 if (kdev->port_ops != NULL)
@@ -483 +480 @@
 {
         /* For each keyboard device */
-        list_foreach(kbd_devs, kdev_link) {
-                kbd_dev_t *kdev = list_get_instance(kdev_link, kbd_dev_t,
-                    kbd_devs);
-                
+        list_foreach(kbd_devs, kbd_devs, kbd_dev_t, kdev) {
                 /* Reclaim port */
                 if (kdev->port_ops != NULL)
@@ -521 +515 @@
                 
                 /* Determine whether we already know this device. */
-                list_foreach(kbd_devs, kdev_link) {
-                        kbd_dev_t *kdev = list_get_instance(kdev_link,
-                            kbd_dev_t, kbd_devs);
+                list_foreach(kbd_devs, kbd_devs, kbd_dev_t, kdev) {
                         if (kdev->svc_id == svcs[i]) {
                                 already_known = true;
@@ -574 +566 @@
                 
                 /* Determine whether we already know this device. */
-                list_foreach(mouse_devs, mdev_link) {
-                        mouse_dev_t *mdev = list_get_instance(mdev_link,
-                            mouse_dev_t, mouse_devs);
+                list_foreach(mouse_devs, mouse_devs, mouse_dev_t, mdev) {
                         if (mdev->svc_id == svcs[i]) {
                                 already_known = true;