diff options
| author | Michael Brown | 2005-04-14 15:44:07 +0200 |
|---|---|---|
| committer | Michael Brown | 2005-04-14 15:44:07 +0200 |
| commit | 104880ca19e230ebbe6a4f46fa17e32ff05324f2 (patch) | |
| tree | d99a776582dfb278218299f88c3ee8fd8203e631 /src/include | |
| parent | Separate out bus-scanning and device-probing logic. (diff) | |
| download | ipxe-104880ca19e230ebbe6a4f46fa17e32ff05324f2.tar.gz ipxe-104880ca19e230ebbe6a4f46fa17e32ff05324f2.tar.xz ipxe-104880ca19e230ebbe6a4f46fa17e32ff05324f2.zip | |
Tweak API to allow separation of bus-scanning and device-probing logic.
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/eisa.h | 6 | ||||
| -rw-r--r-- | src/include/mca.h | 5 | ||||
| -rw-r--r-- | src/include/pci.h | 5 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/include/eisa.h b/src/include/eisa.h index ed0ccef35..081ce47ef 100644 --- a/src/include/eisa.h +++ b/src/include/eisa.h @@ -25,10 +25,9 @@ * A physical EISA device * */ -struct dev; struct eisa_device { char *magic; /* must be first */ - struct dev *dev; + const char *name; unsigned int slot; uint16_t ioaddr; uint16_t mfg_id; @@ -69,9 +68,10 @@ struct eisa_driver { * Functions in eisa.c * */ -extern struct eisa_device * eisa_device ( struct dev *dev ); extern int find_eisa_device ( struct eisa_device *eisa, struct eisa_driver *driver ); +extern int find_eisa_boot_device ( struct dev *dev, + struct eisa_driver *driver ); extern void enable_eisa_device ( struct eisa_device *eisa ); #endif /* EISA_H */ diff --git a/src/include/mca.h b/src/include/mca.h index c12b1cabe..9115b98d6 100644 --- a/src/include/mca.h +++ b/src/include/mca.h @@ -26,10 +26,9 @@ * A physical MCA device * */ -struct dev; struct mca_device { char *magic; /* must be first */ - struct dev *dev; + const char *name; unsigned int slot; unsigned char pos[8]; int already_tried; @@ -69,8 +68,8 @@ struct mca_driver { * Functions in mca.c * */ -extern struct mca_device * mca_device ( struct dev *dev ); extern int find_mca_device ( struct mca_device *mca, struct mca_driver *driver ); +extern int find_mca_boot_device ( struct dev *dev, struct mca_driver *driver ); #endif diff --git a/src/include/pci.h b/src/include/pci.h index 988259a32..e7ac084b5 100644 --- a/src/include/pci.h +++ b/src/include/pci.h @@ -236,10 +236,9 @@ * A physical PCI device * */ -struct dev; struct pci_device { char * magic; /* must be first */ - struct dev * dev; + const char * name; uint32_t membase; /* BAR 1 */ uint32_t ioaddr; /* first IO BAR */ uint16_t vendor, dev_id; @@ -322,9 +321,9 @@ extern unsigned long pci_bus_base ( struct pci_device *dev ); * Functions in pci.c * */ -extern struct pci_device * pci_device ( struct dev *dev ); extern int find_pci_device ( struct pci_device *pci, struct pci_driver *driver ); +extern int find_pci_boot_device ( struct dev *dev, struct pci_driver *driver ); extern void adjust_pci_device ( struct pci_device *pci ); extern unsigned long pci_bar_start ( struct pci_device *pci, unsigned int bar ); |