added missing gaurds

Author: MannyPeterson

drivers/block/block_driver.h

@@ -18,20 +18,65 @@
   #include "task.h"
   #include "timer.h"
   #include "block_io_interface.h"
+  #if defined(DEVICE_NAME)
+    #undef DEVICE_NAME
+  #endif
   #define DEVICE_NAME BLOCKDEV
+  #if defined(DEVICE_UID)
+    #undef DEVICE_UID
+  #endif
   #define DEVICE_UID 0x1000u
+  #if defined(DEVICE_MODE)
+    #undef DEVICE_MODE
+  #endif
   #define DEVICE_MODE DeviceModeReadWrite
+  #if defined(DEVICE_STATE)
+    #undef DEVICE_STATE
+  #endif
   #define DEVICE_STATE DeviceStateRunning
+  #if defined(BLOCK_CMD_CONFIG)
+    #undef BLOCK_CMD_CONFIG
+  #endif
   #define BLOCK_CMD_CONFIG 0x01u
+  #if defined(BLOCK_CMD_SET_ADDRESS)
+    #undef BLOCK_CMD_SET_ADDRESS
+  #endif
   #define BLOCK_CMD_SET_ADDRESS 0x02u
+  #if defined(BLOCK_CMD_GET_INFO)
+    #undef BLOCK_CMD_GET_INFO
+  #endif
   #define BLOCK_CMD_GET_INFO 0x03u
+  #if defined(BLOCK_PROTOCOL_SD_CARD)
+    #undef BLOCK_PROTOCOL_SD_CARD
+  #endif
   #define BLOCK_PROTOCOL_SD_CARD 0x01u
+  #if defined(BLOCK_PROTOCOL_MMC)
+    #undef BLOCK_PROTOCOL_MMC
+  #endif
   #define BLOCK_PROTOCOL_MMC 0x02u
+  #if defined(BLOCK_PROTOCOL_EMMC)
+    #undef BLOCK_PROTOCOL_EMMC
+  #endif
   #define BLOCK_PROTOCOL_EMMC 0x03u
+  #if defined(BLOCK_PROTOCOL_RAW)
+    #undef BLOCK_PROTOCOL_RAW
+  #endif
   #define BLOCK_PROTOCOL_RAW 0xFFu
+  #if defined(BLOCK_CMD_READ_SINGLE)
+    #undef BLOCK_CMD_READ_SINGLE
+  #endif
   #define BLOCK_CMD_READ_SINGLE 0x01u
+  #if defined(BLOCK_CMD_READ_MULTIPLE)
+    #undef BLOCK_CMD_READ_MULTIPLE
+  #endif
   #define BLOCK_CMD_READ_MULTIPLE 0x02u
+  #if defined(BLOCK_CMD_WRITE_SINGLE)
+    #undef BLOCK_CMD_WRITE_SINGLE
+  #endif
   #define BLOCK_CMD_WRITE_SINGLE 0x03u
+  #if defined(BLOCK_CMD_WRITE_MULTIPLE)
+    #undef BLOCK_CMD_WRITE_MULTIPLE
+  #endif
   #define BLOCK_CMD_WRITE_MULTIPLE 0x04u
   typedef struct BlockDeviceState_s {
   HalfWord_t ioDriverUID;

drivers/char/char_driver.h

@@ -18,20 +18,65 @@
   #include "task.h"
   #include "timer.h"
   #include "char_io_interface.h"
+  #if defined(DEVICE_NAME)
+    #undef DEVICE_NAME
+  #endif
   #define DEVICE_NAME CHARDEV0
+  #if defined(DEVICE_UID)
+    #undef DEVICE_UID
+  #endif
   #define DEVICE_UID 0x2000u
+  #if defined(DEVICE_MODE)
+    #undef DEVICE_MODE
+  #endif
   #define DEVICE_MODE DeviceModeReadWrite
+  #if defined(DEVICE_STATE)
+    #undef DEVICE_STATE
+  #endif
   #define DEVICE_STATE DeviceStateRunning
+  #if defined(CHAR_CMD_CONFIG)
+    #undef CHAR_CMD_CONFIG
+  #endif
   #define CHAR_CMD_CONFIG 0x01u
+  #if defined(CHAR_CMD_SET_PARAMS)
+    #undef CHAR_CMD_SET_PARAMS
+  #endif
   #define CHAR_CMD_SET_PARAMS 0x02u
+  #if defined(CHAR_CMD_GET_INFO)
+    #undef CHAR_CMD_GET_INFO
+  #endif
   #define CHAR_CMD_GET_INFO 0x03u
+  #if defined(CHAR_PROTOCOL_UART)
+    #undef CHAR_PROTOCOL_UART
+  #endif
   #define CHAR_PROTOCOL_UART 0x01u
+  #if defined(CHAR_PROTOCOL_USART)
+    #undef CHAR_PROTOCOL_USART
+  #endif
   #define CHAR_PROTOCOL_USART 0x02u
+  #if defined(CHAR_PROTOCOL_USB_CDC)
+    #undef CHAR_PROTOCOL_USB_CDC
+  #endif
   #define CHAR_PROTOCOL_USB_CDC 0x03u
+  #if defined(CHAR_PROTOCOL_RAW)
+    #undef CHAR_PROTOCOL_RAW
+  #endif
   #define CHAR_PROTOCOL_RAW 0xFFu
+  #if defined(CHAR_LINE_RAW)
+    #undef CHAR_LINE_RAW
+  #endif
   #define CHAR_LINE_RAW 0x00u
+  #if defined(CHAR_LINE_COOKED)
+    #undef CHAR_LINE_COOKED
+  #endif
   #define CHAR_LINE_COOKED 0x01u
+  #if defined(CHAR_DEFAULT_TIMEOUT_MS)
+    #undef CHAR_DEFAULT_TIMEOUT_MS
+  #endif
   #define CHAR_DEFAULT_TIMEOUT_MS 0x3E8u
+  #if defined(CHAR_SINGLE_BYTE_COUNT)
+    #undef CHAR_SINGLE_BYTE_COUNT
+  #endif
   #define CHAR_SINGLE_BYTE_COUNT 0x1u
   typedef struct CharDeviceConfig_s {
     Byte_t command;

drivers/ramdisk/ramdisk_driver.h

@@ -18,12 +18,33 @@
   #include "task.h"
   #include "timer.h"
   #include "../block/block_io_interface.h"
+  #if defined(DEVICE_NAME)
+    #undef DEVICE_NAME
+  #endif
   #define DEVICE_NAME RAMDISK0
+  #if defined(DEVICE_UID)
+    #undef DEVICE_UID
+  #endif
   #define DEVICE_UID 0x0100u
+  #if defined(DEVICE_MODE)
+    #undef DEVICE_MODE
+  #endif
   #define DEVICE_MODE DeviceModeReadWrite
+  #if defined(DEVICE_STATE)
+    #undef DEVICE_STATE
+  #endif
   #define DEVICE_STATE DeviceStateRunning
+  #if defined(RAMDISK_CMD_SET_POSITION)
+    #undef RAMDISK_CMD_SET_POSITION
+  #endif
   #define RAMDISK_CMD_SET_POSITION 0x01u
+  #if defined(RAMDISK_CMD_CLEAR_DISK)
+    #undef RAMDISK_CMD_CLEAR_DISK
+  #endif
   #define RAMDISK_CMD_CLEAR_DISK 0x02u
+  #if defined(RAMDISK_CMD_GET_STATS)
+    #undef RAMDISK_CMD_GET_STATS
+  #endif
   #define RAMDISK_CMD_GET_STATS 0x03u
   typedef struct RAMDiskPositionConfig_s {
     Byte_t command;

drivers/template/driver.h

@@ -17,9 +17,21 @@
   #include "sys.h"
   #include "task.h"
   #include "timer.h"
+  #if defined(DEVICE_NAME)
+    #undef DEVICE_NAME
+  #endif
   #define DEVICE_NAME DEVICENA
+  #if defined(DEVICE_UID)
+    #undef DEVICE_UID
+  #endif
   #define DEVICE_UID 0x0u
+  #if defined(DEVICE_MODE)
+    #undef DEVICE_MODE
+  #endif
   #define DEVICE_MODE DeviceModeReadWrite
+  #if defined(DEVICE_STATE)
+    #undef DEVICE_STATE
+  #endif
   #define DEVICE_STATE DeviceStateRunning
   #ifdef __cplusplus
     extern "C" {

drivers/usart_stm32/usart_stm32_driver.h

@@ -20,9 +20,21 @@
   #include "../char/char_io_interface.h"
   #if !defined(POSIX_ARCH_OTHER)
   #endif
+  #if defined(DEVICE_NAME)
+    #undef DEVICE_NAME
+  #endif
   #define DEVICE_NAME USART_TX
+  #if defined(DEVICE_UID)
+    #undef DEVICE_UID
+  #endif
   #define DEVICE_UID 0x0200u
+  #if defined(DEVICE_MODE)
+    #undef DEVICE_MODE
+  #endif
   #define DEVICE_MODE DeviceModeReadWrite
+  #if defined(DEVICE_STATE)
+    #undef DEVICE_STATE
+  #endif
   #define DEVICE_STATE DeviceStateRunning
   #if defined(USART_RX_BUFFER_SIZE)
     #undef USART_RX_BUFFER_SIZE
@@ -52,9 +64,21 @@
     #undef USART_ERROR_OVERRUN
   #endif
   #define USART_ERROR_OVERRUN 0x08u
+  #if defined(USART_MAX_BAUD_RATE)
+    #undef USART_MAX_BAUD_RATE
+  #endif
   #define USART_MAX_BAUD_RATE 0x1C200u
+  #if defined(USART_IRQ_PRIORITY)
+    #undef USART_IRQ_PRIORITY
+  #endif
   #define USART_IRQ_PRIORITY 0x5u
+  #if defined(USART_SINGLE_BYTE_TRANSFER)
+    #undef USART_SINGLE_BYTE_TRANSFER
+  #endif
   #define USART_SINGLE_BYTE_TRANSFER 0x1u
+  #if defined(USART_DEFAULT_TIMEOUT_MS)
+    #undef USART_DEFAULT_TIMEOUT_MS
+  #endif
   #define USART_DEFAULT_TIMEOUT_MS 0x3E8u
   typedef struct USARTSTMInitConfig_s {
   #if !defined(POSIX_ARCH_OTHER)

src/console.h

@@ -42,20 +42,65 @@
       #undef CONSOLE_NOT_READY
     #endif
     #define CONSOLE_NOT_READY 0x02u
+    #if defined(CHAR_NULL)
+      #undef CHAR_NULL
+    #endif
     #define CHAR_NULL 0x00u
+    #if defined(CHAR_TAB)
+      #undef CHAR_TAB
+    #endif
     #define CHAR_TAB 0x09u
+    #if defined(CHAR_LF)
+      #undef CHAR_LF
+    #endif
     #define CHAR_LF 0x0Au
+    #if defined(CHAR_CR)
+      #undef CHAR_CR
+    #endif
     #define CHAR_CR 0x0Du
+    #if defined(CHAR_SPACE)
+      #undef CHAR_SPACE
+    #endif
     #define CHAR_SPACE 0x20u
+    #if defined(CHAR_SLASH)
+      #undef CHAR_SLASH
+    #endif
     #define CHAR_SLASH 0x2Fu
+    #if defined(CHAR_DOT)
+      #undef CHAR_DOT
+    #endif
     #define CHAR_DOT 0x2Eu
+    #if defined(CHAR_ZERO)
+      #undef CHAR_ZERO
+    #endif
     #define CHAR_ZERO 0x30u
+    #if defined(CHAR_LOWERCASE_X)
+      #undef CHAR_LOWERCASE_X
+    #endif
     #define CHAR_LOWERCASE_X 0x78u
+    #if defined(CHAR_BACKSPACE)
+      #undef CHAR_BACKSPACE
+    #endif
     #define CHAR_BACKSPACE 0x08u
+    #if defined(CHAR_DEL)
+      #undef CHAR_DEL
+    #endif
     #define CHAR_DEL 0x7Fu
+    #if defined(CHAR_PRINTABLE_MIN)
+      #undef CHAR_PRINTABLE_MIN
+    #endif
     #define CHAR_PRINTABLE_MIN 0x20u
+    #if defined(CHAR_PRINTABLE_MAX)
+      #undef CHAR_PRINTABLE_MAX
+    #endif
     #define CHAR_PRINTABLE_MAX 0x7Eu
+    #if defined(HEX_DIGIT_MASK)
+      #undef HEX_DIGIT_MASK
+    #endif
     #define HEX_DIGIT_MASK 0xFu
+    #if defined(PATH_SEGMENTS_DIVISOR)
+      #undef PATH_SEGMENTS_DIVISOR
+    #endif
     #define PATH_SEGMENTS_DIVISOR 0x2u
     typedef struct ConsoleState_s {
       Base_t deviceReady;

src/device.h

@@ -31,6 +31,9 @@
       #undef TO_LITERAL
     #endif
     #define TO_LITERAL(a_) QUOTE(a_)
+    #if defined(__DeviceUidNonZero__)
+      #undef __DeviceUidNonZero__
+    #endif
     #define __DeviceUidNonZero__() (0x0u < uid_)
     #ifdef __cplusplus
       extern "C" {