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

Timestamp:

2011-09-04T11:30:58Z (15 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_mouse.c (moved) (moved from uspace/srv/hid/char_mouse/chardev.c ) (3 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup mouse
+/** @addtogroup mouse_port
+ * @ingroup mouse
  * @{
- */ 
+ */
 /** @file
- * @brief
+ * @brief ADB mouse port driver.
  */
 
-#include <ipc/char.h>
+#include <ipc/adb.h>
 #include <async.h>
-#include <async_obsolete.h>
-#include <vfs/vfs.h>
-#include <fcntl.h>
+#include <input.h>
+#include <mouse_port.h>
+#include <mouse.h>
 #include <errno.h>
-#include <devmap.h>
-#include <devmap_obsolete.h>
-#include <char_mouse.h>
-#include <mouse_port.h>
+#include <loc.h>
+#include <stdio.h>
 
-static void chardev_events(ipc_callid_t iid, ipc_call_t *icall);
+static mouse_dev_t *mouse_dev;
+static async_sess_t *dev_sess;
 
-static int dev_phone;
-
-#define NAME "char_mouse"
-
-int mouse_port_init(void)
-{
-        devmap_handle_t handle;
-        int rc = devmap_device_get_handle("char/ps2b", &handle,
-            IPC_FLAG_BLOCKING);
-        
-        if (rc != EOK) {
-                printf("%s: Failed resolving PS/2\n", NAME);
-                return rc;
-        }
-        
-        dev_phone = devmap_obsolete_device_connect(handle, IPC_FLAG_BLOCKING);
-        if (dev_phone < 0) {
-                printf("%s: Failed connecting to PS/2\n", NAME);
-                return ENOENT;
-        }
-        
-        /* NB: The callback connection is slotted for removal */
-        if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, chardev_events) != 0) {
-                printf(NAME ": Failed to create callback from device\n");
-                return false;
-        }
-        
-        return 0;
-}
-
-void mouse_port_yield(void)
-{
-}
-
-void mouse_port_reclaim(void)
-{
-}
-
-void mouse_port_write(uint8_t data)
-{
-        async_obsolete_msg_1(dev_phone, CHAR_WRITE_BYTE, data);
-}
-
-static void chardev_events(ipc_callid_t iid, ipc_call_t *icall)
+static void mouse_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         /* Ignore parameters, the connection is already opened */
         while (true) {
-
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
-
+                
                 int retval;
                 
@@ -104 +60 @@
                         return;
                 }
-
+                
                 switch (IPC_GET_IMETHOD(call)) {
-                case IPC_FIRST_USER_METHOD:
-                        mouse_handle_byte(IPC_GET_ARG1(call));
+                case ADB_REG_NOTIF:
+                        mouse_push_data(mouse_dev, IPC_GET_ARG1(call));
                         break;
                 default:
                         retval = ENOENT;
                 }
+                
                 async_answer_0(callid, retval);
         }
 }
 
+static int adb_port_init(mouse_dev_t *mdev)
+{
+        const char *dev = "adb/mouse";
+        
+        mouse_dev = mdev;
+        
+        service_id_t service_id;
+        int 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;
+        }
+        
+        async_exch_t *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_connect_to_me(exch, 0, 0, 0, mouse_port_events, NULL);
+        async_exchange_end(exch);
+        if (rc != EOK) {
+                printf("%s: Failed to create callback from device\n", NAME);
+                async_hangup(dev_sess);
+                return rc;
+        }
+        
+        return EOK;
+}
+
+static void adb_port_yield(void)
+{
+}
+
+static void adb_port_reclaim(void)
+{
+}
+
+static void adb_port_write(uint8_t data)
+{
+}
+
+mouse_port_ops_t adb_mouse_port = {
+        .init = adb_port_init,
+        .yield = adb_port_yield,
+        .reclaim = adb_port_reclaim,
+        .write = adb_port_write
+};
+
 /**
  * @}