diff options
author | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2010-03-27 15:00:43 +0000 |
---|---|---|
committer | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2010-03-27 15:00:43 +0000 |
commit | 4f5d1c9fd160fc19c0ccd47c7730f0f6141043a9 (patch) | |
tree | 419aaf4738e8832bff977e2fed95567a317d2b77 /c/src/lib/libbsp/powerpc/mpc55xxevb | |
parent | 2010-03-27 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-4f5d1c9fd160fc19c0ccd47c7730f0f6141043a9.tar.bz2 |
removed warnings
Diffstat (limited to 'c/src/lib/libbsp/powerpc/mpc55xxevb')
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc55xxevb/network/smsc9218i.c | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc55xxevb/tests/tests.c | 11 |
3 files changed, 21 insertions, 3 deletions
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 <Thomas.Doerfler@embedded-brains.de> + + * network/smsc9218i.c tests/tests.c: Removed warnings + 2010-03-25 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> * 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 <bsp.h> #include <bsp/irq.h> #include <bsp/utility.h> +#include <libcpu/powerpc-utility.h> #include <bsp/smsc9218i.h> #include <rtems/status-checks.h> @@ -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 <stdio.h> #include <rtems/irq.h> - #include <mpc55xx/regs.h> #include <mpc55xx/mpc55xx.h> #include <mpc55xx/dspi.h> #include <mpc55xx/edma.h> +#include <bsp/irq-generic.h> + #include <libchip/spi-sd-card.h> #include <bsp.h> @@ -38,6 +39,8 @@ #include <rtems/status-checks.h> +#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( |