From 2aa85fd17e5791ad5cffca00ec365bef9786da10 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 1 May 2020 08:50:23 -0600 Subject: [PATCH] arch/arm, board/arm: Rename all up_* functions to arm_* Summary The naming standard at https://cwiki.apache.org/confluence/display/NUTTX/Naming+FAQ requires that all MCU-private functions begin with the name of the architecture, not up_. This PR addresses only these name changes for the ARM-private functions prototyped in arm_internal.h This change to the files only modifies the name of called functions. nxstyle fixes were made for all core architecture files. However, there are well over 5000 additional complaints from MCU drivers and board logic that are unrelated to to this change but were affected by the name change. It is not humanly possible to fix all of these. I ask that this change be treated like other cosmetic changes that we have done which do not require full nxstyle compliance. Impact There should be not impact of this change (other that one step toward more consistent naming). Testing stm32f4discovery:netnsh --- arch/arm/src/a1x/a1x_boot.c | 2 +- arch/arm/src/a1x/a1x_lowputc.c | 4 +- arch/arm/src/a1x/a1x_serial.c | 20 ++-- arch/arm/src/am335x/am335x_boot.c | 4 +- arch/arm/src/am335x/am335x_lowputc.c | 4 +- arch/arm/src/am335x/am335x_serial.c | 20 ++-- arch/arm/src/arm/arm_allocpage.c | 4 +- arch/arm/src/arm/arm_checkmapping.c | 2 +- arch/arm/src/arm/arm_dataabort.c | 6 +- arch/arm/src/arm/arm_doirq.c | 6 +- arch/arm/src/arm/arm_head.S | 2 +- arch/arm/src/arm/arm_nommuhead.S | 4 +- arch/arm/src/arm/arm_pginitialize.c | 6 +- arch/arm/src/arm/arm_prefetchabort.c | 4 +- arch/arm/src/arm/arm_schedulesigaction.c | 4 +- arch/arm/src/arm/arm_sigdeliver.c | 4 +- arch/arm/src/arm/arm_syscall.c | 4 +- arch/arm/src/arm/arm_undefinedinsn.c | 4 +- arch/arm/src/arm/arm_va2pte.c | 4 +- arch/arm/src/arm/arm_vectoraddrexcptn.S | 10 +- arch/arm/src/arm/arm_vectors.S | 80 +++++++-------- arch/arm/src/arm/arm_vectortab.S | 28 +++--- arch/arm/src/armv6-m/arm_doirq.c | 4 +- arch/arm/src/armv6-m/arm_exception.S | 8 +- arch/arm/src/armv6-m/arm_hardfault.c | 6 +- arch/arm/src/armv6-m/arm_schedulesigaction.c | 4 +- arch/arm/src/armv6-m/arm_sigdeliver.c | 4 +- arch/arm/src/armv6-m/arm_svcall.c | 6 +- arch/arm/src/armv6-m/svcall.h | 2 +- arch/arm/src/armv7-a/arm_copyarmstate.c | 2 +- arch/arm/src/armv7-a/arm_doirq.c | 2 +- arch/arm/src/armv7-a/arm_head.S | 2 +- arch/arm/src/armv7-a/arm_l2cc_pl310.c | 4 +- arch/arm/src/armv7-a/arm_pghead.S | 2 +- arch/arm/src/armv7-a/arm_pginitialize.c | 6 +- arch/arm/src/armv7-a/arm_restorefpu.S | 14 +-- arch/arm/src/armv7-a/arm_savefpu.S | 14 +-- arch/arm/src/armv7-a/arm_schedulesigaction.c | 12 +-- arch/arm/src/armv7-a/arm_sigdeliver.c | 4 +- arch/arm/src/armv7-a/arm_syscall.c | 2 +- arch/arm/src/armv7-a/l2cc.h | 4 +- arch/arm/src/armv7-a/svcall.h | 2 +- arch/arm/src/armv7-m/arm_copyarmstate.c | 2 +- arch/arm/src/armv7-m/arm_doirq.c | 4 +- arch/arm/src/armv7-m/arm_hardfault.c | 6 +- arch/arm/src/armv7-m/arm_memfault.c | 4 +- arch/arm/src/armv7-m/arm_schedulesigaction.c | 12 +-- arch/arm/src/armv7-m/arm_sigdeliver.c | 4 +- arch/arm/src/armv7-m/arm_svcall.c | 10 +- arch/arm/src/armv7-m/gnu/arm_exception.S | 8 +- arch/arm/src/armv7-m/gnu/arm_fpu.S | 24 ++--- arch/arm/src/armv7-m/gnu/arm_lazyexception.S | 10 +- arch/arm/src/armv7-m/svcall.h | 2 +- arch/arm/src/armv7-r/arm_copyarmstate.c | 2 +- arch/arm/src/armv7-r/arm_doirq.c | 2 +- arch/arm/src/armv7-r/arm_l2cc_pl310.c | 4 +- arch/arm/src/armv7-r/arm_restorefpu.S | 14 +-- arch/arm/src/armv7-r/arm_savefpu.S | 14 +-- arch/arm/src/armv7-r/arm_schedulesigaction.c | 4 +- arch/arm/src/armv7-r/arm_sigdeliver.c | 4 +- arch/arm/src/armv7-r/arm_syscall.c | 2 +- arch/arm/src/armv7-r/l2cc.h | 4 +- arch/arm/src/armv7-r/svcall.h | 2 +- arch/arm/src/armv8-m/arm_copyarmstate.c | 2 +- arch/arm/src/armv8-m/arm_doirq.c | 4 +- arch/arm/src/armv8-m/arm_exception.S | 8 +- arch/arm/src/armv8-m/arm_fpu.S | 24 ++--- arch/arm/src/armv8-m/arm_hardfault.c | 6 +- arch/arm/src/armv8-m/arm_lazyexception.S | 10 +- arch/arm/src/armv8-m/arm_memfault.c | 4 +- arch/arm/src/armv8-m/arm_schedulesigaction.c | 12 +-- arch/arm/src/armv8-m/arm_sigdeliver.c | 4 +- arch/arm/src/armv8-m/arm_svcall.c | 8 +- arch/arm/src/c5471/c5471_ethernet.c | 2 +- arch/arm/src/c5471/c5471_irq.c | 18 ++-- arch/arm/src/c5471/c5471_lowputc.S | 8 +- arch/arm/src/c5471/c5471_serial.c | 12 +-- arch/arm/src/c5471/c5471_vectors.S | 76 +++++++------- arch/arm/src/c5471/c5471_watchdog.c | 4 +- arch/arm/src/common/arm_createstack.c | 8 +- arch/arm/src/common/arm_etherstub.c | 10 +- arch/arm/src/common/arm_initialize.c | 18 ++-- arch/arm/src/common/arm_internal.h | 98 +++++++++---------- arch/arm/src/common/arm_lowputs.c | 6 +- arch/arm/src/common/arm_usestack.c | 4 +- arch/arm/src/cxd56xx/cxd56_cpustart.c | 2 +- arch/arm/src/cxd56xx/cxd56_dmac.c | 2 +- arch/arm/src/cxd56xx/cxd56_irq.c | 12 +-- arch/arm/src/cxd56xx/cxd56_serial.c | 20 ++-- arch/arm/src/cxd56xx/cxd56_start.c | 4 +- arch/arm/src/cxd56xx/cxd56_uart.c | 4 +- arch/arm/src/cxd56xx/cxd56_usbdev.c | 10 +- arch/arm/src/dm320/dm320_boot.c | 2 +- arch/arm/src/dm320/dm320_decodeirq.c | 48 ++++----- arch/arm/src/dm320/dm320_irq.c | 4 +- arch/arm/src/dm320/dm320_lowputc.S | 8 +- arch/arm/src/dm320/dm320_serial.c | 12 +-- arch/arm/src/dm320/dm320_usbdev.c | 14 +-- arch/arm/src/efm32/efm32_dma.c | 4 +- arch/arm/src/efm32/efm32_irq.c | 12 +-- arch/arm/src/efm32/efm32_leserial.c | 12 +-- arch/arm/src/efm32/efm32_serial.c | 12 +-- arch/arm/src/efm32/efm32_start.c | 2 +- arch/arm/src/efm32/efm32_usbdev.c | 12 +-- arch/arm/src/imx1/imx_allocateheap.c | 4 +- arch/arm/src/imx1/imx_boot.c | 2 +- arch/arm/src/imx1/imx_decodeirq.c | 45 +++------ arch/arm/src/imx1/imx_lowputc.S | 8 +- arch/arm/src/imx1/imx_serial.c | 12 +-- arch/arm/src/imx6/imx_serial.c | 6 +- arch/arm/src/imx6/imx_serial.h | 4 +- arch/arm/src/imxrt/imxrt_allocateheap.c | 4 +- arch/arm/src/imxrt/imxrt_edma.c | 4 +- arch/arm/src/imxrt/imxrt_enet.c | 4 +- arch/arm/src/imxrt/imxrt_enet.h | 4 +- arch/arm/src/imxrt/imxrt_irq.c | 12 +-- arch/arm/src/imxrt/imxrt_serial.c | 10 +- arch/arm/src/imxrt/imxrt_serial.h | 2 +- arch/arm/src/imxrt/imxrt_usbdev.c | 8 +- arch/arm/src/kinetis/Make.defs | 2 +- arch/arm/src/kinetis/kinetis.h | 6 +- arch/arm/src/kinetis/kinetis_dma.c | 2 +- arch/arm/src/kinetis/kinetis_enet.c | 4 +- arch/arm/src/kinetis/kinetis_irq.c | 12 +-- arch/arm/src/kinetis/kinetis_lowputc.c | 4 +- arch/arm/src/kinetis/kinetis_lpserial.c | 12 +-- arch/arm/src/kinetis/kinetis_serial.c | 12 +-- arch/arm/src/kinetis/kinetis_serialinit.c | 6 +- arch/arm/src/kinetis/kinetis_usbdev.c | 10 +- arch/arm/src/kl/kl_irq.c | 8 +- arch/arm/src/kl/kl_lowputc.c | 2 +- arch/arm/src/kl/kl_serial.c | 12 +-- arch/arm/src/kl/kl_start.c | 2 +- .../arm/src/lc823450/lc823450_allocateheap2.c | 4 +- arch/arm/src/lc823450/lc823450_cpustart.c | 2 +- arch/arm/src/lc823450/lc823450_dma.c | 4 +- arch/arm/src/lc823450/lc823450_dvfs2.c | 2 +- arch/arm/src/lc823450/lc823450_irq.c | 12 +-- arch/arm/src/lc823450/lc823450_lowputc.c | 4 +- arch/arm/src/lc823450/lc823450_serial.c | 16 +-- arch/arm/src/lc823450/lc823450_start.c | 4 +- arch/arm/src/lc823450/lc823450_usbdev.c | 4 +- arch/arm/src/lpc17xx_40xx/Make.defs | 2 +- .../src/lpc17xx_40xx/lpc17_40_allocateheap.c | 4 +- arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c | 4 +- arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c | 4 +- arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c | 12 +-- arch/arm/src/lpc17xx_40xx/lpc17_40_lowputc.c | 4 +- arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c | 20 ++-- arch/arm/src/lpc17xx_40xx/lpc17_40_start.c | 4 +- arch/arm/src/lpc17xx_40xx/lpc17_40_usbdev.c | 10 +- arch/arm/src/lpc214x/lpc214x_decodeirq.c | 76 +++++--------- arch/arm/src/lpc214x/lpc214x_head.S | 28 +++--- arch/arm/src/lpc214x/lpc214x_irq.c | 2 +- arch/arm/src/lpc214x/lpc214x_lowputc.S | 10 +- arch/arm/src/lpc214x/lpc214x_serial.c | 16 +-- arch/arm/src/lpc214x/lpc214x_usbdev.c | 10 +- arch/arm/src/lpc2378/lpc23xx_decodeirq.c | 44 +++------ arch/arm/src/lpc2378/lpc23xx_head.S | 28 +++--- arch/arm/src/lpc2378/lpc23xx_irq.c | 4 +- arch/arm/src/lpc2378/lpc23xx_lowputc.S | 10 +- arch/arm/src/lpc2378/lpc23xx_serial.c | 16 +-- arch/arm/src/lpc31xx/lpc31_allocateheap.c | 4 +- arch/arm/src/lpc31xx/lpc31_boot.c | 2 +- arch/arm/src/lpc31xx/lpc31_decodeirq.c | 48 ++++----- arch/arm/src/lpc31xx/lpc31_irq.c | 4 +- arch/arm/src/lpc31xx/lpc31_lowputc.c | 6 +- arch/arm/src/lpc31xx/lpc31_serial.c | 20 ++-- arch/arm/src/lpc31xx/lpc31_usbdev.c | 10 +- arch/arm/src/lpc43xx/lpc43_allocateheap.c | 4 +- arch/arm/src/lpc43xx/lpc43_ethernet.c | 4 +- arch/arm/src/lpc43xx/lpc43_gpdma.c | 4 +- arch/arm/src/lpc43xx/lpc43_irq.c | 12 +-- arch/arm/src/lpc43xx/lpc43_serial.c | 20 ++-- arch/arm/src/lpc43xx/lpc43_start.c | 4 +- arch/arm/src/lpc43xx/lpc43_uart.c | 4 +- arch/arm/src/lpc43xx/lpc43_usb0dev.c | 8 +- arch/arm/src/lpc54xx/lpc54_allocateheap.c | 4 +- arch/arm/src/lpc54xx/lpc54_dma.c | 4 +- arch/arm/src/lpc54xx/lpc54_ethernet.c | 4 +- arch/arm/src/lpc54xx/lpc54_irq.c | 12 +-- arch/arm/src/lpc54xx/lpc54_lowputc.c | 4 +- arch/arm/src/lpc54xx/lpc54_serial.c | 12 +-- arch/arm/src/lpc54xx/lpc54_start.c | 2 +- arch/arm/src/max326xx/common/max326_irq.c | 12 +-- arch/arm/src/max326xx/common/max326_start.c | 2 +- arch/arm/src/max326xx/max32660/max32660_dma.c | 4 +- .../src/max326xx/max32660/max32660_lowputc.c | 4 +- .../src/max326xx/max32660/max32660_serial.c | 12 +-- arch/arm/src/moxart/moxart_head.S | 12 +-- arch/arm/src/moxart/moxart_irq.c | 12 ++- arch/arm/src/moxart/moxart_lowputc.S | 8 +- arch/arm/src/nrf52/nrf52_allocateheap.c | 4 +- arch/arm/src/nrf52/nrf52_irq.c | 12 +-- arch/arm/src/nrf52/nrf52_lowputc.c | 4 +- arch/arm/src/nrf52/nrf52_serial.c | 12 +-- arch/arm/src/nrf52/nrf52_start.c | 2 +- arch/arm/src/nuc1xx/nuc_irq.c | 8 +- arch/arm/src/nuc1xx/nuc_serial.c | 12 +-- arch/arm/src/nuc1xx/nuc_start.c | 2 +- arch/arm/src/s32k1xx/s32k11x/s32k11x_irq.c | 8 +- arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c | 12 +-- arch/arm/src/s32k1xx/s32k1xx_edma.c | 4 +- arch/arm/src/s32k1xx/s32k1xx_enet.c | 4 +- arch/arm/src/s32k1xx/s32k1xx_enet.h | 4 +- arch/arm/src/s32k1xx/s32k1xx_serial.c | 10 +- arch/arm/src/s32k1xx/s32k1xx_serial.h | 2 +- arch/arm/src/s32k1xx/s32k1xx_wdog.h | 2 +- arch/arm/src/sam34/sam_allocateheap.c | 4 +- arch/arm/src/sam34/sam_dmac.c | 4 +- arch/arm/src/sam34/sam_emac.c | 4 +- arch/arm/src/sam34/sam_emac.h | 4 +- arch/arm/src/sam34/sam_irq.c | 12 +-- arch/arm/src/sam34/sam_lowputc.c | 8 +- arch/arm/src/sam34/sam_serial.c | 12 +-- arch/arm/src/sam34/sam_start.c | 4 +- arch/arm/src/sam34/sam_udp.c | 12 +-- arch/arm/src/sama5/sam_allocateheap.c | 4 +- arch/arm/src/sama5/sam_dmac.c | 4 +- arch/arm/src/sama5/sam_ethernet.c | 4 +- arch/arm/src/sama5/sam_lowputc.c | 8 +- arch/arm/src/sama5/sam_serial.c | 2 +- arch/arm/src/sama5/sam_serial.h | 4 +- arch/arm/src/sama5/sam_serialinit.c | 8 +- arch/arm/src/sama5/sam_udphs.c | 12 +-- arch/arm/src/sama5/sam_xdmac.c | 4 +- arch/arm/src/samd2l2/sam_dmac.c | 4 +- arch/arm/src/samd2l2/sam_irq.c | 8 +- arch/arm/src/samd2l2/sam_serial.c | 10 +- arch/arm/src/samd2l2/sam_start.c | 2 +- arch/arm/src/samd2l2/sam_usb.c | 10 +- arch/arm/src/samd5e5/sam_dmac.c | 4 +- arch/arm/src/samd5e5/sam_ethernet.c | 4 +- arch/arm/src/samd5e5/sam_irq.c | 12 +-- arch/arm/src/samd5e5/sam_serial.c | 10 +- arch/arm/src/samd5e5/sam_start.c | 2 +- arch/arm/src/samd5e5/sam_usb.c | 10 +- arch/arm/src/samv7/sam_allocateheap.c | 4 +- arch/arm/src/samv7/sam_ethernet.c | 4 +- arch/arm/src/samv7/sam_irq.c | 12 +-- arch/arm/src/samv7/sam_lowputc.c | 8 +- arch/arm/src/samv7/sam_serial.c | 12 +-- arch/arm/src/samv7/sam_start.c | 2 +- arch/arm/src/samv7/sam_usbdevhs.c | 12 +-- arch/arm/src/samv7/sam_xdmac.c | 4 +- arch/arm/src/stm32/stm32_allocateheap.c | 4 +- arch/arm/src/stm32/stm32_dma_v1.c | 2 +- arch/arm/src/stm32/stm32_dma_v2.c | 2 +- arch/arm/src/stm32/stm32_eth.c | 8 +- arch/arm/src/stm32/stm32_eth.h | 2 +- arch/arm/src/stm32/stm32_irq.c | 12 +-- arch/arm/src/stm32/stm32_lowputc.c | 4 +- arch/arm/src/stm32/stm32_otgfsdev.c | 12 +-- arch/arm/src/stm32/stm32_otghsdev.c | 10 +- arch/arm/src/stm32/stm32_pminitialize.c | 4 +- arch/arm/src/stm32/stm32_serial.c | 20 ++-- arch/arm/src/stm32/stm32_start.c | 4 +- arch/arm/src/stm32/stm32_usbdev.c | 10 +- arch/arm/src/stm32f0l0g0/stm32_dma_v1.c | 2 +- arch/arm/src/stm32f0l0g0/stm32_irq.c | 8 +- arch/arm/src/stm32f0l0g0/stm32_lowputc_v1.c | 4 +- arch/arm/src/stm32f0l0g0/stm32_lowputc_v2.c | 4 +- arch/arm/src/stm32f0l0g0/stm32_serial_v1.c | 16 +-- arch/arm/src/stm32f0l0g0/stm32_serial_v2.c | 20 ++-- arch/arm/src/stm32f0l0g0/stm32_start.c | 4 +- arch/arm/src/stm32f0l0g0/stm32_usbdev.c | 10 +- arch/arm/src/stm32f7/stm32_allocateheap.c | 4 +- arch/arm/src/stm32f7/stm32_dma.c | 2 +- arch/arm/src/stm32f7/stm32_ethernet.c | 8 +- arch/arm/src/stm32f7/stm32_ethernet.h | 2 +- arch/arm/src/stm32f7/stm32_irq.c | 12 +-- arch/arm/src/stm32f7/stm32_lowputc.c | 4 +- arch/arm/src/stm32f7/stm32_otgdev.c | 12 +-- arch/arm/src/stm32f7/stm32_pminitialize.c | 4 +- arch/arm/src/stm32f7/stm32_serial.c | 20 ++-- arch/arm/src/stm32f7/stm32_start.c | 2 +- arch/arm/src/stm32h7/stm32_allocateheap.c | 10 +- arch/arm/src/stm32h7/stm32_dma.c | 2 +- arch/arm/src/stm32h7/stm32_ethernet.c | 8 +- arch/arm/src/stm32h7/stm32_ethernet.h | 2 +- arch/arm/src/stm32h7/stm32_fmc.c | 2 +- arch/arm/src/stm32h7/stm32_fmc.h | 2 +- arch/arm/src/stm32h7/stm32_irq.c | 12 +-- arch/arm/src/stm32h7/stm32_lowputc.c | 4 +- arch/arm/src/stm32h7/stm32_otgdev.c | 12 +-- arch/arm/src/stm32h7/stm32_pminitialize.c | 4 +- arch/arm/src/stm32h7/stm32_serial.c | 20 ++-- arch/arm/src/stm32h7/stm32_start.c | 4 +- arch/arm/src/stm32l4/stm32l4_allocateheap.c | 4 +- arch/arm/src/stm32l4/stm32l4_irq.c | 12 +-- arch/arm/src/stm32l4/stm32l4_lowputc.c | 4 +- arch/arm/src/stm32l4/stm32l4_otgfsdev.c | 12 +-- arch/arm/src/stm32l4/stm32l4_pminitialize.c | 4 +- arch/arm/src/stm32l4/stm32l4_serial.c | 20 ++-- arch/arm/src/stm32l4/stm32l4_start.c | 4 +- arch/arm/src/stm32l4/stm32l4_usbdev.c | 10 +- arch/arm/src/stm32l4/stm32l4x6xx_dma.c | 2 +- arch/arm/src/stm32l4/stm32l4xrxx_dma.c | 4 +- arch/arm/src/str71x/str71x_decodeirq.c | 70 ++++--------- arch/arm/src/str71x/str71x_head.S | 32 +++--- arch/arm/src/str71x/str71x_irq.c | 4 +- arch/arm/src/str71x/str71x_lowputc.c | 4 +- arch/arm/src/str71x/str71x_serial.c | 16 +-- arch/arm/src/tiva/cc13xx/cc13xx_start.c | 4 +- arch/arm/src/tiva/common/lmxx_tm4c_start.c | 4 +- arch/arm/src/tiva/common/tiva_irq.c | 12 +-- arch/arm/src/tiva/common/tiva_lowputc.c | 4 +- arch/arm/src/tiva/common/tiva_serial.c | 16 +-- arch/arm/src/tiva/lm/lm3s_ethernet.c | 4 +- arch/arm/src/tiva/tiva_ethernet.h | 2 +- arch/arm/src/tiva/tm4c/tm4c_ethernet.c | 8 +- arch/arm/src/tms570/tms570_irq.c | 4 +- arch/arm/src/tms570/tms570_lowputc.c | 8 +- arch/arm/src/tms570/tms570_serial.c | 4 +- arch/arm/src/xmc4/Make.defs | 2 +- arch/arm/src/xmc4/xmc4_irq.c | 12 +-- arch/arm/src/xmc4/xmc4_lowputc.c | 4 +- arch/arm/src/xmc4/xmc4_serial.c | 12 +-- arch/arm/src/xmc4/xmc4_start.c | 2 +- .../configs/nsh/pcduino-140107.patch | 4 +- boards/arm/am335x/beaglebone-black/README.txt | 2 +- boards/arm/cxd56xx/common/src/cxd56_netinit.c | 4 +- .../arm/dm320/ntosd-dm320/src/dm320_network.c | 4 +- .../lc823450-xgevk/src/lc823450_netinit.c | 4 +- boards/arm/lpc31xx/ea3131/locked/mklocked.sh | 18 ++-- .../stm32/fire-stm32v2/src/stm32_enc28j60.c | 4 +- .../arm/stm32/mikroe-stm32f4/src/stm32_pm.c | 4 +- .../stm32/nucleo-f429zi/src/stm32_bbsram.c | 4 +- .../olimex-stm32-p107/src/stm32_encx24j600.c | 4 +- .../arm/stm32/omnibusf4/src/stm32_netinit.c | 4 +- boards/arm/stm32/omnibusf4/src/stm32_pm.c | 2 +- boards/arm/stm32/stm3210e-eval/src/stm32_pm.c | 4 +- .../stm32f4discovery/src/stm32_enc28j60.c | 4 +- .../stm32f4discovery/src/stm32_netinit.c | 4 +- .../arm/stm32/stm32f4discovery/src/stm32_pm.c | 2 +- .../arm/stm32f7/nucleo-144/src/stm32_bbsram.c | 4 +- .../stm32l4/nucleo-l432kc/src/stm32_appinit.c | 4 +- .../olimex-strp711/src/str71_enc28j60.c | 4 +- 338 files changed, 1401 insertions(+), 1506 deletions(-) diff --git a/arch/arm/src/a1x/a1x_boot.c b/arch/arm/src/a1x/a1x_boot.c index 98de4956175..162a4429c86 100644 --- a/arch/arm/src/a1x/a1x_boot.c +++ b/arch/arm/src/a1x/a1x_boot.c @@ -342,7 +342,7 @@ void arm_boot(void) * driver. */ - up_earlyserialinit(); + arm_earlyserialinit(); #endif /* Perform board-specific initialization, This must include: diff --git a/arch/arm/src/a1x/a1x_lowputc.c b/arch/arm/src/a1x/a1x_lowputc.c index c69318c4dc2..f0c461c2f1a 100644 --- a/arch/arm/src/a1x/a1x_lowputc.c +++ b/arch/arm/src/a1x/a1x_lowputc.c @@ -191,14 +191,14 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #if defined HAVE_UART_DEVICE && defined HAVE_SERIAL_CONSOLE /* Wait for the transmitter to be available */ diff --git a/arch/arm/src/a1x/a1x_serial.c b/arch/arm/src/a1x/a1x_serial.c index 18f6ddbffa2..3e6de03544c 100644 --- a/arch/arm/src/a1x/a1x_serial.c +++ b/arch/arm/src/a1x/a1x_serial.c @@ -1452,19 +1452,19 @@ static bool up_txempty(struct uart_dev_s *dev) #ifdef USE_EARLYSERIALINIT /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level UART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * * NOTE: Configuration of the CONSOLE UART was performed by up_lowsetup() * very early in the boot sequence. * ****************************************************************************/ -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { /* Configure all UARTs (except the CONSOLE UART) and disable interrupts */ @@ -1535,15 +1535,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes that - * up_earlyserialinit was called previously. + * arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #ifdef CONSOLE_DEV uart_register("/dev/console", &CONSOLE_DEV); @@ -1596,10 +1596,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #ifdef HAVE_SERIAL_CONSOLE up_restoreuartint(priv, ier); #endif @@ -1626,10 +1626,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; } diff --git a/arch/arm/src/am335x/am335x_boot.c b/arch/arm/src/am335x/am335x_boot.c index 0ee70d4381e..41027fc1bab 100644 --- a/arch/arm/src/am335x/am335x_boot.c +++ b/arch/arm/src/am335x/am335x_boot.c @@ -82,7 +82,7 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -# define showprogress(c) up_lowputc(c) +# define showprogress(c) arm_lowputc(c) #else # define showprogress(c) #endif @@ -464,7 +464,7 @@ void arm_boot(void) * driver. */ - up_earlyserialinit(); + arm_earlyserialinit(); #endif /* Perform board-specific initialization, This must include: diff --git a/arch/arm/src/am335x/am335x_lowputc.c b/arch/arm/src/am335x/am335x_lowputc.c index 056c8671040..d612476855f 100644 --- a/arch/arm/src/am335x/am335x_lowputc.c +++ b/arch/arm/src/am335x/am335x_lowputc.c @@ -161,14 +161,14 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #if defined(HAVE_UART_DEVICE) && defined(HAVE_SERIAL_CONSOLE) /* Wait for the transmitter to be available */ diff --git a/arch/arm/src/am335x/am335x_serial.c b/arch/arm/src/am335x/am335x_serial.c index bf353a568b0..708b3d91ba9 100644 --- a/arch/arm/src/am335x/am335x_serial.c +++ b/arch/arm/src/am335x/am335x_serial.c @@ -1269,19 +1269,19 @@ static bool up_txempty(struct uart_dev_s *dev) #ifdef USE_EARLYSERIALINIT /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level UART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * * NOTE: Configuration of the CONSOLE UART was performed by up_lowsetup() * very early in the boot sequence. * ****************************************************************************/ -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { /* Configure all UARTs (except the CONSOLE UART) and disable interrupts */ @@ -1338,15 +1338,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes that - * up_earlyserialinit was called previously. + * arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #ifdef CONSOLE_DEV uart_register("/dev/console", &CONSOLE_DEV); @@ -1393,10 +1393,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #ifdef HAVE_SERIAL_CONSOLE up_restoreuartint(priv, ier); #endif @@ -1423,10 +1423,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; } diff --git a/arch/arm/src/arm/arm_allocpage.c b/arch/arm/src/arm/arm_allocpage.c index 2b8de0c769e..49c86854d3d 100644 --- a/arch/arm/src/arm/arm_allocpage.c +++ b/arch/arm/src/arm/arm_allocpage.c @@ -203,7 +203,7 @@ int up_allocpage(FAR struct tcb_s *tcb, FAR void **vpage) */ uintptr_t oldvaddr = PG_POOL_NDX2VA(g_ptemap[pgndx]); - pte = up_va2pte(oldvaddr); + pte = arm_va2pte(oldvaddr); *pte = 0; /* Invalidate instruction TLB corresponding to the virtual address */ @@ -227,7 +227,7 @@ int up_allocpage(FAR struct tcb_s *tcb, FAR void **vpage) * non-cached (MMU_L2_ALLOCFLAGS). */ - pte = up_va2pte(vaddr); + pte = arm_va2pte(vaddr); *pte = (paddr | MMU_L2_ALLOCFLAGS); /* And save the new L1 index */ diff --git a/arch/arm/src/arm/arm_checkmapping.c b/arch/arm/src/arm/arm_checkmapping.c index f466c27c54a..cff6666b1d4 100644 --- a/arch/arm/src/arm/arm_checkmapping.c +++ b/arch/arm/src/arm/arm_checkmapping.c @@ -98,7 +98,7 @@ bool up_checkmapping(FAR struct tcb_s *tcb) /* Get the PTE associated with this virtual address */ - pte = up_va2pte(vaddr); + pte = arm_va2pte(vaddr); /* Return true if this virtual address is mapped. */ diff --git a/arch/arm/src/arm/arm_dataabort.c b/arch/arm/src/arm/arm_dataabort.c index e8ac5baffc8..794b3a49bfa 100644 --- a/arch/arm/src/arm/arm_dataabort.c +++ b/arch/arm/src/arm/arm_dataabort.c @@ -42,7 +42,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_dataabort + * Name: arm_dataabort * * Input Parameters: * regs - The standard, ARM register save array. @@ -64,7 +64,7 @@ ****************************************************************************/ #ifdef CONFIG_PAGING -void up_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr) +void arm_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr) { struct tcb_s *tcb = this_task(); #ifdef CONFIG_PAGING @@ -148,7 +148,7 @@ segfault: #else /* CONFIG_PAGING */ -void up_dataabort(uint32_t *regs) +void arm_dataabort(uint32_t *regs) { /* Save the saved processor context in CURRENT_REGS where it can be * accessed for register dumps and possibly context switching. diff --git a/arch/arm/src/arm/arm_doirq.c b/arch/arm/src/arm/arm_doirq.c index 680dcd68fd8..b0916660efa 100644 --- a/arch/arm/src/arm/arm_doirq.c +++ b/arch/arm/src/arm/arm_doirq.c @@ -57,7 +57,7 @@ * Public Functions ****************************************************************************/ -void up_doirq(int irq, uint32_t *regs) +void arm_doirq(int irq, uint32_t *regs) { board_autoled_on(LED_INIRQ); #ifdef CONFIG_SUPPRESS_INTERRUPTS @@ -75,7 +75,7 @@ void up_doirq(int irq, uint32_t *regs) /* Acknowledge the interrupt */ - up_ack_irq(irq); + arm_ack_irq(irq); /* Deliver the IRQ */ @@ -94,7 +94,7 @@ void up_doirq(int irq, uint32_t *regs) #ifdef CONFIG_ARCH_FPU /* Restore floating point registers */ - up_restorefpu((uint32_t *)CURRENT_REGS); + arm_restorefpu((uint32_t *)CURRENT_REGS); #endif #ifdef CONFIG_ARCH_ADDRENV diff --git a/arch/arm/src/arm/arm_head.S b/arch/arm/src/arm/arm_head.S index c719611984f..5d6ec778b33 100644 --- a/arch/arm/src/arm/arm_head.S +++ b/arch/arm/src/arm/arm_head.S @@ -211,7 +211,7 @@ #ifdef CONFIG_DEBUG_FEATURES .macro showprogress, code mov r0, #\code - bl up_lowputc + bl arm_lowputc .endm #else .macro showprogress, code diff --git a/arch/arm/src/arm/arm_nommuhead.S b/arch/arm/src/arm/arm_nommuhead.S index e98aeb96e48..f497daa4eb2 100644 --- a/arch/arm/src/arm/arm_nommuhead.S +++ b/arch/arm/src/arm/arm_nommuhead.S @@ -52,7 +52,7 @@ #ifdef CONFIG_DEBUG_FEATURES .macro showprogress, code mov r0, #\code - bl up_lowputc + bl arm_lowputc .endm #else .macro showprogress, code @@ -112,7 +112,7 @@ __start: mov fp, #0 #ifdef USE_EARLYSERIALINIT - bl up_earlyserialinit + bl arm_earlyserialinit #endif #ifdef CONFIG_DEBUG_FEATURES diff --git a/arch/arm/src/arm/arm_pginitialize.c b/arch/arm/src/arm/arm_pginitialize.c index 1057e4b062e..98e9f3dd7be 100644 --- a/arch/arm/src/arm/arm_pginitialize.c +++ b/arch/arm/src/arm/arm_pginitialize.c @@ -51,7 +51,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_pginitialize() + * Name: arm_pginitialize() * * Description: * Initialize the MMU for on-demand paging support.. @@ -69,10 +69,10 @@ * ****************************************************************************/ -void up_pginitialize(void) +void arm_pginitialize(void) { /* None needed at present. This file is just retained in case the need - * arises in the future. Nothing calls up_pginitialize() now. If needed, + * arises in the future. Nothing calls arm_pginitialize() now. If needed, * if should be called early in arm_boot.c to assure that all paging is * ready. */ diff --git a/arch/arm/src/arm/arm_prefetchabort.c b/arch/arm/src/arm/arm_prefetchabort.c index 7d56ea81c93..a7452886755 100644 --- a/arch/arm/src/arm/arm_prefetchabort.c +++ b/arch/arm/src/arm/arm_prefetchabort.c @@ -52,7 +52,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_prefetchabort + * Name: arm_prefetchabort * * Description: * This is the prefetch abort exception handler. The ARM prefetch abort @@ -61,7 +61,7 @@ * ****************************************************************************/ -void up_prefetchabort(uint32_t *regs) +void arm_prefetchabort(uint32_t *regs) { #ifdef CONFIG_PAGING uint32_t *savestate; diff --git a/arch/arm/src/arm/arm_schedulesigaction.c b/arch/arm/src/arm/arm_schedulesigaction.c index 02513ab5834..6c21fba0fe6 100644 --- a/arch/arm/src/arm/arm_schedulesigaction.c +++ b/arch/arm/src/arm/arm_schedulesigaction.c @@ -148,7 +148,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * disabled */ - CURRENT_REGS[REG_PC] = (uint32_t)up_sigdeliver; + CURRENT_REGS[REG_PC] = (uint32_t)arm_sigdeliver; CURRENT_REGS[REG_CPSR] = SVC_MODE | PSR_I_BIT | PSR_F_BIT; /* And make sure that the saved context in the TCB @@ -180,7 +180,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * disabled */ - tcb->xcp.regs[REG_PC] = (uint32_t)up_sigdeliver; + tcb->xcp.regs[REG_PC] = (uint32_t)arm_sigdeliver; tcb->xcp.regs[REG_CPSR] = SVC_MODE | PSR_I_BIT | PSR_F_BIT; } } diff --git a/arch/arm/src/arm/arm_sigdeliver.c b/arch/arm/src/arm/arm_sigdeliver.c index 2469e950e78..6d50b06dc85 100644 --- a/arch/arm/src/arm/arm_sigdeliver.c +++ b/arch/arm/src/arm/arm_sigdeliver.c @@ -58,7 +58,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_sigdeliver + * Name: arm_sigdeliver * * Description: * This is the a signal handling trampoline. When a signal action was @@ -67,7 +67,7 @@ * ****************************************************************************/ -void up_sigdeliver(void) +void arm_sigdeliver(void) { struct tcb_s *rtcb = this_task(); uint32_t regs[XCPTCONTEXT_REGS]; diff --git a/arch/arm/src/arm/arm_syscall.c b/arch/arm/src/arm/arm_syscall.c index 4eaf5c49ec4..536f7c2c7d5 100644 --- a/arch/arm/src/arm/arm_syscall.c +++ b/arch/arm/src/arm/arm_syscall.c @@ -52,7 +52,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_syscall + * Name: arm_syscall * * Description: * SWI interrupts will vector here with insn=the SWI instruction and @@ -64,7 +64,7 @@ * ****************************************************************************/ -void up_syscall(uint32_t *regs) +void arm_syscall(uint32_t *regs) { _alert("Syscall from 0x%x\n", regs[REG_PC]); CURRENT_REGS = regs; diff --git a/arch/arm/src/arm/arm_undefinedinsn.c b/arch/arm/src/arm/arm_undefinedinsn.c index dd84259dc16..807d41d1d65 100644 --- a/arch/arm/src/arm/arm_undefinedinsn.c +++ b/arch/arm/src/arm/arm_undefinedinsn.c @@ -52,10 +52,10 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_undefinedinsn + * Name: arm_undefinedinsn ****************************************************************************/ -void up_undefinedinsn(uint32_t *regs) +void arm_undefinedinsn(uint32_t *regs) { _alert("Undefined instruction at 0x%x\n", regs[REG_PC]); CURRENT_REGS = regs; diff --git a/arch/arm/src/arm/arm_va2pte.c b/arch/arm/src/arm/arm_va2pte.c index 760fe078f9b..3a47ce31ff9 100644 --- a/arch/arm/src/arm/arm_va2pte.c +++ b/arch/arm/src/arm/arm_va2pte.c @@ -69,7 +69,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_va2pte() + * Name: arm_va2pte() * * Description: * Convert a virtual address within the paged text region into a pointer to @@ -89,7 +89,7 @@ * ****************************************************************************/ -uint32_t *up_va2pte(uintptr_t vaddr) +uint32_t *arm_va2pte(uintptr_t vaddr) { uint32_t L1; uint32_t *L2; diff --git a/arch/arm/src/arm/arm_vectoraddrexcptn.S b/arch/arm/src/arm/arm_vectoraddrexcptn.S index 5e4035a6a08..e183cc4beec 100644 --- a/arch/arm/src/arm/arm_vectoraddrexcptn.S +++ b/arch/arm/src/arm/arm_vectoraddrexcptn.S @@ -75,9 +75,9 @@ * ************************************************************************************/ - .globl up_vectoraddrexcptn - .type up_vectoraddrexcptn, %function -up_vectoraddrexcptn: - b up_vectoraddrexcptn - .size up_vectoraddrexcptn, . - up_vectoraddrexcptn + .globl arm_vectoraddrexcptn + .type arm_vectoraddrexcptn, %function +arm_vectoraddrexcptn: + b arm_vectoraddrexcptn + .size arm_vectoraddrexcptn, . - arm_vectoraddrexcptn .end diff --git a/arch/arm/src/arm/arm_vectors.S b/arch/arm/src/arm/arm_vectors.S index 883fe05278a..c03f091edad 100644 --- a/arch/arm/src/arm/arm_vectors.S +++ b/arch/arm/src/arm/arm_vectors.S @@ -79,16 +79,16 @@ g_aborttmp: .text /************************************************************************************ - * Name: up_vectorirq + * Name: arm_vectorirq * * Description: * Interrupt exception. Entered in IRQ mode with spsr = SVC CPSR, lr = SVC PC * ************************************************************************************/ - .globl up_vectorirq - .type up_vectorirq, %function -up_vectorirq: + .globl arm_vectorirq + .type arm_vectorirq, %function +arm_vectorirq: /* On entry, we are in IRQ mode. We are free to use * the IRQ mode r13 and r14. */ @@ -133,10 +133,10 @@ up_vectorirq: #if CONFIG_ARCH_INTERRUPTSTACK > 3 ldr sp, .Lirqstackbase /* SP = interrupt stack base */ str r0, [sp] /* Save the user stack pointer */ - bl up_decodeirq /* Call the handler */ + bl arm_decodeirq /* Call the handler */ ldr sp, [sp] /* Restore the user stack pointer */ #else - bl up_decodeirq /* Call the handler */ + bl arm_decodeirq /* Call the handler */ #endif /* Restore the CPSR, SVC mode registers and return */ @@ -151,20 +151,20 @@ up_vectorirq: .Lirqstackbase: .word g_intstackbase #endif - .size up_vectorirq, . - up_vectorirq + .size arm_vectorirq, . - arm_vectorirq .align 5 /************************************************************************************ - * Function: up_vectorswi + * Function: arm_vectorswi * * Description: * SWI interrupt. We enter the SWI in SVC mode. * ************************************************************************************/ - .globl up_vectorswi - .type up_vectorswi, %function -up_vectorswi: + .globl arm_vectorswi + .type arm_vectorswi, %function +arm_vectorswi: /* Create a context structure. First set aside a stack frame * and store r0-r12 into the frame. @@ -185,24 +185,24 @@ up_vectorswi: stmia r0, {r1-r4} /* Then call the SWI handler with interrupts disabled. - * void up_syscall(struct xcptcontext *xcp) + * void arm_syscall(struct xcptcontext *xcp) */ mov fp, #0 /* Init frame pointer */ mov r0, sp /* Get r0=xcp */ - bl up_syscall /* Call the handler */ + bl arm_syscall /* Call the handler */ /* Restore the CPSR, SVC mode registers and return */ ldr r0, [sp, #(4*REG_CPSR)] /* Setup the SVC mode SPSR */ msr spsr, r0 ldmia sp, {r0-r15}^ /* Return */ - .size up_vectorswi, . - up_vectorswi + .size arm_vectorswi, . - arm_vectorswi .align 5 /************************************************************************************ - * Name: up_vectordata + * Name: arm_vectordata * * Description: * This is the data abort exception dispatcher. The ARM data abort exception occurs @@ -212,9 +212,9 @@ up_vectorswi: * ************************************************************************************/ - .globl up_vectordata - .type up_vectordata, %function -up_vectordata: + .globl arm_vectordata + .type arm_vectordata, %function +arm_vectordata: /* On entry we are free to use the ABORT mode registers * r13 and r14 */ @@ -252,7 +252,7 @@ up_vectordata: stmia r0, {r1-r4} /* Then call the data abort handler with interrupts disabled. - * void up_dataabort(struct xcptcontext *xcp) + * void arm_dataabort(struct xcptcontext *xcp) */ mov fp, #0 /* Init frame pointer */ @@ -261,7 +261,7 @@ up_vectordata: mrc p15, 0, r2, c5, c0, 0 /* Get r2=FSR */ mrc p15, 0, r1, c6, c0, 0 /* Get R1=FAR */ #endif - bl up_dataabort /* Call the handler */ + bl arm_dataabort /* Call the handler */ /* Restore the CPSR, SVC mode registers and return */ @@ -271,12 +271,12 @@ up_vectordata: .Ldaborttmp: .word g_aborttmp - .size up_vectordata, . - up_vectordata + .size arm_vectordata, . - arm_vectordata .align 5 /************************************************************************************ - * Name: up_vectorprefetch + * Name: arm_vectorprefetch * * Description: * This is the prefetch abort exception dispatcher. The ARM prefetch abort exception @@ -286,9 +286,9 @@ up_vectordata: * ************************************************************************************/ - .globl up_vectorprefetch - .type up_vectorprefetch, %function -up_vectorprefetch: + .globl arm_vectorprefetch + .type arm_vectorprefetch, %function +arm_vectorprefetch: /* On entry we are free to use the ABORT mode registers * r13 and r14 */ @@ -326,12 +326,12 @@ up_vectorprefetch: stmia r0, {r1-r4} /* Then call the prefetch abort handler with interrupts disabled. - * void up_prefetchabort(struct xcptcontext *xcp) + * void arm_prefetchabort(struct xcptcontext *xcp) */ mov fp, #0 /* Init frame pointer */ mov r0, sp /* Get r0=xcp */ - bl up_prefetchabort /* Call the handler */ + bl arm_prefetchabort /* Call the handler */ /* Restore the CPSR, SVC mode registers and return */ @@ -341,12 +341,12 @@ up_vectorprefetch: .Lpaborttmp: .word g_aborttmp - .size up_vectorprefetch, . - up_vectorprefetch + .size arm_vectorprefetch, . - arm_vectorprefetch .align 5 /************************************************************************************ - * Name: up_vectorundefinsn + * Name: arm_vectorundefinsn * * Description: * Undefined instruction entry exception. Entered in UND mode, spsr = SVC CPSR, @@ -354,9 +354,9 @@ up_vectorprefetch: * ************************************************************************************/ - .globl up_vectorundefinsn - .type up_vectorundefinsn, %function -up_vectorundefinsn: + .globl arm_vectorundefinsn + .type arm_vectorundefinsn, %function +arm_vectorundefinsn: /* On entry we are free to use the UND mode registers * r13 and r14 */ @@ -393,12 +393,12 @@ up_vectorundefinsn: stmia r0, {r1-r4} /* Then call the undef insn handler with interrupts disabled. - * void up_undefinedinsn(struct xcptcontext *xcp) + * void arm_undefinedinsn(struct xcptcontext *xcp) */ mov fp, #0 /* Init frame pointer */ mov r0, sp /* Get r0=xcp */ - bl up_undefinedinsn /* Call the handler */ + bl arm_undefinedinsn /* Call the handler */ /* Restore the CPSR, SVC mode registers and return */ @@ -408,23 +408,23 @@ up_vectorundefinsn: .Lundeftmp: .word g_undeftmp - .size up_vectorundefinsn, . - up_vectorundefinsn + .size arm_vectorundefinsn, . - arm_vectorundefinsn .align 5 /************************************************************************************ - * Name: up_vectorfiq + * Name: arm_vectorfiq * * Description: * Shouldn't happen * ************************************************************************************/ - .globl up_vectorfiq - .type up_vectorfiq, %function -up_vectorfiq: + .globl arm_vectorfiq + .type arm_vectorfiq, %function +arm_vectorfiq: subs pc, lr, #4 - .size up_vectorfiq, . - up_vectorfiq + .size arm_vectorfiq, . - arm_vectorfiq /************************************************************************************ * Name: g_intstackalloc/g_intstackbase diff --git a/arch/arm/src/arm/arm_vectortab.S b/arch/arm/src/arm/arm_vectortab.S index 0c523705c03..c20b1d88712 100644 --- a/arch/arm/src/arm/arm_vectortab.S +++ b/arch/arm/src/arm/arm_vectortab.S @@ -73,30 +73,30 @@ _vector_start: ldr pc, .Lfiqhandler /* 0x1c: FIQ */ .globl __start - .globl up_vectorundefinsn - .globl up_vectorswi - .globl up_vectorprefetch - .globl up_vectordata - .globl up_vectoraddrexcptn - .globl up_vectorirq - .globl up_vectorfiq + .globl arm_vectorundefinsn + .globl arm_vectorswi + .globl arm_vectorprefetch + .globl arm_vectordata + .globl arm_vectoraddrexcptn + .globl arm_vectorirq + .globl arm_vectorfiq .Lresethandler: .long __start .Lundefinedhandler: - .long up_vectorundefinsn + .long arm_vectorundefinsn .Lswihandler: - .long up_vectorswi + .long arm_vectorswi .Lprefetchaborthandler: - .long up_vectorprefetch + .long arm_vectorprefetch .Ldataaborthandler: - .long up_vectordata + .long arm_vectordata .Laddrexcptnhandler: - .long up_vectoraddrexcptn + .long arm_vectoraddrexcptn .Lirqhandler: - .long up_vectorirq + .long arm_vectorirq .Lfiqhandler: - .long up_vectorfiq + .long arm_vectorfiq .globl _vector_end _vector_end: diff --git a/arch/arm/src/armv6-m/arm_doirq.c b/arch/arm/src/armv6-m/arm_doirq.c index decaa086024..31413160ec4 100644 --- a/arch/arm/src/armv6-m/arm_doirq.c +++ b/arch/arm/src/armv6-m/arm_doirq.c @@ -55,7 +55,7 @@ * Public Functions ****************************************************************************/ -uint32_t *up_doirq(int irq, uint32_t *regs) +uint32_t *arm_doirq(int irq, uint32_t *regs) { board_autoled_on(LED_INIRQ); #ifdef CONFIG_SUPPRESS_INTERRUPTS @@ -80,7 +80,7 @@ uint32_t *up_doirq(int irq, uint32_t *regs) /* Acknowledge the interrupt */ - up_ack_irq(irq); + arm_ack_irq(irq); /* Deliver the IRQ */ diff --git a/arch/arm/src/armv6-m/arm_exception.S b/arch/arm/src/armv6-m/arm_exception.S index 5cf318c0099..c70c57a2eb9 100644 --- a/arch/arm/src/armv6-m/arm_exception.S +++ b/arch/arm/src/armv6-m/arm_exception.S @@ -141,7 +141,7 @@ exception_common: mrs r0, ipsr /* R0=exception number */ /* Disable interrupts, select the stack to use for interrupt handling - * and call up_doirq to handle the interrupt + * and call arm_doirq to handle the interrupt */ cpsid i /* Disable further interrupts */ @@ -155,15 +155,15 @@ exception_common: ldr r7, =g_intstackbase /* R7=Base of the interrupt stack */ mov sp, r7 /* Set the new stack point */ push {r1} /* Save the MSP on the interrupt stack */ - bl up_doirq /* R0=IRQ, R1=register save area on stack */ + bl arm_doirq /* R0=IRQ, R1=register save area on stack */ pop {r1} /* Recover R1=main stack pointer */ #else msr msp, r1 /* We are using the main stack pointer */ - bl up_doirq /* R0=IRQ, R1=register save area on stack */ + bl arm_doirq /* R0=IRQ, R1=register save area on stack */ mrs r1, msp /* Recover R1=main stack pointer */ #endif - /* On return from up_doirq, r0 will hold a pointer to register context + /* On return from arm_doirq, r0 will hold a pointer to register context * array to use for the interrupt return. If that return value is the same * as current stack pointer, then things are relatively easy. */ diff --git a/arch/arm/src/armv6-m/arm_hardfault.c b/arch/arm/src/armv6-m/arm_hardfault.c index 4820ea14588..85181fd1792 100644 --- a/arch/arm/src/armv6-m/arm_hardfault.c +++ b/arch/arm/src/armv6-m/arm_hardfault.c @@ -73,7 +73,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_hardfault + * Name: arm_hardfault * * Description: * This is Hard Fault exception handler. It also catches SVC call @@ -81,7 +81,7 @@ * ****************************************************************************/ -int up_hardfault(int irq, FAR void *context, FAR void *arg) +int arm_hardfault(int irq, FAR void *context, FAR void *arg) { uint32_t *regs = (uint32_t *)context; @@ -121,7 +121,7 @@ int up_hardfault(int irq, FAR void *context, FAR void *arg) if (insn == INSN_SVC0) { hfinfo("Forward SVCall\n"); - return up_svcall(irq, context, NULL); + return arm_svcall(irq, context, NULL); } } diff --git a/arch/arm/src/armv6-m/arm_schedulesigaction.c b/arch/arm/src/armv6-m/arm_schedulesigaction.c index e6ea0bff8e1..080635d4b18 100644 --- a/arch/arm/src/armv6-m/arm_schedulesigaction.c +++ b/arch/arm/src/armv6-m/arm_schedulesigaction.c @@ -147,7 +147,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * privileged thread mode. */ - CURRENT_REGS[REG_PC] = (uint32_t)up_sigdeliver; + CURRENT_REGS[REG_PC] = (uint32_t)arm_sigdeliver; CURRENT_REGS[REG_PRIMASK] = 1; CURRENT_REGS[REG_XPSR] = ARMV6M_XPSR_T; #ifdef CONFIG_BUILD_PROTECTED @@ -186,7 +186,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * here. */ - tcb->xcp.regs[REG_PC] = (uint32_t)up_sigdeliver; + tcb->xcp.regs[REG_PC] = (uint32_t)arm_sigdeliver; tcb->xcp.regs[REG_PRIMASK] = 1; tcb->xcp.regs[REG_XPSR] = ARMV6M_XPSR_T; #ifdef CONFIG_BUILD_PROTECTED diff --git a/arch/arm/src/armv6-m/arm_sigdeliver.c b/arch/arm/src/armv6-m/arm_sigdeliver.c index 79a0b2656cc..0d010ea460f 100644 --- a/arch/arm/src/armv6-m/arm_sigdeliver.c +++ b/arch/arm/src/armv6-m/arm_sigdeliver.c @@ -57,7 +57,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_sigdeliver + * Name: arm_sigdeliver * * Description: * This is the a signal handling trampoline. When a signal action was @@ -66,7 +66,7 @@ * ****************************************************************************/ -void up_sigdeliver(void) +void arm_sigdeliver(void) { /* NOTE the "magic" guard space added to regs. This is a little kludge * because arm_fullcontextrestore (called below) will do a stack-to-stack diff --git a/arch/arm/src/armv6-m/arm_svcall.c b/arch/arm/src/armv6-m/arm_svcall.c index fb55be61a36..98af9556fa3 100644 --- a/arch/arm/src/armv6-m/arm_svcall.c +++ b/arch/arm/src/armv6-m/arm_svcall.c @@ -109,14 +109,14 @@ static void dispatch_syscall(void) ****************************************************************************/ /**************************************************************************** - * Name: up_svcall + * Name: arm_svcall * * Description: * This is SVCall exception handler that performs context switching * ****************************************************************************/ -int up_svcall(int irq, FAR void *context, FAR void *arg) +int arm_svcall(int irq, FAR void *context, FAR void *arg) { uint32_t *regs = (uint32_t *)context; uint32_t cmd; @@ -223,7 +223,7 @@ int up_svcall(int irq, FAR void *context, FAR void *arg) /* R0=SYS_syscall_return: This a syscall return command: * - * void up_syscall_return(void); + * void arm_syscall_return(void); * * At this point, the following values are saved in context: * diff --git a/arch/arm/src/armv6-m/svcall.h b/arch/arm/src/armv6-m/svcall.h index 8afd888bdee..5441a450894 100644 --- a/arch/arm/src/armv6-m/svcall.h +++ b/arch/arm/src/armv6-m/svcall.h @@ -84,7 +84,7 @@ #ifdef CONFIG_LIB_SYSCALL /* SYS call 3: * - * void up_syscall_return(void); + * void arm_syscall_return(void); */ #define SYS_syscall_return (3) diff --git a/arch/arm/src/armv7-a/arm_copyarmstate.c b/arch/arm/src/armv7-a/arm_copyarmstate.c index 19fec251a32..a8265e2e650 100644 --- a/arch/arm/src/armv7-a/arm_copyarmstate.c +++ b/arch/arm/src/armv7-a/arm_copyarmstate.c @@ -75,7 +75,7 @@ void arm_copyarmstate(uint32_t *dest, uint32_t *src) * registers at indices ARM_CONTEXT_REGS through (XCPTCONTEXT_REGS-1) */ - up_savefpu(dest); + arm_savefpu(dest); /* Then copy all of the ARM registers (omitting the floating point * registers). Indices: 0 through (ARM_CONTEXT_REGS-1). diff --git a/arch/arm/src/armv7-a/arm_doirq.c b/arch/arm/src/armv7-a/arm_doirq.c index 43e9f065030..dc9c0ead91c 100644 --- a/arch/arm/src/armv7-a/arm_doirq.c +++ b/arch/arm/src/armv7-a/arm_doirq.c @@ -108,7 +108,7 @@ static inline uint32_t *_arm_doirq(int irq, uint32_t *regs) #ifdef CONFIG_ARCH_FPU /* Restore floating point registers */ - up_restorefpu((uint32_t *)CURRENT_REGS); + arm_restorefpu((uint32_t *)CURRENT_REGS); #endif #ifdef CONFIG_ARCH_ADDRENV diff --git a/arch/arm/src/armv7-a/arm_head.S b/arch/arm/src/armv7-a/arm_head.S index edf2dfdf9e4..8f80573738a 100644 --- a/arch/arm/src/armv7-a/arm_head.S +++ b/arch/arm/src/armv7-a/arm_head.S @@ -174,7 +174,7 @@ #ifdef CONFIG_DEBUG_FEATURES .macro showprogress, code mov r0, #\code - bl up_lowputc + bl arm_lowputc .endm #else .macro showprogress, code diff --git a/arch/arm/src/armv7-a/arm_l2cc_pl310.c b/arch/arm/src/armv7-a/arm_l2cc_pl310.c index b0a72b8f822..3726cc881e2 100644 --- a/arch/arm/src/armv7-a/arm_l2cc_pl310.c +++ b/arch/arm/src/armv7-a/arm_l2cc_pl310.c @@ -293,7 +293,7 @@ static void pl310_flush_all(void) ****************************************************************************/ /**************************************************************************** - * Name: up_l2ccinitialize + * Name: arm_l2ccinitialize * * Description: * One time configuration of the L2 cache. The L2 cache will be enabled @@ -308,7 +308,7 @@ static void pl310_flush_all(void) * ****************************************************************************/ -void up_l2ccinitialize(void) +void arm_l2ccinitialize(void) { uint32_t regval; int i; diff --git a/arch/arm/src/armv7-a/arm_pghead.S b/arch/arm/src/armv7-a/arm_pghead.S index 76a4518aac9..fd4411832ee 100644 --- a/arch/arm/src/armv7-a/arm_pghead.S +++ b/arch/arm/src/armv7-a/arm_pghead.S @@ -198,7 +198,7 @@ #ifdef CONFIG_DEBUG_FEATURES .macro showprogress, code mov r0, #\code - bl up_lowputc + bl arm_lowputc .endm #else .macro showprogress, code diff --git a/arch/arm/src/armv7-a/arm_pginitialize.c b/arch/arm/src/armv7-a/arm_pginitialize.c index 89a3c4d0e1a..48c3f00cb4f 100644 --- a/arch/arm/src/armv7-a/arm_pginitialize.c +++ b/arch/arm/src/armv7-a/arm_pginitialize.c @@ -54,7 +54,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_pginitialize() + * Name: arm_pginitialize() * * Description: * Initialize the MMU for on-demand paging support.. @@ -72,10 +72,10 @@ * ****************************************************************************/ -void up_pginitialize(void) +void arm_pginitialize(void) { /* None needed at present. This file is just retained in case the need - * arises in the future. Nothing calls up_pginitialize() now. If needed, + * arises in the future. Nothing calls arm_pginitialize() now. If needed, * if should be called early in arm_boot.c to assure that all paging is * ready. */ diff --git a/arch/arm/src/armv7-a/arm_restorefpu.S b/arch/arm/src/armv7-a/arm_restorefpu.S index b35e03fb19a..aad80ab36b3 100644 --- a/arch/arm/src/armv7-a/arm_restorefpu.S +++ b/arch/arm/src/armv7-a/arm_restorefpu.S @@ -49,7 +49,7 @@ * Public Symbols ************************************************************************************/ - .globl up_restorefpu + .globl arm_restorefpu /************************************************************************************ * Public Functions @@ -58,14 +58,14 @@ .text /************************************************************************************ - * Name: up_restorefpu + * Name: arm_restorefpu * * Description: * Given the pointer to a register save area (in R0), restore the state of the * floating point registers. * * C Function Prototype: - * void up_restorefpu(const uint32_t *regs); + * void arm_restorefpu(const uint32_t *regs); * * Input Parameters: * regs - A pointer to the register save area containing the floating point @@ -77,10 +77,10 @@ * ************************************************************************************/ - .globl up_restorefpu - .type up_restorefpu, function + .globl arm_restorefpu + .type arm_restorefpu, function -up_restorefpu: +arm_restorefpu: add r1, r0, #(4*REG_S0) /* R1=Address of FP register storage */ @@ -98,6 +98,6 @@ up_restorefpu: vmsr fpscr, r2 /* Restore the FPCSR */ bx lr - .size up_restorefpu, .-up_restorefpu + .size arm_restorefpu, .-arm_restorefpu #endif /* CONFIG_ARCH_FPU */ .end diff --git a/arch/arm/src/armv7-a/arm_savefpu.S b/arch/arm/src/armv7-a/arm_savefpu.S index b753046d9f2..1967b1c5055 100644 --- a/arch/arm/src/armv7-a/arm_savefpu.S +++ b/arch/arm/src/armv7-a/arm_savefpu.S @@ -53,7 +53,7 @@ * Public Symbols ************************************************************************************/ - .globl up_savefpu + .globl arm_savefpu /************************************************************************************ * Public Functions @@ -62,14 +62,14 @@ .text /************************************************************************************ - * Name: up_savefpu + * Name: arm_savefpu * * Description: * Given the pointer to a register save area (in R0), save the state of the * floating point registers. * * C Function Prototype: - * void up_savefpu(uint32_t *regs); + * void arm_savefpu(uint32_t *regs); * * Input Parameters: * regs - A pointer to the register save area in which to save the floating point @@ -80,10 +80,10 @@ * ************************************************************************************/ - .globl up_savefpu - .type up_savefpu, function + .globl arm_savefpu + .type arm_savefpu, function -up_savefpu: +arm_savefpu: add r1, r0, #(4*REG_S0) /* R1=Address of FP register storage */ @@ -101,6 +101,6 @@ up_savefpu: str r2, [r1], #4 /* Save the floating point control and status register */ bx lr - .size up_savefpu, .-up_savefpu + .size arm_savefpu, .-arm_savefpu #endif /* CONFIG_ARCH_FPU */ .end diff --git a/arch/arm/src/armv7-a/arm_schedulesigaction.c b/arch/arm/src/armv7-a/arm_schedulesigaction.c index 26f99ed4d6d..4f0c670406a 100644 --- a/arch/arm/src/armv7-a/arm_schedulesigaction.c +++ b/arch/arm/src/armv7-a/arm_schedulesigaction.c @@ -153,7 +153,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * disabled */ - CURRENT_REGS[REG_PC] = (uint32_t)up_sigdeliver; + CURRENT_REGS[REG_PC] = (uint32_t)arm_sigdeliver; CURRENT_REGS[REG_CPSR] = (PSR_MODE_SVC | PSR_I_BIT | PSR_F_BIT); #ifdef CONFIG_ARM_THUMB CURRENT_REGS[REG_CPSR] |= PSR_T_BIT; @@ -187,7 +187,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * disabled */ - tcb->xcp.regs[REG_PC] = (uint32_t)up_sigdeliver; + tcb->xcp.regs[REG_PC] = (uint32_t)arm_sigdeliver; tcb->xcp.regs[REG_CPSR] = (PSR_MODE_SVC | PSR_I_BIT | PSR_F_BIT); #ifdef CONFIG_ARM_THUMB tcb->xcp.regs[REG_CPSR] |= PSR_T_BIT; @@ -280,7 +280,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * disabled */ - tcb->xcp.regs[REG_PC] = (uint32_t)up_sigdeliver; + tcb->xcp.regs[REG_PC] = (uint32_t)arm_sigdeliver; tcb->xcp.regs[REG_CPSR] = (PSR_MODE_SVC | PSR_I_BIT | PSR_F_BIT); #ifdef CONFIG_ARM_THUMB tcb->xcp.regs[REG_CPSR] |= PSR_T_BIT; @@ -305,7 +305,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * privileged thread mode. */ - CURRENT_REGS[REG_PC] = (uint32_t)up_sigdeliver; + CURRENT_REGS[REG_PC] = (uint32_t)arm_sigdeliver; CURRENT_REGS[REG_CPSR] = (PSR_MODE_SVC | PSR_I_BIT | PSR_F_BIT); #ifdef CONFIG_ARM_THUMB CURRENT_REGS[REG_CPSR] |= PSR_T_BIT; @@ -329,7 +329,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * involves spinlocks that are configured per the TCB irqcount * field. This is logically equivalent to enter_critical_section(). * The matching call to leave_critical_section() will be - * performed in up_sigdeliver(). + * performed in arm_sigdeliver(). */ spin_setbit(&g_cpu_irqset, cpu, &g_cpu_irqsetlock, @@ -371,7 +371,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * disabled */ - tcb->xcp.regs[REG_PC] = (uint32_t)up_sigdeliver; + tcb->xcp.regs[REG_PC] = (uint32_t)arm_sigdeliver; tcb->xcp.regs[REG_CPSR] = (PSR_MODE_SVC | PSR_I_BIT | PSR_F_BIT); #ifdef CONFIG_ARM_THUMB tcb->xcp.regs[REG_CPSR] |= PSR_T_BIT; diff --git a/arch/arm/src/armv7-a/arm_sigdeliver.c b/arch/arm/src/armv7-a/arm_sigdeliver.c index 092d642175c..b0c240ed722 100644 --- a/arch/arm/src/armv7-a/arm_sigdeliver.c +++ b/arch/arm/src/armv7-a/arm_sigdeliver.c @@ -58,7 +58,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_sigdeliver + * Name: arm_sigdeliver * * Description: * This is the a signal handling trampoline. When a signal action was @@ -67,7 +67,7 @@ * ****************************************************************************/ -void up_sigdeliver(void) +void arm_sigdeliver(void) { struct tcb_s *rtcb = this_task(); uint32_t regs[XCPTCONTEXT_REGS]; diff --git a/arch/arm/src/armv7-a/arm_syscall.c b/arch/arm/src/armv7-a/arm_syscall.c index 8ce7c66e3f1..989672ffa0c 100644 --- a/arch/arm/src/armv7-a/arm_syscall.c +++ b/arch/arm/src/armv7-a/arm_syscall.c @@ -157,7 +157,7 @@ uint32_t *arm_syscall(uint32_t *regs) { /* R0=SYS_syscall_return: This a SYSCALL return command: * - * void up_syscall_return(void); + * void arm_syscall_return(void); * * At this point, the following values are saved in context: * diff --git a/arch/arm/src/armv7-a/l2cc.h b/arch/arm/src/armv7-a/l2cc.h index ea7b162b179..53ad2c4129d 100644 --- a/arch/arm/src/armv7-a/l2cc.h +++ b/arch/arm/src/armv7-a/l2cc.h @@ -66,7 +66,7 @@ extern "C" ****************************************************************************/ /**************************************************************************** - * Name: up_l2ccinitialize + * Name: arm_l2ccinitialize * * Description: * One time configuration of the L2 cache. The L2 cache will be enabled @@ -82,7 +82,7 @@ extern "C" ****************************************************************************/ #if 0 /* Prototyped in arm_internal.h */ -void up_l2ccinitialize(void); +void arm_l2ccinitialize(void); #endif /**************************************************************************** diff --git a/arch/arm/src/armv7-a/svcall.h b/arch/arm/src/armv7-a/svcall.h index ba2a9fc17da..8e45835d2df 100644 --- a/arch/arm/src/armv7-a/svcall.h +++ b/arch/arm/src/armv7-a/svcall.h @@ -62,7 +62,7 @@ /* SYS call 0: * - * void up_syscall_return(void); + * void arm_syscall_return(void); */ #define SYS_syscall_return (0) diff --git a/arch/arm/src/armv7-m/arm_copyarmstate.c b/arch/arm/src/armv7-m/arm_copyarmstate.c index c6544aef1b8..bbdfb59345d 100644 --- a/arch/arm/src/armv7-m/arm_copyarmstate.c +++ b/arch/arm/src/armv7-m/arm_copyarmstate.c @@ -60,7 +60,7 @@ void arm_copyarmstate(uint32_t *dest, uint32_t *src) * registers at indices SW_INT_REGS through (SW_INT_REGS+SW_FPU_REGS-1) */ - up_savefpu(dest); + arm_savefpu(dest); /* Save the block of ARM registers that were saved by the interrupt * handling logic. Indices: 0 through (SW_INT_REGS-1). diff --git a/arch/arm/src/armv7-m/arm_doirq.c b/arch/arm/src/armv7-m/arm_doirq.c index 1add2725167..6f53ac36bbd 100644 --- a/arch/arm/src/armv7-m/arm_doirq.c +++ b/arch/arm/src/armv7-m/arm_doirq.c @@ -39,7 +39,7 @@ * Public Functions ****************************************************************************/ -uint32_t *up_doirq(int irq, uint32_t *regs) +uint32_t *arm_doirq(int irq, uint32_t *regs) { board_autoled_on(LED_INIRQ); #ifdef CONFIG_SUPPRESS_INTERRUPTS @@ -64,7 +64,7 @@ uint32_t *up_doirq(int irq, uint32_t *regs) /* Acknowledge the interrupt */ - up_ack_irq(irq); + arm_ack_irq(irq); /* Deliver the IRQ */ diff --git a/arch/arm/src/armv7-m/arm_hardfault.c b/arch/arm/src/armv7-m/arm_hardfault.c index b19ce1f13d7..515f7efdf43 100644 --- a/arch/arm/src/armv7-m/arm_hardfault.c +++ b/arch/arm/src/armv7-m/arm_hardfault.c @@ -63,7 +63,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_hardfault + * Name: arm_hardfault * * Description: * This is Hard Fault exception handler. It also catches SVC call @@ -71,7 +71,7 @@ * ****************************************************************************/ -int up_hardfault(int irq, FAR void *context, FAR void *arg) +int arm_hardfault(int irq, FAR void *context, FAR void *arg) { /* Get the value of the program counter where the fault occurred */ @@ -112,7 +112,7 @@ int up_hardfault(int irq, FAR void *context, FAR void *arg) if (insn == INSN_SVC0) { hfinfo("Forward SVCall\n"); - return up_svcall(irq, context, arg); + return arm_svcall(irq, context, arg); } } #endif diff --git a/arch/arm/src/armv7-m/arm_memfault.c b/arch/arm/src/armv7-m/arm_memfault.c index c2a6487e994..a86c3825155 100644 --- a/arch/arm/src/armv7-m/arm_memfault.c +++ b/arch/arm/src/armv7-m/arm_memfault.c @@ -50,7 +50,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_memfault + * Name: arm_memfault * * Description: * This is Memory Management Fault exception handler. Normally we get @@ -60,7 +60,7 @@ * ****************************************************************************/ -int up_memfault(int irq, FAR void *context, FAR void *arg) +int arm_memfault(int irq, FAR void *context, FAR void *arg) { /* Dump some memory management fault info */ diff --git a/arch/arm/src/armv7-m/arm_schedulesigaction.c b/arch/arm/src/armv7-m/arm_schedulesigaction.c index 9aab25dfd54..863376fc697 100644 --- a/arch/arm/src/armv7-m/arm_schedulesigaction.c +++ b/arch/arm/src/armv7-m/arm_schedulesigaction.c @@ -144,7 +144,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * privileged thread mode. */ - CURRENT_REGS[REG_PC] = (uint32_t)up_sigdeliver; + CURRENT_REGS[REG_PC] = (uint32_t)arm_sigdeliver; #ifdef CONFIG_ARMV7M_USEBASEPRI CURRENT_REGS[REG_BASEPRI] = NVIC_SYSH_DISABLE_PRIORITY; #else @@ -191,7 +191,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * here. */ - tcb->xcp.regs[REG_PC] = (uint32_t)up_sigdeliver; + tcb->xcp.regs[REG_PC] = (uint32_t)arm_sigdeliver; #ifdef CONFIG_ARMV7M_USEBASEPRI tcb->xcp.regs[REG_BASEPRI] = NVIC_SYSH_DISABLE_PRIORITY; #else @@ -299,7 +299,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * to be here. */ - tcb->xcp.regs[REG_PC] = (uint32_t)up_sigdeliver; + tcb->xcp.regs[REG_PC] = (uint32_t)arm_sigdeliver; #ifdef CONFIG_ARMV7M_USEBASEPRI tcb->xcp.regs[REG_BASEPRI] = NVIC_SYSH_DISABLE_PRIORITY; #else @@ -337,7 +337,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * privileged thread mode. */ - CURRENT_REGS[REG_PC] = (uint32_t)up_sigdeliver; + CURRENT_REGS[REG_PC] = (uint32_t)arm_sigdeliver; #ifdef CONFIG_ARMV7M_USEBASEPRI CURRENT_REGS[REG_BASEPRI] = NVIC_SYSH_DISABLE_PRIORITY; #else @@ -367,7 +367,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * field. This is logically equivalent to * enter_critical_section(). The matching call to * leave_critical_section() will be performed in - * up_sigdeliver(). + * arm_sigdeliver(). */ spin_setbit(&g_cpu_irqset, cpu, &g_cpu_irqsetlock, @@ -417,7 +417,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * here. */ - tcb->xcp.regs[REG_PC] = (uint32_t)up_sigdeliver; + tcb->xcp.regs[REG_PC] = (uint32_t)arm_sigdeliver; #ifdef CONFIG_ARMV7M_USEBASEPRI tcb->xcp.regs[REG_BASEPRI] = NVIC_SYSH_DISABLE_PRIORITY; #else diff --git a/arch/arm/src/armv7-m/arm_sigdeliver.c b/arch/arm/src/armv7-m/arm_sigdeliver.c index 62752f70847..3fae5e80dce 100644 --- a/arch/arm/src/armv7-m/arm_sigdeliver.c +++ b/arch/arm/src/armv7-m/arm_sigdeliver.c @@ -42,7 +42,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_sigdeliver + * Name: arm_sigdeliver * * Description: * This is the a signal handling trampoline. When a signal action was @@ -51,7 +51,7 @@ * ****************************************************************************/ -void up_sigdeliver(void) +void arm_sigdeliver(void) { struct tcb_s *rtcb = this_task(); uint32_t regs[XCPTCONTEXT_REGS]; diff --git a/arch/arm/src/armv7-m/arm_svcall.c b/arch/arm/src/armv7-m/arm_svcall.c index e66bc036812..b848bfda950 100644 --- a/arch/arm/src/armv7-m/arm_svcall.c +++ b/arch/arm/src/armv7-m/arm_svcall.c @@ -117,14 +117,14 @@ static void dispatch_syscall(void) ****************************************************************************/ /**************************************************************************** - * Name: up_svcall + * Name: arm_svcall * * Description: * This is SVCall exception handler that performs context switching * ****************************************************************************/ -int up_svcall(int irq, FAR void *context, FAR void *arg) +int arm_svcall(int irq, FAR void *context, FAR void *arg) { uint32_t *regs = (uint32_t *)context; uint32_t cmd; @@ -179,7 +179,7 @@ int up_svcall(int irq, FAR void *context, FAR void *arg) DEBUGASSERT(regs[REG_R1] != 0); memcpy((uint32_t *)regs[REG_R1], regs, XCPTCONTEXT_SIZE); #if defined(CONFIG_ARCH_FPU) && defined(CONFIG_ARMV7M_LAZYFPU) - up_savefpu((uint32_t *)regs[REG_R1]); + arm_savefpu((uint32_t *)regs[REG_R1]); #endif } break; @@ -229,7 +229,7 @@ int up_svcall(int irq, FAR void *context, FAR void *arg) DEBUGASSERT(regs[REG_R1] != 0 && regs[REG_R2] != 0); memcpy((uint32_t *)regs[REG_R1], regs, XCPTCONTEXT_SIZE); #if defined(CONFIG_ARCH_FPU) && defined(CONFIG_ARMV7M_LAZYFPU) - up_savefpu((uint32_t *)regs[REG_R1]); + arm_savefpu((uint32_t *)regs[REG_R1]); #endif CURRENT_REGS = (uint32_t *)regs[REG_R2]; } @@ -237,7 +237,7 @@ int up_svcall(int irq, FAR void *context, FAR void *arg) /* R0=SYS_syscall_return: This a syscall return command: * - * void up_syscall_return(void); + * void arm_syscall_return(void); * * At this point, the following values are saved in context: * diff --git a/arch/arm/src/armv7-m/gnu/arm_exception.S b/arch/arm/src/armv7-m/gnu/arm_exception.S index cd5e152662d..b9580eeec57 100644 --- a/arch/arm/src/armv7-m/gnu/arm_exception.S +++ b/arch/arm/src/armv7-m/gnu/arm_exception.S @@ -165,7 +165,7 @@ exception_common: /* Save the non-volatile FP registers here. * * This routine is the only point where we can save these registers; either before - * or after calling up_doirq. The compiler is free to use them at any time as long + * or after calling arm_doirq. The compiler is free to use them at any time as long * as they are restored before returning, so we can't assume that we can get at the * true values of these registers in any routine called from here. * @@ -179,7 +179,7 @@ exception_common: stmdb sp!, {r2-r11,r14} /* Save the remaining registers plus the SP/PRIMASK values */ - /* There are two arguments to up_doirq: + /* There are two arguments to arm_doirq: * * R0 = The IRQ number * R1 = The top of the stack points to the saved state @@ -210,10 +210,10 @@ exception_common: #endif - bl up_doirq /* R0=IRQ, R1=register save (msp) */ + bl arm_doirq /* R0=IRQ, R1=register save (msp) */ mov r1, r4 /* Recover R1=main stack pointer */ - /* On return from up_doirq, R0 will hold a pointer to register context + /* On return from arm_doirq, R0 will hold a pointer to register context * array to use for the interrupt return. If that return value is the same * as current stack pointer, then things are relatively easy. */ diff --git a/arch/arm/src/armv7-m/gnu/arm_fpu.S b/arch/arm/src/armv7-m/gnu/arm_fpu.S index d6fe3cb1115..a4b31cbd608 100644 --- a/arch/arm/src/armv7-m/gnu/arm_fpu.S +++ b/arch/arm/src/armv7-m/gnu/arm_fpu.S @@ -41,8 +41,8 @@ * Public Symbols ************************************************************************************/ - .globl up_savefpu - .globl up_restorefpu + .globl arm_savefpu + .globl arm_restorefpu .syntax unified .thumb @@ -53,14 +53,14 @@ ************************************************************************************/ /************************************************************************************ - * Name: up_savefpu + * Name: arm_savefpu * * Description: * Given the pointer to a register save area (in R0), save the state of the * floating point registers. * * C Function Prototype: - * void up_savefpu(uint32_t *regs); + * void arm_savefpu(uint32_t *regs); * * Input Parameters: * regs - A pointer to the register save area in which to save the floating point @@ -72,8 +72,8 @@ ************************************************************************************/ .thumb_func - .type up_savefpu, function -up_savefpu: + .type arm_savefpu, function +arm_savefpu: add r1, r0, #(4*REG_S0) /* R1=Address of FP register storage */ @@ -155,17 +155,17 @@ up_savefpu: #endif bx lr - .size up_savefpu, .-up_savefpu + .size arm_savefpu, .-arm_savefpu /************************************************************************************ - * Name: up_restorefpu + * Name: arm_restorefpu * * Description: * Given the pointer to a register save area (in R0), restore the state of the * floating point registers. * * C Function Prototype: - * void up_restorefpu(const uint32_t *regs); + * void arm_restorefpu(const uint32_t *regs); * * Input Parameters: * regs - A pointer to the register save area containing the floating point @@ -178,8 +178,8 @@ up_savefpu: ************************************************************************************/ .thumb_func - .type up_restorefpu, function -up_restorefpu: + .type arm_restorefpu, function +arm_restorefpu: add r1, r0, #(4*REG_S0) /* R1=Address of FP register storage */ @@ -265,6 +265,6 @@ up_restorefpu: #endif bx lr - .size up_restorefpu, .-up_restorefpu + .size arm_restorefpu, .-arm_restorefpu #endif /* CONFIG_ARCH_FPU */ .end diff --git a/arch/arm/src/armv7-m/gnu/arm_lazyexception.S b/arch/arm/src/armv7-m/gnu/arm_lazyexception.S index e75f65c1f38..57ee25096ff 100644 --- a/arch/arm/src/armv7-m/gnu/arm_lazyexception.S +++ b/arch/arm/src/armv7-m/gnu/arm_lazyexception.S @@ -174,7 +174,7 @@ exception_common: stmdb sp!, {r2-r11} /* Save the remaining registers plus the SP value */ #endif - /* There are two arguments to up_doirq: + /* There are two arguments to arm_doirq: * * R0 = The IRQ number * R1 = The top of the stack points to the saved state @@ -205,10 +205,10 @@ exception_common: #endif - bl up_doirq /* R0=IRQ, R1=register save (msp) */ + bl arm_doirq /* R0=IRQ, R1=register save (msp) */ mov r1, r4 /* Recover R1=main stack pointer */ - /* On return from up_doirq, R0 will hold a pointer to register context + /* On return from arm_doirq, R0 will hold a pointer to register context * array to use for the interrupt return. If that return value is the same * as current stack pointer, then things are relatively easy. */ @@ -227,12 +227,12 @@ exception_common: * Here: * r0 = Address of the register save area * - * NOTE: It is a requirement that up_restorefpu() preserve the value of + * NOTE: It is a requirement that arm_restorefpu() preserve the value of * r0! */ #ifdef CONFIG_ARCH_FPU - bl up_restorefpu /* Restore the FPU registers */ + bl arm_restorefpu /* Restore the FPU registers */ #endif /* We are returning with a pending context switch. This case is different diff --git a/arch/arm/src/armv7-m/svcall.h b/arch/arm/src/armv7-m/svcall.h index 0efa3ed777c..948f6b241ba 100644 --- a/arch/arm/src/armv7-m/svcall.h +++ b/arch/arm/src/armv7-m/svcall.h @@ -84,7 +84,7 @@ #ifdef CONFIG_LIB_SYSCALL /* SYS call 3: * - * void up_syscall_return(void); + * void arm_syscall_return(void); */ #define SYS_syscall_return (3) diff --git a/arch/arm/src/armv7-r/arm_copyarmstate.c b/arch/arm/src/armv7-r/arm_copyarmstate.c index 5b7a06edc5e..c0d791169a2 100644 --- a/arch/arm/src/armv7-r/arm_copyarmstate.c +++ b/arch/arm/src/armv7-r/arm_copyarmstate.c @@ -60,7 +60,7 @@ void arm_copyarmstate(uint32_t *dest, uint32_t *src) * registers at indices ARM_CONTEXT_REGS through (XCPTCONTEXT_REGS-1) */ - up_savefpu(dest); + arm_savefpu(dest); /* Then copy all of the ARM registers (omitting the floating point * registers). Indices: 0 through (ARM_CONTEXT_REGS-1). diff --git a/arch/arm/src/armv7-r/arm_doirq.c b/arch/arm/src/armv7-r/arm_doirq.c index f0054bf7e84..4ba440b82f9 100644 --- a/arch/arm/src/armv7-r/arm_doirq.c +++ b/arch/arm/src/armv7-r/arm_doirq.c @@ -89,7 +89,7 @@ uint32_t *arm_doirq(int irq, uint32_t *regs) { /* Restore floating point registers */ - up_restorefpu((uint32_t *)CURRENT_REGS); + arm_restorefpu((uint32_t *)CURRENT_REGS); } #endif diff --git a/arch/arm/src/armv7-r/arm_l2cc_pl310.c b/arch/arm/src/armv7-r/arm_l2cc_pl310.c index 89d35d46ed0..9b998fb5403 100644 --- a/arch/arm/src/armv7-r/arm_l2cc_pl310.c +++ b/arch/arm/src/armv7-r/arm_l2cc_pl310.c @@ -293,7 +293,7 @@ static void pl310_flush_all(void) ****************************************************************************/ /**************************************************************************** - * Name: up_l2ccinitialize + * Name: arm_l2ccinitialize * * Description: * One time configuration of the L2 cache. The L2 cache will be enabled @@ -308,7 +308,7 @@ static void pl310_flush_all(void) * ****************************************************************************/ -void up_l2ccinitialize(void) +void arm_l2ccinitialize(void) { uint32_t regval; int i; diff --git a/arch/arm/src/armv7-r/arm_restorefpu.S b/arch/arm/src/armv7-r/arm_restorefpu.S index f189691b4c9..04a25c404d1 100644 --- a/arch/arm/src/armv7-r/arm_restorefpu.S +++ b/arch/arm/src/armv7-r/arm_restorefpu.S @@ -47,7 +47,7 @@ * Public Symbols ************************************************************************************/ - .globl up_restorefpu + .globl arm_restorefpu #ifdef CONFIG_ARCH_FPU .cpu cortex-r4f @@ -64,14 +64,14 @@ .text /************************************************************************************ - * Name: up_restorefpu + * Name: arm_restorefpu * * Description: * Given the pointer to a register save area (in R0), restore the state of the * floating point registers. * * C Function Prototype: - * void up_restorefpu(const uint32_t *regs); + * void arm_restorefpu(const uint32_t *regs); * * Input Parameters: * regs - A pointer to the register save area containing the floating point @@ -83,10 +83,10 @@ * ************************************************************************************/ - .globl up_restorefpu - .type up_restorefpu, function + .globl arm_restorefpu + .type arm_restorefpu, function -up_restorefpu: +arm_restorefpu: add r1, r0, #(4*REG_S0) /* R1=Address of FP register storage */ @@ -104,6 +104,6 @@ up_restorefpu: vmsr fpscr, r2 /* Restore the FPCSR */ bx lr - .size up_restorefpu, .-up_restorefpu + .size arm_restorefpu, .-arm_restorefpu #endif /* CONFIG_ARCH_FPU */ .end diff --git a/arch/arm/src/armv7-r/arm_savefpu.S b/arch/arm/src/armv7-r/arm_savefpu.S index af637ada9fc..368f31226bd 100644 --- a/arch/arm/src/armv7-r/arm_savefpu.S +++ b/arch/arm/src/armv7-r/arm_savefpu.S @@ -53,7 +53,7 @@ * Public Symbols ************************************************************************************/ - .globl up_savefpu + .globl arm_savefpu /************************************************************************************ * Public Functions @@ -62,14 +62,14 @@ .text /************************************************************************************ - * Name: up_savefpu + * Name: arm_savefpu * * Description: * Given the pointer to a register save area (in R0), save the state of the * floating point registers. * * C Function Prototype: - * void up_savefpu(uint32_t *regs); + * void arm_savefpu(uint32_t *regs); * * Input Parameters: * regs - A pointer to the register save area in which to save the floating point @@ -80,10 +80,10 @@ * ************************************************************************************/ - .globl up_savefpu - .type up_savefpu, function + .globl arm_savefpu + .type arm_savefpu, function -up_savefpu: +arm_savefpu: add r1, r0, #(4*REG_S0) /* R1=Address of FP register storage */ @@ -101,6 +101,6 @@ up_savefpu: str r2, [r1], #4 /* Save the floating point control and status register */ bx lr - .size up_savefpu, .-up_savefpu + .size arm_savefpu, .-arm_savefpu #endif /* CONFIG_ARCH_FPU */ .end diff --git a/arch/arm/src/armv7-r/arm_schedulesigaction.c b/arch/arm/src/armv7-r/arm_schedulesigaction.c index ac334b4322d..f9c1a0bef21 100644 --- a/arch/arm/src/armv7-r/arm_schedulesigaction.c +++ b/arch/arm/src/armv7-r/arm_schedulesigaction.c @@ -148,7 +148,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * disabled */ - CURRENT_REGS[REG_PC] = (uint32_t)up_sigdeliver; + CURRENT_REGS[REG_PC] = (uint32_t)arm_sigdeliver; CURRENT_REGS[REG_CPSR] = (PSR_MODE_SVC | PSR_I_BIT | PSR_F_BIT); #ifdef CONFIG_ENDIAN_BIG @@ -183,7 +183,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * disabled */ - tcb->xcp.regs[REG_PC] = (uint32_t)up_sigdeliver; + tcb->xcp.regs[REG_PC] = (uint32_t)arm_sigdeliver; tcb->xcp.regs[REG_CPSR] = (PSR_MODE_SVC | PSR_I_BIT | PSR_F_BIT); #ifdef CONFIG_ENDIAN_BIG diff --git a/arch/arm/src/armv7-r/arm_sigdeliver.c b/arch/arm/src/armv7-r/arm_sigdeliver.c index b4b929f06f3..46ef7c6f35b 100644 --- a/arch/arm/src/armv7-r/arm_sigdeliver.c +++ b/arch/arm/src/armv7-r/arm_sigdeliver.c @@ -57,7 +57,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_sigdeliver + * Name: arm_sigdeliver * * Description: * This is the a signal handling trampoline. When a signal action was @@ -66,7 +66,7 @@ * ****************************************************************************/ -void up_sigdeliver(void) +void arm_sigdeliver(void) { struct tcb_s *rtcb = this_task(); uint32_t regs[XCPTCONTEXT_REGS]; diff --git a/arch/arm/src/armv7-r/arm_syscall.c b/arch/arm/src/armv7-r/arm_syscall.c index 6c6c29559bb..111757aa4af 100644 --- a/arch/arm/src/armv7-r/arm_syscall.c +++ b/arch/arm/src/armv7-r/arm_syscall.c @@ -155,7 +155,7 @@ uint32_t *arm_syscall(uint32_t *regs) { /* R0=SYS_syscall_return: This a SYSCALL return command: * - * void up_syscall_return(void); + * void arm_syscall_return(void); * * At this point, the following values are saved in context: * diff --git a/arch/arm/src/armv7-r/l2cc.h b/arch/arm/src/armv7-r/l2cc.h index 5d0e0705b89..f841b96b809 100644 --- a/arch/arm/src/armv7-r/l2cc.h +++ b/arch/arm/src/armv7-r/l2cc.h @@ -66,7 +66,7 @@ extern "C" ****************************************************************************/ /**************************************************************************** - * Name: up_l2ccinitialize + * Name: arm_l2ccinitialize * * Description: * One time configuration of the L2 cache. The L2 cache will be enabled @@ -82,7 +82,7 @@ extern "C" ****************************************************************************/ #if 0 /* Prototyped in arm_internal.h */ -void up_l2ccinitialize(void); +void arm_l2ccinitialize(void); #endif /**************************************************************************** diff --git a/arch/arm/src/armv7-r/svcall.h b/arch/arm/src/armv7-r/svcall.h index 9beaf752a40..51a5d26c017 100644 --- a/arch/arm/src/armv7-r/svcall.h +++ b/arch/arm/src/armv7-r/svcall.h @@ -62,7 +62,7 @@ /* SYS call 0: * - * void up_syscall_return(void); + * void arm_syscall_return(void); */ #define SYS_syscall_return (0) diff --git a/arch/arm/src/armv8-m/arm_copyarmstate.c b/arch/arm/src/armv8-m/arm_copyarmstate.c index 7639feea4cb..f22c8840cef 100755 --- a/arch/arm/src/armv8-m/arm_copyarmstate.c +++ b/arch/arm/src/armv8-m/arm_copyarmstate.c @@ -60,7 +60,7 @@ void arm_copyarmstate(uint32_t *dest, uint32_t *src) * registers at indices SW_INT_REGS through (SW_INT_REGS+SW_FPU_REGS-1) */ - up_savefpu(dest); + arm_savefpu(dest); /* Save the block of ARM registers that were saved by the interrupt * handling logic. Indices: 0 through (SW_INT_REGS-1). diff --git a/arch/arm/src/armv8-m/arm_doirq.c b/arch/arm/src/armv8-m/arm_doirq.c index 6a91c9bb3bd..f1d3c765c32 100755 --- a/arch/arm/src/armv8-m/arm_doirq.c +++ b/arch/arm/src/armv8-m/arm_doirq.c @@ -39,7 +39,7 @@ * Public Functions ****************************************************************************/ -uint32_t *up_doirq(int irq, uint32_t *regs) +uint32_t *arm_doirq(int irq, uint32_t *regs) { board_autoled_on(LED_INIRQ); #ifdef CONFIG_SUPPRESS_INTERRUPTS @@ -64,7 +64,7 @@ uint32_t *up_doirq(int irq, uint32_t *regs) /* Acknowledge the interrupt */ - up_ack_irq(irq); + arm_ack_irq(irq); /* Deliver the IRQ */ diff --git a/arch/arm/src/armv8-m/arm_exception.S b/arch/arm/src/armv8-m/arm_exception.S index 38aecb30849..85951b5e6f8 100755 --- a/arch/arm/src/armv8-m/arm_exception.S +++ b/arch/arm/src/armv8-m/arm_exception.S @@ -165,7 +165,7 @@ exception_common: /* Save the non-volatile FP registers here. * * This routine is the only point where we can save these registers; either before - * or after calling up_doirq. The compiler is free to use them at any time as long + * or after calling arm_doirq. The compiler is free to use them at any time as long * as they are restored before returning, so we can't assume that we can get at the * true values of these registers in any routine called from here. * @@ -179,7 +179,7 @@ exception_common: stmdb sp!, {r2-r11,r14} /* Save the remaining registers plus the SP/PRIMASK values */ - /* There are two arguments to up_doirq: + /* There are two arguments to arm_doirq: * * R0 = The IRQ number * R1 = The top of the stack points to the saved state @@ -210,10 +210,10 @@ exception_common: #endif - bl up_doirq /* R0=IRQ, R1=register save (msp) */ + bl arm_doirq /* R0=IRQ, R1=register save (msp) */ mov r1, r4 /* Recover R1=main stack pointer */ - /* On return from up_doirq, R0 will hold a pointer to register context + /* On return from arm_doirq, R0 will hold a pointer to register context * array to use for the interrupt return. If that return value is the same * as current stack pointer, then things are relatively easy. */ diff --git a/arch/arm/src/armv8-m/arm_fpu.S b/arch/arm/src/armv8-m/arm_fpu.S index 6db28a7e181..48e301f9a19 100755 --- a/arch/arm/src/armv8-m/arm_fpu.S +++ b/arch/arm/src/armv8-m/arm_fpu.S @@ -41,8 +41,8 @@ * Public Symbols ************************************************************************************/ - .globl up_savefpu - .globl up_restorefpu + .globl arm_savefpu + .globl arm_restorefpu .syntax unified .thumb @@ -53,14 +53,14 @@ ************************************************************************************/ /************************************************************************************ - * Name: up_savefpu + * Name: arm_savefpu * * Description: * Given the pointer to a register save area (in R0), save the state of the * floating point registers. * * C Function Prototype: - * void up_savefpu(uint32_t *regs); + * void arm_savefpu(uint32_t *regs); * * Input Parameters: * regs - A pointer to the register save area in which to save the floating point @@ -72,8 +72,8 @@ ************************************************************************************/ .thumb_func - .type up_savefpu, function -up_savefpu: + .type arm_savefpu, function +arm_savefpu: add r1, r0, #(4*REG_S0) /* R1=Address of FP register storage */ @@ -155,17 +155,17 @@ up_savefpu: #endif bx lr - .size up_savefpu, .-up_savefpu + .size arm_savefpu, .-arm_savefpu /************************************************************************************ - * Name: up_restorefpu + * Name: arm_restorefpu * * Description: * Given the pointer to a register save area (in R0), restore the state of the * floating point registers. * * C Function Prototype: - * void up_restorefpu(const uint32_t *regs); + * void arm_restorefpu(const uint32_t *regs); * * Input Parameters: * regs - A pointer to the register save area containing the floating point @@ -178,8 +178,8 @@ up_savefpu: ************************************************************************************/ .thumb_func - .type up_restorefpu, function -up_restorefpu: + .type arm_restorefpu, function +arm_restorefpu: add r1, r0, #(4*REG_S0) /* R1=Address of FP register storage */ @@ -265,6 +265,6 @@ up_restorefpu: #endif bx lr - .size up_restorefpu, .-up_restorefpu + .size arm_restorefpu, .-arm_restorefpu #endif /* CONFIG_ARCH_FPU */ .end diff --git a/arch/arm/src/armv8-m/arm_hardfault.c b/arch/arm/src/armv8-m/arm_hardfault.c index 9e88bbe2f28..8ff247834ec 100755 --- a/arch/arm/src/armv8-m/arm_hardfault.c +++ b/arch/arm/src/armv8-m/arm_hardfault.c @@ -63,7 +63,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_hardfault + * Name: arm_hardfault * * Description: * This is Hard Fault exception handler. It also catches SVC call @@ -71,7 +71,7 @@ * ****************************************************************************/ -int up_hardfault(int irq, FAR void *context, FAR void *arg) +int arm_hardfault(int irq, FAR void *context, FAR void *arg) { /* Get the value of the program counter where the fault occurred */ @@ -112,7 +112,7 @@ int up_hardfault(int irq, FAR void *context, FAR void *arg) if (insn == INSN_SVC0) { hfinfo("Forward SVCall\n"); - return up_svcall(irq, context, arg); + return arm_svcall(irq, context, arg); } } #endif diff --git a/arch/arm/src/armv8-m/arm_lazyexception.S b/arch/arm/src/armv8-m/arm_lazyexception.S index 29514477be9..2bb1093b46f 100755 --- a/arch/arm/src/armv8-m/arm_lazyexception.S +++ b/arch/arm/src/armv8-m/arm_lazyexception.S @@ -174,7 +174,7 @@ exception_common: stmdb sp!, {r2-r11} /* Save the remaining registers plus the SP value */ #endif - /* There are two arguments to up_doirq: + /* There are two arguments to arm_doirq: * * R0 = The IRQ number * R1 = The top of the stack points to the saved state @@ -205,10 +205,10 @@ exception_common: #endif - bl up_doirq /* R0=IRQ, R1=register save (msp) */ + bl arm_doirq /* R0=IRQ, R1=register save (msp) */ mov r1, r4 /* Recover R1=main stack pointer */ - /* On return from up_doirq, R0 will hold a pointer to register context + /* On return from arm_doirq, R0 will hold a pointer to register context * array to use for the interrupt return. If that return value is the same * as current stack pointer, then things are relatively easy. */ @@ -227,12 +227,12 @@ exception_common: * Here: * r0 = Address of the register save area * - * NOTE: It is a requirement that up_restorefpu() preserve the value of + * NOTE: It is a requirement that arm_restorefpu() preserve the value of * r0! */ #ifdef CONFIG_ARCH_FPU - bl up_restorefpu /* Restore the FPU registers */ + bl arm_restorefpu /* Restore the FPU registers */ #endif /* We are returning with a pending context switch. This case is different diff --git a/arch/arm/src/armv8-m/arm_memfault.c b/arch/arm/src/armv8-m/arm_memfault.c index 7c1c2812d01..b9f0b1fddd1 100755 --- a/arch/arm/src/armv8-m/arm_memfault.c +++ b/arch/arm/src/armv8-m/arm_memfault.c @@ -50,7 +50,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_memfault + * Name: arm_memfault * * Description: * This is Memory Management Fault exception handler. Normally we get @@ -60,7 +60,7 @@ * ****************************************************************************/ -int up_memfault(int irq, FAR void *context, FAR void *arg) +int arm_memfault(int irq, FAR void *context, FAR void *arg) { /* Dump some memory management fault info */ diff --git a/arch/arm/src/armv8-m/arm_schedulesigaction.c b/arch/arm/src/armv8-m/arm_schedulesigaction.c index da5e1698a1f..32f61e92d18 100755 --- a/arch/arm/src/armv8-m/arm_schedulesigaction.c +++ b/arch/arm/src/armv8-m/arm_schedulesigaction.c @@ -144,7 +144,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * privileged thread mode. */ - CURRENT_REGS[REG_PC] = (uint32_t)up_sigdeliver; + CURRENT_REGS[REG_PC] = (uint32_t)arm_sigdeliver; #ifdef CONFIG_ARMV8M_USEBASEPRI CURRENT_REGS[REG_BASEPRI] = NVIC_SYSH_DISABLE_PRIORITY; #else @@ -191,7 +191,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * here. */ - tcb->xcp.regs[REG_PC] = (uint32_t)up_sigdeliver; + tcb->xcp.regs[REG_PC] = (uint32_t)arm_sigdeliver; #ifdef CONFIG_ARMV8M_USEBASEPRI tcb->xcp.regs[REG_BASEPRI] = NVIC_SYSH_DISABLE_PRIORITY; #else @@ -299,7 +299,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * to be here. */ - tcb->xcp.regs[REG_PC] = (uint32_t)up_sigdeliver; + tcb->xcp.regs[REG_PC] = (uint32_t)arm_sigdeliver; #ifdef CONFIG_ARMV8M_USEBASEPRI tcb->xcp.regs[REG_BASEPRI] = NVIC_SYSH_DISABLE_PRIORITY; #else @@ -337,7 +337,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * privileged thread mode. */ - CURRENT_REGS[REG_PC] = (uint32_t)up_sigdeliver; + CURRENT_REGS[REG_PC] = (uint32_t)arm_sigdeliver; #ifdef CONFIG_ARMV8M_USEBASEPRI CURRENT_REGS[REG_BASEPRI] = NVIC_SYSH_DISABLE_PRIORITY; #else @@ -367,7 +367,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * field. This is logically equivalent to * enter_critical_section(). The matching call to * leave_critical_section() will be performed in - * up_sigdeliver(). + * arm_sigdeliver(). */ spin_setbit(&g_cpu_irqset, cpu, &g_cpu_irqsetlock, @@ -417,7 +417,7 @@ void up_schedule_sigaction(struct tcb_s *tcb, sig_deliver_t sigdeliver) * here. */ - tcb->xcp.regs[REG_PC] = (uint32_t)up_sigdeliver; + tcb->xcp.regs[REG_PC] = (uint32_t)arm_sigdeliver; #ifdef CONFIG_ARMV8M_USEBASEPRI tcb->xcp.regs[REG_BASEPRI] = NVIC_SYSH_DISABLE_PRIORITY; #else diff --git a/arch/arm/src/armv8-m/arm_sigdeliver.c b/arch/arm/src/armv8-m/arm_sigdeliver.c index 0a9a1c78248..d0a764fec4a 100755 --- a/arch/arm/src/armv8-m/arm_sigdeliver.c +++ b/arch/arm/src/armv8-m/arm_sigdeliver.c @@ -42,7 +42,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_sigdeliver + * Name: arm_sigdeliver * * Description: * This is the a signal handling trampoline. When a signal action was @@ -51,7 +51,7 @@ * ****************************************************************************/ -void up_sigdeliver(void) +void arm_sigdeliver(void) { struct tcb_s *rtcb = this_task(); uint32_t regs[XCPTCONTEXT_REGS]; diff --git a/arch/arm/src/armv8-m/arm_svcall.c b/arch/arm/src/armv8-m/arm_svcall.c index 9aa6c2c1835..5232cc77dec 100755 --- a/arch/arm/src/armv8-m/arm_svcall.c +++ b/arch/arm/src/armv8-m/arm_svcall.c @@ -117,14 +117,14 @@ static void dispatch_syscall(void) ****************************************************************************/ /**************************************************************************** - * Name: up_svcall + * Name: arm_svcall * * Description: * This is SVCall exception handler that performs context switching * ****************************************************************************/ -int up_svcall(int irq, FAR void *context, FAR void *arg) +int arm_svcall(int irq, FAR void *context, FAR void *arg) { uint32_t *regs = (uint32_t *)context; uint32_t cmd; @@ -179,7 +179,7 @@ int up_svcall(int irq, FAR void *context, FAR void *arg) DEBUGASSERT(regs[REG_R1] != 0); memcpy((uint32_t *)regs[REG_R1], regs, XCPTCONTEXT_SIZE); #if defined(CONFIG_ARCH_FPU) && defined(CONFIG_ARMV8M_LAZYFPU) - up_savefpu((uint32_t *)regs[REG_R1]); + arm_savefpu((uint32_t *)regs[REG_R1]); #endif } break; @@ -229,7 +229,7 @@ int up_svcall(int irq, FAR void *context, FAR void *arg) DEBUGASSERT(regs[REG_R1] != 0 && regs[REG_R2] != 0); memcpy((uint32_t *)regs[REG_R1], regs, XCPTCONTEXT_SIZE); #if defined(CONFIG_ARCH_FPU) && defined(CONFIG_ARMV8M_LAZYFPU) - up_savefpu((uint32_t *)regs[REG_R1]); + arm_savefpu((uint32_t *)regs[REG_R1]); #endif CURRENT_REGS = (uint32_t *)regs[REG_R2]; } diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c index 72ae393b18a..993319eb12d 100644 --- a/arch/arm/src/c5471/c5471_ethernet.c +++ b/arch/arm/src/c5471/c5471_ethernet.c @@ -2426,7 +2426,7 @@ static void c5471_macassign(struct c5471_driver_s *priv) /* Initialize the DM90x0 chip and driver */ -void up_netinitialize(void) +void arm_netinitialize(void) { /* Attach the IRQ to the driver */ diff --git a/arch/arm/src/c5471/c5471_irq.c b/arch/arm/src/c5471/c5471_irq.c index 36d087e31c5..744ba6bc333 100644 --- a/arch/arm/src/c5471/c5471_irq.c +++ b/arch/arm/src/c5471/c5471_irq.c @@ -84,13 +84,13 @@ extern int _svectors; /* Type does not matter */ static up_vector_t g_vectorinittab[] = { (up_vector_t)NULL, - up_vectorundefinsn, - up_vectorswi, - up_vectorprefetch, - up_vectordata, - up_vectoraddrexcptn, - up_vectorirq, - up_vectorfiq + arm_vectorundefinsn, + arm_vectorswi, + arm_vectorprefetch, + arm_vectordata, + arm_vectoraddrexcptn, + arm_vectorirq, + arm_vectorfiq }; #define NVECTORS ((sizeof(g_vectorinittab)) / sizeof(up_vector_t)) @@ -224,14 +224,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the interrupt * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { uint32_t reg; diff --git a/arch/arm/src/c5471/c5471_lowputc.S b/arch/arm/src/c5471/c5471_lowputc.S index d95408c0b5c..8c5b7ea8290 100644 --- a/arch/arm/src/c5471/c5471_lowputc.S +++ b/arch/arm/src/c5471/c5471_lowputc.S @@ -72,7 +72,7 @@ **************************************************************************/ /************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc **************************************************************************/ /* This assembly language version has the advantage that it can does not @@ -81,9 +81,9 @@ */ .text - .global up_lowputc - .type up_lowputc, function -up_lowputc: + .global arm_lowputc + .type arm_lowputc, function +arm_lowputc: /* On entry, r0 holds the character to be printed */ #ifdef CONFIG_SERIAL_IRDA_CONSOLE diff --git a/arch/arm/src/c5471/c5471_serial.c b/arch/arm/src/c5471/c5471_serial.c index 0bea6f732e0..8c9f2018b6d 100644 --- a/arch/arm/src/c5471/c5471_serial.c +++ b/arch/arm/src/c5471/c5471_serial.c @@ -795,16 +795,16 @@ static bool up_txempty(struct uart_dev_s *dev) #ifdef USE_EARLYSERIALINIT /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Performs the low level UART initialization early in * debug so that the serial console will be available - * during bootup. This must be called before up_serialinit. + * during bootup. This must be called before arm_serialinit. * ****************************************************************************/ -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { up_disableuartint(TTYS0_DEV.priv, NULL); up_disableuartint(TTYS1_DEV.priv, NULL); @@ -815,15 +815,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes - * that up_earlyserialinit was called previously. + * that arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { uart_register("/dev/console", &CONSOLE_DEV); uart_register("/dev/ttyS0", &TTYS0_DEV); diff --git a/arch/arm/src/c5471/c5471_vectors.S b/arch/arm/src/c5471/c5471_vectors.S index 38dd03fd335..95f4357a771 100644 --- a/arch/arm/src/c5471/c5471_vectors.S +++ b/arch/arm/src/c5471/c5471_vectors.S @@ -80,16 +80,16 @@ g_aborttmp: .text /************************************************************************************ - * Name: up_vectorirq + * Name: arm_vectorirq * * Description: * Interrupt exception. Entered in IRQ mode with spsr = SVC * CPSR, lr = SVC PC ************************************************************************************/ - .globl up_vectorirq - .type up_vectorirq, %function -up_vectorirq: + .globl arm_vectorirq + .type arm_vectorirq, %function +arm_vectorirq: /* On entry, we are in IRQ mode. We are free to use * the IRQ mode r13 and r14. * @@ -163,10 +163,10 @@ up_vectorirq: #if CONFIG_ARCH_INTERRUPTSTACK > 3 ldr sp, .Lirqstackbase /* SP = interrupt stack base */ str r1, [sp] /* Save the user stack pointer */ - bl up_doirq /* Call the handler */ + bl arm_doirq /* Call the handler */ ldr sp, [sp] /* Restore the user stack pointer */ #else - bl up_doirq /* Call the handler */ + bl arm_doirq /* Call the handler */ #endif /* Restore the CPSR, SVC modr registers and return */ @@ -184,15 +184,15 @@ up_vectorirq: .align 5 /************************************************************************************ - * Function: up_vectorswi + * Function: arm_vectorswi * * Description: * SWI interrupt. We enter the SWI in SVC mode ************************************************************************************/ - .globl up_vectorswi - .type up_vectorswi, %function -up_vectorswi: + .globl arm_vectorswi + .type arm_vectorswi, %function +arm_vectorswi: /* The c547x rrload bootloader intemediates all * interrupts. For the* case of the SWI, it mucked @@ -221,12 +221,12 @@ up_vectorswi: stmia r0, {r1-r4} /* Then call the SWI handler with interrupt disabled. - * void up_syscall(struct xcptcontext *xcp) + * void arm_syscall(struct xcptcontext *xcp) */ mov fp, #0 /* Init frame pointer */ mov r0, sp /* Get r0=xcp */ - bl up_syscall /* Call the handler */ + bl arm_syscall /* Call the handler */ /* Restore the CPSR, SVC modr registers and return */ @@ -237,7 +237,7 @@ up_vectorswi: .align 5 /************************************************************************************ - * Name: up_vectordata + * Name: arm_vectordata * * Description: * Data abort Exception dispatcher. Give control to data @@ -246,9 +246,9 @@ up_vectorswi: * ************************************************************************************/ - .globl up_vectordata - .type up_vectordata, %function -up_vectordata: + .globl arm_vectordata + .type arm_vectordata, %function +arm_vectordata: /* On entry we are free to use the ABORT mode registers * r13 and r14 */ @@ -286,12 +286,12 @@ up_vectordata: stmia r0, {r1-r4} /* Then call the data abort handler with interrupt disabled. - * void up_dataabort(struct xcptcontext *xcp) + * void arm_dataabort(struct xcptcontext *xcp) */ mov fp, #0 /* Init frame pointer */ mov r0, sp /* Get r0=xcp */ - bl up_dataabort /* Call the handler */ + bl arm_dataabort /* Call the handler */ /* Restore the CPSR, SVC modr registers and return */ @@ -305,16 +305,16 @@ up_vectordata: .align 5 /************************************************************************************ - * Name: up_vectorprefetch + * Name: arm_vectorprefetch * * Description: * Prefetch abort exception. Entered in ABT mode with * spsr = SVC CPSR, lr = SVC PC ************************************************************************************/ - .globl up_vectorprefetch - .type up_vectorprefetch, %function -up_vectorprefetch: + .globl arm_vectorprefetch + .type arm_vectorprefetch, %function +arm_vectorprefetch: /* On entry we are free to use the ABORT mode registers * r13 and r14 */ @@ -352,12 +352,12 @@ up_vectorprefetch: stmia r0, {r1-r4} /* Then call the prefetch abort handler with interrupt disabled. - * void up_prefetchabort(struct xcptcontext *xcp) + * void arm_prefetchabort(struct xcptcontext *xcp) */ mov fp, #0 /* Init frame pointer */ mov r0, sp /* Get r0=xcp */ - bl up_prefetchabort /* Call the handler */ + bl arm_prefetchabort /* Call the handler */ /* Restore the CPSR, SVC modr registers and return */ @@ -371,7 +371,7 @@ up_vectorprefetch: .align 5 /************************************************************************************ - * Name: up_vectorundefinsn + * Name: arm_vectorundefinsn * * Description: * Undefined instruction entry exception. Entered in @@ -379,9 +379,9 @@ up_vectorprefetch: * ************************************************************************************/ - .globl up_vectorundefinsn - .type up_vectorundefinsn, %function -up_vectorundefinsn: + .globl arm_vectorundefinsn + .type arm_vectorundefinsn, %function +arm_vectorundefinsn: /* On entry we are free to use the UND mode registers * r13 and r14 */ @@ -418,12 +418,12 @@ up_vectorundefinsn: stmia r0, {r1-r4} /* Then call the undef insn handler with interrupt disabled. - * void up_undefinedinsn(struct xcptcontext *xcp) + * void arm_undefinedinsn(struct xcptcontext *xcp) */ mov fp, #0 /* Init frame pointer */ mov r0, sp /* Get r0=xcp */ - bl up_undefinedinsn /* Call the handler */ + bl arm_undefinedinsn /* Call the handler */ /* Restore the CPSR, SVC modr registers and return */ @@ -437,15 +437,15 @@ up_vectorundefinsn: .align 5 /************************************************************************************ - * Name: up_vectorfiq + * Name: arm_vectorfiq * * Description: * Shouldn't happen ************************************************************************************/ - .globl up_vectorfiq - .type up_vectorfiq, %function -up_vectorfiq: + .globl arm_vectorfiq + .type arm_vectorfiq, %function +arm_vectorfiq: subs pc, lr, #4 /************************************************************************************ @@ -456,10 +456,10 @@ up_vectorfiq: * ************************************************************************************/ - .globl up_vectoraddrexcptn - .type up_vectoraddrexcptn, %function -up_vectoraddrexcptn: - b up_vectoraddrexcptn + .globl arm_vectoraddrexcptn + .type arm_vectoraddrexcptn, %function +arm_vectoraddrexcptn: + b arm_vectoraddrexcptn /************************************************************************************ * Name: g_intstackalloc/g_intstackbase diff --git a/arch/arm/src/c5471/c5471_watchdog.c b/arch/arm/src/c5471/c5471_watchdog.c index 63dbe4cdace..32526fd9889 100644 --- a/arch/arm/src/c5471/c5471_watchdog.c +++ b/arch/arm/src/c5471/c5471_watchdog.c @@ -354,10 +354,10 @@ static int wdt_close(struct file *filep) ****************************************************************************/ /**************************************************************************** - * Name: up_wdtinit + * Name: arm_wdtinit ****************************************************************************/ -int up_wdtinit(void) +int arm_wdtinit(void) { int ret; diff --git a/arch/arm/src/common/arm_createstack.c b/arch/arm/src/common/arm_createstack.c index ce3dffd24d5..4600d405e5d 100644 --- a/arch/arm/src/common/arm_createstack.c +++ b/arch/arm/src/common/arm_createstack.c @@ -237,7 +237,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype) sizeof(struct tls_info_s); stack_size = tcb->adj_stack_size - sizeof(struct tls_info_s); - up_stack_color((FAR void *)stack_base, stack_size); + arm_stack_color((FAR void *)stack_base, stack_size); #endif /* CONFIG_STACK_COLORATION */ #else /* CONFIG_TLS */ @@ -247,7 +247,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype) * water marks. */ - up_stack_color(tcb->stack_alloc_ptr, tcb->adj_stack_size); + arm_stack_color(tcb->stack_alloc_ptr, tcb->adj_stack_size); #endif /* CONFIG_STACK_COLORATION */ #endif /* CONFIG_TLS */ @@ -260,7 +260,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype) } /**************************************************************************** - * Name: up_stack_color + * Name: arm_stack_color * * Description: * Write a well know value into the stack @@ -268,7 +268,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype) ****************************************************************************/ #ifdef CONFIG_STACK_COLORATION -void up_stack_color(FAR void *stackbase, size_t nbytes) +void arm_stack_color(FAR void *stackbase, size_t nbytes) { /* Take extra care that we do not write outsize the stack boundaries */ diff --git a/arch/arm/src/common/arm_etherstub.c b/arch/arm/src/common/arm_etherstub.c index 556e7e5c226..3462b57b8c7 100644 --- a/arch/arm/src/common/arm_etherstub.c +++ b/arch/arm/src/common/arm_etherstub.c @@ -46,25 +46,25 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_netinitialize (stub) + * Name: arm_netinitialize (stub) * * Description: - * This is a stub version os up_netinitialize. Normally, up_netinitialize + * This is a stub version os arm_netinitialize. Normally, arm_netinitialize * is defined in board/xyz_network.c for board-specific Ethernet * implementations, or chip/xyx_ethernet.c for chip-specific Ethernet * implementations. The stub version here is used in the corner case where * the network is enable yet there is no Ethernet driver to be initialized. - * In this case, up_initialize will still try to call up_netinitialize() + * In this case, up_initialize will still try to call arm_netinitialize() * when one does not exist. This corner case would occur if, for example, * only a USB network interface is being used or perhaps if a SLIP is * being used). * * Use of this stub is deprecated. The preferred mechanism is to use - * CONFIG_NETDEV_LATEINIT=y to suppress the call to up_netinitialize() in + * CONFIG_NETDEV_LATEINIT=y to suppress the call to arm_netinitialize() in * up_initialize(). Then this stub would not be needed. * ****************************************************************************/ -void up_netinitialize(void) +void arm_netinitialize(void) { } diff --git a/arch/arm/src/common/arm_initialize.c b/arch/arm/src/common/arm_initialize.c index 2afa2eb5b08..92c5d85d57c 100644 --- a/arch/arm/src/common/arm_initialize.c +++ b/arch/arm/src/common/arm_initialize.c @@ -112,7 +112,7 @@ void up_initialize(void) /* Add any extra memory fragments to the memory manager */ - up_addregion(); + arm_addregion(); #ifdef CONFIG_PM /* Initialize the power management subsystem. This MCU-specific function @@ -121,19 +121,19 @@ void up_initialize(void) * with the power management subsystem). */ - up_pminitialize(); + arm_pminitialize(); #endif #ifdef CONFIG_ARCH_DMA - /* Initialize the DMA subsystem if the weak function up_dma_initialize has + /* Initialize the DMA subsystem if the weak function arm_dma_initialize has * been brought into the build */ #ifdef CONFIG_HAVE_WEAKFUNCTIONS - if (up_dma_initialize) + if (arm_dma_initialize) #endif { - up_dma_initialize(); + arm_dma_initialize(); } #endif @@ -167,7 +167,7 @@ void up_initialize(void) /* Initialize the serial device driver */ #ifdef USE_SERIALDRIVER - up_serialinit(); + arm_serialinit(); #endif #ifdef CONFIG_RPMSG_UART @@ -203,7 +203,7 @@ void up_initialize(void) #ifndef CONFIG_NETDEV_LATEINIT /* Initialize the network */ - up_netinitialize(); + arm_netinitialize(); #endif #ifdef CONFIG_NET_LOOPBACK @@ -227,11 +227,11 @@ void up_initialize(void) #if defined(CONFIG_USBDEV) || defined(CONFIG_USBHOST) /* Initialize USB -- device and/or host */ - up_usbinitialize(); + arm_usbinitialize(); #endif /* Initialize the L2 cache if present and selected */ - up_l2ccinitialize(); + arm_l2ccinitialize(); board_autoled_on(LED_IRQSENABLED); } diff --git a/arch/arm/src/common/arm_internal.h b/arch/arm/src/common/arm_internal.h index 5adf2268447..c4055255fa0 100644 --- a/arch/arm/src/common/arm_internal.h +++ b/arch/arm/src/common/arm_internal.h @@ -298,21 +298,21 @@ void arm_copyfullstate(uint32_t *dest, uint32_t *src); #ifdef CONFIG_ARCH_FPU void arm_copyarmstate(uint32_t *dest, uint32_t *src); #endif -void up_decodeirq(uint32_t *regs); +uint32_t *arm_decodeirq(uint32_t *regs); int arm_saveusercontext(uint32_t *saveregs); void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function; void arm_switchcontext(uint32_t *saveregs, uint32_t *restoreregs); /* Signal handling **********************************************************/ -void up_sigdeliver(void); +void arm_sigdeliver(void); /* Power management *********************************************************/ #ifdef CONFIG_PM -void up_pminitialize(void); +void arm_pminitialize(void); #else -# define up_pminitialize() +# define arm_pminitialize() #endif /* Interrupt handling *******************************************************/ @@ -324,17 +324,17 @@ void up_pminitialize(void); /* Interrupt acknowledge and dispatch */ -void up_ack_irq(int irq); -uint32_t *up_doirq(int irq, uint32_t *regs); +void arm_ack_irq(int irq); +uint32_t *arm_doirq(int irq, uint32_t *regs); /* Exception Handlers */ -int up_svcall(int irq, FAR void *context, FAR void *arg); -int up_hardfault(int irq, FAR void *context, FAR void *arg); +int arm_svcall(int irq, FAR void *context, FAR void *arg); +int arm_hardfault(int irq, FAR void *context, FAR void *arg); # if defined(CONFIG_ARCH_ARMV7M) || defined(CONFIG_ARCH_ARMV8M) -int up_memfault(int irq, FAR void *context, FAR void *arg); +int arm_memfault(int irq, FAR void *context, FAR void *arg); # endif /* CONFIG_ARCH_CORTEXM3,4,7 */ @@ -354,7 +354,7 @@ uint32_t *arm_doirq(int irq, uint32_t *regs); void arm_pginitialize(void); uint32_t *arm_va2pte(uintptr_t vaddr); #else /* CONFIG_PAGING */ -# define up_pginitialize() +# define arm_pginitialize() #endif /* CONFIG_PAGING */ /* Exception Handlers */ @@ -370,58 +370,58 @@ uint32_t *arm_undefinedinsn(uint32_t *regs); /* Interrupt acknowledge and dispatch */ -void up_ack_irq(int irq); -void up_doirq(int irq, uint32_t *regs); +void arm_ack_irq(int irq); +void arm_doirq(int irq, uint32_t *regs); /* Paging support (and exception handlers) */ #ifdef CONFIG_PAGING -void up_pginitialize(void); -uint32_t *up_va2pte(uintptr_t vaddr); -void up_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr); +void arm_pginitialize(void); +uint32_t *arm_va2pte(uintptr_t vaddr); +void arm_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr); #else /* CONFIG_PAGING */ -# define up_pginitialize() -void up_dataabort(uint32_t *regs); +# define arm_pginitialize() +void arm_dataabort(uint32_t *regs); #endif /* CONFIG_PAGING */ /* Exception handlers */ -void up_prefetchabort(uint32_t *regs); -void up_syscall(uint32_t *regs); -void up_undefinedinsn(uint32_t *regs); +void arm_prefetchabort(uint32_t *regs); +void arm_syscall(uint32_t *regs); +void arm_undefinedinsn(uint32_t *regs); #endif /* CONFIG_ARCH_CORTEXM0,3,4,7 */ -void up_vectorundefinsn(void); -void up_vectorswi(void); -void up_vectorprefetch(void); -void up_vectordata(void); -void up_vectoraddrexcptn(void); -void up_vectorirq(void); -void up_vectorfiq(void); +void arm_vectorundefinsn(void); +void arm_vectorswi(void); +void arm_vectorprefetch(void); +void arm_vectordata(void); +void arm_vectoraddrexcptn(void); +void arm_vectorirq(void); +void arm_vectorfiq(void); /* Floating point unit ******************************************************/ #ifdef CONFIG_ARCH_FPU -void up_savefpu(uint32_t *regs); -void up_restorefpu(const uint32_t *regs); +void arm_savefpu(uint32_t *regs); +void arm_restorefpu(const uint32_t *regs); #else -# define up_savefpu(regs) -# define up_restorefpu(regs) +# define arm_savefpu(regs) +# define arm_restorefpu(regs) #endif /* Low level serial output **************************************************/ -void up_lowputc(char ch); +void arm_lowputc(char ch); void up_puts(const char *str); -void up_lowputs(const char *str); +void arm_lowputs(const char *str); #ifdef USE_SERIALDRIVER -void up_serialinit(void); +void arm_serialinit(void); #endif #ifdef USE_EARLYSERIALINIT -void up_earlyserialinit(void); +void arm_earlyserialinit(void); #endif #ifdef CONFIG_RPMSG_UART @@ -437,28 +437,28 @@ void lwlconsole_init(void); /* DMA **********************************************************************/ #ifdef CONFIG_ARCH_DMA -void weak_function up_dma_initialize(void); +void weak_function arm_dma_initialize(void); #endif /* Cache control ************************************************************/ #ifdef CONFIG_ARCH_L2CACHE -void up_l2ccinitialize(void); +void arm_l2ccinitialize(void); #else -# define up_l2ccinitialize() +# define arm_l2ccinitialize() #endif /* Memory management ********************************************************/ #if CONFIG_MM_REGIONS > 1 -void up_addregion(void); +void arm_addregion(void); #else -# define up_addregion() +# define arm_addregion() #endif /* Watchdog timer ***********************************************************/ -void up_wdtinit(void); +void arm_wdtinit(void); /* Networking ***************************************************************/ @@ -468,29 +468,29 @@ void up_wdtinit(void); * network is enabled yet there is no Ethernet driver to be initialized. * * Use of common/arm_etherstub.c is deprecated. The preferred mechanism is - * to use CONFIG_NETDEV_LATEINIT=y to suppress the call to up_netinitialize() + * to use CONFIG_NETDEV_LATEINIT=y to suppress the call to arm_netinitialize() * in up_initialize(). Then this stub would not be needed. */ #if defined(CONFIG_NET) && !defined(CONFIG_NETDEV_LATEINIT) -void up_netinitialize(void); +void arm_netinitialize(void); #else -# define up_netinitialize() +# define arm_netinitialize() #endif /* USB **********************************************************************/ #ifdef CONFIG_USBDEV -void up_usbinitialize(void); -void up_usbuninitialize(void); +void arm_usbinitialize(void); +void arm_usbuninitialize(void); #else -# define up_usbinitialize() -# define up_usbuninitialize() +# define arm_usbinitialize() +# define arm_usbuninitialize() #endif /* Debug ********************************************************************/ #ifdef CONFIG_STACK_COLORATION -void up_stack_color(FAR void *stackbase, size_t nbytes); +void arm_stack_color(FAR void *stackbase, size_t nbytes); #endif #undef EXTERN diff --git a/arch/arm/src/common/arm_lowputs.c b/arch/arm/src/common/arm_lowputs.c index 8a75b88eeca..080160e982b 100644 --- a/arch/arm/src/common/arm_lowputs.c +++ b/arch/arm/src/common/arm_lowputs.c @@ -46,17 +46,17 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_lowputs + * Name: arm_lowputs * * Description: * This is a low-level helper function used to support debug. * ****************************************************************************/ -void up_lowputs(const char *str) +void arm_lowputs(const char *str) { while (*str) { - up_lowputc(*str++); + arm_lowputc(*str++); } } diff --git a/arch/arm/src/common/arm_usestack.c b/arch/arm/src/common/arm_usestack.c index 06e81be9a0a..0d44322cbfa 100644 --- a/arch/arm/src/common/arm_usestack.c +++ b/arch/arm/src/common/arm_usestack.c @@ -149,11 +149,11 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size) */ #ifdef CONFIG_TLS - up_stack_color((FAR void *)((uintptr_t)tcb->stack_alloc_ptr + + arm_stack_color((FAR void *)((uintptr_t)tcb->stack_alloc_ptr + sizeof(struct tls_info_s)), tcb->adj_stack_size - sizeof(struct tls_info_s)); #else - up_stack_color(tcb->stack_alloc_ptr, tcb->adj_stack_size); + arm_stack_color(tcb->stack_alloc_ptr, tcb->adj_stack_size); #endif #endif diff --git a/arch/arm/src/cxd56xx/cxd56_cpustart.c b/arch/arm/src/cxd56xx/cxd56_cpustart.c index 0f75a990a89..9da519c1064 100644 --- a/arch/arm/src/cxd56xx/cxd56_cpustart.c +++ b/arch/arm/src/cxd56xx/cxd56_cpustart.c @@ -71,7 +71,7 @@ #endif #ifdef CONFIG_DEBUG_FEATURES -# define showprogress(c) up_lowputc(c) +# define showprogress(c) arm_lowputc(c) #else # define showprogress(c) #endif diff --git a/arch/arm/src/cxd56xx/cxd56_dmac.c b/arch/arm/src/cxd56xx/cxd56_dmac.c index cbe3031b9d5..7deb5a376aa 100644 --- a/arch/arm/src/cxd56xx/cxd56_dmac.c +++ b/arch/arm/src/cxd56xx/cxd56_dmac.c @@ -726,7 +726,7 @@ static int dma_stop(int ch) * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { int i; diff --git a/arch/arm/src/cxd56xx/cxd56_irq.c b/arch/arm/src/cxd56xx/cxd56_irq.c index bd1fc5d6938..e776c23f871 100644 --- a/arch/arm/src/cxd56xx/cxd56_irq.c +++ b/arch/arm/src/cxd56xx/cxd56_irq.c @@ -358,8 +358,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(CXD56_IRQ_SVCALL, up_svcall, NULL); - irq_attach(CXD56_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(CXD56_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(CXD56_IRQ_HARDFAULT, arm_hardfault, NULL); /* Set the priority of the SVCall interrupt */ @@ -378,7 +378,7 @@ void up_irqinitialize(void) */ #ifdef CONFIG_ARM_MPU - irq_attach(CXD56_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(CXD56_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(CXD56_IRQ_MEMFAULT); #endif @@ -387,7 +387,7 @@ void up_irqinitialize(void) #ifdef CONFIG_DEBUG_FEATURES irq_attach(CXD56_IRQ_NMI, cxd56_nmi, NULL); # ifndef CONFIG_ARM_MPU - irq_attach(CXD56_IRQ_MEMFAULT, up_memfault, NULL); + 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); @@ -538,14 +538,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { /* Check for external interrupt */ diff --git a/arch/arm/src/cxd56xx/cxd56_serial.c b/arch/arm/src/cxd56xx/cxd56_serial.c index b69efcf7f49..fe20703d646 100644 --- a/arch/arm/src/cxd56xx/cxd56_serial.c +++ b/arch/arm/src/cxd56xx/cxd56_serial.c @@ -885,12 +885,12 @@ static bool up_txempty(FAR struct uart_dev_s *dev) ****************************************************************************/ /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Performs the low level UART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * * NOTE: Configuration of the CONSOLE UART was performed by up_lowsetup() * very early in the boot sequence. @@ -898,7 +898,7 @@ static bool up_txempty(FAR struct uart_dev_s *dev) ****************************************************************************/ #ifdef USE_EARLYSERIALINIT -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { /* Configuration whichever one is the console */ @@ -910,15 +910,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes that - * up_earlyserialinit was called previously. + * arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #ifdef CONSOLE_DEV uart_register("/dev/console", &CONSOLE_DEV); @@ -953,10 +953,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #ifdef HAVE_CONSOLE up_restoreuartint(priv, ier); #endif @@ -983,10 +983,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; } diff --git a/arch/arm/src/cxd56xx/cxd56_start.c b/arch/arm/src/cxd56xx/cxd56_start.c index 1460a5bf746..b4b3bddf158 100644 --- a/arch/arm/src/cxd56xx/cxd56_start.c +++ b/arch/arm/src/cxd56xx/cxd56_start.c @@ -114,7 +114,7 @@ static void go_nx_start(void *pv, unsigned int nbytes) ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -# define showprogress(c) up_lowputc(c) +# define showprogress(c) arm_lowputc(c) #else # define showprogress(c) #endif @@ -330,7 +330,7 @@ void __start(void) /* Perform early serial initialization */ #ifdef USE_EARLYSERIALINIT - up_earlyserialinit(); + arm_earlyserialinit(); #endif showprogress('E'); diff --git a/arch/arm/src/cxd56xx/cxd56_uart.c b/arch/arm/src/cxd56xx/cxd56_uart.c index 57629e984ed..13f507fc8d7 100644 --- a/arch/arm/src/cxd56xx/cxd56_uart.c +++ b/arch/arm/src/cxd56xx/cxd56_uart.c @@ -325,14 +325,14 @@ static int cxd56_uart_clockchange(uint8_t id) ****************************************************************************/ /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #if defined HAVE_UART && defined HAVE_CONSOLE /* Wait for the transmitter to be available */ diff --git a/arch/arm/src/cxd56xx/cxd56_usbdev.c b/arch/arm/src/cxd56xx/cxd56_usbdev.c index fc1748b5281..23dd1f64d0a 100644 --- a/arch/arm/src/cxd56xx/cxd56_usbdev.c +++ b/arch/arm/src/cxd56xx/cxd56_usbdev.c @@ -3100,14 +3100,14 @@ static int cxd56_vbusninterrupt(int irq, FAR void *context, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * * Description: * Initialize USB hardware * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { usbtrace(TRACE_DEVINIT, 0); @@ -3155,14 +3155,14 @@ void up_usbinitialize(void) return; errout: - up_usbuninitialize(); + arm_usbuninitialize(); } /**************************************************************************** - * Name: up_usbuninitialize + * Name: arm_usbuninitialize ****************************************************************************/ -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { FAR struct cxd56_usbdev_s *priv = &g_usbdev; irqstate_t flags; diff --git a/arch/arm/src/dm320/dm320_boot.c b/arch/arm/src/dm320/dm320_boot.c index 92f1ec3d21a..a7234519c15 100644 --- a/arch/arm/src/dm320/dm320_boot.c +++ b/arch/arm/src/dm320/dm320_boot.c @@ -231,6 +231,6 @@ void arm_boot(void) /* Perform early serial initialization */ #ifdef USE_EARLYSERIALINIT - up_earlyserialinit(); + arm_earlyserialinit(); #endif } diff --git a/arch/arm/src/dm320/dm320_decodeirq.c b/arch/arm/src/dm320/dm320_decodeirq.c index a2d618b9957..ce0dfee8817 100644 --- a/arch/arm/src/dm320/dm320_decodeirq.c +++ b/arch/arm/src/dm320/dm320_decodeirq.c @@ -1,35 +1,20 @@ /******************************************************************************** * arch/arm/src/dm320/dm320_decodeirq.c * - * Copyright (C) 2007, 2009, 2011, 2014 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * http://www.apache.org/licenses/LICENSE-2.0 * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. * ********************************************************************************/ @@ -55,12 +40,13 @@ * Public Functions ********************************************************************************/ -void up_decodeirq(uint32_t *regs) +uint32_t *arm_decodeirq(uint32_t *regs) { #ifdef CONFIG_SUPPRESS_INTERRUPTS CURRENT_REGS = regs; err("ERROR: Unexpected IRQ\n"); PANIC(); + return NULL; #else /* Decode the interrupt. First, fetch the interrupt id register. */ @@ -80,7 +66,7 @@ void up_decodeirq(uint32_t *regs) { /* Acknowledge the interrupt */ - up_ack_irq(irq); + arm_ack_irq(irq); /* Current regs non-zero indicates that we are processing an interrupt; * CURRENT_REGS is also used to manage interrupt level context switches. @@ -108,7 +94,7 @@ void up_decodeirq(uint32_t *regs) #ifdef CONFIG_ARCH_FPU /* Restore floating point registers */ - up_restorefpu((uint32_t *)CURRENT_REGS); + arm_restorefpu((uint32_t *)CURRENT_REGS); #endif #ifdef CONFIG_ARCH_ADDRENV @@ -131,4 +117,6 @@ void up_decodeirq(uint32_t *regs) } } #endif + + return NULL; /* Return not used in this architecture */ } diff --git a/arch/arm/src/dm320/dm320_irq.c b/arch/arm/src/dm320/dm320_irq.c index 0c0fffe9b8e..2d757b11662 100644 --- a/arch/arm/src/dm320/dm320_irq.c +++ b/arch/arm/src/dm320/dm320_irq.c @@ -207,14 +207,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the interrupt * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { /* Acknowledge the interrupt by setting the corresponding bit in the * IRQ status register. diff --git a/arch/arm/src/dm320/dm320_lowputc.S b/arch/arm/src/dm320/dm320_lowputc.S index 6934375bc23..d5be8e448ed 100644 --- a/arch/arm/src/dm320/dm320_lowputc.S +++ b/arch/arm/src/dm320/dm320_lowputc.S @@ -73,7 +73,7 @@ **************************************************************************/ /************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc **************************************************************************/ /* This assembly language version has the advantage that it can does not @@ -82,9 +82,9 @@ */ .text - .global up_lowputc - .type up_lowputc, function -up_lowputc: + .global arm_lowputc + .type arm_lowputc, function +arm_lowputc: /* On entry, r0 holds the character to be printed */ #ifdef CONFIG_UART1_SERIAL_CONSOLE diff --git a/arch/arm/src/dm320/dm320_serial.c b/arch/arm/src/dm320/dm320_serial.c index 3dd26486913..4cdcbc385ba 100644 --- a/arch/arm/src/dm320/dm320_serial.c +++ b/arch/arm/src/dm320/dm320_serial.c @@ -709,16 +709,16 @@ static bool up_txempty(struct uart_dev_s *dev) #ifdef USE_EARLYSERIALINIT /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level UART initialization early in * debug so that the serial console will be available - * during bootup. This must be called before up_serialinit. + * during bootup. This must be called before arm_serialinit. * ****************************************************************************/ -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { up_disableuartint(TTYS0_DEV.priv, NULL); up_disableuartint(TTYS1_DEV.priv, NULL); @@ -729,15 +729,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes - * that up_earlyserialinit was called previously. + * that arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { uart_register("/dev/console", &CONSOLE_DEV); uart_register("/dev/ttyS0", &TTYS0_DEV); diff --git a/arch/arm/src/dm320/dm320_usbdev.c b/arch/arm/src/dm320/dm320_usbdev.c index 083b4fd4cbf..22dacaaec5b 100644 --- a/arch/arm/src/dm320/dm320_usbdev.c +++ b/arch/arm/src/dm320/dm320_usbdev.c @@ -1867,8 +1867,8 @@ static void dm320_ctrlinitialize(FAR struct dm320_usbdev_s *priv) /* Initialize interrupts *****************************************************/ - up_ack_irq(DM320_IRQ_USB0); /* Clear USB controller interrupt */ - up_ack_irq(DM320_IRQ_USB1); /* Clear USB DMA interrupt flag */ + arm_ack_irq(DM320_IRQ_USB0); /* Clear USB controller interrupt */ + arm_ack_irq(DM320_IRQ_USB1); /* Clear USB DMA interrupt flag */ dm320_getreg8(DM320_USB_INTRTX1); /* Clear TX interrupt */ dm320_getreg8(DM320_USB_INTRRX1); /* Clear RX interrupt */ @@ -2392,14 +2392,14 @@ static int dm320_pullup(struct usbdev_s *dev, bool enable) ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * * Description: * Initialize USB hardware * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { struct dm320_usbdev_s *priv = &g_usbdev; struct dm320_ep_s *privep; @@ -2499,14 +2499,14 @@ void up_usbinitialize(void) return; errout: - up_usbuninitialize(); + arm_usbuninitialize(); } /**************************************************************************** - * Name: up_usbuninitialize + * Name: arm_usbuninitialize ****************************************************************************/ -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { struct dm320_usbdev_s *priv = &g_usbdev; diff --git a/arch/arm/src/efm32/efm32_dma.c b/arch/arm/src/efm32/efm32_dma.c index 02267ff141f..30c929ea153 100644 --- a/arch/arm/src/efm32/efm32_dma.c +++ b/arch/arm/src/efm32/efm32_dma.c @@ -260,7 +260,7 @@ static int efm32_dmac_interrupt(int irq, void *context, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Name: up_dma_initialize + * Name: arm_dma_initialize * * Description: * Initialize the DMA subsystem @@ -270,7 +270,7 @@ static int efm32_dmac_interrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { uint32_t regval; int i; diff --git a/arch/arm/src/efm32/efm32_irq.c b/arch/arm/src/efm32/efm32_irq.c index 1c45822912a..f85c63d9eaf 100644 --- a/arch/arm/src/efm32/efm32_irq.c +++ b/arch/arm/src/efm32/efm32_irq.c @@ -373,8 +373,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(EFM32_IRQ_SVCALL, up_svcall, NULL); - irq_attach(EFM32_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(EFM32_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(EFM32_IRQ_HARDFAULT, arm_hardfault, NULL); /* Set the priority of the SVCall interrupt */ @@ -387,7 +387,7 @@ void up_irqinitialize(void) */ #ifdef CONFIG_ARM_MPU - irq_attach(EFM32_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(EFM32_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(EFM32_IRQ_MEMFAULT); #endif @@ -396,7 +396,7 @@ void up_irqinitialize(void) #ifdef CONFIG_DEBUG_FEATURES irq_attach(EFM32_IRQ_NMI, efm32_nmi, NULL); #ifndef CONFIG_ARM_MPU - irq_attach(EFM32_IRQ_MEMFAULT, up_memfault, NULL); + 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); @@ -513,14 +513,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { } diff --git a/arch/arm/src/efm32/efm32_leserial.c b/arch/arm/src/efm32/efm32_leserial.c index 9915e1e18de..1fef8ec6889 100644 --- a/arch/arm/src/efm32/efm32_leserial.c +++ b/arch/arm/src/efm32/efm32_leserial.c @@ -751,18 +751,18 @@ static bool efm32_txempty(struct uart_dev_s *dev) #ifdef USE_EARLYSERIALINIT /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level UART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. NOTE: This function depends on GPIO pin + * before arm_serialinit. NOTE: This function depends on GPIO pin * configuration performed in efm32_consoleinit() and main clock iniialization * performed in efm32_clkinitialize(). * ****************************************************************************/ -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { /* Disable interrupts from all UARTS. The console is enabled in * pic32mx_consoleinit() @@ -783,15 +783,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes that - * up_earlyserialinit was called previously. + * arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { /* Register the console */ diff --git a/arch/arm/src/efm32/efm32_serial.c b/arch/arm/src/efm32/efm32_serial.c index 7dfa55a9c1d..f149f8236b4 100644 --- a/arch/arm/src/efm32/efm32_serial.c +++ b/arch/arm/src/efm32/efm32_serial.c @@ -1112,19 +1112,19 @@ static bool efm32_txempty(struct uart_dev_s *dev) ****************************************************************************/ /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level UART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. NOTE: This function depends on GPIO pin + * before arm_serialinit. NOTE: This function depends on GPIO pin * configuration performed in efm32_consoleinit() and main clock iniialization * performed in efm32_clkinitialize(). * ****************************************************************************/ #ifdef USE_EARLYSERIALINIT -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { /* Disable interrupts from all UARTS. The console is enabled in * pic32mx_consoleinit() @@ -1154,15 +1154,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes that - * up_earlyserialinit was called previously. + * arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { /* Register the console */ diff --git a/arch/arm/src/efm32/efm32_start.c b/arch/arm/src/efm32/efm32_start.c index 7363fd57236..c683f116a5f 100644 --- a/arch/arm/src/efm32/efm32_start.c +++ b/arch/arm/src/efm32/efm32_start.c @@ -312,7 +312,7 @@ void __start(void) /* Perform early serial initialization */ - up_earlyserialinit(); + arm_earlyserialinit(); showprogress('D'); /* For the case of the separate user-/kernel-space build, perform whatever diff --git a/arch/arm/src/efm32/efm32_usbdev.c b/arch/arm/src/efm32/efm32_usbdev.c index 8c67205ca5b..ff7e2ba6da1 100644 --- a/arch/arm/src/efm32/efm32_usbdev.c +++ b/arch/arm/src/efm32/efm32_usbdev.c @@ -5414,7 +5414,7 @@ static void efm32_hwinitialize(FAR struct efm32_usbdev_s *priv) ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * * Description: * Initialize USB hardware. @@ -5428,7 +5428,7 @@ static void efm32_hwinitialize(FAR struct efm32_usbdev_s *priv) * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { /* At present, there is only a single OTG FS device support. Hence it is * pre-allocated as g_otgfsdev. However, in most code, the private data @@ -5477,7 +5477,7 @@ void up_usbinitialize(void) /* Uninitialize the hardware so that we know that we are starting from a * known state. */ - up_usbuninitialize(); + arm_usbuninitialize(); /* Initialie the driver data structure */ @@ -5510,14 +5510,14 @@ void up_usbinitialize(void) return; errout: - up_usbuninitialize(); + arm_usbuninitialize(); } /**************************************************************************** - * Name: up_usbuninitialize + * Name: arm_usbuninitialize ****************************************************************************/ -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { /* At present, there is only a single OTG FS device support. Hence it is * pre-allocated as g_otgfsdev. However, in most code, the private data diff --git a/arch/arm/src/imx1/imx_allocateheap.c b/arch/arm/src/imx1/imx_allocateheap.c index 7a091354b97..c64b6f5010e 100644 --- a/arch/arm/src/imx1/imx_allocateheap.c +++ b/arch/arm/src/imx1/imx_allocateheap.c @@ -79,7 +79,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) } /**************************************************************************** - * Name: up_addregion + * Name: arm_addregion * * Description: * Memory may be added in non-contiguous chunks. Additional chunks are @@ -88,7 +88,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) ****************************************************************************/ #if CONFIG_MM_REGIONS > 1 -void up_addregion(void) +void arm_addregion(void) { /* If a bootloader that copies us to DRAM, but not to the beginning of DRAM, * then recover that memory by adding another memory region. diff --git a/arch/arm/src/imx1/imx_boot.c b/arch/arm/src/imx1/imx_boot.c index 3251006102b..3796dff8fe6 100644 --- a/arch/arm/src/imx1/imx_boot.c +++ b/arch/arm/src/imx1/imx_boot.c @@ -222,6 +222,6 @@ void arm_boot(void) /* Perform early serial initialization */ #ifdef USE_EARLYSERIALINIT - up_earlyserialinit(); + arm_earlyserialinit(); #endif } diff --git a/arch/arm/src/imx1/imx_decodeirq.c b/arch/arm/src/imx1/imx_decodeirq.c index 30b0cb1e9c8..950432dc029 100644 --- a/arch/arm/src/imx1/imx_decodeirq.c +++ b/arch/arm/src/imx1/imx_decodeirq.c @@ -1,35 +1,20 @@ /******************************************************************************** * arch/arm/src/imx1/imx_decodeirq.c * - * Copyright (C) 2009, 2011, 2014 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * http://www.apache.org/licenses/LICENSE-2.0 * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. * ********************************************************************************/ @@ -71,12 +56,13 @@ * Public Functions ********************************************************************************/ -void up_decodeirq(uint32_t *regs) +uint32_t *arm_decodeirq(uint32_t *regs) { #ifdef CONFIG_SUPPRESS_INTERRUPTS CURRENT_REGS = regs; err("ERROR: Unexpected IRQ\n"); PANIC(); + return NULL; #else uint32_t regval; int irq; @@ -127,7 +113,7 @@ void up_decodeirq(uint32_t *regs) #ifdef CONFIG_ARCH_FPU /* Restore floating point registers */ - up_restorefpu((uint32_t *)CURRENT_REGS); + arm_restorefpu((uint32_t *)CURRENT_REGS); #endif #ifdef CONFIG_ARCH_ADDRENV @@ -150,5 +136,6 @@ void up_decodeirq(uint32_t *regs) */ CURRENT_REGS = NULL; + return NULL; /* Return not used in this architecture */ #endif } diff --git a/arch/arm/src/imx1/imx_lowputc.S b/arch/arm/src/imx1/imx_lowputc.S index 98c5eb5c9b1..0464aa357f6 100644 --- a/arch/arm/src/imx1/imx_lowputc.S +++ b/arch/arm/src/imx1/imx_lowputc.S @@ -73,7 +73,7 @@ **************************************************************************/ /************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc **************************************************************************/ /* This assembly language version has the advantage that it can does not @@ -82,9 +82,9 @@ */ .text - .global up_lowputc - .type up_lowputc, function -up_lowputc: + .global arm_lowputc + .type arm_lowputc, function +arm_lowputc: /* On entry, r0 holds the character to be printed */ #ifdef CONFIG_UART1_SERIAL_CONSOLE diff --git a/arch/arm/src/imx1/imx_serial.c b/arch/arm/src/imx1/imx_serial.c index 6472c7f0ca1..72b59c3f215 100644 --- a/arch/arm/src/imx1/imx_serial.c +++ b/arch/arm/src/imx1/imx_serial.c @@ -1063,16 +1063,16 @@ static bool up_txempty(struct uart_dev_s *dev) #ifdef USE_EARLYSERIALINIT /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level UART initialization early in * debug so that the serial console will be available - * during bootup. This must be called before up_serialinit. + * during bootup. This must be called before arm_serialinit. * ****************************************************************************/ -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { /* Configure and disable the UART1 */ @@ -1132,15 +1132,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes - * that up_earlyserialinit was called previously. + * that arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #ifdef CONSOLE_DEV uart_register("/dev/console", &CONSOLE_DEV); diff --git a/arch/arm/src/imx6/imx_serial.c b/arch/arm/src/imx6/imx_serial.c index 05a34c5fcaf..0fa910d60e0 100644 --- a/arch/arm/src/imx6/imx_serial.c +++ b/arch/arm/src/imx6/imx_serial.c @@ -889,7 +889,7 @@ static bool imx_txempty(struct uart_dev_s *dev) * Description: * Performs the low level UART initialization early in * debug so that the serial console will be available - * during bootup. This must be called before up_serialinit. + * during bootup. This must be called before arm_serialinit. * ****************************************************************************/ @@ -911,7 +911,7 @@ void imx_earlyserialinit(void) } /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes @@ -919,7 +919,7 @@ void imx_earlyserialinit(void) * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #ifdef CONSOLE_DEV uart_register("/dev/console", &CONSOLE_DEV); diff --git a/arch/arm/src/imx6/imx_serial.h b/arch/arm/src/imx6/imx_serial.h index a332dd939ea..2b2aa9e936c 100644 --- a/arch/arm/src/imx6/imx_serial.h +++ b/arch/arm/src/imx6/imx_serial.h @@ -82,7 +82,7 @@ extern "C" * Description: * Performs the low level UART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * ****************************************************************************/ @@ -96,7 +96,7 @@ void imx_earlyserialinit(void); * Description: * Performs the low level UART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * ****************************************************************************/ diff --git a/arch/arm/src/imxrt/imxrt_allocateheap.c b/arch/arm/src/imxrt/imxrt_allocateheap.c index ffdfc113fcd..46941c3339b 100644 --- a/arch/arm/src/imxrt/imxrt_allocateheap.c +++ b/arch/arm/src/imxrt/imxrt_allocateheap.c @@ -373,7 +373,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) #endif /**************************************************************************** - * Name: up_addregion + * Name: arm_addregion * * Description: * Memory may be added in non-contiguous chunks. Additional chunks are @@ -382,7 +382,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) ****************************************************************************/ #if CONFIG_MM_REGIONS > 1 -void up_addregion(void) +void arm_addregion(void) { /* Add region 1 to the user heap */ diff --git a/arch/arm/src/imxrt/imxrt_edma.c b/arch/arm/src/imxrt/imxrt_edma.c index fe909b15e40..521ab49552b 100644 --- a/arch/arm/src/imxrt/imxrt_edma.c +++ b/arch/arm/src/imxrt/imxrt_edma.c @@ -709,7 +709,7 @@ static int imxrt_error_interrupt(int irq, void *context, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Name: up_dma_initialize + * Name: arm_dma_initialize * * Description: * Initialize the DMA subsystem @@ -719,7 +719,7 @@ static int imxrt_error_interrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { uintptr_t regaddr; uint32_t regval; diff --git a/arch/arm/src/imxrt/imxrt_enet.c b/arch/arm/src/imxrt/imxrt_enet.c index 101db42263a..6d02134ef75 100644 --- a/arch/arm/src/imxrt/imxrt_enet.c +++ b/arch/arm/src/imxrt/imxrt_enet.c @@ -2578,7 +2578,7 @@ int imxrt_netinitialize(int intf) } /**************************************************************************** - * Name: up_netinitialize + * Name: arm_netinitialize * * Description: * Initialize the first network interface. If there are more than one @@ -2589,7 +2589,7 @@ int imxrt_netinitialize(int intf) ****************************************************************************/ #if CONFIG_IMXRT_ENET_NETHIFS == 1 && !defined(CONFIG_NETDEV_LATEINIT) -void up_netinitialize(void) +void arm_netinitialize(void) { imxrt_netinitialize(0); } diff --git a/arch/arm/src/imxrt/imxrt_enet.h b/arch/arm/src/imxrt/imxrt_enet.h index b519cf266f9..2b087654f1c 100644 --- a/arch/arm/src/imxrt/imxrt_enet.h +++ b/arch/arm/src/imxrt/imxrt_enet.h @@ -70,7 +70,7 @@ extern "C" #endif /************************************************************************************ - * Function: up_netinitialize + * Function: arm_netinitialize * * Description: * Initialize the first network interface. If there are more than one @@ -89,7 +89,7 @@ extern "C" * ************************************************************************************/ -void up_netinitialize(void); +void arm_netinitialize(void); /************************************************************************************ * Function: imxrt_phy_boardinitialize diff --git a/arch/arm/src/imxrt/imxrt_irq.c b/arch/arm/src/imxrt/imxrt_irq.c index c247634b76f..4dbd7e91ba8 100644 --- a/arch/arm/src/imxrt/imxrt_irq.c +++ b/arch/arm/src/imxrt/imxrt_irq.c @@ -459,8 +459,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(IMXRT_IRQ_SVCALL, up_svcall, NULL); - irq_attach(IMXRT_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(IMXRT_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(IMXRT_IRQ_HARDFAULT, arm_hardfault, NULL); /* Set the priority of the SVCall interrupt */ @@ -476,7 +476,7 @@ void up_irqinitialize(void) */ #ifdef CONFIG_ARM_MPU - irq_attach(IMXRT_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(IMXRT_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(IMXRT_IRQ_MEMFAULT); #endif @@ -485,7 +485,7 @@ void up_irqinitialize(void) #ifdef CONFIG_DEBUG_FEATURES irq_attach(IMXRT_IRQ_NMI, imxrt_nmi, NULL); #ifndef CONFIG_ARM_MPU - irq_attach(IMXRT_IRQ_MEMFAULT, up_memfault, NULL); + 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); @@ -617,14 +617,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { } diff --git a/arch/arm/src/imxrt/imxrt_serial.c b/arch/arm/src/imxrt/imxrt_serial.c index 6a9b86ff629..838c0fb06dd 100644 --- a/arch/arm/src/imxrt/imxrt_serial.c +++ b/arch/arm/src/imxrt/imxrt_serial.c @@ -1642,7 +1642,7 @@ static int up_pm_prepare(struct pm_callback_s *cb, int domain, * Description: * Performs the low level UART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * ****************************************************************************/ @@ -1664,7 +1664,7 @@ void imxrt_earlyserialinit(void) } /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes @@ -1672,7 +1672,7 @@ void imxrt_earlyserialinit(void) * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #ifdef CONFIG_PM int ret; @@ -1765,10 +1765,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; diff --git a/arch/arm/src/imxrt/imxrt_serial.h b/arch/arm/src/imxrt/imxrt_serial.h index 3bcc87d1e36..bdb44144d41 100644 --- a/arch/arm/src/imxrt/imxrt_serial.h +++ b/arch/arm/src/imxrt/imxrt_serial.h @@ -82,7 +82,7 @@ extern "C" * Description: * Performs the low level UART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * ****************************************************************************/ diff --git a/arch/arm/src/imxrt/imxrt_usbdev.c b/arch/arm/src/imxrt/imxrt_usbdev.c index 099c4f4ce9f..308957524a2 100644 --- a/arch/arm/src/imxrt/imxrt_usbdev.c +++ b/arch/arm/src/imxrt/imxrt_usbdev.c @@ -2792,7 +2792,7 @@ static int imxrt_pullup(struct usbdev_s *dev, bool enable) ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * * Description: * Initialize USB hardware. @@ -2805,7 +2805,7 @@ static int imxrt_pullup(struct usbdev_s *dev, bool enable) * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { struct imxrt_usbdev_s *priv = &g_usbdev; int i; @@ -2920,10 +2920,10 @@ void up_usbinitialize(void) } /**************************************************************************** - * Name: up_usbuninitialize + * Name: arm_usbuninitialize ****************************************************************************/ -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { struct imxrt_usbdev_s *priv = &g_usbdev; irqstate_t flags; diff --git a/arch/arm/src/kinetis/Make.defs b/arch/arm/src/kinetis/Make.defs index ba36df80d77..ec0c936c399 100644 --- a/arch/arm/src/kinetis/Make.defs +++ b/arch/arm/src/kinetis/Make.defs @@ -86,7 +86,7 @@ CMN_CSRCS += arm_checkstack.c endif # Use of common/arm_etherstub.c is deprecated. The preferred mechanism is to -# use CONFIG_NETDEV_LATEINIT=y to suppress the call to up_netinitialize() in +# use CONFIG_NETDEV_LATEINIT=y to suppress the call to arm_netinitialize() in # up_initialize(). Then this stub would not be needed. ifeq ($(CONFIG_NET),y) diff --git a/arch/arm/src/kinetis/kinetis.h b/arch/arm/src/kinetis/kinetis.h index 573a68cfe13..16290f684a9 100644 --- a/arch/arm/src/kinetis/kinetis.h +++ b/arch/arm/src/kinetis/kinetis.h @@ -360,7 +360,7 @@ void kinetis_clockconfig(void); * Description: * Performs the low level UART/LPUART initialization early in debug so that * the serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * ****************************************************************************/ @@ -374,7 +374,7 @@ void kinetis_earlyserialinit(void); * Description: * Performs the low level UART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * ****************************************************************************/ @@ -388,7 +388,7 @@ void kinetis_uart_earlyserialinit(void); * Description: * Performs the low level LPUART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * ****************************************************************************/ diff --git a/arch/arm/src/kinetis/kinetis_dma.c b/arch/arm/src/kinetis/kinetis_dma.c index 327fd5e54e9..0d9fb4301e3 100644 --- a/arch/arm/src/kinetis/kinetis_dma.c +++ b/arch/arm/src/kinetis/kinetis_dma.c @@ -160,7 +160,7 @@ size_t kinetis_dmaresidual(DMA_HANDLE handle) * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { int i; uint32_t regval; diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c index 56c28b79cfb..c78d98e1990 100644 --- a/arch/arm/src/kinetis/kinetis_enet.c +++ b/arch/arm/src/kinetis/kinetis_enet.c @@ -2255,7 +2255,7 @@ int kinetis_netinitialize(int intf) } /**************************************************************************** - * Name: up_netinitialize + * Name: arm_netinitialize * * Description: * Initialize the first network interface. If there are more than one @@ -2266,7 +2266,7 @@ int kinetis_netinitialize(int intf) ****************************************************************************/ #if CONFIG_KINETIS_ENETNETHIFS == 1 && !defined(CONFIG_NETDEV_LATEINIT) -void up_netinitialize(void) +void arm_netinitialize(void) { kinetis_netinitialize(0); } diff --git a/arch/arm/src/kinetis/kinetis_irq.c b/arch/arm/src/kinetis/kinetis_irq.c index 26a232922b4..ccca756a87a 100644 --- a/arch/arm/src/kinetis/kinetis_irq.c +++ b/arch/arm/src/kinetis/kinetis_irq.c @@ -399,8 +399,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(KINETIS_IRQ_SVCALL, up_svcall, NULL); - irq_attach(KINETIS_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(KINETIS_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(KINETIS_IRQ_HARDFAULT, arm_hardfault, NULL); /* Set the priority of the SVCall interrupt */ @@ -413,7 +413,7 @@ void up_irqinitialize(void) */ #ifdef CONFIG_ARM_MPU - irq_attach(KINETIS_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(KINETIS_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(KINETIS_IRQ_MEMFAULT); #endif @@ -422,7 +422,7 @@ void up_irqinitialize(void) #ifdef CONFIG_DEBUG_FEATURES irq_attach(KINETIS_IRQ_NMI, kinetis_nmi, NULL); #ifndef CONFIG_ARM_MPU - irq_attach(KINETIS_IRQ_MEMFAULT, up_memfault, NULL); + 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); @@ -523,14 +523,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { #if 0 /* Does not appear to be necessary in most cases */ kinetis_clrpend(irq); diff --git a/arch/arm/src/kinetis/kinetis_lowputc.c b/arch/arm/src/kinetis/kinetis_lowputc.c index 405c80a785c..f0aaba13a4f 100644 --- a/arch/arm/src/kinetis/kinetis_lowputc.c +++ b/arch/arm/src/kinetis/kinetis_lowputc.c @@ -276,14 +276,14 @@ static uint8_t g_sizemap[8] = ****************************************************************************/ /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #if defined(HAVE_UART_CONSOLE) # ifdef CONFIG_KINETIS_UARTFIFOS diff --git a/arch/arm/src/kinetis/kinetis_lpserial.c b/arch/arm/src/kinetis/kinetis_lpserial.c index 828de830b76..870d811abc8 100644 --- a/arch/arm/src/kinetis/kinetis_lpserial.c +++ b/arch/arm/src/kinetis/kinetis_lpserial.c @@ -1308,7 +1308,7 @@ static bool kinetis_txready(struct uart_dev_s *dev) * Description: * Performs the low level LPUART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. NOTE: This function depends on GPIO pin + * before arm_serialinit. NOTE: This function depends on GPIO pin * configuration performed in kinetis_lowsetup() and main clock * initialization performed in up_clkinitialize(). * @@ -1347,7 +1347,7 @@ void kinetis_lpuart_earlyserialinit(void) * * Description: * Register serial console and serial ports. This assumes - * that up_earlyserialinit was called previously. + * that arm_earlyserialinit was called previously. * * Input Parameters: * first: - First TTY number to assign @@ -1433,10 +1433,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); kinetis_restoreuartint(priv, ie); #endif return ch; @@ -1463,10 +1463,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; } diff --git a/arch/arm/src/kinetis/kinetis_serial.c b/arch/arm/src/kinetis/kinetis_serial.c index 691b6ee8c9f..55245570a1f 100644 --- a/arch/arm/src/kinetis/kinetis_serial.c +++ b/arch/arm/src/kinetis/kinetis_serial.c @@ -1970,7 +1970,7 @@ static void up_dma_rxcallback(DMA_HANDLE handle, void *arg, int result) * Description: * Performs the low level UART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. NOTE: This function depends on GPIO pin + * before arm_serialinit. NOTE: This function depends on GPIO pin * configuration performed in up_consoleinit() and main clock * initialization performed in up_clkinitialize(). * @@ -2014,7 +2014,7 @@ void kinetis_uart_earlyserialinit(void) * * Description: * Register serial console and serial ports. This assumes - * that up_earlyserialinit was called previously. + * that arm_earlyserialinit was called previously. * * Input Parameters: * first: - First TTY number to assign @@ -2154,10 +2154,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); up_restoreuartint(priv, ie); #endif return ch; @@ -2184,10 +2184,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; } diff --git a/arch/arm/src/kinetis/kinetis_serialinit.c b/arch/arm/src/kinetis/kinetis_serialinit.c index 91a6b8e71cf..5051ae3a537 100644 --- a/arch/arm/src/kinetis/kinetis_serialinit.c +++ b/arch/arm/src/kinetis/kinetis_serialinit.c @@ -63,7 +63,7 @@ * Description: * Performs the low level UART and LPUART initialization early in debug * so that the serial console will be available during bootup. This must - * be called before up_serialinit. NOTE: This function depends on GPIO + * be called before arm_serialinit. NOTE: This function depends on GPIO * pin configuration performed in up_consoleinit() and main clock * initialization performed in up_clkinitialize(). * @@ -87,7 +87,7 @@ void kinetis_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register all the serial console and serial ports. This assumes @@ -96,7 +96,7 @@ void kinetis_earlyserialinit(void) ****************************************************************************/ #if defined(USE_SERIALDRIVER) -void up_serialinit(void) +void arm_serialinit(void) { #if defined(HAVE_UART_DEVICE) ||defined(HAVE_LPUART_DEVICE) uint32_t start = 0; diff --git a/arch/arm/src/kinetis/kinetis_usbdev.c b/arch/arm/src/kinetis/kinetis_usbdev.c index 4d5ae7d166b..64a3d359f1b 100644 --- a/arch/arm/src/kinetis/kinetis_usbdev.c +++ b/arch/arm/src/kinetis/kinetis_usbdev.c @@ -4324,7 +4324,7 @@ static void khci_hwshutdown(struct khci_usbdev_s *priv) ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * * Description: * Initialize the USB driver @@ -4344,7 +4344,7 @@ static void khci_hwshutdown(struct khci_usbdev_s *priv) * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { /* For now there is only one USB controller, but we will always refer to * it using a pointer to make any future ports to multiple USB controllers @@ -4400,7 +4400,7 @@ void up_usbinitialize(void) { usbtrace(TRACE_DEVERROR(KHCI_TRACEERR_IRQREGISTRATION), (uint16_t)KINETIS_IRQ_USBOTG); - up_usbuninitialize(); + arm_usbuninitialize(); return; } @@ -4408,7 +4408,7 @@ void up_usbinitialize(void) } /**************************************************************************** - * Name: up_usbuninitialize + * Name: arm_usbuninitialize * Description: * Initialize the USB driver * Input Parameters: @@ -4419,7 +4419,7 @@ void up_usbinitialize(void) * ****************************************************************************/ -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { /* For now there is only one USB controller, but we will always refer to * it using a pointer to make any future ports to multiple USB controllers diff --git a/arch/arm/src/kl/kl_irq.c b/arch/arm/src/kl/kl_irq.c index f827e9fd35e..1865a206903 100644 --- a/arch/arm/src/kl/kl_irq.c +++ b/arch/arm/src/kl/kl_irq.c @@ -231,8 +231,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(KL_IRQ_SVCALL, up_svcall, NULL); - irq_attach(KL_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(KL_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(KL_IRQ_HARDFAULT, arm_hardfault, NULL); /* Attach all other processor exceptions (except reset and sys tick) */ @@ -331,14 +331,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { kl_clrpend(irq); } diff --git a/arch/arm/src/kl/kl_lowputc.c b/arch/arm/src/kl/kl_lowputc.c index 7571368668d..113f78ad5fc 100644 --- a/arch/arm/src/kl/kl_lowputc.c +++ b/arch/arm/src/kl/kl_lowputc.c @@ -109,7 +109,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console diff --git a/arch/arm/src/kl/kl_serial.c b/arch/arm/src/kl/kl_serial.c index 87b7cb82598..e5a5c94cc3c 100644 --- a/arch/arm/src/kl/kl_serial.c +++ b/arch/arm/src/kl/kl_serial.c @@ -797,18 +797,18 @@ static bool up_txready(struct uart_dev_s *dev) #ifdef USE_EARLYSERIALINIT /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level UART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. NOTE: This function depends on GPIO pin + * before arm_serialinit. NOTE: This function depends on GPIO pin * configuration performed in up_consoleinit() and main clock * initialization performed in up_clkinitialize(). * ****************************************************************************/ -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { /* Disable interrupts from all UARTS. The console is enabled in * pic32mx_consoleinit() @@ -841,15 +841,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes that - * up_earlyserialinit was called previously. + * arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { /* Register the console */ diff --git a/arch/arm/src/kl/kl_start.c b/arch/arm/src/kl/kl_start.c index cfac2007f54..0ea1880f953 100644 --- a/arch/arm/src/kl/kl_start.c +++ b/arch/arm/src/kl/kl_start.c @@ -152,7 +152,7 @@ void __start(void) /* Perform early serial initialization */ #ifdef USE_EARLYSERIALINIT - up_earlyserialinit(); + arm_earlyserialinit(); #endif showprogress('D'); diff --git a/arch/arm/src/lc823450/lc823450_allocateheap2.c b/arch/arm/src/lc823450/lc823450_allocateheap2.c index a736dea1aa4..3395fe5e899 100644 --- a/arch/arm/src/lc823450/lc823450_allocateheap2.c +++ b/arch/arm/src/lc823450/lc823450_allocateheap2.c @@ -224,7 +224,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) #endif /**************************************************************************** - * Name: up_addregion + * Name: arm_addregion * * Description: * Memory may be added in non-contiguous chunks. Additional chunks are @@ -233,7 +233,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) ****************************************************************************/ #if CONFIG_MM_REGIONS > 1 -void up_addregion(void) +void arm_addregion(void) { FAR void *region_start; size_t region_size; diff --git a/arch/arm/src/lc823450/lc823450_cpustart.c b/arch/arm/src/lc823450/lc823450_cpustart.c index fb34af2c63f..4abeae8a2ef 100644 --- a/arch/arm/src/lc823450/lc823450_cpustart.c +++ b/arch/arm/src/lc823450/lc823450_cpustart.c @@ -114,7 +114,7 @@ static void cpu1_boot(void) #if defined(CONFIG_BUILD_FLAT) && defined(CONFIG_ARM_MPU) lc823450_mpuinitialize(); - irq_attach(LC823450_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(LC823450_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(LC823450_IRQ_MEMFAULT); #endif diff --git a/arch/arm/src/lc823450/lc823450_dma.c b/arch/arm/src/lc823450/lc823450_dma.c index 1616e24449a..2993fa2aafe 100644 --- a/arch/arm/src/lc823450/lc823450_dma.c +++ b/arch/arm/src/lc823450/lc823450_dma.c @@ -339,10 +339,10 @@ void lc823450_dma_test() ****************************************************************************/ /**************************************************************************** - * Name: up_dma_initialize + * Name: arm_dma_initialize ****************************************************************************/ -void up_dma_initialize(void) +void arm_dma_initialize(void) { int i; diff --git a/arch/arm/src/lc823450/lc823450_dvfs2.c b/arch/arm/src/lc823450/lc823450_dvfs2.c index 10dc92f4410..edb1ee73cea 100644 --- a/arch/arm/src/lc823450/lc823450_dvfs2.c +++ b/arch/arm/src/lc823450/lc823450_dvfs2.c @@ -574,7 +574,7 @@ exit_with_error: /**************************************************************************** * Name: lc823450_dvfs_exit_idle - * This API is called in up_ack_irq() (i.e. interrupt context) + * This API is called in arm_ack_irq() (i.e. interrupt context) ****************************************************************************/ void lc823450_dvfs_exit_idle(int irq) diff --git a/arch/arm/src/lc823450/lc823450_irq.c b/arch/arm/src/lc823450/lc823450_irq.c index e362a4c06c6..5f0c23e7263 100644 --- a/arch/arm/src/lc823450/lc823450_irq.c +++ b/arch/arm/src/lc823450/lc823450_irq.c @@ -478,7 +478,7 @@ void up_irqinitialize(void) #if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 3 { size_t intstack_size = (CONFIG_ARCH_INTERRUPTSTACK & ~3); - up_stack_color((FAR void *)((uintptr_t)&g_intstackbase - intstack_size), + arm_stack_color((FAR void *)((uintptr_t)&g_intstackbase - intstack_size), intstack_size); } #endif @@ -534,8 +534,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(LC823450_IRQ_SVCALL, up_svcall, NULL); - irq_attach(LC823450_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(LC823450_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(LC823450_IRQ_HARDFAULT, arm_hardfault, NULL); /* Set the priority of the SVCall interrupt */ @@ -551,7 +551,7 @@ void up_irqinitialize(void) */ #ifdef CONFIG_ARM_MPU - irq_attach(LC823450_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(LC823450_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(LC823450_IRQ_MEMFAULT); #endif @@ -711,14 +711,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { if (irq < LC823450_IRQ_SYSTICK) { diff --git a/arch/arm/src/lc823450/lc823450_lowputc.c b/arch/arm/src/lc823450/lc823450_lowputc.c index ab7d8d928da..e371f824d9d 100644 --- a/arch/arm/src/lc823450/lc823450_lowputc.c +++ b/arch/arm/src/lc823450/lc823450_lowputc.c @@ -133,14 +133,14 @@ **************************************************************************/ /************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * **************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #ifdef CONFIG_DEV_CONSOLE_SWITCH diff --git a/arch/arm/src/lc823450/lc823450_serial.c b/arch/arm/src/lc823450/lc823450_serial.c index b3f565474b3..d1112f29dde 100644 --- a/arch/arm/src/lc823450/lc823450_serial.c +++ b/arch/arm/src/lc823450/lc823450_serial.c @@ -1253,16 +1253,16 @@ retry: #ifdef USE_EARLYSERIALINIT /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level UART initialization early in * debug so that the serial console will be available - * during bootup. This must be called before up_serialinit. + * during bootup. This must be called before arm_serialinit. * ****************************************************************************/ -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { /* NOTE: All GPIO configuration for the UARTs was performed in * up_lowsetup @@ -1301,17 +1301,17 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes - * that up_earlyserialinit was called previously. + * that arm_earlyserialinit was called previously. * ****************************************************************************/ int hsuart_register(const char *path, uart_dev_t *dev); -void up_serialinit(void) +void arm_serialinit(void) { /* Register the console */ @@ -1396,10 +1396,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); return ch; } diff --git a/arch/arm/src/lc823450/lc823450_start.c b/arch/arm/src/lc823450/lc823450_start.c index fcbd7c1649a..75187f66d3d 100644 --- a/arch/arm/src/lc823450/lc823450_start.c +++ b/arch/arm/src/lc823450/lc823450_start.c @@ -143,7 +143,7 @@ static void go_nx_start(void *pv, unsigned int nbytes) ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -# define showprogress(c) up_lowputc(c) +# define showprogress(c) arm_lowputc(c) #else # define showprogress(c) #endif @@ -334,7 +334,7 @@ void __start(void) /* Perform early serial initialization */ #ifdef USE_EARLYSERIALINIT - up_earlyserialinit(); + arm_earlyserialinit(); #endif showprogress('D'); diff --git a/arch/arm/src/lc823450/lc823450_usbdev.c b/arch/arm/src/lc823450/lc823450_usbdev.c index dc07f51c01f..e045b620b3a 100644 --- a/arch/arm/src/lc823450/lc823450_usbdev.c +++ b/arch/arm/src/lc823450/lc823450_usbdev.c @@ -1433,7 +1433,7 @@ static int lc823450_usbinterrupt(int irq, void *context, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * * Description: * Initialize the USB driver @@ -1446,7 +1446,7 @@ static int lc823450_usbinterrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { int i; struct lc823450_usbdev_s *priv = &g_usbdev; diff --git a/arch/arm/src/lpc17xx_40xx/Make.defs b/arch/arm/src/lpc17xx_40xx/Make.defs index 752f7a116a6..69cc53b0e9a 100644 --- a/arch/arm/src/lpc17xx_40xx/Make.defs +++ b/arch/arm/src/lpc17xx_40xx/Make.defs @@ -87,7 +87,7 @@ CMN_UASRCS += arm_signal_handler.S endif # Use of common/arm_etherstub.c is deprecated. The preferred mechanism is to -# use CONFIG_NETDEV_LATEINIT=y to suppress the call to up_netinitialize() in +# use CONFIG_NETDEV_LATEINIT=y to suppress the call to arm_netinitialize() in # up_initialize(). Then this stub would not be needed. ifeq ($(CONFIG_NET),y) diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_allocateheap.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_allocateheap.c index b0e0f7dfc97..9d4edd9bdea 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_allocateheap.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_allocateheap.c @@ -341,7 +341,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) #endif /**************************************************************************** - * Name: up_addregion + * Name: arm_addregion * * Description: * Memory may be added in non-contiguous chunks. Additional chunks are @@ -350,7 +350,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) ****************************************************************************/ #if CONFIG_MM_REGIONS > 1 -void up_addregion(void) +void arm_addregion(void) { /* Banks 0 and 1 are each 16Kb. If both are present, they occupy a * contiguous 32Kb memory region. diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c index b90aeb09ba7..62539be69a7 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c @@ -3340,7 +3340,7 @@ static inline int lpc17_40_ethinitialize(int intf) } /**************************************************************************** - * Name: up_netinitialize + * Name: arm_netinitialize * * Description: * Initialize the first network interface. If there are more than one @@ -3351,7 +3351,7 @@ static inline int lpc17_40_ethinitialize(int intf) ****************************************************************************/ #if CONFIG_LPC17_40_NINTERFACES == 1 && !defined(CONFIG_NETDEV_LATEINIT) -void up_netinitialize(void) +void arm_netinitialize(void) { lpc17_40_ethinitialize(0); } diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c index 2590e93f03f..09e22ade03d 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c @@ -271,7 +271,7 @@ static int gpdma_interrupt(int irq, FAR void *context, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Name: up_dma_initialize + * Name: arm_dma_initialize * * Description: * Initialize the GPDMA subsystem. Called from up_initialize() early in @@ -282,7 +282,7 @@ static int gpdma_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { uint32_t regval; int ret; diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c index 524f57e840c..fd27e4b8a85 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c @@ -372,8 +372,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(LPC17_40_IRQ_SVCALL, up_svcall, NULL); - irq_attach(LPC17_40_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(LPC17_40_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(LPC17_40_IRQ_HARDFAULT, arm_hardfault, NULL); /* Set the priority of the SVCall interrupt */ @@ -389,7 +389,7 @@ void up_irqinitialize(void) */ #ifdef CONFIG_ARM_MPU - irq_attach(LPC17_40_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(LPC17_40_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(LPC17_40_IRQ_MEMFAULT); #endif @@ -398,7 +398,7 @@ void up_irqinitialize(void) #ifdef CONFIG_DEBUG_FEATURES irq_attach(LPC17_40_IRQ_NMI, lpc17_40_nmi, NULL); #ifndef CONFIG_ARM_MPU - irq_attach(LPC17_40_IRQ_MEMFAULT, up_memfault, NULL); + 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); @@ -515,14 +515,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { #if 0 /* Does not appear to be necessary in most cases */ lpc17_40_clrpend(irq); diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_lowputc.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_lowputc.c index 0e3e4ee1d17..dedaaed878b 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_lowputc.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_lowputc.c @@ -263,14 +263,14 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #if defined HAVE_UART && defined HAVE_CONSOLE /* Wait for the transmitter to be available */ diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c index 210f29e12f1..1f2a6f15599 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c @@ -1580,12 +1580,12 @@ static bool up_txempty(struct uart_dev_s *dev) ****************************************************************************/ /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Performs the low level UART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * * NOTE: Configuration of the CONSOLE UART was performed by up_lowsetup() * very early in the boot sequence. @@ -1593,7 +1593,7 @@ static bool up_txempty(struct uart_dev_s *dev) ****************************************************************************/ #ifdef USE_EARLYSERIALINIT -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { /* Configure all UARTs (except the CONSOLE UART) and disable interrupts */ @@ -1649,15 +1649,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes that - * up_earlyserialinit was called previously. + * arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #ifdef CONSOLE_DEV uart_register("/dev/console", &CONSOLE_DEV); @@ -1698,10 +1698,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #ifdef HAVE_CONSOLE up_restoreuartint(priv, ier); #endif @@ -1728,10 +1728,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; } diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_start.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_start.c index 259764e128d..1b13e3d3e36 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_start.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_start.c @@ -100,7 +100,7 @@ const uintptr_t g_idle_topstack = HEAP_BASE; ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -# define showprogress(c) up_lowputc(c) +# define showprogress(c) arm_lowputc(c) #else # define showprogress(c) #endif @@ -262,7 +262,7 @@ void __start(void) /* Perform early serial initialization */ #ifdef USE_EARLYSERIALINIT - up_earlyserialinit(); + arm_earlyserialinit(); #endif showprogress('D'); diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_usbdev.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_usbdev.c index 71e9f8004a2..9a0a4032d50 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_usbdev.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_usbdev.c @@ -3188,7 +3188,7 @@ static int lpc17_40_pullup(struct usbdev_s *dev, bool enable) ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * * Description: * Initialize USB hardware. @@ -3199,7 +3199,7 @@ static int lpc17_40_pullup(struct usbdev_s *dev, bool enable) * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { struct lpc17_40_usbdev_s *priv = &g_usbdev; uint32_t regval; @@ -3359,14 +3359,14 @@ void up_usbinitialize(void) return; errout: - up_usbuninitialize(); + arm_usbuninitialize(); } /**************************************************************************** - * Name: up_usbuninitialize + * Name: arm_usbuninitialize ****************************************************************************/ -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { struct lpc17_40_usbdev_s *priv = &g_usbdev; uint32_t regval; diff --git a/arch/arm/src/lpc214x/lpc214x_decodeirq.c b/arch/arm/src/lpc214x/lpc214x_decodeirq.c index 88f62ec7361..ab0f00e6790 100644 --- a/arch/arm/src/lpc214x/lpc214x_decodeirq.c +++ b/arch/arm/src/lpc214x/lpc214x_decodeirq.c @@ -1,35 +1,20 @@ /******************************************************************************** * arch/arm/src/lpc214x/lpc214x_decodeirq.c * - * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * http://www.apache.org/licenses/LICENSE-2.0 * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. * ********************************************************************************/ @@ -51,18 +36,6 @@ #include "lpc214x_vic.h" -/******************************************************************************** - * Pre-processor Definitions - ********************************************************************************/ - -/******************************************************************************** - * Private Types - ********************************************************************************/ - -/******************************************************************************** - * Public Data - ********************************************************************************/ - /******************************************************************************** * Private Data ********************************************************************************/ @@ -70,23 +43,22 @@ /* This array maps 4 bits into the bit number of the lowest bit that it set */ #ifndef CONFIG_SUPPRESS_INTERRUPTS -static uint8_t g_nibblemap[16] = { 0, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0 }; +static uint8_t g_nibblemap[16] = +{ + 0, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0 +}; #endif /******************************************************************************** - * Private Functions + * Public Functions ********************************************************************************/ /******************************************************************************** - * Public Funstions - ********************************************************************************/ - -/******************************************************************************** - * up_decodeirq() and/or lpc214x_decodeirq() + * arm_decodeirq() and/or lpc214x_decodeirq() * * Description: * The vectored interrupt controller (VIC) takes 32 interrupt request inputs - * and programmatically assigns them into 3 categories: FIQ, vectored IRQ, + * and pro grammatically assigns them into 3 categories: FIQ, vectored IRQ, * and non-vectored IRQ. * * - FIQs have the highest priority. There is a single FIQ vector, but multiple @@ -105,15 +77,16 @@ static uint8_t g_nibblemap[16] = { 0, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, ********************************************************************************/ #ifndef CONFIG_VECTORED_INTERRUPTS -void up_decodeirq(uint32_t *regs) +uint32_t *arm_decodeirq(uint32_t *regs) #else -static void lpc214x_decodeirq(uint32_t *regs) +static uint32_t *lpc214x_decodeirq(uint32_t *regs) #endif { #ifdef CONFIG_SUPPRESS_INTERRUPTS CURRENT_REGS = regs; err("ERROR: Unexpected IRQ\n"); PANIC(); + return NULL; #else /* Decode the interrupt. We have to do this by search for the lowest numbered @@ -164,13 +137,16 @@ static void lpc214x_decodeirq(uint32_t *regs) CURRENT_REGS = savestate; } + + return NULL; /* Return not used in this architecture */ #endif } #ifdef CONFIG_VECTORED_INTERRUPTS -void up_decodeirq(uint32_t *regs) +uint32_t *arm_decodeirq(uint32_t *regs) { vic_vector_t vector = (vic_vector_t)vic_getreg(LPC214X_VIC_VECTADDR_OFFSET); vector(regs); + return NULL; /* Return not used in this architecture */ } #endif diff --git a/arch/arm/src/lpc214x/lpc214x_head.S b/arch/arm/src/lpc214x/lpc214x_head.S index 72db089a24f..a2a0d1cac3b 100644 --- a/arch/arm/src/lpc214x/lpc214x_head.S +++ b/arch/arm/src/lpc214x/lpc214x_head.S @@ -282,7 +282,7 @@ .macro showprogress, code #ifdef CONFIG_DEBUG_FEATURES mov r0, #\code - bl up_lowputc + bl arm_lowputc #endif .endm @@ -473,27 +473,27 @@ _vector_table: ldr pc, .Lfiqhandler /* 0x1c: FIQ */ .globl __start - .globl up_vectorundefinsn - .globl up_vectorswi - .globl up_vectorprefetch - .globl up_vectordata - .globl up_vectorirq - .globl up_vectorfiq + .globl arm_vectorundefinsn + .globl arm_vectorswi + .globl arm_vectorprefetch + .globl arm_vectordata + .globl arm_vectorirq + .globl arm_vectorfiq .Lresethandler: .long __start .Lundefinedhandler: - .long up_vectorundefinsn + .long arm_vectorundefinsn .Lswihandler: - .long up_vectorswi + .long arm_vectorswi .Lprefetchaborthandler: - .long up_vectorprefetch + .long arm_vectorprefetch .Ldataaborthandler: - .long up_vectordata + .long arm_vectordata .Lirqhandler: - .long up_vectorirq + .long arm_vectorirq .Lfiqhandler: - .long up_vectorfiq + .long arm_vectorfiq .size _vector_table, . - _vector_table /***************************************************************************** @@ -583,7 +583,7 @@ __start: mov fp, #0 #ifdef USE_EARLYSERIALINIT - bl up_earlyserialinit + bl arm_earlyserialinit #endif showprogress 'C' diff --git a/arch/arm/src/lpc214x/lpc214x_irq.c b/arch/arm/src/lpc214x/lpc214x_irq.c index a836d1df765..28576e92358 100644 --- a/arch/arm/src/lpc214x/lpc214x_irq.c +++ b/arch/arm/src/lpc214x/lpc214x_irq.c @@ -99,7 +99,7 @@ void up_irqinitialize(void) /* Set the default vector */ - vic_putreg((uint32_t)up_decodeirq, LPC214X_VIC_DEFVECTADDR_OFFSET); + vic_putreg((uint32_t)arm_decodeirq, LPC214X_VIC_DEFVECTADDR_OFFSET); /* Disable all vectored interrupts */ diff --git a/arch/arm/src/lpc214x/lpc214x_lowputc.S b/arch/arm/src/lpc214x/lpc214x_lowputc.S index 80de7cd4fe6..f2dcfa0f123 100644 --- a/arch/arm/src/lpc214x/lpc214x_lowputc.S +++ b/arch/arm/src/lpc214x/lpc214x_lowputc.S @@ -131,7 +131,7 @@ **************************************************************************/ /************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc **************************************************************************/ /* This assembly language version has the advantage that it can does not @@ -140,9 +140,9 @@ */ .text - .global up_lowputc - .type up_lowputc, function -up_lowputc: + .global arm_lowputc + .type arm_lowputc, function +arm_lowputc: /* On entry, r0 holds the character to be printed */ ldr r1, =LPC214X_UART_BASE @@ -157,7 +157,7 @@ up_lowputc: /* And return */ mov pc, lr - .size up_lowputc, . - up_lowputc + .size arm_lowputc, . - arm_lowputc /* This performs basic initialization of the UART. This can be called very * early in initialization because it does not depend on having a stack. It diff --git a/arch/arm/src/lpc214x/lpc214x_serial.c b/arch/arm/src/lpc214x/lpc214x_serial.c index 4c8132be777..2384596d955 100644 --- a/arch/arm/src/lpc214x/lpc214x_serial.c +++ b/arch/arm/src/lpc214x/lpc214x_serial.c @@ -734,16 +734,16 @@ static bool up_txempty(struct uart_dev_s *dev) #ifdef USE_EARLYSERIALINIT /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level UART initialization early in * debug so that the serial console will be available - * during bootup. This must be called before up_serialinit. + * during bootup. This must be called before arm_serialinit. * ****************************************************************************/ -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { /* Enable UART0 and 1 */ @@ -765,15 +765,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes - * that up_earlyserialinit was called previously. + * that arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { uart_register("/dev/console", &CONSOLE_DEV); uart_register("/dev/ttyS0", &TTYS0_DEV); @@ -830,10 +830,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); return ch; } diff --git a/arch/arm/src/lpc214x/lpc214x_usbdev.c b/arch/arm/src/lpc214x/lpc214x_usbdev.c index 384a9b62e92..4b6ac529a94 100644 --- a/arch/arm/src/lpc214x/lpc214x_usbdev.c +++ b/arch/arm/src/lpc214x/lpc214x_usbdev.c @@ -3146,7 +3146,7 @@ static int lpc214x_pullup(struct usbdev_s *dev, bool enable) ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * * Description: * Initialize USB hardware. @@ -3160,7 +3160,7 @@ static int lpc214x_pullup(struct usbdev_s *dev, bool enable) * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { struct lpc214x_usbdev_s *priv = &g_usbdev; uint32_t reg; @@ -3268,14 +3268,14 @@ void up_usbinitialize(void) return; errout: - up_usbuninitialize(); + arm_usbuninitialize(); } /**************************************************************************** - * Name: up_usbuninitialize + * Name: arm_usbuninitialize ****************************************************************************/ -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { struct lpc214x_usbdev_s *priv = &g_usbdev; uint32_t reg; diff --git a/arch/arm/src/lpc2378/lpc23xx_decodeirq.c b/arch/arm/src/lpc2378/lpc23xx_decodeirq.c index 970f74fdb53..2bee064f4c2 100644 --- a/arch/arm/src/lpc2378/lpc23xx_decodeirq.c +++ b/arch/arm/src/lpc2378/lpc23xx_decodeirq.c @@ -57,36 +57,16 @@ #include "lpc2378.h" #include "lpc23xx_vic.h" -/******************************************************************************** - * Pre-processor Definitions - ********************************************************************************/ - -/******************************************************************************** - * Private Types - ********************************************************************************/ - -/******************************************************************************** - * Public Data - ********************************************************************************/ - -/******************************************************************************** - * Private Data - ********************************************************************************/ - -/******************************************************************************** - * Private Functions - ********************************************************************************/ - /******************************************************************************** * Public Functions ********************************************************************************/ /******************************************************************************** - * up_decodeirq() and/or lpc23xx_decodeirq() + * arm_decodeirq() and/or lpc23xx_decodeirq() * * Description: * The vectored interrupt controller (VIC) takes 32 interrupt request inputs - * and programmatically assigns them into 2 categories: FIQ, vectored IRQ. + * and pro grammatically assigns them into 2 categories: FIQ, vectored IRQ. * * - FIQs have the highest priority. There is a single FIQ vector, but multiple * interrupt sources can be ORed to this FIQ vector. @@ -104,15 +84,16 @@ ********************************************************************************/ #ifndef CONFIG_VECTORED_INTERRUPTS -void up_decodeirq(uint32_t *regs) +uint32_t *arm_decodeirq(uint32_t *regs) #else -static void lpc23xx_decodeirq(uint32_t *regs) +static uint32_t *lpc23xx_decodeirq(uint32_t *regs) #endif { #ifdef CONFIG_SUPPRESS_INTERRUPTS - PANIC(); err("ERROR: Unexpected IRQ\n"); CURRENT_REGS = regs; + PANIC(); + return NULL; #else /* Check which IRQ fires */ @@ -123,7 +104,9 @@ static void lpc23xx_decodeirq(uint32_t *regs) for (irq = 0; irq < NR_IRQS; irq++) { if (irqbits & (uint32_t) (1 << irq)) - break; + { + break; + } } /* Verify that the resulting IRQ number is valid */ @@ -141,7 +124,7 @@ static void lpc23xx_decodeirq(uint32_t *regs) /* Acknowledge the interrupt */ - up_ack_irq(irq); + arm_ack_irq(irq); /* Deliver the IRQ */ @@ -155,17 +138,18 @@ static void lpc23xx_decodeirq(uint32_t *regs) CURRENT_REGS = savestate; } + return NULL; /* Return not used in this architecture */ #endif } #ifdef CONFIG_VECTORED_INTERRUPTS -void up_decodeirq(uint32_t *regs) +uint32_t *arm_decodeirq(uint32_t *regs) { vic_vector_t vector = (vic_vector_t) vic_getreg(VIC_ADDRESS_OFFSET); /* Acknowledge the interrupt */ - up_ack_irq(irq); + arm_ack_irq(irq); /* Valid Interrupt */ @@ -173,5 +157,7 @@ void up_decodeirq(uint32_t *regs) { (vector)(regs); } + + return NULL; /* Return not used in this architecture */ } #endif diff --git a/arch/arm/src/lpc2378/lpc23xx_head.S b/arch/arm/src/lpc2378/lpc23xx_head.S index 300a522c349..919f3c4bff5 100644 --- a/arch/arm/src/lpc2378/lpc23xx_head.S +++ b/arch/arm/src/lpc2378/lpc23xx_head.S @@ -63,7 +63,7 @@ #ifdef CONFIG_DEBUG_FEATURES .macro showprogress, code mov r0, #\code - bl up_lowputc + bl arm_lowputc .endm #else .macro showprogress, code @@ -100,27 +100,27 @@ _vector_table: ldr pc, .Lfiqhandler /* 0x1c: FIQ */ .globl __start - .globl up_vectorundefinsn - .globl up_vectorswi - .globl up_vectorprefetch - .globl up_vectordata - .globl up_vectorirq - .globl up_vectorfiq + .globl arm_vectorundefinsn + .globl arm_vectorswi + .globl arm_vectorprefetch + .globl arm_vectordata + .globl arm_vectorirq + .globl arm_vectorfiq .Lresethandler: .long __start .Lundefinedhandler: - .long up_vectorundefinsn + .long arm_vectorundefinsn .Lswihandler: - .long up_vectorswi + .long arm_vectorswi .Lprefetchaborthandler: - .long up_vectorprefetch + .long arm_vectorprefetch .Ldataaborthandler: - .long up_vectordata + .long arm_vectordata .Lirqhandler: - .long up_vectorirq + .long arm_vectorirq .Lfiqhandler: - .long up_vectorfiq + .long arm_vectorfiq .size _vector_table, . - _vector_table /**************************************************************************** @@ -183,7 +183,7 @@ __start: mov fp, #0 #ifdef USE_EARLYSERIALINIT - bl up_earlyserialinit + bl arm_earlyserialinit showprogress 'S' #endif diff --git a/arch/arm/src/lpc2378/lpc23xx_irq.c b/arch/arm/src/lpc2378/lpc23xx_irq.c index bcad9d39112..8ecff5b2e84 100644 --- a/arch/arm/src/lpc2378/lpc23xx_irq.c +++ b/arch/arm/src/lpc2378/lpc23xx_irq.c @@ -197,14 +197,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the interrupt * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { uint32_t reg32; diff --git a/arch/arm/src/lpc2378/lpc23xx_lowputc.S b/arch/arm/src/lpc2378/lpc23xx_lowputc.S index 1f4dad51fdd..d9d16d5dd2f 100644 --- a/arch/arm/src/lpc2378/lpc23xx_lowputc.S +++ b/arch/arm/src/lpc2378/lpc23xx_lowputc.S @@ -167,7 +167,7 @@ **************************************************************************/ /************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc **************************************************************************/ /* This assembly language version has the advantage that it does not @@ -176,9 +176,9 @@ */ .text - .global up_lowputc - .type up_lowputc, function -up_lowputc: + .global arm_lowputc + .type arm_lowputc, function +arm_lowputc: /* On entry, r0 holds the character to be printed */ ldr r1, =UARTxBASE @@ -193,7 +193,7 @@ up_lowputc: /* And return */ mov pc, lr - .size up_lowputc, . - up_lowputc + .size arm_lowputc, . - arm_lowputc /* This performs basic initialization of the UART. This can be called very * early in initialization because it does not depend on having a stack. It diff --git a/arch/arm/src/lpc2378/lpc23xx_serial.c b/arch/arm/src/lpc2378/lpc23xx_serial.c index 64f7cbae79d..49bbe49c169 100644 --- a/arch/arm/src/lpc2378/lpc23xx_serial.c +++ b/arch/arm/src/lpc2378/lpc23xx_serial.c @@ -848,16 +848,16 @@ static bool up_txempty(struct uart_dev_s *dev) #ifdef USE_EARLYSERIALINIT /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level UART initialization early in * debug so that the serial console will be available - * during bootup. This must be called before up_serialinit. + * during bootup. This must be called before arm_serialinit. * ****************************************************************************/ -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { /* Enable UART0 and 2 */ @@ -886,15 +886,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes - * that up_earlyserialinit was called previously. + * that arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { uart_register("/dev/console", &CONSOLE_DEV); uart_register("/dev/ttyS0", &TTYS0_DEV); @@ -951,10 +951,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); return ch; } #endif /* USE_SERIALDRIVER */ diff --git a/arch/arm/src/lpc31xx/lpc31_allocateheap.c b/arch/arm/src/lpc31xx/lpc31_allocateheap.c index e5beaae4e03..0dd27c4ef0c 100644 --- a/arch/arm/src/lpc31xx/lpc31_allocateheap.c +++ b/arch/arm/src/lpc31xx/lpc31_allocateheap.c @@ -199,7 +199,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) } /**************************************************************************** - * Name: up_addregion + * Name: arm_addregion * * Description: * Memory may be added in non-contiguous chunks. Additional chunks are @@ -208,7 +208,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) ****************************************************************************/ #if CONFIG_MM_REGIONS > 1 -void up_addregion(void) +void arm_addregion(void) { #if defined(CONFIG_LPC31_EXTSRAM0) && defined(CONFIG_LPC31_EXTSRAM0HEAP) MM_ADDREGION((FAR void *)LPC31_EXTSRAM0_VSECTION, CONFIG_LPC31_EXTSRAM0SIZE); diff --git a/arch/arm/src/lpc31xx/lpc31_boot.c b/arch/arm/src/lpc31xx/lpc31_boot.c index 6b0b99b8fdd..b97f213cd3b 100644 --- a/arch/arm/src/lpc31xx/lpc31_boot.c +++ b/arch/arm/src/lpc31xx/lpc31_boot.c @@ -387,7 +387,7 @@ void arm_boot(void) /* Perform early serial initialization if we are going to use the serial driver */ #ifdef USE_EARLYSERIALINIT - up_earlyserialinit(); + arm_earlyserialinit(); #endif /* Perform board-specific initialization */ diff --git a/arch/arm/src/lpc31xx/lpc31_decodeirq.c b/arch/arm/src/lpc31xx/lpc31_decodeirq.c index d0e2124296e..70d1e2c3a96 100644 --- a/arch/arm/src/lpc31xx/lpc31_decodeirq.c +++ b/arch/arm/src/lpc31xx/lpc31_decodeirq.c @@ -1,35 +1,20 @@ /******************************************************************************** * arch/arm/src/lpc31xx/lpc31_decodeirq.c * - * Copyright (C) 2009, 2014 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * http://www.apache.org/licenses/LICENSE-2.0 * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. * ********************************************************************************/ @@ -58,12 +43,13 @@ * Public Functions ********************************************************************************/ -void up_decodeirq(uint32_t *regs) +uint32_t *arm_decodeirq(uint32_t *regs) { #ifdef CONFIG_SUPPRESS_INTERRUPTS CURRENT_REGS = regs; err("ERROR: Unexpected IRQ\n"); PANIC(); + return NULL; #else int index; int irq; @@ -88,7 +74,7 @@ void up_decodeirq(uint32_t *regs) { /* Acknowledge the interrupt */ - up_ack_irq(irq); + arm_ack_irq(irq); /* Current regs non-zero indicates that we are processing an interrupt; * CURRENT_REGS is also used to manage interrupt level context switches. @@ -116,7 +102,7 @@ void up_decodeirq(uint32_t *regs) #ifdef CONFIG_ARCH_FPU /* Restore floating point registers */ - up_restorefpu((uint32_t *)CURRENT_REGS); + arm_restorefpu((uint32_t *)CURRENT_REGS); #endif #ifdef CONFIG_ARCH_ADDRENV @@ -137,5 +123,7 @@ void up_decodeirq(uint32_t *regs) CURRENT_REGS = NULL; } } + + return NULL; /* Return not used in this architecture */ #endif } diff --git a/arch/arm/src/lpc31xx/lpc31_irq.c b/arch/arm/src/lpc31xx/lpc31_irq.c index ce4cdd8759c..8ba39eeb4a5 100644 --- a/arch/arm/src/lpc31xx/lpc31_irq.c +++ b/arch/arm/src/lpc31xx/lpc31_irq.c @@ -181,14 +181,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the interrupt * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { /* Get the address of the request register corresponding to this * interrupt source diff --git a/arch/arm/src/lpc31xx/lpc31_lowputc.c b/arch/arm/src/lpc31xx/lpc31_lowputc.c index c9d2914c1c6..4c0d0606b25 100644 --- a/arch/arm/src/lpc31xx/lpc31_lowputc.c +++ b/arch/arm/src/lpc31xx/lpc31_lowputc.c @@ -67,7 +67,7 @@ # ifdef CONFIG_UART_SERIAL_CONSOLE # define HAVE_CONSOLE 1 -/* Is initialization performed by up_earlyserialinit()? Or is UART +/* Is initialization performed by arm_earlyserialinit()? Or is UART * initialization suppressed? */ @@ -340,14 +340,14 @@ void lpc31_lowsetup(void) } /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Provide priority, low-level access to support OS debug writes * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #ifdef HAVE_CONSOLE up_waittxready(); diff --git a/arch/arm/src/lpc31xx/lpc31_serial.c b/arch/arm/src/lpc31xx/lpc31_serial.c index 18753ec8010..fa5d1a8bfa4 100644 --- a/arch/arm/src/lpc31xx/lpc31_serial.c +++ b/arch/arm/src/lpc31xx/lpc31_serial.c @@ -753,16 +753,16 @@ static bool up_txempty(struct uart_dev_s *dev) #ifdef USE_EARLYSERIALINIT /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level UART initialization early in debug so that the * serial console will be available during bootup (via up_putc). This must - * be called before up_serialinit. + * be called before arm_serialinit. * ****************************************************************************/ -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { /* Enable UART system clock */ @@ -783,15 +783,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes that - * up_earlyserialinit was called previously. + * arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #if defined(CONFIG_UART_SERIAL_CONSOLE) uart_register("/dev/console", &g_uartport); @@ -824,12 +824,12 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } /* Output the character */ - up_lowputc(ch); + arm_lowputc(ch); up_restoreuartint(priv, ier); return ch; } @@ -852,12 +852,12 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } /* Output the character */ - up_lowputc(ch); + arm_lowputc(ch); return ch; } diff --git a/arch/arm/src/lpc31xx/lpc31_usbdev.c b/arch/arm/src/lpc31xx/lpc31_usbdev.c index 7e48ec7fb65..be8782e3641 100644 --- a/arch/arm/src/lpc31xx/lpc31_usbdev.c +++ b/arch/arm/src/lpc31xx/lpc31_usbdev.c @@ -2461,7 +2461,7 @@ static int lpc31_pullup(struct usbdev_s *dev, bool enable) ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * * Description: * Initialize USB hardware. @@ -2475,7 +2475,7 @@ static int lpc31_pullup(struct usbdev_s *dev, bool enable) * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { struct lpc31_usbdev_s *priv = &g_usbdev; int i; @@ -2595,14 +2595,14 @@ void up_usbinitialize(void) return; errout: - up_usbuninitialize(); + arm_usbuninitialize(); } /**************************************************************************** - * Name: up_usbuninitialize + * Name: arm_usbuninitialize ****************************************************************************/ -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { struct lpc31_usbdev_s *priv = &g_usbdev; irqstate_t flags; diff --git a/arch/arm/src/lpc43xx/lpc43_allocateheap.c b/arch/arm/src/lpc43xx/lpc43_allocateheap.c index 4d156b898a6..b9d295c8f76 100644 --- a/arch/arm/src/lpc43xx/lpc43_allocateheap.c +++ b/arch/arm/src/lpc43xx/lpc43_allocateheap.c @@ -519,7 +519,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) #endif /**************************************************************************** - * Name: up_addregion + * Name: arm_addregion * * Description: * Memory may be added in non-contiguous chunks. Additional chunks are @@ -528,7 +528,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) ****************************************************************************/ #if CONFIG_MM_REGIONS > 1 -void up_addregion(void) +void arm_addregion(void) { #ifdef MM_HAVE_REGION /* start from second region */ diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c index c56101134a0..1d94614f751 100644 --- a/arch/arm/src/lpc43xx/lpc43_ethernet.c +++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c @@ -3862,7 +3862,7 @@ static inline int lpc43_ethinitialize(void) } /**************************************************************************** - * Function: up_netinitialize + * Function: arm_netinitialize * * Description: * This is the "standard" network initialization logic called from the @@ -3879,7 +3879,7 @@ static inline int lpc43_ethinitialize(void) ****************************************************************************/ #ifndef CONFIG_NETDEV_LATEINIT -void up_netinitialize(void) +void arm_netinitialize(void) { lpc43_ethinitialize(); } diff --git a/arch/arm/src/lpc43xx/lpc43_gpdma.c b/arch/arm/src/lpc43xx/lpc43_gpdma.c index 518ea6f908d..fb1ab52aa3c 100644 --- a/arch/arm/src/lpc43xx/lpc43_gpdma.c +++ b/arch/arm/src/lpc43xx/lpc43_gpdma.c @@ -269,7 +269,7 @@ static int gpdma_interrupt(int irq, FAR void *context, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Name: up_dma_initialize + * Name: arm_dma_initialize * * Description: * Initialize the GPDMA subsystem. Called from up_initialize() early in @@ -280,7 +280,7 @@ static int gpdma_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { uint32_t regval; int ret; diff --git a/arch/arm/src/lpc43xx/lpc43_irq.c b/arch/arm/src/lpc43xx/lpc43_irq.c index 6bc88a68d29..91a0380eb8c 100644 --- a/arch/arm/src/lpc43xx/lpc43_irq.c +++ b/arch/arm/src/lpc43xx/lpc43_irq.c @@ -365,8 +365,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(LPC43_IRQ_SVCALL, up_svcall, NULL); - irq_attach(LPC43_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(LPC43_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(LPC43_IRQ_HARDFAULT, arm_hardfault, NULL); /* Set the priority of the SVCall interrupt */ @@ -382,7 +382,7 @@ void up_irqinitialize(void) */ #ifdef CONFIG_ARM_MPU - irq_attach(LPC43_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(LPC43_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(LPC43_IRQ_MEMFAULT); #endif @@ -391,7 +391,7 @@ void up_irqinitialize(void) #ifdef CONFIG_DEBUG_FEATURES irq_attach(LPC43_IRQ_NMI, lpc43_nmi, NULL); #ifndef CONFIG_ARM_MPU - irq_attach(LPC43_IRQ_MEMFAULT, up_memfault, NULL); + 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); @@ -495,14 +495,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { lpc43_clrpend(irq); } diff --git a/arch/arm/src/lpc43xx/lpc43_serial.c b/arch/arm/src/lpc43xx/lpc43_serial.c index 9143191082f..3249a5fb373 100644 --- a/arch/arm/src/lpc43xx/lpc43_serial.c +++ b/arch/arm/src/lpc43xx/lpc43_serial.c @@ -1263,12 +1263,12 @@ static bool up_txempty(struct uart_dev_s *dev) ****************************************************************************/ /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Performs the low level UART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * * NOTE: Configuration of the CONSOLE UART was performed by up_lowsetup() * very early in the boot sequence. @@ -1276,7 +1276,7 @@ static bool up_txempty(struct uart_dev_s *dev) ****************************************************************************/ #ifdef USE_EARLYSERIALINIT -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { /* Configure all UARTs (except the CONSOLE UART) and disable interrupts */ @@ -1318,15 +1318,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes that - * up_earlyserialinit was called previously. + * arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #ifdef CONSOLE_DEV uart_register("/dev/console", &CONSOLE_DEV); @@ -1367,10 +1367,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #ifdef HAVE_SERIAL_CONSOLE up_restoreuartint(priv, ier); #endif @@ -1397,10 +1397,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; } diff --git a/arch/arm/src/lpc43xx/lpc43_start.c b/arch/arm/src/lpc43xx/lpc43_start.c index 9abfab012eb..19aded85a0c 100644 --- a/arch/arm/src/lpc43xx/lpc43_start.c +++ b/arch/arm/src/lpc43xx/lpc43_start.c @@ -88,7 +88,7 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -# define showprogress(c) up_lowputc(c) +# define showprogress(c) arm_lowputc(c) #else # define showprogress(c) #endif @@ -328,7 +328,7 @@ void __start(void) /* Perform early serial initialization */ #ifdef USE_EARLYSERIALINIT - up_earlyserialinit(); + arm_earlyserialinit(); #endif showprogress('E'); diff --git a/arch/arm/src/lpc43xx/lpc43_uart.c b/arch/arm/src/lpc43xx/lpc43_uart.c index 0f034c1107a..ee9533f1400 100644 --- a/arch/arm/src/lpc43xx/lpc43_uart.c +++ b/arch/arm/src/lpc43xx/lpc43_uart.c @@ -147,14 +147,14 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #ifdef HAVE_SERIAL_CONSOLE /* Wait for the transmitter to be available */ diff --git a/arch/arm/src/lpc43xx/lpc43_usb0dev.c b/arch/arm/src/lpc43xx/lpc43_usb0dev.c index 2217150380c..c4f27855392 100644 --- a/arch/arm/src/lpc43xx/lpc43_usb0dev.c +++ b/arch/arm/src/lpc43xx/lpc43_usb0dev.c @@ -2604,7 +2604,7 @@ static int lpc43_pullup(struct usbdev_s *dev, bool enable) ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * * Description: * Initialize USB hardware. @@ -2616,7 +2616,7 @@ static int lpc43_pullup(struct usbdev_s *dev, bool enable) * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { struct lpc43_usbdev_s *priv = &g_usbdev; int i; @@ -2735,10 +2735,10 @@ void up_usbinitialize(void) } /**************************************************************************** - * Name: up_usbuninitialize + * Name: arm_usbuninitialize ****************************************************************************/ -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { struct lpc43_usbdev_s *priv = &g_usbdev; irqstate_t flags; diff --git a/arch/arm/src/lpc54xx/lpc54_allocateheap.c b/arch/arm/src/lpc54xx/lpc54_allocateheap.c index b40690101f2..61700718365 100644 --- a/arch/arm/src/lpc54xx/lpc54_allocateheap.c +++ b/arch/arm/src/lpc54xx/lpc54_allocateheap.c @@ -249,7 +249,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) #endif /**************************************************************************** - * Name: up_addregion + * Name: arm_addregion * * Description: * Memory may be added in non-contiguous chunks. Additional chunks are @@ -258,7 +258,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) ****************************************************************************/ #if CONFIG_MM_REGIONS > 1 -void up_addregion(void) +void arm_addregion(void) { int remaining = CONFIG_MM_REGIONS; FAR void *heapstart; diff --git a/arch/arm/src/lpc54xx/lpc54_dma.c b/arch/arm/src/lpc54xx/lpc54_dma.c index 7d48dd30169..9e5ef2efbfa 100644 --- a/arch/arm/src/lpc54xx/lpc54_dma.c +++ b/arch/arm/src/lpc54xx/lpc54_dma.c @@ -217,7 +217,7 @@ static int lpc54_dma_interrupt(int irq, FAR void *context, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Name: up_dma_initialize + * Name: arm_dma_initialize * * Description: * Initialize the DMA subsystem. Called from up_initialize() early in the @@ -228,7 +228,7 @@ static int lpc54_dma_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { int ret; diff --git a/arch/arm/src/lpc54xx/lpc54_ethernet.c b/arch/arm/src/lpc54xx/lpc54_ethernet.c index 52a190653bb..79f5fc3abf3 100644 --- a/arch/arm/src/lpc54xx/lpc54_ethernet.c +++ b/arch/arm/src/lpc54xx/lpc54_ethernet.c @@ -2992,7 +2992,7 @@ static int lpc54_phy_reset(struct lpc54_ethdriver_s *priv) ****************************************************************************/ /**************************************************************************** - * Name: up_netinitialize + * Name: arm_netinitialize * * Description: * Initialize the Ethernet controller and driver. @@ -3012,7 +3012,7 @@ static int lpc54_phy_reset(struct lpc54_ethdriver_s *priv) * ****************************************************************************/ -int up_netinitialize(int intf) +int arm_netinitialize(int intf) { struct lpc54_ethdriver_s *priv; int ret; diff --git a/arch/arm/src/lpc54xx/lpc54_irq.c b/arch/arm/src/lpc54xx/lpc54_irq.c index 77220736963..99c30184c54 100644 --- a/arch/arm/src/lpc54xx/lpc54_irq.c +++ b/arch/arm/src/lpc54xx/lpc54_irq.c @@ -364,8 +364,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(LPC54_IRQ_SVCALL, up_svcall, NULL); - irq_attach(LPC54_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(LPC54_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(LPC54_IRQ_HARDFAULT, arm_hardfault, NULL); /* Set the priority of the SVCall interrupt */ @@ -382,7 +382,7 @@ void up_irqinitialize(void) * Fault handler. */ - irq_attach(LPC54_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(LPC54_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(LPC54_IRQ_MEMFAULT); #endif @@ -391,7 +391,7 @@ void up_irqinitialize(void) #ifdef CONFIG_DEBUG_FEATURES irq_attach(LPC54_IRQ_NMI, lpc54_nmi, NULL); #ifndef CONFIG_ARM_MPU - irq_attach(LPC54_IRQ_MEMFAULT, up_memfault, NULL); + 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); @@ -501,14 +501,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { lpc54_clrpend(irq); } diff --git a/arch/arm/src/lpc54xx/lpc54_lowputc.c b/arch/arm/src/lpc54xx/lpc54_lowputc.c index 3340dd8ed39..3ab8f44281f 100644 --- a/arch/arm/src/lpc54xx/lpc54_lowputc.c +++ b/arch/arm/src/lpc54xx/lpc54_lowputc.c @@ -749,14 +749,14 @@ void lpc54_usart_disable(uintptr_t base) #endif /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #ifdef HAVE_USART_CONSOLE irqstate_t flags; diff --git a/arch/arm/src/lpc54xx/lpc54_serial.c b/arch/arm/src/lpc54xx/lpc54_serial.c index 8b152391a54..fc22f2a755a 100644 --- a/arch/arm/src/lpc54xx/lpc54_serial.c +++ b/arch/arm/src/lpc54xx/lpc54_serial.c @@ -1411,7 +1411,7 @@ void lpc54_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes @@ -1425,7 +1425,7 @@ void lpc54_earlyserialinit(void) * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #ifdef HAVE_USART_CONSOLE /* Register the serial console */ @@ -1487,10 +1487,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); lpc54_fifoint_enable(priv, intset); #endif @@ -1516,10 +1516,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); return ch; } #endif diff --git a/arch/arm/src/lpc54xx/lpc54_start.c b/arch/arm/src/lpc54xx/lpc54_start.c index 5d8a15cf77b..6e9de4543c0 100644 --- a/arch/arm/src/lpc54xx/lpc54_start.c +++ b/arch/arm/src/lpc54xx/lpc54_start.c @@ -67,7 +67,7 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -# define showprogress(c) up_lowputc(c) +# define showprogress(c) arm_lowputc(c) #else # define showprogress(c) #endif diff --git a/arch/arm/src/max326xx/common/max326_irq.c b/arch/arm/src/max326xx/common/max326_irq.c index 9a427f4b713..ea08cb603fd 100644 --- a/arch/arm/src/max326xx/common/max326_irq.c +++ b/arch/arm/src/max326xx/common/max326_irq.c @@ -363,8 +363,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(MAX326_IRQ_SVCALL, up_svcall, NULL); - irq_attach(MAX326_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(MAX326_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(MAX326_IRQ_HARDFAULT, arm_hardfault, NULL); /* Set the priority of the SVCall interrupt */ @@ -381,7 +381,7 @@ void up_irqinitialize(void) * Fault handler. */ - irq_attach(MAX326_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(MAX326_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(MAX326_IRQ_MEMFAULT); #endif @@ -390,7 +390,7 @@ void up_irqinitialize(void) #ifdef CONFIG_DEBUG_FEATURES irq_attach(MAX326_IRQ_NMI, max326_nmi, NULL); #ifndef CONFIG_ARM_MPU - irq_attach(MAX326_IRQ_MEMFAULT, up_memfault, NULL); + 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); @@ -518,14 +518,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { max326_clrpend(irq); } diff --git a/arch/arm/src/max326xx/common/max326_start.c b/arch/arm/src/max326xx/common/max326_start.c index 822a9e4a690..1e6b683a60b 100644 --- a/arch/arm/src/max326xx/common/max326_start.c +++ b/arch/arm/src/max326xx/common/max326_start.c @@ -82,7 +82,7 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -# define showprogress(c) up_lowputc(c) +# define showprogress(c) arm_lowputc(c) #else # define showprogress(c) #endif diff --git a/arch/arm/src/max326xx/max32660/max32660_dma.c b/arch/arm/src/max326xx/max32660/max32660_dma.c index e3d67f00185..9da2be68abd 100644 --- a/arch/arm/src/max326xx/max32660/max32660_dma.c +++ b/arch/arm/src/max326xx/max32660/max32660_dma.c @@ -221,7 +221,7 @@ static int max326_dmach_interrupt(int irq, FAR void *context, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Name: up_dma_initialize + * Name: arm_dma_initialize * * Description: * Initialize the DMA subsystem @@ -231,7 +231,7 @@ static int max326_dmach_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { int i; diff --git a/arch/arm/src/max326xx/max32660/max32660_lowputc.c b/arch/arm/src/max326xx/max32660/max32660_lowputc.c index 109772ebf97..5159497f36c 100644 --- a/arch/arm/src/max326xx/max32660/max32660_lowputc.c +++ b/arch/arm/src/max326xx/max32660/max32660_lowputc.c @@ -428,14 +428,14 @@ void max326_uart_disable(uintptr_t base) #endif /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #ifdef HAVE_UART_CONSOLE irqstate_t flags; diff --git a/arch/arm/src/max326xx/max32660/max32660_serial.c b/arch/arm/src/max326xx/max32660/max32660_serial.c index 558350592fc..c9bb674a27d 100644 --- a/arch/arm/src/max326xx/max32660/max32660_serial.c +++ b/arch/arm/src/max326xx/max32660/max32660_serial.c @@ -822,7 +822,7 @@ void max326_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes @@ -836,7 +836,7 @@ void max326_earlyserialinit(void) * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #ifdef HAVE_UART_CONSOLE /* Register the serial console */ @@ -874,10 +874,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); max326_int_enable(priv, intset); #endif @@ -903,10 +903,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); return ch; } #endif diff --git a/arch/arm/src/moxart/moxart_head.S b/arch/arm/src/moxart/moxart_head.S index c67ac085667..1f4b9db98c4 100644 --- a/arch/arm/src/moxart/moxart_head.S +++ b/arch/arm/src/moxart/moxart_head.S @@ -45,16 +45,16 @@ .section .text.exceptions _undef_instr: - b up_vectorundefinsn + b arm_vectorundefinsn _sw_interr: - b up_vectorswi + b arm_vectorswi _prefetch_abort: - b up_vectorprefetch + b arm_vectorprefetch _data_abort: - b up_vectordata + b arm_vectordata _reserved: b _reserved _irq: - b up_vectorirq + b arm_vectorirq _fiq: - b up_vectorfiq + b arm_vectorfiq diff --git a/arch/arm/src/moxart/moxart_irq.c b/arch/arm/src/moxart/moxart_irq.c index 291142115e9..8ce7747b41e 100644 --- a/arch/arm/src/moxart/moxart_irq.c +++ b/arch/arm/src/moxart/moxart_irq.c @@ -281,14 +281,14 @@ static int ffs(uint32_t word) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the interrupt * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { putreg32((1 << irq), IRQ_REG(IRQ__CLEAR)); } @@ -297,7 +297,7 @@ void up_ack_irq(int irq) * Entry point for interrupts ****************************************************************************/ -void up_decodeirq(uint32_t *regs) +uint32_t *arm_decodeirq(uint32_t *regs) { uint32_t num, status; @@ -306,17 +306,19 @@ void up_decodeirq(uint32_t *regs) status = getreg32(IRQ_REG(IRQ__STATUS)); if (!status) { - return; + return NULL; } /* Ack IRQ */ num = ffs(status) - 1; - up_ack_irq(num); + arm_ack_irq(num); DEBUGASSERT(CURRENT_REGS == NULL); CURRENT_REGS = regs; irq_dispatch(num, regs); CURRENT_REGS = NULL; + + return NULL; /* Return not used in this architecture */ } diff --git a/arch/arm/src/moxart/moxart_lowputc.S b/arch/arm/src/moxart/moxart_lowputc.S index c9dad21654f..84857b3d9f9 100644 --- a/arch/arm/src/moxart/moxart_lowputc.S +++ b/arch/arm/src/moxart/moxart_lowputc.S @@ -72,7 +72,7 @@ **************************************************************************/ /************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc **************************************************************************/ /* This assembly language version has the advantage that it can does not @@ -81,9 +81,9 @@ */ .text - .global up_lowputc - .type up_lowputc, function -up_lowputc: + .global arm_lowputc + .type arm_lowputc, function +arm_lowputc: /* On entry, r0 holds the character to be printed */ ldr r2, =UART0_BASE /* r2=UART0 base */ diff --git a/arch/arm/src/nrf52/nrf52_allocateheap.c b/arch/arm/src/nrf52/nrf52_allocateheap.c index 4cc57304d72..313ab65699b 100644 --- a/arch/arm/src/nrf52/nrf52_allocateheap.c +++ b/arch/arm/src/nrf52/nrf52_allocateheap.c @@ -205,7 +205,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) #endif /**************************************************************************** - * Name: up_addregion + * Name: arm_addregion * * Description: * Memory may be added in non-contiguous chunks. Additional chunks are @@ -214,7 +214,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) ****************************************************************************/ #if CONFIG_MM_REGIONS > 1 -void up_addregion(void) +void arm_addregion(void) { } #endif /* CONFIG_MM_REGIONS > 1 */ diff --git a/arch/arm/src/nrf52/nrf52_irq.c b/arch/arm/src/nrf52/nrf52_irq.c index 113a516d582..f2a42d94749 100644 --- a/arch/arm/src/nrf52/nrf52_irq.c +++ b/arch/arm/src/nrf52/nrf52_irq.c @@ -378,8 +378,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(NRF52_IRQ_SVCALL, up_svcall, NULL); - irq_attach(NRF52_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(NRF52_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(NRF52_IRQ_HARDFAULT, arm_hardfault, NULL); /* Set the priority of the SVCall interrupt */ @@ -398,7 +398,7 @@ void up_irqinitialize(void) * Fault handler. */ - irq_attach(NRF52_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(NRF52_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(NRF52_IRQ_MEMFAULT); #endif @@ -407,7 +407,7 @@ void up_irqinitialize(void) #ifdef CONFIG_DEBUG_FEATURES irq_attach(NRF52_IRQ_NMI, nrf52_nmi, NULL); #ifndef CONFIG_ARM_MPU - irq_attach(NRF52_IRQ_MEMFAULT, up_memfault, NULL); + 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); @@ -517,14 +517,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { nrf52_clrpend(irq); } diff --git a/arch/arm/src/nrf52/nrf52_lowputc.c b/arch/arm/src/nrf52/nrf52_lowputc.c index 10dbf055f6a..ea40102345e 100644 --- a/arch/arm/src/nrf52/nrf52_lowputc.c +++ b/arch/arm/src/nrf52/nrf52_lowputc.c @@ -243,14 +243,14 @@ void nrf52_usart_disable(uintptr_t base, const struct uart_config_s *config) #endif /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #ifdef HAVE_UART_CONSOLE putreg32(1, CONSOLE_BASE + NRF52_UART_TASKS_STARTTX_OFFSET); diff --git a/arch/arm/src/nrf52/nrf52_serial.c b/arch/arm/src/nrf52/nrf52_serial.c index 0dbdce73a96..5dd347fd1ce 100644 --- a/arch/arm/src/nrf52/nrf52_serial.c +++ b/arch/arm/src/nrf52/nrf52_serial.c @@ -636,7 +636,7 @@ void nrf52_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes @@ -650,7 +650,7 @@ void nrf52_earlyserialinit(void) * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { unsigned minor = 0; unsigned i = 0; @@ -711,10 +711,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; @@ -739,10 +739,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); return ch; #endif } diff --git a/arch/arm/src/nrf52/nrf52_start.c b/arch/arm/src/nrf52/nrf52_start.c index 2ba60c12090..3196b26a83d 100644 --- a/arch/arm/src/nrf52/nrf52_start.c +++ b/arch/arm/src/nrf52/nrf52_start.c @@ -72,7 +72,7 @@ ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -# define showprogress(c) up_lowputc(c) +# define showprogress(c) arm_lowputc(c) #else # define showprogress(c) #endif diff --git a/arch/arm/src/nuc1xx/nuc_irq.c b/arch/arm/src/nuc1xx/nuc_irq.c index 7682d757235..2f12a50abde 100644 --- a/arch/arm/src/nuc1xx/nuc_irq.c +++ b/arch/arm/src/nuc1xx/nuc_irq.c @@ -231,8 +231,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(NUC_IRQ_SVCALL, up_svcall, NULL); - irq_attach(NUC_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(NUC_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(NUC_IRQ_HARDFAULT, arm_hardfault, NULL); /* Attach all other processor exceptions (except reset and sys tick) */ @@ -323,14 +323,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { nuc_clrpend(irq); } diff --git a/arch/arm/src/nuc1xx/nuc_serial.c b/arch/arm/src/nuc1xx/nuc_serial.c index 85db3c1b8d2..5754266bab1 100644 --- a/arch/arm/src/nuc1xx/nuc_serial.c +++ b/arch/arm/src/nuc1xx/nuc_serial.c @@ -1000,19 +1000,19 @@ static bool up_txempty(struct uart_dev_s *dev) #ifdef USE_EARLYSERIALINIT /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level UART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * * NOTE: Configuration of the CONSOLE UART was performed by up_lowsetup() * very early in the boot sequence. * ****************************************************************************/ -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { /* Configuration whichever UART is the console */ @@ -1024,15 +1024,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes that - * up_earlyserialinit was called previously. + * arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #ifdef CONSOLE_DEV uart_register("/dev/console", &CONSOLE_DEV); diff --git a/arch/arm/src/nuc1xx/nuc_start.c b/arch/arm/src/nuc1xx/nuc_start.c index 875de6d5345..ed8473db9d3 100644 --- a/arch/arm/src/nuc1xx/nuc_start.c +++ b/arch/arm/src/nuc1xx/nuc_start.c @@ -145,7 +145,7 @@ void __start(void) /* Perform early serial initialization */ #ifdef USE_EARLYSERIALINIT - up_earlyserialinit(); + arm_earlyserialinit(); #endif showprogress('D'); diff --git a/arch/arm/src/s32k1xx/s32k11x/s32k11x_irq.c b/arch/arm/src/s32k1xx/s32k11x/s32k11x_irq.c index 9fb923aaac9..3dd96eecbd6 100644 --- a/arch/arm/src/s32k1xx/s32k11x/s32k11x_irq.c +++ b/arch/arm/src/s32k1xx/s32k11x/s32k11x_irq.c @@ -189,8 +189,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(S32K1XX_IRQ_SVCALL, up_svcall, NULL); - irq_attach(S32K1XX_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(S32K1XX_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(S32K1XX_IRQ_HARDFAULT, arm_hardfault, NULL); /* Attach all other processor exceptions (except reset and sys tick) */ @@ -288,14 +288,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { s32k11x_clrpend(irq); } diff --git a/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c b/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c index 2d3511f29a9..0da1e901dda 100644 --- a/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c +++ b/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c @@ -385,8 +385,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(S32K1XX_IRQ_SVCALL, up_svcall, NULL); - irq_attach(S32K1XX_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(S32K1XX_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(S32K1XX_IRQ_HARDFAULT, arm_hardfault, NULL); /* Set the priority of the SVCall interrupt */ @@ -403,7 +403,7 @@ void up_irqinitialize(void) * Fault handler. */ - irq_attach(S32K1XX_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(S32K1XX_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(S32K1XX_IRQ_MEMFAULT); #endif @@ -412,7 +412,7 @@ void up_irqinitialize(void) #ifdef CONFIG_DEBUG_FEATURES irq_attach(S32K1XX_IRQ_NMI, s32k14x_nmi, NULL); #ifndef CONFIG_ARM_MPU - irq_attach(S32K1XX_IRQ_MEMFAULT, up_memfault, NULL); + 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); @@ -522,14 +522,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { s32k14x_clrpend(irq); } diff --git a/arch/arm/src/s32k1xx/s32k1xx_edma.c b/arch/arm/src/s32k1xx/s32k1xx_edma.c index 0d906c78fe0..8b56fc78dd6 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_edma.c +++ b/arch/arm/src/s32k1xx/s32k1xx_edma.c @@ -680,7 +680,7 @@ static int s32k1xx_error_interrupt(int irq, void *context, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Name: up_dma_initialize + * Name: arm_dma_initialize * * Description: * Initialize the DMA subsystem @@ -693,7 +693,7 @@ static int s32k1xx_error_interrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { uintptr_t regaddr; uint32_t regval; diff --git a/arch/arm/src/s32k1xx/s32k1xx_enet.c b/arch/arm/src/s32k1xx/s32k1xx_enet.c index 4c1dc43dc03..52f6f8c074a 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_enet.c +++ b/arch/arm/src/s32k1xx/s32k1xx_enet.c @@ -2661,7 +2661,7 @@ int s32k1xx_netinitialize(int intf) } /**************************************************************************** - * Name: up_netinitialize + * Name: arm_netinitialize * * Description: * Initialize the first network interface. If there are more than one @@ -2672,7 +2672,7 @@ int s32k1xx_netinitialize(int intf) ****************************************************************************/ #if CONFIG_S32K1XX_ENET_NETHIFS == 1 && !defined(CONFIG_NETDEV_LATEINIT) -void up_netinitialize(void) +void arm_netinitialize(void) { s32k1xx_netinitialize(0); } diff --git a/arch/arm/src/s32k1xx/s32k1xx_enet.h b/arch/arm/src/s32k1xx/s32k1xx_enet.h index d6d84fbef4f..ef89913af2f 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_enet.h +++ b/arch/arm/src/s32k1xx/s32k1xx_enet.h @@ -70,7 +70,7 @@ extern "C" #endif /************************************************************************************ - * Function: up_netinitialize + * Function: arm_netinitialize * * Description: * Initialize the first network interface. If there are more than one @@ -89,7 +89,7 @@ extern "C" * ************************************************************************************/ -void up_netinitialize(void); +void arm_netinitialize(void); /************************************************************************************ * Function: s32k1xx_phy_boardinitialize diff --git a/arch/arm/src/s32k1xx/s32k1xx_serial.c b/arch/arm/src/s32k1xx/s32k1xx_serial.c index 44ae58af9fb..492ecd169c2 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_serial.c +++ b/arch/arm/src/s32k1xx/s32k1xx_serial.c @@ -1212,7 +1212,7 @@ static int up_pm_prepare(struct pm_callback_s *cb, int domain, * Description: * Performs the low level UART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * ****************************************************************************/ @@ -1234,7 +1234,7 @@ void s32k1xx_earlyserialinit(void) } /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes @@ -1242,7 +1242,7 @@ void s32k1xx_earlyserialinit(void) * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #ifdef CONFIG_PM int ret; @@ -1320,10 +1320,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; diff --git a/arch/arm/src/s32k1xx/s32k1xx_serial.h b/arch/arm/src/s32k1xx/s32k1xx_serial.h index 4af2ec4d5be..c4b1f37d7d8 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_serial.h +++ b/arch/arm/src/s32k1xx/s32k1xx_serial.h @@ -82,7 +82,7 @@ extern "C" * Description: * Performs the low level UART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * ****************************************************************************/ diff --git a/arch/arm/src/s32k1xx/s32k1xx_wdog.h b/arch/arm/src/s32k1xx/s32k1xx_wdog.h index 3ce6ec071b4..029b362f444 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_wdog.h +++ b/arch/arm/src/s32k1xx/s32k1xx_wdog.h @@ -65,7 +65,7 @@ * Description: * Performs the low level UART initialization early in debug so that the * serial console will be available during boot-up. This must be called - * before up_serialinit. + * before arm_serialinit. * * REVISIT: Hardcoded assumption that WDOG clock derives for LPO_CLK * diff --git a/arch/arm/src/sam34/sam_allocateheap.c b/arch/arm/src/sam34/sam_allocateheap.c index 95c9a96f2d8..dec94c6cbcd 100644 --- a/arch/arm/src/sam34/sam_allocateheap.c +++ b/arch/arm/src/sam34/sam_allocateheap.c @@ -292,7 +292,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) #endif /**************************************************************************** - * Name: up_addregion + * Name: arm_addregion * * Description: * Memory may be added in non-contiguous chunks. Additional chunks are @@ -301,7 +301,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) ****************************************************************************/ #if CONFIG_MM_REGIONS > 1 -void up_addregion(void) +void arm_addregion(void) { /* The SAM3U also have SRAM1 and NFCSRAM, We will add these as regions * the first two additional memory regions if we have them. diff --git a/arch/arm/src/sam34/sam_dmac.c b/arch/arm/src/sam34/sam_dmac.c index 9fc9e4d1f8e..2816f015090 100644 --- a/arch/arm/src/sam34/sam_dmac.c +++ b/arch/arm/src/sam34/sam_dmac.c @@ -1354,7 +1354,7 @@ static int sam_dmainterrupt(int irq, void *context, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Name: up_dma_initialize + * Name: arm_dma_initialize * * Description: * Initialize the DMA subsystem @@ -1364,7 +1364,7 @@ static int sam_dmainterrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { dmainfo("Initialize DMAC0\n"); diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c index 97e922e1cba..c7ea72a10c2 100644 --- a/arch/arm/src/sam34/sam_emac.c +++ b/arch/arm/src/sam34/sam_emac.c @@ -3619,7 +3619,7 @@ static int sam_emac_configure(struct sam_emac_s *priv) ****************************************************************************/ /**************************************************************************** - * Function: up_netinitialize + * Function: arm_netinitialize * * Description: * Initialize the EMAC driver. @@ -3635,7 +3635,7 @@ static int sam_emac_configure(struct sam_emac_s *priv) * ****************************************************************************/ -void up_netinitialize(void) +void arm_netinitialize(void) { struct sam_emac_s *priv = &g_emac; int ret; diff --git a/arch/arm/src/sam34/sam_emac.h b/arch/arm/src/sam34/sam_emac.h index 8f729d60c9f..5b6dd84cd0e 100644 --- a/arch/arm/src/sam34/sam_emac.h +++ b/arch/arm/src/sam34/sam_emac.h @@ -71,7 +71,7 @@ extern "C" #endif /**************************************************************************** - * Function: up_netinitialize + * Function: arm_netinitialize * * Description: * Initialize the EMAC driver. Also prototyped in arm_internal.h. @@ -87,7 +87,7 @@ extern "C" * ****************************************************************************/ -void up_netinitialize(void); +void arm_netinitialize(void); /************************************************************************************ * Function: sam_phy_boardinitialize diff --git a/arch/arm/src/sam34/sam_irq.c b/arch/arm/src/sam34/sam_irq.c index d475cd645a1..74a6d3bd2f4 100644 --- a/arch/arm/src/sam34/sam_irq.c +++ b/arch/arm/src/sam34/sam_irq.c @@ -430,8 +430,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(SAM_IRQ_SVCALL, up_svcall, NULL); - irq_attach(SAM_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(SAM_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(SAM_IRQ_HARDFAULT, arm_hardfault, NULL); /* Set the priority of the SVCall interrupt */ @@ -447,7 +447,7 @@ void up_irqinitialize(void) */ #ifdef CONFIG_ARM_MPU - irq_attach(SAM_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(SAM_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(SAM_IRQ_MEMFAULT); #endif @@ -456,7 +456,7 @@ void up_irqinitialize(void) #ifdef CONFIG_DEBUG_FEATURES irq_attach(SAM_IRQ_NMI, sam_nmi, NULL); #ifndef CONFIG_ARM_MPU - irq_attach(SAM_IRQ_MEMFAULT, up_memfault, NULL); + 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); @@ -588,14 +588,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { } diff --git a/arch/arm/src/sam34/sam_lowputc.c b/arch/arm/src/sam34/sam_lowputc.c index 375bfbb1cdf..285e4494ed6 100644 --- a/arch/arm/src/sam34/sam_lowputc.c +++ b/arch/arm/src/sam34/sam_lowputc.c @@ -271,14 +271,14 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #ifdef HAVE_CONSOLE irqstate_t flags; @@ -328,10 +328,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; } diff --git a/arch/arm/src/sam34/sam_serial.c b/arch/arm/src/sam34/sam_serial.c index f10bfc90212..0ff9e9c13b5 100644 --- a/arch/arm/src/sam34/sam_serial.c +++ b/arch/arm/src/sam34/sam_serial.c @@ -1322,17 +1322,17 @@ static bool up_txempty(struct uart_dev_s *dev) ****************************************************************************/ /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level USART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * ****************************************************************************/ #ifdef USE_EARLYSERIALINIT -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { /* NOTE: All GPIO configuration for the USARTs was performed in * sam_lowsetup @@ -1367,15 +1367,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes - * that up_earlyserialinit was called previously. + * that arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { /* Register the console */ diff --git a/arch/arm/src/sam34/sam_start.c b/arch/arm/src/sam34/sam_start.c index dedecd25b9e..7afabe3ec88 100644 --- a/arch/arm/src/sam34/sam_start.c +++ b/arch/arm/src/sam34/sam_start.c @@ -117,7 +117,7 @@ void __start(void) __attribute__ ((no_instrument_function)); ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -# define showprogress(c) up_lowputc(c) +# define showprogress(c) arm_lowputc(c) #else # define showprogress(c) #endif @@ -327,7 +327,7 @@ void __start(void) /* Perform early serial initialization */ #ifdef USE_EARLYSERIALINIT - up_earlyserialinit(); + arm_earlyserialinit(); #endif showprogress('B'); diff --git a/arch/arm/src/sam34/sam_udp.c b/arch/arm/src/sam34/sam_udp.c index c01bcea4e65..29dd837061c 100644 --- a/arch/arm/src/sam34/sam_udp.c +++ b/arch/arm/src/sam34/sam_udp.c @@ -3877,7 +3877,7 @@ static void sam_sw_shutdown(struct sam_usbdev_s *priv) * Public Functions ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * Description: * Initialize the USB driver * Input Parameters: @@ -3888,7 +3888,7 @@ static void sam_sw_shutdown(struct sam_usbdev_s *priv) * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { /* For now there is only one USB controller, but we will always refer to * it using a pointer to make any future ports to multiple USB controllers @@ -3926,11 +3926,11 @@ void up_usbinitialize(void) return; errout: - up_usbuninitialize(); + arm_usbuninitialize(); } /**************************************************************************** - * Name: up_usbuninitialize + * Name: arm_usbuninitialize * Description: * Initialize the USB driver * Input Parameters: @@ -3941,7 +3941,7 @@ errout: * ****************************************************************************/ -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { /* For now there is only one USB controller, but we will always refer to * it using a pointer to make any future ports to multiple USB controllers @@ -4091,7 +4091,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver) /* Put the hardware in an inactive state. Then bring the hardware back up * in the initial state. This is essentially the same state as we were - * in when up_usbinitialize() was first called. + * in when arm_usbinitialize() was first called. */ sam_hw_shutdown(priv); diff --git a/arch/arm/src/sama5/sam_allocateheap.c b/arch/arm/src/sama5/sam_allocateheap.c index 14e2f10a3ea..7d0dade229a 100644 --- a/arch/arm/src/sama5/sam_allocateheap.c +++ b/arch/arm/src/sama5/sam_allocateheap.c @@ -274,7 +274,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) } /**************************************************************************** - * Name: up_addregion + * Name: arm_addregion * * Description: * Memory may be added in non-contiguous chunks. Additional chunks are @@ -283,7 +283,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) ****************************************************************************/ #if CONFIG_MM_REGIONS > 1 -void up_addregion(void) +void arm_addregion(void) { int nregions = CONFIG_MM_REGIONS - 1; uintptr_t vaddr; diff --git a/arch/arm/src/sama5/sam_dmac.c b/arch/arm/src/sama5/sam_dmac.c index d1aae251295..6d3f315d7eb 100644 --- a/arch/arm/src/sama5/sam_dmac.c +++ b/arch/arm/src/sama5/sam_dmac.c @@ -1896,7 +1896,7 @@ void sam_dmainitialize(struct sam_dmac_s *dmac) ****************************************************************************/ /**************************************************************************** - * Name: up_dma_initialize + * Name: arm_dma_initialize * * Description: * Initialize the DMA subsystem @@ -1906,7 +1906,7 @@ void sam_dmainitialize(struct sam_dmac_s *dmac) * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { #ifdef CONFIG_SAMA5_DMAC0 dmainfo("Initialize DMAC0\n"); diff --git a/arch/arm/src/sama5/sam_ethernet.c b/arch/arm/src/sama5/sam_ethernet.c index e764de4cb2c..f1af46f11d9 100644 --- a/arch/arm/src/sama5/sam_ethernet.c +++ b/arch/arm/src/sama5/sam_ethernet.c @@ -156,7 +156,7 @@ static inline void up_emac_initialize(void) ****************************************************************************/ /**************************************************************************** - * Function: up_netinitialize + * Function: arm_netinitialize * * Description: * This is the "standard" network initialization logic called from the @@ -174,7 +174,7 @@ static inline void up_emac_initialize(void) * ****************************************************************************/ -void up_netinitialize(void) +void arm_netinitialize(void) { /* The first device registered with be ETH0 and the second ETH1 */ diff --git a/arch/arm/src/sama5/sam_lowputc.c b/arch/arm/src/sama5/sam_lowputc.c index 555ca7bf512..eab19702434 100644 --- a/arch/arm/src/sama5/sam_lowputc.c +++ b/arch/arm/src/sama5/sam_lowputc.c @@ -229,14 +229,14 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #if defined(SAMA5_HAVE_UART_CONSOLE) || defined(SAMA5_HAVE_USART_CONSOLE) irqstate_t flags; @@ -340,10 +340,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; } diff --git a/arch/arm/src/sama5/sam_serial.c b/arch/arm/src/sama5/sam_serial.c index caad7b8e579..8b4472fa77c 100644 --- a/arch/arm/src/sama5/sam_serial.c +++ b/arch/arm/src/sama5/sam_serial.c @@ -1586,7 +1586,7 @@ static bool up_txempty(struct uart_dev_s *dev) * Description: * Performs the low level USART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * ****************************************************************************/ diff --git a/arch/arm/src/sama5/sam_serial.h b/arch/arm/src/sama5/sam_serial.h index c64ff761f30..430df9e245a 100644 --- a/arch/arm/src/sama5/sam_serial.h +++ b/arch/arm/src/sama5/sam_serial.h @@ -82,7 +82,7 @@ extern "C" * Description: * Performs the low level USART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * ****************************************************************************/ @@ -96,7 +96,7 @@ void sam_earlyserialinit(void); * Description: * Performs the low level USART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * ****************************************************************************/ diff --git a/arch/arm/src/sama5/sam_serialinit.c b/arch/arm/src/sama5/sam_serialinit.c index 26a79101f85..853e36fb377 100644 --- a/arch/arm/src/sama5/sam_serialinit.c +++ b/arch/arm/src/sama5/sam_serialinit.c @@ -57,7 +57,7 @@ * Description: * Performs the low level serial initialization early so that the serial * console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * ****************************************************************************/ @@ -82,15 +82,15 @@ void sam_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register all serial console and serial ports. This assumes - * that up_earlyserialinit was called previously. + * that arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #if defined(SAMA5_HAVE_UART) || defined(SAMA5_HAVE_USART) /* Register UART/USART drivers */ diff --git a/arch/arm/src/sama5/sam_udphs.c b/arch/arm/src/sama5/sam_udphs.c index 24ffc5a1f0e..f416030587a 100644 --- a/arch/arm/src/sama5/sam_udphs.c +++ b/arch/arm/src/sama5/sam_udphs.c @@ -4397,7 +4397,7 @@ static void sam_sw_shutdown(struct sam_usbdev_s *priv) * Public Functions ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * Description: * Initialize the USB driver * Input Parameters: @@ -4408,7 +4408,7 @@ static void sam_sw_shutdown(struct sam_usbdev_s *priv) * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { /* For now there is only one USB controller, but we will always refer to * it using a pointer to make any future ports to multiple USB controllers @@ -4446,11 +4446,11 @@ void up_usbinitialize(void) return; errout: - up_usbuninitialize(); + arm_usbuninitialize(); } /**************************************************************************** - * Name: up_usbuninitialize + * Name: arm_usbuninitialize * Description: * Initialize the USB driver * Input Parameters: @@ -4461,7 +4461,7 @@ errout: * ****************************************************************************/ -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { /* For now there is only one USB controller, but we will always refer to * it using a pointer to make any future ports to multiple USB controllers @@ -4611,7 +4611,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver) /* Put the hardware in an inactive state. Then bring the hardware back up * in the initial state. This is essentially the same state as we were - * in when up_usbinitialize() was first called. + * in when arm_usbinitialize() was first called. */ sam_hw_shutdown(priv); diff --git a/arch/arm/src/sama5/sam_xdmac.c b/arch/arm/src/sama5/sam_xdmac.c index d748dba45cd..4eb8e3e2461 100644 --- a/arch/arm/src/sama5/sam_xdmac.c +++ b/arch/arm/src/sama5/sam_xdmac.c @@ -1912,7 +1912,7 @@ void sam_dmainitialize(struct sam_xdmac_s *xdmac) ****************************************************************************/ /**************************************************************************** - * Name: up_dma_initialize + * Name: arm_dma_initialize * * Description: * Initialize the DMA subsystem @@ -1922,7 +1922,7 @@ void sam_dmainitialize(struct sam_xdmac_s *xdmac) * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { #ifdef CONFIG_SAMA5_XDMAC0 dmainfo("Initialize XDMAC0\n"); diff --git a/arch/arm/src/samd2l2/sam_dmac.c b/arch/arm/src/samd2l2/sam_dmac.c index 1970f8133fa..47ccc078d7a 100644 --- a/arch/arm/src/samd2l2/sam_dmac.c +++ b/arch/arm/src/samd2l2/sam_dmac.c @@ -770,7 +770,7 @@ static int sam_rxbuffer(struct sam_dmach_s *dmach, uint32_t paddr, ****************************************************************************/ /**************************************************************************** - * Name: up_dma_initialize + * Name: arm_dma_initialize * * Description: * Initialize the DMA subsystem @@ -780,7 +780,7 @@ static int sam_rxbuffer(struct sam_dmach_s *dmach, uint32_t paddr, * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { dmainfo("Initialize DMAC\n"); int i; diff --git a/arch/arm/src/samd2l2/sam_irq.c b/arch/arm/src/samd2l2/sam_irq.c index a4d49846dec..a42ab023292 100644 --- a/arch/arm/src/samd2l2/sam_irq.c +++ b/arch/arm/src/samd2l2/sam_irq.c @@ -187,8 +187,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(SAM_IRQ_SVCALL, up_svcall, NULL); - irq_attach(SAM_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(SAM_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(SAM_IRQ_HARDFAULT, arm_hardfault, NULL); /* Attach all other processor exceptions (except reset and sys tick) */ @@ -279,14 +279,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { sam_clrpend(irq); } diff --git a/arch/arm/src/samd2l2/sam_serial.c b/arch/arm/src/samd2l2/sam_serial.c index 80dd3caf999..25fb58fe304 100644 --- a/arch/arm/src/samd2l2/sam_serial.c +++ b/arch/arm/src/samd2l2/sam_serial.c @@ -958,20 +958,20 @@ static bool sam_txempty(struct uart_dev_s *dev) #ifdef USE_EARLYSERIALINIT /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level USART initialization early in debug so that the * serial console will be available during bootup. This must be called * before sam_serialinit. * - * NOTE: On this platform up_earlyserialinit() does not really do + * NOTE: On this platform arm_earlyserialinit() does not really do * anything of consequence and probably could be eliminated with little * effort. * ****************************************************************************/ -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { /* Disable all USARTS */ @@ -1001,7 +1001,7 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes @@ -1009,7 +1009,7 @@ void up_earlyserialinit(void) * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { /* Register the console */ diff --git a/arch/arm/src/samd2l2/sam_start.c b/arch/arm/src/samd2l2/sam_start.c index 0777027fa5a..9905ae93c37 100644 --- a/arch/arm/src/samd2l2/sam_start.c +++ b/arch/arm/src/samd2l2/sam_start.c @@ -146,7 +146,7 @@ void __start(void) /* Perform early serial initialization */ #ifdef USE_EARLYSERIALINIT - up_earlyserialinit(); + arm_earlyserialinit(); #endif showprogress('B'); diff --git a/arch/arm/src/samd2l2/sam_usb.c b/arch/arm/src/samd2l2/sam_usb.c index 51737cd2d58..ec3499bf3b4 100644 --- a/arch/arm/src/samd2l2/sam_usb.c +++ b/arch/arm/src/samd2l2/sam_usb.c @@ -3469,12 +3469,12 @@ static int sam_usb_interrupt(int irq, void *context, void *arg) return OK; } -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { - uinfo("up_usbuninitialize()\n"); + uinfo("arm_usbuninitialize()\n"); } -void up_usbinitialize(void) +void arm_usbinitialize(void) { /* For now there is only one USB controller, but we will always refer to * it using a pointer to make any future ports to multiple USB controllers @@ -3513,7 +3513,7 @@ void up_usbinitialize(void) return; errout: - up_usbuninitialize(); + arm_usbuninitialize(); } /**************************************************************************** @@ -4120,7 +4120,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver) /* Put the hardware in an inactive state. Then bring the hardware back up * in the initial state. This is essentially the same state as we were - * in when up_usbinitialize() was first called. + * in when arm_usbinitialize() was first called. */ sam_hw_shutdown(priv); diff --git a/arch/arm/src/samd5e5/sam_dmac.c b/arch/arm/src/samd5e5/sam_dmac.c index d8452760031..62ef1dae7c5 100644 --- a/arch/arm/src/samd5e5/sam_dmac.c +++ b/arch/arm/src/samd5e5/sam_dmac.c @@ -743,7 +743,7 @@ static int sam_rxbuffer(struct sam_dmach_s *dmach, uint32_t paddr, ****************************************************************************/ /**************************************************************************** - * Name: up_dma_initialize + * Name: arm_dma_initialize * * Description: * Initialize the DMA subsystem @@ -753,7 +753,7 @@ static int sam_rxbuffer(struct sam_dmach_s *dmach, uint32_t paddr, * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { dmainfo("Initialize DMAC\n"); int i; diff --git a/arch/arm/src/samd5e5/sam_ethernet.c b/arch/arm/src/samd5e5/sam_ethernet.c index 6ea7eb50b13..a5d0d1fbb70 100644 --- a/arch/arm/src/samd5e5/sam_ethernet.c +++ b/arch/arm/src/samd5e5/sam_ethernet.c @@ -100,7 +100,7 @@ static inline void up_gmac_initialize(void) ****************************************************************************/ /**************************************************************************** - * Function: up_netinitialize + * Function: arm_netinitialize * * Description: * This is the "standard" network initialization logic called from the @@ -116,7 +116,7 @@ static inline void up_gmac_initialize(void) * ****************************************************************************/ -void up_netinitialize(void) +void arm_netinitialize(void) { up_gmac_initialize(); } diff --git a/arch/arm/src/samd5e5/sam_irq.c b/arch/arm/src/samd5e5/sam_irq.c index 774fe8bab8c..29278399750 100644 --- a/arch/arm/src/samd5e5/sam_irq.c +++ b/arch/arm/src/samd5e5/sam_irq.c @@ -508,8 +508,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(SAM_IRQ_SVCALL, up_svcall, NULL); - irq_attach(SAM_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(SAM_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(SAM_IRQ_HARDFAULT, arm_hardfault, NULL); /* Set the priority of the SVCall interrupt */ @@ -525,7 +525,7 @@ void up_irqinitialize(void) */ #ifdef CONFIG_ARM_MPU - irq_attach(SAM_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(SAM_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(SAM_IRQ_MEMFAULT); #endif @@ -534,7 +534,7 @@ void up_irqinitialize(void) #ifdef CONFIG_DEBUG_FEATURES irq_attach(SAM_IRQ_NMI, sam_nmi, NULL); #ifndef CONFIG_ARM_MPU - irq_attach(SAM_IRQ_MEMFAULT, up_memfault, NULL); + 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); @@ -648,14 +648,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { } diff --git a/arch/arm/src/samd5e5/sam_serial.c b/arch/arm/src/samd5e5/sam_serial.c index 2a8ce730cfc..8313c421b0c 100644 --- a/arch/arm/src/samd5e5/sam_serial.c +++ b/arch/arm/src/samd5e5/sam_serial.c @@ -1007,20 +1007,20 @@ static bool sam_txempty(struct uart_dev_s *dev) #ifdef USE_EARLYSERIALINIT /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level USART initialization early in debug so that the * serial console will be available during bootup. This must be called * before sam_serialinit. * - * NOTE: On this platform up_earlyserialinit() does not really do + * NOTE: On this platform arm_earlyserialinit() does not really do * anything of consequence and probably could be eliminated with little * effort. * ****************************************************************************/ -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { /* Disable all USARTS */ @@ -1056,7 +1056,7 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes @@ -1064,7 +1064,7 @@ void up_earlyserialinit(void) * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { /* Register the console */ diff --git a/arch/arm/src/samd5e5/sam_start.c b/arch/arm/src/samd5e5/sam_start.c index dbc6116d764..c3bdc2ff14d 100644 --- a/arch/arm/src/samd5e5/sam_start.c +++ b/arch/arm/src/samd5e5/sam_start.c @@ -327,7 +327,7 @@ void __start(void) /* Perform early serial initialization */ #ifdef USE_EARLYSERIALINIT - up_earlyserialinit(); + arm_earlyserialinit(); #endif showprogress('B'); diff --git a/arch/arm/src/samd5e5/sam_usb.c b/arch/arm/src/samd5e5/sam_usb.c index 128534550c5..37e0368725c 100644 --- a/arch/arm/src/samd5e5/sam_usb.c +++ b/arch/arm/src/samd5e5/sam_usb.c @@ -3468,12 +3468,12 @@ static int sam_usb_interrupt(int irq, void *context, void *arg) return OK; } -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { - uinfo("up_usbuninitialize()\n"); + uinfo("arm_usbuninitialize()\n"); } -void up_usbinitialize(void) +void arm_usbinitialize(void) { /* For now there is only one USB controller, but we will always refer to * it using a pointer to make any future ports to multiple USB controllers @@ -3512,7 +3512,7 @@ void up_usbinitialize(void) return; errout: - up_usbuninitialize(); + arm_usbuninitialize(); } /**************************************************************************** @@ -4084,7 +4084,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver) /* Put the hardware in an inactive state. Then bring the hardware back up * in the initial state. This is essentially the same state as we were - * in when up_usbinitialize() was first called. + * in when arm_usbinitialize() was first called. */ sam_hw_shutdown(priv); diff --git a/arch/arm/src/samv7/sam_allocateheap.c b/arch/arm/src/samv7/sam_allocateheap.c index a5ec12d8a66..5a546cabc01 100644 --- a/arch/arm/src/samv7/sam_allocateheap.c +++ b/arch/arm/src/samv7/sam_allocateheap.c @@ -292,7 +292,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) #endif /**************************************************************************** - * Name: up_addregion + * Name: arm_addregion * * Description: * Memory may be added in non-contiguous chunks. Additional chunks are @@ -301,7 +301,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) ****************************************************************************/ #if CONFIG_MM_REGIONS > 1 -void up_addregion(void) +void arm_addregion(void) { #if HAVE_SDRAM_REGION != 0 /* Allow user access to the heap memory */ diff --git a/arch/arm/src/samv7/sam_ethernet.c b/arch/arm/src/samv7/sam_ethernet.c index 016142912cf..462923e8e7c 100644 --- a/arch/arm/src/samv7/sam_ethernet.c +++ b/arch/arm/src/samv7/sam_ethernet.c @@ -49,7 +49,7 @@ ****************************************************************************/ /**************************************************************************** - * Function: up_netinitialize + * Function: arm_netinitialize * * Description: * This is the "standard" network initialization logic called from the @@ -68,7 +68,7 @@ * ****************************************************************************/ -void up_netinitialize(void) +void arm_netinitialize(void) { #ifdef CONFIG_SAMV7_EMAC0 int ret; diff --git a/arch/arm/src/samv7/sam_irq.c b/arch/arm/src/samv7/sam_irq.c index 508ff2f9594..a954c874be0 100644 --- a/arch/arm/src/samv7/sam_irq.c +++ b/arch/arm/src/samv7/sam_irq.c @@ -426,8 +426,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(SAM_IRQ_SVCALL, up_svcall, NULL); - irq_attach(SAM_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(SAM_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(SAM_IRQ_HARDFAULT, arm_hardfault, NULL); /* Set the priority of the SVCall interrupt */ @@ -443,7 +443,7 @@ void up_irqinitialize(void) */ #ifdef CONFIG_ARM_MPU - irq_attach(SAM_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(SAM_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(SAM_IRQ_MEMFAULT); #endif @@ -452,7 +452,7 @@ void up_irqinitialize(void) #ifdef CONFIG_DEBUG_FEATURES irq_attach(SAM_IRQ_NMI, sam_nmi, NULL); #ifndef CONFIG_ARM_MPU - irq_attach(SAM_IRQ_MEMFAULT, up_memfault, NULL); + 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); @@ -584,14 +584,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { } diff --git a/arch/arm/src/samv7/sam_lowputc.c b/arch/arm/src/samv7/sam_lowputc.c index 09c70104c88..dca807efcbc 100644 --- a/arch/arm/src/samv7/sam_lowputc.c +++ b/arch/arm/src/samv7/sam_lowputc.c @@ -177,14 +177,14 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #ifdef HAVE_SERIAL_CONSOLE irqstate_t flags; @@ -233,10 +233,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; } diff --git a/arch/arm/src/samv7/sam_serial.c b/arch/arm/src/samv7/sam_serial.c index f731f4d7f10..4977c9c8f2e 100644 --- a/arch/arm/src/samv7/sam_serial.c +++ b/arch/arm/src/samv7/sam_serial.c @@ -1390,17 +1390,17 @@ static bool sam_txempty(struct uart_dev_s *dev) ****************************************************************************/ /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level USART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * ****************************************************************************/ #ifdef USE_EARLYSERIALINIT -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { /* NOTE: All GPIO configuration for the USARTs was performed in * sam_lowsetup @@ -1443,15 +1443,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes - * that up_earlyserialinit was called previously. + * that arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { /* Register the console */ diff --git a/arch/arm/src/samv7/sam_start.c b/arch/arm/src/samv7/sam_start.c index bbdba519921..d11d87679e6 100644 --- a/arch/arm/src/samv7/sam_start.c +++ b/arch/arm/src/samv7/sam_start.c @@ -395,7 +395,7 @@ void __start(void) /* Perform early serial initialization */ #ifdef USE_EARLYSERIALINIT - up_earlyserialinit(); + arm_earlyserialinit(); #endif /* Then start NuttX */ diff --git a/arch/arm/src/samv7/sam_usbdevhs.c b/arch/arm/src/samv7/sam_usbdevhs.c index f9f355f7771..1dab6ef9e4b 100644 --- a/arch/arm/src/samv7/sam_usbdevhs.c +++ b/arch/arm/src/samv7/sam_usbdevhs.c @@ -4823,7 +4823,7 @@ static void sam_sw_shutdown(struct sam_usbdev_s *priv) * Public Functions ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * Description: * Initialize the USB driver * Input Parameters: @@ -4834,7 +4834,7 @@ static void sam_sw_shutdown(struct sam_usbdev_s *priv) * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { /* For now there is only one USB controller, but we will always refer to * it using a pointer to make any future ports to multiple USB controllers @@ -4878,11 +4878,11 @@ void up_usbinitialize(void) return; errout: - up_usbuninitialize(); + arm_usbuninitialize(); } /**************************************************************************** - * Name: up_usbuninitialize + * Name: arm_usbuninitialize * Description: * Initialize the USB driver * Input Parameters: @@ -4893,7 +4893,7 @@ errout: * ****************************************************************************/ -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { struct sam_usbdev_s *priv = &g_usbhs; irqstate_t flags; @@ -5007,7 +5007,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver) /* Put the hardware in an inactive state. Then bring the hardware back up * in the initial state. This is essentially the same state as we were - * in when up_usbinitialize() was first called. + * in when arm_usbinitialize() was first called. */ sam_hw_shutdown(priv); diff --git a/arch/arm/src/samv7/sam_xdmac.c b/arch/arm/src/samv7/sam_xdmac.c index b7d9afe010b..977fdb48621 100644 --- a/arch/arm/src/samv7/sam_xdmac.c +++ b/arch/arm/src/samv7/sam_xdmac.c @@ -1601,7 +1601,7 @@ void sam_dmainitialize(struct sam_xdmac_s *xdmac) ****************************************************************************/ /**************************************************************************** - * Name: up_dma_initialize + * Name: arm_dma_initialize * * Description: * Initialize the DMA subsystem @@ -1611,7 +1611,7 @@ void sam_dmainitialize(struct sam_xdmac_s *xdmac) * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { dmainfo("Initialize XDMAC\n"); diff --git a/arch/arm/src/stm32/stm32_allocateheap.c b/arch/arm/src/stm32/stm32_allocateheap.c index 1fe112ff729..6ad0e5f7cc4 100644 --- a/arch/arm/src/stm32/stm32_allocateheap.c +++ b/arch/arm/src/stm32/stm32_allocateheap.c @@ -666,7 +666,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) #endif /****************************************************************************** - * Name: up_addregion + * Name: arm_addregion * * Description: * Memory may be added in non-contiguous chunks. Additional chunks are @@ -675,7 +675,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) ******************************************************************************/ #if CONFIG_MM_REGIONS > 1 -void up_addregion(void) +void arm_addregion(void) { #ifndef CONFIG_STM32_CCMEXCLUDE #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) diff --git a/arch/arm/src/stm32/stm32_dma_v1.c b/arch/arm/src/stm32/stm32_dma_v1.c index 2892dfd05d6..d269dd64ea4 100644 --- a/arch/arm/src/stm32/stm32_dma_v1.c +++ b/arch/arm/src/stm32/stm32_dma_v1.c @@ -342,7 +342,7 @@ static int stm32_dmainterrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { struct stm32_dma_s *dmach; int chndx; diff --git a/arch/arm/src/stm32/stm32_dma_v2.c b/arch/arm/src/stm32/stm32_dma_v2.c index 34c24bd59e2..b02ec5aaf01 100644 --- a/arch/arm/src/stm32/stm32_dma_v2.c +++ b/arch/arm/src/stm32/stm32_dma_v2.c @@ -460,7 +460,7 @@ static int stm32_dmainterrupt(int irq, void *context, void *arg) * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { struct stm32_dma_s *dmast; int stream; diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c index d3fde3ebf5c..d2c19371000 100644 --- a/arch/arm/src/stm32/stm32_eth.c +++ b/arch/arm/src/stm32/stm32_eth.c @@ -4010,7 +4010,7 @@ static int stm32_ethconfig(FAR struct stm32_ethmac_s *priv) * Description: * Initialize the Ethernet driver for one interface. If the STM32 chip * supports multiple Ethernet controllers, then board specific logic - * must implement up_netinitialize() and call this function to initialize + * must implement arm_netinitialize() and call this function to initialize * the desired interfaces. * * Input Parameters: @@ -4088,13 +4088,13 @@ int stm32_ethinitialize(int intf) } /**************************************************************************** - * Function: up_netinitialize + * Function: arm_netinitialize * * Description: * This is the "standard" network initialization logic called from the * low-level initialization logic in arm_initialize.c. If STM32_NETHERNET * greater than one, then board specific logic will have to supply a - * version of up_netinitialize() that calls stm32_ethinitialize() with + * version of arm_netinitialize() that calls stm32_ethinitialize() with * the appropriate interface number. * * Input Parameters: @@ -4108,7 +4108,7 @@ int stm32_ethinitialize(int intf) ****************************************************************************/ #if STM32_NETHERNET == 1 && !defined(CONFIG_NETDEV_LATEINIT) -void up_netinitialize(void) +void arm_netinitialize(void) { stm32_ethinitialize(0); } diff --git a/arch/arm/src/stm32/stm32_eth.h b/arch/arm/src/stm32/stm32_eth.h index 27cfb2d51b8..2742d011a68 100644 --- a/arch/arm/src/stm32/stm32_eth.h +++ b/arch/arm/src/stm32/stm32_eth.h @@ -69,7 +69,7 @@ extern "C" * Description: * Initialize the Ethernet driver for one interface. If the STM32 chip supports * multiple Ethernet controllers, then board specific logic must implement - * up_netinitialize() and call this function to initialize the desired interfaces. + * arm_netinitialize() and call this function to initialize the desired interfaces. * * Input Parameters: * intf - In the case where there are multiple EMACs, this value identifies which diff --git a/arch/arm/src/stm32/stm32_irq.c b/arch/arm/src/stm32/stm32_irq.c index b292713c50a..24da0ccc603 100644 --- a/arch/arm/src/stm32/stm32_irq.c +++ b/arch/arm/src/stm32/stm32_irq.c @@ -369,8 +369,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(STM32_IRQ_SVCALL, up_svcall, NULL); - irq_attach(STM32_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(STM32_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(STM32_IRQ_HARDFAULT, arm_hardfault, NULL); /* Set the priority of the SVCall interrupt */ @@ -386,7 +386,7 @@ void up_irqinitialize(void) */ #ifdef CONFIG_ARM_MPU - irq_attach(STM32_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(STM32_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(STM32_IRQ_MEMFAULT); #endif @@ -401,7 +401,7 @@ void up_irqinitialize(void) #ifdef CONFIG_DEBUG_FEATURES irq_attach(STM32_IRQ_NMI, stm32_nmi, NULL); #ifndef CONFIG_ARM_MPU - irq_attach(STM32_IRQ_MEMFAULT, up_memfault, NULL); + 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); @@ -495,14 +495,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { } diff --git a/arch/arm/src/stm32/stm32_lowputc.c b/arch/arm/src/stm32/stm32_lowputc.c index ee9668234db..3f8bd456115 100644 --- a/arch/arm/src/stm32/stm32_lowputc.c +++ b/arch/arm/src/stm32/stm32_lowputc.c @@ -401,14 +401,14 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #ifdef HAVE_CONSOLE /* Wait until the TX data register is empty */ diff --git a/arch/arm/src/stm32/stm32_otgfsdev.c b/arch/arm/src/stm32/stm32_otgfsdev.c index f1e04c81696..63fee03e5e2 100644 --- a/arch/arm/src/stm32/stm32_otgfsdev.c +++ b/arch/arm/src/stm32/stm32_otgfsdev.c @@ -5434,7 +5434,7 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv) ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * * Description: * Initialize USB hardware. @@ -5448,7 +5448,7 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv) * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { /* At present, there is only a single OTG FS device support. Hence it is * pre-allocated as g_otgfsdev. However, in most code, the private data @@ -5498,7 +5498,7 @@ void up_usbinitialize(void) * known state. */ - up_usbuninitialize(); + arm_usbuninitialize(); /* Initialie the driver data structure */ @@ -5531,14 +5531,14 @@ void up_usbinitialize(void) return; errout: - up_usbuninitialize(); + arm_usbuninitialize(); } /**************************************************************************** - * Name: up_usbuninitialize + * Name: arm_usbuninitialize ****************************************************************************/ -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { /* At present, there is only a single OTG FS device support. Hence it is * pre-allocated as g_otgfsdev. However, in most code, the private data diff --git a/arch/arm/src/stm32/stm32_otghsdev.c b/arch/arm/src/stm32/stm32_otghsdev.c index 7ef39610a39..9291765da86 100644 --- a/arch/arm/src/stm32/stm32_otghsdev.c +++ b/arch/arm/src/stm32/stm32_otghsdev.c @@ -5369,7 +5369,7 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv) ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * * Description: * Initialize USB hardware. @@ -5383,7 +5383,7 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv) * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { /* At present, there is only a single OTG HS device support. Hence it is * pre-allocated as g_otghsdev. However, in most code, the private data @@ -5432,7 +5432,7 @@ void up_usbinitialize(void) /* Uninitialize the hardware so that we know that we are starting from a * known state. */ - up_usbuninitialize(); + arm_usbuninitialize(); /* Initialie the driver data structure */ @@ -5465,14 +5465,14 @@ void up_usbinitialize(void) return; errout: - up_usbuninitialize(); + arm_usbuninitialize(); } /**************************************************************************** * Name: up_usbhsuninitialize ****************************************************************************/ -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { /* At present, there is only a single OTG HS device support. Hence it is * pre-allocated as g_otghsdev. However, in most code, the private data diff --git a/arch/arm/src/stm32/stm32_pminitialize.c b/arch/arm/src/stm32/stm32_pminitialize.c index 153f8469d16..61e98b14958 100644 --- a/arch/arm/src/stm32/stm32_pminitialize.c +++ b/arch/arm/src/stm32/stm32_pminitialize.c @@ -51,7 +51,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_pminitialize + * Name: arm_pminitialize * * Description: * This function is called by MCU-specific logic at power-on reset in @@ -68,7 +68,7 @@ * ****************************************************************************/ -void up_pminitialize(void) +void arm_pminitialize(void) { /* Then initialize the NuttX power management subsystem proper */ diff --git a/arch/arm/src/stm32/stm32_serial.c b/arch/arm/src/stm32/stm32_serial.c index 62ada542359..ac24d7bbca6 100644 --- a/arch/arm/src/stm32/stm32_serial.c +++ b/arch/arm/src/stm32/stm32_serial.c @@ -2700,17 +2700,17 @@ FAR uart_dev_t *stm32_serial_get_uart(int uart_num) #endif /* HAVE_SERIALDRIVER */ /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level USART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * ****************************************************************************/ #ifdef USE_EARLYSERIALINIT -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { #ifdef HAVE_SERIALDRIVER unsigned i; @@ -2735,15 +2735,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes - * that up_earlyserialinit was called previously. + * that arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #ifdef HAVE_SERIALDRIVER char devname[16]; @@ -2912,10 +2912,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); up_restoreusartint(priv, ie); #endif return ch; @@ -2940,10 +2940,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; } diff --git a/arch/arm/src/stm32/stm32_start.c b/arch/arm/src/stm32/stm32_start.c index 71ac5205171..e2374892bf8 100644 --- a/arch/arm/src/stm32/stm32_start.c +++ b/arch/arm/src/stm32/stm32_start.c @@ -109,7 +109,7 @@ static void go_nx_start(void *pv, unsigned int nbytes) ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -# define showprogress(c) up_lowputc(c) +# define showprogress(c) arm_lowputc(c) #else # define showprogress(c) #endif @@ -319,7 +319,7 @@ void __start(void) /* Perform early serial initialization */ #ifdef USE_EARLYSERIALINIT - up_earlyserialinit(); + arm_earlyserialinit(); #endif showprogress('D'); diff --git a/arch/arm/src/stm32/stm32_usbdev.c b/arch/arm/src/stm32/stm32_usbdev.c index 54a3d58798a..ee167f73b24 100644 --- a/arch/arm/src/stm32/stm32_usbdev.c +++ b/arch/arm/src/stm32/stm32_usbdev.c @@ -3692,7 +3692,7 @@ static void stm32_hwshutdown(struct stm32_usbdev_s *priv) * Public Functions ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * Description: * Initialize the USB driver * Input Parameters: @@ -3703,7 +3703,7 @@ static void stm32_hwshutdown(struct stm32_usbdev_s *priv) * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { /* For now there is only one USB controller, but we will always refer to * it using a pointer to make any future ports to multiple USB controllers @@ -3762,11 +3762,11 @@ void up_usbinitialize(void) return; errout: - up_usbuninitialize(); + arm_usbuninitialize(); } /**************************************************************************** - * Name: up_usbuninitialize + * Name: arm_usbuninitialize * Description: * Initialize the USB driver * Input Parameters: @@ -3777,7 +3777,7 @@ errout: * ****************************************************************************/ -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { /* For now there is only one USB controller, but we will always refer to * it using a pointer to make any future ports to multiple USB controllers diff --git a/arch/arm/src/stm32f0l0g0/stm32_dma_v1.c b/arch/arm/src/stm32f0l0g0/stm32_dma_v1.c index 4e7f81e5bd0..157fe9cdeaa 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_dma_v1.c +++ b/arch/arm/src/stm32f0l0g0/stm32_dma_v1.c @@ -332,7 +332,7 @@ static int stm32_dmainterrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { struct stm32_dma_s *dmach; int chndx; diff --git a/arch/arm/src/stm32f0l0g0/stm32_irq.c b/arch/arm/src/stm32f0l0g0/stm32_irq.c index 54ee970f48e..f83a2a663d1 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_irq.c +++ b/arch/arm/src/stm32f0l0g0/stm32_irq.c @@ -228,8 +228,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(STM32_IRQ_SVCALL, up_svcall, NULL); - irq_attach(STM32_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(STM32_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(STM32_IRQ_HARDFAULT, arm_hardfault, NULL); /* Attach all other processor exceptions (except reset and sys tick) */ @@ -328,14 +328,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { stm32_clrpend(irq); } diff --git a/arch/arm/src/stm32f0l0g0/stm32_lowputc_v1.c b/arch/arm/src/stm32f0l0g0/stm32_lowputc_v1.c index f3f64270c48..993ba81e4af 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_lowputc_v1.c +++ b/arch/arm/src/stm32f0l0g0/stm32_lowputc_v1.c @@ -232,14 +232,14 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #ifdef HAVE_CONSOLE /* Wait until the TX data register is empty */ diff --git a/arch/arm/src/stm32f0l0g0/stm32_lowputc_v2.c b/arch/arm/src/stm32f0l0g0/stm32_lowputc_v2.c index cb47203fa44..7b70a038525 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_lowputc_v2.c +++ b/arch/arm/src/stm32f0l0g0/stm32_lowputc_v2.c @@ -249,14 +249,14 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #ifdef HAVE_CONSOLE /* Wait until the TX data register is empty */ diff --git a/arch/arm/src/stm32f0l0g0/stm32_serial_v1.c b/arch/arm/src/stm32f0l0g0/stm32_serial_v1.c index 296fd1a76fb..a71a4c9e119 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_serial_v1.c +++ b/arch/arm/src/stm32f0l0g0/stm32_serial_v1.c @@ -2362,7 +2362,7 @@ static int stm32serial_pmprepare(FAR struct pm_callback_s *cb, int domain, #ifdef USE_SERIALDRIVER /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level USART initialization early in debug so that the @@ -2372,7 +2372,7 @@ static int stm32serial_pmprepare(FAR struct pm_callback_s *cb, int domain, ****************************************************************************/ #ifdef USE_EARLYSERIALINIT -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { #ifdef HAVE_USART unsigned i; @@ -2401,11 +2401,11 @@ void up_earlyserialinit(void) * * Description: * Register serial console and serial ports. This assumes - * that up_earlyserialinit was called previously. + * that arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #ifdef HAVE_USART char devname[16]; @@ -2553,10 +2553,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); stm32serial_restoreusartint(priv, ie); #endif return ch; @@ -2581,10 +2581,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; diff --git a/arch/arm/src/stm32f0l0g0/stm32_serial_v2.c b/arch/arm/src/stm32f0l0g0/stm32_serial_v2.c index 21ca09a8351..1b0d0ce7204 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_serial_v2.c +++ b/arch/arm/src/stm32f0l0g0/stm32_serial_v2.c @@ -1786,17 +1786,17 @@ FAR uart_dev_t *stm32_serial_get_uart(int uart_num) } /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level USART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * ****************************************************************************/ #ifdef USE_EARLYSERIALINIT -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { #ifdef HAVE_UART unsigned i; @@ -1821,15 +1821,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes - * that up_earlyserialinit was called previously. + * that arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #ifdef HAVE_UART char devname[16]; @@ -1915,10 +1915,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); up_restoreusartint(priv, ie); #endif @@ -1944,10 +1944,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; } diff --git a/arch/arm/src/stm32f0l0g0/stm32_start.c b/arch/arm/src/stm32f0l0g0/stm32_start.c index 30c35e877ae..421b153094b 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_start.c +++ b/arch/arm/src/stm32f0l0g0/stm32_start.c @@ -80,7 +80,7 @@ const uint32_t g_idle_topstack = IDLE_STACK; ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -# define showprogress(c) up_lowputc(c) +# define showprogress(c) arm_lowputc(c) #else # define showprogress(c) #endif @@ -135,7 +135,7 @@ void __start(void) /* Perform early serial initialization */ #ifdef USE_EARLYSERIALINIT - up_earlyserialinit(); + arm_earlyserialinit(); #endif showprogress('D'); diff --git a/arch/arm/src/stm32f0l0g0/stm32_usbdev.c b/arch/arm/src/stm32f0l0g0/stm32_usbdev.c index ba97c510df5..8b1e3fbf7af 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_usbdev.c +++ b/arch/arm/src/stm32f0l0g0/stm32_usbdev.c @@ -3633,7 +3633,7 @@ static void stm32_hwshutdown(struct stm32_usbdev_s *priv) ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * Description: * Initialize the USB driver * Input Parameters: @@ -3644,7 +3644,7 @@ static void stm32_hwshutdown(struct stm32_usbdev_s *priv) * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { /* For now there is only one USB controller, but we will always refer to * it using a pointer to make any future ports to multiple USB controllers @@ -3687,11 +3687,11 @@ void up_usbinitialize(void) return; errout: - up_usbuninitialize(); + arm_usbuninitialize(); } /**************************************************************************** - * Name: up_usbuninitialize + * Name: arm_usbuninitialize * Description: * Initialize the USB driver * Input Parameters: @@ -3702,7 +3702,7 @@ errout: * ****************************************************************************/ -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { /* For now there is only one USB controller, but we will always refer to * it using a pointer to make any future ports to multiple USB controllers diff --git a/arch/arm/src/stm32f7/stm32_allocateheap.c b/arch/arm/src/stm32f7/stm32_allocateheap.c index 7ea8b4c735c..e09945f1e47 100644 --- a/arch/arm/src/stm32f7/stm32_allocateheap.c +++ b/arch/arm/src/stm32f7/stm32_allocateheap.c @@ -370,7 +370,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) #endif /**************************************************************************** - * Name: up_addregion + * Name: arm_addregion * * Description: * Memory may be added in non-contiguous chunks. Additional chunks are @@ -379,7 +379,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) ****************************************************************************/ #if CONFIG_MM_REGIONS > 1 -void up_addregion(void) +void arm_addregion(void) { #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) diff --git a/arch/arm/src/stm32f7/stm32_dma.c b/arch/arm/src/stm32f7/stm32_dma.c index 4e5a6e82332..ef2d9cfaa94 100644 --- a/arch/arm/src/stm32f7/stm32_dma.c +++ b/arch/arm/src/stm32f7/stm32_dma.c @@ -464,7 +464,7 @@ static int stm32_dmainterrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { struct stm32_dma_s *dmast; int stream; diff --git a/arch/arm/src/stm32f7/stm32_ethernet.c b/arch/arm/src/stm32f7/stm32_ethernet.c index a4ee7b013d5..b11c769643a 100644 --- a/arch/arm/src/stm32f7/stm32_ethernet.c +++ b/arch/arm/src/stm32f7/stm32_ethernet.c @@ -4098,7 +4098,7 @@ static int stm32_ethconfig(struct stm32_ethmac_s *priv) * Description: * Initialize the Ethernet driver for one interface. If the STM32 chip * supports multiple Ethernet controllers, then board specific logic - * must implement up_netinitialize() and call this function to initialize + * must implement arm_netinitialize() and call this function to initialize * the desired interfaces. * * Input Parameters: @@ -4187,13 +4187,13 @@ int stm32_ethinitialize(int intf) } /**************************************************************************** - * Function: up_netinitialize + * Function: arm_netinitialize * * Description: * This is the "standard" network initialization logic called from the * low-level initialization logic in arm_initialize.c. If STM32F7_NETHERNET * greater than one, then board specific logic will have to supply a - * version of up_netinitialize() that calls stm32_ethinitialize() with + * version of arm_netinitialize() that calls stm32_ethinitialize() with * the appropriate interface number. * * Input Parameters: @@ -4207,7 +4207,7 @@ int stm32_ethinitialize(int intf) ****************************************************************************/ #if STM32F7_NETHERNET == 1 && !defined(CONFIG_NETDEV_LATEINIT) -void up_netinitialize(void) +void arm_netinitialize(void) { stm32_ethinitialize(0); } diff --git a/arch/arm/src/stm32f7/stm32_ethernet.h b/arch/arm/src/stm32f7/stm32_ethernet.h index fad8e365a61..2e0a1f4358a 100644 --- a/arch/arm/src/stm32f7/stm32_ethernet.h +++ b/arch/arm/src/stm32f7/stm32_ethernet.h @@ -66,7 +66,7 @@ extern "C" * Description: * Initialize the Ethernet driver for one interface. If the STM32 chip supports * multiple Ethernet controllers, then board specific logic must implement - * up_netinitialize() and call this function to initialize the desired interfaces. + * arm_netinitialize() and call this function to initialize the desired interfaces. * * Input Parameters: * intf - In the case where there are multiple EMACs, this value identifies which diff --git a/arch/arm/src/stm32f7/stm32_irq.c b/arch/arm/src/stm32f7/stm32_irq.c index 4df25de4208..b172375cab4 100644 --- a/arch/arm/src/stm32f7/stm32_irq.c +++ b/arch/arm/src/stm32f7/stm32_irq.c @@ -459,8 +459,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(STM32_IRQ_SVCALL, up_svcall, NULL); - irq_attach(STM32_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(STM32_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(STM32_IRQ_HARDFAULT, arm_hardfault, NULL); /* Set the priority of the SVCall interrupt */ @@ -476,7 +476,7 @@ void up_irqinitialize(void) */ #ifdef CONFIG_ARM_MPU - irq_attach(STM32_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(STM32_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(STM32_IRQ_MEMFAULT); #endif @@ -485,7 +485,7 @@ void up_irqinitialize(void) #ifdef CONFIG_DEBUG_FEATURES irq_attach(STM32_IRQ_NMI, stm32_nmi, NULL); #ifndef CONFIG_ARM_MPU - irq_attach(STM32_IRQ_MEMFAULT, up_memfault, NULL); + 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); @@ -617,14 +617,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { } diff --git a/arch/arm/src/stm32f7/stm32_lowputc.c b/arch/arm/src/stm32f7/stm32_lowputc.c index b2131a87358..013169dd129 100644 --- a/arch/arm/src/stm32f7/stm32_lowputc.c +++ b/arch/arm/src/stm32f7/stm32_lowputc.c @@ -325,14 +325,14 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #ifdef HAVE_CONSOLE /* Wait until the TX data register is empty */ diff --git a/arch/arm/src/stm32f7/stm32_otgdev.c b/arch/arm/src/stm32f7/stm32_otgdev.c index b43656f0916..e94f405e5aa 100644 --- a/arch/arm/src/stm32f7/stm32_otgdev.c +++ b/arch/arm/src/stm32f7/stm32_otgdev.c @@ -5634,7 +5634,7 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv) ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * * Description: * Initialize USB hardware. @@ -5648,7 +5648,7 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv) * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { /* At present, there is only a single OTG device support. Hence it is * pre-allocated as g_otghsdev. However, in most code, the private data @@ -5683,7 +5683,7 @@ void up_usbinitialize(void) * known state. */ - up_usbuninitialize(); + arm_usbuninitialize(); /* Initialie the driver data structure */ @@ -5717,14 +5717,14 @@ void up_usbinitialize(void) return; errout: - up_usbuninitialize(); + arm_usbuninitialize(); } /**************************************************************************** - * Name: up_usbuninitialize + * Name: arm_usbuninitialize ****************************************************************************/ -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { /* At present, there is only a single OTG device support. Hence it is * pre-allocated as g_otghsdev. However, in most code, the private data diff --git a/arch/arm/src/stm32f7/stm32_pminitialize.c b/arch/arm/src/stm32f7/stm32_pminitialize.c index fc5d984354b..d73ab84b686 100644 --- a/arch/arm/src/stm32f7/stm32_pminitialize.c +++ b/arch/arm/src/stm32f7/stm32_pminitialize.c @@ -51,7 +51,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_pminitialize + * Name: arm_pminitialize * * Description: * This function is called by MCU-specific logic at power-on reset in @@ -68,7 +68,7 @@ * ****************************************************************************/ -void up_pminitialize(void) +void arm_pminitialize(void) { /* Then initialize the NuttX power management subsystem proper */ diff --git a/arch/arm/src/stm32f7/stm32_serial.c b/arch/arm/src/stm32f7/stm32_serial.c index fe046ab0c14..a1667b28906 100644 --- a/arch/arm/src/stm32f7/stm32_serial.c +++ b/arch/arm/src/stm32f7/stm32_serial.c @@ -3550,17 +3550,17 @@ static int up_pm_prepare(struct pm_callback_s *cb, int domain, #ifdef USE_SERIALDRIVER /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level USART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * ****************************************************************************/ #ifdef USE_EARLYSERIALINIT -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { #ifdef HAVE_UART unsigned i; @@ -3585,15 +3585,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes - * that up_earlyserialinit was called previously. + * that arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #ifdef HAVE_UART char devname[16]; @@ -3771,10 +3771,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); up_restoreusartint(priv, ie); #endif return ch; @@ -3799,10 +3799,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; } diff --git a/arch/arm/src/stm32f7/stm32_start.c b/arch/arm/src/stm32f7/stm32_start.c index bed9ffd6f7b..dc7b03387c1 100644 --- a/arch/arm/src/stm32f7/stm32_start.c +++ b/arch/arm/src/stm32f7/stm32_start.c @@ -383,7 +383,7 @@ void __start(void) /* Perform early serial initialization */ #ifdef USE_EARLYSERIALINIT - up_earlyserialinit(); + arm_earlyserialinit(); #endif /* For the case of the separate user-/kernel-space build, perform whatever diff --git a/arch/arm/src/stm32h7/stm32_allocateheap.c b/arch/arm/src/stm32h7/stm32_allocateheap.c index 855b30e9b30..f65db6d4efa 100644 --- a/arch/arm/src/stm32h7/stm32_allocateheap.c +++ b/arch/arm/src/stm32h7/stm32_allocateheap.c @@ -66,7 +66,7 @@ * Pre-processor Definitions ****************************************************************************/ -/* At startup the kernel will invoke up_addregion() so that platform code +/* At startup the kernel will invoke arm_addregion() so that platform code * may register available memories for use as part of system heap. * The global configuration option CONFIG_MM_REGIONS defines the maximal * number of non-contiguous memory ranges that may be registered with the @@ -77,7 +77,7 @@ * * - AXI SRAM is a 512kb memory area. This will be automatically registered * with the system heap in up_allocate_heap, all the other memory - * regions will be registered in up_addregion(). + * regions will be registered in arm_addregion(). * So, CONFIG_MM_REGIONS must be at least 1 to use AXI SRAM. * * - Internal SRAM is available in all members of the STM32 family. @@ -93,7 +93,7 @@ * +1 to CONFIG_MM_REGIONS if you want to use DTCM. * * - External SDRAM can be connected to the FMC peripherial. Initialization - * of FMC is done as up_addregion() will invoke stm32_fmc_init(). + * of FMC is done as arm_addregion() will invoke stm32_fmc_init(). * Please read the comment in stm32_fmc.c how to initialize FMC * correctly. * @@ -333,7 +333,7 @@ static void addregion (uintptr_t start, uint32_t size, const char *desc) } /**************************************************************************** - * Name: up_addregion + * Name: arm_addregion * * Description: * Memory may be added in non-contiguous chunks. Additional chunks are @@ -341,7 +341,7 @@ static void addregion (uintptr_t start, uint32_t size, const char *desc) * ****************************************************************************/ -void up_addregion(void) +void arm_addregion(void) { addregion (SRAM123_START, SRAM123_END - SRAM123_START, "SRAM1,2,3"); diff --git a/arch/arm/src/stm32h7/stm32_dma.c b/arch/arm/src/stm32h7/stm32_dma.c index 227c959f9d9..dc8a17a7cec 100644 --- a/arch/arm/src/stm32h7/stm32_dma.c +++ b/arch/arm/src/stm32h7/stm32_dma.c @@ -1947,7 +1947,7 @@ static void stm32_dmamux_dump(DMA_MUX dmamux, uint8_t chan) * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { DMA_CHANNEL dmachan = NULL; uint8_t controller = 0; diff --git a/arch/arm/src/stm32h7/stm32_ethernet.c b/arch/arm/src/stm32h7/stm32_ethernet.c index 8353de1d2db..fdb3867cb66 100644 --- a/arch/arm/src/stm32h7/stm32_ethernet.c +++ b/arch/arm/src/stm32h7/stm32_ethernet.c @@ -4300,7 +4300,7 @@ static int stm32_ethconfig(struct stm32_ethmac_s *priv) * Description: * Initialize the Ethernet driver for one interface. If the STM32 chip * supports multiple Ethernet controllers, then board specific logic - * must implement up_netinitialize() and call this function to initialize + * must implement arm_netinitialize() and call this function to initialize * the desired interfaces. * * Parameters: @@ -4385,13 +4385,13 @@ static inline int stm32_ethinitialize(int intf) } /**************************************************************************** - * Function: up_netinitialize + * Function: arm_netinitialize * * Description: * This is the "standard" network initialization logic called from the * low-level initialization logic in arm_initialize.c. If STM32H7_NETHERNET * greater than one, then board specific logic will have to supply a - * version of up_netinitialize() that calls stm32_ethinitialize() with + * version of arm_netinitialize() that calls stm32_ethinitialize() with * the appropriate interface number. * * Parameters: @@ -4405,7 +4405,7 @@ static inline int stm32_ethinitialize(int intf) ****************************************************************************/ #if STM32H7_NETHERNET == 1 && !defined(CONFIG_NETDEV_LATEINIT) -void up_netinitialize(void) +void arm_netinitialize(void) { stm32_ethinitialize(0); } diff --git a/arch/arm/src/stm32h7/stm32_ethernet.h b/arch/arm/src/stm32h7/stm32_ethernet.h index fc17197e98c..9117025fa25 100644 --- a/arch/arm/src/stm32h7/stm32_ethernet.h +++ b/arch/arm/src/stm32h7/stm32_ethernet.h @@ -66,7 +66,7 @@ extern "C" * Description: * Initialize the Ethernet driver for one interface. If the STM32 chip * supports multiple Ethernet controllers, then board specific logic must - * implement up_netinitialize() and call this function to initialize the + * implement arm_netinitialize() and call this function to initialize the * desired interfaces. * * Parameters: diff --git a/arch/arm/src/stm32h7/stm32_fmc.c b/arch/arm/src/stm32h7/stm32_fmc.c index e5364c115f6..3631093b628 100644 --- a/arch/arm/src/stm32h7/stm32_fmc.c +++ b/arch/arm/src/stm32h7/stm32_fmc.c @@ -254,7 +254,7 @@ static int stm32_fmc_sdram_wait(unsigned timeout); * dependent on the used parts, definition of the initial values for FMC * registers is mostly left to board designer. * - * Typically called from up_addregion(). + * Typically called from arm_addregion(). * ****************************************************************************/ diff --git a/arch/arm/src/stm32h7/stm32_fmc.h b/arch/arm/src/stm32h7/stm32_fmc.h index 3473f82e608..62f74f36f46 100644 --- a/arch/arm/src/stm32h7/stm32_fmc.h +++ b/arch/arm/src/stm32h7/stm32_fmc.h @@ -68,7 +68,7 @@ extern "C" * dependent on the used parts, definition of the initial values for FMC * registers is mostly left to board designer. * - * Typically called from up_addregion(). + * Typically called from arm_addregion(). * ****************************************************************************/ diff --git a/arch/arm/src/stm32h7/stm32_irq.c b/arch/arm/src/stm32h7/stm32_irq.c index ed7e7692c4b..4bf95a3e403 100644 --- a/arch/arm/src/stm32h7/stm32_irq.c +++ b/arch/arm/src/stm32h7/stm32_irq.c @@ -484,8 +484,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(STM32_IRQ_SVCALL, up_svcall, NULL); - irq_attach(STM32_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(STM32_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(STM32_IRQ_HARDFAULT, arm_hardfault, NULL); /* Set the priority of the SVCall interrupt */ @@ -501,7 +501,7 @@ void up_irqinitialize(void) */ #ifdef CONFIG_ARM_MPU - irq_attach(STM32_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(STM32_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(STM32_IRQ_MEMFAULT); #endif @@ -510,7 +510,7 @@ void up_irqinitialize(void) #ifdef CONFIG_DEBUG_FEATURES irq_attach(STM32_IRQ_NMI, stm32_nmi, NULL); #ifndef CONFIG_ARM_MPU - irq_attach(STM32_IRQ_MEMFAULT, up_memfault, NULL); + 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); @@ -642,14 +642,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { } diff --git a/arch/arm/src/stm32h7/stm32_lowputc.c b/arch/arm/src/stm32h7/stm32_lowputc.c index 60b3aade4d5..51bcab670e3 100644 --- a/arch/arm/src/stm32h7/stm32_lowputc.c +++ b/arch/arm/src/stm32h7/stm32_lowputc.c @@ -325,14 +325,14 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #ifdef HAVE_CONSOLE /* Wait until the TX data register is empty */ diff --git a/arch/arm/src/stm32h7/stm32_otgdev.c b/arch/arm/src/stm32h7/stm32_otgdev.c index b9a5141f663..07b4ea5c38a 100644 --- a/arch/arm/src/stm32h7/stm32_otgdev.c +++ b/arch/arm/src/stm32h7/stm32_otgdev.c @@ -5426,7 +5426,7 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv) ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * * Description: * Initialize USB hardware. @@ -5440,7 +5440,7 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv) * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { /* At present, there is only a single OTG device support. Hence it is * pre-allocated as g_otghsdev. However, in most code, the private data @@ -5501,7 +5501,7 @@ void up_usbinitialize(void) /* Uninitialize the hardware so that we know that we are starting from a * known state. */ - up_usbuninitialize(); + arm_usbuninitialize(); /* Initialie the driver data structure */ @@ -5534,14 +5534,14 @@ void up_usbinitialize(void) return; errout: - up_usbuninitialize(); + arm_usbuninitialize(); } /**************************************************************************** - * Name: up_usbuninitialize + * Name: arm_usbuninitialize ****************************************************************************/ -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { /* At present, there is only a single OTG device support. Hence it is * pre-allocated as g_otghsdev. However, in most code, the private data diff --git a/arch/arm/src/stm32h7/stm32_pminitialize.c b/arch/arm/src/stm32h7/stm32_pminitialize.c index 4bd6ff815b7..811e66b5386 100644 --- a/arch/arm/src/stm32h7/stm32_pminitialize.c +++ b/arch/arm/src/stm32h7/stm32_pminitialize.c @@ -51,7 +51,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_pminitialize + * Name: arm_pminitialize * * Description: * This function is called by MCU-specific logic at power-on reset in @@ -68,7 +68,7 @@ * ****************************************************************************/ -void up_pminitialize(void) +void arm_pminitialize(void) { /* Then initialize the NuttX power management subsystem proper */ diff --git a/arch/arm/src/stm32h7/stm32_serial.c b/arch/arm/src/stm32h7/stm32_serial.c index a78b658de5e..5fd6f6164b4 100644 --- a/arch/arm/src/stm32h7/stm32_serial.c +++ b/arch/arm/src/stm32h7/stm32_serial.c @@ -2248,17 +2248,17 @@ FAR uart_dev_t *stm32_serial_get_uart(int uart_num) } /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level USART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * ****************************************************************************/ #ifdef USE_EARLYSERIALINIT -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { #ifdef HAVE_UART unsigned i; @@ -2283,15 +2283,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes - * that up_earlyserialinit was called previously. + * that arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #ifdef HAVE_UART char devname[16]; @@ -2377,10 +2377,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); up_restoreusartint(priv, ie); #endif @@ -2406,10 +2406,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; } diff --git a/arch/arm/src/stm32h7/stm32_start.c b/arch/arm/src/stm32h7/stm32_start.c index 1a8304257c5..a999ca7f1b4 100644 --- a/arch/arm/src/stm32h7/stm32_start.c +++ b/arch/arm/src/stm32h7/stm32_start.c @@ -117,7 +117,7 @@ static void go_nx_start(void *pv, unsigned int nbytes) ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -# define showprogress(c) up_lowputc(c) +# define showprogress(c) arm_lowputc(c) #else # define showprogress(c) #endif @@ -395,7 +395,7 @@ void __start(void) /* Perform early serial initialization */ #ifdef USE_EARLYSERIALINIT - up_earlyserialinit(); + arm_earlyserialinit(); #endif showprogress('D'); diff --git a/arch/arm/src/stm32l4/stm32l4_allocateheap.c b/arch/arm/src/stm32l4/stm32l4_allocateheap.c index e18c60507b3..d81d01b8fb2 100644 --- a/arch/arm/src/stm32l4/stm32l4_allocateheap.c +++ b/arch/arm/src/stm32l4/stm32l4_allocateheap.c @@ -312,7 +312,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) #endif /**************************************************************************** - * Name: up_addregion + * Name: arm_addregion * * Description: * Memory may be added in non-contiguous chunks. Additional chunks are @@ -321,7 +321,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) ****************************************************************************/ #if CONFIG_MM_REGIONS > 1 -void up_addregion(void) +void arm_addregion(void) { #ifdef CONFIG_STM32L4_SRAM2_HEAP diff --git a/arch/arm/src/stm32l4/stm32l4_irq.c b/arch/arm/src/stm32l4/stm32l4_irq.c index 36fd53d3b00..d53e17a10ee 100644 --- a/arch/arm/src/stm32l4/stm32l4_irq.c +++ b/arch/arm/src/stm32l4/stm32l4_irq.c @@ -357,8 +357,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(STM32L4_IRQ_SVCALL, up_svcall, NULL); - irq_attach(STM32L4_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(STM32L4_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(STM32L4_IRQ_HARDFAULT, arm_hardfault, NULL); /* Set the priority of the SVCall interrupt */ @@ -374,7 +374,7 @@ void up_irqinitialize(void) */ #ifdef CONFIG_ARM_MPU - irq_attach(STM32L4_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(STM32L4_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(STM32L4_IRQ_MEMFAULT); #endif @@ -383,7 +383,7 @@ void up_irqinitialize(void) #ifdef CONFIG_DEBUG_FEATURES irq_attach(STM32L4_IRQ_NMI, stm32l4_nmi, NULL); #ifndef CONFIG_ARM_MPU - irq_attach(STM32L4_IRQ_MEMFAULT, up_memfault, NULL); + 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); @@ -477,14 +477,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { } diff --git a/arch/arm/src/stm32l4/stm32l4_lowputc.c b/arch/arm/src/stm32l4/stm32l4_lowputc.c index b905b477e92..cdca13900f8 100644 --- a/arch/arm/src/stm32l4/stm32l4_lowputc.c +++ b/arch/arm/src/stm32l4/stm32l4_lowputc.c @@ -272,14 +272,14 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #ifdef HAVE_CONSOLE /* Wait until the TX data register is empty */ diff --git a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c index 15200eb3961..c0fa9e4d84d 100644 --- a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c +++ b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c @@ -5517,7 +5517,7 @@ static void stm32l4_hwinitialize(FAR struct stm32l4_usbdev_s *priv) ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * * Description: * Initialize USB hardware. @@ -5531,7 +5531,7 @@ static void stm32l4_hwinitialize(FAR struct stm32l4_usbdev_s *priv) * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { /* At present, there is only a single OTG FS device support. Hence it is * pre-allocated as g_otgfsdev. However, in most code, the private data @@ -5581,7 +5581,7 @@ void up_usbinitialize(void) * known state. */ - up_usbuninitialize(); + arm_usbuninitialize(); /* Initialize the driver data structure */ @@ -5614,14 +5614,14 @@ void up_usbinitialize(void) return; errout: - up_usbuninitialize(); + arm_usbuninitialize(); } /**************************************************************************** - * Name: up_usbuninitialize + * Name: arm_usbuninitialize ****************************************************************************/ -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { /* At present, there is only a single OTG FS device support. Hence it is * pre-allocated as g_otgfsdev. However, in most code, the private data diff --git a/arch/arm/src/stm32l4/stm32l4_pminitialize.c b/arch/arm/src/stm32l4/stm32l4_pminitialize.c index 3695b735df5..78814ba5a4a 100644 --- a/arch/arm/src/stm32l4/stm32l4_pminitialize.c +++ b/arch/arm/src/stm32l4/stm32l4_pminitialize.c @@ -51,7 +51,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_pminitialize + * Name: arm_pminitialize * * Description: * This function is called by MCU-specific logic at power-on reset in @@ -68,7 +68,7 @@ * ****************************************************************************/ -void up_pminitialize(void) +void arm_pminitialize(void) { /* Then initialize the NuttX power management subsystem proper */ diff --git a/arch/arm/src/stm32l4/stm32l4_serial.c b/arch/arm/src/stm32l4/stm32l4_serial.c index 7b13c3b06e6..b083e3f9fcd 100644 --- a/arch/arm/src/stm32l4/stm32l4_serial.c +++ b/arch/arm/src/stm32l4/stm32l4_serial.c @@ -2859,17 +2859,17 @@ static int stm32l4serial_pmprepare(FAR struct pm_callback_s *cb, int domain, #ifdef USE_SERIALDRIVER /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level USART initialization early in debug so that the * serial console will be available during bootup. This must be called - * before up_serialinit. + * before arm_serialinit. * ****************************************************************************/ #ifdef USE_EARLYSERIALINIT -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { #ifdef HAVE_UART unsigned i; @@ -2894,15 +2894,15 @@ void up_earlyserialinit(void) #endif /* USE_EARLYSERIALINIT */ /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes - * that up_earlyserialinit was called previously. + * that arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #ifdef HAVE_UART char devname[16]; @@ -3050,10 +3050,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); stm32l4serial_restoreusartint(priv, ie); #endif return ch; @@ -3078,10 +3078,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; } diff --git a/arch/arm/src/stm32l4/stm32l4_start.c b/arch/arm/src/stm32l4/stm32l4_start.c index 192f137f514..cc276ed3daa 100644 --- a/arch/arm/src/stm32l4/stm32l4_start.c +++ b/arch/arm/src/stm32l4/stm32l4_start.c @@ -117,7 +117,7 @@ static void go_nx_start(void *pv, unsigned int nbytes) ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -# define showprogress(c) up_lowputc(c) +# define showprogress(c) arm_lowputc(c) #else # define showprogress(c) #endif @@ -339,7 +339,7 @@ void __start(void) /* Perform early serial initialization */ #ifdef USE_EARLYSERIALINIT - up_earlyserialinit(); + arm_earlyserialinit(); #endif showprogress('D'); diff --git a/arch/arm/src/stm32l4/stm32l4_usbdev.c b/arch/arm/src/stm32l4/stm32l4_usbdev.c index 20445b335a4..2056b66166f 100644 --- a/arch/arm/src/stm32l4/stm32l4_usbdev.c +++ b/arch/arm/src/stm32l4/stm32l4_usbdev.c @@ -3735,14 +3735,14 @@ static void stm32l4_hwshutdown(struct stm32l4_usbdev_s *priv) ****************************************************************************/ /**************************************************************************** - * Name: up_usbinitialize + * Name: arm_usbinitialize * * Description: * Initialize the USB driver * ****************************************************************************/ -void up_usbinitialize(void) +void arm_usbinitialize(void) { /* For now there is only one USB controller, but we will always refer to * it using a pointer to make any future ports to multiple USB controllers @@ -3771,19 +3771,19 @@ void up_usbinitialize(void) { usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_IRQREGISTRATION), (uint16_t)STM32L4_IRQ_USB_FS); - up_usbuninitialize(); + arm_usbuninitialize(); } } /**************************************************************************** - * Name: up_usbuninitialize + * Name: arm_usbuninitialize * * Description: * Initialize the USB driver * ****************************************************************************/ -void up_usbuninitialize(void) +void arm_usbuninitialize(void) { /* For now there is only one USB controller, but we will always refer to * it using a pointer to make any future ports to multiple USB controllers diff --git a/arch/arm/src/stm32l4/stm32l4x6xx_dma.c b/arch/arm/src/stm32l4/stm32l4x6xx_dma.c index 97d5275dc25..b1b52d3be49 100644 --- a/arch/arm/src/stm32l4/stm32l4x6xx_dma.c +++ b/arch/arm/src/stm32l4/stm32l4x6xx_dma.c @@ -332,7 +332,7 @@ static int stm32l4_dmainterrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { struct stm32l4_dma_s *dmach; int chndx; diff --git a/arch/arm/src/stm32l4/stm32l4xrxx_dma.c b/arch/arm/src/stm32l4/stm32l4xrxx_dma.c index f1ab6e8e94f..4924ce451e7 100644 --- a/arch/arm/src/stm32l4/stm32l4xrxx_dma.c +++ b/arch/arm/src/stm32l4/stm32l4xrxx_dma.c @@ -957,7 +957,7 @@ static void stm32l4_dmamux_dump(DMA_MUX dmamux, uint8_t channel, ****************************************************************************/ /**************************************************************************** - * Name: up_dma_initialize + * Name: arm_dma_initialize * * Description: * Initialize the DMA subsystem (DMA1, DMA2) @@ -967,7 +967,7 @@ static void stm32l4_dmamux_dump(DMA_MUX dmamux, uint8_t channel, * ****************************************************************************/ -void weak_function up_dma_initialize(void) +void weak_function arm_dma_initialize(void) { DMA_CHANNEL dmachan; uint8_t controller; diff --git a/arch/arm/src/str71x/str71x_decodeirq.c b/arch/arm/src/str71x/str71x_decodeirq.c index be4834214b5..17b16e8afba 100644 --- a/arch/arm/src/str71x/str71x_decodeirq.c +++ b/arch/arm/src/str71x/str71x_decodeirq.c @@ -1,35 +1,20 @@ /******************************************************************************** * arch/arm/src/str71x/str71x_decodeirq.c * - * Copyright (C) 2008-2009, 2011, 2015 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * http://www.apache.org/licenses/LICENSE-2.0 * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. * ********************************************************************************/ @@ -53,31 +38,11 @@ #include "arm_internal.h" /******************************************************************************** - * Pre-processor Definitions + * Public Functions ********************************************************************************/ /******************************************************************************** - * Private Types - ********************************************************************************/ - -/******************************************************************************** - * Public Data - ********************************************************************************/ - -/******************************************************************************** - * Private Data - ********************************************************************************/ - -/******************************************************************************** - * Private Functions - ********************************************************************************/ - -/******************************************************************************** - * Public Funstions - ********************************************************************************/ - -/******************************************************************************** - * up_decodeirq() + * arm_decodeirq() * * Description: * Read the IRQ number from the IVR register. During initialization, the IVR @@ -87,13 +52,14 @@ * ********************************************************************************/ -void up_decodeirq(uint32_t *regs) +uint32_t *arm_decodeirq(uint32_t *regs) { #ifdef CONFIG_SUPPRESS_INTERRUPTS board_autoled_on(LED_INIRQ); CURRENT_REGS = regs; err("ERROR: Unexpected IRQ\n"); PANIC(); + return NULL; #else unsigned int irq; @@ -119,7 +85,7 @@ void up_decodeirq(uint32_t *regs) /* Acknowledge the interrupt */ - up_ack_irq(irq); + arm_ack_irq(irq); /* Deliver the IRQ */ @@ -138,6 +104,8 @@ void up_decodeirq(uint32_t *regs) DEBUGPANIC(); /* Normally never happens */ } #endif + board_autoled_off(LED_INIRQ); + return NULL; /* Return not used in this architecture */ #endif } diff --git a/arch/arm/src/str71x/str71x_head.S b/arch/arm/src/str71x/str71x_head.S index 11c9adcf0bc..4cd10e23e2e 100644 --- a/arch/arm/src/str71x/str71x_head.S +++ b/arch/arm/src/str71x/str71x_head.S @@ -62,13 +62,13 @@ .globl str71x_prccuinit /* Clock initialization */ .globl up_lowsetup /* Early initialization of UART */ #ifdef USE_EARLYSERIALINIT - .globl up_earlyserialinit /* Early initialization of serial driver */ + .globl arm_earlyserialinit /* Early initialization of serial driver */ #endif #ifdef CONFIG_ARCH_LEDS .globl board_autoled_initialize /* Boot LED setup */ #endif #ifdef CONFIG_DEBUG_FEATURES - .globl up_lowputc /* Low-level debug output */ + .globl arm_lowputc /* Low-level debug output */ #endif .globl nx_start /* NuttX entry point */ @@ -88,7 +88,7 @@ .macro showprogress, code #ifdef CONFIG_DEBUG_FEATURES mov r0, #\code - bl up_lowputc + bl arm_lowputc #endif .endm @@ -438,27 +438,27 @@ _vector_table: ldr pc, .Lfiqhandler /* 0x1c: FIQ */ .globl __start - .globl up_vectorundefinsn - .globl up_vectorswi - .globl up_vectorprefetch - .globl up_vectordata - .globl up_vectorirq - .globl up_vectorfiq + .globl arm_vectorundefinsn + .globl arm_vectorswi + .globl arm_vectorprefetch + .globl arm_vectordata + .globl arm_vectorirq + .globl arm_vectorfiq .Lresethandler: .long __start .Lundefinedhandler: - .long up_vectorundefinsn + .long arm_vectorundefinsn .Lswihandler: - .long up_vectorswi + .long arm_vectorswi .Lprefetchaborthandler: - .long up_vectorprefetch + .long arm_vectorprefetch .Ldataaborthandler: - .long up_vectordata + .long arm_vectordata .Lirqhandler: - .long up_vectorirq + .long arm_vectorirq .Lfiqhandler: - .long up_vectorfiq + .long arm_vectorfiq .size _vector_table, . - _vector_table /***************************************************************************** @@ -544,7 +544,7 @@ __flashstart: mov fp, #0 #ifdef USE_EARLYSERIALINIT - bl up_earlyserialinit + bl arm_earlyserialinit #endif showprogress 'B' diff --git a/arch/arm/src/str71x/str71x_irq.c b/arch/arm/src/str71x/str71x_irq.c index 69d1b3e9a97..17a0d9fcbbc 100644 --- a/arch/arm/src/str71x/str71x_irq.c +++ b/arch/arm/src/str71x/str71x_irq.c @@ -164,7 +164,7 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the interrupt. No XTI support.. only used in interrupt @@ -172,7 +172,7 @@ void up_enable_irq(int irq) * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { uint32_t reg32; diff --git a/arch/arm/src/str71x/str71x_lowputc.c b/arch/arm/src/str71x/str71x_lowputc.c index 57041e45166..16349cb885f 100644 --- a/arch/arm/src/str71x/str71x_lowputc.c +++ b/arch/arm/src/str71x/str71x_lowputc.c @@ -248,14 +248,14 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #ifdef HAVE_CONSOLE /* Wait until the TX FIFO is not full */ diff --git a/arch/arm/src/str71x/str71x_serial.c b/arch/arm/src/str71x/str71x_serial.c index cb4721d8695..fa6c1a19aff 100644 --- a/arch/arm/src/str71x/str71x_serial.c +++ b/arch/arm/src/str71x/str71x_serial.c @@ -882,16 +882,16 @@ static bool up_txempty(struct uart_dev_s *dev) #ifdef USE_EARLYSERIALINIT /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level UART initialization early in * debug so that the serial console will be available - * during bootup. This must be called before up_serialinit. + * during bootup. This must be called before arm_serialinit. * ****************************************************************************/ -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { /* NOTE: All GPIO configuration for the UARTs was performed in * up_lowsetup @@ -920,15 +920,15 @@ void up_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes - * that up_earlyserialinit was called previously. + * that arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { /* Register the console */ @@ -1003,10 +1003,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; } diff --git a/arch/arm/src/tiva/cc13xx/cc13xx_start.c b/arch/arm/src/tiva/cc13xx/cc13xx_start.c index 3b7a6566d5d..c55121ac6ea 100644 --- a/arch/arm/src/tiva/cc13xx/cc13xx_start.c +++ b/arch/arm/src/tiva/cc13xx/cc13xx_start.c @@ -110,7 +110,7 @@ void cc13xx_trim_device(void); ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -# define showprogress(c) up_lowputc(c) +# define showprogress(c) arm_lowputc(c) #else # define showprogress(c) #endif @@ -266,7 +266,7 @@ void __start(void) #ifdef USE_EARLYSERIALINIT /* Perform early serial initialization */ - up_earlyserialinit(); + arm_earlyserialinit(); showprogress('C'); #endif diff --git a/arch/arm/src/tiva/common/lmxx_tm4c_start.c b/arch/arm/src/tiva/common/lmxx_tm4c_start.c index f5bd991910c..2ad86ac18ff 100644 --- a/arch/arm/src/tiva/common/lmxx_tm4c_start.c +++ b/arch/arm/src/tiva/common/lmxx_tm4c_start.c @@ -101,7 +101,7 @@ const uintptr_t g_idle_topstack = HEAP_BASE; ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -# define showprogress(c) up_lowputc(c) +# define showprogress(c) arm_lowputc(c) #else # define showprogress(c) #endif @@ -251,7 +251,7 @@ void __start(void) #ifdef USE_EARLYSERIALINIT /* Perform early serial initialization */ - up_earlyserialinit(); + arm_earlyserialinit(); showprogress('D'); #endif diff --git a/arch/arm/src/tiva/common/tiva_irq.c b/arch/arm/src/tiva/common/tiva_irq.c index fdfe9765ea8..89364fa3032 100644 --- a/arch/arm/src/tiva/common/tiva_irq.c +++ b/arch/arm/src/tiva/common/tiva_irq.c @@ -477,8 +477,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(TIVA_IRQ_SVCALL, up_svcall, NULL); - irq_attach(TIVA_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(TIVA_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(TIVA_IRQ_HARDFAULT, arm_hardfault, NULL); /* Set the priority of the SVCall interrupt */ @@ -494,7 +494,7 @@ void up_irqinitialize(void) */ #ifdef CONFIG_ARM_MPU - irq_attach(TIVA_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(TIVA_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(TIVA_IRQ_MEMFAULT); #endif @@ -503,7 +503,7 @@ void up_irqinitialize(void) #ifdef CONFIG_DEBUG_FEATURES irq_attach(TIVA_IRQ_NMI, tiva_nmi, NULL); #ifndef CONFIG_ARM_MPU - irq_attach(TIVA_IRQ_MEMFAULT, up_memfault, NULL); + 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); @@ -597,14 +597,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { } diff --git a/arch/arm/src/tiva/common/tiva_lowputc.c b/arch/arm/src/tiva/common/tiva_lowputc.c index 96002b5668d..ac038b79a55 100644 --- a/arch/arm/src/tiva/common/tiva_lowputc.c +++ b/arch/arm/src/tiva/common/tiva_lowputc.c @@ -223,14 +223,14 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #ifdef HAVE_SERIAL_CONSOLE /* Wait until the TX FIFO is not full */ diff --git a/arch/arm/src/tiva/common/tiva_serial.c b/arch/arm/src/tiva/common/tiva_serial.c index c024d34dc8f..db77a3be5a8 100644 --- a/arch/arm/src/tiva/common/tiva_serial.c +++ b/arch/arm/src/tiva/common/tiva_serial.c @@ -1313,17 +1313,17 @@ static bool up_txempty(struct uart_dev_s *dev) ****************************************************************************/ /**************************************************************************** - * Name: up_earlyserialinit + * Name: arm_earlyserialinit * * Description: * Performs the low level UART initialization early in * debug so that the serial console will be available - * during bootup. This must be called before up_serialinit. + * during bootup. This must be called before arm_serialinit. * ****************************************************************************/ #ifdef USE_EARLYSERIALINIT -void up_earlyserialinit(void) +void arm_earlyserialinit(void) { /* NOTE: All GPIO configuration for the UARTs was performed in * tiva_lowsetup @@ -1364,15 +1364,15 @@ void up_earlyserialinit(void) #endif /* !USE_EARLYSERIALINIT */ /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes - * that up_earlyserialinit was called previously. + * that arm_earlyserialinit was called previously. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { /* Register the console */ @@ -1460,10 +1460,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; } diff --git a/arch/arm/src/tiva/lm/lm3s_ethernet.c b/arch/arm/src/tiva/lm/lm3s_ethernet.c index 2bd69063316..99805e3c062 100644 --- a/arch/arm/src/tiva/lm/lm3s_ethernet.c +++ b/arch/arm/src/tiva/lm/lm3s_ethernet.c @@ -1747,7 +1747,7 @@ static inline int tiva_ethinitialize(int intf) /************************************************************************************ - * Name: up_netinitialize + * Name: arm_netinitialize * * Description: * Initialize the first network interface. If there are more than one interface @@ -1757,7 +1757,7 @@ static inline int tiva_ethinitialize(int intf) ************************************************************************************/ #if TIVA_NETHCONTROLLERS == 1 && !defined(CONFIG_NETDEV_LATEINIT) -void up_netinitialize(void) +void arm_netinitialize(void) { tiva_ethinitialize(0); } diff --git a/arch/arm/src/tiva/tiva_ethernet.h b/arch/arm/src/tiva/tiva_ethernet.h index c147a2ae074..6dfa156f511 100644 --- a/arch/arm/src/tiva/tiva_ethernet.h +++ b/arch/arm/src/tiva/tiva_ethernet.h @@ -81,7 +81,7 @@ extern "C" * Description: * Initialize the Ethernet driver for one interface. If the Tiva/Stellaris * chip supports multiple Ethernet controllers, then board specific logic - * must implement up_netinitialize() and call this function to initialize + * must implement arm_netinitialize() and call this function to initialize * the desired interfaces. * * Input Parameters: diff --git a/arch/arm/src/tiva/tm4c/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c/tm4c_ethernet.c index 8eb8c5994e1..e96d341fe59 100644 --- a/arch/arm/src/tiva/tm4c/tm4c_ethernet.c +++ b/arch/arm/src/tiva/tm4c/tm4c_ethernet.c @@ -3992,7 +3992,7 @@ static int tive_emac_configure(FAR struct tiva_ethmac_s *priv) * Description: * Initialize the Ethernet driver for one interface. If the Tiva chip * supports multiple Ethernet controllers, then board specific logic - * must implement up_netinitialize() and call this function to initialize + * must implement arm_netinitialize() and call this function to initialize * the desired interfaces. * * Input Parameters: @@ -4127,13 +4127,13 @@ int tiva_ethinitialize(int intf) } /**************************************************************************** - * Function: up_netinitialize + * Function: arm_netinitialize * * Description: * This is the "standard" network initialization logic called from the * low-level initialization logic in arm_initialize.c. If TIVA_NETHCONTROLLERS * greater than one, then board specific logic will have to supply a - * version of up_netinitialize() that calls tiva_ethinitialize() with + * version of arm_netinitialize() that calls tiva_ethinitialize() with * the appropriate interface number. * * Input Parameters: @@ -4147,7 +4147,7 @@ int tiva_ethinitialize(int intf) ****************************************************************************/ #if TIVA_NETHCONTROLLERS == 1 && !defined(CONFIG_NETDEV_LATEINIT) -void up_netinitialize(void) +void arm_netinitialize(void) { tiva_ethinitialize(0); } diff --git a/arch/arm/src/tms570/tms570_irq.c b/arch/arm/src/tms570/tms570_irq.c index ebba759f337..d4bec6934bc 100644 --- a/arch/arm/src/tms570/tms570_irq.c +++ b/arch/arm/src/tms570/tms570_irq.c @@ -390,13 +390,13 @@ void up_enable_fiq(int channel) #endif /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { } diff --git a/arch/arm/src/tms570/tms570_lowputc.c b/arch/arm/src/tms570/tms570_lowputc.c index 68ca3eba36b..75b1176c51a 100644 --- a/arch/arm/src/tms570/tms570_lowputc.c +++ b/arch/arm/src/tms570/tms570_lowputc.c @@ -177,14 +177,14 @@ static void tms570_sci_initialize(uint32_t base) ****************************************************************************/ /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #ifdef HAVE_SERIAL_CONSOLE irqstate_t flags; @@ -233,10 +233,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); #endif return ch; } diff --git a/arch/arm/src/tms570/tms570_serial.c b/arch/arm/src/tms570/tms570_serial.c index 0b0ba763253..922303b0a86 100644 --- a/arch/arm/src/tms570/tms570_serial.c +++ b/arch/arm/src/tms570/tms570_serial.c @@ -843,14 +843,14 @@ static bool tms570_txempty(struct uart_dev_s *dev) ****************************************************************************/ /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { /* Disable all SCIS */ diff --git a/arch/arm/src/xmc4/Make.defs b/arch/arm/src/xmc4/Make.defs index 7dc3e1e8c13..7f46482d00d 100644 --- a/arch/arm/src/xmc4/Make.defs +++ b/arch/arm/src/xmc4/Make.defs @@ -86,7 +86,7 @@ CMN_CSRCS += arm_checkstack.c endif # Use of common/arm_etherstub.c is deprecated. The preferred mechanism is to -# use CONFIG_NETDEV_LATEINIT=y to suppress the call to up_netinitialize() in +# use CONFIG_NETDEV_LATEINIT=y to suppress the call to arm_netinitialize() in # up_initialize(). Then this stub would not be needed. ifeq ($(CONFIG_NET),y) diff --git a/arch/arm/src/xmc4/xmc4_irq.c b/arch/arm/src/xmc4/xmc4_irq.c index 9c9f0bfdaf0..55d5b6ba911 100644 --- a/arch/arm/src/xmc4/xmc4_irq.c +++ b/arch/arm/src/xmc4/xmc4_irq.c @@ -398,8 +398,8 @@ void up_irqinitialize(void) * under certain conditions. */ - irq_attach(XMC4_IRQ_SVCALL, up_svcall, NULL); - irq_attach(XMC4_IRQ_HARDFAULT, up_hardfault, NULL); + irq_attach(XMC4_IRQ_SVCALL, arm_svcall, NULL); + irq_attach(XMC4_IRQ_HARDFAULT, arm_hardfault, NULL); /* Set the priority of the SVCall interrupt */ @@ -415,7 +415,7 @@ void up_irqinitialize(void) */ #ifdef CONFIG_ARM_MPU - irq_attach(XMC4_IRQ_MEMFAULT, up_memfault, NULL); + irq_attach(XMC4_IRQ_MEMFAULT, arm_memfault, NULL); up_enable_irq(XMC4_IRQ_MEMFAULT); #endif @@ -424,7 +424,7 @@ void up_irqinitialize(void) #ifdef CONFIG_DEBUG_FEATURES irq_attach(XMC4_IRQ_NMI, xmc4_nmi, NULL); #ifndef CONFIG_ARM_MPU - irq_attach(XMC4_IRQ_MEMFAULT, up_memfault, NULL); + 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); @@ -525,14 +525,14 @@ void up_enable_irq(int irq) } /**************************************************************************** - * Name: up_ack_irq + * Name: arm_ack_irq * * Description: * Acknowledge the IRQ * ****************************************************************************/ -void up_ack_irq(int irq) +void arm_ack_irq(int irq) { #if 0 /* Does not appear to be necessary in most cases */ xmc4_clrpend(irq); diff --git a/arch/arm/src/xmc4/xmc4_lowputc.c b/arch/arm/src/xmc4/xmc4_lowputc.c index b7cc0738985..fda1e0e6306 100644 --- a/arch/arm/src/xmc4/xmc4_lowputc.c +++ b/arch/arm/src/xmc4/xmc4_lowputc.c @@ -143,14 +143,14 @@ static const struct uart_config_s g_console_config = ****************************************************************************/ /**************************************************************************** - * Name: up_lowputc + * Name: arm_lowputc * * Description: * Output one byte on the serial console * ****************************************************************************/ -void up_lowputc(char ch) +void arm_lowputc(char ch) { #ifdef HAVE_UART_CONSOLE uintptr_t base; diff --git a/arch/arm/src/xmc4/xmc4_serial.c b/arch/arm/src/xmc4/xmc4_serial.c index ced3fb1ec2e..48344308264 100644 --- a/arch/arm/src/xmc4/xmc4_serial.c +++ b/arch/arm/src/xmc4/xmc4_serial.c @@ -1067,7 +1067,7 @@ void xmc4_earlyserialinit(void) #endif /**************************************************************************** - * Name: up_serialinit + * Name: arm_serialinit * * Description: * Register serial console and serial ports. This assumes @@ -1081,7 +1081,7 @@ void xmc4_earlyserialinit(void) * ****************************************************************************/ -void up_serialinit(void) +void arm_serialinit(void) { #ifdef HAVE_UART_CONSOLE /* Register the serial console */ @@ -1131,10 +1131,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); xmc4_restoreuartint(priv, ccr); #endif @@ -1160,10 +1160,10 @@ int up_putc(int ch) { /* Add CR */ - up_lowputc('\r'); + arm_lowputc('\r'); } - up_lowputc(ch); + arm_lowputc(ch); return ch; } #endif diff --git a/arch/arm/src/xmc4/xmc4_start.c b/arch/arm/src/xmc4/xmc4_start.c index 4324220e7f3..576c1c0fb49 100644 --- a/arch/arm/src/xmc4/xmc4_start.c +++ b/arch/arm/src/xmc4/xmc4_start.c @@ -129,7 +129,7 @@ const uintptr_t g_idle_topstack = HEAP_BASE; ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -# define showprogress(c) up_lowputc(c) +# define showprogress(c) arm_lowputc(c) #else # define showprogress(c) #endif diff --git a/boards/arm/a1x/pcduino-a10/configs/nsh/pcduino-140107.patch b/boards/arm/a1x/pcduino-a10/configs/nsh/pcduino-140107.patch index 2dcd324a7d8..8531d4cb586 100644 --- a/boards/arm/a1x/pcduino-a10/configs/nsh/pcduino-140107.patch +++ b/boards/arm/a1x/pcduino-a10/configs/nsh/pcduino-140107.patch @@ -41,8 +41,8 @@ index 3cc6323..ad42790 100644 */ #ifdef USE_EARLYSERIALINIT -+syslog(LOG_INFO, "Calling up_earlyserialinit\n"); // REMOVE ME - up_earlyserialinit(); ++syslog(LOG_INFO, "Calling arm_earlyserialinit\n"); // REMOVE ME + arm_earlyserialinit(); #endif @@ -353,6 +359,7 @@ void arm_boot(void) diff --git a/boards/arm/am335x/beaglebone-black/README.txt b/boards/arm/am335x/beaglebone-black/README.txt index 326999d73a9..27b1996b5af 100644 --- a/boards/arm/am335x/beaglebone-black/README.txt +++ b/boards/arm/am335x/beaglebone-black/README.txt @@ -241,7 +241,7 @@ Configurations 2019-01-06: Work in progress. Till now it is possible to pass arm_boot(), but Prefetch abort is met when devnull_register() call is done. Have no idea why. I was able to trace down to _inode_search() call. If I put any debug statement - like "up_lowputc('0');" right after "desc->node = node;" statement at line 425 + like "arm_lowputc('0');" right after "desc->node = node;" statement at line 425 the code does not crash. 2019-01-09: The NSH configuration is now functional. 2019-01-16: Correct timer interrupts by switching to DMTimer2 (DMTimer1ms is diff --git a/boards/arm/cxd56xx/common/src/cxd56_netinit.c b/boards/arm/cxd56xx/common/src/cxd56_netinit.c index dccd67ab70e..928e614cabe 100644 --- a/boards/arm/cxd56xx/common/src/cxd56_netinit.c +++ b/boards/arm/cxd56xx/common/src/cxd56_netinit.c @@ -44,11 +44,11 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_netinitialize + * Name: arm_netinitialize ****************************************************************************/ #if defined(CONFIG_NET) && !defined(CONFIG_NETDEV_LATEINIT) -void up_netinitialize(void) +void arm_netinitialize(void) { } #endif diff --git a/boards/arm/dm320/ntosd-dm320/src/dm320_network.c b/boards/arm/dm320/ntosd-dm320/src/dm320_network.c index 068c40da7cb..69a6201c49c 100644 --- a/boards/arm/dm320/ntosd-dm320/src/dm320_network.c +++ b/boards/arm/dm320/ntosd-dm320/src/dm320_network.c @@ -57,10 +57,10 @@ extern void dm9x_initialize(void); ****************************************************************************/ /**************************************************************************** - * Name: up_netinitialize + * Name: arm_netinitialize ****************************************************************************/ -void up_netinitialize(void) +void arm_netinitialize(void) { /* CS4 is used for DM9000A Ethernet. Interrupt is provided via GIO6 * which must be configured to interrupt on the rising edge. Bus diff --git a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_netinit.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_netinit.c index db64b8df33a..920d4adf7b0 100644 --- a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_netinit.c +++ b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_netinit.c @@ -44,11 +44,11 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_netinitialize + * Name: arm_netinitialize ****************************************************************************/ #if defined(CONFIG_NET) && !defined(CONFIG_NETDEV_LATEINIT) -void up_netinitialize(void) +void arm_netinitialize(void) { } #endif diff --git a/boards/arm/lpc31xx/ea3131/locked/mklocked.sh b/boards/arm/lpc31xx/ea3131/locked/mklocked.sh index 4ca7c733d3c..0d610331757 100755 --- a/boards/arm/lpc31xx/ea3131/locked/mklocked.sh +++ b/boards/arm/lpc31xx/ea3131/locked/mklocked.sh @@ -99,13 +99,13 @@ function checkzero () { # rm -f ld-locked.inc -echo "EXTERN(up_vectorswi)" >>ld-locked.inc -echo "EXTERN(up_vectordata)" >>ld-locked.inc -echo "EXTERN(up_vectorprefetch)" >>ld-locked.inc -echo "EXTERN(up_vectorundefinsn)" >>ld-locked.inc -echo "EXTERN(up_vectorfiq)" >>ld-locked.inc -echo "EXTERN(up_vectorirq)" >>ld-locked.inc -echo "EXTERN(up_vectoraddrexcptn)" >>ld-locked.inc +echo "EXTERN(arm_vectorswi)" >>ld-locked.inc +echo "EXTERN(arm_vectordata)" >>ld-locked.inc +echo "EXTERN(arm_vectorprefetch)" >>ld-locked.inc +echo "EXTERN(arm_vectorundefinsn)" >>ld-locked.inc +echo "EXTERN(arm_vectorfiq)" >>ld-locked.inc +echo "EXTERN(arm_vectorirq)" >>ld-locked.inc +echo "EXTERN(arm_vectoraddrexcptn)" >>ld-locked.inc # # These are the initialization entry points of all device drivers that @@ -119,14 +119,14 @@ echo "EXTERN(up_timer_initialize)" >>ld-locked.inc answer=$(checkconfig CONFIG_LPC31_UART) if [ "$answer" = y ]; then - echo "EXTERN(up_earlyserialinit)" >>ld-locked.inc + echo "EXTERN(arm_earlyserialinit)" >>ld-locked.inc fi # xyz_i2cbus_initialize -- Not conditioned on anything answer=$(checkconfig CONFIG_USBDEV) if [ "$answer" = y ]; then - echo "EXTERN(up_usbinitialize)" >>ld-locked.inc + echo "EXTERN(arm_usbinitialize)" >>ld-locked.inc fi ############################################################################ diff --git a/boards/arm/stm32/fire-stm32v2/src/stm32_enc28j60.c b/boards/arm/stm32/fire-stm32v2/src/stm32_enc28j60.c index da3915ada25..e4a398a8d9a 100644 --- a/boards/arm/stm32/fire-stm32v2/src/stm32_enc28j60.c +++ b/boards/arm/stm32/fire-stm32v2/src/stm32_enc28j60.c @@ -184,10 +184,10 @@ static void up_disable(FAR const struct enc_lower_s *lower) ****************************************************************************/ /**************************************************************************** - * Name: up_netinitialize + * Name: arm_netinitialize ****************************************************************************/ -void up_netinitialize(void) +void arm_netinitialize(void) { FAR struct spi_dev_s *spi; int ret; diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_pm.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_pm.c index cc7bf9dbafd..666f067dc23 100644 --- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_pm.c +++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_pm.c @@ -53,7 +53,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_pminitialize + * Name: arm_pminitialize * * Description: * This function is called by MCU-specific logic at power-on reset in @@ -70,7 +70,7 @@ * ****************************************************************************/ -void up_pminitialize(void) +void arm_pminitialize(void) { /* Then initialize the NuttX power management subsystem proper */ diff --git a/boards/arm/stm32/nucleo-f429zi/src/stm32_bbsram.c b/boards/arm/stm32/nucleo-f429zi/src/stm32_bbsram.c index a1726801d19..2aa7c8d4c43 100644 --- a/boards/arm/stm32/nucleo-f429zi/src/stm32_bbsram.c +++ b/boards/arm/stm32/nucleo-f429zi/src/stm32_bbsram.c @@ -519,14 +519,14 @@ void board_crashdump(uintptr_t currentsp, FAR void *tcb, while (*dead) { - up_lowputc(*dead++); + arm_lowputc(*dead++); } } else if (rv == -ENOSPC) { /* hard fault again */ - up_lowputc('!'); + arm_lowputc('!'); } } #endif /* CONFIG_STM32F4_SAVE_CRASHDUMP */ diff --git a/boards/arm/stm32/olimex-stm32-p107/src/stm32_encx24j600.c b/boards/arm/stm32/olimex-stm32-p107/src/stm32_encx24j600.c index f40ccdb50eb..00c0c450e8f 100644 --- a/boards/arm/stm32/olimex-stm32-p107/src/stm32_encx24j600.c +++ b/boards/arm/stm32/olimex-stm32-p107/src/stm32_encx24j600.c @@ -175,10 +175,10 @@ static void up_disable(FAR const struct enc_lower_s *lower) ****************************************************************************/ /**************************************************************************** - * Name: up_netinitialize + * Name: arm_netinitialize ****************************************************************************/ -void up_netinitialize(void) +void arm_netinitialize(void) { FAR struct spi_dev_s *spi; int ret; diff --git a/boards/arm/stm32/omnibusf4/src/stm32_netinit.c b/boards/arm/stm32/omnibusf4/src/stm32_netinit.c index 09ef077c967..c5ff527498a 100644 --- a/boards/arm/stm32/omnibusf4/src/stm32_netinit.c +++ b/boards/arm/stm32/omnibusf4/src/stm32_netinit.c @@ -44,11 +44,11 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_netinitialize + * Name: arm_netinitialize ****************************************************************************/ #if defined(CONFIG_NET) && !defined(CONFIG_NETDEV_LATEINIT) -void up_netinitialize(void) +void arm_netinitialize(void) { } #endif diff --git a/boards/arm/stm32/omnibusf4/src/stm32_pm.c b/boards/arm/stm32/omnibusf4/src/stm32_pm.c index 0682aa903c3..7baddf62115 100644 --- a/boards/arm/stm32/omnibusf4/src/stm32_pm.c +++ b/boards/arm/stm32/omnibusf4/src/stm32_pm.c @@ -71,7 +71,7 @@ * ****************************************************************************/ -void up_pminitialize(void) +void arm_pminitialize(void) { /* Then initialize the NuttX power management subsystem proper */ diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_pm.c b/boards/arm/stm32/stm3210e-eval/src/stm32_pm.c index b1cc2564b11..0459df60aec 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_pm.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_pm.c @@ -53,7 +53,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_pminitialize + * Name: arm_pminitialize * * Description: * This function is called by MCU-specific logic at power-on reset in @@ -70,7 +70,7 @@ * ****************************************************************************/ -void up_pminitialize(void) +void arm_pminitialize(void) { /* Then initialize the NuttX power management subsystem proper */ diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_enc28j60.c b/boards/arm/stm32/stm32f4discovery/src/stm32_enc28j60.c index 2843a187db9..42078c5c943 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_enc28j60.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_enc28j60.c @@ -171,10 +171,10 @@ static void up_disable(FAR const struct enc_lower_s *lower) ****************************************************************************/ /**************************************************************************** - * Name: up_netinitialize + * Name: arm_netinitialize ****************************************************************************/ -void up_netinitialize(void) +void arm_netinitialize(void) { FAR struct spi_dev_s *spi; int ret; diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_netinit.c b/boards/arm/stm32/stm32f4discovery/src/stm32_netinit.c index 3a3a5b29926..36c82403e17 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_netinit.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_netinit.c @@ -44,11 +44,11 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_netinitialize + * Name: arm_netinitialize ****************************************************************************/ #if defined(CONFIG_NET) && !defined(CONFIG_NETDEV_LATEINIT) -void up_netinitialize(void) +void arm_netinitialize(void) { } #endif diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_pm.c b/boards/arm/stm32/stm32f4discovery/src/stm32_pm.c index 8d63f3f8018..f8aef27346c 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_pm.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_pm.c @@ -71,7 +71,7 @@ * ****************************************************************************/ -void up_pminitialize(void) +void arm_pminitialize(void) { /* Then initialize the NuttX power management subsystem proper */ diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c b/boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c index 2b1864d9167..2bf4133df46 100644 --- a/boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c +++ b/boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c @@ -532,14 +532,14 @@ void board_crashdump(uintptr_t currentsp, FAR void *tcb, while (*dead) { - up_lowputc(*dead++); + arm_lowputc(*dead++); } } else if (rv == -ENOSPC) { /* hard fault again */ - up_lowputc('!'); + arm_lowputc('!'); } } #endif /* CONFIG_STM32F7_SAVE_CRASHDUMP */ diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c index ee18aab3497..340b0333127 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c @@ -80,7 +80,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: up_netinitialize + * Name: arm_netinitialize * * Description: * Dummy function expected to start-up logic. @@ -88,7 +88,7 @@ ****************************************************************************/ #if defined(CONFIG_NET) && !defined(CONFIG_NETDEV_LATEINIT) -void up_netinitialize(void) +void arm_netinitialize(void) { } #endif diff --git a/boards/arm/str71x/olimex-strp711/src/str71_enc28j60.c b/boards/arm/str71x/olimex-strp711/src/str71_enc28j60.c index 9c1144a3c11..2bbada2448d 100644 --- a/boards/arm/str71x/olimex-strp711/src/str71_enc28j60.c +++ b/boards/arm/str71x/olimex-strp711/src/str71_enc28j60.c @@ -204,10 +204,10 @@ static void up_disable(FAR const struct enc_lower_s *lower) ****************************************************************************/ /**************************************************************************** - * Name: up_netinitialize + * Name: arm_netinitialize ****************************************************************************/ -void up_netinitialize(void) +void arm_netinitialize(void) { FAR struct spi_dev_s *spi; uint16_t reg16;