Changeset 8ff0bd2 in mainline for uspace/srv/hid/input/port/adb.c

Timestamp:

2011-09-04T11:30:58Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/srv/hid/input/port/adb.c (moved) (moved from uspace/srv/hid/kbd/port/adb.c ) (5 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -37 +37 @@
 #include <ipc/adb.h>
 #include <async.h>
-#include <async_obsolete.h>
+#include <input.h>
 #include <kbd_port.h>
 #include <kbd.h>
@@ -43 +43 @@
 #include <fcntl.h>
 #include <errno.h>
-#include <devmap.h>
-#include <devmap_obsolete.h>
+#include <loc.h>
 
-static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall);
+static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg);
 static void adb_kbd_reg0_data(uint16_t data);
 
-static int dev_phone;
+static int adb_port_init(kbd_dev_t *);
+static void adb_port_yield(void);
+static void adb_port_reclaim(void);
+static void adb_port_write(uint8_t data);
 
-#define NAME "kbd"
+kbd_port_ops_t adb_port = {
+        .init = adb_port_init,
+        .yield = adb_port_yield,
+        .reclaim = adb_port_reclaim,
+        .write = adb_port_write
+};
 
-int kbd_port_init(void)
+static kbd_dev_t *kbd_dev;
+static async_sess_t *dev_sess;
+
+static int adb_port_init(kbd_dev_t *kdev)
 {
         const char *dev = "adb/kbd";
-        devmap_handle_t handle;
+        service_id_t service_id;
+        async_exch_t *exch;
+        int rc;
         
-        int rc = devmap_device_get_handle(dev, &handle, 0);
-        if (rc == EOK) {
-                dev_phone = devmap_obsolete_device_connect(handle, 0);
-                if (dev_phone < 0) {
-                        printf("%s: Failed to connect to device\n", NAME);
-                        return dev_phone;
-                }
-        } else
+        kbd_dev = kdev;
+        
+        rc = loc_service_get_id(dev, &service_id, 0);
+        if (rc != EOK)
                 return rc;
         
+        dev_sess = loc_service_connect(EXCHANGE_ATOMIC, service_id, 0);
+        if (dev_sess == NULL) {
+                printf("%s: Failed to connect to device\n", NAME);
+                return ENOENT;
+        }
+        
+        exch = async_exchange_begin(dev_sess);
+        if (exch == NULL) {
+                printf("%s: Failed starting exchange with device\n", NAME);
+                async_hangup(dev_sess);
+                return ENOMEM;
+        }
+        
         /* NB: The callback connection is slotted for removal */
-        rc = async_obsolete_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events);
+        rc = async_connect_to_me(exch, 0, 0, 0, kbd_port_events, NULL);
+        async_exchange_end(exch);
         if (rc != EOK) {
-                printf(NAME ": Failed to create callback from device\n");
+                printf("%s: Failed to create callback from device\n", NAME);
+                async_hangup(dev_sess);
                 return rc;
         }
@@ -78 +101 @@
 }
 
-void kbd_port_yield(void)
+static void adb_port_yield(void)
 {
 }
 
-void kbd_port_reclaim(void)
+static void adb_port_reclaim(void)
 {
 }
 
-void kbd_port_write(uint8_t data)
+static void adb_port_write(uint8_t data)
 {
         /*async_msg_1(dev_phone, CHAR_WRITE_BYTE, data);*/
 }
 
-static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall)
+static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         /* Ignore parameters, the connection is already opened */
@@ -119 +142 @@
 static void adb_kbd_reg0_data(uint16_t data)
 {
-        uint8_t b0, b1;
-
-        b0 = (data >> 8) & 0xff;
-        b1 = data & 0xff;
-
+        uint8_t b0 = (data >> 8) & 0xff;
+        uint8_t b1 = data & 0xff;
+        
         if (b0 != 0xff)
-                kbd_push_scancode(b0);
+                kbd_push_data(kbd_dev, b0);
+        
         if (b1 != 0xff)
-                kbd_push_scancode(b1);
+                kbd_push_data(kbd_dev, b1);
 }