Changeset 3843ecb in mainline for uspace/srv

Timestamp:

2010-04-09T13:54:06Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

892e4e1

Parents:

3a5909f

Message:

device classes as interface sets

Location:

uspace/srv

Files:

• devman/main.c (modified) (8 diffs)
• drivers/pciintel/pci.c (modified) (3 diffs)
• drivers/pciintel/pci.h (modified) (1 diff)
• drivers/rootia32/rootia32.c (modified) (4 diffs)

uspace/srv/devman/main.c

@@ -121 +121 @@
 }
 
+/**
+ * Receive device match ID from the device's parent driver and add it to the list of devices match ids.
+ * 
+ * @param match_ids the list of the device's match ids.
+ * 
+ * @return 0 on success, negative error code otherwise. 
+ */
 static int devman_receive_match_id(match_id_list_t *match_ids) {
         
@@ -159 +166 @@
 }
 
+/**
+ * Receive device match IDs from the device's parent driver 
+ * and add them to the list of devices match ids.
+ * 
+ * @param match_count the number of device's match ids to be received.
+ * @param match_ids the list of the device's match ids.
+ * 
+ * @return 0 on success, negative error code otherwise.
+ */
 static int devman_receive_match_ids(ipcarg_t match_count, match_id_list_t *match_ids) 
 {       
@@ -171 +187 @@
 }
 
-static void devman_add_child(ipc_callid_t callid, ipc_call_t *call, driver_t *driver)
+/** Handle child device registration. 
+ * 
+ * Child devices are registered by their parent's device driver.
+ */
+static void devman_add_child(ipc_callid_t callid, ipc_call_t *call)
 {
         // printf(NAME ": devman_add_child\n");
@@ -211 +231 @@
 }
 
+/**
+ * Initialize driver which has registered itself as running and ready.
+ * 
+ * The initialization is done in a separate fibril to avoid deadlocks 
+ * (if the driver needed to be served by devman during the driver's initialization). 
+ */
 static int init_running_drv(void *drv)
 {
@@ -219 +245 @@
 }
 
-/** Function for handling connections to device manager.
- *
+/** Function for handling connections from a driver to the device manager.
  */
 static void devman_connection_driver(ipc_callid_t iid, ipc_call_t *icall)
@@ -231 +256 @@
                 return;
         
+        // Initialize the driver as running (e.g. pass assigned devices to it) in a separate fibril;
+        // the separate fibril is used to enable the driver 
+        // to use devman service during the driver's initialization.
         fid_t fid = fibril_create(init_running_drv, driver);
         if (fid == 0) {
                 printf(NAME ": Error creating fibril for the initialization of the newly registered running driver.\n");
-                exit(1);
+                return;
         }
         fibril_add_ready(fid);
@@ -254 +282 @@
                         continue;
                 case DEVMAN_ADD_CHILD_DEVICE:
-                        devman_add_child(callid, &call, driver);
+                        devman_add_child(callid, &call);
                         break;
                 default:
@@ -299 +327 @@
         
         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);
+                printf(NAME ": devman_forward: cound not forward to driver %s ", driver->name);
+                printf("the driver's phone is %x).\n", driver->phone);
                 return;
         }

uspace/srv/drivers/pciintel/pci.c

@@ -58 +58 @@
 #define NAME "pciintel"
 
-
 #define CONF_ADDR(bus, dev, fn, reg)   ((1 << 31) | (bus << 16) | (dev << 11) | (fn << 8) | (reg & ~3))
+
+
+static hw_resource_list_t * pciintel_get_child_resources(device_t *dev)
+{
+        pci_dev_data_t *dev_data = (pci_dev_data_t *)dev->driver_data;
+        if (NULL == dev_data) {
+                return NULL;
+        }
+        return &dev_data->hw_resources;
+}
+
+static bool pciintel_enable_child_interrupt(device_t *dev) 
+{
+        // TODO
+        
+        return false;
+}
+
+static resource_iface_t pciintel_child_res_iface = {
+        &pciintel_get_child_resources,
+        &pciintel_enable_child_interrupt        
+};
+
+static device_class_t pci_child_class;
 
 
@@ -373 +396 @@
                         pci_read_interrupt(dev);
                         
-                        // TODO initialize device interfaces                    
+                        dev->class = &pci_child_class;                  
                         
                         printf(NAME ": adding new child device %s.\n", dev->name);
@@ -464 +487 @@
 }
 
+static void pciintel_init() 
+{
+        pci_child_class.id = 0; // TODO
+        pci_child_class.interfaces[HW_RES_DEV_IFACE] = &pciintel_child_res_iface;
+}
+
 int main(int argc, char *argv[])
 {
-        printf(NAME ": HelenOS pci bus driver (intel method 1).\n");    
+        printf(NAME ": HelenOS pci bus driver (intel method 1).\n");
+        pciintel_init();
         return driver_main(&pci_driver);
 }

uspace/srv/drivers/pciintel/pci.h

@@ -110 +110 @@
 }
 
-static inline bool pci_clean_resource_list(device_t *dev)
+static inline void pci_clean_resource_list(device_t *dev)
 {
         pci_dev_data_t *dev_data = (pci_dev_data_t *)dev->driver_data;

uspace/srv/drivers/rootia32/rootia32.c

@@ -51 +51 @@
 #include <ipc/dev_iface.h>
 #include <resource.h>
+#include <device/hw_res.h>
 
 #define NAME "rootia32"
@@ -111 +112 @@
 };
 
+// initialized in root_ia32_init() function
+static device_class_t rootia32_child_class;
+
 static bool rootia32_add_child(
         device_t *parent, const char *name, const char *str_match_id, 
@@ -136 +140 @@
         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);
+        // set class to the device
+        child->class = &rootia32_child_class;
         
         // register child  device
@@ -181 +185 @@
 }
 
+static void root_ia32_init() {
+        // initialize child device class                
+        rootia32_child_class.id = 0;    // TODO 
+        rootia32_child_class.interfaces[HW_RES_DEV_IFACE] = &child_res_iface;
+}
+
 int main(int argc, char *argv[])
 {
         printf(NAME ": HelenOS root device driver\n");  
+        root_ia32_init();
         return driver_main(&rootia32_driver);
 }