Dynamic vector relocation and formatting changes

Author: Ganesh Ramachandran

targets/TARGET_TOSHIBA/TARGET_TMPM46B/Periph_Driver/inc/tx04_common.h

@@ -17,7 +17,8 @@
 
 typedef enum {
     SUCCESS = 0U,
-    ERROR = 1U
+    ERROR = 1U,
+    FAIL = -1
 } Result;
 
 typedef enum {

targets/TARGET_TOSHIBA/TARGET_TMPM46B/flash_api.c

@@ -84,7 +84,7 @@ int32_t flash_free(flash_t *obj)
 #endif
 int32_t flash_erase_sector(flash_t *obj, uint32_t address)
 {
-    int status = ERROR;
+    int status = FAIL;
     /* We need to prevent flash accesses during erase operation */
     core_util_critical_section_enter();
 
@@ -110,7 +110,7 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
         if (FC_SUCCESS == FC_WritePage((uint32_t)address, (uint32_t *)data)) {      /* write one page every time */
             /* Do nothing */
         } else {
-            status = ERROR;
+            status = FAIL;
             break;
         }
         size = size - PROGRAM_WIRTE_MAX;
@@ -120,7 +120,7 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
     if (FC_SUCCESS == FC_WritePage((uint32_t)address, (uint32_t *)data)) {  /* write the last data, no more than one page */
         /* Do nothing */
     } else {
-        status = ERROR;
+        status = FAIL;
     }
 
     core_util_critical_section_exit();

targets/TARGET_TOSHIBA/TARGET_TMPM46B/pwmout_api.c

@@ -108,7 +108,7 @@ void pwmout_write(pwmout_t *obj, float value)
     }
     TMRB_SetFlipFlop(obj->channel, &FFStruct);
 
-    if (obj->period > 0.7){
+    if (obj->period > 0.7) {
         value = 1; //TMPM46B duty cycle should be < 700ms, above 700ms fixed 50% duty cycle
     }
     // Store the new leading_timing value
@@ -148,7 +148,7 @@ void pwmout_period_us(pwmout_t *obj, int us)
     seconds = (float)((us) / 1000000.0f);
     obj->period = seconds;
 
-    if (obj->period > 0.7){
+    if (obj->period > 0.7) {
         clk_freq = (CLOCK_FREQUENCY / 2);
     } else {
         clk_freq = CLOCK_FREQUENCY;

targets/TARGET_TOSHIBA/TARGET_TMPM46B/spi_api.c

@@ -60,18 +60,6 @@ static const PinMap PinMap_SPI_SSEL[] = {
     {NC,  NC,    0}
 };
 
-typedef enum {
-    SPI_SPH0_SPO0 = 0,   // [Clock Phase 0, Clock Polarity 0] = 0
-    SPI_SPH0_SPO1,       // [Clock Phase 0, Clock Polarity 1] = 1
-    SPI_SPH1_SPO0,       // [Clock Phase 1, Clock Polarity 0] = 2
-    SPI_SPH1_SPO1        // [Clock Phase 1, Clock Polarity 1] = 3
-} SPI_MODE;
-
-typedef enum {
-    SPI_MASTER,
-    SPI_SLAVE
-} spi_mode;
-
 #define TMPM46B_SPI_2_FMAX    20000000
 #define TMPM46B_SPI_FMAX      10000000
 
@@ -149,7 +137,7 @@ void spi_free(spi_t *obj)
 void spi_format(spi_t *obj, int bits, int mode, int slave)
 {
     TSB_SSP_TypeDef* spi;
-    MBED_ASSERT(slave == SPI_MASTER);   // Master mode only
+    MBED_ASSERT(slave == SSP_MASTER);   // Master mode only
 
     spi = obj->spi;
 
@@ -194,9 +182,9 @@ void spi_frequency(spi_t *obj, int hz)
 
     spi = obj->spi;
     fr_gear = SystemCoreClock / hz;
-    if (fr_gear < 48){
+    if (fr_gear < 48) {
         cur_cpsdvsr = fr_gear;
-    } 
+    }
     while (best_diff != 0 && cur_cpsdvsr <= 254) {
         cur_scr = fr_gear / cur_cpsdvsr - 1;
 

targets/TARGET_TOSHIBA/TARGET_TMPM46B/trng_api.c

@@ -65,20 +65,18 @@ int trng_get_bytes(trng_t *obj, uint8_t *output, size_t length, size_t *output_l
 
     *output_length = 0;
 
-    if (!obj->trng_init){
+    if (!obj->trng_init) {
         error("TRNG is not Initialised");
-        return -1;
+        return FAIL; // fail i.e. -1 
     }
 
-    while (ESG_GetIntStatus() == DISABLE)
-    {
-       // Wait for ESG core for generating an interrupt
+    while (ESG_GetIntStatus() == DISABLE) {
+        // Wait for ESG core for generating an interrupt
     }
     // Interrupt clearing
     ret = ESG_ClrInt();
-    if (ret == ERROR)
-    {
-        return ret;
+    if (ret == ERROR) {
+        return FAIL; // fail i.e. -1 
     }
     // Get the calculation result
     ESG_GetResult((uint32_t*)random); //512-bit entropy
@@ -90,8 +88,11 @@ int trng_get_bytes(trng_t *obj, uint8_t *output, size_t length, size_t *output_l
     }
     *output_length = i;
     //clear and restart the ESG core
-    ESG_IPReset(); 
+    ESG_IPReset();
     ret |= ESG_Startup();
+    if (ret == ERROR) {
+        return FAIL; // fail i.e. -1
+    }
 
     return ret;
 }

targets/TARGET_TOSHIBA/TARGET_TMPM46B/us_ticker.c

@@ -22,17 +22,11 @@
 static uint8_t us_ticker_inited = 0;                // Is ticker initialized yet?
 static volatile uint32_t us_ticker = 0;             // timer counter
 
-void INTTB1_IRQHandler(void)
-{
-    // This function is going to disable the interrupts if there are
-    us_ticker_irq_handler();
-}
-
 const ticker_info_t* us_ticker_get_info()
 {
     static const ticker_info_t info = {
-			1875000,//1875000,
-            16     // 16 bit counter
+        1875000, // 1875000,
+        16       // 16 bit counter
     };
     return &info;
 }
@@ -91,7 +85,7 @@ void us_ticker_set_interrupt(timestamp_t timestamp)
 
     const uint32_t now_ticks = us_ticker_read();
     uint32_t delta_ticks =
-            timestamp >= now_ticks ? timestamp - now_ticks : (uint32_t)((uint64_t) timestamp + 0xFFFF - now_ticks);
+        timestamp >= now_ticks ? timestamp - now_ticks : (uint32_t)((uint64_t) timestamp + 0xFFFF - now_ticks);
 
     if (delta_ticks == 0) {
         /* The requested delay is less than the minimum resolution of this counter. */
@@ -101,6 +95,7 @@ void us_ticker_set_interrupt(timestamp_t timestamp)
     // Ticker interrupt handle
     TMRB_Enable(TSB_TB1);
     TMRB_SetRunState(TSB_TB1, TMRB_STOP);
+    NVIC_SetVector(INTTB1_IRQn, (uint32_t)us_ticker_irq_handler);
     NVIC_EnableIRQ(INTTB1_IRQn);
 
     // Split delta for preventing the Multiply overflowing