Changeset 04803bf in mainline for uspace/srv/hid/adb_mouse/adb_dev.c

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/srv/hid/adb_mouse/adb_dev.c (moved) (moved from uspace/app/tester/ipc/register.c ) (2 diffs)

uspace/srv/hid/adb_mouse/adb_dev.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Ondrej Palkovsky
+ * Copyright (c) 2010 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#include <stdio.h>
-#include <unistd.h>
+/** @addtogroup mouse
+ * @{
+ */ 
+/** @file
+ * @brief
+ */
+
+#include <ipc/adb.h>
 #include <async.h>
+#include <vfs/vfs.h>
+#include <fcntl.h>
 #include <errno.h>
-#include "../tester.h"
 
-#define MAX_CONNECTIONS  50
+#include "adb_mouse.h"
+#include "adb_dev.h"
 
-static int connections[MAX_CONNECTIONS];
+static void adb_dev_events(ipc_callid_t iid, ipc_call_t *icall);
 
-static void client_connection(ipc_callid_t iid, ipc_call_t *icall)
+static int dev_phone;
+
+int adb_dev_init(void)
 {
-        unsigned int i;
-        
-        TPRINTF("Connected phone %#x accepting\n", icall->in_phone_hash);
-        ipc_answer_0(iid, EOK);
-        for (i = 0; i < MAX_CONNECTIONS; i++) {
-                if (!connections[i]) {
-                        connections[i] = icall->in_phone_hash;
-                        break;
-                }
+        const char *input = "/dev/adb/mouse";
+        int input_fd;
+
+        printf(NAME ": open %s\n", input);
+
+        input_fd = open(input, O_RDONLY);
+        if (input_fd < 0) {
+                printf(NAME ": Failed opening %s (%d)\n", input, input_fd);
+                return false;
+        }
+
+        dev_phone = fd_phone(input_fd);
+        if (dev_phone < 0) {
+                printf(NAME ": Failed to connect to device\n");
+                return false;
+        }
+
+        /* NB: The callback connection is slotted for removal */
+        if (async_connect_to_me(dev_phone, 0, 0, 0, adb_dev_events) != 0) {
+                printf(NAME ": Failed to create callback from device\n");
+                return false;
         }
         
+        return 0;
+}
+
+static void adb_dev_events(ipc_callid_t iid, ipc_call_t *icall)
+{
+        /* Ignore parameters, the connection is already opened */
         while (true) {
+
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
+
                 int retval;
-                
-                switch (IPC_GET_METHOD(call)) {
+
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
-                        TPRINTF("Phone %#x hung up\n", icall->in_phone_hash);
-                        retval = 0;
-                        break;
-                case IPC_TEST_METHOD:
-                        TPRINTF("Received well known message from %#x: %#x\n",
-                            icall->in_phone_hash, callid);
-                        ipc_answer_0(callid, EOK);
+                        /* TODO: Handle hangup */
+                        return;
+                case IPC_FIRST_USER_METHOD:
+                        mouse_handle_data(IPC_GET_ARG1(call));
                         break;
                 default:
-                        TPRINTF("Received unknown message from %#x: %#x\n",
-                            icall->in_phone_hash, callid);
-                        ipc_answer_0(callid, ENOENT);
-                        break;
+                        retval = ENOENT;
                 }
+                async_answer_0(callid, retval);
         }
 }
 
-char *test_register(void)
-{
-        async_set_client_connection(client_connection);
-        
-        ipcarg_t phonead;
-        int res = ipc_connect_to_me(PHONE_NS, IPC_TEST_SERVICE, 0, 0, &phonead);
-        if (res != 0)
-                return "Failed registering IPC service";
-        
-        TPRINTF("Registered as service %u, accepting connections\n", IPC_TEST_SERVICE);
-        async_manager();
-        
-        return NULL;
-}
+/**
+ * @}
+ */