cc3200: Correct udelay us to ticks calculation.

Daniel Campora · Daniel Campora · commit 9220dc466a8d · 2015-07-08T13:13:37.000+02:00
diff --git a/cc3200/bootmgr/main.c b/cc3200/bootmgr/main.c
@@ -64,11 +64,11 @@
 #define BOOTMGR_HASH_SIZE                   32
 #define BOOTMGR_BUFF_SIZE                   512
 
-#define BOOTMGR_WAIT_SAFE_MODE_MS           1200
-#define BOOTMGR_WAIT_SAFE_MODE_TOOGLE_MS    200
+#define BOOTMGR_WAIT_SAFE_MODE_MS           2400
+#define BOOTMGR_WAIT_SAFE_MODE_TOOGLE_MS    400
 
-#define BOOTMGR_SAFE_MODE_ENTER_MS          800
-#define BOOTMGR_SAFE_MODE_ENTER_TOOGLE_MS   80
+#define BOOTMGR_SAFE_MODE_ENTER_MS          1600
+#define BOOTMGR_SAFE_MODE_ENTER_TOOGLE_MS   160
 
 //*****************************************************************************
 // Exported functions declarations
diff --git a/cc3200/hal/cc3200_hal.c b/cc3200/hal/cc3200_hal.c
@@ -123,9 +123,7 @@ void HAL_Delay(uint32_t delay) {
         #endif
     } else {
         for (int ms = 0; ms < delay; ms++) {
-            // 500 instead of 1000 us to compensate the overhead of the for loop
-            // and the function call
-            UtilsDelay(UTILS_DELAY_US_TO_COUNT(500));
+            UtilsDelay(UTILS_DELAY_US_TO_COUNT(1000));
         }
     }
 }
diff --git a/cc3200/hal/cc3200_hal.h b/cc3200/hal/cc3200_hal.h
@@ -37,7 +37,7 @@
 #define HAL_FCPU_MHZ                        80U
 #define HAL_FCPU_HZ                         (1000000U * HAL_FCPU_MHZ)
 #define HAL_SYSTICK_PERIOD_US               1000U
-#define UTILS_DELAY_US_TO_COUNT(us)         (((us) * HAL_FCPU_MHZ) / 3)
+#define UTILS_DELAY_US_TO_COUNT(us)         (((us) * HAL_FCPU_MHZ) / 6)
 
 #define HAL_NVIC_INT_CTRL_REG               (*((volatile uint32_t *) 0xE000ED04 ) )
 #define HAL_VECTACTIVE_MASK                 (0x1FUL)

Original file line number	Diff line number	Diff line change
`@@ -123,9 +123,7 @@ void HAL_Delay(uint32_t delay) {`
`123`	`123`	`#endif`
`124`	`124`	`} else {`
`125`	`125`	`for (int ms = 0; ms < delay; ms++) {`
`126`		`- // 500 instead of 1000 us to compensate the overhead of the for loop`
`127`		`- // and the function call`
`128`		`- UtilsDelay(UTILS_DELAY_US_TO_COUNT(500));`
	`126`	`+ UtilsDelay(UTILS_DELAY_US_TO_COUNT(1000));`
`129`	`127`	`}`
`130`	`128`	`}`
`131`	`129`	`}`