Merge pull request #233 from CE-Programming/fix-defines

Fix defines
CE-Programming · Jan 12, 2020 · 96e6c5a · 96e6c5a
2 parents 3e8207c + e913abb
commit 96e6c5a
Show file tree

Hide file tree

Showing 9 changed files with 140 additions and 140 deletions.
diff --git a/examples/standalone/second_counter/src/main.c b/examples/standalone/second_counter/src/main.c
@@ -1,9 +1,9 @@
 #include <tice.h>
 #include <stdio.h>
 
-#define ONE_SECOND         32768/1
-#define HALF_SECOND        32768/2
-#define QUARTER_SECOND     32768/4
+#define ONE_SECOND      (32768/1)
+#define HALF_SECOND     (32768/2)
+#define QUARTER_SECOND  (32768/4)
 
 int main(void)
 {

diff --git a/examples/standalone/second_counter2/src/main.c b/examples/standalone/second_counter2/src/main.c
@@ -1,9 +1,9 @@
 #include <tice.h>
 #include <stdio.h>
 
-#define ONE_SECOND         32768/1
-#define HALF_SECOND        32768/2
-#define QUARTER_SECOND     32768/4
+#define ONE_SECOND      (32768/1)
+#define HALF_SECOND     (32768/2)
+#define QUARTER_SECOND  (32768/4)
 
 void reset_counter(void);
 

diff --git a/src/ce/debug.h b/src/ce/debug.h
@@ -98,8 +98,8 @@ void dbg_RemoveAllWatchpoints(void);
  */
 void dbg_RemoveAllBreakpoints(void);
 
-#define dbgout ((char*)0xFB0000) /**< Standard debug output */
-#define dbgerr ((char*)0xFC0000) /**< Error debug output */
+#define dbgout ((volatile char*)0xFB0000) /**< Standard debug output */
+#define dbgerr ((volatile char*)0xFC0000) /**< Error debug output */
 #define dbg_sprintf sprintf
 #define dbg_ClearConsole() (*(unsigned char*)0xFD0000 = 1)
 #else

diff --git a/src/ce/intce.h b/src/ce/intce.h
@@ -69,22 +69,22 @@ void int_SetVector(uint8_t ivect, void (*handler)(void));
 #define RTC_IVECT       12 /**< Real Time Clock interrupt source */
 #define USB_IVECT       13 /**< USB interrupt source             */
 
-#define INT_ON          1<<ON_IVECT        /**< [on] key interrupt source mask        */
-#define INT_TIMER1      1<<TIMER1_IVECT    /**< Timer 1 interrupt source mask         */
-#define INT_TIMER2      1<<TIMER2_IVECT    /**< Timer 2 interrupt source mask         */
-#define INT_TIMER3      1<<TIMER3_IVECT    /**< Timer 3 interrupt source mask         */
-#define INT_TIMEROS     1<<TIMEROS_IVECT   /**< Timer OS interrupt source mask        */
-#define INT_KEYBOARD	1<<KEYBOARD_IVECT  /**< Keyboard interrupt source mask        */
-#define INT_LCD         1<<LCD_IVECT       /**< LCD interrupt source mask             */
-#define INT_RTC         1<<RTC_IVECT       /**< Real Time Clock interrupt source mask */
-#define INT_USB         1<<USB_IVECT       /**< USB interrupt source mask             */
+#define INT_ON          (1<<ON_IVECT)       /**< [on] key interrupt source mask        */
+#define INT_TIMER1      (1<<TIMER1_IVECT)   /**< Timer 1 interrupt source mask         */
+#define INT_TIMER2      (1<<TIMER2_IVECT)   /**< Timer 2 interrupt source mask         */
+#define INT_TIMER3      (1<<TIMER3_IVECT)   /**< Timer 3 interrupt source mask         */
+#define INT_TIMEROS     (1<<TIMEROS_IVECT)  /**< Timer OS interrupt source mask        */
+#define INT_KEYBOARD    (1<<KEYBOARD_IVECT) /**< Keyboard interrupt source mask        */
+#define INT_LCD         (1<<LCD_IVECT)      /**< LCD interrupt source mask             */
+#define INT_RTC         (1<<RTC_IVECT)      /**< Real Time Clock interrupt source mask */
+#define INT_USB         (1<<USB_IVECT)      /**< USB interrupt source mask             */
 
 #define int_RawStatus       (*(volatile uint24_t*)0x0F00000) /**< State of interrupt signals        */
 #define int_MaskedStatus    (*(volatile uint24_t*)0x0F00014) /**< Masked state of interrupt signals */
-#define int_EnableConfig    (*(uint24_t*)0x0F00004)          /**< Enabled interrupt signals         */
-#define int_LatchConfig     (*(uint24_t*)0x0F0000C)          /**< Latchable interrupt signals       */
-#define int_InvertConfig    (*(uint24_t*)0x0F00010)          /**< Invertable interrupt signals      */
-#define int_Acknowledge     (*(uint24_t*)0x0F00008)          /**< Acknowledge interrupt signals     */
+#define int_EnableConfig    (*(volatile uint24_t*)0x0F00004) /**< Enabled interrupt signals         */
+#define int_LatchConfig     (*(volatile uint24_t*)0x0F0000C) /**< Latchable interrupt signals       */
+#define int_InvertConfig    (*(volatile uint24_t*)0x0F00010) /**< Invertable interrupt signals      */
+#define int_Acknowledge     (*(volatile uint24_t*)0x0F00008) /**< Acknowledge interrupt signals     */
 
 #ifdef __cplusplus
 }

diff --git a/src/ce/tice.h b/src/ce/tice.h
@@ -117,7 +117,7 @@ uint32_t atomic_load_decreasing_32(volatile uint32_t *p);
 #define RTC_UNFREEZE            (1<<7)
 #define RTC_FREEZE              (0<<7)
 #define RTC_LOAD                (1<<6)
-#define RTC_ENABLE              ((1<<0)|(RTC_UNFREEZE))
+#define RTC_ENABLE              ((1<<0)|RTC_UNFREEZE)
 #define RTC_DISABLE             (0<<0)
 
 /* RTC registers */
@@ -213,7 +213,7 @@ uint32_t atomic_load_decreasing_32(volatile uint32_t *p);
 #define timer_EnableInt          (*(volatile uint16_t*)0xF20038)
 
 /* LCD defines */
-#define lcd_BacklightLevel       (*(volatile uint8_t*)0xF60024) /* Current backlight level of the LCD. 0 is bright. 255 is dark. */
+#define lcd_Ram                  ((volatile uint16_t*)0xD40000)
 #define lcd_Timing0              (*(volatile uint32_t*)0xE30000)
 #define lcd_Timing1              (*(volatile uint32_t*)0xE30004)
 #define lcd_Timing2              (*(volatile uint32_t*)0xE30008)
@@ -227,6 +227,7 @@ uint32_t atomic_load_decreasing_32(volatile uint32_t *p);
 #define lcd_IntAcknowledge       (*(volatile uint8_t*)0xE30028)
 #define lcd_UpBaseCurr           (*(volatile uint32_t*)0xE3002C)
 #define lcd_LpBaseCurr           (*(volatile uint32_t*)0xE30030)
+#define lcd_Palette              ((volatile uint16_t*)0xE30200)
 #define lcd_CrsrCtrl             (*(volatile uint8_t*)0xE30C00)
 #define lcd_CrsrConfig           (*(volatile uint8_t*)0xE30C04)
 #define lcd_CrsrPalette0         (*(volatile uint24_t*)0xE30C08)
@@ -241,8 +242,7 @@ uint32_t atomic_load_decreasing_32(volatile uint32_t *p);
 #define lcd_CrsrIntAcknowledge   (*(volatile uint8_t*)0xE30C24)
 #define lcd_CrsrIntStatus        (*(volatile uint8_t*)0xE30C28)
 #define lcd_CrsrIntStatusMasked  (*(volatile uint8_t*)0xE30C2C)
-#define lcd_Ram                  ((uint16_t*)0xD40000)
-#define lcd_Palette              ((uint16_t*)0xE30200)
+#define lcd_BacklightLevel       (*(volatile uint8_t*)0xF60024) /* Current backlight level of the LCD. 0 is bright. 255 is dark. */
 
 /**
  * Width of LCD in pixels

diff --git a/src/graphx/graphx.h b/src/graphx/graphx.h
@@ -235,7 +235,7 @@ gfx_sprite_t *name = (gfx_sprite_t *)name##_data
  * @return pointer to the allocated sprite
  */
 #define gfx_AllocRLETSprite(data_size, malloc_routine) \
-(gfx_rletsprite_t *)(malloc_routine)(data_size)
+((gfx_rletsprite_t *)(malloc_routine)(data_size))
 
 /**
  * Dynamically allocates memory for a sprite with RLE transparency using \c

diff --git a/src/keypadc/keypadc.h b/src/keypadc/keypadc.h
@@ -118,144 +118,144 @@ typedef enum {
 } kb_int_signal_t;
 
 /* Keyboard group 1 */
-#define kb_Graph      1<<0
-#define kb_Trace      1<<1
-#define kb_Zoom       1<<2
-#define kb_Window     1<<3
-#define kb_Yequ       1<<4
-#define kb_2nd        1<<5
-#define kb_Mode       1<<6
-#define kb_Del        1<<7
+#define kb_Graph    (1<<0)
+#define kb_Trace    (1<<1)
+#define kb_Zoom     (1<<2)
+#define kb_Window   (1<<3)
+#define kb_Yequ     (1<<4)
+#define kb_2nd      (1<<5)
+#define kb_Mode     (1<<6)
+#define kb_Del      (1<<7)
 
 /* Keyboard group 2 */
-#define kb_Sto        1<<1
-#define kb_Ln         1<<2
-#define kb_Log        1<<3
-#define kb_Square     1<<4
-#define kb_Recip      1<<5
-#define kb_Math       1<<6
-#define kb_Alpha      1<<7
+#define kb_Sto      (1<<1)
+#define kb_Ln       (1<<2)
+#define kb_Log      (1<<3)
+#define kb_Square   (1<<4)
+#define kb_Recip    (1<<5)
+#define kb_Math     (1<<6)
+#define kb_Alpha    (1<<7)
 
 /* Keyboard group 3 */
-#define kb_0          1<<0
-#define kb_1          1<<1
-#define kb_4          1<<2
-#define kb_7          1<<3
-#define kb_Comma      1<<4
-#define kb_Sin        1<<5
-#define kb_Apps       1<<6
-#define kb_GraphVar   1<<7
+#define kb_0        (1<<0)
+#define kb_1        (1<<1)
+#define kb_4        (1<<2)
+#define kb_7        (1<<3)
+#define kb_Comma    (1<<4)
+#define kb_Sin      (1<<5)
+#define kb_Apps     (1<<6)
+#define kb_GraphVar (1<<7)
 
 /* Keyboard group 4 */
-#define kb_DecPnt     1<<0
-#define kb_2          1<<1
-#define kb_5          1<<2
-#define kb_8          1<<3
-#define kb_LParen     1<<4
-#define kb_Cos        1<<5
-#define kb_Prgm       1<<6
-#define kb_Stat       1<<7
+#define kb_DecPnt   (1<<0)
+#define kb_2        (1<<1)
+#define kb_5        (1<<2)
+#define kb_8        (1<<3)
+#define kb_LParen   (1<<4)
+#define kb_Cos      (1<<5)
+#define kb_Prgm     (1<<6)
+#define kb_Stat     (1<<7)
 
 /* Keyboard group 5 */
-#define kb_Chs        1<<0
-#define kb_3          1<<1
-#define kb_6          1<<2
-#define kb_9          1<<3
-#define kb_RParen     1<<4
-#define kb_Tan        1<<5
-#define kb_Vars       1<<6
+#define kb_Chs      (1<<0)
+#define kb_3        (1<<1)
+#define kb_6        (1<<2)
+#define kb_9        (1<<3)
+#define kb_RParen   (1<<4)
+#define kb_Tan      (1<<5)
+#define kb_Vars     (1<<6)
 
 /* Keyboard group 6 */
-#define kb_Enter      1<<0
-#define kb_Add        1<<1
-#define kb_Sub        1<<2
-#define kb_Mul        1<<3
-#define kb_Div        1<<4
-#define kb_Power      1<<5
-#define kb_Clear      1<<6
+#define kb_Enter    (1<<0)
+#define kb_Add      (1<<1)
+#define kb_Sub      (1<<2)
+#define kb_Mul      (1<<3)
+#define kb_Div      (1<<4)
+#define kb_Power    (1<<5)
+#define kb_Clear    (1<<6)
 
 /* Keyboard group 7 */
-#define kb_Down       1<<0
-#define kb_Left       1<<1
-#define kb_Right      1<<2
-#define kb_Up         1<<3
+#define kb_Down     (1<<0)
+#define kb_Left     (1<<1)
+#define kb_Right    (1<<2)
+#define kb_Up       (1<<3)
 
 /* Keyboard group 1 */
-#define kb_KeyGraph           (kb_lkey_t)(1 << 8 | 1<<0)
-#define kb_KeyTrace           (kb_lkey_t)(1 << 8 | 1<<1)
-#define kb_KeyZoom            (kb_lkey_t)(1 << 8 | 1<<2)
-#define kb_KeyWindow          (kb_lkey_t)(1 << 8 | 1<<3)
-#define kb_KeyYequ            (kb_lkey_t)(1 << 8 | 1<<4)
-#define kb_Key2nd             (kb_lkey_t)(1 << 8 | 1<<5)
-#define kb_KeyMode            (kb_lkey_t)(1 << 8 | 1<<6)
-#define kb_KeyDel             (kb_lkey_t)(1 << 8 | 1<<7)
+#define kb_KeyGraph     ((kb_lkey_t)(1 << 8 | 1<<0))
+#define kb_KeyTrace     ((kb_lkey_t)(1 << 8 | 1<<1))
+#define kb_KeyZoom      ((kb_lkey_t)(1 << 8 | 1<<2))
+#define kb_KeyWindow    ((kb_lkey_t)(1 << 8 | 1<<3))
+#define kb_KeyYequ      ((kb_lkey_t)(1 << 8 | 1<<4))
+#define kb_Key2nd       ((kb_lkey_t)(1 << 8 | 1<<5))
+#define kb_KeyMode      ((kb_lkey_t)(1 << 8 | 1<<6))
+#define kb_KeyDel       ((kb_lkey_t)(1 << 8 | 1<<7))
 
 /* Keyboard group 2 */
-#define kb_KeyStore           (kb_lkey_t)(2 << 8 | 1<<1)
-#define kb_KeyLn              (kb_lkey_t)(2 << 8 | 1<<2)
-#define kb_KeyLog             (kb_lkey_t)(2 << 8 | 1<<3)
-#define kb_KeySquare          (kb_lkey_t)(2 << 8 | 1<<4)
-#define kb_KeyRecip           (kb_lkey_t)(2 << 8 | 1<<5)
-#define kb_KeyMath            (kb_lkey_t)(2 << 8 | 1<<6)
-#define kb_KeyAlpha           (kb_lkey_t)(2 << 8 | 1<<7)
+#define kb_KeyStore     ((kb_lkey_t)(2 << 8 | 1<<1))
+#define kb_KeyLn        ((kb_lkey_t)(2 << 8 | 1<<2))
+#define kb_KeyLog       ((kb_lkey_t)(2 << 8 | 1<<3))
+#define kb_KeySquare    ((kb_lkey_t)(2 << 8 | 1<<4))
+#define kb_KeyRecip     ((kb_lkey_t)(2 << 8 | 1<<5))
+#define kb_KeyMath      ((kb_lkey_t)(2 << 8 | 1<<6))
+#define kb_KeyAlpha     ((kb_lkey_t)(2 << 8 | 1<<7))
 
 /* Keyboard group 3 */
-#define kb_Key0               (kb_lkey_t)(3 << 8 | 1<<0)
-#define kb_Key1               (kb_lkey_t)(3 << 8 | 1<<1)
-#define kb_Key4               (kb_lkey_t)(3 << 8 | 1<<2)
-#define kb_Key7               (kb_lkey_t)(3 << 8 | 1<<3)
-#define kb_KeyComma           (kb_lkey_t)(3 << 8 | 1<<4)
-#define kb_KeySin             (kb_lkey_t)(3 << 8 | 1<<5)
-#define kb_KeyApps            (kb_lkey_t)(3 << 8 | 1<<6)
-#define kb_KeyGraphVar        (kb_lkey_t)(3 << 8 | 1<<7)
+#define kb_Key0         ((kb_lkey_t)(3 << 8 | 1<<0))
+#define kb_Key1         ((kb_lkey_t)(3 << 8 | 1<<1))
+#define kb_Key4         ((kb_lkey_t)(3 << 8 | 1<<2))
+#define kb_Key7         ((kb_lkey_t)(3 << 8 | 1<<3))
+#define kb_KeyComma     ((kb_lkey_t)(3 << 8 | 1<<4))
+#define kb_KeySin       ((kb_lkey_t)(3 << 8 | 1<<5))
+#define kb_KeyApps      ((kb_lkey_t)(3 << 8 | 1<<6))
+#define kb_KeyGraphVar  ((kb_lkey_t)(3 << 8 | 1<<7))
 
 /* Keyboard group 4 */
-#define kb_KeyDecPnt          (kb_lkey_t)(4 << 8 | 1<<0)
-#define kb_Key2               (kb_lkey_t)(4 << 8 | 1<<1)
-#define kb_Key5               (kb_lkey_t)(4 << 8 | 1<<2)
-#define kb_Key8               (kb_lkey_t)(4 << 8 | 1<<3)
-#define kb_KeyLParen          (kb_lkey_t)(4 << 8 | 1<<4)
-#define kb_KeyCos             (kb_lkey_t)(4 << 8 | 1<<5)
-#define kb_KeyPrgm            (kb_lkey_t)(4 << 8 | 1<<6)
-#define kb_KeyStat            (kb_lkey_t)(4 << 8 | 1<<7)
+#define kb_KeyDecPnt    ((kb_lkey_t)(4 << 8 | 1<<0))
+#define kb_Key2         ((kb_lkey_t)(4 << 8 | 1<<1))
+#define kb_Key5         ((kb_lkey_t)(4 << 8 | 1<<2))
+#define kb_Key8         ((kb_lkey_t)(4 << 8 | 1<<3))
+#define kb_KeyLParen    ((kb_lkey_t)(4 << 8 | 1<<4))
+#define kb_KeyCos       ((kb_lkey_t)(4 << 8 | 1<<5))
+#define kb_KeyPrgm      ((kb_lkey_t)(4 << 8 | 1<<6))
+#define kb_KeyStat      ((kb_lkey_t)(4 << 8 | 1<<7))
 
 /* Keyboard group 5 */
-#define kb_KeyChs            (kb_lkey_t)(5 << 8 | 1<<0)
-#define kb_Key3              (kb_lkey_t)(5 << 8 | 1<<1)
-#define kb_Key6              (kb_lkey_t)(5 << 8 | 1<<2)
-#define kb_Key9              (kb_lkey_t)(5 << 8 | 1<<3)
-#define kb_KeyRParen         (kb_lkey_t)(5 << 8 | 1<<4)
-#define kb_KeyTan            (kb_lkey_t)(5 << 8 | 1<<5)
-#define kb_KeyVars           (kb_lkey_t)(5 << 8 | 1<<6)
+#define kb_KeyChs      ((kb_lkey_t)(5 << 8 | 1<<0))
+#define kb_Key3        ((kb_lkey_t)(5 << 8 | 1<<1))
+#define kb_Key6        ((kb_lkey_t)(5 << 8 | 1<<2))
+#define kb_Key9        ((kb_lkey_t)(5 << 8 | 1<<3))
+#define kb_KeyRParen   ((kb_lkey_t)(5 << 8 | 1<<4))
+#define kb_KeyTan      ((kb_lkey_t)(5 << 8 | 1<<5))
+#define kb_KeyVars     ((kb_lkey_t)(5 << 8 | 1<<6))
 
 /* Keyboard group 6 */
-#define kb_KeyEnter          (kb_lkey_t)(6 << 8 | 1<<0)
-#define kb_KeyAdd            (kb_lkey_t)(6 << 8 | 1<<1)
-#define kb_KeySub            (kb_lkey_t)(6 << 8 | 1<<2)
-#define kb_KeyMul            (kb_lkey_t)(6 << 8 | 1<<3)
-#define kb_KeyDiv            (kb_lkey_t)(6 << 8 | 1<<4)
-#define kb_KeyPower          (kb_lkey_t)(6 << 8 | 1<<5)
-#define kb_KeyClear          (kb_lkey_t)(6 << 8 | 1<<6)
+#define kb_KeyEnter    ((kb_lkey_t)(6 << 8 | 1<<0))
+#define kb_KeyAdd      ((kb_lkey_t)(6 << 8 | 1<<1))
+#define kb_KeySub      ((kb_lkey_t)(6 << 8 | 1<<2))
+#define kb_KeyMul      ((kb_lkey_t)(6 << 8 | 1<<3))
+#define kb_KeyDiv      ((kb_lkey_t)(6 << 8 | 1<<4))
+#define kb_KeyPower    ((kb_lkey_t)(6 << 8 | 1<<5))
+#define kb_KeyClear    ((kb_lkey_t)(6 << 8 | 1<<6))
 
 /* Keyboard group 7 */
-#define kb_KeyDown           (kb_lkey_t)(7 << 8 | 1<<0)
-#define kb_KeyLeft           (kb_lkey_t)(7 << 8 | 1<<1)
-#define kb_KeyRight          (kb_lkey_t)(7 << 8 | 1<<2)
-#define kb_KeyUp             (kb_lkey_t)(7 << 8 | 1<<3)
+#define kb_KeyDown     ((kb_lkey_t)(7 << 8 | 1<<0))
+#define kb_KeyLeft     ((kb_lkey_t)(7 << 8 | 1<<1))
+#define kb_KeyRight    ((kb_lkey_t)(7 << 8 | 1<<2))
+#define kb_KeyUp       ((kb_lkey_t)(7 << 8 | 1<<3))
 
 /* Compatibility defines */
-#define kb_DataArray ((uint16_t*)0xF50010)
-#define kb_dataArray ((uint16_t*)0xF50010)
-#define kb_Store 1<<1
-#define kb_KeyPgrm kb_KeyPrgm
-#define kb_group_0 0
-#define kb_group_1 1
-#define kb_group_2 2
-#define kb_group_3 3
-#define kb_group_4 4
-#define kb_group_5 5
-#define kb_group_6 6
-#define kb_group_7 7
+#define kb_DataArray    ((volatile uint16_t*)0xF50010)
+#define kb_dataArray    ((volatile uint16_t*)0xF50010)
+#define kb_Store        kb_Sto
+#define kb_KeyPgrm      kb_KeyPrgm
+#define kb_group_0      0
+#define kb_group_1      1
+#define kb_group_2      2
+#define kb_group_3      3
+#define kb_group_4      4
+#define kb_group_5      5
+#define kb_group_6      6
+#define kb_group_7      7
 
 #ifdef __cplusplus
 }

diff --git a/src/std/float.h b/src/std/float.h
@@ -26,7 +26,7 @@
 /* power approximates a positive floating point number in the  */
 /* range of representable values.                              */
 
-#define FLT_MIN_EXP	-125
+#define FLT_MIN_EXP	(-125)
 #define DBL_MIN_EXP	FLT_MIN_EXP
 #define LDBL_MIN_EXP	FLT_MIN_EXP
 
@@ -42,15 +42,15 @@
 /* approximates a floating point number in the range of */
 /* representable value ((int)log10(FLT_MAX),etc)        */
 
-#define FLT_MAX_10_EXP	+38
+#define FLT_MAX_10_EXP	(+38)
 #define DBL_MAX_10_EXP	FLT_MAX_10_EXP
 #define LDBL_MAX_10_EXP FLT_MAX_10_EXP
 
 /* minimum negative integer such that 10 raised to that power */
 /* approximates a positive floating point number in the range */
 /* of representable values ((int)log10(FLT_MIN),etc.)         */
 
-#define FLT_MIN_10_EXP	-37
+#define FLT_MIN_10_EXP	(-37)
 #define DBL_MIN_10_EXP	FLT_MIN_10_EXP
 #define LDBL_MIN_10_EXP FLT_MIN_10_EXP