Changeset 97a62fe in mainline for uspace/drv/pciintel/pci.h

Timestamp:

2011-02-14T21:41:50Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cd0684d

Parents:

7df0477e

Message:

Refactor create_function(), delete_function() and register_function() into
ddf_fun_create(), ddf_fun_destroy() and ddf_fun_bind(). This is not just
a rename.

File:

• uspace/drv/pciintel/pci.h (modified) (3 diffs)

uspace/drv/pciintel/pci.h

@@ -45 +45 @@
 #define PCI_MAX_HW_RES 8
 
+typedef struct pciintel_bus {
+        /** DDF device node */
+        device_t *dnode;
+        uint32_t conf_io_addr;
+        void *conf_data_port;
+        void *conf_addr_port;
+        fibril_mutex_t conf_mutex;
+} pci_bus_t;
+
 typedef struct pci_fun_data {
+        pci_bus_t *busptr;
         function_t *fnode;
 
@@ -55 +65 @@
         hw_resource_list_t hw_resources;
 } pci_fun_t;
-
-typedef struct pciintel_bus {
-        /** DDF device node */
-        device_t *dnode;
-        uint32_t conf_io_addr;
-        void *conf_data_port;
-        void *conf_addr_port;
-        fibril_mutex_t conf_mutex;
-} pci_bus_t;
 
 extern void pci_fun_create_match_ids(pci_fun_t *);
@@ -79 +80 @@
 extern void pci_add_interrupt(pci_fun_t *, int);
 
-extern pci_fun_t *pci_fun_new(void);
+extern pci_fun_t *pci_fun_new(pci_bus_t *);
 extern void pci_fun_init(pci_fun_t *, int, int, int);
 extern void pci_fun_delete(pci_fun_t *);
-extern void pci_fun_create_name(pci_fun_t *);
+extern char *pci_fun_create_name(pci_fun_t *);
 
 extern void pci_bus_scan(pci_bus_t *, int);