Merge pull request #8108 from c1728p9/systick_rename

Rename device option STCLK_OFF_DURING_SLEEP
pull/8337/head
Martin Kojtal 2018-10-06 07:46:49 +02:00 committed by GitHub
commit 4fbd39c74e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions

View File

@ -169,9 +169,9 @@ void sleep_manager_sleep_auto(void);
static inline void sleep(void) static inline void sleep(void)
{ {
#if DEVICE_SLEEP #if DEVICE_SLEEP
#if (MBED_CONF_RTOS_PRESENT == 0) || (DEVICE_STCLK_OFF_DURING_SLEEP == 0) || defined(MBED_TICKLESS) #if (MBED_CONF_RTOS_PRESENT == 0) || (DEVICE_SYSTICK_CLK_OFF_DURING_SLEEP == 0) || defined(MBED_TICKLESS)
sleep_manager_sleep_auto(); sleep_manager_sleep_auto();
#endif /* (MBED_CONF_RTOS_PRESENT == 0) || (DEVICE_STCLK_OFF_DURING_SLEEP == 0) || defined(MBED_TICKLESS) */ #endif /* (MBED_CONF_RTOS_PRESENT == 0) || (DEVICE_SYSTICK_CLK_OFF_DURING_SLEEP == 0) || defined(MBED_TICKLESS) */
#endif /* DEVICE_SLEEP */ #endif /* DEVICE_SLEEP */
} }

View File

@ -3790,7 +3790,7 @@
"SLEEP", "SLEEP",
"SPI", "SPI",
"SPI_ASYNCH", "SPI_ASYNCH",
"STCLK_OFF_DURING_SLEEP", "SYSTICK_CLK_OFF_DURING_SLEEP",
"TRNG", "TRNG",
"USTICKER" "USTICKER"
], ],
@ -3895,7 +3895,7 @@
"SLEEP", "SLEEP",
"SPI", "SPI",
"SPI_ASYNCH", "SPI_ASYNCH",
"STCLK_OFF_DURING_SLEEP", "SYSTICK_CLK_OFF_DURING_SLEEP",
"TRNG", "TRNG",
"USTICKER", "USTICKER",
"QSPI" "QSPI"

View File

@ -82,7 +82,7 @@ DEVICE_HAS_ALLOWED = ["ANALOGIN", "ANALOGOUT", "CAN", "ETHERNET", "EMAC",
"LPTICKER", "PORTIN", "PORTINOUT", "PORTOUT", "LPTICKER", "PORTIN", "PORTINOUT", "PORTOUT",
"PWMOUT", "RTC", "TRNG","SERIAL", "SERIAL_ASYNCH", "PWMOUT", "RTC", "TRNG","SERIAL", "SERIAL_ASYNCH",
"SERIAL_FC", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE", "SERIAL_FC", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE",
"STORAGE", "STCLK_OFF_DURING_SLEEP"] "STORAGE", "SYSTICK_CLK_OFF_DURING_SLEEP"]
def check_device_has(dict): def check_device_has(dict):
for name in dict.get("device_has", []): for name in dict.get("device_has", []):
if name not in DEVICE_HAS_ALLOWED: if name not in DEVICE_HAS_ALLOWED: