diff options
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/include/rtems/pci.h | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 09208eaf7e..cdbf73ebbf 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2005-02-17 Joel Sherrill <joel@OARcorp.com> + + * include/rtems/pci.h: Merge differences from + libbsp/powerpc/shared/pci/pci.h. + 2005-02-17 Ralf Corsepius <ralf.corsepius@rtems.org> * libnetworking/vm/vm_param.h: Update from FreeBSD. diff --git a/cpukit/include/rtems/pci.h b/cpukit/include/rtems/pci.h index 054bbb622c..97e25e6081 100644 --- a/cpukit/include/rtems/pci.h +++ b/cpukit/include/rtems/pci.h @@ -1082,7 +1082,10 @@ #define PCIBIOS_SET_FAILED 0x88 #define PCIBIOS_BUFFER_TOO_SMALL 0x89 -#define PCI_MAX_DEVICES 16 +/* T. Straumann, 7/31/2001: increased to 32 - PMC slots are not + * scanned on mvme2306 otherwise + */ +#define PCI_MAX_DEVICES 32 #define PCI_MAX_FUNCTIONS 8 typedef struct { @@ -1101,9 +1104,9 @@ typedef struct { }pci_config_access_functions; typedef struct { - volatile unsigned char* pci_config_addr; - volatile unsigned char* pci_config_data; - pci_config_access_functions* pci_functions; + volatile unsigned char* pci_config_addr; + volatile unsigned char* pci_config_data; + const pci_config_access_functions* pci_functions; } pci_config; extern pci_config BSP_pci_configuration; |