2010-05-20 Sebastian Huber <sebastian.huber@embedded-brains.de>

	* include/lpc24xx.h, misc/dma-copy.c, misc/dma.c,
	misc/system-clocks.c, ssp/ssp.c, startup/bspstarthooks.c: Removed
	superfluous macros.

3 files changed, 8 insertions, 8 deletions

diff --git a/c/src/lib/libbsp/arm/lpc24xx/misc/dma-copy.c b/c/src/lib/libbsp/arm/lpc24xx/misc/dma-copy.c
index f5bd2e2baf..82fb7f5fb9 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/misc/dma-copy.c
+++ b/c/src/lib/libbsp/arm/lpc24xx/misc/dma-copy.c
@@ -38,16 +38,16 @@ static void lpc24xx_dma_copy_handler(void *arg)
   GPDMA_INT_ERR_CLR = err;
 
   /* Check channel 0 */
-  if (IS_FLAG_SET(tc, GPDMA_STATUS_CH_0)) {
+  if ((tc & GPDMA_STATUS_CH_0) != 0) {
     rtems_semaphore_release(lpc24xx_dma_sema_table [0]);
   }
-  lpc24xx_dma_status_table [0] = IS_FLAG_CLEARED(err, GPDMA_STATUS_CH_0);
+  lpc24xx_dma_status_table [0] = (err & GPDMA_STATUS_CH_0) == 0;
 
   /* Check channel 1 */
-  if (IS_FLAG_SET(tc, GPDMA_STATUS_CH_1)) {
+  if ((tc & GPDMA_STATUS_CH_1) != 0) {
     rtems_semaphore_release(lpc24xx_dma_sema_table [1]);
   }
-  lpc24xx_dma_status_table [1] = IS_FLAG_CLEARED(err, GPDMA_STATUS_CH_1);
+  lpc24xx_dma_status_table [1] = (err & GPDMA_STATUS_CH_1) == 0;
 }
 
 rtems_status_code lpc24xx_dma_copy_initialize(void)
diff --git a/c/src/lib/libbsp/arm/lpc24xx/misc/dma.c b/c/src/lib/libbsp/arm/lpc24xx/misc/dma.c
index 32df2a7fa8..5b0a50dcf3 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/misc/dma.c
+++ b/c/src/lib/libbsp/arm/lpc24xx/misc/dma.c
@@ -85,15 +85,15 @@ void lpc24xx_dma_channel_disable(unsigned channel, bool force)
 
     if (!force) {
       /* Halt */
-      ch->cfg = SET_FLAG(cfg, GPDMA_CH_CFG_HALT);
+      ch->cfg |= GPDMA_CH_CFG_HALT;
 
       /* Wait for inactive */
       do {
         cfg = ch->cfg;
-      } while (IS_FLAG_SET(cfg, GPDMA_CH_CFG_ACTIVE));
+      } while ((cfg & GPDMA_CH_CFG_ACTIVE) != 0);
     }
 
     /* Disable */
-    ch->cfg = CLEAR_FLAG(cfg, GPDMA_CH_CFG_EN);
+    ch->cfg &= ~GPDMA_CH_CFG_EN;
   }
 }
diff --git a/c/src/lib/libbsp/arm/lpc24xx/misc/system-clocks.c b/c/src/lib/libbsp/arm/lpc24xx/misc/system-clocks.c
index 110e9aef15..e5d9fc5585 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/misc/system-clocks.c
+++ b/c/src/lib/libbsp/arm/lpc24xx/misc/system-clocks.c
@@ -93,7 +93,7 @@ unsigned lpc24xx_pllclk(void)
   }
 
   /* Get PLL output frequency */
-  if (IS_FLAG_SET(PLLSTAT, PLLSTAT_PLLC)) {
+  if ((PLLSTAT & PLLSTAT_PLLC) != 0) {
     uint32_t pllcfg = PLLCFG;
     unsigned n = GET_PLLCFG_NSEL(pllcfg) + 1;
     unsigned m = GET_PLLCFG_MSEL(pllcfg) + 1;