Changeset f658458 in mainline for uspace/srv

Timestamp:

2010-05-02T20:49:09Z (16 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

bb864a0

Parents:

25a7e11d

Message:

parts of generic char interface, fixed some bugs

Location:

uspace/srv

Files:

• devman/devman.c (modified) (3 diffs)
• devman/main.c (modified) (2 diffs)
• drivers/serial/serial.c (modified) (4 diffs)

uspace/srv/devman/devman.c

@@ -679 +679 @@
 {
         node_t *dev = tree->root_node;
+        // relative path to the device from its parent (but with '/' at the beginning)
         char *rel_path = path;
         char *next_path_elem = NULL;
@@ -685 +686 @@
         
         while (cont && NULL != dev) {           
-                next_path_elem  = get_path_elem_end(rel_path+1);                
+                next_path_elem  = get_path_elem_end(rel_path + 1);              
                 if ('/' == next_path_elem[0]) {
                         cont = true;
@@ -693 +694 @@
                 }
                 
-                dev = find_node_child(dev, rel_path);           
+                dev = find_node_child(dev, rel_path + 1);               
                 
                 if (cont) {
+                        // restore the original path
                         next_path_elem[0] = '/';
                 }

uspace/srv/devman/main.c

@@ -291 +291 @@
 }
 
+/** Find handle for the device instance identified by the device's path in the device tree.
+ */
+static void devman_device_get_handle(ipc_callid_t iid, ipc_call_t *icall)
+{
+        char *pathname;
+        
+        /* Get fqdn */
+        int rc = async_string_receive(&pathname, 0, NULL);
+        if (rc != EOK) {
+                ipc_answer_0(iid, rc);
+                return;
+        }
+        
+        node_t * dev = find_dev_node_by_path(&device_tree, pathname); 
+        
+        free(pathname);
+
+        if (NULL == dev) {
+                ipc_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        ipc_answer_1(iid, EOK, dev->handle);
+}
+
+
+/** Function for handling connections from a client to the device manager.
+ */
+static void devman_connection_client(ipc_callid_t iid, ipc_call_t *icall)
+{
+        /* Accept connection */
+        ipc_answer_0(iid, EOK);
+        
+        bool cont = true;
+        while (cont) {
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+                
+                switch (IPC_GET_METHOD(call)) {
+                case IPC_M_PHONE_HUNGUP:
+                        cont = false;
+                        continue;
+                case DEVMAN_DEVICE_GET_HANDLE:
+                        devman_device_get_handle(callid, &call);
+                        break;
+                default:
+                        if (!(callid & IPC_CALLID_NOTIFICATION))
+                                ipc_answer_0(callid, ENOENT);
+                }
+        }       
+}
+
 static void devman_forward(ipc_callid_t iid, ipc_call_t *icall, bool drv_to_parent) {   
         
@@ -346 +398 @@
                 devman_connection_driver(iid, icall);
                 break;
-        /*case DEVMAN_CLIENT:
-                devmap_connection_client(iid, icall);
-                break;*/
+        case DEVMAN_CLIENT:
+                devman_connection_client(iid, icall);
+                break;
         case DEVMAN_CONNECT_TO_DEVICE:
                 // Connect client to selected device

uspace/srv/drivers/serial/serial.c

@@ -53 +53 @@
 
 #include <driver.h>
+#include <char.h>
 #include <resource.h>
 
@@ -91 +92 @@
 }
 
+static int serial_read(device_t *dev, char *buf, size_t count) 
+{
+        printf(NAME ": serial_read %s\n", dev->name);
+        // TODO
+        return 0;
+}
+
+static int serial_write(device_t *dev, char *buf, size_t count) 
+{
+        // TODO
+        return 0;
+}
+
 static device_class_t serial_dev_class;
+
+static char_iface_t serial_char_iface = {
+        .read = &serial_read,
+        .write = &serial_write
+};
 
 static int serial_add_device(device_t *dev);
@@ -377 +396 @@
                 serial_unregister_interrupt_handler(dev);
                 return res;
-        }               
+        }       
+        
+        dev->class = &serial_dev_class;
         
         printf(NAME ": the %s device has been successfully initialized.\n", dev->name);
@@ -440 +461 @@
         serial_dev_class.open = &serial_open;
         serial_dev_class.close = &serial_close; 
+        
+        serial_dev_class.interfaces[CHAR_DEV_IFACE] = &serial_char_iface;
 }