Merge pull request ARMmbed#90 from linlingao/enable_rtc

linlingao · web-flow · commit e72873743e5e · 2018-12-21T16:45:40.000-06:00
Added RTC, redefined system reset function, added config files to all…
diff --git a/TESTS/network/interface/mbed_app.json b/TESTS/network/interface/mbed_app.json
diff --git a/targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/device/system_CC3220SF.h b/targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/device/system_CC3220SF.h
@@ -50,6 +50,19 @@ extern void SystemInit (void);
  */
 extern void SystemCoreClockUpdate (void);
 
+extern void PRCMMCUReset(unsigned char bIncludeSubsystem);
+/**
+  \brief   System Reset
+  \details Initiates a system reset request to reset the MCU.
+ */
+__NO_RETURN __STATIC_INLINE void __CC3200_SystemReset(void)
+{
+    PRCMMCUReset(0);
+}
+#ifdef NVIC_SystemReset
+#undef NVIC_SystemReset
+#endif
+#define NVIC_SystemReset            __CC3200_SystemReset
 
 #ifdef __cplusplus
 }
diff --git a/targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/flash_api.c b/targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/flash_api.c
@@ -50,7 +50,14 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
 
 uint32_t flash_get_sector_size(const flash_t *obj, uint32_t address)
 {
-    return CC3200_FLASH_SECTOR_SIZE;
+    if ((address >= CC3200_FLASH_START_ADDRESS) && address < (CC3200_FLASH_START_ADDRESS + CC3200_FLASH_SIZE))
+    {
+        return CC3200_FLASH_SECTOR_SIZE;
+    }
+    else
+    {
+        return MBED_FLASH_INVALID_SIZE;
+    }
 }
 
 uint32_t flash_get_page_size(const flash_t *obj)
diff --git a/targets/targets.json b/targets/targets.json
@@ -7615,7 +7615,7 @@
         "inherits": ["CC32XX"],
         "macros": ["MBED_MPU_CUSTOM"],
         "components": ["SD"],
-        "device_has": ["USTICKER", "SERIAL", "SERIAL_FC", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "INTERRUPTIN", "SPI", "ANALOGIN", "FLASH", "TRNG"],
+        "device_has": ["USTICKER", "SERIAL", "SERIAL_FC", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "INTERRUPTIN", "SPI", "ANALOGIN", "FLASH", "TRNG", "RTC"],
         "core": "Cortex-M4",
         "bootloader_supported": true,
         "device_name": "CC3220SF"
diff --git a/tools/test_configs/CC3220SFInterface.json b/tools/test_configs/CC3220SFInterface.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "echo-server-addr" : {
+            "help" : "IP address of echo server",
+            "value" : "\"echo.mbedcloudtesting.com\""
+        },
+        "echo-server-port" : {
+            "help" : "Port of echo server",
+            "value" : "7"
+        }
+    },
+    "target_overrides": {
+        "*": {
+            "target.features_add"               : ["STORAGE"],
+            "target.components_add"             : ["SD"],
+            "target.network-default-interface-type": "WIFI",
+            "nsapi.default-wifi-security"       : "WPA_WPA2",
+            "nsapi.default-wifi-ssid"           : "\"SSID\"",
+            "nsapi.default-wifi-password"       : "\"PASSWORD\""
+        }
+    }
+}
diff --git a/tools/test_configs/config_paths.json b/tools/test_configs/config_paths.json
@@ -14,5 +14,6 @@
     "THREAD_END_DEVICE" : "ThreadInterface_end_device.json",
     "THREAD_ROUTER" : "ThreadInterface_router.json",
     "NO_NETWORK": "no_network.json",
-    "NANOSTACK_MAC_TESTER": "NanostackMACTester.json"
+    "NANOSTACK_MAC_TESTER": "NanostackMACTester.json",
+    "CC3220SF_WIFI": "CC3220SFInterface.json"
 }
diff --git a/tools/test_configs/target_configs.json b/tools/test_configs/target_configs.json
@@ -62,5 +62,10 @@
     "TB_SENSE_1": {
         "default_test_configuration": "NO_NETWORK",
         "test_configurations": ["6LOWPAN_HOST", "6LOWPAN_ROUTER", "THREAD_END_DEVICE", "THREAD_ROUTER"]
+    },
+    "CC3220SF": {
+        "nsapi.socket-stats-enable": true,
+        "default_test_configuration": "CC3220SF_WIFI",
+        "test_configurations": ["CC3220SF_WIFI"]
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,14 @@ int32_t flash_program_page(flash_t obj, uint32_t address, const uint8_t data,`
`50`	`50`
`51`	`51`	`uint32_t flash_get_sector_size(const flash_t *obj, uint32_t address)`
`52`	`52`	`{`
`53`		`- return CC3200_FLASH_SECTOR_SIZE;`
	`53`	`+ if ((address >= CC3200_FLASH_START_ADDRESS) && address < (CC3200_FLASH_START_ADDRESS + CC3200_FLASH_SIZE))`
	`54`	`+ {`
	`55`	`+ return CC3200_FLASH_SECTOR_SIZE;`
	`56`	`+ }`
	`57`	`+ else`
	`58`	`+ {`
	`59`	`+ return MBED_FLASH_INVALID_SIZE;`
	`60`	`+ }`
`54`	`61`	`}`
`55`	`62`
`56`	`63`	`uint32_t flash_get_page_size(const flash_t *obj)`
Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,6 @@`
`14`	`14`	`"THREAD_END_DEVICE" : "ThreadInterface_end_device.json",`
`15`	`15`	`"THREAD_ROUTER" : "ThreadInterface_router.json",`
`16`	`16`	`"NO_NETWORK": "no_network.json",`
`17`		`- "NANOSTACK_MAC_TESTER": "NanostackMACTester.json"`
	`17`	`+ "NANOSTACK_MAC_TESTER": "NanostackMACTester.json",`
	`18`	`+ "CC3220SF_WIFI": "CC3220SFInterface.json"`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,5 +62,10 @@`
`62`	`62`	`"TB_SENSE_1": {`
`63`	`63`	`"default_test_configuration": "NO_NETWORK",`
`64`	`64`	`"test_configurations": ["6LOWPAN_HOST", "6LOWPAN_ROUTER", "THREAD_END_DEVICE", "THREAD_ROUTER"]`
	`65`	`+ },`
	`66`	`+ "CC3220SF": {`
	`67`	`+ "nsapi.socket-stats-enable": true,`
	`68`	`+ "default_test_configuration": "CC3220SF_WIFI",`
	`69`	`+ "test_configurations": ["CC3220SF_WIFI"]`
`65`	`70`	`}`
`66`	`71`	`}`