diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-03-04 21:48:00 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-03-04 21:48:00 +0000 |
| commit | bdc2572a16e0b87b901725a239dc1e5480dfd232 (patch) | |
| tree | fe04a1b0045b0be276013d4e4ef547a0d0c1a455 | |
| parent | 2005-03-04 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-bdc2572a16e0b87b901725a239dc1e5480dfd232.tar.bz2 | |
2005-03-04 Joel Sherrill <joel@OARcorp.com>
* shared/pci/pcibios.c, shared/pci/pcibios.h: Make PCI initialize
function part of the unified PCI API as pci_initialize().
| -rw-r--r-- | c/src/lib/libbsp/i386/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/shared/pci/pcibios.c | 17 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/shared/pci/pcibios.h | 10 |
3 files changed, 9 insertions, 23 deletions
diff --git a/c/src/lib/libbsp/i386/ChangeLog b/c/src/lib/libbsp/i386/ChangeLog index 7efccc6895..852a2be84c 100644 --- a/c/src/lib/libbsp/i386/ChangeLog +++ b/c/src/lib/libbsp/i386/ChangeLog @@ -1,3 +1,8 @@ +2005-03-04 Joel Sherrill <joel@OARcorp.com> + + * shared/pci/pcibios.c, shared/pci/pcibios.h: Make PCI initialize + function part of the unified PCI API as pci_initialize(). + 2005-01-19 Joel Sherrill <joel@OARcorp.com> * pc386/console/vgainit.c, pc386/wd8003/wd8003.c, shared/comm/uart.c: diff --git a/c/src/lib/libbsp/i386/shared/pci/pcibios.c b/c/src/lib/libbsp/i386/shared/pci/pcibios.c index a62ed4f4bf..6041cd6af1 100644 --- a/c/src/lib/libbsp/i386/shared/pci/pcibios.c +++ b/c/src/lib/libbsp/i386/shared/pci/pcibios.c @@ -37,7 +37,7 @@ static int pcib_convert_err(int err); * error code */ int -pcib_init(void) +pci_initialize(void) { unsigned char *ucp; unsigned char sum; @@ -211,22 +211,11 @@ pcib_find_by_class(int classCode, int idx, int *sig) return PCIB_ERR_SUCCESS; } -#define PCI_MULTI_FUNCTION 0x80 -#define PCI_MAX_DEVICES 16 -#define PCI_MAX_FUNCTIONS 8 - -#define PCI_VENDOR_ID 0x00 /* 16 bits */ -#define PCI_DEVICE_ID 0x02 /* 16 bits */ -#define PCI_CLASS_REVISION 0x08 -#define PCI_HEADER_TYPE 0x0e -#define PCI_SUBORDINATE_BUS 0x1a - -#define PCI_CLASS_BRIDGE_PCI 0x0604 +#define PCI_MULTI_FUNCTION 0x80 static unsigned8 ucBusCount = 0xff; - -int +unsigned char BusCountPCI() { if( ucBusCount == 0xff ) diff --git a/c/src/lib/libbsp/i386/shared/pci/pcibios.h b/c/src/lib/libbsp/i386/shared/pci/pcibios.h index beba80ff5b..efaac74347 100644 --- a/c/src/lib/libbsp/i386/shared/pci/pcibios.h +++ b/c/src/lib/libbsp/i386/shared/pci/pcibios.h @@ -8,14 +8,7 @@ #ifndef _PCIB_H #define _PCIB_H -/* Error codes */ -#define PCIB_ERR_SUCCESS (0) -#define PCIB_ERR_UNINITIALIZED (-1) /* PCI BIOS is not initilized */ -#define PCIB_ERR_NOTPRESENT (-2) /* PCI BIOS not present */ -#define PCIB_ERR_NOFUNC (-3) /* Function not supported */ -#define PCIB_ERR_BADVENDOR (-4) /* Bad Vendor ID */ -#define PCIB_ERR_DEVNOTFOUND (-5) /* Device not found */ -#define PCIB_ERR_BADREG (-6) /* Bad register number */ +#include <rtems/pci.h> /* * Make device signature from bus number, device numebr and function @@ -34,7 +27,6 @@ extern "C" { #endif -int pcib_init(void); int pcib_find_by_devid(int vendorId, int devId, int idx, int *sig); int pcib_find_by_class(int classCode, int idx, int *sig); int pcib_special_cycle(int busNo, int data); |