Changes in uspace/srv/hid/input/input.c [1d6dd2a:01c3bb4] in mainline

File:

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

uspace/srv/hid/input/input.c

@@ -54 +54 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <str.h>
 #include <str_error.h>
 
@@ -474 +473 @@
         kdev->ctl_ops = &kbdev_ctl;
         
-        errno_t rc = loc_service_get_name(service_id, &kdev->svc_name);
+        int rc = loc_service_get_name(service_id, &kdev->svc_name);
         if (rc != EOK) {
                 kdev->svc_name = NULL;
@@ -487 +486 @@
         list_append(&kdev->link, &kbd_devs);
         *kdevp = kdev;
-        return 0;
+        return EOK;
         
 fail:
@@ -511 +510 @@
         mdev->proto_ops = &mousedev_proto;
         
-        errno_t rc = loc_service_get_name(service_id, &mdev->svc_name);
+        int rc = loc_service_get_name(service_id, &mdev->svc_name);
         if (rc != EOK) {
                 mdev->svc_name = NULL;
@@ -524 +523 @@
         list_append(&mdev->link, &mouse_devs);
         *mdevp = mdev;
-        return 0;
+        return EOK;
         
 fail:
@@ -531 +530 @@
 }
 
-static errno_t serial_consumer(void *arg)
+static int serial_consumer(void *arg)
 {
         serial_dev_t *sdev = (serial_dev_t *) arg;
@@ -555 +554 @@
 {
         bool match = false;
-        errno_t rc;
+        int rc;
 
         serial_dev_t *sdev = serial_dev_new();
@@ -600 +599 @@
         
         *sdevp = sdev;
-        return 0;
+        return EOK;
         
 fail:
@@ -634 +633 @@
 }
 
-static errno_t dev_check_new_kbdevs(void)
+static int dev_check_new_kbdevs(void)
 {
         category_id_t keyboard_cat;
@@ -640 +639 @@
         size_t count, i;
         bool already_known;
-        errno_t rc;
+        int rc;
         
         rc = loc_category_get_id("keyboard", &keyboard_cat, IPC_FLAG_BLOCKING);
@@ -671 +670 @@
                 if (!already_known) {
                         kbd_dev_t *kdev;
-                        if (kbd_add_kbdev(svcs[i], &kdev) == 0) {
+                        if (kbd_add_kbdev(svcs[i], &kdev) == EOK) {
                                 printf("%s: Connected keyboard device '%s'\n",
                                     NAME, kdev->svc_name);
@@ -685 +684 @@
 }
 
-static errno_t dev_check_new_mousedevs(void)
+static int dev_check_new_mousedevs(void)
 {
         category_id_t mouse_cat;
@@ -691 +690 @@
         size_t count, i;
         bool already_known;
-        errno_t rc;
+        int rc;
         
         rc = loc_category_get_id("mouse", &mouse_cat, IPC_FLAG_BLOCKING);
@@ -722 +721 @@
                 if (!already_known) {
                         mouse_dev_t *mdev;
-                        if (mouse_add_mousedev(svcs[i], &mdev) == 0) {
+                        if (mouse_add_mousedev(svcs[i], &mdev) == EOK) {
                                 printf("%s: Connected mouse device '%s'\n",
                                     NAME, mdev->svc_name);
@@ -736 +735 @@
 }
 
-static errno_t dev_check_new_serialdevs(void)
+static int dev_check_new_serialdevs(void)
 {
         category_id_t serial_cat;
@@ -742 +741 @@
         size_t count, i;
         bool already_known;
-        errno_t rc;
+        int rc;
         
         rc = loc_category_get_id("serial", &serial_cat, IPC_FLAG_BLOCKING);
@@ -773 +772 @@
                 if (!already_known) {
                         serial_dev_t *sdev;
-                        if (serial_add_srldev(svcs[i], &sdev) == 0) {
+                        if (serial_add_srldev(svcs[i], &sdev) == EOK) {
                                 printf("%s: Connected serial device '%s'\n",
                                     NAME, sdev->kdev->svc_name);
@@ -787 +786 @@
 }
 
-static errno_t dev_check_new(void)
-{
-        errno_t rc;
+static int dev_check_new(void)
+{
+        int rc;
         
         fibril_mutex_lock(&discovery_lock);
@@ -824 +823 @@
 
 /** Start listening for new devices. */
-static errno_t input_start_dev_discovery(void)
-{
-        errno_t rc = loc_register_cat_change_cb(cat_change_cb);
-        if (rc != EOK) {
-                printf("%s: Failed registering callback for device discovery: "
-                    "%s\n", NAME, str_error(rc));
+static int input_start_dev_discovery(void)
+{
+        int rc = loc_register_cat_change_cb(cat_change_cb);
+        if (rc != EOK) {
+                printf("%s: Failed registering callback for device discovery. "
+                    "(%d)\n", NAME, rc);
                 return rc;
         }
@@ -843 +842 @@
 int main(int argc, char **argv)
 {
-        errno_t rc;
+        int rc;
 
         if (argc < 2) {