Changes in uspace/srv/hid/input/input.c [feeac0d:c928bb7] 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);
@@ -470 +476 @@
 {
         /* For each keyboard device */
-        list_foreach(kbd_devs, kbd_devs, kbd_dev_t, kdev) {
+        list_foreach(kbd_devs, kdev_link) {
+                kbd_dev_t *kdev = list_get_instance(kdev_link, kbd_dev_t,
+                    kbd_devs);
+                
                 /* Yield port */
                 if (kdev->port_ops != NULL)
@@ -480 +489 @@
 {
         /* For each keyboard device */
-        list_foreach(kbd_devs, kbd_devs, kbd_dev_t, kdev) {
+        list_foreach(kbd_devs, kdev_link) {
+                kbd_dev_t *kdev = list_get_instance(kdev_link, kbd_dev_t,
+                    kbd_devs);
+                
                 /* Reclaim port */
                 if (kdev->port_ops != NULL)
@@ -515 +527 @@
                 
                 /* Determine whether we already know this device. */
-                list_foreach(kbd_devs, kbd_devs, kbd_dev_t, kdev) {
+                list_foreach(kbd_devs, kdev_link) {
+                        kbd_dev_t *kdev = list_get_instance(kdev_link,
+                            kbd_dev_t, kbd_devs);
                         if (kdev->svc_id == svcs[i]) {
                                 already_known = true;
@@ -566 +580 @@
                 
                 /* Determine whether we already know this device. */
-                list_foreach(mouse_devs, mouse_devs, mouse_dev_t, mdev) {
+                list_foreach(mouse_devs, mdev_link) {
+                        mouse_dev_t *mdev = list_get_instance(mdev_link,
+                            mouse_dev_t, mouse_devs);
                         if (mdev->svc_id == svcs[i]) {
                                 already_known = true;