Skip to content

Commit d885de6

Browse files
ccli8ccli8
committed
[NUC472/M453] Move target configuration from mbed_lib.json to targets.json
1 parent 8092c36 commit d885de6

File tree

5 files changed

+60
-68
lines changed

5 files changed

+60
-68
lines changed

‎targets/TARGET_NUVOTON/TARGET_M451/gpio_irq_api.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,23 +52,23 @@ static struct nu_gpio_irq_var gpio_irq_var_arr[] = {
5252

5353
#define NU_MAX_PORT (sizeof (gpio_irq_var_arr) / sizeof (gpio_irq_var_arr[0]))
5454

55-
#ifndef MBED_CONF_M451_GPIO_IRQ_DEBOUNCE_ENABLE
56-
#define MBED_CONF_M451_GPIO_IRQ_DEBOUNCE_ENABLE 0
55+
#ifndef MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_ENABLE
56+
#define MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_ENABLE 0
5757
#endif
5858

59-
#ifndef MBED_CONF_M451_GPIO_IRQ_DEBOUNCE_ENABLE_LIST
60-
#define MBED_CONF_M451_GPIO_IRQ_DEBOUNCE_ENABLE_LIST NC
59+
#ifndef MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_ENABLE_LIST
60+
#define MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_ENABLE_LIST NC
6161
#endif
6262
static PinName gpio_irq_debounce_arr[] = {
63-
MBED_CONF_M451_GPIO_IRQ_DEBOUNCE_ENABLE_LIST
63+
MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_ENABLE_LIST
6464
};
6565

66-
#ifndef MBED_CONF_M451_GPIO_IRQ_DEBOUNCE_CLOCK_SOURCE
67-
#define MBED_CONF_M451_GPIO_IRQ_DEBOUNCE_CLOCK_SOURCE GPIO_DBCTL_DBCLKSRC_LIRC
66+
#ifndef MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_CLOCK_SOURCE
67+
#define MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_CLOCK_SOURCE GPIO_DBCTL_DBCLKSRC_LIRC
6868
#endif
6969

70-
#ifndef MBED_CONF_M451_GPIO_IRQ_DEBOUNCE_SAMPLE_RATE
71-
#define MBED_CONF_M451_GPIO_IRQ_DEBOUNCE_SAMPLE_RATE GPIO_DBCTL_DBCLKSEL_16
70+
#ifndef MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_SAMPLE_RATE
71+
#define MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_SAMPLE_RATE GPIO_DBCTL_DBCLKSEL_16
7272
#endif
7373

7474
int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32_t id)
@@ -92,12 +92,12 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
9292
//gpio_set(pin);
9393

9494
{
95-
#if MBED_CONF_M451_GPIO_IRQ_DEBOUNCE_ENABLE
95+
#if MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_ENABLE
9696
// Suppress compiler warning
9797
(void) gpio_irq_debounce_arr;
9898

9999
// Configure de-bounce clock source and sampling cycle time
100-
GPIO_SET_DEBOUNCE_TIME(MBED_CONF_M451_GPIO_IRQ_DEBOUNCE_CLOCK_SOURCE, MBED_CONF_M451_GPIO_IRQ_DEBOUNCE_SAMPLE_RATE);
100+
GPIO_SET_DEBOUNCE_TIME(MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_CLOCK_SOURCE, MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_SAMPLE_RATE);
101101
GPIO_ENABLE_DEBOUNCE(gpio_base, 1 << pin_index);
102102
#else
103103
// Enable de-bounce if the pin is in the de-bounce enable list
@@ -114,7 +114,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
114114
if (pin_index == pin_index_debunce &&
115115
port_index == port_index_debounce) {
116116
// Configure de-bounce clock source and sampling cycle time
117-
GPIO_SET_DEBOUNCE_TIME(MBED_CONF_M451_GPIO_IRQ_DEBOUNCE_CLOCK_SOURCE, MBED_CONF_M451_GPIO_IRQ_DEBOUNCE_SAMPLE_RATE);
117+
GPIO_SET_DEBOUNCE_TIME(MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_CLOCK_SOURCE, MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_SAMPLE_RATE);
118118
GPIO_ENABLE_DEBOUNCE(gpio_base, 1 << pin_index);
119119
break;
120120
}

‎targets/TARGET_NUVOTON/TARGET_M451/mbed_lib.json

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎targets/TARGET_NUVOTON/TARGET_NUC472/gpio_irq_api.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,23 +58,23 @@ static struct nu_gpio_irq_var gpio_irq_var_arr[] = {
5858

5959
#define NU_MAX_PORT (sizeof (gpio_irq_var_arr) / sizeof (gpio_irq_var_arr[0]))
6060

61-
#ifndef MBED_CONF_NUC472_GPIO_IRQ_DEBOUNCE_ENABLE
62-
#define MBED_CONF_NUC472_GPIO_IRQ_DEBOUNCE_ENABLE 0
61+
#ifndef MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_ENABLE
62+
#define MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_ENABLE 0
6363
#endif
6464

65-
#ifndef MBED_CONF_NUC472_GPIO_IRQ_DEBOUNCE_ENABLE_LIST
66-
#define MBED_CONF_NUC472_GPIO_IRQ_DEBOUNCE_ENABLE_LIST NC
65+
#ifndef MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_ENABLE_LIST
66+
#define MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_ENABLE_LIST NC
6767
#endif
6868
static PinName gpio_irq_debounce_arr[] = {
69-
MBED_CONF_NUC472_GPIO_IRQ_DEBOUNCE_ENABLE_LIST
69+
MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_ENABLE_LIST
7070
};
7171

72-
#ifndef MBED_CONF_NUC472_GPIO_IRQ_DEBOUNCE_CLOCK_SOURCE
73-
#define MBED_CONF_NUC472_GPIO_IRQ_DEBOUNCE_CLOCK_SOURCE GPIO_DBCTL_DBCLKSRC_IRC10K
72+
#ifndef MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_CLOCK_SOURCE
73+
#define MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_CLOCK_SOURCE GPIO_DBCTL_DBCLKSRC_IRC10K
7474
#endif
7575

76-
#ifndef MBED_CONF_NUC472_GPIO_IRQ_DEBOUNCE_SAMPLE_RATE
77-
#define MBED_CONF_NUC472_GPIO_IRQ_DEBOUNCE_SAMPLE_RATE GPIO_DBCTL_DBCLKSEL_16
76+
#ifndef MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_SAMPLE_RATE
77+
#define MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_SAMPLE_RATE GPIO_DBCTL_DBCLKSEL_16
7878
#endif
7979

8080
int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32_t id)
@@ -98,12 +98,12 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
9898
//gpio_set(pin);
9999

100100
{
101-
#if MBED_CONF_NUC472_GPIO_IRQ_DEBOUNCE_ENABLE
101+
#if MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_ENABLE
102102
// Suppress compiler warning
103103
(void) gpio_irq_debounce_arr;
104104

105105
// Configure de-bounce clock source and sampling cycle time
106-
GPIO_SET_DEBOUNCE_TIME(MBED_CONF_NUC472_GPIO_IRQ_DEBOUNCE_CLOCK_SOURCE, MBED_CONF_NUC472_GPIO_IRQ_DEBOUNCE_SAMPLE_RATE);
106+
GPIO_SET_DEBOUNCE_TIME(MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_CLOCK_SOURCE, MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_SAMPLE_RATE);
107107
GPIO_ENABLE_DEBOUNCE(gpio_base, 1 << pin_index);
108108
#else
109109
// Enable de-bounce if the pin is in the de-bounce enable list
@@ -120,7 +120,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
120120
if (pin_index == pin_index_debunce &&
121121
port_index == port_index_debounce) {
122122
// Configure de-bounce clock source and sampling cycle time
123-
GPIO_SET_DEBOUNCE_TIME(MBED_CONF_NUC472_GPIO_IRQ_DEBOUNCE_CLOCK_SOURCE, MBED_CONF_NUC472_GPIO_IRQ_DEBOUNCE_SAMPLE_RATE);
123+
GPIO_SET_DEBOUNCE_TIME(MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_CLOCK_SOURCE, MBED_CONF_TARGET_GPIO_IRQ_DEBOUNCE_SAMPLE_RATE);
124124
GPIO_ENABLE_DEBOUNCE(gpio_base, 1 << pin_index);
125125
break;
126126
}

‎targets/TARGET_NUVOTON/TARGET_NUC472/mbed_lib.json

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎targets/targets.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3126,6 +3126,24 @@
31263126
"extra_labels": ["NUVOTON", "NUC472", "NU_XRAM_SUPPORTED", "FLASH_CMSIS_ALGO"],
31273127
"is_disk_virtual": true,
31283128
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
3129+
"config": {
3130+
"gpio-irq-debounce-enable": {
3131+
"help": "Enable GPIO IRQ debounce",
3132+
"value": 0
3133+
},
3134+
"gpio-irq-debounce-enable-list": {
3135+
"help": "Comma separated pin list to enable GPIO IRQ debounce",
3136+
"value": "NC"
3137+
},
3138+
"gpio-irq-debounce-clock-source": {
3139+
"help": "Select GPIO IRQ debounce clock source: GPIO_DBCTL_DBCLKSRC_HCLK or GPIO_DBCTL_DBCLKSRC_IRC10K",
3140+
"value": "GPIO_DBCTL_DBCLKSRC_IRC10K"
3141+
},
3142+
"gpio-irq-debounce-sample-rate": {
3143+
"help": "Select GPIO IRQ debounce sample rate: GPIO_DBCTL_DBCLKSEL_1, GPIO_DBCTL_DBCLKSEL_2, GPIO_DBCTL_DBCLKSEL_4, ..., or GPIO_DBCTL_DBCLKSEL_32768",
3144+
"value": "GPIO_DBCTL_DBCLKSEL_16"
3145+
}
3146+
},
31293147
"inherits": ["Target"],
31303148
"macros_add": ["MBEDTLS_CONFIG_HW_SUPPORT"],
31313149
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "STDIO_MESSAGES", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "TRNG", "CAN", "FLASH"],
@@ -3176,6 +3194,24 @@
31763194
"extra_labels": ["NUVOTON", "M451", "NUMAKER_PFM_M453", "FLASH_CMSIS_ALGO"],
31773195
"is_disk_virtual": true,
31783196
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
3197+
"config": {
3198+
"gpio-irq-debounce-enable": {
3199+
"help": "Enable GPIO IRQ debounce",
3200+
"value": 0
3201+
},
3202+
"gpio-irq-debounce-enable-list": {
3203+
"help": "Comma separated pin list to enable GPIO IRQ debounce",
3204+
"value": "NC"
3205+
},
3206+
"gpio-irq-debounce-clock-source": {
3207+
"help": "Select GPIO IRQ debounce clock source: GPIO_DBCTL_DBCLKSRC_HCLK or GPIO_DBCTL_DBCLKSRC_LIRC",
3208+
"value": "GPIO_DBCTL_DBCLKSRC_LIRC"
3209+
},
3210+
"gpio-irq-debounce-sample-rate": {
3211+
"help": "Select GPIO IRQ debounce sample rate: GPIO_DBCTL_DBCLKSEL_1, GPIO_DBCTL_DBCLKSEL_2, GPIO_DBCTL_DBCLKSEL_4, ..., or GPIO_DBCTL_DBCLKSEL_32768",
3212+
"value": "GPIO_DBCTL_DBCLKSEL_16"
3213+
}
3214+
},
31793215
"inherits": ["Target"],
31803216
"progen": {"target": "numaker-pfm-m453"},
31813217
"device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "STDIO_MESSAGES", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "CAN", "FLASH"],

0 commit comments

Comments
 (0)