Changeset 924c75e1 in mainline

Timestamp:

2010-02-24T22:09:12Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

729fa2d6

Parents:

0c3666d

Message:

backup (unstable)

Location:

uspace

Files:

• Makefile (modified) (1 diff)
• lib/libc/include/ipc/devman.h (modified) (2 diffs)
• srv/devman/devman.h (modified) (1 diff)
• srv/devman/main.c (modified) (2 diffs)
• srv/drivers/root/Makefile (added)
• srv/drivers/root/root.c (added)
• srv/drivers/root/root.ma (added)

uspace/Makefile

@@ -49 +49 @@
         srv/devmap \
         srv/devman \
+        srv/drivers/root \
         srv/loader \
         srv/ns \

uspace/lib/libc/include/ipc/devman.h

@@ -36 +36 @@
 #include <ipc/ipc.h>
 
+typedef enum {
+        DEVMAN_DRIVER = 1,
+        DEVMAN_CLIENT,
+        DEVMAN_CONNECT_TO_DEVICE
+} devman_interface_t;
 
 typedef enum {
@@ -41 +46 @@
         DEVMAN_ADD_CHILD_DEVICE
 
-} devman_request_t;
+} driver_to_devman_t;
+
+typedef enum {
+        DRIVER_ADD_DEVICE = IPC_FIRST_USER_METHOD
+
+} devman_to_driver_t;
 
 

uspace/srv/devman/devman.h

@@ -201 +201 @@
         list_initialize(&drv->match_ids.ids);
         list_initialize(&drv->devices);
+        fibril_mutex_initialize(&drv->driver_mutex);    
 }
 

uspace/srv/devman/main.c

@@ -63 +63 @@
  *
  */
-static void devman_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void devman_connection_driver(ipc_callid_t iid, ipc_call_t *icall)
 {
         ipc_callid_t callid;
@@ -85 +85 @@
                         break;
                 }
+        }
+}
+
+/** Function for handling connections to device manager.
+ *
+ */
+static void devman_connection(ipc_callid_t iid, ipc_call_t *icall)
+{
+        // Select interface 
+        switch ((ipcarg_t) (IPC_GET_ARG1(*icall))) {
+        case DEVMAN_DRIVER:
+                devman_connection_driver(iid, icall);
+                break;
+        /*case DEVMAN_CLIENT:
+                devmap_connection_client(iid, icall);
+                break;
+        case DEVMAN_CONNECT_TO_DEVICE:
+                // Connect client to selected device
+                devmap_forward(iid, icall);
+                break;*/
+        default:
+                /* No such interface */
+                ipc_answer_0(iid, ENOENT);
         }
 }