Changeset 9a66bc2e in mainline for uspace/srv

Timestamp:

2010-04-04T21:52:26Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

8c06905

Parents:

5cd136ab

Message:

several bugs fixed

Location:

uspace/srv

Files:

• devman/main.c (modified) (3 diffs)
• drivers/rootia32/rootia32.c (modified) (5 diffs)

uspace/srv/devman/main.c

@@ -258 +258 @@
 }
 
-static void devman_forward(ipc_callid_t iid, ipc_call_t *icall, bool drv_to_parent) {
-        device_handle_t handle;
+static void devman_forward(ipc_callid_t iid, ipc_call_t *icall, bool drv_to_parent) {   
+        
+        device_handle_t handle = IPC_GET_ARG2(*icall);
+        printf(NAME ": devman_forward - trying to forward connection to device with handle %x.\n", handle);
+        
         node_t *dev = find_dev_node(&device_tree, handle);
         if (NULL == dev) {
+                printf(NAME ": devman_forward error - no device with handle %x was found.\n", handle);
                 ipc_answer_0(iid, ENOENT);
                 return;
@@ -269 +273 @@
         
         if (drv_to_parent) {
-                driver = dev->parent->drv;
+                if (NULL != dev->parent) {
+                        driver = dev->parent->drv;              
+                }
         } else {
                 driver = dev->drv;              
         }
         
-        if (NULL == driver) {           
+        if (NULL == driver) {   
+                printf(NAME ": devman_forward error - no driver to connect to.\n", handle);
                 ipc_answer_0(iid, ENOENT);
                 return; 
@@ -286 +293 @@
         }
         
+        if (driver->phone <= 0) {
+                printf(NAME ": devman_forward: cound not forward to driver %s (the driver's phone is %x).\n", driver->name, driver->phone);
+                return;
+        }
+        printf(NAME ": devman_forward: forward to driver %s with phone %d.\n", driver->name, driver->phone);
         ipc_forward_fast(iid, driver->phone, method, dev->handle, 0, IPC_FF_NONE);      
 }

uspace/srv/drivers/rootia32/rootia32.c

@@ -50 +50 @@
 #include <ipc/devman.h>
 #include <ipc/dev_iface.h>
+#include <resource.h>
 
 #define NAME "rootia32"
 
-typedef struct rootia32_dev_data {
+typedef struct rootia32_child_dev_data {
         hw_resource_list_t hw_resources;        
-} rootia32_dev_data_t;
+} rootia32_child_dev_data_t;
 
 static bool rootia32_add_device(device_t *dev);
@@ -82 +83 @@
 };
 
-static rootia32_dev_data_t pci_data = {
+static rootia32_child_dev_data_t pci_data = {
         .hw_resources = {
                 1, 
@@ -89 +90 @@
 };
 
+static hw_resource_list_t * rootia32_get_child_resources(device_t *dev)
+{
+        rootia32_child_dev_data_t *data = (rootia32_child_dev_data_t *)dev->driver_data;
+        if (NULL == data) {
+                return NULL;
+        }
+        return &data->hw_resources;
+}
+
+static bool rootia32_enable_child_interrupt(device_t *dev) 
+{
+        // TODO
+        
+        return false;
+}
+
+static resource_iface_t child_res_iface = {
+        &rootia32_get_child_resources,
+        &rootia32_enable_child_interrupt        
+};
+
 static bool rootia32_add_child(
         device_t *parent, const char *name, const char *str_match_id, 
-        rootia32_dev_data_t *drv_data) 
+        rootia32_child_dev_data_t *drv_data) 
 {
         printf(NAME ": adding new child device '%s'.\n", name);
@@ -113 +135 @@
         match_id->score = 100;
         add_match_id(&child->match_ids, match_id);      
+        
+        // add an interface to the device
+        device_set_iface(child, HW_RES_DEV_IFACE, &child_res_iface);
         
         // register child  device
@@ -151 +176 @@
         if (!rootia32_add_children(dev)) {
                 printf(NAME ": failed to add child devices for platform ia32.\n");
-                return false;
         }