From 4f5d1c9fd160fc19c0ccd47c7730f0f6141043a9 Mon Sep 17 00:00:00 2001 From: Thomas Doerfler Date: Sat, 27 Mar 2010 15:00:43 +0000 Subject: removed warnings --- c/src/lib/libbsp/powerpc/beatnik/ChangeLog | 4 ++++ c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.c | 2 +- c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe.c | 8 ++++---- c/src/lib/libbsp/powerpc/ep1a/ChangeLog | 4 ++++ c/src/lib/libbsp/powerpc/ep1a/start/start.S | 5 ----- c/src/lib/libbsp/powerpc/gen5200/ChangeLog | 6 ++++++ .../powerpc/gen5200/bestcomm/task_api/tasksetup_general.h | 4 +++- c/src/lib/libbsp/powerpc/gen5200/include/mscan-base.h | 4 ++-- c/src/lib/libbsp/powerpc/gen5200/irq/irq.c | 4 +++- c/src/lib/libbsp/powerpc/gen5200/mscan/mscan-base.c | 8 ++++---- c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog | 4 ++++ c/src/lib/libbsp/powerpc/mpc55xxevb/network/smsc9218i.c | 9 +++++++++ c/src/lib/libbsp/powerpc/mpc55xxevb/tests/tests.c | 11 ++++++++--- 13 files changed, 52 insertions(+), 21 deletions(-) diff --git a/c/src/lib/libbsp/powerpc/beatnik/ChangeLog b/c/src/lib/libbsp/powerpc/beatnik/ChangeLog index e8dd64c9ea..b426cec6de 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/ChangeLog +++ b/c/src/lib/libbsp/powerpc/beatnik/ChangeLog @@ -1,3 +1,7 @@ +2010-03-27 Thomas Doerfler + + * network/if_gfe/if_gme.c, network/if_em/if_em.c: Removed warnings + 2010-02-09 Till Straumann * network/if_mve/mv643xx_eth.c: Fixed alignment attribute diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.c b/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.c index 749a4877a4..dc3bc93844 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.c +++ b/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.c @@ -2571,7 +2571,7 @@ em_initialize_transmit_unit(struct adapter * adapter) E1000_WRITE_REG(&adapter->hw, TDT, 0); - HW_DEBUGOUT2("Base = %x, Length = %x\n", + HW_DEBUGOUT2("Base = %" PRIx32 ", Length = %" PRIx32 "\n", E1000_READ_REG(&adapter->hw, TDBAL), E1000_READ_REG(&adapter->hw, TDLEN)); diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe.c b/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe.c index 47ceb98182..b707fb8410 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe.c +++ b/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe.c @@ -811,7 +811,7 @@ gfe_ifwatchdog(struct ifnet *ifp) uint32_t curtxdnum = (bus_space_read_4(sc->sc_gt_memt, sc->sc_gt_memh, txq->txq_ectdp) - txq->txq_desc_busaddr) / sizeof(txq->txq_descs[0]); GE_TXDPOSTSYNC(sc, txq, txq->txq_fi); GE_TXDPOSTSYNC(sc, txq, curtxdnum); - printf(" (fi=%d(%#x),lo=%d,cur=%" PRId32 "(%#x),icm=%#x) ", + printf(" (fi=%d(%#" PRIx32 "),lo=%d,cur=%" PRIx32 "(%#" PRIx32 "),icm=%#" PRIx32 ") ", txq->txq_fi, txq->txq_descs[txq->txq_fi].ed_cmdsts, txq->txq_lo, curtxdnum, txq->txq_descs[curtxdnum].ed_cmdsts, GE_READ(sc, EICR)); @@ -1758,7 +1758,7 @@ gfe_tx_enqueue(struct gfe_softc *sc, enum gfe_txprio txprio) */ d = NEXT_TXD(l); - out_be32(&d->ed_cmdsts,0); + out_be32((unsigned int*)&d->ed_cmdsts,0); GE_TXDPRESYNC(sc, txq, d - txq->txq_descs); @@ -2270,12 +2270,12 @@ gfe_whack(struct gfe_softc *sc, enum gfe_whack_op op) #endif /* FALLTHROUGH */ case GE_WHACK_CHANGE: - GE_DPRINTF(sc, ("(pcr=%#x,imr=%#x)", + GE_DPRINTF(sc, ("(pcr=%#" PRIx32 ",imr=%#" PRIx32 ")", GE_READ(sc, EPCR), GE_READ(sc, EIMR))); GE_WRITE(sc, EPCR, sc->sc_pcr | ETH_EPCR_EN); GE_WRITE(sc, EIMR, sc->sc_intrmask); gfe_ifstart(&sc->sc_ec.ec_if); - GE_DPRINTF(sc, ("(ectdp0=%#x, ectdp1=%#x)", + GE_DPRINTF(sc, ("(ectdp0=%#" PRIx32 ", ectdp1=%#" PRIx32 ")", GE_READ(sc, ECTDP0), GE_READ(sc, ECTDP1))); GE_FUNC_EXIT(sc, ""); return error; diff --git a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog index 356012bd6a..4a5d5f082d 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog @@ -1,3 +1,7 @@ +2009-12-16 Thomas Doerfler + + * start/start.S: removed obsolete bootcard calling warning + 2009-12-16 Thomas Doerfler * console/mc68360_scc.c: adapted to new prototype for *_write diff --git a/c/src/lib/libbsp/powerpc/ep1a/start/start.S b/c/src/lib/libbsp/powerpc/ep1a/start/start.S index 974739affa..b35fb7093a 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/start/start.S +++ b/c/src/lib/libbsp/powerpc/ep1a/start/start.S @@ -36,11 +36,6 @@ #include */ -#warning Call to boot_card has changed and needs checking. -#warning The call is "void boot_card(const char* cmdline);" -#warning You need to pass a NULL. -#warning Please check and remove these warnings. - #include #include #include diff --git a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog index 95a6cf4d41..5b03bcfc64 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog @@ -1,3 +1,9 @@ +2010-03-27 Thomas Doerfler + + * bestcomm/task_api/tasksetup_general.h, + gen5200/include/mscan-base.h, gen5200/mscan/mscan-base.c, + gen5200/irq/irq.c: Removed warnings + 2010-03-25 Thomas Doerfler * configure.ac, include/bsp.h, console/console.c, start/start.S: diff --git a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_general.h b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_general.h index 9db076cfa3..be7bb9d7b0 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_general.h +++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/task_api/tasksetup_general.h @@ -255,8 +255,10 @@ TaskId TASKSETUP_NAME(TASK_API *TaskAPI, TaskSetupParamSet_t *TaskSetupParams) { TaskId TaskNum; +#if ((MAX_BD>0)||(DEBUG_BESTCOMM_API>0)) uint32 Status = 0; -#if ((INCR_TYPE_SRC!=0)||(INCR_TYPE_DST!=0)||(DEBUG_BESTCOMM_API>0)) +#endif +#if ((MAX_BD>0)&&((INCR_TYPE_SRC!=0)||(INCR_TYPE_DST!=0))||(DEBUG_BESTCOMM_API>0)) uint8 NumPtr = 0; #endif #if (INITIATOR_DATA<0) /* runtime configurable */ diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/mscan-base.h b/c/src/lib/libbsp/powerpc/gen5200/include/mscan-base.h index e9daefe467..9fd87a507c 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/include/mscan-base.h +++ b/c/src/lib/libbsp/powerpc/gen5200/include/mscan-base.h @@ -264,9 +264,9 @@ void mscan_sleep_mode_enter( mscan *m); void mscan_sleep_mode_leave( mscan *m); -uint8_t *mscan_id_acceptance_register( mscan *m, unsigned i); +volatile uint8_t *mscan_id_acceptance_register( mscan *m, unsigned i); -uint8_t *mscan_id_mask_register( mscan *m, unsigned i); +volatile uint8_t *mscan_id_mask_register( mscan *m, unsigned i); unsigned mscan_filter_number( mscan *m); diff --git a/c/src/lib/libbsp/powerpc/gen5200/irq/irq.c b/c/src/lib/libbsp/powerpc/gen5200/irq/irq.c index 181ebc42f2..f0a15d0ae8 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/irq/irq.c +++ b/c/src/lib/libbsp/powerpc/gen5200/irq/irq.c @@ -483,14 +483,16 @@ void BSP_IRQ_Benchmarking_Report( void) /* * High level IRQ handler called from shared_raw_irq_code_entry */ -int C_dispatch_irq_handler( CPU_Interrupt_frame * frame, unsigned int excNum) +int C_dispatch_irq_handler(BSP_Exception_frame *frame, unsigned excNum) { register unsigned int irq; register unsigned int pmce; register unsigned int crit_pri_main_mask, per_mask; +#if (ALLOW_IRQ_NESTING == 1) uint32_t msr; +#endif #if (BENCHMARK_IRQ_PROCESSING == 1) uint64_t start, diff --git a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan-base.c b/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan-base.c index fd15c681ad..e768529004 100644 --- a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan-base.c +++ b/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan-base.c @@ -442,9 +442,9 @@ bool mscan_set_filter_number( mscan *m, unsigned number) * * @warning The index @a i is not checked if it is in range. */ -uint8_t *mscan_id_acceptance_register( mscan *m, unsigned i) +volatile uint8_t *mscan_id_acceptance_register( mscan *m, unsigned i) { - uint8_t *idar [8] = { + volatile uint8_t *const idar [8] = { &m->idar0, &m->idar1, &m->idar2, @@ -464,9 +464,9 @@ uint8_t *mscan_id_acceptance_register( mscan *m, unsigned i) * * @warning The index @a i is not checked if it is in range. */ -uint8_t *mscan_id_mask_register( mscan *m, unsigned i) +volatile uint8_t *mscan_id_mask_register( mscan *m, unsigned i) { - uint8_t *idmr [8] = { + volatile uint8_t *const idmr [8] = { &m->idmr0, &m->idmr1, &m->idmr2, diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog b/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog index 0a842a61a5..567d851e41 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog @@ -1,3 +1,7 @@ +2010-03-27 Thomas Doerfler + + * network/smsc9218i.c tests/tests.c: Removed warnings + 2010-03-25 Thomas Doerfler * Makefile.am, confiugre.ac, include/bsp.h, startup/bspstart.c, diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/network/smsc9218i.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/network/smsc9218i.c index a1c7d0902d..8d53927134 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/network/smsc9218i.c +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/network/smsc9218i.c @@ -48,6 +48,7 @@ #include #include #include +#include #include #include @@ -293,6 +294,7 @@ static void smsc9218i_enable_promiscous_mode( smsc9218i_mac_write(regs, SMSC9218I_MAC_CR, mac_cr); } +#if defined(DEBUG) static void smsc9218i_register_dump(volatile smsc9218i_registers *regs) { uint32_t reg = 0; @@ -402,6 +404,7 @@ static void smsc9218i_register_dump(volatile smsc9218i_registers *regs) printf("phy: imr: 0x%08" PRIx32 "\n", smsc9218i_phy_read(regs, SMSC9218I_PHY_IMR)); printf("phy: physcsr: 0x%08" PRIx32 "\n", smsc9218i_phy_read(regs, SMSC9218I_PHY_PHYSCSR)); } +#endif static void smsc9218i_interrupt_handler(void *arg) { @@ -725,6 +728,7 @@ cleanup: (void) rtems_task_delete(RTEMS_SELF); } +#if defined(DEBUG) static void smsc9218i_transmit_job_dump( smsc9218i_transmit_job_control *jc, const char *msg @@ -783,6 +787,7 @@ static void smsc9218i_transmit_job_dump( out ); } +#endif /* defined(DEBUG) */ static struct mbuf *smsc9218i_next_transmit_fragment( struct ifnet *ifp, @@ -1250,6 +1255,7 @@ cleanup: (void) rtems_task_delete(RTEMS_SELF); } +#if defined(DEBUG) static void smsc9218i_test_macros(void) { unsigned i = 0; @@ -1288,6 +1294,7 @@ static void smsc9218i_test_macros(void) printf("[%i] get field 16: %u\n", r, i); } } +#endif static void smsc9218i_set_mac_address( volatile smsc9218i_registers *regs, @@ -1449,8 +1456,10 @@ static void smsc9218i_interface_init(void *arg) rtems_bsp_delay(200); smsc9218i_reset_signal(true); +#if defined(DEBUG) /* Register dump */ smsc9218i_register_dump(regs); +#endif /* Set hardware configuration */ regs->hw_cfg = SMSC9218I_HW_CFG_MBO | SMSC9218I_HW_CFG_TX_FIF_SZ(5); diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/tests/tests.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/tests/tests.c index a61ae53b81..4f27426d36 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/tests/tests.c +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/tests/tests.c @@ -21,12 +21,13 @@ #include #include - #include #include #include #include +#include + #include #include @@ -38,6 +39,8 @@ #include +#undef USE_DSPI_READER_WRITER + static rtems_driver_address_table test_mpc55xx_drv_ops = { initialization_entry : NULL, open_entry : NULL, @@ -74,6 +77,7 @@ static unsigned char test_mpc55xx_dspi_writer_inbuf [MPC55XX_TEST_DSPI_BUFSIZE_C static unsigned char test_mpc55xx_dspi_reader_inbuf [MPC55XX_TEST_DSPI_BUFSIZE_CACHE_PROOF] __attribute__ ((aligned (32))); +#if defined(USE_DSPI_READER_WRITER) static rtems_task test_mpc55xx_dspi_writer( rtems_task_argument arg) { rtems_status_code sc = RTEMS_SUCCESSFUL; @@ -200,6 +204,7 @@ static rtems_task test_mpc55xx_dspi_reader( rtems_task_argument arg) sc = rtems_task_delete( RTEMS_SELF); RTEMS_CHECK_SC_TASK( sc, "rtems_task_delete"); } +#endif /* defined(USE_DSPI_READER_WRITER) */ rtems_task test_sd_card( rtems_task_argument arg); @@ -284,7 +289,7 @@ rtems_status_code mpc55xx_dspi_register(void) ); RTEMS_CHECK_SC( sc, "rtems_semaphore_create"); - #if 0 +#if defined(USE_DSPI_READER_WRITER) rtems_id writer_task_id; rtems_id reader_task_id; @@ -311,7 +316,7 @@ rtems_status_code mpc55xx_dspi_register(void) RTEMS_CHECK_SC( sc, "rtems_task_start"); sc = rtems_task_start( reader_task_id, test_mpc55xx_dspi_reader, 0); RTEMS_CHECK_SC( sc, "rtems_task_start"); - #endif +#endif rtems_id sd_card_task_id; sc = rtems_task_create( -- cgit v1.2.3