diff options
| author | Marti Bolivar <mbolivar@mit.edu> | 2010-12-28 19:06:27 -0500 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@mit.edu> | 2010-12-28 19:06:27 -0500 |
| commit | d1a8d832af96efdd1b399799dfae81517dc04dfa (patch) | |
| tree | 3ce037909f3fdec9167557544c19a8c94726838b /libmaple/util.h | |
| parent | d38ffc1c658476a5c28e3d70ac9abd300f914433 (diff) | |
| download | librambutan-d1a8d832af96efdd1b399799dfae81517dc04dfa.tar.gz librambutan-d1a8d832af96efdd1b399799dfae81517dc04dfa.zip | |
nzmichaelh's pull request mods compile and upload.
renamed SysTick_Handler back to SysTickHandler since all of our linker magic/lanchon-stm32 depends on that name. added backup register support in order to test independent watchdog support; it seems to work. next major test target is DMA support.
Diffstat (limited to 'libmaple/util.h')
| -rw-r--r-- | libmaple/util.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmaple/util.h b/libmaple/util.h index 2bbd90c..b6074d8 100644 --- a/libmaple/util.h +++ b/libmaple/util.h @@ -52,14 +52,14 @@ #define REG_SET_MASK(reg, mask) (*(volatile uint32*)(reg) |= (uint32)(mask)) #define REG_CLEAR_MASK(reg, mask) (*(volatile uint32*)(reg) &= (uint32)~(mask)) -#define REG_GET(reg) *(volatile uint32*)(reg) +#define REG_GET(reg) (*(volatile uint32*)(reg)) -#define __set_bits(addr, mask) *(volatile uint32*)(addr) |= (uint32)(mask) +#define __set_bits(addr, mask) (*(volatile uint32*)(addr) |= (uint32)(mask)) #define __clear_bits(addr, mask) (*(volatile uint32*)(addr) &= (uint32)~(mask)) #define __get_bits(addr, mask) (*(volatile uint32*)(addr) & (uint32)(mask)) -#define __read(reg) *(volatile uint32*)(reg) -#define __write(reg, value) *(volatile uint32*)(reg) = (value) +#define __read(reg) (*(volatile uint32*)(reg)) +#define __write(reg, value) (*(volatile uint32*)(reg) = (value)) #define IS_POWER_OF_TWO(v) (v && !(v & (v - 1))) |