diff options
Diffstat (limited to '')
6 files changed, 34 insertions, 12 deletions
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog index 02e78501fd..67dad3ca42 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog @@ -1,3 +1,10 @@ +2009-10-23 Ralf Corsépius <ralf.corsepius@rtems.org> + + * irq/BSP_irq.c, network/if_100MHz/GT64260eth.c, + network/if_1GHz/if_wm.c, network/if_1GHz/pci_map.c, + startup/bspstart.c: Add missing prototypes. + Adjust bogus types. Remove unused vars. + 2009-10-21 Ralf Corsépius <ralf.corsepius@rtems.org> * make/custom/mvme5500.cfg: Remove RTEMS_BSP_FAMILY. diff --git a/c/src/lib/libbsp/powerpc/mvme5500/irq/BSP_irq.c b/c/src/lib/libbsp/powerpc/mvme5500/irq/BSP_irq.c index 25d2a92e3d..854c152ea5 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/irq/BSP_irq.c +++ b/c/src/lib/libbsp/powerpc/mvme5500/irq/BSP_irq.c @@ -442,7 +442,7 @@ int C_dispatch_irq_handler (BSP_Exception_frame *frame, unsigned int excNum) { unsigned long irqCause[3]={0, 0,0}; unsigned oldMask[3]={0,0,0}; - int loop=0, wloop=0, i=0, j; + int loop=0, i=0, j; int irq=0, group=0; if (excNum == ASM_DEC_VECTOR) { @@ -479,7 +479,7 @@ int C_dispatch_irq_handler (BSP_Exception_frame *frame, unsigned int excNum) } /* Only print part of the entries for now */ -void BSP_printPicIsrTbl() +void BSP_printPicIsrTbl(void) { int i; diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c b/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c index feec946c92..8288641bd7 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c +++ b/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c @@ -61,6 +61,8 @@ #include <bsp/GT64260eth.h> #include <bsp/VPD.h> +extern unsigned char ReadConfVPD_buff(int offset); /* in startup/bspstart.c */ + #define GT_ETH_TASK_NAME "Geth" #define PKT_BUF_SZ 1536 #define SOFTC_ALIGN 31 @@ -104,7 +106,7 @@ enum GTeth_hash_op { #define ET_MINLEN 64 /* minimum message length */ -static int GTeth_ifioctl(struct ifnet *ifp, u_long cmd, caddr_t data); +static int GTeth_ifioctl(struct ifnet *ifp, ioctl_command_t 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); @@ -502,9 +504,9 @@ int rtems_GT64260eth_driver_attach(struct rtems_bsdnet_ifconfig *config, int att static void GT64260eth_stats(struct GTeth_softc *sc) { +#if 0 struct ifnet *ifp = &sc->arpcom.ac_if; -#if 0 printf(" Rx Interrupts:%-8lu\n", sc->stats.rxInterrupts); printf(" Receive Packets:%-8lu\n", ifp->if_ipackets); printf(" Receive errors:%-8lu\n", ifp->if_ierrors); @@ -532,7 +534,7 @@ void GT64260eth_printStats(void) GT64260eth_stats(root_GT64260eth_dev); } -static int GTeth_ifioctl(struct ifnet *ifp, u_long cmd, caddr_t data) +static int GTeth_ifioctl(struct ifnet *ifp, ioctl_command_t cmd, caddr_t data) { struct GTeth_softc *sc = ifp->if_softc; struct ifreq *ifr = (struct ifreq *) data; @@ -855,6 +857,7 @@ static void GTeth_txq_free(struct GTeth_softc *sc, unsigned cmdsts) --sc->txq_nactive; } +#if UNUSED static int txq_high_limit(struct GTeth_softc *sc) { /* @@ -894,6 +897,9 @@ static int txq_high_limit(struct GTeth_softc *sc) } /* end if ( TX_RING_SIZE == sc->txq_nactive + TXQ_HiLmt_OFF) */ return 0; } +#endif + +#define MAX(a,b) (((a) > (b)) ? (a) : (b)) static int GT64260eth_sendpacket(struct GTeth_softc *sc,struct mbuf *m) { diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c b/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c index 7288fe8c92..761beb0a10 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c +++ b/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c @@ -77,6 +77,9 @@ #include <bsp/pci.h> #include <bsp/pcireg.h> #include <bsp/if_wmreg.h> + +extern int pci_mem_find(int b, int d, int f, int reg, unsigned *basep,unsigned *sizep); + #define WMREG_RADV 0x282c /* Receive Interrupt Absolute Delay Timer */ #define ETHERTYPE_FLOWCONTROL 0x8808 /* 802.3x flow control packet */ @@ -236,7 +239,6 @@ static void wm_set_filter(struct wm_softc *sc); static void i82544EI_rx(struct wm_softc *sc); static void i82544EI_isr(rtems_irq_hdl_param handle); static void i82544EI_sendpacket(struct wm_softc *sc, struct mbuf *m); -extern int pci_mem_find(), pci_io_find(), pci_get_capability(); static void i82544EI_irq_on(const rtems_irq_connect_data *irq) { @@ -1142,11 +1144,11 @@ static int i82544EI_init_hw(struct wm_softc *sc) return(0); } -void BSP_rdTIDV() +void BSP_rdTIDV(void) { printf("Reg TIDV: 0x%x\n", in_le32((volatile unsigned *) (BSP_1GHz_membase+WMREG_TIDV))); } -void BSP_rdRDTR() +void BSP_rdRDTR(void) { printf("Reg RDTR: 0x%x\n", in_le32((volatile unsigned *) (BSP_1GHz_membase+WMREG_RDTR))); } @@ -1600,7 +1602,7 @@ static void i82544EI_error(struct wm_softc *sc) if ((++sc->if_err_ptr1)==IF_ERR_BUFSZE) sc->if_err_ptr1=0; /* Till Straumann */ } -void i82544EI_printStats() +void i82544EI_printStats(void) { i82544EI_stats(root_i82544EI_dev); } diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/pci_map.c b/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/pci_map.c index c238e637d0..7594fe9841 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/pci_map.c +++ b/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/pci_map.c @@ -24,6 +24,10 @@ #include <bsp/pci.h> #include <bsp/pcireg.h> +extern int pci_get_capability(int b, int d, int f, int capid,int *offset,uint32_t *value); +extern int pci_mem_find(int b, int d, int f, int reg, unsigned *basep,unsigned *sizep); +extern int pci_io_find(int b, int d, int f, int reg,unsigned *basep,unsigned *sizep); + int pci_io_find(int b, int d, int f, int reg,unsigned *basep,unsigned *sizep) { uint32_t address, mask; diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c index 6dfe5a4121..fe87da88b6 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c @@ -55,6 +55,9 @@ /* there is no public Workspace_Free() variant :-( */ #include <rtems/score/wkspace.h> +extern uint32_t probeMemoryEnd(void); /* from shared/startup/probeMemoryEnd.c */ + + BSP_output_char_function_type BSP_output_char = BSP_output_char_via_serial; extern void _return_to_ppcbug(void); @@ -65,6 +68,8 @@ extern void BSP_pgtbl_activate(Triv121PgTbl); extern int I2Cread_eeprom(unsigned char I2cBusAddr, uint32_t devA2A1A0, uint32_t AddrBytes, unsigned char *pBuff, uint32_t numBytes); extern void BSP_vme_config(void); +extern unsigned char ReadConfVPD_buff(int offset); + extern unsigned long __bss_start[], __SBSS_START__[], __SBSS_END__[]; extern unsigned long __SBSS2_START__[], __SBSS2_END__[]; @@ -128,7 +133,7 @@ void _BSP_Fatal_error(unsigned int v) __asm__ __volatile ("sc"); } -void zero_bss() +void zero_bss(void) { memset( __SBSS_START__, @@ -214,8 +219,6 @@ void bsp_start( void ) #ifdef CONF_VPD int i; #endif - unsigned char *stack; - unsigned long *r1sp; #ifdef SHOW_LCR1_REGISTER unsigned l1cr; #endif |