RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2007-09-06 Joel Sherrill <joel.sherrill@OARcorp.com>

Browse Source 
* pci/pci.c: Fix some warnings.
This commit is contained in:
Joel Sherrill
2007-09-06 15:41:33 +00:00
parent f752c246fa
commit 2a07d0f40d
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/lib/libbsp/sparc/leon3/ChangeLog
View File

@@ -1,3 +1,7 @@
2007-09-06 Joel Sherrill <joel.sherrill@OARcorp.com>
* pci/pci.c: Fix some warnings.
2007-09-06 Joel Sherrill <joel.sherrill@OARcorp.com> 2007-09-06 Joel Sherrill <joel.sherrill@OARcorp.com>
* console/debugputs.c: Add missing include file. * console/debugputs.c: Add missing include file.

17
c/src/lib/libbsp/sparc/leon3/pci/pci.c
View File

@@ -25,6 +25,7 @@
*/ */
#include <pci.h> #include <pci.h>
#include <stdlib.h>
#include <rtems/bspIo.h> #include <rtems/bspIo.h>
#define PCI_ADDR 0x80000400 #define PCI_ADDR 0x80000400
@@ -97,8 +98,14 @@ static inline unsigned int flip_dword (unsigned int l)
int int
pci_read_config_dword(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned int *val) { pci_read_config_dword(
unsigned char bus,
unsigned char slot,
unsigned char function,
unsigned char offset,
unsigned int *val
)
{
volatile unsigned int *pci_conf; volatile unsigned int *pci_conf;
if (offset & 3) return PCIBIOS_BAD_REGISTER_NUMBER; if (offset & 3) return PCIBIOS_BAD_REGISTER_NUMBER;
@@ -108,7 +115,8 @@ pci_read_config_dword(unsigned char bus, unsigned char slot, unsigned char funct
return PCIBIOS_SUCCESSFUL; return PCIBIOS_SUCCESSFUL;
} }
pci_conf = PCI_CONF + ((slot<<11) | (function<<8) | offset); pci_conf = (volatile unsigned int *) (PCI_CONF +
((slot<<11) | (function<<8) | offset));
#ifdef BT_ENABLED #ifdef BT_ENABLED
*val = flip_dword(*pci_conf); *val = flip_dword(*pci_conf);
@@ -160,7 +168,8 @@ pci_write_config_dword(unsigned char bus, unsigned char slot, unsigned char func
if (offset & 3 || bus != 0) return PCIBIOS_BAD_REGISTER_NUMBER; if (offset & 3 || bus != 0) return PCIBIOS_BAD_REGISTER_NUMBER;
pci_conf = PCI_CONF + ((slot<<11) | (function<<8) | (offset & ~3)); pci_conf = (volatile unsigned int *) (PCI_CONF +
((slot<<11) | (function<<8) | (offset & ~3)));
#ifdef BT_ENABLED #ifdef BT_ENABLED
value = flip_dword(val); value = flip_dword(val);