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

2005-05-10 Jennifer Averett <jennifer.averett@oarcorp.com>

Browse Source 
* network/GT64260eth.c: Fixed warning.
        *  pci/pci.c, pci/pci.h: Modified to depend upon rtems/pci.h
This commit is contained in:
Jennifer Averett
2005-05-10 18:24:35 +00:00
parent cc212899b2
commit 3bfb6ef9dc
4 changed files with 85 additions and 1088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,8 @@
2005-05-10 Jennifer Averett <jennifer.averett@oarcorp.com>
* network/GT64260eth.c: Fixed warning.
* pci/pci.c, pci/pci.h: Modified to depend upon rtems/pci.h
2005-05-04 Jennifer Averett <jennifer.averett@oarcorp.com>
* pci/pci.c, pci/pci.h, startup/bspstart.c: Name change to support

4
c/src/lib/libbsp/powerpc/mvme5500/network/GT64260eth.c
View File

@@ -126,7 +126,7 @@ enum GTeth_hash_op {
#define ET_MINLEN 64 /* minimum message length */
static int GTeth_ifioctl(struct ifnet *ifp, int cmd, caddr_t data);
static int GTeth_ifioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
static void GTeth_ifstart (struct ifnet *);
static void GTeth_ifchange(struct GTeth_softc *sc);
static void GTeth_init_rx_ring(struct GTeth_softc *sc);
@@ -541,7 +541,7 @@ void GT64260eth_err()
printf(" Missed Frame errors:%-8u\n", GTeth_MissedFrame_err);
}
static int GTeth_ifioctl(struct ifnet *ifp, int cmd, caddr_t data)
static int GTeth_ifioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
{
struct GTeth_softc *sc = ifp->if_softc;
struct ifreq *ifr = (struct ifreq *) data;

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

@@ -126,45 +126,47 @@ unchar func, unchar offset, unsigned int val)
return PCIBIOS_SUCCESSFUL;
}
/* backwards compatible with other PPC board for the vmeUniverse.c */
int pci_read_config_byte(unchar bus, unchar dev,unchar func,unchar offset,
/* backwards compatible with other PPC board for the vmeUniverse.c
* Note: We must override the default with these in pci.h
*/
int pci_bsp_read_config_byte(unchar bus, unchar dev,unchar func,unchar offset,
unchar *val)
{
return(PCIx_read_config_byte(0, bus, dev, func, offset, val));
}
int pci_read_config_word(unchar bus, unchar dev,
int pci_bsp_read_config_word(unchar bus, unchar dev,
unchar func, unchar offset, unsigned short *val)
{
return(PCIx_read_config_word(0, bus, dev, func, offset, val));
}
int pci_read_config_dword(unchar bus, unchar dev,
int pci_bsp_read_config_dword(unchar bus, unchar dev,
unchar func, unchar offset, unsigned int *val)
{
return(PCIx_read_config_dword(0, bus, dev, func, offset, val));
}
int pci_write_config_byte(unchar bus, unchar dev,
int pci_bsp_write_config_byte(unchar bus, unchar dev,
unchar func, unchar offset, unchar val)
{
return(PCIx_write_config_byte(0, bus, dev, func, offset, val));
}
int pci_write_config_word(unchar bus, unchar dev,
int pci_bsp_write_config_word(unchar bus, unchar dev,
unchar func, unchar offset, unsigned short val)
{
return(PCIx_write_config_word(0, bus, dev, func, offset, val));
}
int pci_write_config_dword(unchar bus,unchar dev,
int pci_bsp_write_config_dword(unchar bus,unchar dev,
unchar func, unchar offset, unsigned int val)
{
return(PCIx_write_config_dword(0, bus, dev, func, offset, val));
}
pci_config BSP_pci_config[2] = {
pci_bsp_config BSP_pci_config[2] = {
{PCI0_CONFIG_ADDR,PCI0_CONFIG_DATA/*,&pci_functions*/},
{PCI1_CONFIG_ADDR,PCI1_CONFIG_DATA/*,&pci_functions*/}
};
@@ -172,7 +174,7 @@ pci_config BSP_pci_config[2] = {
/*
* This routine determines the maximum bus number in the system
*/
void pci_initialize()
int pci_initialize()
{
int PciNumber;
unchar ucBusNumber, ucSlotNumber, ucFnNumber, ucNumFuncs;
@@ -368,6 +370,8 @@ void pci_initialize()
}
}
} /* PCI number */
return PCIB_ERR_SUCCESS;
}
/*

1142
c/src/lib/libbsp/powerpc/mvme5500/pci/pci.h
View File

File diff suppressed because it is too large Load Diff