Fixed static functions with names conflicting with global functions.

flit · flit · commit 1113dd0677af · 2019-11-26T15:27:37.000-06:00
diff --git a/source/board/mkit_dk_dongle_nrf5x.c b/source/board/mkit_dk_dongle_nrf5x.c
@@ -18,7 +18,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 #include "sam3u2c.h"
 #include "DAP_config.h"
 #include "target_config.h"
@@ -37,6 +37,7 @@ const char *board_id_nrf52840_dk = "1102";
 extern target_cfg_t target_device_nrf52;
 extern target_cfg_t target_device_nrf52840;
 static uint8_t device_type;
+
 static void set_target_device(uint32_t device)
 {
     device_type = device;
@@ -52,27 +53,27 @@ static void set_target_device(uint32_t device)
 }
 
 
-static void prerun_board_config(void)
+static void nrf_prerun_board_config(void)
 {
     // Work around for setting the correct board id based on GPIOs
     uint8_t bit1;
     uint8_t bit2;
     uint8_t bit3;
-    
+
     PIOB->PIO_PER = (1 << 1); // Enable PIO pin PB1
     PIOB->PIO_PER = (1 << 2); // Enable PIO pin PB2
     PIOB->PIO_PER = (1 << 3); // Enable PIO pin PB3
     PIOB->PIO_ODR = (1 << 1); // Disabe output
     PIOB->PIO_ODR = (1 << 2); // Disabe output
     PIOB->PIO_ODR = (1 << 3); // Disabe output
-    PIOB->PIO_PUER = (1 << 1); // Enable pull-up 
+    PIOB->PIO_PUER = (1 << 1); // Enable pull-up
     PIOB->PIO_PUER = (1 << 2); // Enable pull-up
     PIOB->PIO_PUER = (1 << 3); // Enable pull-up
-    
+
     bit1 = (PIOB->PIO_PDSR >> 1) & 1; // Read PB1
     bit2 = (PIOB->PIO_PDSR >> 2) & 1; // Read PB2
     bit3 = (PIOB->PIO_PDSR >> 3) & 1; // Read PB3
-    
+
     /* pins translate to board-ids as follow
      *
      *  PB3|PB2|PB1|BOARD ID| BOARD
@@ -87,7 +88,7 @@ static void prerun_board_config(void)
      *   1 | 1 | 0 |    undefined
      */
 
-    
+
     if (bit3) {
         set_target_device(0);
         target_device.rt_family_id = kNordic_Nrf51_FamilyID;
@@ -115,13 +116,13 @@ static void prerun_board_config(void)
             target_device.rt_board_id = board_id_nrf52840_dk;  // 1102
         }
     }
-    
-    PIOB->PIO_PUDR = (1 << 1); // Disable pull-up 
+
+    PIOB->PIO_PUDR = (1 << 1); // Disable pull-up
     PIOB->PIO_PUDR = (1 << 2); // Disable pull-up
     PIOB->PIO_PUDR = (1 << 3); // Disable pull-up
 }
 
-static void swd_set_target_reset(uint8_t asserted){
+static void nrf_swd_set_target_reset(uint8_t asserted){
     if (asserted && device_type == 0) {
         PIOA->PIO_OER = PIN_SWDIO;
         PIOA->PIO_OER = PIN_SWCLK;
@@ -133,7 +134,7 @@ static void swd_set_target_reset(uint8_t asserted){
 const board_info_t g_board_info = {
     .infoVersion = 0x0,
     .flags = kEnablePageErase,
-    .prerun_board_config = prerun_board_config,
-    .swd_set_target_reset = swd_set_target_reset,
+    .prerun_board_config = nrf_prerun_board_config,
+    .swd_set_target_reset = nrf_swd_set_target_reset,
     .target_cfg = &target_device,
 };
diff --git a/source/board/ublox_evk_nina_b1.c b/source/board/ublox_evk_nina_b1.c
@@ -23,7 +23,7 @@
 #include "target_board.h"
 #include "target_family.h"
 
-static void swd_set_target_reset(uint8_t asserted){
+static void nina_swd_set_target_reset(uint8_t asserted){
     if(!asserted) {
         PIOA->PIO_MDER = PIN_SWDIO | PIN_SWCLK | PIN_nRESET;
     }
@@ -33,6 +33,6 @@ const board_info_t g_board_info = {
     .infoVersion = 0x0,
     .board_id = "1237",
     .family_id = kNordic_Nrf52_FamilyID,
-    .swd_set_target_reset = swd_set_target_reset,
+    .swd_set_target_reset = nina_swd_set_target_reset,
     .target_cfg = &target_device,
 };
diff --git a/source/board/vbluno51.c b/source/board/vbluno51.c
@@ -23,7 +23,7 @@
 #include "target_board.h"
 #include "target_family.h"
 
-static void prerun_board_config()
+static void vbluno_prerun_board_config()
 {
     uart_enable_flow_control(false);
 }
@@ -33,6 +33,6 @@ const board_info_t g_board_info = {
     .board_id = "C006",
     .family_id = kNordic_Nrf51_FamilyID,
     .daplink_target_url = "https://os.mbed.com/platforms/VBLUNO51/",
-    .prerun_board_config = prerun_board_config,
+    .prerun_board_config = vbluno_prerun_board_config,
     .target_cfg = &target_device,
 };
diff --git a/source/family/arm/musca_a/target_reset.c b/source/family/arm/musca_a/target_reset.c
@@ -30,7 +30,7 @@
 #include "power_ctrl.h"
 #include "uart.h"
 
-static void target_before_init_debug(void)
+static void musca_a_target_before_init_debug(void)
 {
     uint8_t buf[12];
 
@@ -103,7 +103,7 @@ static void target_before_init_debug(void)
     return;
 }
 
-static uint8_t target_set_state(TARGET_RESET_STATE state)
+static uint8_t musca_a_target_set_state(TARGET_RESET_STATE state)
 {
     if(state == RESET_RUN)
     {
@@ -156,8 +156,8 @@ static uint8_t target_set_state(TARGET_RESET_STATE state)
 }
 
 const target_family_descriptor_t g_target_family_musca_a = {
-    .target_before_init_debug = target_before_init_debug,
-    .target_set_state = target_set_state,
+    .target_before_init_debug = musca_a_target_before_init_debug,
+    .target_set_state = musca_a_target_set_state,
     .apsel = 0x01000000,
 };
 
diff --git a/source/family/arm/musca_b/target_reset.c b/source/family/arm/musca_b/target_reset.c
@@ -31,7 +31,7 @@
 #include "power_ctrl.h"
 #include "uart.h"
 
-static void target_before_init_debug(void)
+static void musca_b_target_before_init_debug(void)
 {
     uint8_t buf[12];
 
@@ -108,7 +108,7 @@ static void target_before_init_debug(void)
     return;
 }
 
-static uint8_t target_set_state(TARGET_RESET_STATE state)
+static uint8_t musca_b_target_set_state(TARGET_RESET_STATE state)
 {
     if(state == RESET_RUN)
     {
@@ -161,8 +161,8 @@ static uint8_t target_set_state(TARGET_RESET_STATE state)
 }
 
 const target_family_descriptor_t g_target_family_musca_b = {
-    .target_before_init_debug = target_before_init_debug,
-    .target_set_state = target_set_state,
+    .target_before_init_debug = musca_b_target_before_init_debug,
+    .target_set_state = musca_b_target_set_state,
     .apsel = 0x01000000,
 };
 
diff --git a/source/family/nordic/target_reset_nrf51.c b/source/family/nordic/target_reset_nrf51.c
@@ -25,7 +25,7 @@
 #include "target_family.h"
 #include "target_board.h"
 
-static void swd_set_target_reset(uint8_t asserted)
+static void swd_set_target_reset_nrf(uint8_t asserted)
 {
     if (asserted) {
         swd_init_debug();
@@ -59,5 +59,5 @@ const target_family_descriptor_t g_nordic_nrf51 = {
     .family_id = kNordic_Nrf51_FamilyID,
     .default_reset_type = kSoftwareReset,
     .soft_reset_type = SYSRESETREQ,
-    .swd_set_target_reset = swd_set_target_reset,
+    .swd_set_target_reset = swd_set_target_reset_nrf,
 };
diff --git a/source/family/nordic/target_reset_nrf52.c b/source/family/nordic/target_reset_nrf52.c
@@ -25,7 +25,7 @@
 #include "target_family.h"
 #include "target_board.h"
 
-static void swd_set_target_reset(uint8_t asserted)
+static void swd_set_target_reset_nrf(uint8_t asserted)
 {
     uint32_t ap_index_return;
 
@@ -65,5 +65,5 @@ const target_family_descriptor_t g_nordic_nrf52 = {
     .family_id = kNordic_Nrf52_FamilyID,
     .default_reset_type = kSoftwareReset,
     .soft_reset_type = SYSRESETREQ,
-    .swd_set_target_reset = swd_set_target_reset,
+    .swd_set_target_reset = swd_set_target_reset_nrf,
 };
diff --git a/source/family/nxp/lpc55S6X/target_reset.c b/source/family/nxp/lpc55S6X/target_reset.c
@@ -36,7 +36,7 @@
 #define DEBUGMB_RET  0x02000008
 #define DEBUGMB_ID   0x020000FC
 
-static uint8_t target_set_state(TARGET_RESET_STATE state)
+static uint8_t lpc55s6x_target_set_state(TARGET_RESET_STATE state)
 {
     uint32_t val;
     int8_t ap_retries = 2;
@@ -108,7 +108,7 @@ static uint8_t target_set_state(TARGET_RESET_STATE state)
 
 const target_family_descriptor_t g_target_family_lpc55S6X = {
     .family_id = VENDOR_TO_FAMILY(kNXP_VendorID, 0), //ID not maching the predefined family ids
-    .target_set_state = target_set_state,
+    .target_set_state = lpc55s6x_target_set_state,
 };
 
 const target_family_descriptor_t *g_target_family = &g_target_family_lpc55S6X;
diff --git a/source/family/nxp/target_reset_lpc4088.c b/source/family/nxp/target_reset_lpc4088.c
@@ -51,7 +51,7 @@ static void prerun_target_config(void)
 }
 
 
-static uint8_t target_set_state(TARGET_RESET_STATE state)
+static uint8_t lpc4088_target_set_state(TARGET_RESET_STATE state)
 {
     //return swd_set_target_state_hw(state);
     uint8_t res;
@@ -72,7 +72,7 @@ static uint8_t target_set_state(TARGET_RESET_STATE state)
 const target_family_descriptor_t g_nxp_lpc4088 = {
     .family_id = VENDOR_TO_FAMILY(kNXP_VendorID, 0), //ID not maching the predefined family ids
     .prerun_target_config = prerun_target_config,
-    .target_set_state = target_set_state,
+    .target_set_state = lpc4088_target_set_state,
 };
 
 const target_family_descriptor_t *g_target_family = &g_nxp_lpc4088;
diff --git a/source/family/realtek/target_reset_realtek_rtl8195am.c b/source/family/realtek/target_reset_realtek_rtl8195am.c
@@ -19,14 +19,14 @@
 #include "DAP_config.h"
 #include "target_family.h"
 
-static void swd_set_target_reset(uint8_t asserted)
+static void swd_set_target_reset_realtek(uint8_t asserted)
 {
     if (asserted) {
         swd_write_word(0xE000ED0C, 0x05FA0004);
     }
 }
 
-static uint8_t validate_bin_nvic(const uint8_t *buf)
+static uint8_t validate_bin_nvic_realtek(const uint8_t *buf)
 {
     const char header[] = {0x99, 0x99, 0x96, 0x96, 0x3F, 0xCC, 0x66, 0xFC,
                            0xC0, 0x33, 0xCC, 0x03, 0xE5, 0xDC, 0x31, 0x62};
@@ -37,6 +37,6 @@ static uint8_t validate_bin_nvic(const uint8_t *buf)
 const target_family_descriptor_t g_realtek_rtl8195am = {
     .family_id = kRealtek_Rtl8195am_FamilyID,
     .default_reset_type = kHardwareReset,
-    .swd_set_target_reset = swd_set_target_reset,
-    .validate_bin_nvic = validate_bin_nvic,
+    .swd_set_target_reset = swd_set_target_reset_realtek,
+    .validate_bin_nvic = validate_bin_nvic_realtek,
 };
diff --git a/source/family/renesas/target_reset_rza.c b/source/family/renesas/target_reset_rza.c
@@ -23,14 +23,14 @@
 #include "swd_host.h"
 #include "target_family.h"
 
-static uint8_t target_set_state(TARGET_RESET_STATE state)
+static uint8_t target_set_state_rza(TARGET_RESET_STATE state)
 {
     return swd_set_target_state_hw(state);
 }
 
 #define BINARY_DETECTION    (0xE59FF000)
 
-static uint8_t validate_bin_nvic(const uint8_t *buf)
+static uint8_t validate_bin_nvic_rza(const uint8_t *buf)
 {
     // Very dirty hacking here for ARMv7-A (non Cortex-M) binary detection
     // This returns validated result when start instrunction
@@ -45,15 +45,15 @@ static uint8_t validate_bin_nvic(const uint8_t *buf)
     }
 }
 
-static uint8_t validate_hexfile(const uint8_t *buf)
+static uint8_t validate_hexfile_rza(const uint8_t *buf)
 {
     return 0;
 }
 
 const target_family_descriptor_t g_renesas_family = {
     .family_id = kRenesas_FamilyID,
-    .target_set_state = target_set_state,
-    .validate_bin_nvic = validate_bin_nvic,
-    .validate_hexfile = validate_hexfile,
+    .target_set_state = target_set_state_rza,
+    .validate_bin_nvic = validate_bin_nvic_rza,
+    .validate_hexfile = validate_hexfile_rza,
 };
 
diff --git a/source/family/ti/target_reset_ti.c b/source/family/ti/target_reset_ti.c
@@ -27,7 +27,7 @@
 #define GPRCM_0_RESET_MCU_VALUE        0x1
 #define GPRCM_0_RESET_MCU_PERIPH_VALUE 0x2
 
-static uint8_t target_set_state(TARGET_RESET_STATE state)
+static uint8_t target_set_state_ti(TARGET_RESET_STATE state)
 {
     swd_set_soft_reset(VECTRESET);
     if (state == POST_FLASH_RESET)
@@ -50,14 +50,14 @@ const uint32_t cookieList[]=
 
 // Override the weak validate_bin_nvic function. The weak function expects NVIC at the beginning of the flash.
 // On CC3220SF, the beginning of the flash is the cookie list, which allows the boot ROM code to jump into onchip flash directly bypassing external flash.
-static uint8_t validate_bin_nvic(const uint8_t *buf)
+static uint8_t validate_bin_nvic_ti(const uint8_t *buf)
 {
     return (memcmp(buf, cookieList, sizeof(cookieList)) == 0);
 }
 
 const target_family_descriptor_t g_ti_family = {
     .family_id = kTI_Cc3220sf_FamilyID,
-    .target_set_state = target_set_state,
-    .validate_bin_nvic = validate_bin_nvic,
+    .target_set_state = target_set_state_ti,
+    .validate_bin_nvic = validate_bin_nvic_ti,
 };
 
diff --git a/source/family/toshiba/target_reset_tz.c b/source/family/toshiba/target_reset_tz.c
@@ -18,13 +18,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 #include "cmsis_os2.h"
 #include "target_reset.h"
 #include "swd_host.h"
 #include "target_family.h"
 
-void target_before_init_debug(void) {
+static void target_before_init_debug_tz(void) {
     swd_set_target_reset(1);
     osDelay(2);
     swd_set_target_reset(0);
@@ -37,5 +37,5 @@ const target_family_descriptor_t g_toshiba_tz_family = {
     .family_id = kToshiba_Tz_FamilyID,
     .default_reset_type = kSoftwareReset,
     .soft_reset_type = SYSRESETREQ,
-    .target_before_init_debug = target_before_init_debug,
+    .target_before_init_debug = target_before_init_debug_tz,
 };
diff --git a/source/family/wiznet/target_reset_wiznet.c b/source/family/wiznet/target_reset_wiznet.c

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`#include "power_ctrl.h"`
`31`	`31`	`#include "uart.h"`
`32`	`32`
`33`		`-static void target_before_init_debug(void)`
	`33`	`+static void musca_a_target_before_init_debug(void)`
`34`	`34`	`{`
`35`	`35`	`uint8_t buf[12];`
`36`	`36`
`@@ -103,7 +103,7 @@ static void target_before_init_debug(void)`
`103`	`103`	`return;`
`104`	`104`	`}`
`105`	`105`
`106`		`-static uint8_t target_set_state(TARGET_RESET_STATE state)`
	`106`	`+static uint8_t musca_a_target_set_state(TARGET_RESET_STATE state)`
`107`	`107`	`{`
`108`	`108`	`if(state == RESET_RUN)`
`109`	`109`	`{`
`@@ -156,8 +156,8 @@ static uint8_t target_set_state(TARGET_RESET_STATE state)`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`const target_family_descriptor_t g_target_family_musca_a = {`
`159`		`- .target_before_init_debug = target_before_init_debug,`
`160`		`- .target_set_state = target_set_state,`
	`159`	`+ .target_before_init_debug = musca_a_target_before_init_debug,`
	`160`	`+ .target_set_state = musca_a_target_set_state,`
`161`	`161`	`.apsel = 0x01000000,`
`162`	`162`	`};`
`163`	`163`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`#include "power_ctrl.h"`
`32`	`32`	`#include "uart.h"`
`33`	`33`
`34`		`-static void target_before_init_debug(void)`
	`34`	`+static void musca_b_target_before_init_debug(void)`
`35`	`35`	`{`
`36`	`36`	`uint8_t buf[12];`
`37`	`37`
`@@ -108,7 +108,7 @@ static void target_before_init_debug(void)`
`108`	`108`	`return;`
`109`	`109`	`}`
`110`	`110`
`111`		`-static uint8_t target_set_state(TARGET_RESET_STATE state)`
	`111`	`+static uint8_t musca_b_target_set_state(TARGET_RESET_STATE state)`
`112`	`112`	`{`
`113`	`113`	`if(state == RESET_RUN)`
`114`	`114`	`{`
`@@ -161,8 +161,8 @@ static uint8_t target_set_state(TARGET_RESET_STATE state)`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`const target_family_descriptor_t g_target_family_musca_b = {`
`164`		`- .target_before_init_debug = target_before_init_debug,`
`165`		`- .target_set_state = target_set_state,`
	`164`	`+ .target_before_init_debug = musca_b_target_before_init_debug,`
	`165`	`+ .target_set_state = musca_b_target_set_state,`
`166`	`166`	`.apsel = 0x01000000,`
`167`	`167`	`};`
`168`	`168`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ static void prerun_target_config(void)`
`51`	`51`	`}`
`52`	`52`
`53`	`53`
`54`		`-static uint8_t target_set_state(TARGET_RESET_STATE state)`
	`54`	`+static uint8_t lpc4088_target_set_state(TARGET_RESET_STATE state)`
`55`	`55`	`{`
`56`	`56`	`//return swd_set_target_state_hw(state);`
`57`	`57`	`uint8_t res;`
`@@ -72,7 +72,7 @@ static uint8_t target_set_state(TARGET_RESET_STATE state)`
`72`	`72`	`const target_family_descriptor_t g_nxp_lpc4088 = {`
`73`	`73`	`.family_id = VENDOR_TO_FAMILY(kNXP_VendorID, 0), //ID not maching the predefined family ids`
`74`	`74`	`.prerun_target_config = prerun_target_config,`
`75`		`- .target_set_state = target_set_state,`
	`75`	`+ .target_set_state = lpc4088_target_set_state,`
`76`	`76`	`};`
`77`	`77`
`78`	`78`	`const target_family_descriptor_t *g_target_family = &g_nxp_lpc4088;`
Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,14 @@`
`19`	`19`	`#include "DAP_config.h"`
`20`	`20`	`#include "target_family.h"`
`21`	`21`
`22`		`-static void swd_set_target_reset(uint8_t asserted)`
	`22`	`+static void swd_set_target_reset_realtek(uint8_t asserted)`
`23`	`23`	`{`
`24`	`24`	`if (asserted) {`
`25`	`25`	`swd_write_word(0xE000ED0C, 0x05FA0004);`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`-static uint8_t validate_bin_nvic(const uint8_t *buf)`
	`29`	`+static uint8_t validate_bin_nvic_realtek(const uint8_t *buf)`
`30`	`30`	`{`
`31`	`31`	`const char header[] = {0x99, 0x99, 0x96, 0x96, 0x3F, 0xCC, 0x66, 0xFC,`
`32`	`32`	`0xC0, 0x33, 0xCC, 0x03, 0xE5, 0xDC, 0x31, 0x62};`
`@@ -37,6 +37,6 @@ static uint8_t validate_bin_nvic(const uint8_t *buf)`
`37`	`37`	`const target_family_descriptor_t g_realtek_rtl8195am = {`
`38`	`38`	`.family_id = kRealtek_Rtl8195am_FamilyID,`
`39`	`39`	`.default_reset_type = kHardwareReset,`
`40`		`- .swd_set_target_reset = swd_set_target_reset,`
`41`		`- .validate_bin_nvic = validate_bin_nvic,`
	`40`	`+ .swd_set_target_reset = swd_set_target_reset_realtek,`
	`41`	`+ .validate_bin_nvic = validate_bin_nvic_realtek,`
`42`	`42`	`};`