Changes in uspace/drv/pciintel/pci.h [af6b5157:713a4b9] in mainline

File:

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

uspace/drv/pciintel/pci.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Lenka Trochtova
- * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -37 +36 @@
 #define PCI_H_
 
-#include <ddf/driver.h>
+#include <stdlib.h>
+#include <driver.h>
+#include <malloc.h>
+
 #include "pci_regs.h"
 
 #define PCI_MAX_HW_RES 8
 
-typedef struct pciintel_bus {
-        /** DDF device node */
-        ddf_dev_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;
-        ddf_fun_t *fnode;
-
+typedef struct pci_dev_data {
         int bus;
         int dev;
@@ -61 +51 @@
         int device_id;
         hw_resource_list_t hw_resources;
-} pci_fun_t;
+} pci_dev_data_t;
 
-extern void pci_fun_create_match_ids(pci_fun_t *);
+extern void create_pci_match_ids(device_t *);
 
-extern uint8_t pci_conf_read_8(pci_fun_t *, int);
-extern uint16_t pci_conf_read_16(pci_fun_t *, int);
-extern uint32_t pci_conf_read_32(pci_fun_t *, int);
-extern void pci_conf_write_8(pci_fun_t *, int, uint8_t);
-extern void pci_conf_write_16(pci_fun_t *, int, uint16_t);
-extern void pci_conf_write_32(pci_fun_t *, int, uint32_t);
+extern uint8_t pci_conf_read_8(device_t *, int);
+extern uint16_t pci_conf_read_16(device_t *, int);
+extern uint32_t pci_conf_read_32(device_t *, int);
+extern void pci_conf_write_8(device_t *, int, uint8_t);
+extern void pci_conf_write_16(device_t *, int, uint16_t);
+extern void pci_conf_write_32(device_t *, int, uint32_t);
 
-extern void pci_add_range(pci_fun_t *, uint64_t, size_t, bool);
-extern int pci_read_bar(pci_fun_t *, int);
-extern void pci_read_interrupt(pci_fun_t *);
-extern void pci_add_interrupt(pci_fun_t *, int);
+extern void pci_add_range(device_t *, uint64_t, size_t, bool);
+extern int pci_read_bar(device_t *, int);
+extern void pci_read_interrupt(device_t *);
+extern void pci_add_interrupt(device_t *, int);
 
-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 char *pci_fun_create_name(pci_fun_t *);
+extern void pci_bus_scan(device_t *, int);
 
-extern void pci_bus_scan(pci_bus_t *, int);
+extern pci_dev_data_t *create_pci_dev_data(void);
+extern void init_pci_dev_data(pci_dev_data_t *, int, int, int);
+extern void delete_pci_dev_data(pci_dev_data_t *);
+extern void create_pci_dev_name(device_t *);
 
-extern bool pci_alloc_resource_list(pci_fun_t *);
-extern void pci_clean_resource_list(pci_fun_t *);
+extern bool pci_alloc_resource_list(device_t *);
+extern void pci_clean_resource_list(device_t *);
 
-extern void pci_read_bars(pci_fun_t *);
+extern void pci_read_bars(device_t *);
 extern size_t pci_bar_mask_to_size(uint32_t);