diff options
| author | hathach <[email protected]> | 2012-12-10 14:58:25 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2012-12-10 14:58:25 +0700 |
| commit | 3eb7465e5ee8ea6298fcf134f853174fd9560a4c (patch) | |
| tree | 5036198df7331ed5430ac1c2b664fd50ec49b1cf /demos | |
| parent | b52b3b1cef3e8415542922b41db436202af340bf (diff) | |
abstract usb enable/disable interrupt to hal layer
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/bsp/boards/board.h | 4 | ||||
| -rw-r--r-- | demos/bsp/boards/board_lpcxpresso1347.c | 4 | ||||
| -rw-r--r-- | demos/bsp/boards/board_ngx43xx.c | 8 | ||||
| -rw-r--r-- | demos/device/keyboard/_makefile.defs (renamed from demos/device/keyboard/makefile.defs) | 0 |
4 files changed, 10 insertions, 6 deletions
diff --git a/demos/bsp/boards/board.h b/demos/bsp/boards/board.h index 11e4a2bc1..74030f2f0 100644 --- a/demos/bsp/boards/board.h +++ b/demos/bsp/boards/board.h @@ -60,8 +60,8 @@ #define TICKS_PER_SECOND 1000 /// n-th Bit -#ifndef BIT -#define BIT(n) (1 << (n)) +#ifndef BIT_ +#define BIT_(n) (1 << (n)) #endif #define BOARD_NGX43XX 1 diff --git a/demos/bsp/boards/board_lpcxpresso1347.c b/demos/bsp/boards/board_lpcxpresso1347.c index 206f5b69c..c937bb29f 100644 --- a/demos/bsp/boards/board_lpcxpresso1347.c +++ b/demos/bsp/boards/board_lpcxpresso1347.c @@ -59,7 +59,9 @@ void board_init(void) void board_leds(uint32_t mask, uint32_t state) { if (mask) - GPIOSetBitValue(CFG_LED_PORT, CFG_LED_PIN, mask & state); + { + GPIOSetBitValue(CFG_LED_PORT, CFG_LED_PIN, mask & state ? CFG_LED_ON : CFG_LED_OFF); + } } #endif diff --git a/demos/bsp/boards/board_ngx43xx.c b/demos/bsp/boards/board_ngx43xx.c index 7cb93584d..0f14214c2 100644 --- a/demos/bsp/boards/board_ngx43xx.c +++ b/demos/bsp/boards/board_ngx43xx.c @@ -76,7 +76,7 @@ void board_init(void) for (i=0; i<BOARD_MAX_LEDS; i++) { scu_pinmux(leds[i].port, leds[i].pin, MD_PUP|MD_EZI|MD_ZI, FUNC0); - GPIO_SetDir(leds[i].port, BIT(leds[i].pin), 1); // output + GPIO_SetDir(leds[i].port, BIT_(leds[i].pin), 1); // output } } @@ -85,8 +85,10 @@ void board_leds(uint32_t mask, uint32_t state) uint8_t i; for(i=0; i<BOARD_MAX_LEDS; i++) { - if ( mask & BIT(i) ) - (mask & state) ? GPIO_SetValue(leds[i].port, BIT(leds[i].pin)) : GPIO_ClearValue(leds[i].port, BIT(leds[i].pin)) ; + if ( mask & BIT_(i) ) + { + (mask & state) ? GPIO_SetValue(leds[i].port, BIT_(leds[i].pin)) : GPIO_ClearValue(leds[i].port, BIT_(leds[i].pin)) ; + } } } diff --git a/demos/device/keyboard/makefile.defs b/demos/device/keyboard/_makefile.defs index bf691d5f0..bf691d5f0 100644 --- a/demos/device/keyboard/makefile.defs +++ b/demos/device/keyboard/_makefile.defs |