Changes in uspace/srv/hid/input/generic/input.c [333c233:15f3c3f] in mainline

File:

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

uspace/srv/hid/input/generic/input.c

@@ -53 +53 @@
 #include <io/console.h>
 #include <io/keycode.h>
-#include <devmap.h>
+#include <loc.h>
 #include <input.h>
 #include <kbd.h>
@@ -324 +324 @@
 /** Add new kbdev device.
  *
- * @param dev_path Filesystem path to the device (/dev/class/...)
+ * @param dev_path Filesystem path to the device (/loc/class/...)
  *
  */
@@ -352 +352 @@
 /** Add new mousedev device.
  *
- * @param dev_path Filesystem path to the device (/dev/class/...)
+ * @param dev_path Filesystem path to the device (/loc/class/...)
  *
  */
@@ -410 +410 @@
 #endif
 #if defined(MACHINE_msim)
-        kbd_add_dev(&msim_port, &stty_ctl);
+        kbd_add_dev(&msim_port, &pc_ctl);
 #endif
 #if (defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)) && defined(CONFIG_FB)
@@ -424 +424 @@
         kbd_add_dev(&niagara_port, &stty_ctl);
 #endif
+#if defined(UARCH_sparc64) && defined(MACHINE_serengeti)
+        kbd_add_dev(&sgcn_port, &stty_ctl);
+#endif
 #if defined(UARCH_sparc64) && defined(MACHINE_generic)
+        kbd_add_dev(&z8530_port, &sun_ctl);
         kbd_add_dev(&ns16550_port, &sun_ctl);
 #endif
@@ -482 +486 @@
 /** Periodically check for new input devices.
  *
- * Looks under /dev/class/keyboard and /dev/class/mouse.
+ * Looks under /loc/class/keyboard and /loc/class/mouse.
  *
  * @param arg Ignored
@@ -500 +504 @@
                  * Check for new keyboard device
                  */
-                rc = asprintf(&dev_path, "/dev/class/keyboard\\%zu", kbd_id);
+                rc = asprintf(&dev_path, "/loc/class/keyboard\\%zu", kbd_id);
                 if (rc < 0)
                         continue;
@@ -517 +521 @@
                  * Check for new mouse device
                  */
-                rc = asprintf(&dev_path, "/dev/class/mouse\\%zu", mouse_id);
+                rc = asprintf(&dev_path, "/loc/class/mouse\\%zu", mouse_id);
                 if (rc < 0)
                         continue;
@@ -552 +556 @@
         printf("%s: HelenOS input service\n", NAME);
         
+        sysarg_t fhc;
         sysarg_t obio;
         
@@ -557 +562 @@
         list_initialize(&mouse_devs);
         
-        if ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio))
+        if (((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc))
+            || ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio)))
                 irc_service = true;
         
@@ -567 +573 @@
         /* Add legacy keyboard devices. */
         kbd_add_legacy_devs();
-        
+
         /* Add legacy mouse devices. */
         mouse_add_legacy_devs();
         
         /* Register driver */
-        int rc = devmap_driver_register(NAME, client_connection);
+        int rc = loc_server_register(NAME, client_connection);
         if (rc < 0) {
-                printf("%s: Unable to register driver (%d)\n", NAME, rc);
+                printf("%s: Unable to register server (%d)\n", NAME, rc);
                 return -1;
         }
         
-        char kbd[DEVMAP_NAME_MAXLEN + 1];
-        snprintf(kbd, DEVMAP_NAME_MAXLEN, "%s/%s", NAMESPACE, NAME);
-        
-        devmap_handle_t devmap_handle;
-        if (devmap_device_register(kbd, &devmap_handle) != EOK) {
-                printf("%s: Unable to register device %s\n", NAME, kbd);
+        char kbd[LOC_NAME_MAXLEN + 1];
+        snprintf(kbd, LOC_NAME_MAXLEN, "%s/%s", NAMESPACE, NAME);
+        
+        service_id_t service_id;
+        if (loc_service_register(kbd, &service_id) != EOK) {
+                printf("%s: Unable to register service %s\n", NAME, kbd);
                 return -1;
         }