You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/10/30 15:03:41 UTC
[incubator-nuttx] branch master updated (d7b4e91dda -> 59416af3e6)
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
from d7b4e91dda Call nxsem_destroy or nxmutex_destry in the error path
new 4051fcd42b include/endian.h: Fix format specifies type 'unsigned long' but the argument has type 'unsigned int'
new 513904d1df Fix gd32f4xx_dma.c:223:26: error: unused function 'gd32_dma_channel_get' [-Werror,-Wunused-function]
new 202408c6e7 Fix gd32f4xx_syscfg.c:137:5: error: variable 'regaddr' is used uninitialized whenever switch default is taken [-Werror,-Wsometimes-uninitialized]
new ad35572751 Fix Error: chip/gd32f4xx_spi.c:924:20: error: unused function 'spi_putreg16' [-Werror,-Wunused-function]
new d1a3f5e47f arch/arm: Replace xxx_[bus|usage]fault with arm_[bus|usage]fault
new c701d1c6ec Fix error: variable 'lfbclk' is used uninitialized whenever switch case is taken [-Werror,-Wsometimes-uninitialized]
new eeefc4a516 Fix chip/cxd56_usbdev.c:675:20: error: unused function 'cxd56_iscableconnected' [-Werror,-Wunused-function]
new d8babf8dfd Fix board/cxd56_sdcard.c:128:11: error: logical not is only applied to the left hand side of this comparison [-Werror,-Wlogical-not-parentheses]
new 929882862b Fix usbdev/usbmsc_desc.c:316:7: error: variable 'length' set but not used [-Werror,-Wunused-but-set-variable]
new 7ad74c413a Fix chip/cxd56_icc.c:498:18: error: overlapping comparisons always evaluate to false [-Werror,-Wtautological-overlap-compare]
new c6ae5e42c0 Fix chip/cxd56_farapi.c:285:14: error: format specifies type 'int' but the argument has type 'unsigned long' [-Werror,-Wformat]
new 2e3473c9d6 Fix src/cxd56_ili9340.c:276:22: error: cast to smaller integer type 'uint16_t' (aka 'unsigned short') from 'uint8_t *' (aka 'unsigned char *') [-Werror,-Wpointer-to-int-cast]
new 8405b7b4ff Fix Error: audio/cxd56.c:1945:20: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion]
new 940ee2c8b1 Fix Error: chip/efm32_clockconfig.c:109:20: error: unused function 'efm32_synchronize' [-Werror,-Wunused-function] static inline void efm32_synchronize(uint32_t bitset) ^ Error: chip/efm32_clockconfig.c:185:20: error: unused function 'efm32_enable_auxhfrco' [-Werror,-Wunused-function] static inline void efm32_enable_auxhfrco(void)
new e46bdeca1d Fix Error: board/cxd56_leds.c:43:20: error: unused function 'led_clrbits' [-Werror,-Wunused-function] static inline void led_clrbits(unsigned int clrbits) ^ Error: board/cxd56_leds.c:66:20: error: unused function 'led_setbits' [-Werror,-Wunused-function] static inline void led_setbits(unsigned int setbits)
new c2a4263cc5 Fix Error: modem/alt1250/altcom_hdlr.c:902:24: error: result of comparison of constant 1 with expression of type 'bool' is always false [-Werror,-Wtautological-constant-compare] api_edrx->enable > LTE_ENABLE) ~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~ Error: modem/alt1250/altcom_hdlr.c:901:24: error: result of comparison of constant 0 with expression of type 'bool' is always false [-Werror,-Wtautological-constant-compare] if (api_edrx->enable < LTE_DISABLE || ~~ [...]
new 09da04d7d2 Fix video/video.c:1458:52: error: implicit conversion from enumeration type 'enum v4l2_buf_type' to different enumeration type 'imgsensor_stream_type_t' (aka 'enum imgsensor_stream_type_e') [-Werror,-Wenum-conversion]
new 5d7f1d5020 Fix chip/stm32_sdio.c:749:24: error: unused function 'stm32_getpwrctrl' [-Werror,-Wunused-function]
new 04863785f1 Fix Error: audio/cs43l22.c:356:24: error: unused function 'cs43l22_scalevolume' [-Werror,-Wunused-function]
new 2d6503646d Fix Error: usbhost/usbhost_storage.c:1471:24: error: unused function 'usbhost_getle32'
new e9f630ecb5 Fix clang compiler warning in boards/arm/stm32/
new 59416af3e6 Fix modem/alt1250/altcom_cmd_sms.h:148:7: error: field u within 'struct apicmd_sms_msg_s' is less aligned than 'union
The 22 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/arm/src/armv7-m/arm_busfault.c | 6 +-
arch/arm/src/armv7-m/arm_hardfault.c | 6 +-
arch/arm/src/armv7-m/arm_memfault.c | 3 +-
arch/arm/src/armv7-m/arm_usagefault.c | 6 +-
arch/arm/src/armv8-m/arm_busfault.c | 6 +-
arch/arm/src/armv8-m/arm_hardfault.c | 6 +-
arch/arm/src/armv8-m/arm_memfault.c | 3 +-
arch/arm/src/armv8-m/arm_securefault.c | 3 +-
arch/arm/src/armv8-m/arm_usagefault.c | 6 +-
arch/arm/src/cxd56xx/cxd56_farapi.c | 2 +-
arch/arm/src/cxd56xx/cxd56_icc.c | 2 +-
arch/arm/src/cxd56xx/cxd56_irq.c | 22 +------
arch/arm/src/cxd56xx/cxd56_usbdev.c | 13 ----
arch/arm/src/efm32/efm32_clockconfig.c | 34 +----------
arch/arm/src/efm32/efm32_irq.c | 22 +------
arch/arm/src/eoss3/eoss3_irq.c | 22 +------
arch/arm/src/gd32f4/gd32f4xx_dma.c | 36 -----------
arch/arm/src/gd32f4/gd32f4xx_irq.c | 24 +-------
arch/arm/src/gd32f4/gd32f4xx_spi.c | 71 ----------------------
arch/arm/src/gd32f4/gd32f4xx_syscfg.c | 3 +-
arch/arm/src/imxrt/imxrt_irq.c | 24 +-------
arch/arm/src/kinetis/kinetis_irq.c | 22 +------
arch/arm/src/lc823450/lc823450_irq.c | 22 +------
arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c | 20 +-----
arch/arm/src/lpc43xx/lpc43_irq.c | 22 +------
arch/arm/src/lpc54xx/lpc54_irq.c | 22 +------
arch/arm/src/max326xx/common/max326_irq.c | 22 +------
arch/arm/src/nrf52/nrf52_irq.c | 22 +------
arch/arm/src/nrf53/nrf53_irq.c | 22 +------
arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c | 22 +------
arch/arm/src/s32k3xx/s32k3xx_irq.c | 22 +------
arch/arm/src/sam34/sam_irq.c | 22 +------
arch/arm/src/samd5e5/sam_irq.c | 22 +------
arch/arm/src/samv7/sam_irq.c | 23 +------
arch/arm/src/stm32/stm32_irq.c | 24 +-------
arch/arm/src/stm32/stm32_sdio.c | 22 -------
arch/arm/src/stm32f7/stm32_irq.c | 24 +-------
arch/arm/src/stm32f7/stm32_sdmmc.c | 23 -------
arch/arm/src/stm32h7/stm32_irq.c | 22 +------
arch/arm/src/stm32h7/stm32_sdmmc.c | 23 -------
arch/arm/src/stm32l4/stm32l4_irq.c | 22 +------
arch/arm/src/stm32l4/stm32l4_sdmmc.c | 23 -------
arch/arm/src/stm32l5/stm32l5_irq.c | 22 +------
arch/arm/src/stm32u5/stm32_irq.c | 22 +------
arch/arm/src/stm32wb/stm32wb_irq.c | 24 +-------
arch/arm/src/stm32wl5/stm32wl5_irq.c | 27 ++------
arch/arm/src/tiva/common/tiva_irq.c | 22 +------
arch/arm/src/xmc4/xmc4_irq.c | 22 +------
boards/arm/cxd56xx/common/src/cxd56_ili9340.c | 2 +-
boards/arm/cxd56xx/spresense/src/cxd56_leds.c | 2 +
boards/arm/cxd56xx/spresense/src/cxd56_sdcard.c | 2 +-
.../arm/stm32/fire-stm32v2/src/stm32_selectlcd.c | 2 +-
boards/arm/stm32/hymini-stm32v/src/stm32_r61505u.c | 2 +-
boards/arm/stm32/hymini-stm32v/src/stm32_ssd1289.c | 2 +-
.../arm/stm32/stm3210e-eval/src/stm32_selectlcd.c | 2 +-
.../arm/stm32/stm3220g-eval/src/stm32_selectlcd.c | 6 +-
.../arm/stm32/stm3240g-eval/src/stm32_selectlcd.c | 6 +-
.../arm/stm32/stm32f4discovery/src/stm32_ssd1289.c | 6 +-
.../stm32/viewtool-stm32f107/src/stm32_ssd1289.c | 2 +-
drivers/audio/cs43l22.c | 17 ------
drivers/audio/cxd56.c | 19 ++----
drivers/modem/alt1250/altcom_cmd_sms.h | 10 +--
drivers/modem/alt1250/altcom_hdlr.c | 7 ---
drivers/usbdev/usbmsc_desc.c | 9 +--
drivers/usbhost/usbhost_hidkbd.c | 52 ----------------
drivers/usbhost/usbhost_hidmouse.c | 52 ----------------
drivers/usbhost/usbhost_xboxcontroller.c | 52 ----------------
drivers/video/video.c | 3 +-
net/route/net_del_fileroute.c | 2 +-
net/route/net_del_ramroute.c | 2 +-
70 files changed, 156 insertions(+), 1030 deletions(-)
[incubator-nuttx] 15/22: Fix Error: board/cxd56_leds.c:43:20: error: unused function 'led_clrbits' [-Werror,-Wunused-function] static inline void led_clrbits(unsigned int clrbits) ^ Error: board/cxd56_leds.c:66:20: error: unused function 'led_setbits' [-Werror,-Wunused-function] static inline void led_setbits(unsigned int setbits)
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit e46bdeca1d41def67f6aec714412842f57b4f028
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Oct 29 02:36:10 2022 +0800
Fix Error: board/cxd56_leds.c:43:20: error: unused function 'led_clrbits' [-Werror,-Wunused-function]
static inline void led_clrbits(unsigned int clrbits)
^
Error: board/cxd56_leds.c:66:20: error: unused function 'led_setbits' [-Werror,-Wunused-function]
static inline void led_setbits(unsigned int setbits)
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
boards/arm/cxd56xx/spresense/src/cxd56_leds.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_leds.c b/boards/arm/cxd56xx/spresense/src/cxd56_leds.c
index 40ad88d6ef..1ae0d2fcb7 100644
--- a/boards/arm/cxd56xx/spresense/src/cxd56_leds.c
+++ b/boards/arm/cxd56xx/spresense/src/cxd56_leds.c
@@ -40,6 +40,7 @@
* Private Functions
****************************************************************************/
+#ifndef CONFIG_ARCH_LEDS_CPU_ACTIVITY
static inline void led_clrbits(unsigned int clrbits)
{
if ((clrbits & BOARD_LED1_BIT) != 0)
@@ -85,6 +86,7 @@ static inline void led_setbits(unsigned int setbits)
cxd56_gpio_write(GPIO_LED4, true);
}
}
+#endif
/****************************************************************************
* Public Functions
[incubator-nuttx] 05/22: arch/arm: Replace xxx_[bus|usage]fault with arm_[bus|usage]fault
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit d1a3f5e47f752142251c30b188c8d1b47ef59941
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Oct 26 10:49:18 2022 +0800
arch/arm: Replace xxx_[bus|usage]fault with arm_[bus|usage]fault
to fix the following clang warning:
Error: chip/eoss3_irq.c:138:47: error: format specifies type 'unsigned int' but the argument has type 'uint32_t' (aka 'unsigned long') [-Werror,-Wformat]
_err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
~~~~ ^~~~~~~~~~~~~~~~~~~~~~
%08lx
/github/workspace/sources/nuttx/include/debug.h:126:57: note: expanded from macro '_err'
__arch_syslog(LOG_ERR, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
~~~~~~ ^~~~~~~~~~~
/github/workspace/sources/nuttx/arch/arm/src/common/arm_internal.h:134:24: note: expanded from macro 'getreg32'
^~~~~~~~~~~~~~~~~~~~~~~~~~~
Error: chip/eoss3_irq.c:146:49: error: format specifies type 'unsigned int' but the argument has type 'uint32_t' (aka 'unsigned long') [-Werror,-Wformat]
_err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
~~~~ ^~~~~~~~~~~~~~~~~~~~~~
%08lx
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/armv7-m/arm_busfault.c | 6 ++++--
arch/arm/src/armv7-m/arm_hardfault.c | 6 ++++--
arch/arm/src/armv7-m/arm_memfault.c | 3 ++-
arch/arm/src/armv7-m/arm_usagefault.c | 6 ++++--
arch/arm/src/armv8-m/arm_busfault.c | 6 ++++--
arch/arm/src/armv8-m/arm_hardfault.c | 6 ++++--
arch/arm/src/armv8-m/arm_memfault.c | 3 ++-
arch/arm/src/armv8-m/arm_securefault.c | 3 ++-
arch/arm/src/armv8-m/arm_usagefault.c | 6 ++++--
arch/arm/src/cxd56xx/cxd56_irq.c | 22 +++-------------------
arch/arm/src/efm32/efm32_irq.c | 22 +++-------------------
arch/arm/src/eoss3/eoss3_irq.c | 22 +++-------------------
arch/arm/src/gd32f4/gd32f4xx_irq.c | 24 +++---------------------
arch/arm/src/imxrt/imxrt_irq.c | 24 +++---------------------
arch/arm/src/kinetis/kinetis_irq.c | 22 +++-------------------
arch/arm/src/lc823450/lc823450_irq.c | 22 +++-------------------
arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c | 20 ++------------------
arch/arm/src/lpc43xx/lpc43_irq.c | 22 +++-------------------
arch/arm/src/lpc54xx/lpc54_irq.c | 22 +++-------------------
arch/arm/src/max326xx/common/max326_irq.c | 22 +++-------------------
arch/arm/src/nrf52/nrf52_irq.c | 22 +++-------------------
arch/arm/src/nrf53/nrf53_irq.c | 22 +++-------------------
arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c | 22 +++-------------------
arch/arm/src/s32k3xx/s32k3xx_irq.c | 22 +++-------------------
arch/arm/src/sam34/sam_irq.c | 22 +++-------------------
arch/arm/src/samd5e5/sam_irq.c | 22 +++-------------------
arch/arm/src/samv7/sam_irq.c | 23 +++--------------------
arch/arm/src/stm32/stm32_irq.c | 24 +++---------------------
arch/arm/src/stm32f7/stm32_irq.c | 24 +++---------------------
arch/arm/src/stm32h7/stm32_irq.c | 22 +++-------------------
arch/arm/src/stm32l4/stm32l4_irq.c | 22 +++-------------------
arch/arm/src/stm32l5/stm32l5_irq.c | 22 +++-------------------
arch/arm/src/stm32u5/stm32_irq.c | 22 +++-------------------
arch/arm/src/stm32wb/stm32wb_irq.c | 24 +++---------------------
arch/arm/src/stm32wl5/stm32wl5_irq.c | 27 ++++-----------------------
arch/arm/src/tiva/common/tiva_irq.c | 22 +++-------------------
arch/arm/src/xmc4/xmc4_irq.c | 22 +++-------------------
37 files changed, 114 insertions(+), 561 deletions(-)
diff --git a/arch/arm/src/armv7-m/arm_busfault.c b/arch/arm/src/armv7-m/arm_busfault.c
index 81ab7a6152..41f0b8d4aa 100644
--- a/arch/arm/src/armv7-m/arm_busfault.c
+++ b/arch/arm/src/armv7-m/arm_busfault.c
@@ -63,9 +63,11 @@ int arm_busfault(int irq, void *context, void *arg)
bfalert("PANIC!!! Bus Fault:\n");
bfalert("\tIRQ: %d regs: %p\n", irq, context);
- bfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n",
+ bfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08"
+ PRIx32 " CONTROL: %08" PRIx32 "\n",
getbasepri(), getprimask(), getipsr(), getcontrol());
- bfalert("\tCFSR: %08x HFSR: %08x DFSR: %08x BFAR: %08x AFSR: %08x\n",
+ bfalert("\tCFSR: %08" PRIx32 " HFSR: %08" PRIx32 " DFSR: %08"
+ PRIx32 " BFAR: %08" PRIx32 " AFSR: %08" PRIx32 "\n",
cfsr, getreg32(NVIC_HFAULTS), getreg32(NVIC_DFAULTS),
getreg32(NVIC_BFAULT_ADDR), getreg32(NVIC_AFAULTS));
diff --git a/arch/arm/src/armv7-m/arm_hardfault.c b/arch/arm/src/armv7-m/arm_hardfault.c
index f0dfdf514a..7ea7ec4c12 100644
--- a/arch/arm/src/armv7-m/arm_hardfault.c
+++ b/arch/arm/src/armv7-m/arm_hardfault.c
@@ -152,9 +152,11 @@ int arm_hardfault(int irq, void *context, void *arg)
hfalert("PANIC!!! Hard Fault!:");
hfalert("\tIRQ: %d regs: %p\n", irq, context);
- hfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n",
+ hfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08"
+ PRIx32 " CONTROL: %08" PRIx32 "\n",
getbasepri(), getprimask(), getipsr(), getcontrol());
- hfalert("\tCFSR: %08x HFSR: %08x DFSR: %08x BFAR: %08x AFSR: %08x\n",
+ hfalert("\tCFSR: %08" PRIx32 " HFSR: %08" PRIx32 " DFSR: %08"
+ PRIx32 " BFAR: %08" PRIx32 " AFSR: %08" PRIx32 "\n",
cfsr, hfsr, getreg32(NVIC_DFAULTS),
getreg32(NVIC_BFAULT_ADDR), getreg32(NVIC_AFAULTS));
diff --git a/arch/arm/src/armv7-m/arm_memfault.c b/arch/arm/src/armv7-m/arm_memfault.c
index 1f36789808..8b9a164f1a 100644
--- a/arch/arm/src/armv7-m/arm_memfault.c
+++ b/arch/arm/src/armv7-m/arm_memfault.c
@@ -68,7 +68,8 @@ int arm_memfault(int irq, void *context, void *arg)
mfalert("\tIRQ: %d context: %p\n", irq, context);
mfalert("\tCFSR: %08x MMFAR: %08x\n",
getreg32(NVIC_CFAULTS), getreg32(NVIC_MEMMANAGE_ADDR));
- mfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n",
+ mfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08"
+ PRIx32 " CONTROL: %08" PRIx32 "\n",
getbasepri(), getprimask(), getipsr(), getcontrol());
mfalert("Memory Management Fault Reason:\n");
diff --git a/arch/arm/src/armv7-m/arm_usagefault.c b/arch/arm/src/armv7-m/arm_usagefault.c
index 7fb0a55221..00579faa47 100644
--- a/arch/arm/src/armv7-m/arm_usagefault.c
+++ b/arch/arm/src/armv7-m/arm_usagefault.c
@@ -65,9 +65,11 @@ int arm_usagefault(int irq, void *context, void *arg)
ufalert("PANIC!!! Usage Fault:\n");
ufalert("\tIRQ: %d regs: %p\n", irq, context);
- ufalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n",
+ ufalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08"
+ PRIx32 " CONTROL: %08" PRIx32 "\n",
getbasepri(), getprimask(), getipsr(), getcontrol());
- ufalert("\tCFSR: %08x HFSR: %08x DFSR: %08x BFAR: %08x AFSR: %08x\n",
+ ufalert("\tCFSR: %08" PRIx32 " HFSR: %08" PRIx32 " DFSR: %08"
+ PRIx32 " BFAR: %08" PRIx32 " AFSR: %08" PRIx32 "\n",
cfsr, getreg32(NVIC_HFAULTS), getreg32(NVIC_DFAULTS),
getreg32(NVIC_BFAULT_ADDR), getreg32(NVIC_AFAULTS));
diff --git a/arch/arm/src/armv8-m/arm_busfault.c b/arch/arm/src/armv8-m/arm_busfault.c
index 11ccac444e..5feafdf43e 100644
--- a/arch/arm/src/armv8-m/arm_busfault.c
+++ b/arch/arm/src/armv8-m/arm_busfault.c
@@ -63,9 +63,11 @@ int arm_busfault(int irq, void *context, void *arg)
bfalert("PANIC!!! Bus Fault:\n");
bfalert("\tIRQ: %d regs: %p\n", irq, context);
- bfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n",
+ bfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08"
+ PRIx32 " CONTROL: %08" PRIx32 "\n",
getbasepri(), getprimask(), getipsr(), getcontrol());
- bfalert("\tCFSR: %08x HFSR: %08x DFSR: %08x BFAR: %08x AFSR: %08x\n",
+ bfalert("\tCFSR: %08" PRIx32 " HFSR: %08" PRIx32 " DFSR: %08"
+ PRIx32 " BFAR: %08" PRIx32 " AFSR: %08" PRIx32 "\n",
cfsr, getreg32(NVIC_HFAULTS), getreg32(NVIC_DFAULTS),
getreg32(NVIC_BFAULT_ADDR), getreg32(NVIC_AFAULTS));
diff --git a/arch/arm/src/armv8-m/arm_hardfault.c b/arch/arm/src/armv8-m/arm_hardfault.c
index 0e459b8ade..0eec176999 100644
--- a/arch/arm/src/armv8-m/arm_hardfault.c
+++ b/arch/arm/src/armv8-m/arm_hardfault.c
@@ -162,9 +162,11 @@ int arm_hardfault(int irq, void *context, void *arg)
hfalert("PANIC!!! Hard Fault!:");
hfalert("\tIRQ: %d regs: %p\n", irq, context);
- hfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n",
+ hfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08"
+ PRIx32 " CONTROL: %08" PRIx32 "\n",
getbasepri(), getprimask(), getipsr(), getcontrol());
- hfalert("\tCFSR: %08x HFSR: %08x DFSR: %08x BFAR: %08x AFSR: %08x\n",
+ hfalert("\tCFSR: %08" PRIx32 " HFSR: %08" PRIx32 " DFSR: %08"
+ PRIx32 " BFAR: %08" PRIx32 " AFSR: %08" PRIx32 "\n",
cfsr, hfsr, getreg32(NVIC_DFAULTS),
getreg32(NVIC_BFAULT_ADDR), getreg32(NVIC_AFAULTS));
diff --git a/arch/arm/src/armv8-m/arm_memfault.c b/arch/arm/src/armv8-m/arm_memfault.c
index 526a02af8f..b6b52b1b19 100644
--- a/arch/arm/src/armv8-m/arm_memfault.c
+++ b/arch/arm/src/armv8-m/arm_memfault.c
@@ -68,7 +68,8 @@ int arm_memfault(int irq, void *context, void *arg)
mfalert("\tIRQ: %d context: %p\n", irq, context);
mfalert("\tCFSR: %08x MMFAR: %08x\n",
getreg32(NVIC_CFAULTS), getreg32(NVIC_MEMMANAGE_ADDR));
- mfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n",
+ mfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08"
+ PRIx32 " CONTROL: %08" PRIx32 "\n",
getbasepri(), getprimask(), getipsr(), getcontrol());
mfalert("Memory Management Fault Reason:\n");
diff --git a/arch/arm/src/armv8-m/arm_securefault.c b/arch/arm/src/armv8-m/arm_securefault.c
index 47327d901f..77775c83d0 100644
--- a/arch/arm/src/armv8-m/arm_securefault.c
+++ b/arch/arm/src/armv8-m/arm_securefault.c
@@ -109,7 +109,8 @@ int arm_securefault(int irq, void *context, void *arg)
sfalert("PANIC!!! Secure Fault:\n");
sfalert("\tIRQ: %d regs: %p\n", irq, context);
- sfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n",
+ sfalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08"
+ PRIx32 " CONTROL: %08" PRIx32 "\n",
getbasepri(), getprimask(), getipsr(), getcontrol());
sfalert("\tCFSR: %08x HFSR: %08x DFSR: %08x\n", getreg32(NVIC_CFAULTS),
getreg32(NVIC_HFAULTS), getreg32(NVIC_DFAULTS));
diff --git a/arch/arm/src/armv8-m/arm_usagefault.c b/arch/arm/src/armv8-m/arm_usagefault.c
index 7f1f774443..3706d38db2 100644
--- a/arch/arm/src/armv8-m/arm_usagefault.c
+++ b/arch/arm/src/armv8-m/arm_usagefault.c
@@ -65,9 +65,11 @@ int arm_usagefault(int irq, void *context, void *arg)
ufalert("PANIC!!! Usage Fault:\n");
ufalert("\tIRQ: %d regs: %p\n", irq, context);
- ufalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n",
+ ufalert("\tBASEPRI: %08x PRIMASK: %08x IPSR: %08"
+ PRIx32 " CONTROL: %08" PRIx32 "\n",
getbasepri(), getprimask(), getipsr(), getcontrol());
- ufalert("\tCFSR: %08x HFSR: %08x DFSR: %08x BFAR: %08x AFSR: %08x\n",
+ ufalert("\tCFSR: %08" PRIx32 " HFSR: %08" PRIx32 " DFSR: %08"
+ PRIx32 " BFAR: %08" PRIx32 " AFSR: %08" PRIx32 "\n",
cfsr, getreg32(NVIC_HFAULTS), getreg32(NVIC_DFAULTS),
getreg32(NVIC_BFAULT_ADDR), getreg32(NVIC_AFAULTS));
diff --git a/arch/arm/src/cxd56xx/cxd56_irq.c b/arch/arm/src/cxd56xx/cxd56_irq.c
index 80fb917b17..98770ed6e7 100644
--- a/arch/arm/src/cxd56xx/cxd56_irq.c
+++ b/arch/arm/src/cxd56xx/cxd56_irq.c
@@ -151,7 +151,7 @@ static void cxd56_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: cxd56_nmi, cxd56_busfault, cxd56_usagefault, cxd56_pendsv,
+ * Name: cxd56_nmi, cxd56_pendsv,
* cxd56_dbgmonitor, cxd56_pendsv, cxd56_reserved
*
* Description:
@@ -170,22 +170,6 @@ static int cxd56_nmi(int irq, void *context, void *arg)
return 0;
}
-static int cxd56_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received\n");
- PANIC();
- return 0;
-}
-
-static int cxd56_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received\n");
- PANIC();
- return 0;
-}
-
static int cxd56_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -376,8 +360,8 @@ void up_irqinitialize(void)
# ifndef CONFIG_ARM_MPU
irq_attach(CXD56_IRQ_MEMFAULT, arm_memfault, NULL);
# endif
- irq_attach(CXD56_IRQ_BUSFAULT, cxd56_busfault, NULL);
- irq_attach(CXD56_IRQ_USAGEFAULT, cxd56_usagefault, NULL);
+ irq_attach(CXD56_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(CXD56_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(CXD56_IRQ_PENDSV, cxd56_pendsv, NULL);
irq_attach(CXD56_IRQ_DBGMONITOR, cxd56_dbgmonitor, NULL);
irq_attach(CXD56_IRQ_RESERVED, cxd56_reserved, NULL);
diff --git a/arch/arm/src/efm32/efm32_irq.c b/arch/arm/src/efm32/efm32_irq.c
index abb178ab05..53f422b6d7 100644
--- a/arch/arm/src/efm32/efm32_irq.c
+++ b/arch/arm/src/efm32/efm32_irq.c
@@ -132,7 +132,7 @@ static void efm32_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: efm32_nmi, efm32_busfault, efm32_usagefault, efm32_pendsv,
+ * Name: efm32_nmi, efm32_pendsv,
* efm32_dbgmonitor, efm32_pendsv, efm32_reserved
*
* Description:
@@ -151,22 +151,6 @@ static int efm32_nmi(int irq, void *context, void *arg)
return 0;
}
-static int efm32_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
-static int efm32_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
static int efm32_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -373,8 +357,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(EFM32_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(EFM32_IRQ_BUSFAULT, efm32_busfault, NULL);
- irq_attach(EFM32_IRQ_USAGEFAULT, efm32_usagefault, NULL);
+ irq_attach(EFM32_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(EFM32_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(EFM32_IRQ_PENDSV, efm32_pendsv, NULL);
irq_attach(EFM32_IRQ_DBGMONITOR, efm32_dbgmonitor, NULL);
irq_attach(EFM32_IRQ_RESERVED, efm32_reserved, NULL);
diff --git a/arch/arm/src/eoss3/eoss3_irq.c b/arch/arm/src/eoss3/eoss3_irq.c
index d6d190c5a5..2fa1b963cb 100644
--- a/arch/arm/src/eoss3/eoss3_irq.c
+++ b/arch/arm/src/eoss3/eoss3_irq.c
@@ -113,7 +113,7 @@ static void eoss3_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: eoss3_nmi, eoss3_busfault, eoss3_usagefault, eoss3_pendsv,
+ * Name: eoss3_nmi, eoss3_pendsv,
* eoss3_dbgmonitor, eoss3_pendsv, eoss3_reserved
*
* Description:
@@ -132,22 +132,6 @@ static int eoss3_nmi(int irq, void *context, void *arg)
return 0;
}
-static int eoss3_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
-static int eoss3_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
static int eoss3_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -354,8 +338,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(EOSS3_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(EOSS3_IRQ_BUSFAULT, eoss3_busfault, NULL);
- irq_attach(EOSS3_IRQ_USAGEFAULT, eoss3_usagefault, NULL);
+ irq_attach(EOSS3_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(EOSS3_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(EOSS3_IRQ_PENDSV, eoss3_pendsv, NULL);
irq_attach(EOSS3_IRQ_DBGMONITOR, eoss3_dbgmonitor, NULL);
irq_attach(EOSS3_IRQ_RESERVED, eoss3_reserved, NULL);
diff --git a/arch/arm/src/gd32f4/gd32f4xx_irq.c b/arch/arm/src/gd32f4/gd32f4xx_irq.c
index f7417701b2..da323d5152 100644
--- a/arch/arm/src/gd32f4/gd32f4xx_irq.c
+++ b/arch/arm/src/gd32f4/gd32f4xx_irq.c
@@ -138,7 +138,7 @@ static void gd32_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: gd32_nmi, gd32_busfault, gd32_usagefault, gd32_pendsv,
+ * Name: gd32_nmi, gd32_pendsv,
* gd32_dbgmonitor, gd32_pendsv, gd32_reserved
*
* Description:
@@ -157,24 +157,6 @@ static int gd32_nmi(int irq, void *context, void *arg)
return 0;
}
-static int gd32_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received: %08" PRIx32 "\n",
- getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
-static int gd32_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received: %08" PRIx32 "\n",
- getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
static int gd32_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -385,8 +367,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(GD32_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(GD32_IRQ_BUSFAULT, gd32_busfault, NULL);
- irq_attach(GD32_IRQ_USAGEFAULT, gd32_usagefault, NULL);
+ irq_attach(GD32_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(GD32_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(GD32_IRQ_PENDSV, gd32_pendsv, NULL);
irq_attach(GD32_IRQ_DBGMONITOR, gd32_dbgmonitor, NULL);
irq_attach(GD32_IRQ_RESERVED, gd32_reserved, NULL);
diff --git a/arch/arm/src/imxrt/imxrt_irq.c b/arch/arm/src/imxrt/imxrt_irq.c
index eb7c5ed213..aaec938dae 100644
--- a/arch/arm/src/imxrt/imxrt_irq.c
+++ b/arch/arm/src/imxrt/imxrt_irq.c
@@ -187,7 +187,7 @@ static void imxrt_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: imxrt_nmi, imxrt_busfault, imxrt_usagefault, imxrt_pendsv,
+ * Name: imxrt_nmi, imxrt_pendsv,
* imxrt_dbgmonitor, imxrt_pendsv, imxrt_reserved
*
* Description:
@@ -206,24 +206,6 @@ static int imxrt_nmi(int irq, void *context, void *arg)
return 0;
}
-static int imxrt_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received: %08" PRIx32 "\n",
- getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
-static int imxrt_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received: %08" PRIx32 "\n",
- getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
static int imxrt_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -477,8 +459,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(IMXRT_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(IMXRT_IRQ_BUSFAULT, imxrt_busfault, NULL);
- irq_attach(IMXRT_IRQ_USAGEFAULT, imxrt_usagefault, NULL);
+ irq_attach(IMXRT_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(IMXRT_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(IMXRT_IRQ_PENDSV, imxrt_pendsv, NULL);
irq_attach(IMXRT_IRQ_DBGMONITOR, imxrt_dbgmonitor, NULL);
irq_attach(IMXRT_IRQ_RESERVED, imxrt_reserved, NULL);
diff --git a/arch/arm/src/kinetis/kinetis_irq.c b/arch/arm/src/kinetis/kinetis_irq.c
index 2f5258f14c..fc90c7d717 100644
--- a/arch/arm/src/kinetis/kinetis_irq.c
+++ b/arch/arm/src/kinetis/kinetis_irq.c
@@ -144,7 +144,7 @@ static void kinetis_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: kinetis_nmi, kinetis_busfault, kinetis_usagefault, kinetis_pendsv,
+ * Name: kinetis_nmi, kinetis_pendsv,
* kinetis_dbgmonitor, kinetis_pendsv, kinetis_reserved
*
* Description:
@@ -163,22 +163,6 @@ static int kinetis_nmi(int irq, void *context, void *arg)
return 0;
}
-static int kinetis_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received\n");
- PANIC();
- return 0;
-}
-
-static int kinetis_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received\n");
- PANIC();
- return 0;
-}
-
static int kinetis_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -404,8 +388,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(KINETIS_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(KINETIS_IRQ_BUSFAULT, kinetis_busfault, NULL);
- irq_attach(KINETIS_IRQ_USAGEFAULT, kinetis_usagefault, NULL);
+ irq_attach(KINETIS_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(KINETIS_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(KINETIS_IRQ_PENDSV, kinetis_pendsv, NULL);
irq_attach(KINETIS_IRQ_DBGMONITOR, kinetis_dbgmonitor, NULL);
irq_attach(KINETIS_IRQ_RESERVED, kinetis_reserved, NULL);
diff --git a/arch/arm/src/lc823450/lc823450_irq.c b/arch/arm/src/lc823450/lc823450_irq.c
index fcb29ea8fe..3aa6b6e8a7 100644
--- a/arch/arm/src/lc823450/lc823450_irq.c
+++ b/arch/arm/src/lc823450/lc823450_irq.c
@@ -171,7 +171,7 @@ static void lc823450_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: lc823450_nmi, lc823450_busfault, lc823450_usagefault,
+ * Name: lc823450_nmi,
* lc823450_pendsv, lc823450_dbgmonitor, lc823450_pendsv,
* lc823450_reserved
*
@@ -191,22 +191,6 @@ static int lc823450_nmi(int irq, void *context, void *arg)
return 0;
}
-static int lc823450_busfault(int irq, void *context, void *arg)
-{
- enter_critical_section();
- irqinfo("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
-static int lc823450_usagefault(int irq, void *context, void *arg)
-{
- enter_critical_section();
- irqinfo("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
static int lc823450_pendsv(int irq, void *context, void *arg)
{
enter_critical_section();
@@ -532,8 +516,8 @@ void up_irqinitialize(void)
#ifdef CONFIG_DEBUG
irq_attach(LC823450_IRQ_NMI, lc823450_nmi, NULL);
- irq_attach(LC823450_IRQ_BUSFAULT, lc823450_busfault, NULL);
- irq_attach(LC823450_IRQ_USAGEFAULT, lc823450_usagefault, NULL);
+ irq_attach(LC823450_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(LC823450_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(LC823450_IRQ_PENDSV, lc823450_pendsv, NULL);
irq_attach(LC823450_IRQ_DBGMONITOR, lc823450_dbgmonitor, NULL);
irq_attach(LC823450_IRQ_RESERVED, lc823450_reserved, NULL);
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c
index 039cfece8a..02194b62c4 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c
@@ -136,22 +136,6 @@ static int lpc17_40_nmi(int irq, void *context, void *arg)
return 0;
}
-static int lpc17_40_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received\n");
- PANIC();
- return 0;
-}
-
-static int lpc17_40_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received\n");
- PANIC();
- return 0;
-}
-
static int lpc17_40_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -374,8 +358,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(LPC17_40_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(LPC17_40_IRQ_BUSFAULT, lpc17_40_busfault, NULL);
- irq_attach(LPC17_40_IRQ_USAGEFAULT, lpc17_40_usagefault, NULL);
+ irq_attach(LPC17_40_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(LPC17_40_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(LPC17_40_IRQ_PENDSV, lpc17_40_pendsv, NULL);
irq_attach(LPC17_40_IRQ_DBGMONITOR, lpc17_40_dbgmonitor, NULL);
irq_attach(LPC17_40_IRQ_RESERVED, lpc17_40_reserved, NULL);
diff --git a/arch/arm/src/lpc43xx/lpc43_irq.c b/arch/arm/src/lpc43xx/lpc43_irq.c
index 96c4a542e4..642832637a 100644
--- a/arch/arm/src/lpc43xx/lpc43_irq.c
+++ b/arch/arm/src/lpc43xx/lpc43_irq.c
@@ -122,7 +122,7 @@ static void lpc43_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: lpc43_nmi, lpc43_busfault, lpc43_usagefault, lpc43_pendsv,
+ * Name: lpc43_nmi, lpc43_pendsv,
* lpc43_dbgmonitor, lpc43_pendsv, lpc43_reserved
*
* Description:
@@ -141,22 +141,6 @@ static int lpc43_nmi(int irq, void *context, void *arg)
return 0;
}
-static int lpc43_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received\n");
- PANIC();
- return 0;
-}
-
-static int lpc43_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received\n");
- PANIC();
- return 0;
-}
-
static int lpc43_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -367,8 +351,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(LPC43_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(LPC43_IRQ_BUSFAULT, lpc43_busfault, NULL);
- irq_attach(LPC43_IRQ_USAGEFAULT, lpc43_usagefault, NULL);
+ irq_attach(LPC43_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(LPC43_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(LPC43_IRQ_PENDSV, lpc43_pendsv, NULL);
irq_attach(LPC43_IRQ_DBGMONITOR, lpc43_dbgmonitor, NULL);
irq_attach(LPC43_IRQ_RESERVED, lpc43_reserved, NULL);
diff --git a/arch/arm/src/lpc54xx/lpc54_irq.c b/arch/arm/src/lpc54xx/lpc54_irq.c
index fb3a827ffa..caba3997f8 100644
--- a/arch/arm/src/lpc54xx/lpc54_irq.c
+++ b/arch/arm/src/lpc54xx/lpc54_irq.c
@@ -121,7 +121,7 @@ static void lpc54_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: lpc54_nmi, lpc54_busfault, lpc54_usagefault, lpc54_pendsv,
+ * Name: lpc54_nmi, lpc54_pendsv,
* lpc54_dbgmonitor, lpc54_pendsv, lpc54_reserved
*
* Description:
@@ -140,22 +140,6 @@ static int lpc54_nmi(int irq, void *context, void *arg)
return 0;
}
-static int lpc54_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received\n");
- PANIC();
- return 0;
-}
-
-static int lpc54_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received\n");
- PANIC();
- return 0;
-}
-
static int lpc54_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -367,8 +351,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(LPC54_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(LPC54_IRQ_BUSFAULT, lpc54_busfault, NULL);
- irq_attach(LPC54_IRQ_USAGEFAULT, lpc54_usagefault, NULL);
+ irq_attach(LPC54_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(LPC54_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(LPC54_IRQ_PENDSV, lpc54_pendsv, NULL);
irq_attach(LPC54_IRQ_DBGMONITOR, lpc54_dbgmonitor, NULL);
irq_attach(LPC54_IRQ_RESERVED, lpc54_reserved, NULL);
diff --git a/arch/arm/src/max326xx/common/max326_irq.c b/arch/arm/src/max326xx/common/max326_irq.c
index e01db272d9..454fa1917e 100644
--- a/arch/arm/src/max326xx/common/max326_irq.c
+++ b/arch/arm/src/max326xx/common/max326_irq.c
@@ -122,7 +122,7 @@ static void max326_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: max326_nmi, max326_busfault, max326_usagefault, max326_pendsv,
+ * Name: max326_nmi, max326_pendsv,
* max326_dbgmonitor, max326_pendsv, max326_reserved
*
* Description:
@@ -141,22 +141,6 @@ static int max326_nmi(int irq, void *context, void *arg)
return 0;
}
-static int max326_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received\n");
- PANIC();
- return 0;
-}
-
-static int max326_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received\n");
- PANIC();
- return 0;
-}
-
static int max326_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -367,8 +351,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(MAX326_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(MAX326_IRQ_BUSFAULT, max326_busfault, NULL);
- irq_attach(MAX326_IRQ_USAGEFAULT, max326_usagefault, NULL);
+ irq_attach(MAX326_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(MAX326_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(MAX326_IRQ_PENDSV, max326_pendsv, NULL);
irq_attach(MAX326_IRQ_DBGMONITOR, max326_dbgmonitor, NULL);
irq_attach(MAX326_IRQ_RESERVED, max326_reserved, NULL);
diff --git a/arch/arm/src/nrf52/nrf52_irq.c b/arch/arm/src/nrf52/nrf52_irq.c
index b7fe06dca4..0b0939db45 100644
--- a/arch/arm/src/nrf52/nrf52_irq.c
+++ b/arch/arm/src/nrf52/nrf52_irq.c
@@ -123,7 +123,7 @@ static void nrf52_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: nrf52_nmi, nrf52_busfault, nrf52_usagefault, nrf52_pendsv,
+ * Name: nrf52_nmi, nrf52_pendsv,
* nrf52_dbgmonitor, nrf52_pendsv, nrf52_reserved
*
* Description:
@@ -142,22 +142,6 @@ static int nrf52_nmi(int irq, void *context, void *arg)
return 0;
}
-static int nrf52_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received\n");
- PANIC();
- return 0;
-}
-
-static int nrf52_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received\n");
- PANIC();
- return 0;
-}
-
static int nrf52_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -371,8 +355,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(NRF52_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(NRF52_IRQ_BUSFAULT, nrf52_busfault, NULL);
- irq_attach(NRF52_IRQ_USAGEFAULT, nrf52_usagefault, NULL);
+ irq_attach(NRF52_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(NRF52_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(NRF52_IRQ_PENDSV, nrf52_pendsv, NULL);
irq_attach(NRF52_IRQ_DBGMONITOR, nrf52_dbgmonitor, NULL);
irq_attach(NRF52_IRQ_RESERVED, nrf52_reserved, NULL);
diff --git a/arch/arm/src/nrf53/nrf53_irq.c b/arch/arm/src/nrf53/nrf53_irq.c
index fb958034f3..b2f1966cb6 100644
--- a/arch/arm/src/nrf53/nrf53_irq.c
+++ b/arch/arm/src/nrf53/nrf53_irq.c
@@ -123,7 +123,7 @@ static void nrf53_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: nrf53_nmi, nrf53_busfault, nrf53_usagefault, nrf53_pendsv,
+ * Name: nrf53_nmi, nrf53_pendsv,
* nrf53_dbgmonitor, nrf53_pendsv, nrf53_reserved
*
* Description:
@@ -142,22 +142,6 @@ static int nrf53_nmi(int irq, void *context, void *arg)
return 0;
}
-static int nrf53_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received\n");
- PANIC();
- return 0;
-}
-
-static int nrf53_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received\n");
- PANIC();
- return 0;
-}
-
static int nrf53_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -371,8 +355,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(NRF53_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(NRF53_IRQ_BUSFAULT, nrf53_busfault, NULL);
- irq_attach(NRF53_IRQ_USAGEFAULT, nrf53_usagefault, NULL);
+ irq_attach(NRF53_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(NRF53_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(NRF53_IRQ_PENDSV, nrf53_pendsv, NULL);
irq_attach(NRF53_IRQ_DBGMONITOR, nrf53_dbgmonitor, NULL);
irq_attach(NRF53_IRQ_RESERVED, nrf53_reserved, NULL);
diff --git a/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c b/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c
index af217da5c9..a6d6f23870 100644
--- a/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c
+++ b/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c
@@ -156,7 +156,7 @@ static void s32k14x_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: s32k14x_nmi, s32k14x_busfault, s32k14x_usagefault, s32k14x_pendsv,
+ * Name: s32k14x_nmi, s32k14x_pendsv,
* s32k14x_dbgmonitor, s32k14x_pendsv, s32k14x_reserved
*
* Description:
@@ -175,22 +175,6 @@ static int s32k14x_nmi(int irq, void *context, void *arg)
return 0;
}
-static int s32k14x_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received\n");
- PANIC();
- return 0;
-}
-
-static int s32k14x_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received\n");
- PANIC();
- return 0;
-}
-
static int s32k14x_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -402,8 +386,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(S32K1XX_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(S32K1XX_IRQ_BUSFAULT, s32k14x_busfault, NULL);
- irq_attach(S32K1XX_IRQ_USAGEFAULT, s32k14x_usagefault, NULL);
+ irq_attach(S32K1XX_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(S32K1XX_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(S32K1XX_IRQ_PENDSV, s32k14x_pendsv, NULL);
irq_attach(S32K1XX_IRQ_DBGMONITOR, s32k14x_dbgmonitor, NULL);
irq_attach(S32K1XX_IRQ_RESERVED, s32k14x_reserved, NULL);
diff --git a/arch/arm/src/s32k3xx/s32k3xx_irq.c b/arch/arm/src/s32k3xx/s32k3xx_irq.c
index 2382a0da9f..62b0f8028f 100644
--- a/arch/arm/src/s32k3xx/s32k3xx_irq.c
+++ b/arch/arm/src/s32k3xx/s32k3xx_irq.c
@@ -163,7 +163,7 @@ static void s32k3xx_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: s32k3xx_nmi, s32k3xx_busfault, s32k3xx_usagefault, s32k3xx_pendsv,
+ * Name: s32k3xx_nmi, s32k3xx_pendsv,
* s32k3xx_dbgmonitor, s32k3xx_pendsv, s32k3xx_reserved
*
* Description:
@@ -182,22 +182,6 @@ static int s32k3xx_nmi(int irq, void *context, void *arg)
return 0;
}
-static int s32k3xx_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received\n");
- PANIC();
- return 0;
-}
-
-static int s32k3xx_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received\n");
- PANIC();
- return 0;
-}
-
static int s32k3xx_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -409,8 +393,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(S32K3XX_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(S32K3XX_IRQ_BUSFAULT, s32k3xx_busfault, NULL);
- irq_attach(S32K3XX_IRQ_USAGEFAULT, s32k3xx_usagefault, NULL);
+ irq_attach(S32K3XX_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(S32K3XX_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(S32K3XX_IRQ_PENDSV, s32k3xx_pendsv, NULL);
irq_attach(S32K3XX_IRQ_DBGMONITOR, s32k3xx_dbgmonitor, NULL);
irq_attach(S32K3XX_IRQ_RESERVED, s32k3xx_reserved, NULL);
diff --git a/arch/arm/src/sam34/sam_irq.c b/arch/arm/src/sam34/sam_irq.c
index 126e399e70..770e9c2f85 100644
--- a/arch/arm/src/sam34/sam_irq.c
+++ b/arch/arm/src/sam34/sam_irq.c
@@ -142,7 +142,7 @@ static void sam_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: sam_nmi, sam_busfault, sam_usagefault, sam_pendsv, sam_dbgmonitor,
+ * Name: sam_nmi, sam_pendsv, sam_dbgmonitor,
* sam_pendsv, sam_reserved
*
* Description:
@@ -161,22 +161,6 @@ static int sam_nmi(int irq, void *context, void *arg)
return 0;
}
-static int sam_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
-static int sam_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
static int sam_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -428,8 +412,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(SAM_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(SAM_IRQ_BUSFAULT, sam_busfault, NULL);
- irq_attach(SAM_IRQ_USAGEFAULT, sam_usagefault, NULL);
+ irq_attach(SAM_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(SAM_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(SAM_IRQ_PENDSV, sam_pendsv, NULL);
irq_attach(SAM_IRQ_DBGMONITOR, sam_dbgmonitor, NULL);
irq_attach(SAM_IRQ_RESERVED, sam_reserved, NULL);
diff --git a/arch/arm/src/samd5e5/sam_irq.c b/arch/arm/src/samd5e5/sam_irq.c
index 8aa11ef390..58b89ea462 100644
--- a/arch/arm/src/samd5e5/sam_irq.c
+++ b/arch/arm/src/samd5e5/sam_irq.c
@@ -180,7 +180,7 @@ static void sam_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: sam_nmi, sam_busfault, sam_usagefault, sam_pendsv, sam_dbgmonitor,
+ * Name: sam_nmi, sam_pendsv, sam_dbgmonitor,
* sam_pendsv, sam_reserved
*
* Description:
@@ -199,22 +199,6 @@ static int sam_nmi(int irq, void *context, void *arg)
return 0;
}
-static int sam_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
-static int sam_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
static int sam_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -515,8 +499,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(SAM_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(SAM_IRQ_BUSFAULT, sam_busfault, NULL);
- irq_attach(SAM_IRQ_USAGEFAULT, sam_usagefault, NULL);
+ irq_attach(SAM_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(SAM_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(SAM_IRQ_PENDSV, sam_pendsv, NULL);
irq_attach(SAM_IRQ_DBGMONITOR, sam_dbgmonitor, NULL);
irq_attach(SAM_IRQ_RESERVED, sam_reserved, NULL);
diff --git a/arch/arm/src/samv7/sam_irq.c b/arch/arm/src/samv7/sam_irq.c
index fddb44512c..8a270dbb81 100644
--- a/arch/arm/src/samv7/sam_irq.c
+++ b/arch/arm/src/samv7/sam_irq.c
@@ -142,7 +142,7 @@ static void sam_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: sam_nmi, sam_busfault, sam_usagefault, sam_pendsv, sam_dbgmonitor,
+ * Name: sam_nmi, sam_pendsv, sam_dbgmonitor,
* sam_pendsv, sam_reserved
*
* Description:
@@ -170,23 +170,6 @@ static int sam_busfault(int irq, void *context, void *arg)
return 0;
}
-static int sam_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received: %08" PRIx32 "\n",
- getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
-static int sam_pendsv(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! PendSV received\n");
- PANIC();
- return 0;
-}
-
static int sam_dbgmonitor(int irq, void *context, void *arg)
{
up_irq_save();
@@ -430,8 +413,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(SAM_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(SAM_IRQ_BUSFAULT, sam_busfault, NULL);
- irq_attach(SAM_IRQ_USAGEFAULT, sam_usagefault, NULL);
+ irq_attach(SAM_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(SAM_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(SAM_IRQ_PENDSV, sam_pendsv, NULL);
irq_attach(SAM_IRQ_DBGMONITOR, sam_dbgmonitor, NULL);
irq_attach(SAM_IRQ_RESERVED, sam_reserved, NULL);
diff --git a/arch/arm/src/stm32/stm32_irq.c b/arch/arm/src/stm32/stm32_irq.c
index 045539eb87..03432dd7e0 100644
--- a/arch/arm/src/stm32/stm32_irq.c
+++ b/arch/arm/src/stm32/stm32_irq.c
@@ -128,7 +128,7 @@ static void stm32_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: stm32_nmi, stm32_busfault, stm32_usagefault, stm32_pendsv,
+ * Name: stm32_nmi, stm32_pendsv,
* stm32_dbgmonitor, stm32_pendsv, stm32_reserved
*
* Description:
@@ -147,24 +147,6 @@ static int stm32_nmi(int irq, void *context, void *arg)
return 0;
}
-static int stm32_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received: %08" PRIx32 "\n",
- getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
-static int stm32_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received: %08" PRIx32 "\n",
- getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
static int stm32_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -377,8 +359,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(STM32_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(STM32_IRQ_BUSFAULT, stm32_busfault, NULL);
- irq_attach(STM32_IRQ_USAGEFAULT, stm32_usagefault, NULL);
+ irq_attach(STM32_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(STM32_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(STM32_IRQ_PENDSV, stm32_pendsv, NULL);
irq_attach(STM32_IRQ_DBGMONITOR, stm32_dbgmonitor, NULL);
irq_attach(STM32_IRQ_RESERVED, stm32_reserved, NULL);
diff --git a/arch/arm/src/stm32f7/stm32_irq.c b/arch/arm/src/stm32f7/stm32_irq.c
index 3b775a4da6..8111e5c679 100644
--- a/arch/arm/src/stm32f7/stm32_irq.c
+++ b/arch/arm/src/stm32f7/stm32_irq.c
@@ -164,7 +164,7 @@ static void stm32_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: stm32_nmi, stm32_busfault, stm32_usagefault, stm32_pendsv,
+ * Name: stm32_nmi, stm32_pendsv,
* stm32_dbgmonitor, stm32_pendsv, stm32_reserved
*
* Description:
@@ -183,24 +183,6 @@ static int stm32_nmi(int irq, void *context, void *arg)
return 0;
}
-static int stm32_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received: %08" PRIx32 "\n",
- getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
-static int stm32_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received: %08" PRIx32 "\n",
- getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
static int stm32_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -474,8 +456,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(STM32_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(STM32_IRQ_BUSFAULT, stm32_busfault, NULL);
- irq_attach(STM32_IRQ_USAGEFAULT, stm32_usagefault, NULL);
+ irq_attach(STM32_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(STM32_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(STM32_IRQ_PENDSV, stm32_pendsv, NULL);
irq_attach(STM32_IRQ_DBGMONITOR, stm32_dbgmonitor, NULL);
irq_attach(STM32_IRQ_RESERVED, stm32_reserved, NULL);
diff --git a/arch/arm/src/stm32h7/stm32_irq.c b/arch/arm/src/stm32h7/stm32_irq.c
index 2f1e4ee4af..3dd99295a6 100644
--- a/arch/arm/src/stm32h7/stm32_irq.c
+++ b/arch/arm/src/stm32h7/stm32_irq.c
@@ -159,7 +159,7 @@ static void stm32_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: stm32_nmi, stm32_busfault, stm32_usagefault, stm32_pendsv,
+ * Name: stm32_nmi, stm32_pendsv,
* stm32_dbgmonitor, stm32_pendsv, stm32_reserved
*
* Description:
@@ -178,22 +178,6 @@ static int stm32_nmi(int irq, void *context, void *arg)
return 0;
}
-static int stm32_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
-static int stm32_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
static int stm32_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -494,8 +478,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(STM32_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(STM32_IRQ_BUSFAULT, stm32_busfault, NULL);
- irq_attach(STM32_IRQ_USAGEFAULT, stm32_usagefault, NULL);
+ irq_attach(STM32_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(STM32_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(STM32_IRQ_PENDSV, stm32_pendsv, NULL);
irq_attach(STM32_IRQ_DBGMONITOR, stm32_dbgmonitor, NULL);
irq_attach(STM32_IRQ_RESERVED, stm32_reserved, NULL);
diff --git a/arch/arm/src/stm32l4/stm32l4_irq.c b/arch/arm/src/stm32l4/stm32l4_irq.c
index b602f3cdc6..7a40ba8ed8 100644
--- a/arch/arm/src/stm32l4/stm32l4_irq.c
+++ b/arch/arm/src/stm32l4/stm32l4_irq.c
@@ -125,7 +125,7 @@ static void stm32l4_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: stm32l4_nmi, stm32l4_busfault, stm32l4_usagefault, stm32l4_pendsv,
+ * Name: stm32l4_nmi, stm32l4_pendsv,
* stm32l4_dbgmonitor, stm32l4_pendsv, stm32l4_reserved
*
* Description:
@@ -144,22 +144,6 @@ static int stm32l4_nmi(int irq, void *context, void *arg)
return 0;
}
-static int stm32l4_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
-static int stm32l4_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
static int stm32l4_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -362,8 +346,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(STM32L4_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(STM32L4_IRQ_BUSFAULT, stm32l4_busfault, NULL);
- irq_attach(STM32L4_IRQ_USAGEFAULT, stm32l4_usagefault, NULL);
+ irq_attach(STM32L4_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(STM32L4_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(STM32L4_IRQ_PENDSV, stm32l4_pendsv, NULL);
irq_attach(STM32L4_IRQ_DBGMONITOR, stm32l4_dbgmonitor, NULL);
irq_attach(STM32L4_IRQ_RESERVED, stm32l4_reserved, NULL);
diff --git a/arch/arm/src/stm32l5/stm32l5_irq.c b/arch/arm/src/stm32l5/stm32l5_irq.c
index 1876ca57b6..b93dd26c2f 100644
--- a/arch/arm/src/stm32l5/stm32l5_irq.c
+++ b/arch/arm/src/stm32l5/stm32l5_irq.c
@@ -110,7 +110,7 @@ static void stm32l5_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: stm32l5_nmi, stm32l5_busfault, stm32l5_usagefault, stm32l5_pendsv,
+ * Name: stm32l5_nmi, stm32l5_pendsv,
* stm32l5_dbgmonitor, stm32l5_pendsv, stm32l5_reserved
*
* Description:
@@ -129,22 +129,6 @@ static int stm32l5_nmi(int irq, void *context, void *arg)
return 0;
}
-static int stm32l5_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
-static int stm32l5_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
static int stm32l5_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -349,8 +333,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(STM32L5_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(STM32L5_IRQ_BUSFAULT, stm32l5_busfault, NULL);
- irq_attach(STM32L5_IRQ_USAGEFAULT, stm32l5_usagefault, NULL);
+ irq_attach(STM32L5_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(STM32L5_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(STM32L5_IRQ_PENDSV, stm32l5_pendsv, NULL);
irq_attach(STM32L5_IRQ_DBGMONITOR, stm32l5_dbgmonitor, NULL);
irq_attach(STM32L5_IRQ_RESERVED, stm32l5_reserved, NULL);
diff --git a/arch/arm/src/stm32u5/stm32_irq.c b/arch/arm/src/stm32u5/stm32_irq.c
index 528d51cff7..239d414bec 100644
--- a/arch/arm/src/stm32u5/stm32_irq.c
+++ b/arch/arm/src/stm32u5/stm32_irq.c
@@ -110,7 +110,7 @@ static void stm32_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: stm32_nmi, stm32_busfault, stm32_usagefault, stm32_pendsv,
+ * Name: stm32_nmi, stm32_pendsv,
* stm32_dbgmonitor, stm32_pendsv, stm32_reserved
*
* Description:
@@ -129,22 +129,6 @@ static int stm32_nmi(int irq, void *context, void *arg)
return 0;
}
-static int stm32_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
-static int stm32_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
static int stm32_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -349,8 +333,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(STM32_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(STM32_IRQ_BUSFAULT, stm32_busfault, NULL);
- irq_attach(STM32_IRQ_USAGEFAULT, stm32_usagefault, NULL);
+ irq_attach(STM32_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(STM32_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(STM32_IRQ_PENDSV, stm32_pendsv, NULL);
irq_attach(STM32_IRQ_DBGMONITOR, stm32_dbgmonitor, NULL);
irq_attach(STM32_IRQ_RESERVED, stm32_reserved, NULL);
diff --git a/arch/arm/src/stm32wb/stm32wb_irq.c b/arch/arm/src/stm32wb/stm32wb_irq.c
index 3e8578ddae..f4ffe0e68d 100644
--- a/arch/arm/src/stm32wb/stm32wb_irq.c
+++ b/arch/arm/src/stm32wb/stm32wb_irq.c
@@ -126,7 +126,7 @@ static void stm32wb_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: stm32wb_nmi, stm32wb_busfault, stm32wb_usagefault, stm32wb_pendsv,
+ * Name: stm32wb_nmi, stm32wb_pendsv,
* stm32wb_dbgmonitor, stm32wb_pendsv, stm32wb_reserved
*
* Description:
@@ -145,24 +145,6 @@ static int stm32wb_nmi(int irq, void *context, void *arg)
return 0;
}
-static int stm32wb_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received: %08" PRIx32 "\n",
- getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
-static int stm32wb_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received: %08" PRIx32 "\n",
- getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
static int stm32wb_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -369,8 +351,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(STM32WB_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(STM32WB_IRQ_BUSFAULT, stm32wb_busfault, NULL);
- irq_attach(STM32WB_IRQ_USAGEFAULT, stm32wb_usagefault, NULL);
+ irq_attach(STM32WB_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(STM32WB_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(STM32WB_IRQ_PENDSV, stm32wb_pendsv, NULL);
irq_attach(STM32WB_IRQ_DBGMONITOR, stm32wb_dbgmonitor, NULL);
irq_attach(STM32WB_IRQ_RESERVED, stm32wb_reserved, NULL);
diff --git a/arch/arm/src/stm32wl5/stm32wl5_irq.c b/arch/arm/src/stm32wl5/stm32wl5_irq.c
index 5848b53d46..c4107c491a 100644
--- a/arch/arm/src/stm32wl5/stm32wl5_irq.c
+++ b/arch/arm/src/stm32wl5/stm32wl5_irq.c
@@ -126,9 +126,8 @@ static void stm32wl5_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: stm32wl5_nmi, stm32wl5_busfault, stm32wl5_usagefault,
- * stm32wl5_pendsv, stm32wl5_dbgmonitor, stm32wl5_pendsv,
- * stm32wl5_reserved
+ * Name: stm32wl5_nmi, stm32wl5_pendsv,
+ * stm32wl5_dbgmonitor, stm32wl5_pendsv, stm32wl5_reserved
*
* Description:
* Handlers for various exceptions. None are handled and all are fatal
@@ -146,24 +145,6 @@ static int stm32wl5_nmi(int irq, void *context, void *arg)
return 0;
}
-static int stm32wl5_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received: %08x\n",
- (unsigned int)getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
-static int stm32wl5_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received: %08x\n",
- (unsigned int)getreg32(NVIC_CFAULTS));
- PANIC();
- return 0;
-}
-
static int stm32wl5_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -366,8 +347,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(STM32WL5_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(STM32WL5_IRQ_BUSFAULT, stm32wl5_busfault, NULL);
- irq_attach(STM32WL5_IRQ_USAGEFAULT, stm32wl5_usagefault, NULL);
+ irq_attach(STM32WL5_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(STM32WL5_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(STM32WL5_IRQ_PENDSV, stm32wl5_pendsv, NULL);
irq_attach(STM32WL5_IRQ_DBGMONITOR, stm32wl5_dbgmonitor, NULL);
irq_attach(STM32WL5_IRQ_RESERVED, stm32wl5_reserved, NULL);
diff --git a/arch/arm/src/tiva/common/tiva_irq.c b/arch/arm/src/tiva/common/tiva_irq.c
index 47b5427132..6445a40078 100644
--- a/arch/arm/src/tiva/common/tiva_irq.c
+++ b/arch/arm/src/tiva/common/tiva_irq.c
@@ -193,7 +193,7 @@ static void tiva_dumpnvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: tiva_nmi, tiva_busfault, tiva_usagefault, tiva_pendsv,
+ * Name: tiva_nmi, tiva_pendsv,
* tiva_dbgmonitor, tiva_pendsv, tiva_reserved
*
* Description:
@@ -212,22 +212,6 @@ static int tiva_nmi(int irq, void *context, void *arg)
return 0;
}
-static int tiva_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received\n");
- PANIC();
- return 0;
-}
-
-static int tiva_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received\n");
- PANIC();
- return 0;
-}
-
static int tiva_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -492,8 +476,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(TIVA_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(TIVA_IRQ_BUSFAULT, tiva_busfault, NULL);
- irq_attach(TIVA_IRQ_USAGEFAULT, tiva_usagefault, NULL);
+ irq_attach(TIVA_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(TIVA_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(TIVA_IRQ_PENDSV, tiva_pendsv, NULL);
irq_attach(TIVA_IRQ_DBGMONITOR, tiva_dbgmonitor, NULL);
irq_attach(TIVA_IRQ_RESERVED, tiva_reserved, NULL);
diff --git a/arch/arm/src/xmc4/xmc4_irq.c b/arch/arm/src/xmc4/xmc4_irq.c
index fe66ad0178..907ad0dbef 100644
--- a/arch/arm/src/xmc4/xmc4_irq.c
+++ b/arch/arm/src/xmc4/xmc4_irq.c
@@ -143,7 +143,7 @@ static void xmc4_dump_nvic(const char *msg, int irq)
#endif
/****************************************************************************
- * Name: xmc4_nmi, xmc4_busfault, xmc4_usagefault, xmc4_pendsv,
+ * Name: xmc4_nmi, xmc4_pendsv,
* xmc4_dbgmonitor, xmc4_pendsv, xmc4_reserved
*
* Description:
@@ -162,22 +162,6 @@ static int xmc4_nmi(int irq, void *context, void *arg)
return 0;
}
-static int xmc4_busfault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Bus fault received\n");
- PANIC();
- return 0;
-}
-
-static int xmc4_usagefault(int irq, void *context, void *arg)
-{
- up_irq_save();
- _err("PANIC!!! Usage fault received\n");
- PANIC();
- return 0;
-}
-
static int xmc4_pendsv(int irq, void *context, void *arg)
{
up_irq_save();
@@ -406,8 +390,8 @@ void up_irqinitialize(void)
#ifndef CONFIG_ARM_MPU
irq_attach(XMC4_IRQ_MEMFAULT, arm_memfault, NULL);
#endif
- irq_attach(XMC4_IRQ_BUSFAULT, xmc4_busfault, NULL);
- irq_attach(XMC4_IRQ_USAGEFAULT, xmc4_usagefault, NULL);
+ irq_attach(XMC4_IRQ_BUSFAULT, arm_busfault, NULL);
+ irq_attach(XMC4_IRQ_USAGEFAULT, arm_usagefault, NULL);
irq_attach(XMC4_IRQ_PENDSV, xmc4_pendsv, NULL);
irq_attach(XMC4_IRQ_DBGMONITOR, xmc4_dbgmonitor, NULL);
irq_attach(XMC4_IRQ_RESERVED, xmc4_reserved, NULL);
[incubator-nuttx] 21/22: Fix clang compiler warning in boards/arm/stm32/
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit e9f630ecb5d34f20d58a26609f5de9dc16ecf6a9
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Oct 30 01:26:11 2022 +0800
Fix clang compiler warning in boards/arm/stm32/
Error: board/stm32_ssd1289.c:290:33: error: shifting a negative signed value is undefined [-Werror,-Wshift-negative-value]
putreg32(FSMC_BTR_ADDSET(5) | FSMC_BTR_ADDHLD(0) |
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~
/github/workspace/sources/nuttx/arch/arm/src/chip/hardware/stm32_fsmc.h:164:42: note: expanded from macro 'FSMC_BTR_ADDHLD'
^
/github/workspace/sources/nuttx/arch/arm/src/common/arm_internal.h:135:54: note: expanded from macro 'putreg32'
^
Error: board/stm32_ssd1289.c:291:33: error: shifting a negative signed value is undefined [-Werror,-Wshift-negative-value]
FSMC_BTR_DATAST(9) | FSMC_BTR_BUSTURN(0) |
~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~
/github/workspace/sources/nuttx/arch/arm/src/chip/hardware/stm32_fsmc.h:172:42: note: expanded from macro 'FSMC_BTR_BUSTURN'
^
/github/workspace/sources/nuttx/arch/arm/src/common/arm_internal.h:135:54: note: expanded from macro 'putreg32'
^
Error: board/stm32_ssd1289.c:292:12: error: shifting a negative signed value is undefined [-Werror,-Wshift-negative-value]
FSMC_BTR_CLKDIV(0) | FSMC_BTR_DATLAT(0) |
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/github/workspace/sources/nuttx/arch/arm/src/chip/hardware/stm32_fsmc.h:176:42: note: expanded from macro 'FSMC_BTR_CLKDIV'
^
/github/workspace/sources/nuttx/arch/arm/src/common/arm_internal.h:135:54: note: expanded from macro 'putreg32'
^
Error: board/stm32_ssd1289.c:292:33: error: shifting a negative signed value is undefined [-Werror,-Wshift-negative-value]
FSMC_BTR_CLKDIV(0) | FSMC_BTR_DATLAT(0) |
~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~
/github/workspace/sources/nuttx/arch/arm/src/chip/hardware/stm32_fsmc.h:180:42: note: expanded from macro 'FSMC_BTR_DATLAT'
^
/github/workspace/sources/nuttx/arch/arm/src/common/arm_internal.h:135:54: note: expanded from macro 'putreg32'
^
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
boards/arm/stm32/fire-stm32v2/src/stm32_selectlcd.c | 2 +-
boards/arm/stm32/hymini-stm32v/src/stm32_r61505u.c | 2 +-
boards/arm/stm32/hymini-stm32v/src/stm32_ssd1289.c | 2 +-
boards/arm/stm32/stm3210e-eval/src/stm32_selectlcd.c | 2 +-
boards/arm/stm32/stm3220g-eval/src/stm32_selectlcd.c | 6 +++---
boards/arm/stm32/stm3240g-eval/src/stm32_selectlcd.c | 6 +++---
boards/arm/stm32/stm32f4discovery/src/stm32_ssd1289.c | 6 +++---
boards/arm/stm32/viewtool-stm32f107/src/stm32_ssd1289.c | 2 +-
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/boards/arm/stm32/fire-stm32v2/src/stm32_selectlcd.c b/boards/arm/stm32/fire-stm32v2/src/stm32_selectlcd.c
index 5c6af94819..6a385dcf0c 100644
--- a/boards/arm/stm32/fire-stm32v2/src/stm32_selectlcd.c
+++ b/boards/arm/stm32/fire-stm32v2/src/stm32_selectlcd.c
@@ -165,7 +165,7 @@ void stm32_selectlcd(void)
putreg32(FSMC_BTR_ADDSET(1) | FSMC_BTR_ADDHLD(0) |
FSMC_BTR_DATAST(2) | FSMC_BTR_BUSTURN(0) |
- FSMC_BTR_CLKDIV(0) | FSMC_BTR_DATLAT(0) |
+ FSMC_BTR_CLKDIV(1) | FSMC_BTR_DATLAT(2) |
FSMC_BTR_ACCMODA, STM32_FSMC_BTR1);
putreg32(0xffffffff, STM32_FSMC_BWTR4);
diff --git a/boards/arm/stm32/hymini-stm32v/src/stm32_r61505u.c b/boards/arm/stm32/hymini-stm32v/src/stm32_r61505u.c
index c89d49748e..f034f124c0 100644
--- a/boards/arm/stm32/hymini-stm32v/src/stm32_r61505u.c
+++ b/boards/arm/stm32/hymini-stm32v/src/stm32_r61505u.c
@@ -296,7 +296,7 @@ static void stm32_selectlcd(void)
/* Bank1 NOR/SRAM timing register configuration */
putreg32(FSMC_BTR_ADDSET(2) | FSMC_BTR_ADDHLD(0) | FSMC_BTR_DATAST(2) |
- FSMC_BTR_BUSTURN(0) | FSMC_BTR_CLKDIV(0) | FSMC_BTR_DATLAT(0) |
+ FSMC_BTR_BUSTURN(0) | FSMC_BTR_CLKDIV(1) | FSMC_BTR_DATLAT(2) |
FSMC_BTR_ACCMODA,
STM32_FSMC_BTR1);
diff --git a/boards/arm/stm32/hymini-stm32v/src/stm32_ssd1289.c b/boards/arm/stm32/hymini-stm32v/src/stm32_ssd1289.c
index 9ef75ac701..46875308cf 100644
--- a/boards/arm/stm32/hymini-stm32v/src/stm32_ssd1289.c
+++ b/boards/arm/stm32/hymini-stm32v/src/stm32_ssd1289.c
@@ -375,7 +375,7 @@ static void stm32_selectlcd(void)
/* Bank1 NOR/SRAM timing register configuration */
putreg32(FSMC_BTR_ADDSET(1) | FSMC_BTR_ADDHLD(0) | FSMC_BTR_DATAST(2) |
- FSMC_BTR_BUSTURN(0) | FSMC_BTR_CLKDIV(0) | FSMC_BTR_DATLAT(0) |
+ FSMC_BTR_BUSTURN(0) | FSMC_BTR_CLKDIV(1) | FSMC_BTR_DATLAT(2) |
FSMC_BTR_ACCMODA,
STM32_FSMC_BTR1);
diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_selectlcd.c b/boards/arm/stm32/stm3210e-eval/src/stm32_selectlcd.c
index 5db4ecc61f..ad62481973 100644
--- a/boards/arm/stm32/stm3210e-eval/src/stm32_selectlcd.c
+++ b/boards/arm/stm32/stm3210e-eval/src/stm32_selectlcd.c
@@ -117,7 +117,7 @@ void stm32_selectlcd(void)
putreg32(FSMC_BTR_ADDSET(1) | FSMC_BTR_ADDHLD(0) |
FSMC_BTR_DATAST(2) | FSMC_BTR_BUSTURN(0) |
- FSMC_BTR_CLKDIV(0) | FSMC_BTR_DATLAT(0) |
+ FSMC_BTR_CLKDIV(1) | FSMC_BTR_DATLAT(2) |
FSMC_BTR_ACCMODA, STM32_FSMC_BTR4);
putreg32(0xffffffff, STM32_FSMC_BWTR4);
diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_selectlcd.c b/boards/arm/stm32/stm3220g-eval/src/stm32_selectlcd.c
index 92bfc0c6d6..3af64fdc59 100644
--- a/boards/arm/stm32/stm3220g-eval/src/stm32_selectlcd.c
+++ b/boards/arm/stm32/stm3220g-eval/src/stm32_selectlcd.c
@@ -136,9 +136,9 @@ void stm32_selectlcd(void)
/* Bank3 NOR/SRAM timing register configuration */
- putreg32(FSMC_BTR_ADDSET(5) | FSMC_BTR_ADDHLD(0) |
- FSMC_BTR_DATAST(9) | FSMC_BTR_BUSTURN(0) |
- FSMC_BTR_CLKDIV(0) | FSMC_BTR_DATLAT(0) |
+ putreg32(FSMC_BTR_ADDSET(5) | FSMC_BTR_ADDHLD(1) |
+ FSMC_BTR_DATAST(9) | FSMC_BTR_BUSTURN(1) |
+ FSMC_BTR_CLKDIV(1) | FSMC_BTR_DATLAT(2) |
FSMC_BTR_ACCMODA, STM32_FSMC_BTR3);
putreg32(0xffffffff, STM32_FSMC_BWTR3);
diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_selectlcd.c b/boards/arm/stm32/stm3240g-eval/src/stm32_selectlcd.c
index 23c1f085e3..b33852077d 100644
--- a/boards/arm/stm32/stm3240g-eval/src/stm32_selectlcd.c
+++ b/boards/arm/stm32/stm3240g-eval/src/stm32_selectlcd.c
@@ -136,9 +136,9 @@ void stm32_selectlcd(void)
/* Bank3 NOR/SRAM timing register configuration */
- putreg32(FSMC_BTR_ADDSET(5) | FSMC_BTR_ADDHLD(0) |
- FSMC_BTR_DATAST(9) | FSMC_BTR_BUSTURN(0) |
- FSMC_BTR_CLKDIV(0) | FSMC_BTR_DATLAT(0) |
+ putreg32(FSMC_BTR_ADDSET(5) | FSMC_BTR_ADDHLD(1) |
+ FSMC_BTR_DATAST(9) | FSMC_BTR_BUSTURN(1) |
+ FSMC_BTR_CLKDIV(1) | FSMC_BTR_DATLAT(2) |
FSMC_BTR_ACCMODA, STM32_FSMC_BTR3);
putreg32(0xffffffff, STM32_FSMC_BWTR3);
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_ssd1289.c b/boards/arm/stm32/stm32f4discovery/src/stm32_ssd1289.c
index c436e24183..7d8623e50c 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_ssd1289.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_ssd1289.c
@@ -287,9 +287,9 @@ void stm32_selectlcd(void)
/* Bank1 NOR/SRAM timing register configuration */
- putreg32(FSMC_BTR_ADDSET(5) | FSMC_BTR_ADDHLD(0) |
- FSMC_BTR_DATAST(9) | FSMC_BTR_BUSTURN(0) |
- FSMC_BTR_CLKDIV(0) | FSMC_BTR_DATLAT(0) |
+ putreg32(FSMC_BTR_ADDSET(5) | FSMC_BTR_ADDHLD(1) |
+ FSMC_BTR_DATAST(9) | FSMC_BTR_BUSTURN(1) |
+ FSMC_BTR_CLKDIV(1) | FSMC_BTR_DATLAT(2) |
FSMC_BTR_ACCMODA, STM32_FSMC_BTR1);
putreg32(0xffffffff, STM32_FSMC_BWTR1);
diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_ssd1289.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_ssd1289.c
index ffb940a558..6732cd6555 100644
--- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_ssd1289.c
+++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_ssd1289.c
@@ -445,7 +445,7 @@ static void stm32_selectlcd(void)
putreg32(
FSMC_BTR_ADDSET(1) | FSMC_BTR_ADDHLD(0) |
FSMC_BTR_DATAST(2) | FSMC_BTR_BUSTURN(0) |
- FSMC_BTR_CLKDIV(0) | FSMC_BTR_DATLAT(0) |
+ FSMC_BTR_CLKDIV(1) | FSMC_BTR_DATLAT(2) |
FSMC_BTR_ACCMODA,
STM32_FSMC_BTR1);
[incubator-nuttx] 20/22: Fix Error: usbhost/usbhost_storage.c:1471:24: error: unused function 'usbhost_getle32'
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 2d6503646d6a1ae402435e8ff9bd6d85f5f0dc5a
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Oct 30 01:16:36 2022 +0800
Fix Error: usbhost/usbhost_storage.c:1471:24: error: unused function 'usbhost_getle32'
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
drivers/usbhost/usbhost_hidkbd.c | 52 --------------------------------
drivers/usbhost/usbhost_hidmouse.c | 52 --------------------------------
drivers/usbhost/usbhost_xboxcontroller.c | 52 --------------------------------
3 files changed, 156 deletions(-)
diff --git a/drivers/usbhost/usbhost_hidkbd.c b/drivers/usbhost/usbhost_hidkbd.c
index ab2d9de3b6..7279d3c367 100644
--- a/drivers/usbhost/usbhost_hidkbd.c
+++ b/drivers/usbhost/usbhost_hidkbd.c
@@ -276,10 +276,6 @@ static inline int usbhost_devinit(FAR struct usbhost_state_s *priv);
static inline uint16_t usbhost_getle16(const uint8_t *val);
static inline void usbhost_putle16(uint8_t *dest, uint16_t val);
-static inline uint32_t usbhost_getle32(const uint8_t *val);
-#if 0 /* Not used */
-static void usbhost_putle32(uint8_t *dest, uint32_t val);
-#endif
/* Transfer descriptor memory management */
@@ -1746,54 +1742,6 @@ static void usbhost_putle16(uint8_t *dest, uint16_t val)
dest[1] = val >> 8;
}
-/****************************************************************************
- * Name: usbhost_getle32
- *
- * Description:
- * Get a (possibly unaligned) 32-bit little endian value.
- *
- * Input Parameters:
- * dest - A pointer to the first byte to save the big endian value.
- * val - The 32-bit value to be saved.
- *
- * Returned Value:
- * None
- *
- ****************************************************************************/
-
-static inline uint32_t usbhost_getle32(const uint8_t *val)
-{
- /* Little endian means LS halfword first in byte stream */
-
- return (uint32_t)usbhost_getle16(&val[2]) << 16 |
- (uint32_t)usbhost_getle16(val);
-}
-
-/****************************************************************************
- * Name: usbhost_putle32
- *
- * Description:
- * Put a (possibly unaligned) 32-bit little endian value.
- *
- * Input Parameters:
- * dest - A pointer to the first byte to save the little endian value.
- * val - The 32-bit value to be saved.
- *
- * Returned Value:
- * None
- *
- ****************************************************************************/
-
-#if 0 /* Not used */
-static void usbhost_putle32(uint8_t *dest, uint32_t val)
-{
- /* Little endian means LS halfword first in byte stream */
-
- usbhost_putle16(dest, (uint16_t)(val & 0xffff));
- usbhost_putle16(dest + 2, (uint16_t)(val >> 16));
-}
-#endif
-
/****************************************************************************
* Name: usbhost_tdalloc
*
diff --git a/drivers/usbhost/usbhost_hidmouse.c b/drivers/usbhost/usbhost_hidmouse.c
index 55e124f241..bd3e1bcaee 100644
--- a/drivers/usbhost/usbhost_hidmouse.c
+++ b/drivers/usbhost/usbhost_hidmouse.c
@@ -327,10 +327,6 @@ static inline int usbhost_devinit(FAR struct usbhost_state_s *priv);
static inline uint16_t usbhost_getle16(const uint8_t *val);
static inline void usbhost_putle16(uint8_t *dest, uint16_t val);
-static inline uint32_t usbhost_getle32(const uint8_t *val);
-#if 0 /* Not used */
-static void usbhost_putle32(uint8_t *dest, uint32_t val);
-#endif
/* Transfer descriptor memory management */
@@ -1700,54 +1696,6 @@ static void usbhost_putle16(uint8_t *dest, uint16_t val)
dest[1] = val >> 8;
}
-/****************************************************************************
- * Name: usbhost_getle32
- *
- * Description:
- * Get a (possibly unaligned) 32-bit little endian value.
- *
- * Input Parameters:
- * dest - A pointer to the first byte to save the big endian value.
- * val - The 32-bit value to be saved.
- *
- * Returned Value:
- * None
- *
- ****************************************************************************/
-
-static inline uint32_t usbhost_getle32(const uint8_t *val)
-{
- /* Little endian means LS halfword first in byte stream */
-
- return (uint32_t)usbhost_getle16(&val[2]) << 16 |
- (uint32_t)usbhost_getle16(val);
-}
-
-/****************************************************************************
- * Name: usbhost_putle32
- *
- * Description:
- * Put a (possibly unaligned) 32-bit little endian value.
- *
- * Input Parameters:
- * dest - A pointer to the first byte to save the little endian value.
- * val - The 32-bit value to be saved.
- *
- * Returned Value:
- * None
- *
- ****************************************************************************/
-
-#if 0 /* Not used */
-static void usbhost_putle32(uint8_t *dest, uint32_t val)
-{
- /* Little endian means LS halfword first in byte stream */
-
- usbhost_putle16(dest, (uint16_t)(val & 0xffff));
- usbhost_putle16(dest + 2, (uint16_t)(val >> 16));
-}
-#endif
-
/****************************************************************************
* Name: usbhost_tdalloc
*
diff --git a/drivers/usbhost/usbhost_xboxcontroller.c b/drivers/usbhost/usbhost_xboxcontroller.c
index 2b2e4d328b..bfc91730df 100644
--- a/drivers/usbhost/usbhost_xboxcontroller.c
+++ b/drivers/usbhost/usbhost_xboxcontroller.c
@@ -215,10 +215,6 @@ static inline int usbhost_devinit(FAR struct usbhost_state_s *priv);
static inline uint16_t usbhost_getle16(const uint8_t *val);
static inline void usbhost_putle16(uint8_t *dest, uint16_t val);
-static inline uint32_t usbhost_getle32(const uint8_t *val);
-#if 0 /* Not used */
-static void usbhost_putle32(uint8_t *dest, uint32_t val);
-#endif
/* Transfer descriptor memory management */
@@ -1424,54 +1420,6 @@ static void usbhost_putle16(uint8_t *dest, uint16_t val)
dest[1] = val >> 8;
}
-/****************************************************************************
- * Name: usbhost_getle32
- *
- * Description:
- * Get a (possibly unaligned) 32-bit little endian value.
- *
- * Input Parameters:
- * dest - A pointer to the first byte to save the big endian value.
- * val - The 32-bit value to be saved.
- *
- * Returned Value:
- * None
- *
- ****************************************************************************/
-
-static inline uint32_t usbhost_getle32(const uint8_t *val)
-{
- /* Little endian means LS halfword first in byte stream */
-
- return (uint32_t)usbhost_getle16(&val[2]) << 16 |
- (uint32_t)usbhost_getle16(val);
-}
-
-/****************************************************************************
- * Name: usbhost_putle32
- *
- * Description:
- * Put a (possibly unaligned) 32-bit little endian value.
- *
- * Input Parameters:
- * dest - A pointer to the first byte to save the little endian value.
- * val - The 32-bit value to be saved.
- *
- * Returned Value:
- * None
- *
- ****************************************************************************/
-
-#if 0 /* Not used */
-static void usbhost_putle32(uint8_t *dest, uint32_t val)
-{
- /* Little endian means LS halfword first in byte stream */
-
- usbhost_putle16(dest, (uint16_t)(val & 0xffff));
- usbhost_putle16(dest + 2, (uint16_t)(val >> 16));
-}
-#endif
-
/****************************************************************************
* Name: usbhost_talloc
*
[incubator-nuttx] 16/22: Fix Error: modem/alt1250/altcom_hdlr.c:902:24: error: result of comparison of constant 1 with expression of type 'bool' is always false [-Werror,-Wtautological-constant-compare] api_edrx->enable > LTE_ENABLE) ~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~ Error: modem/alt1250/altcom_hdlr.c:901:24: error: result of comparison of constant 0 with expression of type 'bool' is always false [-Werror,-Wtautological-constant-compare] if (api_edrx->enable < LTE_DISABLE || ~~~~~~~~~~~~~~~~ ^ ~~~~ [...]
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit c2a4263cc5725cebcb62d07e64343479fe50180c
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Oct 29 02:38:22 2022 +0800
Fix Error: modem/alt1250/altcom_hdlr.c:902:24: error: result of comparison of constant 1 with expression of type 'bool' is always false [-Werror,-Wtautological-constant-compare]
api_edrx->enable > LTE_ENABLE)
~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~
Error: modem/alt1250/altcom_hdlr.c:901:24: error: result of comparison of constant 0 with expression of type 'bool' is always false [-Werror,-Wtautological-constant-compare]
if (api_edrx->enable < LTE_DISABLE ||
~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
drivers/modem/alt1250/altcom_hdlr.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/modem/alt1250/altcom_hdlr.c b/drivers/modem/alt1250/altcom_hdlr.c
index 10591ac9f8..ecefaf9012 100644
--- a/drivers/modem/alt1250/altcom_hdlr.c
+++ b/drivers/modem/alt1250/altcom_hdlr.c
@@ -898,13 +898,6 @@ int32_t altcombs_convert_api_edrx_value(lte_edrx_setting_t *api_edrx,
return -EINVAL;
}
- if (api_edrx->enable < LTE_DISABLE ||
- api_edrx->enable > LTE_ENABLE)
- {
- m_err("Invalid enable :%d\n", api_edrx->enable);
- return -EINVAL;
- }
-
/* act_type check for version V4 or later */
if (altver == ALTCOM_VER1)
[incubator-nuttx] 22/22: Fix modem/alt1250/altcom_cmd_sms.h:148:7: error: field u within 'struct apicmd_sms_msg_s' is less aligned than 'union
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 59416af3e697ab89a85f8598751654422f63d46c
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Oct 30 12:18:34 2022 +0800
Fix modem/alt1250/altcom_cmd_sms.h:148:7: error: field u within 'struct apicmd_sms_msg_s' is less aligned than 'union
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
drivers/modem/alt1250/altcom_cmd_sms.h | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/modem/alt1250/altcom_cmd_sms.h b/drivers/modem/alt1250/altcom_cmd_sms.h
index 6eb19572ad..6bc5e8e076 100644
--- a/drivers/modem/alt1250/altcom_cmd_sms.h
+++ b/drivers/modem/alt1250/altcom_cmd_sms.h
@@ -123,7 +123,7 @@ begin_packed_struct struct apicmd_sms_msg_s
{
/* SMS-DELIVER */
- struct
+ begin_packed_struct struct
{
uint8_t valid_indicator;
struct apicmd_sms_addr_s src_addr;
@@ -134,17 +134,19 @@ begin_packed_struct struct apicmd_sms_msg_s
/* Variable length array */
uint16_t user_data[0];
- } recv;
+ }
+ end_packed_struct recv;
/* SMS-STATUS-REPORT */
- struct
+ begin_packed_struct struct
{
uint8_t status;
struct apicmd_sms_time_s sc_time;
uint8_t ref_id;
struct apicmd_sms_time_s discharge_time;
- } delivery_report;
+ }
+ end_packed_struct delivery_report;
} u;
} end_packed_struct;
[incubator-nuttx] 07/22: Fix chip/cxd56_usbdev.c:675:20: error: unused function 'cxd56_iscableconnected' [-Werror,-Wunused-function]
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit eeefc4a5167c5504abc34ac4e6aab12b0f853bec
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Oct 26 10:59:10 2022 +0800
Fix chip/cxd56_usbdev.c:675:20: error: unused function 'cxd56_iscableconnected' [-Werror,-Wunused-function]
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/cxd56xx/cxd56_usbdev.c | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/arch/arm/src/cxd56xx/cxd56_usbdev.c b/arch/arm/src/cxd56xx/cxd56_usbdev.c
index 07aea3d604..08858425ea 100644
--- a/arch/arm/src/cxd56xx/cxd56_usbdev.c
+++ b/arch/arm/src/cxd56xx/cxd56_usbdev.c
@@ -664,19 +664,6 @@ static inline void cxd56_cableconnected(bool connected)
}
}
-/****************************************************************************
- * Name: cxd56_iscableconnected
- *
- * Description:
- * Return the cable status. (true is connected)
- *
- ****************************************************************************/
-
-static inline bool cxd56_iscableconnected(void)
-{
- return getreg32(CXD56_TOPREG_USB_VBUS) & VBUS_DET;
-}
-
/****************************************************************************
* Name: cxd56_rqdequeue
*
[incubator-nuttx] 13/22: Fix Error: audio/cxd56.c:1945:20: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion]
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 8405b7b4fff9c5772ae54a123c1477af6a19e0b4
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Oct 26 11:39:34 2022 +0800
Fix Error: audio/cxd56.c:1945:20: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion]
cxd56_set_volume(CXD56_AUDIO_VOLID_MIXER_OUT, dev->volume);
~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~
Error: audio/cxd56.c:2735:34: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion]
cxd56_set_volume(CXD56_AUDIO_VOLID_MIXER_OUT, priv->volume);
~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~
Error: audio/cxd56.c:2736:34: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion]
cxd56_set_volume(CXD56_AUDIO_VOLID_MIXER_IN1, 0);
~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~
Error: audio/cxd56.c:2737:34: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion]
cxd56_set_volume(CXD56_AUDIO_VOLID_MIXER_IN2, 0);
~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~
Error: audio/cxd56.c:2755:34: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion]
cxd56_set_volume(CXD56_AUDIO_VOLID_MIXER_OUT,
~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~
Error: audio/cxd56.c:2757:34: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion]
cxd56_set_volume(CXD56_AUDIO_VOLID_MIXER_IN1,
~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~
Error: audio/cxd56.c:2759:34: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion]
cxd56_set_volume(CXD56_AUDIO_VOLID_MIXER_IN2,
~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~
Error: audio/cxd56.c:2764:34: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion]
cxd56_set_volume(CXD56_AUDIO_VOLID_MIXER_OUT, priv->volume);
~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~
Error: audio/cxd56.c:2765:34: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion]
cxd56_set_volume(CXD56_AUDIO_VOLID_MIXER_IN1, 0);
~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~
Error: audio/cxd56.c:2766:34: error: implicit conversion from enumeration type 'enum cxd56_audio_volid_e' to different enumeration type 'enum cxd56_vol_id_e' [-Werror,-Wenum-conversion]
cxd56_set_volume(CXD56_AUDIO_VOLID_MIXER_IN2, 0);
~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
drivers/audio/cxd56.c | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/drivers/audio/cxd56.c b/drivers/audio/cxd56.c
index 3e7961b01a..48da3ecc87 100644
--- a/drivers/audio/cxd56.c
+++ b/drivers/audio/cxd56.c
@@ -209,15 +209,6 @@ enum cxd56_dma_int_e
CXD56_DMA_INT_CMB = 0x20
};
-/* Volume setting IDs */
-
-enum cxd56_vol_id_e
-{
- CXD56_VOL_ID_MIXER_IN1, /* SDIN1_VOL */
- CXD56_VOL_ID_MIXER_IN2, /* SDIN2_VOL */
- CXD56_VOL_ID_MIXER_OUT /* DAC_VOL */
-};
-
enum cxd56_pulco_ser_mode_id_e
{
CXD56_SER_MODE_UNKNOWN,
@@ -418,7 +409,7 @@ static void cxd56_set_dma_running(cxd56_dmahandle_t handle, bool running);
static void cxd56_set_mic_gains(uint8_t gain,
struct cxd56_aca_pwinput_param_s *param);
static void cxd56_set_mic_out_channel(FAR struct cxd56_dev_s *dev);
-static int cxd56_set_volume(enum cxd56_vol_id_e id, int16_t vol);
+static int cxd56_set_volume(enum cxd56_audio_volid_e id, int16_t vol);
static void cxd56_swap_buffer_rl(uint32_t addr, uint16_t size);
static void *cxd56_workerthread(pthread_addr_t pvarg);
@@ -1584,7 +1575,7 @@ static void cxd56_enable_irq(bool enable)
}
}
-static int cxd56_set_volume(enum cxd56_vol_id_e id, int16_t vol)
+static int cxd56_set_volume(enum cxd56_audio_volid_e id, int16_t vol)
{
int ret;
@@ -1599,13 +1590,13 @@ static int cxd56_set_volume(enum cxd56_vol_id_e id, int16_t vol)
switch (id)
{
- case CXD56_VOL_ID_MIXER_IN1:
+ case CXD56_AUDIO_VOLID_MIXER_IN1:
write_reg(REG_AC_SDIN1_VOL, vol);
break;
- case CXD56_VOL_ID_MIXER_IN2:
+ case CXD56_AUDIO_VOLID_MIXER_IN2:
write_reg(REG_AC_SDIN2_VOL, vol);
break;
- case CXD56_VOL_ID_MIXER_OUT:
+ case CXD56_AUDIO_VOLID_MIXER_OUT:
write_reg(REG_AC_DAC_VOL, vol);
break;
}
[incubator-nuttx] 14/22: Fix Error: chip/efm32_clockconfig.c:109:20: error: unused function 'efm32_synchronize' [-Werror,-Wunused-function] static inline void efm32_synchronize(uint32_t bitset) ^ Error: chip/efm32_clockconfig.c:185:20: error: unused function 'efm32_enable_auxhfrco' [-Werror,-Wunused-function] static inline void efm32_enable_auxhfrco(void)
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 940ee2c8b1d4a02f8818e3bc707d4e6dc182b258
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Oct 29 02:16:14 2022 +0800
Fix Error: chip/efm32_clockconfig.c:109:20: error: unused function 'efm32_synchronize' [-Werror,-Wunused-function]
static inline void efm32_synchronize(uint32_t bitset)
^
Error: chip/efm32_clockconfig.c:185:20: error: unused function 'efm32_enable_auxhfrco' [-Werror,-Wunused-function]
static inline void efm32_enable_auxhfrco(void)
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/efm32/efm32_clockconfig.c | 33 ++-------------------------------
1 file changed, 2 insertions(+), 31 deletions(-)
diff --git a/arch/arm/src/efm32/efm32_clockconfig.c b/arch/arm/src/efm32/efm32_clockconfig.c
index 91c006ec08..22d841605f 100644
--- a/arch/arm/src/efm32/efm32_clockconfig.c
+++ b/arch/arm/src/efm32/efm32_clockconfig.c
@@ -89,37 +89,6 @@
* Private Functions
****************************************************************************/
-/****************************************************************************
- * Name: efm32_synchronize
- *
- * Description:
- * Wait for ongoing sync of register(s) to low frequency domain to
- * complete.
- *
- * Input Parameters:
- * bitset - Bitset corresponding to SYNCBUSY register defined bits,
- * indicating registers that must complete any ongoing
- * synchronization.
- *
- * Returned Value:
- * None
- *
- ****************************************************************************/
-
-static inline void efm32_synchronize(uint32_t bitset)
-{
- /* Avoid deadlock if modifying a register again after freeze mode is
- * activated.
- */
-
- if ((getreg32(EFM32_CMU_FREEZE) & CMU_FREEZE_REGFREEZE) == 0)
- {
- /* Wait for any pending previous write operation to complete */
-
- while ((getreg32(EFM32_CMU_SYNCBUSY) & bitset) != 0);
- }
-}
-
/****************************************************************************
* Name: efm32_statuswait
*
@@ -182,6 +151,7 @@ static void efm32_enable_hfxo(void)
efm32_statuswait(CMU_STATUS_HFXORDY);
}
+#ifdef CONFIG_ARMV7M_ITMSYSLOG
static inline void efm32_enable_auxhfrco(void)
{
/* Enable the HFXO */
@@ -189,6 +159,7 @@ static inline void efm32_enable_auxhfrco(void)
putreg32(CMU_OSCENCMD_AUXHFRCOEN, EFM32_CMU_OSCENCMD);
efm32_statuswait(CMU_STATUS_AUXHFRCORDY);
}
+#endif
/****************************************************************************
* Name: efm32_enable_leclocking
[incubator-nuttx] 01/22: include/endian.h: Fix format specifies type 'unsigned long' but the argument has type 'unsigned int'
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 4051fcd42b1f87e096cb5cf9bba28854cb515571
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Oct 26 04:13:03 2022 +0800
include/endian.h: Fix format specifies type 'unsigned long' but the argument has type 'unsigned int'
Error: route/net_del_ramroute.c:94:9: error: format specifies type 'unsigned long' but the argument has type 'unsigned int' [-Werror,-Wformat]
HTONL(match->target), HTONL(match->netmask));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/github/workspace/sources/nuttx/include/debug.h:232:23: note: expanded from macro 'ninfo'
^
/github/workspace/sources/nuttx/include/debug.h:102:43: note: expanded from macro '_none'
do { if (0) syslog(LOG_ERR, format, ##__VA_ARGS__); } while (0)
~~~~~~ ^~~~~~~~~~~
/github/workspace/sources/nuttx/include/netinet/in.h:233:17: note: expanded from macro 'HTONL'
^
/github/workspace/sources/nuttx/include/endian.h:63:25: note: expanded from macro '__swap_uint32'
^
Error: route/net_del_ramroute.c:94:31: error: format specifies type 'unsigned long' but the argument has type 'unsigned int' [-Werror,-Wformat]
HTONL(match->target), HTONL(match->netmask));
~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~
/github/workspace/sources/nuttx/include/debug.h:232:23: note: expanded from macro 'ninfo'
^
/github/workspace/sources/nuttx/include/debug.h:102:43: note: expanded from macro '_none'
do { if (0) syslog(LOG_ERR, format, ##__VA_ARGS__); } while (0)
~~~~~~ ^~~~~~~~~~~
/github/workspace/sources/nuttx/include/netinet/in.h:233:17: note: expanded from macro 'HTONL'
^
/github/workspace/sources/nuttx/include/endian.h:63:25: note: expanded from macro '__swap_uint32'
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
net/route/net_del_fileroute.c | 2 +-
net/route/net_del_ramroute.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/route/net_del_fileroute.c b/net/route/net_del_fileroute.c
index 1eed9a5a13..dff88fe7df 100644
--- a/net/route/net_del_fileroute.c
+++ b/net/route/net_del_fileroute.c
@@ -95,7 +95,7 @@ static int net_match_ipv4(FAR struct net_route_ipv4_s *route, FAR void *arg)
net_ipv4_dumproute("Comparing", route);
ninfo("With:\n");
- ninfo(" target=%08lx netmask=%08lx\n",
+ ninfo(" target=%08" PRIx32 " netmask=%08" PRIx32 "\n",
HTONL(match->target), HTONL(match->netmask));
if (net_ipv4addr_maskcmp(route->target, match->target, match->netmask) &&
diff --git a/net/route/net_del_ramroute.c b/net/route/net_del_ramroute.c
index a6b334f879..5914dd46d2 100644
--- a/net/route/net_del_ramroute.c
+++ b/net/route/net_del_ramroute.c
@@ -90,7 +90,7 @@ static int net_match_ipv4(FAR struct net_route_ipv4_s *route, FAR void *arg)
net_ipv4_dumproute("Comparing", route);
ninfo("With:\n");
- ninfo(" target=%08" PRIu32 " netmask=%08" PRIu32 "\n",
+ ninfo(" target=%08" PRIx32 " netmask=%08" PRIx32 "\n",
HTONL(match->target), HTONL(match->netmask));
if (net_ipv4addr_maskcmp(route->target, match->target, match->netmask) &&
[incubator-nuttx] 12/22: Fix src/cxd56_ili9340.c:276:22: error: cast to smaller integer type 'uint16_t' (aka 'unsigned short') from 'uint8_t *' (aka 'unsigned char *') [-Werror,-Wpointer-to-int-cast]
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 2e3473c9d62a3140079c7c7b08bd9982702d9764
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Oct 26 11:18:42 2022 +0800
Fix src/cxd56_ili9340.c:276:22: error: cast to smaller integer type 'uint16_t' (aka 'unsigned short') from 'uint8_t *' (aka 'unsigned char *') [-Werror,-Wpointer-to-int-cast]
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
boards/arm/cxd56xx/common/src/cxd56_ili9340.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/boards/arm/cxd56xx/common/src/cxd56_ili9340.c b/boards/arm/cxd56xx/common/src/cxd56_ili9340.c
index b5d83854fd..4f28a8272e 100644
--- a/boards/arm/cxd56xx/common/src/cxd56_ili9340.c
+++ b/boards/arm/cxd56xx/common/src/cxd56_ili9340.c
@@ -273,7 +273,7 @@ static int cxd56_ili93404ws_recvparam(struct ili9340_lcd_s *lcd,
struct ili93404ws_lcd_s *priv = (struct ili93404ws_lcd_s *)lcd;
cxd56_gpio_write(DISPLAY_DC, true); /* Indicate DATA */
- *param = (uint8_t)(SPI_SEND(priv->spi, param) & 0xff);
+ SPI_RECVBLOCK(priv->spi, param, 1);
return OK;
}
[incubator-nuttx] 02/22: Fix gd32f4xx_dma.c:223:26: error: unused function 'gd32_dma_channel_get' [-Werror,-Wunused-function]
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 513904d1dfb549f90f7bfc90230061988ff0d083
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Oct 26 04:14:34 2022 +0800
Fix gd32f4xx_dma.c:223:26: error: unused function 'gd32_dma_channel_get' [-Werror,-Wunused-function]
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/gd32f4/gd32f4xx_dma.c | 36 ------------------------------------
1 file changed, 36 deletions(-)
diff --git a/arch/arm/src/gd32f4/gd32f4xx_dma.c b/arch/arm/src/gd32f4/gd32f4xx_dma.c
index 777e7dfb85..8d4ed14bbf 100644
--- a/arch/arm/src/gd32f4/gd32f4xx_dma.c
+++ b/arch/arm/src/gd32f4/gd32f4xx_dma.c
@@ -211,42 +211,6 @@ static void gd32_dma_clock_enable(uint32_t dmabase)
modifyreg32(regaddr, 0, rcu_en);
}
-/****************************************************************************
- * Name: gd32_dma_channel_get
- *
- * Description:
- * Get the g_dmachan table entry associated with a DMA controller and
- * a channel number
- ****************************************************************************/
-
-static inline struct gd32_dma_channel_s
- *gd32_dma_channel_get(uint32_t channelx,
- uint32_t dma_periph)
-{
- int index;
-
- DEBUGASSERT(channelx < DMA0_NCHANNELS);
-
- DEBUGASSERT(dma_periph == GD32_DMA0_BASE && dma_periph == GD32_DMA1_BASE);
-
- /* Convert the dma_periph + chan_num based on the fact that there are
- * 8 channel per dma_periph.
- */
-
- if (dma_periph == GD32_DMA0_BASE)
- {
- index = channelx;
- }
- else
- {
- index = channelx + DMA0_NCHANNELS;
- }
-
- /* Then return the chan_num structure associated with the chan_num index */
-
- return &g_dmachan[index];
-}
-
/****************************************************************************
* Name: gd32_channel_enable
*
[incubator-nuttx] 10/22: Fix chip/cxd56_icc.c:498:18: error: overlapping comparisons always evaluate to false [-Werror,-Wtautological-overlap-compare]
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 7ad74c413a7caf7701218d6913874e81a2bce297
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Oct 26 11:09:52 2022 +0800
Fix chip/cxd56_icc.c:498:18: error: overlapping comparisons always evaluate to false [-Werror,-Wtautological-overlap-compare]
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/cxd56xx/cxd56_icc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/src/cxd56xx/cxd56_icc.c b/arch/arm/src/cxd56xx/cxd56_icc.c
index 4f98080661..7b7624b983 100644
--- a/arch/arm/src/cxd56xx/cxd56_icc.c
+++ b/arch/arm/src/cxd56xx/cxd56_icc.c
@@ -495,7 +495,7 @@ int cxd56_iccsignal(int8_t cpuid, int8_t signo, int16_t sigdata,
{
struct iccreq_s req;
- if (cpuid <= 2 && cpuid >= 7)
+ if (cpuid <= 2 || cpuid >= 7)
{
return -EINVAL;
}
[incubator-nuttx] 11/22: Fix chip/cxd56_farapi.c:285:14: error: format specifies type 'int' but the argument has type 'unsigned long' [-Werror,-Wformat]
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit c6ae5e42c0514f5f5e839112f29257a81a0ee7fa
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Oct 26 11:11:10 2022 +0800
Fix chip/cxd56_farapi.c:285:14: error: format specifies type 'int' but the argument has type 'unsigned long' [-Werror,-Wformat]
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/cxd56xx/cxd56_farapi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/src/cxd56xx/cxd56_farapi.c b/arch/arm/src/cxd56xx/cxd56_farapi.c
index dc0b76a102..ec53266f57 100644
--- a/arch/arm/src/cxd56xx/cxd56_farapi.c
+++ b/arch/arm/src/cxd56xx/cxd56_farapi.c
@@ -281,7 +281,7 @@ void cxd56_farapiinitialize(void)
#ifdef CONFIG_CXD56_FARAPI_VERSION_CHECK
if (GET_SYSFW_VERSION_BUILD() < FARAPISTUB_VERSION)
{
- _alert("Mismatched version: loader(%d) != Self(%d)\n",
+ _alert("Mismatched version: loader(%" PRId32 ") != Self(%d)\n",
GET_SYSFW_VERSION_BUILD(), FARAPISTUB_VERSION);
_alert("Please update loader and gnssfw firmwares!!\n");
# ifdef CONFIG_CXD56_FARAPI_VERSION_FAILED_PANIC
[incubator-nuttx] 04/22: Fix Error: chip/gd32f4xx_spi.c:924:20: error: unused function 'spi_putreg16' [-Werror,-Wunused-function]
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit ad35572751c217786e97ade33dec897a54890f08
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Oct 26 10:22:37 2022 +0800
Fix Error: chip/gd32f4xx_spi.c:924:20: error: unused function 'spi_putreg16' [-Werror,-Wunused-function]
static inline void spi_putreg16(struct gd32_spidev_s *priv,
^
Error: chip/gd32f4xx_spi.c:945:23: error: unused function 'spi_getreg8' [-Werror,-Wunused-function]
static inline uint8_t spi_getreg8(struct gd32_spidev_s *priv,
^
Error: chip/gd32f4xx_spi.c:967:20: error: unused function 'spi_putreg8' [-Werror,-Wunused-function]
static inline void spi_putreg8(struct gd32_spidev_s *priv,
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/gd32f4/gd32f4xx_spi.c | 71 --------------------------------------
1 file changed, 71 deletions(-)
diff --git a/arch/arm/src/gd32f4/gd32f4xx_spi.c b/arch/arm/src/gd32f4/gd32f4xx_spi.c
index 13ee2ac536..fee72e36bc 100644
--- a/arch/arm/src/gd32f4/gd32f4xx_spi.c
+++ b/arch/arm/src/gd32f4/gd32f4xx_spi.c
@@ -193,12 +193,6 @@ static inline void spi_putreg(struct gd32_spidev_s *priv,
uint8_t offset, uint32_t value);
static inline uint16_t spi_getreg16(struct gd32_spidev_s *priv,
uint8_t offset);
-static inline void spi_putreg16(struct gd32_spidev_s *priv,
- uint8_t offset, uint16_t value);
-static inline uint8_t spi_getreg8(struct gd32_spidev_s *priv,
- uint8_t offset);
-static inline void spi_putreg8(struct gd32_spidev_s *priv,
- uint8_t offset, uint8_t value);
static inline uint16_t spi_readword(struct gd32_spidev_s *priv);
static inline void spi_writeword(struct gd32_spidev_s *priv,
@@ -905,71 +899,6 @@ static inline uint16_t spi_getreg16(struct gd32_spidev_s *priv,
return getreg16(priv->spibase + offset);
}
-/****************************************************************************
- * Name: spi_putreg16
- *
- * Description:
- * Write a 16-bit value to the SPI register at offset
- *
- * Input Parameters:
- * priv - private SPI device structure
- * offset - offset to the register of interest
- * value - the 16-bit value to be written
- *
- * Returned Value:
- * Nothing
- *
- ****************************************************************************/
-
-static inline void spi_putreg16(struct gd32_spidev_s *priv,
- uint8_t offset, uint16_t value)
-{
- putreg16(value, priv->spibase + offset);
-}
-
-/****************************************************************************
- * Name: spi_getreg8
- *
- * Description:
- * Get the 8 bit contents of the SPI register at offset
- *
- * Input Parameters:
- * priv - private SPI device structure
- * offset - offset to the register of interest
- *
- * Returned Value:
- * The contents of the 8-bit register
- *
- ****************************************************************************/
-
-static inline uint8_t spi_getreg8(struct gd32_spidev_s *priv,
- uint8_t offset)
-{
- return getreg8(priv->spibase + offset);
-}
-
-/****************************************************************************
- * Name: spi_putreg8
- *
- * Description:
- * Write a 8-bit value to the SPI register at offset
- *
- * Input Parameters:
- * priv - private SPI device structure
- * offset - offset to the register of interest
- * value - the 8-bit value to be written
- *
- * Returned Value:
- * Nothing
- *
- ****************************************************************************/
-
-static inline void spi_putreg8(struct gd32_spidev_s *priv,
- uint8_t offset, uint8_t value)
-{
- putreg8(value, priv->spibase + offset);
-}
-
/****************************************************************************
* Name: spi_modifyreg
*
[incubator-nuttx] 08/22: Fix board/cxd56_sdcard.c:128:11: error: logical not is only applied to the left hand side of this comparison [-Werror,-Wlogical-not-parentheses]
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit d8babf8dfd20a0fc1c6d9f1f783a8e10d268c8c7
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Oct 26 11:05:01 2022 +0800
Fix board/cxd56_sdcard.c:128:11: error: logical not is only applied to the left hand side of this comparison [-Werror,-Wlogical-not-parentheses]
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
boards/arm/cxd56xx/spresense/src/cxd56_sdcard.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_sdcard.c b/boards/arm/cxd56xx/spresense/src/cxd56_sdcard.c
index 42a63bbd4e..3701fb8a1d 100644
--- a/boards/arm/cxd56xx/spresense/src/cxd56_sdcard.c
+++ b/boards/arm/cxd56xx/spresense/src/cxd56_sdcard.c
@@ -125,7 +125,7 @@ static void board_sdcard_enable(void *arg)
/* If not initialize SD slot */
- if (!nx_stat("/dev/mmcsd0", &stat_sdio, 1) == 0)
+ if (nx_stat("/dev/mmcsd0", &stat_sdio, 1) != 0)
{
/* Now bind the SDHC interface to the MMC/SD driver */
[incubator-nuttx] 17/22: Fix video/video.c:1458:52: error: implicit conversion from enumeration type 'enum v4l2_buf_type' to different enumeration type 'imgsensor_stream_type_t' (aka 'enum imgsensor_stream_type_e') [-Werror,-Wenum-conversion]
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 09da04d7d219dbe3590e6fa0652e9c11e644e5db
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Oct 29 18:56:48 2022 +0800
Fix video/video.c:1458:52: error: implicit conversion from enumeration type 'enum v4l2_buf_type' to different enumeration type 'imgsensor_stream_type_t' (aka 'enum imgsensor_stream_type_e') [-Werror,-Wenum-conversion]
ret = g_video_sensor_ops->validate_frame_setting(type, nr_fmt, sf, &si);
~~~~~~~~~~~~~~~~~~ ^~~~
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
drivers/video/video.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/video/video.c b/drivers/video/video.c
index 120e260d94..ce8463ece2 100644
--- a/drivers/video/video.c
+++ b/drivers/video/video.c
@@ -1455,7 +1455,8 @@ static int validate_frame_setting(enum v4l2_buf_type type,
convert_to_imgsensorfmt(&vfmt[VIDEO_FMT_SUB], &sf[IMGSENSOR_FMT_SUB]);
convert_to_imgsensorinterval(interval, &si);
- ret = g_video_sensor_ops->validate_frame_setting(type, nr_fmt, sf, &si);
+ ret = g_video_sensor_ops->validate_frame_setting(
+ type == V4L2_BUF_TYPE_STILL_CAPTURE, nr_fmt, sf, &si);
if (ret != OK)
{
return ret;
[incubator-nuttx] 06/22: Fix error: variable 'lfbclk' is used uninitialized whenever switch case is taken [-Werror,-Wsometimes-uninitialized]
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit c701d1c6ecf1c6182a37f253db0290c11e29a19e
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Oct 26 10:53:04 2022 +0800
Fix error: variable 'lfbclk' is used uninitialized whenever switch case is taken [-Werror,-Wsometimes-uninitialized]
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/efm32/efm32_clockconfig.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/src/efm32/efm32_clockconfig.c b/arch/arm/src/efm32/efm32_clockconfig.c
index bd38e5c23e..91c006ec08 100644
--- a/arch/arm/src/efm32/efm32_clockconfig.c
+++ b/arch/arm/src/efm32/efm32_clockconfig.c
@@ -746,6 +746,7 @@ static inline uint32_t efm32_lfbclk_config(uint32_t lfbclksel, bool ulfrco,
case CMU_LFCLKSEL_LFB_LFRCO:
{
efm32_enable_lfrco();
+ lfbclk = 0;
}
break;
[incubator-nuttx] 18/22: Fix chip/stm32_sdio.c:749:24: error: unused function 'stm32_getpwrctrl' [-Werror,-Wunused-function]
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 5d7f1d5020f535d1ca9123bff5ddae925ca35c53
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Oct 30 00:59:19 2022 +0800
Fix chip/stm32_sdio.c:749:24: error: unused function 'stm32_getpwrctrl' [-Werror,-Wunused-function]
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/stm32/stm32_sdio.c | 22 ----------------------
arch/arm/src/stm32f7/stm32_sdmmc.c | 23 -----------------------
arch/arm/src/stm32h7/stm32_sdmmc.c | 23 -----------------------
arch/arm/src/stm32l4/stm32l4_sdmmc.c | 23 -----------------------
4 files changed, 91 deletions(-)
diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c
index 02b2ea724d..4c0460bc37 100644
--- a/arch/arm/src/stm32/stm32_sdio.c
+++ b/arch/arm/src/stm32/stm32_sdio.c
@@ -387,7 +387,6 @@ static void stm32_configwaitints(struct stm32_dev_s *priv, uint32_t waitmask,
sdio_eventset_t waitevents, sdio_eventset_t wkupevents);
static void stm32_configxfrints(struct stm32_dev_s *priv, uint32_t xfrmask);
static void stm32_setpwrctrl(uint32_t pwrctrl);
-static inline uint32_t stm32_getpwrctrl(void);
/* DMA Helpers **************************************************************/
@@ -730,27 +729,6 @@ static void stm32_setpwrctrl(uint32_t pwrctrl)
putreg32(regval, STM32_SDIO_POWER);
}
-/****************************************************************************
- * Name: stm32_getpwrctrl
- *
- * Description:
- * Return the current value of the the PWRCTRL field of the SDIO POWER
- * register. This function can be used to see if the SDIO is powered ON
- * or OFF
- *
- * Input Parameters:
- * None
- *
- * Returned Value:
- * The current value of the the PWRCTRL field of the SDIO POWER register.
- *
- ****************************************************************************/
-
-static inline uint32_t stm32_getpwrctrl(void)
-{
- return getreg32(STM32_SDIO_POWER) & SDIO_POWER_PWRCTRL_MASK;
-}
-
/****************************************************************************
* Name: stm32_sampleinit
*
diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.c b/arch/arm/src/stm32f7/stm32_sdmmc.c
index 47594dfd1c..77b8aad1d3 100644
--- a/arch/arm/src/stm32f7/stm32_sdmmc.c
+++ b/arch/arm/src/stm32f7/stm32_sdmmc.c
@@ -468,7 +468,6 @@ static void stm32_configwaitints(struct stm32_dev_s *priv, uint32_t waitmask,
sdio_eventset_t waitevents, sdio_eventset_t wkupevents);
static void stm32_configxfrints(struct stm32_dev_s *priv, uint32_t xfrmask);
static void stm32_setpwrctrl(struct stm32_dev_s *priv, uint32_t pwrctrl);
-static inline uint32_t stm32_getpwrctrl(struct stm32_dev_s *priv);
/* DMA Helpers **************************************************************/
@@ -943,28 +942,6 @@ static void stm32_setpwrctrl(struct stm32_dev_s *priv, uint32_t pwrctrl)
sdmmc_putreg32(priv, regval, STM32_SDMMC_POWER_OFFSET);
}
-/****************************************************************************
- * Name: stm32_getpwrctrl
- *
- * Description:
- * Return the current value of the the PWRCTRL field of the SDIO POWER
- * register. This function can be used to see if the SDIO is powered ON
- * or OFF
- *
- * Input Parameters:
- * priv - Instance of the SDMMC private state structure.
- *
- * Returned Value:
- * The current value of the the PWRCTRL field of the SDIO POWER register.
- *
- ****************************************************************************/
-
-static inline uint32_t stm32_getpwrctrl(struct stm32_dev_s *priv)
-{
- return sdmmc_getreg32(priv, STM32_SDMMC_POWER_OFFSET) &
- STM32_SDMMC_POWER_PWRCTRL_MASK;
-}
-
/****************************************************************************
* Name: stm32_sampleinit
*
diff --git a/arch/arm/src/stm32h7/stm32_sdmmc.c b/arch/arm/src/stm32h7/stm32_sdmmc.c
index c2a03e3fad..92038d2ea3 100644
--- a/arch/arm/src/stm32h7/stm32_sdmmc.c
+++ b/arch/arm/src/stm32h7/stm32_sdmmc.c
@@ -429,7 +429,6 @@ static void stm32_configwaitints(struct stm32_dev_s *priv, uint32_t waitmask,
sdio_eventset_t wkupevents);
static void stm32_configxfrints(struct stm32_dev_s *priv, uint32_t xfrmask);
static void stm32_setpwrctrl(struct stm32_dev_s *priv, uint32_t pwrctrl);
-static inline uint32_t stm32_getpwrctrl(struct stm32_dev_s *priv);
/* Debug Helpers ************************************************************/
@@ -888,28 +887,6 @@ static void stm32_setpwrctrl(struct stm32_dev_s *priv, uint32_t pwrctrl)
sdmmc_putreg32(priv, regval, STM32_SDMMC_POWER_OFFSET);
}
-/****************************************************************************
- * Name: stm32_getpwrctrl
- *
- * Description:
- * Return the current value of the the PWRCTRL field of the SDIO POWER
- * register. This function can be used to see if the SDIO is powered ON
- * or OFF
- *
- * Input Parameters:
- * priv - Instance of the SDMMC private state structure.
- *
- * Returned Value:
- * The current value of the the PWRCTRL field of the SDIO POWER register.
- *
- ****************************************************************************/
-
-static inline uint32_t stm32_getpwrctrl(struct stm32_dev_s *priv)
-{
- return sdmmc_getreg32(priv, STM32_SDMMC_POWER_OFFSET) &
- STM32_SDMMC_POWER_PWRCTRL_MASK;
-}
-
/****************************************************************************
* Name: stm32_sampleinit
*
diff --git a/arch/arm/src/stm32l4/stm32l4_sdmmc.c b/arch/arm/src/stm32l4/stm32l4_sdmmc.c
index 139ab2c7db..176c5ea606 100644
--- a/arch/arm/src/stm32l4/stm32l4_sdmmc.c
+++ b/arch/arm/src/stm32l4/stm32l4_sdmmc.c
@@ -395,7 +395,6 @@ static void stm32_configwaitints(struct stm32_dev_s *priv, uint32_t waitmask,
sdio_eventset_t waitevents, sdio_eventset_t wkupevents);
static void stm32_configxfrints(struct stm32_dev_s *priv, uint32_t xfrmask);
static void stm32_setpwrctrl(struct stm32_dev_s *priv, uint32_t pwrctrl);
-static inline uint32_t stm32_getpwrctrl(struct stm32_dev_s *priv);
/* DMA Helpers **************************************************************/
@@ -836,28 +835,6 @@ static void stm32_setpwrctrl(struct stm32_dev_s *priv, uint32_t pwrctrl)
sdmmc_putreg32(priv, regval, STM32_SDMMC_POWER_OFFSET);
}
-/****************************************************************************
- * Name: stm32_getpwrctrl
- *
- * Description:
- * Return the current value of the the PWRCTRL field of the SDIO POWER
- * register. This function can be used to see if the SDIO is powered ON
- * or OFF
- *
- * Input Parameters:
- * priv - Instance of the SDMMC private state structure.
- *
- * Returned Value:
- * The current value of the the PWRCTRL field of the SDIO POWER register.
- *
- ****************************************************************************/
-
-static inline uint32_t stm32_getpwrctrl(struct stm32_dev_s *priv)
-{
- return sdmmc_getreg32(priv, STM32_SDMMC_POWER_OFFSET) &
- STM32_SDMMC_POWER_PWRCTRL_MASK;
-}
-
/****************************************************************************
* Name: stm32_sampleinit
*
[incubator-nuttx] 09/22: Fix usbdev/usbmsc_desc.c:316:7: error: variable 'length' set but not used [-Werror,-Wunused-but-set-variable]
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 929882862b6682862b6eea3990c71aba2151faeb
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Oct 26 11:08:43 2022 +0800
Fix usbdev/usbmsc_desc.c:316:7: error: variable 'length' set but not used [-Werror,-Wunused-but-set-variable]
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
drivers/usbdev/usbmsc_desc.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/usbdev/usbmsc_desc.c b/drivers/usbdev/usbmsc_desc.c
index 320b5d9df0..fe435c6f47 100644
--- a/drivers/usbdev/usbmsc_desc.c
+++ b/drivers/usbdev/usbmsc_desc.c
@@ -313,7 +313,6 @@ int16_t usbmsc_mkcfgdesc(uint8_t *buf,
FAR struct usbdev_devinfo_s *devinfo)
#endif
{
- int length = 0;
bool hispeed = false;
#ifdef CONFIG_USBDEV_DUALSPEED
@@ -359,8 +358,7 @@ int16_t usbmsc_mkcfgdesc(uint8_t *buf,
USBMSC_REMOTEWAKEUP;
dest->mxpower = (CONFIG_USBDEV_MAXPOWER + 1) / 2; /* Max power (mA/2) */
- buf += sizeof(struct usb_cfgdesc_s);
- length += sizeof(struct usb_cfgdesc_s);
+ buf += sizeof(struct usb_cfgdesc_s);
}
#endif
@@ -381,8 +379,7 @@ int16_t usbmsc_mkcfgdesc(uint8_t *buf,
dest->protocol = USBMSC_PROTO_BULKONLY; /* Interface protocol */
dest->iif = devinfo->strbase + USBMSC_INTERFACESTRID; /* iInterface */
- buf += sizeof(struct usb_ifdesc_s);
- length += sizeof(struct usb_ifdesc_s);
+ buf += sizeof(struct usb_ifdesc_s);
}
/* Make the two endpoint configurations */
@@ -395,7 +392,6 @@ int16_t usbmsc_mkcfgdesc(uint8_t *buf,
devinfo, hispeed);
buf += len;
- length += len;
}
/* Bulk OUT endpoint descriptor */
@@ -406,7 +402,6 @@ int16_t usbmsc_mkcfgdesc(uint8_t *buf,
hispeed);
buf += len;
- length += len;
}
return SIZEOF_USBMSC_CFGDESC;
[incubator-nuttx] 19/22: Fix Error: audio/cs43l22.c:356:24: error: unused function 'cs43l22_scalevolume' [-Werror,-Wunused-function]
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 04863785f13ba9cd98dfc3a2655862ab53749acf
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Oct 30 01:13:28 2022 +0800
Fix Error: audio/cs43l22.c:356:24: error: unused function 'cs43l22_scalevolume' [-Werror,-Wunused-function]
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
drivers/audio/cs43l22.c | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/drivers/audio/cs43l22.c b/drivers/audio/cs43l22.c
index ec763e3f31..299518f028 100644
--- a/drivers/audio/cs43l22.c
+++ b/drivers/audio/cs43l22.c
@@ -63,7 +63,6 @@ static void cs43l22_writereg(FAR struct cs43l22_dev_s *priv, uint8_t regaddr,
uint8_t regval);
#ifndef CONFIG_AUDIO_EXCLUDE_VOLUME
-static inline uint16_t cs43l22_scalevolume(uint16_t volume, b16_t scale);
static void cs43l22_setvolume(FAR struct cs43l22_dev_s *priv,
uint16_t volume, bool mute);
#endif
@@ -343,22 +342,6 @@ cs43l22_writereg(FAR struct cs43l22_dev_s *priv, uint8_t regaddr,
}
}
-/****************************************************************************
- * Name: cs43l22_scalevolume
- *
- * Description:
- * Set the right and left volume values in the CS43L22 device based on the
- * current volume and balance settings.
- *
- ****************************************************************************/
-
-#ifndef CONFIG_AUDIO_EXCLUDE_VOLUME
-static inline uint16_t cs43l22_scalevolume(uint16_t volume, b16_t scale)
-{
- return b16toi((b16_t) volume * scale);
-}
-#endif
-
/****************************************************************************
* Name: cs43l22_setvolume
*
[incubator-nuttx] 03/22: Fix gd32f4xx_syscfg.c:137:5: error: variable 'regaddr' is used uninitialized whenever switch default is taken [-Werror,-Wsometimes-uninitialized]
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 202408c6e7ea6a8eccc88c9e015a5ddfc77b18d0
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Oct 26 04:16:59 2022 +0800
Fix gd32f4xx_syscfg.c:137:5: error: variable 'regaddr' is used uninitialized whenever switch default is taken [-Werror,-Wsometimes-uninitialized]
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/gd32f4/gd32f4xx_syscfg.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/src/gd32f4/gd32f4xx_syscfg.c b/arch/arm/src/gd32f4/gd32f4xx_syscfg.c
index 84f32ddf2f..145a4ff1ad 100644
--- a/arch/arm/src/gd32f4/gd32f4xx_syscfg.c
+++ b/arch/arm/src/gd32f4/gd32f4xx_syscfg.c
@@ -107,7 +107,7 @@ void gd32_syscfg_exmc_swap_config(uint32_t syscfg_exmc_swap)
void gd32_syscfg_exti_line_config(uint8_t exti_port, uint8_t exti_pin)
{
uint32_t regval;
- uint32_t regaddr;
+ uint32_t regaddr = 0;
switch (exti_pin / SYSCFG_EXTI_SS_JSTEP)
{
@@ -135,6 +135,7 @@ void gd32_syscfg_exti_line_config(uint8_t exti_port, uint8_t exti_pin)
regaddr = GD32_SYSCFG_EXTISS3;
break;
default:
+ DEBUGASSERT(false);
break;
}