From 2fcafb9c93aeacd0c9eeb27cd886bb30b6080a52 Mon Sep 17 00:00:00 2001 From: Chris Snow Date: Tue, 13 Aug 2019 15:33:33 +0100 Subject: [PATCH 1/4] LPC1768 WDT implementation --- .../TARGET_NXP/TARGET_LPC176X/watchdog_api.c | 67 +++++++++++++++++++ targets/targets.json | 3 +- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 targets/TARGET_NXP/TARGET_LPC176X/watchdog_api.c diff --git a/targets/TARGET_NXP/TARGET_LPC176X/watchdog_api.c b/targets/TARGET_NXP/TARGET_LPC176X/watchdog_api.c new file mode 100644 index 00000000000..b0224f4a771 --- /dev/null +++ b/targets/TARGET_NXP/TARGET_LPC176X/watchdog_api.c @@ -0,0 +1,67 @@ +/* mbed Microcontroller Library + * Copyright (c) 2006-2018 ARM Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +#ifdef DEVICE_WATCHDOG + +#include "watchdog_api.h" +#include "reset_reason_api.h" +#include "device.h" +#include "mbed_error.h" +#include + + + +watchdog_status_t hal_watchdog_init(const watchdog_config_t *config) +{ + LPC_WDT->WDCLKSEL = 0x1; //CLK src to PCLK + uint32_t clk = SystemCoreClock / 16; // WD has a fixed /4 prescaler, PCLK default is /4 + LPC_WDT->WDTC = ((float)config->timeout_ms )* clk/1000; + LPC_WDT->WDMOD = 0x3; // Enable and Reset + hal_watchdog_kick(); + + return WATCHDOG_STATUS_OK; +} + +void hal_watchdog_kick(void) +{ + LPC_WDT->WDFEED = 0xAA; + LPC_WDT->WDFEED = 0x55; +} +watchdog_status_t hal_watchdog_stop(void) +{ + return WATCHDOG_STATUS_NOT_SUPPORTED; +} + +uint32_t hal_watchdog_get_reload_value(void) +{ + uint32_t clk = SystemCoreClock / 16; // WD has a fixed /4 prescaler, PCLK default is /4 + + return (float)LPC_WDT->WDTC/clk*1000; +} + +watchdog_features_t hal_watchdog_get_platform_features(void) +{ + uint32_t clk = SystemCoreClock / 16; // WD has a fixed /4 prescaler, PCLK default is /4 + watchdog_features_t features; + features.max_timeout = ((float)INT32_MAX/clk)*1000; + features.update_config = true; + features.disable_watchdog = false; + + return features; +} + +#endif // DEVICE_WATCHDOG diff --git a/targets/targets.json b/targets/targets.json index 91b4ae463a4..0011e90b494 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -624,7 +624,8 @@ "STDIO_MESSAGES", "FLASH", "MPU", - "USBDEVICE" + "USBDEVICE", + "WATCHDOG" ], "release_versions": ["2", "5"], "device_name": "LPC1768", From 7e2c2a98dd64e0c774c7583ed7593a0b3d42dc38 Mon Sep 17 00:00:00 2001 From: Chris Snow Date: Wed, 14 Aug 2019 15:50:11 +0100 Subject: [PATCH 2/4] LPC1768 Reset Reason implementation --- .../TARGET_NXP/TARGET_LPC176X/reset_reason.c | 62 +++++++++++++++++++ targets/targets.json | 3 +- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 targets/TARGET_NXP/TARGET_LPC176X/reset_reason.c diff --git a/targets/TARGET_NXP/TARGET_LPC176X/reset_reason.c b/targets/TARGET_NXP/TARGET_LPC176X/reset_reason.c new file mode 100644 index 00000000000..bbf08f50f99 --- /dev/null +++ b/targets/TARGET_NXP/TARGET_LPC176X/reset_reason.c @@ -0,0 +1,62 @@ +/* mbed Microcontroller Library + * Copyright (c) 2006-2017 ARM Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include "reset_reason_api.h" + +#ifdef DEVICE_RESET_REASON + +#include "device.h" + +reset_reason_t hal_reset_reason_get(void) +{ + if (LPC_SC->RSID & (1<<0)) { + return RESET_REASON_POWER_ON; + } + + if (LPC_SC->RSID & (1<<1)) { + return RESET_REASON_PIN_RESET; + } + if (LPC_SC->RSID & (1<<2)) { + return RESET_REASON_WATCHDOG; + } + + if (LPC_SC->RSID & (1<<3)) { + return RESET_REASON_BROWN_OUT; + } + if (LPC_SC->RSID & (1<<4)) { + return RESET_REASON_SOFTWARE; + } + + if (LPC_SC->RSID & (1<<5)) { + return RESET_REASON_LOCKUP; + } + + return RESET_REASON_UNKNOWN; +} + + +uint32_t hal_reset_reason_get_raw(void) +{ + + return LPC_SC->RSID; +} + + +void hal_reset_reason_clear(void) +{ + LPC_SC->RSID = 0xff; // Clear flags +} + +#endif // DEVICE_RESET_REASON diff --git a/targets/targets.json b/targets/targets.json index 0011e90b494..2a5e885a78a 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -625,7 +625,8 @@ "FLASH", "MPU", "USBDEVICE", - "WATCHDOG" + "WATCHDOG", + "RESET_REASON" ], "release_versions": ["2", "5"], "device_name": "LPC1768", From edc992b29772f9c9e8d1c95e9b64572b79625cc5 Mon Sep 17 00:00:00 2001 From: Chris Snow Date: Wed, 14 Aug 2019 17:15:18 +0100 Subject: [PATCH 3/4] Enable WATCHDOG and RESET_REASON for other LPC1768 targets --- targets/targets.json | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/targets/targets.json b/targets/targets.json index 2a5e885a78a..670724570e2 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -675,7 +675,9 @@ "FLASH", "MPU", "USBDEVICE", - "USTICKER" + "USTICKER", + "WATCHDOG", + "RESET_REASON" ], "release_versions": ["2", "5"], "device_name": "LPC1768", @@ -725,7 +727,9 @@ "SPISLAVE", "STDIO_MESSAGES", "FLASH", - "MPU" + "MPU", + "WATCHDOG", + "RESET_REASON" ], "release_versions": ["2", "5"], "device_name": "LPC1768", @@ -763,7 +767,9 @@ "SPISLAVE", "STDIO_MESSAGES", "FLASH", - "MPU" + "MPU", + "WATCHDOG", + "RESET_REASON" ], "device_name": "LPC1768" }, From 82f4be0b4d52fcc8d53131bc832e04b57528de05 Mon Sep 17 00:00:00 2001 From: Chris Snow Date: Mon, 19 Aug 2019 11:58:02 +0100 Subject: [PATCH 4/4] SPDX identifier and license amended --- targets/TARGET_NXP/TARGET_LPC176X/reset_reason.c | 9 +++++++-- targets/TARGET_NXP/TARGET_LPC176X/watchdog_api.c | 11 +++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/targets/TARGET_NXP/TARGET_LPC176X/reset_reason.c b/targets/TARGET_NXP/TARGET_LPC176X/reset_reason.c index bbf08f50f99..a6a5d4f8cc4 100644 --- a/targets/TARGET_NXP/TARGET_LPC176X/reset_reason.c +++ b/targets/TARGET_NXP/TARGET_LPC176X/reset_reason.c @@ -1,5 +1,5 @@ -/* mbed Microcontroller Library - * Copyright (c) 2006-2017 ARM Limited +/* Copyright (c) 2017-2019 ARM Limited + * SPDX-License-Identifier: Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,6 +12,11 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * @section DESCRIPTION + * + * LPC1768 Reset Reason + * */ #include "reset_reason_api.h" diff --git a/targets/TARGET_NXP/TARGET_LPC176X/watchdog_api.c b/targets/TARGET_NXP/TARGET_LPC176X/watchdog_api.c index b0224f4a771..40172d6e760 100644 --- a/targets/TARGET_NXP/TARGET_LPC176X/watchdog_api.c +++ b/targets/TARGET_NXP/TARGET_LPC176X/watchdog_api.c @@ -1,5 +1,5 @@ -/* mbed Microcontroller Library - * Copyright (c) 2006-2018 ARM Limited +/* Copyright (c) 2017-2019 ARM Limited + * SPDX-License-Identifier: Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,9 +12,12 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * @section DESCRIPTION + * + * LPC1768 Watchdog + * */ - - #ifdef DEVICE_WATCHDOG #include "watchdog_api.h"