Changes in uspace/srv/hid/input/input.c [c928bb7:feeac0d] in mainline

File:

• uspace/srv/hid/input/input.c (modified) (5 diffs)

uspace/srv/hid/input/input.c

@@ -440 +440 @@
         kbd_add_dev(&msim_port, &stty_ctl);
 #endif
-#if (defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)) && defined(CONFIG_FB)
-        kbd_add_dev(&gxemul_port, &gxe_fb_ctl);
-#endif
-#if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul) && !defined(CONFIG_FB)
-        kbd_add_dev(&gxemul_port, &stty_ctl);
-#endif
 #if defined(UARCH_ppc32)
         kbd_add_dev(&adb_port, &apple_ctl);
@@ -476 +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)
@@ -489 +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)
@@ -527 +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;
@@ -580 +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;