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

2007-01-29 Ralf Corsépius <ralf.corsepius@rtems.org>

Browse Source 
* GT64260/MVME5500I2C.c, pci/pci.c: Eliminate unchar.
This commit is contained in:
Ralf Corsepius
2007-01-29 05:25:50 +00:00
parent 40d5b64b62
commit ea6c5d8197
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
View File

@@ -1,3 +1,7 @@
2007-01-29 Ralf Corsépius <ralf.corsepius@rtems.org>
* GT64260/MVME5500I2C.c, pci/pci.c: Eliminate unchar.
2007-01-19 Till Straumann <strauman@slac.stanford.edu> 2007-01-19 Till Straumann <strauman@slac.stanford.edu>
* mvme5500/Makefile.am, mvme5500/preinstall.am, * mvme5500/Makefile.am, mvme5500/preinstall.am,

7
c/src/lib/libbsp/powerpc/mvme5500/GT64260/MVME5500I2C.c
View File

@@ -16,20 +16,19 @@
/* #define I2C_DEBUG*/ /* #define I2C_DEBUG*/
typedef unsigned int u32; typedef unsigned int u32;
typedef unsigned char unchar;
unchar I2cAddrPack(unchar busAddr,u32 offset) unsigned char I2cAddrPack(unsigned char busAddr,u32 offset)
{ {
return(busAddr | ((offset & 0x700) >> 7)); return(busAddr | ((offset & 0x700) >> 7));
} }
unchar I2cDevByteAddr(u32 devA2A1A0, unchar byteNum) unsigned char I2cDevByteAddr(u32 devA2A1A0, unsigned char byteNum)
{ {
return(( devA2A1A0 >>(byteNum*8)) & 0xff); return(( devA2A1A0 >>(byteNum*8)) & 0xff);
} }
/**************************************************************************** /****************************************************************************
* I2Cread_eeprom - read EEPROM VPD from the I2C * I2Cread_eeprom - read EEPROM VPD from the I2C
*/ */
int I2Cread_eeprom(unchar I2cBusAddr,u32 devA2A1A0,u32 AddrBytes,unchar *pBuff,u32 numBytes) int I2Cread_eeprom(unsigned char I2cBusAddr,u32 devA2A1A0,u32 AddrBytes,unsigned char *pBuff,u32 numBytes)
{ {
int status=0, lastByte=0; int status=0, lastByte=0;

23
c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c
View File

@@ -59,7 +59,6 @@
/* define a shortcut */ /* define a shortcut */
#define pci BSP_pci_configuration #define pci BSP_pci_configuration
typedef unsigned char unchar;
static int numPCIDevs=0; static int numPCIDevs=0;
extern void pci_interface(); extern void pci_interface();
@@ -72,12 +71,12 @@ extern void pci_interface();
/* /*
* Bit encode for PCI_CONFIG_HEADER_TYPE register * Bit encode for PCI_CONFIG_HEADER_TYPE register
*/ */
unchar ucMaxPCIBus=0; unsigned char ucMaxPCIBus=0;
/* Please note that PCI0 and PCI1 does not correlate with the busNum 0 and 1. /* Please note that PCI0 and PCI1 does not correlate with the busNum 0 and 1.
*/ */
static int direct_pci_read_config_byte(unchar bus,unchar dev,unchar func, static int direct_pci_read_config_byte(unsigned char bus,unsigned char dev,unsigned char func,
unchar offset,unchar *val) unsigned char offset,unsigned char *val)
{ {
volatile unsigned char *config_addr, *config_data; volatile unsigned char *config_addr, *config_data;
@@ -101,8 +100,8 @@ unchar offset,unchar *val)
return PCIBIOS_SUCCESSFUL; return PCIBIOS_SUCCESSFUL;
} }
static int direct_pci_read_config_word(unchar bus, unchar dev, static int direct_pci_read_config_word(unsigned char bus, unsigned char dev,
unchar func, unchar offset, unsigned short *val) unsigned char func, unsigned char offset, unsigned short *val)
{ {
volatile unsigned char *config_addr, *config_data; volatile unsigned char *config_addr, *config_data;
@@ -127,8 +126,8 @@ unchar func, unchar offset, unsigned short *val)
return PCIBIOS_SUCCESSFUL; return PCIBIOS_SUCCESSFUL;
} }
static int direct_pci_read_config_dword(unchar bus, unchar dev, static int direct_pci_read_config_dword(unsigned char bus, unsigned char dev,
unchar func, unchar offset, unsigned int *val) unsigned char func, unsigned char offset, unsigned int *val)
{ {
volatile unsigned char *config_addr, *config_data; volatile unsigned char *config_addr, *config_data;
@@ -153,7 +152,7 @@ unchar func, unchar offset, unsigned int *val)
return PCIBIOS_SUCCESSFUL; return PCIBIOS_SUCCESSFUL;
} }
static int direct_pci_write_config_byte(unchar bus, unchar dev,unchar func, unchar offset, unchar val) static int direct_pci_write_config_byte(unsigned char bus, unsigned char dev,unsigned char func, unsigned char offset, unsigned char val)
{ {
volatile unsigned char *config_addr, *config_data; volatile unsigned char *config_addr, *config_data;
@@ -178,7 +177,7 @@ static int direct_pci_write_config_byte(unchar bus, unchar dev,unchar func, unch
return PCIBIOS_SUCCESSFUL; return PCIBIOS_SUCCESSFUL;
} }
static int direct_pci_write_config_word(unchar bus, unchar dev,unchar func, unchar offset, unsigned short val) static int direct_pci_write_config_word(unsigned char bus, unsigned char dev,unsigned char func, unsigned char offset, unsigned short val)
{ {
volatile unsigned char *config_addr, *config_data; volatile unsigned char *config_addr, *config_data;
@@ -202,7 +201,7 @@ static int direct_pci_write_config_word(unchar bus, unchar dev,unchar func, unch
return PCIBIOS_SUCCESSFUL; return PCIBIOS_SUCCESSFUL;
} }
static int direct_pci_write_config_dword(unchar bus,unchar dev,unchar func, unchar offset, unsigned int val) static int direct_pci_write_config_dword(unsigned char bus,unsigned char dev,unsigned char func, unsigned char offset, unsigned int val)
{ {
volatile unsigned char *config_addr, *config_data; volatile unsigned char *config_addr, *config_data;
@@ -249,7 +248,7 @@ pci_config BSP_pci_configuration = {(volatile unsigned char*) PCI_CONFIG_ADDR,
int pci_initialize() int pci_initialize()
{ {
int deviceFound; int deviceFound;
unchar ucBusNumber, ucSlotNumber, ucFnNumber, ucNumFuncs; unsigned char ucBusNumber, ucSlotNumber, ucFnNumber, ucNumFuncs;
unsigned int ulHeader; unsigned int ulHeader;
unsigned int pcidata, ulClass, ulDeviceID; unsigned int pcidata, ulClass, ulDeviceID;