Changeset f9b2cb4c in mainline for uspace/srv/hid

Timestamp:

2015-08-23T12:50:23Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

9ef495f

Parents:

0dd16778

Message:

unify interface API

• introduce new interfaces
• unify location service clients to always expect service ID as the second argument
• remove obsolete methods that take explicit exchange management arguments (first phase)
• use interfaces in device drivers, devman, location service, logger, inet

Location:

uspace/srv/hid

Files:

• compositor/compositor.c (modified) (4 diffs)
• console/console.c (modified) (3 diffs)
• input/ctl/kbdev.c (modified) (2 diffs)
• input/input.c (modified) (1 diff)
• input/port/adb.c (modified) (2 diffs)
• input/port/adb_mouse.c (modified) (2 diffs)
• input/port/chardev.c (modified) (2 diffs)
• input/proto/mousedev.c (modified) (2 diffs)
• isdv4_tablet/main.c (modified) (2 diffs)
• remcons/remcons.c (modified) (1 diff)

uspace/srv/hid/compositor/compositor.c

@@ -896 +896 @@
         ipc_call_t call;
         ipc_callid_t callid;
-        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*icall);
+        service_id_t service_id = (service_id_t) IPC_GET_ARG2(*icall);
 
         /* Allocate resources for new window and register it to the location service. */
@@ -1175 +1175 @@
         async_sess_t *sess;
 
-        sess = loc_service_connect(EXCHANGE_SERIALIZE, sid, 0);
+        sess = loc_service_connect(sid, INTERFACE_DDF, 0);
         if (sess == NULL) {
                 printf("%s: Unable to connect to visualizer %s\n", NAME, svc);
@@ -1182 +1182 @@
 
         async_exch_t *exch = async_exchange_begin(sess);
-        rc = async_connect_to_me(exch, sid, 0, 0, vsl_notifications, NULL);
+        
+        port_id_t port;
+        rc = async_create_callback_port(exch, INTERFACE_VISUALIZER_CB, 0, 0,
+            vsl_notifications, NULL, &port);
+        
         async_exchange_end(exch);
 
@@ -2145 +2149 @@
         }
 
-        sess = loc_service_connect(EXCHANGE_ATOMIC, dsid, 0);
+        sess = loc_service_connect(dsid, INTERFACE_INPUT, 0);
         if (sess == NULL) {
                 printf("%s: Unable to connect to input service %s\n", NAME,

uspace/srv/hid/console/console.c

@@ -508 +508 @@
         
         for (size_t i = 0; i < CONSOLE_COUNT; i++) {
-                if (consoles[i].dsid == (service_id_t) IPC_GET_ARG1(*icall)) {
+                if (consoles[i].dsid == (service_id_t) IPC_GET_ARG2(*icall)) {
                         cons = &consoles[i];
                         break;
@@ -536 +536 @@
         }
 
-        sess = loc_service_connect(EXCHANGE_ATOMIC, dsid, 0);
+        sess = loc_service_connect(dsid, INTERFACE_INPUT, 0);
         if (sess == NULL) {
                 printf("%s: Unable to connect to input service %s\n", NAME,
@@ -561 +561 @@
         int rc = loc_service_get_id(svc, &dsid, 0);
         if (rc == EOK) {
-                sess = loc_service_connect(EXCHANGE_SERIALIZE, dsid, 0);
+                sess = loc_service_connect(dsid, INTERFACE_OUTPUT, 0);
                 if (sess == NULL) {
                         printf("%s: Unable to connect to output service %s\n",

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

@@ -94 +94 @@
 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 = loc_service_connect(kdev->svc_id,
+            INTERFACE_DDF, 0);
         if (sess == NULL) {
                 printf("%s: Failed starting session with '%s.'\n", NAME,
@@ -120 +120 @@
         }
         
-        int rc = async_connect_to_me(exch, 0, 0, 0, kbdev_callback_conn, kbdev);
+        port_id_t port;
+        int rc = async_create_callback_port(exch, INTERFACE_KBD_CB, 0, 0,
+            kbdev_callback_conn, kbdev, &port);
+        
         if (rc != EOK) {
                 printf("%s: Failed creating callback connection from '%s'.\n",

uspace/srv/hid/input/input.c

@@ -745 +745 @@
         if (irc_service) {
                 while (irc_sess == NULL)
-                        irc_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
-                            SERVICE_IRC, 0);
+                        irc_sess = service_connect_blocking(SERVICE_IRC,
+                            INTERFACE_IRC, 0);
         }
         

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

@@ -69 +69 @@
                 return rc;
         
-        dev_sess = loc_service_connect(EXCHANGE_ATOMIC, service_id, 0);
+        dev_sess = loc_service_connect(service_id, INTERFACE_DDF, 0);
         if (dev_sess == NULL) {
                 printf("%s: Failed to connect to device\n", NAME);
@@ -82 +82 @@
         }
         
-        rc = async_connect_to_me(exch, 0, 0, 0, kbd_port_events, NULL);
+        port_id_t port;
+        rc = async_create_callback_port(exch, INTERFACE_ADB_CB, 0, 0,
+            kbd_port_events, NULL, &port);
+        
         async_exchange_end(exch);
         if (rc != EOK) {

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

@@ -84 +84 @@
                 return rc;
         
-        dev_sess = loc_service_connect(EXCHANGE_ATOMIC, service_id, 0);
+        dev_sess = loc_service_connect(service_id, INTERFACE_DDF, 0);
         if (dev_sess == NULL) {
                 printf("%s: Failed to connect to device\n", NAME);
@@ -98 +98 @@
         
         /* NB: The callback connection is slotted for removal */
-        rc = async_connect_to_me(exch, 0, 0, 0, mouse_port_events, NULL);
+        port_id_t port;
+        rc = async_create_callback_port(exch, INTERFACE_ADB_CB, 0, 0,
+            mouse_port_events, NULL, &port);
+        
         async_exchange_end(exch);
         if (rc != EOK) {

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

@@ -84 +84 @@
         }
         
-        dev_sess = loc_service_connect(EXCHANGE_ATOMIC, service_id,
+        dev_sess = loc_service_connect(service_id, INTERFACE_DDF,
             IPC_FLAG_BLOCKING);
         if (dev_sess == NULL) {
@@ -98 +98 @@
         }
         
-        /* NB: The callback connection is slotted for removal */
-        rc = async_connect_to_me(exch, 0, 0, 0, kbd_port_events, NULL);
+        port_id_t port;
+        rc = async_create_callback_port(exch, INTERFACE_CHAR_CB, 0, 0,
+            kbd_port_events, NULL, &port);
+        
         async_exchange_end(exch);
         

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

@@ -118 +118 @@
 static int mousedev_proto_init(mouse_dev_t *mdev)
 {
-        async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE,
-            mdev->svc_id, 0);
+        async_sess_t *sess = loc_service_connect(mdev->svc_id, INTERFACE_DDF, 0);
         if (sess == NULL) {
                 printf("%s: Failed starting session with '%s'\n", NAME,
@@ -143 +142 @@
         }
         
-        int rc = async_connect_to_me(exch, 0, 0, 0, mousedev_callback_conn, mousedev);
+        port_id_t port;
+        int rc = async_create_callback_port(exch, INTERFACE_MOUSE_CB, 0, 0,
+            mousedev_callback_conn, mousedev, &port);
+        
         async_exchange_end(exch);
         async_hangup(sess);

uspace/srv/hid/isdv4_tablet/main.c

@@ -69 +69 @@
         async_sess_t *sess =
             async_callback_receive(EXCHANGE_SERIALIZE);
+        
         fibril_mutex_lock(&client_mutex);
-                if (client_sess == NULL) {
-                        client_sess = sess;
-                }
+        
+        if (client_sess == NULL)
+                client_sess = sess;
+        
         fibril_mutex_unlock(&client_mutex);
 
@@ -262 +264 @@
         printf(NAME ": Using serial port %s\n", serial_port_name);
 
-        async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE, svc_id,
+        async_sess_t *sess = loc_service_connect(svc_id, INTERFACE_DDF,
             IPC_FLAG_BLOCKING);
         if (!sess) {

uspace/srv/hid/remcons/remcons.c

@@ -217 +217 @@
 {
         /* Find the user. */
-        telnet_user_t *user = telnet_user_get_for_client_connection(IPC_GET_ARG1(*icall));
+        telnet_user_t *user = telnet_user_get_for_client_connection(IPC_GET_ARG2(*icall));
         if (user == NULL) {
                 async_answer_0(iid, ENOENT);