Changeset df747b9c in mainline for uspace/srv/drivers/pciintel/pci.c

Timestamp:

2010-04-23T11:30:25Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

5af21c5

Parents:

a78fa2a

Message:

added device states (usable, invalid, not present, not initialized); add_device driver callback method returns integer (errno) instead of bool

File:

• uspace/srv/drivers/pciintel/pci.c (modified) (8 diffs)

uspace/srv/drivers/pciintel/pci.c

@@ -85 +85 @@
 
 
-static bool pci_add_device(device_t *dev);
+static int pci_add_device(device_t *dev);
 
 /** The pci bus driver's standard operations.
@@ -402 +402 @@
                         create_pci_match_ids(dev);
                         
-                        if (!child_device_register(dev, parent)) {                              
+                        if (EOK != child_device_register(dev, parent)) {                                
                                 pci_clean_resource_list(dev);                           
                                 clean_match_ids(&dev->match_ids);
@@ -433 +433 @@
 }
 
-static bool pci_add_device(device_t *dev)
+static int pci_add_device(device_t *dev)
 {
         printf(NAME ": pci_add_device\n");
@@ -440 +440 @@
         if (NULL == bus_data) {
                 printf(NAME ": pci_add_device allocation failed.\n");
-                return false;
+                return ENOMEM;
         }       
         
@@ -447 +447 @@
                 printf(NAME ": pci_add_device failed to connect to the parent's driver.\n");
                 delete_pci_bus_data(bus_data);
-                return false;
+                return EPARTY;
         }
         
@@ -456 +456 @@
                 delete_pci_bus_data(bus_data);
                 ipc_hangup(dev->parent_phone);
-                return false;           
+                return EPARTY;          
         }       
         
@@ -472 +472 @@
                 ipc_hangup(dev->parent_phone);
                 clean_hw_resource_list(&hw_resources);
-                return false;                                   
+                return EADDRNOTAVAIL;                                   
         }
         bus_data->conf_data_port = (char *)bus_data->conf_addr_port + 4;
@@ -484 +484 @@
         clean_hw_resource_list(&hw_resources);
         
-        return true;
+        return EOK;
 }