Changeset 89ce401a in mainline

Timestamp:

2010-04-08T10:20:29Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

2480e19

Parents:

5e598e0

Message:

fixed some bugs, parts of pci bus enumeration

Location:

uspace

Files:

• lib/libc/include/ipc/dev_iface.h (modified) (2 diffs)
• srv/drivers/pciintel/pci.c (modified) (6 diffs)
• srv/drivers/pciintel/pci.h (modified) (1 diff)

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

@@ -32 +32 @@
 #include <ipc/ipc.h>
 #include <malloc.h>
+#include <unistd.h>
 
 #define DEV_IFACE_FIRST IPC_FIRST_USER_METHOD
@@ -88 +89 @@
 static inline void clean_hw_resource_list(hw_resource_list_t *hw_res)
 {
-        free(hw_res->resources);
-        hw_res->resources = 0;
+        if(NULL != hw_res->resources) {
+                free(hw_res->resources);
+                hw_res->resources = NULL;
+        }
         hw_res->count = 0;      
 }

uspace/srv/drivers/pciintel/pci.c

@@ -150 +150 @@
 }
 
+void create_pci_match_ids(device_t *dev)
+{
+        pci_dev_data_t *dev_data = (pci_dev_data_t *)dev->driver_data;
+        match_id_t *match_id = NULL;    
+        match_id = create_match_id();
+        if (NULL != match_id) {
+                asprintf(&match_id->id, "pci/ven=%04x,dev=%04x", dev_data->vendor_id, dev_data->device_id);
+                match_id->score = 90;
+                add_match_id(&dev->match_ids, match_id);
+        }       
+        // TODO add more ids (with subsys ids, using class id etc.)
+}
+
+
 void pci_bus_scan(device_t *parent, int bus_num) 
 {
@@ -181 +195 @@
                         header_type = header_type & 0x7F; // clear the multifunction bit
                         
-                        // TODO initialize device - name, match ids, interfaces
-                        // TODO register device
+                        // TODO initialize device - interfaces, hw resources
+                        
+                        create_pci_dev_name(dev);
+                        printf(NAME ": adding new device name %s.\n", dev->name);
+                        
+                        create_pci_match_ids(dev);
+                        
+                        if (!child_device_register(dev, parent)) {
+                                clean_match_ids(&dev->match_ids);
+                                free((char *)dev->name);
+                                dev->name = NULL;
+                                continue;
+                        }
                         
                         if (header_type == PCI_HEADER_TYPE_BRIDGE || header_type == PCI_HEADER_TYPE_CARDBUS ) {
@@ -219 +244 @@
         if (dev->parent_phone <= 0) {
                 printf(NAME ": pci_add_device failed to connect to the parent's driver.\n");
-                free(bus_data);
+                delete_pci_bus_data(bus_data);
                 return false;
         }
@@ -227 +252 @@
         if (!get_hw_resources(dev->parent_phone, &hw_resources)) {
                 printf(NAME ": pci_add_device failed to get hw resources for the device.\n");
-                free(bus_data);
+                delete_pci_bus_data(bus_data);
                 ipc_hangup(dev->parent_phone);
                 return false;           
@@ -243 +268 @@
         if (pio_enable(bus_data->conf_io_addr, 8, &bus_data->conf_addr_port)) {
                 printf(NAME ": failed to enable configuration ports.\n");
-                free(bus_data);
+                delete_pci_bus_data(bus_data);
                 ipc_hangup(dev->parent_phone);
                 clean_hw_resource_list(&hw_resources);
@@ -252 +277 @@
         dev->driver_data = bus_data;
         
-        // TODO scan the bus    
+        // enumerate child devices
+        printf(NAME ": scanning the bus\n");
         pci_bus_scan(dev, 0);
         

uspace/srv/drivers/pciintel/pci.h

@@ -74 +74 @@
 }
 
+static inline void create_pci_dev_name(device_t *dev)
+{
+        pci_dev_data_t *dev_data = (pci_dev_data_t *)dev->driver_data;
+        char *name = NULL;
+        asprintf(&name, "%02x:%02x.%01x", dev_data->bus, dev_data->dev, dev_data->fn);
+        dev->name = name;
+}
+
+void create_pci_match_ids(device_t *dev);
+
 uint8_t pci_conf_read_8(device_t *dev, int reg);
 uint16_t pci_conf_read_16(device_t *dev, int reg);