Changeset 3123d2a in mainline

Timestamp:

2012-06-01T19:26:32Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

520acaf, 85a4350, c573e0f, e1e4192

Parents:

2f90b46

Message:

trivial changes (error code reporting, messages)

Location:

uspace/srv/hid

Files:

• input/ctl/kbdev.c (modified) (6 diffs)
• input/generic/input.c (modified) (2 diffs)
• input/port/adb.c (modified) (3 diffs)
• input/proto/mousedev.c (modified) (4 diffs)
• remcons/remcons.c (modified) (5 diffs)
• remcons/telnet.h (modified) (1 diff)
• remcons/user.h (modified) (1 diff)
• s3c24xx_ts/s3c24xx_ts.c (modified) (1 diff)

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;
-
-        kbdev = calloc(1, sizeof(kbdev_t));
+        kbdev_t *kbdev = calloc(1, sizeof(kbdev_t));
         if (kbdev == NULL)
                 return NULL;
-
+        
         kbdev->kbd_dev = kdev;
 
@@ -90 +88 @@
         if (kbdev->sess != NULL)
                 async_hangup(kbdev->sess);
+        
         free(kbdev);
 }
@@ -95 +94 @@
 static int kbdev_ctl_init(kbd_dev_t *kdev)
 {
-        async_sess_t *sess;
-        async_exch_t *exch;
-        kbdev_t *kbdev;
-        int rc;
-
-        sess = loc_service_connect(EXCHANGE_SERIALIZE, kdev->svc_id, 0);
+        async_sess_t *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 -1;
+                return ENOENT;
         }
-
-        kbdev = kbdev_new(kdev);
+        
+        kbdev_t *kbdev = kbdev_new(kdev);
         if (kbdev == NULL) {
                 printf("%s: Failed allocating device structure for '%s'.\n",
                     NAME, kdev->svc_name);
                 async_hangup(sess);
-                return -1;
+                return ENOMEM;
         }
-
+        
         kbdev->sess = sess;
-
-        exch = async_exchange_begin(sess);
+        
+        async_exch_t *exch = async_exchange_begin(sess);
         if (exch == NULL) {
                 printf("%s: Failed starting exchange with '%s'.\n", NAME,
                     kdev->svc_name);
                 kbdev_destroy(kbdev);
-                return -1;
+                return ENOENT;
         }
-
-        rc = async_connect_to_me(exch, 0, 0, 0, kbdev_callback_conn, kbdev);
+        
+        int 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",
@@ -131 +126 @@
                 async_exchange_end(exch);
                 kbdev_destroy(kbdev);
-                return -1;
+                return rc;
         }
-
+        
         async_exchange_end(exch);
-
+        
         kdev->ctl_private = (void *) kbdev;
         return 0;
@@ -142 +137 @@
 static void kbdev_ctl_set_ind(kbd_dev_t *kdev, unsigned mods)
 {
-        async_sess_t *sess;
-        async_exch_t *exch;
-
-        sess = ((kbdev_t *) kdev->ctl_private)->sess;
-
-        exch = async_exchange_begin(sess);
+        async_sess_t *sess = ((kbdev_t *) kdev->ctl_private)->sess;
+        async_exch_t *exch = async_exchange_begin(sess);
         if (!exch)
                 return;
-
+        
         async_msg_1(exch, KBDEV_SET_IND, mods);
         async_exchange_end(exch);

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

@@ -662 +662 @@
         async_set_client_connection(client_connection);
         int rc = loc_server_register(NAME);
-        if (rc < 0) {
-                printf("%s: Unable to register server (%d)\n", NAME, rc);
-                return -1;
+        if (rc != EOK) {
+                printf("%s: Unable to register server\n", NAME);
+                return rc;
         }
         
@@ -671 +671 @@
         
         service_id_t service_id;
-        if (loc_service_register(kbd, &service_id) != EOK) {
+        rc = loc_service_register(kbd, &service_id);
+        if (rc != EOK) {
                 printf("%s: Unable to register service %s\n", NAME, kbd);
-                return -1;
+                return rc;
         }
         

uspace/srv/hid/input/port/adb.c

@@ -65 +65 @@
 static int adb_port_init(kbd_dev_t *kdev)
 {
+        kbd_dev = kdev;
+        
         const char *dev = "adb/kbd";
         service_id_t service_id;
-        async_exch_t *exch;
-        int rc;
-        
-        kbd_dev = kdev;
-        
-        rc = loc_service_get_id(dev, &service_id, 0);
+        int rc = loc_service_get_id(dev, &service_id, 0);
         if (rc != EOK)
                 return rc;
@@ -82 +79 @@
         }
         
-        exch = async_exchange_begin(dev_sess);
+        async_exch_t *exch = async_exchange_begin(dev_sess);
         if (exch == NULL) {
                 printf("%s: Failed starting exchange with device\n", NAME);
@@ -89 +86 @@
         }
         
-        /* NB: The callback connection is slotted for removal */
         rc = async_connect_to_me(exch, 0, 0, 0, kbd_port_events, NULL);
         async_exchange_end(exch);

uspace/srv/hid/input/proto/mousedev.c

@@ -117 +117 @@
                 printf("%s: Failed starting session with '%s'\n", NAME,
                     mdev->svc_name);
-                return -1;
+                return ENOENT;
         }
         
@@ -125 +125 @@
                     NAME, mdev->svc_name);
                 async_hangup(sess);
-                return -1;
+                return ENOMEM;
         }
         
@@ -134 +134 @@
                 mousedev_destroy(mousedev);
                 async_hangup(sess);
-                return -1;
+                return ENOENT;
         }
         
@@ -145 +145 @@
                     NAME, mdev->svc_name);
                 mousedev_destroy(mousedev);
-                return -1;
+                return rc;
         }
         
-        return 0;
+        return EOK;
 }
 

uspace/srv/hid/remcons/remcons.c

@@ -71 +71 @@
         TELNET_IAC, TELNET_WONT, TELNET_LINEMODE
 };
+
 static const size_t telnet_force_character_mode_command_count =
     sizeof(telnet_force_character_mode_command) / sizeof(telnet_cmd_t);
@@ -272 +273 @@
 static int network_user_fibril(void *arg)
 {
-        int rc;
         telnet_user_t *user = arg;
 
-        rc = loc_service_register(user->service_name, &user->service_id);
+        int rc = loc_service_register(user->service_name, &user->service_id);
         if (rc != EOK) {
                 telnet_user_error(user, "Unable to register %s with loc: %s.",
@@ -284 +284 @@
         telnet_user_log(user, "Service %s registerd with id %" PRIun ".",
             user->service_name, user->service_id);
-
+        
         fid_t spawn_fibril = fibril_create(spawn_task_fibril, user);
         assert(spawn_fibril);
         fibril_add_ready(spawn_fibril);
-
+        
         /* Wait for all clients to exit. */
         fibril_mutex_lock(&user->guard);
@@ -304 +304 @@
         }
         fibril_mutex_unlock(&user->guard);
-
+        
         rc = loc_service_unregister(user->service_id);
         if (rc != EOK) {
@@ -324 +324 @@
         async_set_client_connection(client_connection);
         int rc = loc_server_register(NAME);
-        if (rc < 0) {
-                fprintf(stderr, NAME ": Unable to register server: %s.\n",
-                    str_error(rc));
-                return 1;
-        }
-
+        if (rc != EOK) {
+                fprintf(stderr, "%s: Unable to register server\n", NAME);
+                return rc;
+        }
+        
         struct sockaddr_in addr;
-
+        
         addr.sin_family = AF_INET;
         addr.sin_port = htons(port);
-
+        
         rc = inet_pton(AF_INET, "127.0.0.1", (void *)
             &addr.sin_addr.s_addr);

uspace/srv/hid/remcons/telnet.h

@@ -57 +57 @@
 #define TELNET_LINEMODE 34
 
-
 #endif
 

uspace/srv/hid/remcons/user.h

@@ -76 +76 @@
 } telnet_user_t;
 
-telnet_user_t *telnet_user_create(int socket);
-void telnet_user_destroy(telnet_user_t *user);
-telnet_user_t *telnet_user_get_for_client_connection(service_id_t id);
-bool telnet_user_is_zombie(telnet_user_t *user);
-void telnet_user_notify_client_disconnected(telnet_user_t *user);
-int telnet_user_get_next_keyboard_event(telnet_user_t *user, kbd_event_t *event);
-int telnet_user_send_data(telnet_user_t *user, uint8_t *data, size_t size);
-void telnet_user_update_cursor_x(telnet_user_t *user, int new_x);
+extern telnet_user_t *telnet_user_create(int);
+extern void telnet_user_destroy(telnet_user_t *);
+extern telnet_user_t *telnet_user_get_for_client_connection(service_id_t);
+extern bool telnet_user_is_zombie(telnet_user_t *);
+extern void telnet_user_notify_client_disconnected(telnet_user_t *);
+extern int telnet_user_get_next_keyboard_event(telnet_user_t *, kbd_event_t *);
+extern int telnet_user_send_data(telnet_user_t *, uint8_t *, size_t);
+extern void telnet_user_update_cursor_x(telnet_user_t *, int);
 
 /** Print informational message about connected user. */
 #ifdef CONFIG_DEBUG
 #define telnet_user_log(user, fmt, ...) \
-        printf(NAME " [console %d (%d)]: " fmt "\n", user->id, (int) user->service_id, ##__VA_ARGS__)
+        printf(NAME " [console %d (%d)]: " fmt "\n", \
+            user->id, (int) user->service_id, ##__VA_ARGS__)
 #else
-#define telnet_user_log(user, fmt, ...) (void)0
+#define telnet_user_log(user, fmt, ...) ((void) 0)
 #endif
 
 /** Print error message associated with connected user. */
 #define telnet_user_error(user, fmt, ...) \
-        fprintf(stderr, NAME " [console %d (%d)]: ERROR: " fmt "\n", user->id, (int) user->service_id, ##__VA_ARGS__)
+        fprintf(stderr, NAME " [console %d (%d)]: ERROR: " fmt "\n", \
+            user->id, (int) user->service_id, ##__VA_ARGS__)
 
 #endif

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -84 +84 @@
 int main(int argc, char *argv[])
 {
-        int rc;
-
-        printf(NAME ": S3C24xx touchscreen driver\n");
+        printf("%s: S3C24xx touchscreen driver\n", NAME);
         
         async_set_client_connection(s3c24xx_ts_connection);
-        rc = loc_server_register(NAME);
-        if (rc < 0) {
-                printf(NAME ": Unable to register driver.\n");
-                return -1;
+        int rc = loc_server_register(NAME);
+        if (rc != EOK) {
+                printf("%s: Unable to register driver.\n", NAME);
+                return rc;
         }