Changes in uspace/srv/hid/input/ctl/kbdev.c [3123d2a:cce8a83] in mainline

File:

• uspace/srv/hid/input/ctl/kbdev.c (modified) (7 diffs)

uspace/srv/hid/input/ctl/kbdev.c

@@ -68 +68 @@
         /** Link to generic keyboard device */
         kbd_dev_t *kbd_dev;
-        
+
         /** Session with kbdev device */
         async_sess_t *sess;
@@ -75 +75 @@
 static kbdev_t *kbdev_new(kbd_dev_t *kdev)
 {
-        kbdev_t *kbdev = calloc(1, sizeof(kbdev_t));
+        kbdev_t *kbdev;
+
+        kbdev = calloc(1, sizeof(kbdev_t));
         if (kbdev == NULL)
                 return NULL;
-        
+
         kbdev->kbd_dev = kdev;
 
@@ -88 +90 @@
         if (kbdev->sess != NULL)
                 async_hangup(kbdev->sess);
-        
         free(kbdev);
 }
@@ -94 +95 @@
 static int kbdev_ctl_init(kbd_dev_t *kdev)
 {
-        async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE,
-            kdev->svc_id, 0);
+        async_sess_t *sess;
+        async_exch_t *exch;
+        kbdev_t *kbdev;
+        int rc;
+
+        sess = loc_service_connect(EXCHANGE_SERIALIZE, kdev->svc_id, 0);
         if (sess == NULL) {
                 printf("%s: Failed starting session with '%s.'\n", NAME,
                     kdev->svc_name);
-                return ENOENT;
+                return -1;
         }
-        
-        kbdev_t *kbdev = kbdev_new(kdev);
+
+        kbdev = kbdev_new(kdev);
         if (kbdev == NULL) {
                 printf("%s: Failed allocating device structure for '%s'.\n",
                     NAME, kdev->svc_name);
-                async_hangup(sess);
-                return ENOMEM;
+                return -1;
         }
-        
+
         kbdev->sess = sess;
-        
-        async_exch_t *exch = async_exchange_begin(sess);
+
+        exch = async_exchange_begin(sess);
         if (exch == NULL) {
                 printf("%s: Failed starting exchange with '%s'.\n", NAME,
                     kdev->svc_name);
                 kbdev_destroy(kbdev);
-                return ENOENT;
+                return -1;
         }
-        
-        int rc = async_connect_to_me(exch, 0, 0, 0, kbdev_callback_conn, kbdev);
+
+        rc = async_connect_to_me(exch, 0, 0, 0, kbdev_callback_conn, kbdev);
         if (rc != EOK) {
                 printf("%s: Failed creating callback connection from '%s'.\n",
@@ -126 +130 @@
                 async_exchange_end(exch);
                 kbdev_destroy(kbdev);
-                return rc;
+                return -1;
         }
-        
+
         async_exchange_end(exch);
-        
+
         kdev->ctl_private = (void *) kbdev;
         return 0;
@@ -137 +141 @@
 static void kbdev_ctl_set_ind(kbd_dev_t *kdev, unsigned mods)
 {
-        async_sess_t *sess = ((kbdev_t *) kdev->ctl_private)->sess;
-        async_exch_t *exch = async_exchange_begin(sess);
+        async_sess_t *sess;
+        async_exch_t *exch;
+
+        sess = ((kbdev_t *) kdev->ctl_private)->sess;
+
+        exch = async_exchange_begin(sess);
         if (!exch)
                 return;
-        
+
         async_msg_1(exch, KBDEV_SET_IND, mods);
         async_exchange_end(exch);
@@ -161 +169 @@
                 callid = async_get_call(&call);
                 if (!IPC_GET_IMETHOD(call)) {
-                        kbdev_destroy(kbdev);
+                        /* XXX Handle hangup */
                         return;
                 }