You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2022/01/16 14:11:23 UTC
[incubator-nuttx] branch master updated: include: fix double include pre-processor guards
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 8d3bf05 include: fix double include pre-processor guards
8d3bf05 is described below
commit 8d3bf05fd22ce96ca0565a7dac5079090da9ada4
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Sat Jan 15 04:44:35 2022 +0200
include: fix double include pre-processor guards
Signed-off-by: Petro Karashchenko <pe...@gmail.com>
---
arch/arm/include/armv7-m/nvicpri.h | 6 +-
arch/arm/include/armv8-m/nvicpri.h | 6 +-
arch/arm/include/efm32/efm32g_irq.h | 6 +-
arch/arm/include/efm32/efm32gg_irq.h | 6 +-
arch/arm/include/efm32/efm32tg_irq.h | 6 +-
arch/arm/include/kinetis/kinetis_k40irq.h | 6 +-
arch/arm/include/kinetis/kinetis_k60irq.h | 6 +-
arch/arm/include/kinetis/kinetis_k64irq.h | 6 +-
arch/arm/include/lpc17xx_40xx/lpc178x_40xx_irq.h | 6 +-
arch/arm/include/lpc54xx/lpc546x_irq.h | 6 +-
arch/arm/include/max326xx/irq.h | 6 +-
arch/arm/include/phy62xx/phy62xx_irq.h | 6 +-
arch/arm/include/samd5e5/samd5e5_irq.h | 6 +-
arch/arm/include/tiva/cc13x2_cc26x2_irq.h | 6 +-
arch/arm/src/arm/arm.h | 6 +-
arch/arm/src/armv6-m/nvic.h | 6 +-
arch/arm/src/armv6-m/psr.h | 6 +-
arch/arm/src/armv7-a/barriers.h | 6 +-
arch/arm/src/armv7-m/barriers.h | 6 +-
arch/arm/src/armv7-m/fpb.h | 6 +-
arch/arm/src/armv7-m/mpu.h | 6 +-
arch/arm/src/armv7-m/nvic.h | 6 +-
arch/arm/src/armv7-m/psr.h | 6 +-
arch/arm/src/armv7-m/ram_vectors.h | 6 +-
arch/arm/src/armv7-r/arm.h | 6 +-
arch/arm/src/armv7-r/barriers.h | 6 +-
arch/arm/src/armv7-r/mpu.h | 6 +-
arch/arm/src/armv8-m/barriers.h | 6 +-
arch/arm/src/armv8-m/fpb.h | 6 +-
arch/arm/src/armv8-m/mpu.h | 6 +-
arch/arm/src/armv8-m/nvic.h | 6 +-
arch/arm/src/armv8-m/psr.h | 6 +-
arch/arm/src/armv8-m/ram_vectors.h | 6 +-
arch/arm/src/armv8-m/sau.h | 6 +-
arch/arm/src/cxd56xx/cxd56_i2c_bitbang.h | 6 +-
arch/arm/src/cxd56xx/hardware/cxd56_ge2d.h | 4 +-
arch/arm/src/efm32/efm32_spi.h | 6 +-
arch/arm/src/efm32/efm32_usb.h | 6 +-
arch/arm/src/efm32/hardware/efm32_acmp.h | 6 +-
arch/arm/src/efm32/hardware/efm32_adc.h | 6 +-
arch/arm/src/efm32/hardware/efm32_aes.h | 6 +-
arch/arm/src/efm32/hardware/efm32_burtc.h | 6 +-
arch/arm/src/efm32/hardware/efm32_calibrate.h | 6 +-
arch/arm/src/efm32/hardware/efm32_cmu.h | 6 +-
arch/arm/src/efm32/hardware/efm32_dac.h | 6 +-
arch/arm/src/efm32/hardware/efm32_devinfo.h | 6 +-
arch/arm/src/efm32/hardware/efm32_dma.h | 6 +-
arch/arm/src/efm32/hardware/efm32_emu.h | 6 +-
arch/arm/src/efm32/hardware/efm32_flash.h | 6 +-
arch/arm/src/efm32/hardware/efm32_gpio.h | 6 +-
arch/arm/src/efm32/hardware/efm32_i2c.h | 6 +-
arch/arm/src/efm32/hardware/efm32_lcd.h | 6 +-
arch/arm/src/efm32/hardware/efm32_lesense.h | 6 +-
arch/arm/src/efm32/hardware/efm32_letimer.h | 6 +-
arch/arm/src/efm32/hardware/efm32_leuart.h | 6 +-
arch/arm/src/efm32/hardware/efm32_memorymap.h | 6 +-
arch/arm/src/efm32/hardware/efm32_msc.h | 4 +-
arch/arm/src/efm32/hardware/efm32_pcnt.h | 6 +-
arch/arm/src/efm32/hardware/efm32_prs.h | 6 +-
arch/arm/src/efm32/hardware/efm32_rmu.h | 6 +-
arch/arm/src/efm32/hardware/efm32_romtable.h | 6 +-
arch/arm/src/efm32/hardware/efm32_rtc.h | 6 +-
arch/arm/src/efm32/hardware/efm32_timer.h | 6 +-
arch/arm/src/efm32/hardware/efm32_usart.h | 6 +-
arch/arm/src/efm32/hardware/efm32_usb.h | 6 +-
arch/arm/src/efm32/hardware/efm32_vcmp.h | 6 +-
arch/arm/src/efm32/hardware/efm32_wdog.h | 6 +-
arch/arm/src/efm32/hardware/efm32g_memorymap.h | 6 +-
arch/arm/src/efm32/hardware/efm32gg_memorymap.h | 6 +-
arch/arm/src/efm32/hardware/efm32tg_memorymap.h | 6 +-
arch/arm/src/imx1/chip.h | 6 +-
arch/arm/src/imx1/imx_aitc.h | 10 +-
arch/arm/src/imx1/imx_cspi.h | 6 +-
arch/arm/src/imx1/imx_dma.h | 6 +-
arch/arm/src/imx1/imx_eim.h | 6 +-
arch/arm/src/imx1/imx_i2c.h | 4 +-
arch/arm/src/imx1/imx_memorymap.h | 6 +-
arch/arm/src/imx1/imx_rtc.h | 6 +-
arch/arm/src/imx1/imx_system.h | 36 ++---
arch/arm/src/imx1/imx_timer.h | 6 +-
arch/arm/src/imx1/imx_uart.h | 6 +-
arch/arm/src/imx1/imx_usbd.h | 6 +-
arch/arm/src/imx1/imx_wdog.h | 6 +-
arch/arm/src/imx6/hardware/imx_ecspi.h | 6 +-
arch/arm/src/imx6/imx_ecspi.h | 6 +-
arch/arm/src/imxrt/hardware/imxrt_enc.h | 6 +-
arch/arm/src/imxrt/hardware/imxrt_usbphy.h | 6 +-
arch/arm/src/imxrt/hardware/rt102x/imxrt102x_ccm.h | 6 +-
.../src/imxrt/hardware/rt102x/imxrt102x_dmamux.h | 6 +-
.../arm/src/imxrt/hardware/rt102x/imxrt102x_gpio.h | 6 +-
.../src/imxrt/hardware/rt102x/imxrt102x_iomuxc.h | 6 +-
.../imxrt/hardware/rt102x/imxrt102x_memorymap.h | 6 +-
.../src/imxrt/hardware/rt102x/imxrt102x_pinmux.h | 6 +-
arch/arm/src/imxrt/hardware/rt105x/imxrt105x_ccm.h | 6 +-
.../src/imxrt/hardware/rt105x/imxrt105x_dmamux.h | 6 +-
.../arm/src/imxrt/hardware/rt105x/imxrt105x_gpio.h | 6 +-
.../src/imxrt/hardware/rt105x/imxrt105x_iomuxc.h | 6 +-
.../imxrt/hardware/rt105x/imxrt105x_memorymap.h | 6 +-
.../src/imxrt/hardware/rt105x/imxrt105x_pinmux.h | 6 +-
arch/arm/src/imxrt/hardware/rt106x/imxrt106x_ccm.h | 6 +-
.../src/imxrt/hardware/rt106x/imxrt106x_dmamux.h | 6 +-
.../arm/src/imxrt/hardware/rt106x/imxrt106x_gpio.h | 6 +-
.../src/imxrt/hardware/rt106x/imxrt106x_iomuxc.h | 6 +-
.../imxrt/hardware/rt106x/imxrt106x_memorymap.h | 6 +-
.../src/imxrt/hardware/rt106x/imxrt106x_pinmux.h | 6 +-
arch/arm/src/imxrt/imxrt_adc.h | 6 +-
arch/arm/src/imxrt/imxrt_clockconfig.h | 6 +-
arch/arm/src/imxrt/imxrt_enc.c | 1 +
arch/arm/src/imxrt/imxrt_enc.h | 5 +-
arch/arm/src/imxrt/imxrt_iomuxc.h | 6 +-
arch/arm/src/imxrt/imxrt_lowputc.h | 6 +-
arch/arm/src/imxrt/imxrt_lpi2c.h | 6 +-
arch/arm/src/imxrt/imxrt_usdhc.h | 6 +-
arch/arm/src/kinetis/hardware/kinetis_i2c.h | 6 +-
arch/arm/src/kinetis/kinetis_alarm.h | 6 +-
arch/arm/src/kinetis/kinetis_uid.h | 6 +-
arch/arm/src/kl/hardware/k25z128_pinmux.h | 6 +-
arch/arm/src/kl/kl_config.h | 6 +-
arch/arm/src/kl/kl_gpio.h | 6 +-
arch/arm/src/kl/kl_irq.h | 6 +-
arch/arm/src/kl/kl_lowputc.h | 6 +-
arch/arm/src/kl/kl_pwm.h | 6 +-
arch/arm/src/kl/kl_userspace.h | 6 +-
arch/arm/src/lc823450/chip.h | 6 +-
arch/arm/src/lc823450/lc823450_start.h | 6 +-
arch/arm/src/lc823450/lc823450_usbdev.h | 6 +-
.../src/lpc17xx_40xx/hardware/lpc178x_40xx_iocon.h | 6 +-
.../lpc17xx_40xx/hardware/lpc178x_40xx_memorymap.h | 6 +-
.../lpc17xx_40xx/hardware/lpc178x_40xx_pinconfig.h | 6 +-
.../lpc17xx_40xx/hardware/lpc178x_40xx_syscon.h | 6 +-
arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_adc.h | 6 +-
arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_can.h | 6 +-
arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_dac.h | 6 +-
arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_gpio.h | 6 +-
arch/arm/src/lpc17xx_40xx/lpc178x_40xx_gpio.h | 6 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_i2s.h | 6 +-
arch/arm/src/lpc2378/lpc2378.h | 6 +-
.../src/lpc43xx/hardware/lpc4310203050_pinconfig.h | 6 +-
.../src/lpc43xx/hardware/lpc4337jet100_pinconfig.h | 6 +-
.../src/lpc43xx/hardware/lpc4357fet256_pinconfig.h | 6 +-
arch/arm/src/lpc43xx/hardware/lpc43_qei.h | 6 +-
arch/arm/src/lpc43xx/hardware/lpc43_rtc.h | 6 +-
arch/arm/src/lpc43xx/hardware/lpc43_scu.h | 6 +-
arch/arm/src/lpc43xx/lpc43_can.h | 6 +-
arch/arm/src/lpc43xx/lpc43_cgu.h | 6 +-
arch/arm/src/lpc43xx/lpc43_config.h | 6 +-
arch/arm/src/lpc43xx/lpc43_ethernet.h | 6 +-
arch/arm/src/lpc43xx/lpc43_gpio.h | 6 +-
arch/arm/src/lpc43xx/lpc43_pinconfig.h | 6 +-
arch/arm/src/lpc43xx/lpc43_spi.h | 6 +-
arch/arm/src/lpc43xx/lpc43_ssp.h | 6 +-
arch/arm/src/lpc43xx/lpc43_timer.h | 6 +-
arch/arm/src/lpc43xx/lpc43_uart.h | 6 +-
arch/arm/src/lpc43xx/lpc43_wdt.h | 6 +-
.../lpc43xx/spifi/inc/private/spifilib_chiphw.h | 6 +-
arch/arm/src/lpc43xx/spifi/inc/spifilib_api.h | 10 +-
arch/arm/src/lpc43xx/spifi/inc/spifilib_dev.h | 6 +-
arch/arm/src/lpc54xx/hardware/lpc54_iocon.h | 6 +-
arch/arm/src/lpc54xx/lpc546x_power.h | 6 +-
arch/arm/src/lpc54xx/lpc54_clockconfig.h | 6 +-
arch/arm/src/lpc54xx/lpc54_power.h | 6 +-
arch/arm/src/lpc54xx/lpc54_spi_master.h | 6 +-
arch/arm/src/lpc54xx/lpc54_usb0_ohci.h | 6 +-
.../src/max326xx/max32660/max32660_clockconfig.h | 6 +-
arch/arm/src/nrf52/nrf52_uid.h | 6 +-
arch/arm/src/nrf52/nrf52_wdt_lowerhalf.h | 6 +-
arch/arm/src/nrf52/sdc/core_cm4.h | 6 +-
arch/arm/src/nrf52/sdc/nrf.h | 6 +-
arch/arm/src/phy62xx/bus_dev.h | 6 +-
arch/arm/src/phy62xx/gpio.h | 6 +-
arch/arm/src/phy62xx/log.h | 12 +-
arch/arm/src/phy62xx/mcu_phy_bumbee.h | 6 +-
arch/arm/src/phy62xx/phy6222_irq.h | 7 +-
arch/arm/src/phy62xx/phy62xx_ble.h | 6 +-
arch/arm/src/phy62xx/phyplus_gpio.h | 7 +-
arch/arm/src/phy62xx/phyplus_stub.h | 6 +-
arch/arm/src/phy62xx/phyplus_tim.h | 6 +-
arch/arm/src/phy62xx/phyplus_timer_lowerhalf.h | 6 +-
arch/arm/src/phy62xx/pplus_mtd_flash.h | 6 +-
arch/arm/src/phy62xx/rom_sym_def.h | 10 +-
arch/arm/src/phy62xx/timer.h | 6 +-
arch/arm/src/phy62xx/uart.h | 6 +-
arch/arm/src/phy62xx/version.h | 6 +-
arch/arm/src/rtl8720c/ameba_efuse.h | 6 +-
arch/arm/src/rtl8720c/ameba_flash.h | 6 +-
arch/arm/src/rtl8720c/ameba_uart.h | 6 +-
arch/arm/src/rtl8720c/amebaz_depend.h | 7 +-
arch/arm/src/rtl8720c/amebaz_driver.h | 6 +-
arch/arm/src/rtl8720c/amebaz_hci_board.h | 7 +-
arch/arm/src/rtl8720c/amebaz_netdev.h | 7 +-
arch/arm/src/rtl8720c/amebaz_wlan.h | 7 +-
arch/arm/src/rtl8720c/chip.h | 6 +-
arch/arm/src/rtl8720c/include/irq.h | 7 +-
arch/arm/src/s32k1xx/hardware/s32k1xx_mcm.h | 6 +-
arch/arm/src/s32k1xx/s32k1xx_eeeprom.h | 6 +-
arch/arm/src/s32k1xx/s32k1xx_lowputc.h | 6 +-
arch/arm/src/s32k1xx/s32k1xx_progmem.h | 6 +-
arch/arm/src/s32k1xx/s32k1xx_rtc.h | 6 +-
arch/arm/src/sam34/hardware/sam4l_pinmap.h | 6 +-
arch/arm/src/sam34/hardware/sam4l_usart.h | 6 +-
arch/arm/src/sam34/sam4cm_freerun.h | 6 +-
arch/arm/src/sam34/sam4cm_oneshot.h | 6 +-
arch/arm/src/sam34/sam4s_nand.h | 10 +-
arch/arm/src/sam34/sam_emac.h | 6 +-
arch/arm/src/sam34/sam_rtt.h | 6 +-
arch/arm/src/sam34/sam_tc.h | 6 +-
arch/arm/src/sam34/sam_wdt.h | 6 +-
arch/arm/src/sama5/hardware/sam_flexcom_usart.h | 6 +-
arch/arm/src/sama5/hardware/sam_sdmmc.h | 6 +-
arch/arm/src/sama5/sam_pmecc.h | 6 +-
arch/arm/src/samd5e5/hardware/sam_gmac.h | 6 +-
arch/arm/src/samd5e5/hardware/sam_tc.h | 6 +-
arch/arm/src/samv7/hardware/sam_pio.h | 6 +-
arch/arm/src/samv7/sam_config.h | 6 +-
arch/arm/src/stm32/hardware/stm32_dma_v1.h | 6 +-
arch/arm/src/stm32/hardware/stm32_dma_v2.h | 6 +-
arch/arm/src/stm32/hardware/stm32f33xxx_hrtim.h | 6 +-
arch/arm/src/stm32/hardware/stm32f33xxx_opamp.h | 6 +-
arch/arm/src/stm32/stm32_dfumode.h | 6 +-
arch/arm/src/stm32/stm32_foc.h | 6 +-
arch/arm/src/stm32/stm32_freerun.h | 6 +-
arch/arm/src/stm32/stm32_hciuart.h | 6 +-
arch/arm/src/stm32/stm32_i2s.h | 6 +-
arch/arm/src/stm32/stm32_oneshot.h | 6 +-
arch/arm/src/stm32/stm32_spi.h | 6 +-
arch/arm/src/stm32/stm32_uid.h | 6 +-
arch/arm/src/stm32f0l0g0/hardware/stm32_uart_v1.h | 4 +-
arch/arm/src/stm32f0l0g0/hardware/stm32_uart_v2.h | 4 +-
.../src/stm32f0l0g0/hardware/stm32f03x_memorymap.h | 6 +-
.../hardware/stm32f05xf07xf09x_memorymap.h | 6 +-
.../src/stm32f0l0g0/hardware/stm32g0_memorymap.h | 6 +-
arch/arm/src/stm32f0l0g0/stm32_spi.h | 6 +-
arch/arm/src/stm32f7/hardware/stm32_can.h | 4 +-
arch/arm/src/stm32f7/hardware/stm32_qspi.h | 6 +-
arch/arm/src/stm32f7/hardware/stm32f72xx73xx_adc.h | 6 +-
.../src/stm32f7/hardware/stm32f72xx73xx_dbgmcu.h | 6 +-
arch/arm/src/stm32f7/hardware/stm32f72xx73xx_dma.h | 6 +-
.../src/stm32f7/hardware/stm32f72xx73xx_flash.h | 6 +-
.../stm32f7/hardware/stm32f72xx73xx_memorymap.h | 4 +-
.../src/stm32f7/hardware/stm32f74xx75xx_dbgmcu.h | 6 +-
arch/arm/src/stm32f7/hardware/stm32f74xx75xx_dma.h | 6 +-
.../src/stm32f7/hardware/stm32f74xx75xx_flash.h | 6 +-
arch/arm/src/stm32f7/hardware/stm32f74xx77xx_i2c.h | 4 +-
.../src/stm32f7/hardware/stm32f76xx77xx_dbgmcu.h | 6 +-
arch/arm/src/stm32f7/hardware/stm32f76xx77xx_dma.h | 6 +-
.../src/stm32f7/hardware/stm32f76xx77xx_flash.h | 6 +-
.../stm32f7/hardware/stm32f76xx77xx_memorymap.h | 6 +-
arch/arm/src/stm32f7/stm32_i2c.h | 6 +-
arch/arm/src/stm32f7/stm32_qspi.h | 6 +-
arch/arm/src/stm32f7/stm32_start.h | 6 +-
arch/arm/src/stm32f7/stm32_uid.h | 6 +-
arch/arm/src/stm32h7/hardware/stm32_qspi.h | 6 +-
arch/arm/src/stm32h7/hardware/stm32_wdg.h | 6 +-
arch/arm/src/stm32h7/hardware/stm32h7x3xx_i2c.h | 4 +-
arch/arm/src/stm32h7/stm32.h | 4 +-
arch/arm/src/stm32h7/stm32_i2c.h | 6 +-
arch/arm/src/stm32h7/stm32_oneshot.h | 6 +-
arch/arm/src/stm32h7/stm32_qspi.h | 6 +-
arch/arm/src/stm32h7/stm32_start.h | 6 +-
arch/arm/src/stm32h7/stm32_uid.h | 6 +-
arch/arm/src/stm32h7/stm32_wdg.h | 6 +-
arch/arm/src/stm32l4/hardware/stm32l4_memorymap.h | 6 +-
arch/arm/src/stm32l4/hardware/stm32l4x3xx_dbgmcu.h | 6 +-
arch/arm/src/stm32l4/stm32l4_dfumode.h | 6 +-
arch/arm/src/stm32l4/stm32l4_freerun.h | 6 +-
arch/arm/src/stm32l4/stm32l4_oneshot.h | 6 +-
arch/arm/src/stm32l5/hardware/stm32l562xx_rcc.h | 4 +-
arch/arm/src/stm32l5/hardware/stm32l5_memorymap.h | 6 +-
arch/arm/src/tiva/hardware/cc13x0/cc13x0_ioc.h | 6 +-
.../src/tiva/hardware/cc13x0/cc13x0_memorymap.h | 6 +-
arch/arm/src/tiva/hardware/cc13x0/cc13x0_timer.h | 6 +-
.../hardware/cc13x2_cc26x2/cc13x2_cc26x2_i2c.h | 6 +-
.../hardware/cc13x2_cc26x2/cc13x2_cc26x2_ioc.h | 6 +-
.../hardware/cc13x2_cc26x2/cc13x2_cc26x2_uart.h | 6 +-
arch/arm/src/tiva/hardware/lm/lm3s_sysctrl.h | 6 +-
arch/arm/src/tiva/hardware/lm/lm4f_sysctrl.h | 6 +-
arch/arm/src/tiva/hardware/tiva_sysctrl.h | 6 +-
arch/arm/src/tiva/hardware/tm4c/tm4c123_sysctrl.h | 6 +-
arch/arm/src/tiva/hardware/tm4c/tm4c123_timer.h | 6 +-
arch/arm/src/tiva/hardware/tm4c/tm4c129_sysctrl.h | 6 +-
arch/arm/src/tiva/hardware/tm4c/tm4c129_timer.h | 6 +-
arch/arm/src/tiva/lm/lm3s_gpio.h | 6 +-
arch/arm/src/tiva/lm/lm4f_gpio.h | 6 +-
arch/arm/src/tiva/tiva_hciuart.h | 6 +-
arch/arm/src/tiva/tiva_sysctrl.h | 6 +-
arch/avr/include/debug.h | 6 +-
arch/avr/src/at90usb/at90usb.h | 6 +-
arch/avr/src/at90usb/at90usb_config.h | 6 +-
arch/avr/src/at90usb/at90usb_memorymap.h | 6 +-
arch/avr/src/at90usb/chip.h | 18 +--
arch/avr/src/common/up_internal.h | 6 +-
arch/ceva/src/common/up_arch.h | 6 +-
arch/hc/include/syscall.h | 6 +-
arch/hc/src/common/up_arch.h | 4 +-
arch/hc/src/common/up_internal.h | 6 +-
arch/hc/src/m9s12/m9s12_atd.h | 6 +-
arch/hc/src/m9s12/m9s12_crg.h | 6 +-
arch/hc/src/m9s12/m9s12_emac.h | 6 +-
arch/hc/src/m9s12/m9s12_flash.h | 10 +-
arch/hc/src/m9s12/m9s12_iic.h | 10 +-
arch/hc/src/m9s12/m9s12_int.h | 6 +-
arch/hc/src/m9s12/m9s12_mebi.h | 6 +-
arch/hc/src/m9s12/m9s12_mmc.h | 8 +-
arch/hc/src/m9s12/m9s12_phy.h | 6 +-
arch/hc/src/m9s12/m9s12_pim.h | 6 +-
arch/hc/src/m9s12/m9s12_sci.h | 6 +-
arch/hc/src/m9s12/m9s12_serial.h | 6 +-
arch/hc/src/m9s12/m9s12_spi.h | 6 +-
arch/hc/src/m9s12/m9s12_tim.h | 6 +-
arch/mips/src/common/mips_arch.h | 6 +-
arch/mips/src/common/mips_internal.h | 6 +-
arch/mips/src/mips32/mips_vfork.h | 6 +-
arch/mips/src/pic32mx/pic32mx_config.h | 6 +-
arch/mips/src/pic32mz/hardware/pic32mz_int.h | 6 +-
arch/mips/src/pic32mz/hardware/pic32mz_uart.h | 6 +-
arch/mips/src/pic32mz/pic32mz_excptmacros.h | 6 +-
arch/misoc/include/minerva/csrdefs.h | 6 +-
arch/misoc/src/common/hw/ethmac_mem.h | 6 +-
arch/renesas/include/m16c/inttypes.h | 6 +-
arch/renesas/include/m16c/types.h | 2 +-
arch/renesas/include/rx65n/iodefine.h | 7 +-
arch/renesas/include/rx65n/types.h | 2 +-
arch/renesas/include/sh1/inttypes.h | 6 +-
arch/renesas/include/sh1/types.h | 2 +-
arch/renesas/include/sh1Plimits.h | 6 +-
arch/renesas/include/sh1Ptypes.h | 6 +-
arch/renesas/src/rx65n/chip.h | 2 +-
arch/renesas/src/rx65n/rx65n_cgc.h | 6 +-
arch/renesas/src/rx65n/rx65n_cmt.h | 6 +-
arch/renesas/src/rx65n/rx65n_cmtw.h | 6 +-
arch/renesas/src/rx65n/rx65n_cmtw0.h | 6 +-
arch/renesas/src/rx65n/rx65n_dtc.h | 6 +-
arch/renesas/src/rx65n/rx65n_macrodriver.h | 6 +-
arch/renesas/src/rx65n/rx65n_port.h | 6 +-
arch/renesas/src/rx65n/rx65n_rtc.h | 6 +-
arch/renesas/src/rx65n/rx65n_sbram.h | 2 +-
arch/renesas/src/rx65n/rx65n_sci.h | 6 +-
arch/renesas/src/rx65n/rx65n_usbdev.h | 6 +-
arch/renesas/src/rx65n/rx65n_usbhost.h | 6 +-
arch/renesas/src/sh1/sh1_703x.h | 6 +-
arch/risc-v/src/bl602/bl602_boot2.h | 6 +-
arch/risc-v/src/bl602/bl602_lowputc.h | 6 +-
arch/risc-v/src/bl602/bl602_netdev.h | 6 +-
arch/risc-v/src/bl602/bl602_os_hal.h | 6 +-
arch/risc-v/src/bl602/bl602_romapi.h | 2 +-
arch/risc-v/src/bl602/bl602_rtc.h | 6 +-
arch/risc-v/src/bl602/bl602_tim_lowerhalf.h | 6 +-
arch/risc-v/src/bl602/chip.h | 6 +-
arch/risc-v/src/bl602/hardware/bl602_aon.h | 6 +-
arch/risc-v/src/c906/c906_memorymap.h | 6 +-
arch/risc-v/src/common/riscv_arch.h | 6 +-
arch/risc-v/src/common/riscv_internal.h | 6 +-
arch/risc-v/src/common/riscv_vfork.h | 8 +-
arch/risc-v/src/common/svcall.h | 8 +-
arch/risc-v/src/esp32c3/esp32c3_freerun.h | 6 +-
arch/risc-v/src/esp32c3/esp32c3_memorymap.h | 6 +-
arch/risc-v/src/esp32c3/esp32c3_wifi_utils.h | 6 +-
arch/risc-v/src/esp32c3/hardware/apb_ctrl_reg.h | 6 +-
arch/risc-v/src/esp32c3/hardware/bb_reg.h | 6 +-
.../src/esp32c3/hardware/esp32c3_cache_memory.h | 6 +-
arch/risc-v/src/esp32c3/hardware/extmem_reg.h | 6 +-
arch/risc-v/src/esp32c3/hardware/fe_reg.h | 6 +-
arch/risc-v/src/esp32c3/hardware/nrx_reg.h | 6 +-
arch/risc-v/src/esp32c3/hardware/regi2c_bbpll.h | 6 +-
arch/risc-v/src/esp32c3/hardware/regi2c_brownout.h | 6 +-
arch/risc-v/src/esp32c3/hardware/regi2c_ctrl.h | 6 +-
arch/risc-v/src/esp32c3/hardware/regi2c_dig_reg.h | 6 +-
arch/risc-v/src/esp32c3/hardware/regi2c_lp_bias.h | 6 +-
arch/risc-v/src/esp32c3/hardware/regi2c_saradc.h | 6 +-
arch/risc-v/src/esp32c3/hardware/spi_mem_reg.h | 6 +-
arch/risc-v/src/fe310/fe310_memorymap.h | 6 +-
arch/risc-v/src/k210/k210_memorymap.h | 6 +-
arch/risc-v/src/litex/litex_memorymap.h | 6 +-
.../risc-v/src/mpfs/hardware/mpfs250t_484_pinmap.h | 6 +-
arch/risc-v/src/mpfs/mpfs_i2c.h | 6 +-
arch/risc-v/src/mpfs/mpfs_memorymap.h | 6 +-
arch/risc-v/src/rv32m1/rv32m1_uart.h | 6 +-
arch/sim/src/sim/up_hcisocket_host.h | 6 +-
arch/sim/src/sim/up_i2cbus.h | 6 +-
arch/sim/src/sim/up_internal.h | 6 +-
arch/sim/src/sim/up_spi.h | 6 +-
arch/sim/src/sim/vpnkit/protocol.h | 6 +-
arch/x86/src/qemu/chip.h | 6 +-
arch/x86_64/src/intel64/chip.h | 6 +-
arch/xtensa/include/esp32/tie.h | 6 +-
arch/xtensa/include/esp32s2/tie.h | 6 +-
arch/xtensa/include/xtensa/core_macros.h | 6 +-
arch/xtensa/include/xtensa/xtensa_abi.h | 8 +-
arch/xtensa/src/common/mpu.h | 6 +-
arch/xtensa/src/esp32/esp32_freerun.h | 6 +-
arch/xtensa/src/esp32/esp32_oneshot.h | 6 +-
arch/xtensa/src/esp32/esp32_pm.h | 6 +-
arch/xtensa/src/esp32/esp32_wifi_utils.h | 6 +-
arch/xtensa/src/esp32/hardware/efuse_reg.h | 6 +-
arch/xtensa/src/esp32/hardware/esp32_rtc_io.h | 6 +-
arch/xtensa/src/esp32/hardware/esp32_rtccntl.h | 6 +-
arch/xtensa/src/esp32/rom/esp32_efuse.h | 6 +-
arch/xtensa/src/esp32s2/esp32s2_freerun.h | 6 +-
.../src/esp32s2/hardware/esp32s2_cache_memory.h | 6 +-
arch/xtensa/src/esp32s2/hardware/esp32s2_extmem.h | 6 +-
arch/xtensa/src/esp32s2/hardware/esp32s2_iomux.h | 6 +-
arch/xtensa/src/esp32s2/hardware/esp32s2_rtc_io.h | 6 +-
arch/xtensa/src/esp32s2/hardware/esp32s2_rtccntl.h | 6 +-
arch/xtensa/src/esp32s2/hardware/esp32s2_soc.h | 6 +-
arch/z16/include/z16f/arch.h | 6 +-
arch/z80/include/z8/types.h | 6 +-
arch/z80/include/z80/arch.h | 6 +-
arch/z80/include/z80/io.h | 6 +-
arch/z80/src/ez80/ez80_rtc.h | 6 +-
arch/z80/src/ez80/ez80f91.h | 3 +-
arch/z80/src/z80/z80_mem.h | 6 +-
.../arm/cxd56xx/spresense/include/cxd56_bcm20706.h | 6 +-
boards/arm/imxrt/teensy-4.x/include/board.h | 6 +-
.../imxrt/teensy-4.x/src/imxrt_flexspi_nor_boot.h | 136 ++++++++--------
.../imxrt/teensy-4.x/src/imxrt_flexspi_nor_flash.h | 178 ++++++++++-----------
boards/arm/imxrt/teensy-4.x/src/teensy-4.h | 40 ++---
boards/arm/kinetis/kwikstik-k40/include/board.h | 6 +-
boards/arm/kinetis/kwikstik-k40/src/kwikstik-k40.h | 6 +-
boards/arm/kinetis/twr-k60n512/include/board.h | 6 +-
boards/arm/kinetis/twr-k60n512/src/twr-k60n512.h | 6 +-
boards/arm/lpc17xx_40xx/lincoln60/src/lincoln60.h | 6 +-
boards/arm/lpc17xx_40xx/lx_cpu/include/board.h | 6 +-
boards/arm/lpc17xx_40xx/lx_cpu/src/lx_cpu.h | 6 +-
boards/arm/lpc17xx_40xx/mbed/src/mbed.h | 6 +-
.../lpc17xx_40xx/zkit-arm-1769/src/zkit-arm-1769.h | 6 +-
.../arm/lpc31xx/ea3131/include/board_memorymap.h | 6 +-
.../arm/lpc31xx/ea3152/include/board_memorymap.h | 6 +-
boards/arm/lpc43xx/bambino-200e/src/bambino-200e.h | 6 +-
.../lpc43xx/lpc4330-xplorer/src/lpc4330-xplorer.h | 6 +-
boards/arm/lpc43xx/lpc4357-evb/src/lpc4357-evb.h | 6 +-
boards/arm/lpc43xx/lpc4370-link2/include/board.h | 6 +-
.../arm/lpc43xx/lpc4370-link2/src/lpc4370-link2.h | 6 +-
boards/arm/nrf52/nrf52832-dk/include/board.h | 6 +-
boards/arm/nuc1xx/nutiny-nuc120/include/board.h | 6 +-
boards/arm/phy62xx/phy6222/include/board.h | 6 +-
boards/arm/phy62xx/phy6222/src/phy6222.h | 6 +-
.../rp2040/common/include/rp2040_lcd_backpack.h | 6 +-
.../sam4s-xplained-pro/src/sam4s-xplained-pro.h | 6 +-
.../arm/stm32/clicker2-stm32/src/clicker2-stm32.h | 6 +-
boards/arm/stm32/common/include/board_hall3ph.h | 6 +-
boards/arm/stm32/common/include/board_qencoder.h | 6 +-
boards/arm/stm32/common/include/stm32_apa102.h | 6 +-
boards/arm/stm32/common/include/stm32_apds9960.h | 6 +-
boards/arm/stm32/common/include/stm32_bh1750.h | 6 +-
boards/arm/stm32/common/include/stm32_bmp180.h | 6 +-
boards/arm/stm32/common/include/stm32_dhtxx.h | 6 +-
boards/arm/stm32/common/include/stm32_hcsr04.h | 6 +-
boards/arm/stm32/common/include/stm32_ihm07m1.h | 6 +-
boards/arm/stm32/common/include/stm32_ihm08m1.h | 6 +-
boards/arm/stm32/common/include/stm32_ihm16m1.h | 6 +-
boards/arm/stm32/common/include/stm32_ina219.h | 6 +-
boards/arm/stm32/common/include/stm32_l3gd20.h | 6 +-
.../arm/stm32/common/include/stm32_lcd_backpack.h | 6 +-
boards/arm/stm32/common/include/stm32_lis3dsh.h | 6 +-
boards/arm/stm32/common/include/stm32_lm75.h | 6 +-
boards/arm/stm32/common/include/stm32_max31855.h | 6 +-
boards/arm/stm32/common/include/stm32_max6675.h | 6 +-
boards/arm/stm32/common/include/stm32_mlx90614.h | 6 +-
boards/arm/stm32/common/include/stm32_mpl115a.h | 6 +-
boards/arm/stm32/common/include/stm32_nrf24l01.h | 6 +-
boards/arm/stm32/common/include/stm32_nunchuck.h | 6 +-
boards/arm/stm32/common/include/stm32_ssd1306.h | 6 +-
boards/arm/stm32/common/include/stm32_tone.h | 6 +-
boards/arm/stm32/common/include/stm32_veml6070.h | 6 +-
boards/arm/stm32/common/include/stm32_ws2812.h | 6 +-
boards/arm/stm32/common/include/stm32_xen1210.h | 6 +-
boards/arm/stm32/common/include/stm32_zerocross.h | 6 +-
boards/arm/stm32/fire-stm32v2/src/fire-stm32v2.h | 6 +-
boards/arm/stm32/hymini-stm32v/src/hymini-stm32v.h | 6 +-
boards/arm/stm32/nucleo-f103rb/include/board.h | 4 +-
boards/arm/stm32/nucleo-f207zg/include/board.h | 4 +-
boards/arm/stm32/nucleo-f302r8/include/board.h | 4 +-
boards/arm/stm32/nucleo-f303re/include/board.h | 4 +-
boards/arm/stm32/nucleo-f303ze/include/board.h | 4 +-
.../olimex-stm32-e407/src/olimex-stm32-e407.h | 6 +-
.../olimex-stm32-h405/src/olimex-stm32-h405.h | 6 +-
.../olimex-stm32-h407/src/olimex-stm32-h407.h | 6 +-
.../olimex-stm32-p107/src/olimex-stm32-p107.h | 6 +-
.../olimex-stm32-p207/src/olimex-stm32-p207.h | 6 +-
.../olimex-stm32-p407/src/olimex-stm32-p407.h | 6 +-
boards/arm/stm32/omnibusf4/src/stm32_romfs.h | 6 +-
boards/arm/stm32/stm3220g-eval/src/stm3220g-eval.h | 6 +-
.../stm32/stm32f429i-disco/src/stm32f429i-disco.h | 4 +-
.../viewtool-stm32f107/src/viewtool_stm32f107.h | 6 +-
boards/arm/stm32f7/stm32f746-ws/src/stm32f746-ws.h | 6 +-
.../stm32f746g-disco/src/stm32f746g-disco.h | 4 +-
.../stm32f769i-disco/src/stm32f769i-disco.h | 4 +-
boards/arm/stm32h7/nucleo-h743zi/src/stm32_romfs.h | 6 +-
boards/arm/stm32l4/stm32l476-mdk/include/board.h | 14 +-
.../arm/stm32l4/stm32l476-mdk/src/stm32l476-mdk.h | 6 +-
.../arm/stm32l4/stm32l4r9ai-disco/include/board.h | 6 +-
boards/arm/tiva/ekk-lm3s9b96/src/ekk-lm3s9b96.h | 6 +-
boards/arm/tiva/lm3s6432-s2e/src/lm3s6432-s2e.h | 6 +-
boards/arm/tiva/lm3s6965-ek/src/lm3s6965-ek.h | 6 +-
boards/arm/tiva/lm3s8962-ek/src/lm3s8962-ek.h | 6 +-
boards/avr/at90usb/teensy-2.0/src/teensy-20.h | 6 +-
boards/hc/m9s12/demo9s12ne64/include/board.h | 6 +-
boards/hc/m9s12/demo9s12ne64/src/demo9s12ne64.h | 6 +-
boards/hc/m9s12/ne64badge/include/board.h | 6 +-
boards/hc/m9s12/ne64badge/src/ne64badge.h | 6 +-
boards/misoc/lm32/misoc/include/board.h | 6 +-
boards/renesas/m16c/skp16c26/include/board.h | 6 +-
boards/renesas/m16c/skp16c26/src/skp16c26.h | 6 +-
boards/renesas/rx65n/rx65n-rsk1mb/include/board.h | 6 +-
.../renesas/rx65n/rx65n-rsk2mb/src/rx65n_rsk2mb.h | 6 +-
boards/renesas/sh1/us7032evb1/include/board.h | 6 +-
boards/risc-v/mpfs/icicle/include/board.h | 6 +-
boards/risc-v/mpfs/icicle/src/board_config.h | 6 +-
boards/risc-v/mpfs/m100pfsevp/include/board.h | 6 +-
boards/risc-v/mpfs/m100pfsevp/src/board_config.h | 6 +-
boards/sim/sim/sim/include/nsh_romfsimg.h | 6 +-
boards/x86_64/intel64/qemu-intel64/include/board.h | 6 +-
.../x86_64/intel64/qemu-intel64/src/qemu_intel64.h | 6 +-
boards/xtensa/esp32/common/include/esp32_bmp180.h | 6 +-
.../xtensa/esp32/common/include/esp32_board_i2c.h | 6 +-
.../esp32/common/include/esp32_board_oneshot.h | 6 +-
.../esp32/common/include/esp32_board_spiflash.h | 6 +-
.../xtensa/esp32/common/include/esp32_board_wdt.h | 6 +-
.../xtensa/esp32/common/include/esp32_board_wlan.h | 6 +-
boards/xtensa/esp32/common/include/esp32_ht16k33.h | 6 +-
.../esp32/common/include/esp32_lcd_backpack.h | 6 +-
boards/xtensa/esp32/common/include/esp32_mcp2515.h | 6 +-
boards/xtensa/esp32/common/include/esp32_sht3x.h | 6 +-
.../esp32-ethernet-kit/src/esp32-ethernet-kit.h | 6 +-
.../xtensa/esp32s2/esp32s2-saola-1/include/board.h | 6 +-
drivers/modem/altair/altmdm_pm_state.h | 6 +-
drivers/modem/altair/altmdm_spi.h | 6 +-
drivers/modem/altair/altmdm_sys.h | 6 +-
drivers/video/video_framebuff.h | 6 +-
drivers/video/vnc/vnc_server.h | 6 +-
drivers/wireless/ieee80211/bcm43xxx/bcmf_bdc.h | 6 +-
drivers/wireless/ieee80211/bcm43xxx/bcmf_cdc.h | 6 +-
drivers/wireless/ieee80211/bcm43xxx/bcmf_core.h | 6 +-
drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h | 6 +-
drivers/wireless/ieee80211/bcm43xxx/bcmf_ioctl.h | 6 +-
drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.h | 6 +-
drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.h | 6 +-
.../wireless/ieee80211/bcm43xxx/bcmf_sdio_core.h | 6 +-
.../wireless/ieee80211/bcm43xxx/bcmf_sdio_regs.h | 6 +-
drivers/wireless/ieee80211/bcm43xxx/bcmf_sdpcm.h | 6 +-
drivers/wireless/ieee80211/bcm43xxx/bcmf_utils.h | 6 +-
drivers/wireless/ieee802154/mrf24j40/mrf24j40.h | 6 +-
.../wireless/ieee802154/mrf24j40/mrf24j40_getset.h | 6 +-
.../wireless/ieee802154/mrf24j40/mrf24j40_radif.h | 6 +-
.../wireless/ieee802154/mrf24j40/mrf24j40_reg.h | 6 +-
.../wireless/ieee802154/mrf24j40/mrf24j40_regops.h | 6 +-
drivers/wireless/ieee802154/xbee/xbee.h | 6 +-
drivers/wireless/ieee802154/xbee/xbee_mac.h | 6 +-
drivers/wireless/lpwan/sx127x/sx127x.h | 6 +-
.../wireless/spirit/include/spirit_linearfifo.h | 6 +-
drivers/wireless/spirit/include/spirit_pktstack.h | 6 +-
drivers/wireless/spirit/include/spirit_types.h | 6 +-
fs/inode/inode.h | 6 +-
fs/mmap/fs_rammap.h | 6 +-
fs/rpmsgfs/rpmsgfs.h | 6 +-
include/nuttx/drivers/drivers.h | 6 +-
include/nuttx/eeprom/spi_xx25xx.h | 6 +-
include/nuttx/fs/automount.h | 6 +-
include/nuttx/fs/smart.h | 6 +-
include/nuttx/i2c/i2c_bitbang.h | 6 +-
include/nuttx/i2c/pca9540bdp.h | 6 +-
include/nuttx/input/cypress_mbr3108.h | 6 +-
include/nuttx/lcd/gc9a01.h | 6 +-
include/nuttx/lcd/hd4478ou.h | 6 +-
include/nuttx/lcd/ht16k33.h | 6 +-
include/nuttx/lcd/lcd.h | 6 +-
include/nuttx/lcd/lcd_dev.h | 6 +-
include/nuttx/lcd/memlcd.h | 6 +-
include/nuttx/lcd/p14201.h | 6 +-
include/nuttx/lcd/pcd8544.h | 6 +-
include/nuttx/lcd/ssd1306.h | 16 +-
include/nuttx/lcd/st7032.h | 6 +-
include/nuttx/lcd/st7565.h | 6 +-
include/nuttx/lcd/st7567.h | 6 +-
include/nuttx/lcd/st7735.h | 6 +-
include/nuttx/lcd/st7789.h | 6 +-
include/nuttx/lcd/ug-2864ambag01.h | 16 +-
include/nuttx/lcd/ug-9664hswag01.h | 6 +-
include/nuttx/mm/iob.h | 6 +-
include/nuttx/mtd/hamming.h | 6 +-
include/nuttx/mtd/nand_ecc.h | 6 +-
include/nuttx/mtd/nand_scheme.h | 6 +-
include/nuttx/net/icmpv6.h | 6 +-
include/nuttx/nx/nx.h | 6 +-
include/nuttx/power/bq2429x.h | 6 +-
include/nuttx/power/bq27426.h | 16 +-
include/nuttx/power/bq769x0.h | 16 +-
include/nuttx/power/mcp73871.h | 6 +-
include/nuttx/power/powerled.h | 6 +-
include/nuttx/power/smps.h | 6 +-
include/nuttx/rf/dat-31r5-sp.h | 6 +-
include/nuttx/sensors/adxl345.h | 6 +-
include/nuttx/sensors/aht10.h | 6 +-
include/nuttx/sensors/as5048b.h | 6 +-
include/nuttx/sensors/hc_sr04.h | 6 +-
include/nuttx/sensors/hdc1008.h | 6 +-
include/nuttx/sensors/hts221.h | 6 +-
include/nuttx/sensors/isl29023.h | 6 +-
include/nuttx/sensors/lps25h.h | 6 +-
include/nuttx/sensors/lsm303agr.h | 6 +-
include/nuttx/sensors/lsm6dsl.h | 6 +-
include/nuttx/sensors/lsm9ds1.h | 6 +-
include/nuttx/sensors/max44009.h | 6 +-
include/nuttx/sensors/mb7040.h | 6 +-
include/nuttx/sensors/ms58xx.h | 6 +-
include/nuttx/sensors/msa301.h | 7 +-
include/nuttx/sensors/qencoder.h | 6 +-
include/nuttx/sensors/scd30.h | 6 +-
include/nuttx/sensors/sgp30.h | 6 +-
include/nuttx/sensors/sht21.h | 6 +-
include/nuttx/sensors/sht3x.h | 6 +-
include/nuttx/sensors/sps30.h | 6 +-
include/nuttx/spi/qspi.h | 6 +-
include/nuttx/timers/pwm.h | 6 +-
include/nuttx/video/vesagtf.h | 6 +-
include/nuttx/video/video.h | 6 +-
include/nuttx/video/video_controls.h | 6 +-
include/nuttx/wireless/bluetooth/bt_uart_shim.h | 8 +-
include/nuttx/wireless/ieee802154/at86rf23x.h | 6 +-
include/nuttx/wireless/lpwan/sx127x.h | 6 +-
include/nuttx/wireless/nrf24l01.h | 6 +-
libs/libc/aio/aio.h | 6 +-
libs/libc/libc.h | 6 +-
libs/libc/lzf/lzf.h | 6 +-
libs/libc/modlib/modlib.h | 6 +-
libs/libc/syslog/syslog.h | 6 +-
libs/libc/unistd/unistd.h | 6 +-
libs/libc/wqueue/wqueue.h | 6 +-
libs/libnx/nxfonts/nxfonts.h | 6 +-
libs/libnx/nxfonts/nxfonts_mono5x8.h | 6 +-
libs/libnx/nxfonts/nxfonts_pixel-lcd-machine.h | 6 +-
libs/libnx/nxfonts/nxfonts_pixel-unicode.h | 6 +-
libs/libnx/nxfonts/nxfonts_sans17x22.h | 6 +-
libs/libnx/nxfonts/nxfonts_sans17x23b.h | 6 +-
libs/libnx/nxfonts/nxfonts_sans20x26.h | 6 +-
libs/libnx/nxfonts/nxfonts_sans20x27b.h | 6 +-
libs/libnx/nxfonts/nxfonts_sans22x29.h | 6 +-
libs/libnx/nxfonts/nxfonts_sans22x29b.h | 6 +-
libs/libnx/nxfonts/nxfonts_sans23x27.h | 6 +-
libs/libnx/nxfonts/nxfonts_sans28x37.h | 6 +-
libs/libnx/nxfonts/nxfonts_sans28x37b.h | 6 +-
libs/libnx/nxfonts/nxfonts_sans39x48.h | 6 +-
libs/libnx/nxfonts/nxfonts_sans40x49b.h | 6 +-
libs/libnx/nxfonts/nxfonts_serif22x28b.h | 6 +-
libs/libnx/nxfonts/nxfonts_serif22x29.h | 6 +-
libs/libnx/nxfonts/nxfonts_serif27x38b.h | 6 +-
libs/libnx/nxfonts/nxfonts_serif29x37.h | 6 +-
libs/libnx/nxfonts/nxfonts_serif38x48.h | 6 +-
libs/libnx/nxfonts/nxfonts_serif38x49b.h | 6 +-
libs/libnx/nxfonts/nxfonts_tom-thumb-4x6.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-10x20.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-4x6.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x7.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x8.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x10.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x12.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13b.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13o.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x9.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13b.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13o.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14b.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13b.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13o.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15b.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18.h | 6 +-
libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18b.h | 6 +-
libs/libnx/nxtk/nxtk.h | 6 +-
libs/libxx/libxx.hxx | 6 +-
net/bluetooth/bluetooth.h | 6 +-
net/devif/devif.h | 6 +-
net/ieee802154/ieee802154.h | 6 +-
net/igmp/igmp.h | 6 +-
net/mld/mld.h | 6 +-
net/pkt/pkt.h | 6 +-
net/sixlowpan/sixlowpan.h | 6 +-
net/sixlowpan/sixlowpan_internal.h | 6 +-
net/socket/socket.h | 6 +-
net/tcp/tcp.h | 6 +-
684 files changed, 2248 insertions(+), 2258 deletions(-)
diff --git a/arch/arm/include/armv7-m/nvicpri.h b/arch/arm/include/armv7-m/nvicpri.h
index e081aaf..0ede47a 100644
--- a/arch/arm/include/armv7-m/nvicpri.h
+++ b/arch/arm/include/armv7-m/nvicpri.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_INCLUDE_ARM7_M_NVICPRI_H
-#define __ARCH_ARM_INCLUDE_ARM7_M_NVICPRI_H
+#ifndef __ARCH_ARM_INCLUDE_ARMV7_M_NVICPRI_H
+#define __ARCH_ARM_INCLUDE_ARMV7_M_NVICPRI_H
/****************************************************************************
* Included Files
@@ -78,4 +78,4 @@
#define NVIC_SYSH_DISABLE_PRIORITY NVIC_SYSH_PRIORITY_DEFAULT
#define NVIC_SYSH_SVCALL_PRIORITY (NVIC_SYSH_PRIORITY_DEFAULT - 1*NVIC_SYSH_PRIORITY_STEP)
-#endif /* __ARCH_ARM_INCLUDE_ARM7_M_NVICPRI_H */
+#endif /* __ARCH_ARM_INCLUDE_ARMV7_M_NVICPRI_H */
diff --git a/arch/arm/include/armv8-m/nvicpri.h b/arch/arm/include/armv8-m/nvicpri.h
index c2b2d91..24f0e87 100644
--- a/arch/arm/include/armv8-m/nvicpri.h
+++ b/arch/arm/include/armv8-m/nvicpri.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_INCLUDE_ARM8_M_NVICPRI_H
-#define __ARCH_ARM_INCLUDE_ARM8_M_NVICPRI_H
+#ifndef __ARCH_ARM_INCLUDE_ARMV8_M_NVICPRI_H
+#define __ARCH_ARM_INCLUDE_ARMV8_M_NVICPRI_H
/****************************************************************************
* Included Files
@@ -78,4 +78,4 @@
#define NVIC_SYSH_DISABLE_PRIORITY NVIC_SYSH_PRIORITY_DEFAULT
#define NVIC_SYSH_SVCALL_PRIORITY (NVIC_SYSH_PRIORITY_DEFAULT - 1*NVIC_SYSH_PRIORITY_STEP)
-#endif /* __ARCH_ARM_INCLUDE_ARM8_M_NVICPRI_H */
+#endif /* __ARCH_ARM_INCLUDE_ARMV8_M_NVICPRI_H */
diff --git a/arch/arm/include/efm32/efm32g_irq.h b/arch/arm/include/efm32/efm32g_irq.h
index 57cdd63..61ed9f3 100644
--- a/arch/arm/include/efm32/efm32g_irq.h
+++ b/arch/arm/include/efm32/efm32g_irq.h
@@ -22,8 +22,8 @@
* through nuttx/irq.h
*/
-#ifndef __ARCH_ARM_INCLUDE_EFM32G_IRQ_H
-#define __ARCH_ARM_INCLUDE_EFM32G_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_EFM32_EFM32G_IRQ_H
+#define __ARCH_ARM_INCLUDE_EFM32_EFM32G_IRQ_H
/****************************************************************************
* Included Files
@@ -105,4 +105,4 @@ extern "C"
#endif
#endif
-#endif /* __ARCH_ARM_INCLUDE_EFM32G_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_EFM32_EFM32G_IRQ_H */
diff --git a/arch/arm/include/efm32/efm32gg_irq.h b/arch/arm/include/efm32/efm32gg_irq.h
index bc2e301..27cd6b3 100644
--- a/arch/arm/include/efm32/efm32gg_irq.h
+++ b/arch/arm/include/efm32/efm32gg_irq.h
@@ -22,8 +22,8 @@
* through nuttx/irq.h
*/
-#ifndef __ARCH_ARM_INCLUDE_EFM32GG_IRQ_H
-#define __ARCH_ARM_INCLUDE_EFM32GG_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_EFM32_EFM32GG_IRQ_H
+#define __ARCH_ARM_INCLUDE_EFM32_EFM32GG_IRQ_H
/****************************************************************************
* Included Files
@@ -113,4 +113,4 @@ extern "C"
#endif
#endif
-#endif /* __ARCH_ARM_INCLUDE_EFM32GG_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_EFM32_EFM32GG_IRQ_H */
diff --git a/arch/arm/include/efm32/efm32tg_irq.h b/arch/arm/include/efm32/efm32tg_irq.h
index 0617fed..33d5d31 100644
--- a/arch/arm/include/efm32/efm32tg_irq.h
+++ b/arch/arm/include/efm32/efm32tg_irq.h
@@ -22,8 +22,8 @@
* through nuttx/irq.h
*/
-#ifndef __ARCH_ARM_INCLUDE_EFM32TG_IRQ_H
-#define __ARCH_ARM_INCLUDE_EFM32TG_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_EFM32_EFM32TG_IRQ_H
+#define __ARCH_ARM_INCLUDE_EFM32_EFM32TG_IRQ_H
/****************************************************************************
* Included Files
@@ -97,4 +97,4 @@ extern "C"
#endif
#endif
-#endif /* __ARCH_ARM_INCLUDE_EFM32TG_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_EFM32_EFM32TG_IRQ_H */
diff --git a/arch/arm/include/kinetis/kinetis_k40irq.h b/arch/arm/include/kinetis/kinetis_k40irq.h
index b33a844..df62786 100644
--- a/arch/arm/include/kinetis/kinetis_k40irq.h
+++ b/arch/arm/include/kinetis/kinetis_k40irq.h
@@ -22,8 +22,8 @@
* only indirectly through nuttx/irq.h
*/
-#ifndef __ARCH_ARM_INCLUDE_KINETIS_KINETIS_40KIRQ_H
-#define __ARCH_ARM_INCLUDE_KINETIS_KINETIS_40KIRQ_H
+#ifndef __ARCH_ARM_INCLUDE_KINETIS_KINETIS_K40IRQ_H
+#define __ARCH_ARM_INCLUDE_KINETIS_KINETIS_K40IRQ_H
/****************************************************************************
* Included Files
@@ -182,4 +182,4 @@ extern "C"
#endif
#endif
-#endif /* __ARCH_ARM_INCLUDE_KINETIS_KINETIS_40KIRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_KINETIS_KINETIS_K40IRQ_H */
diff --git a/arch/arm/include/kinetis/kinetis_k60irq.h b/arch/arm/include/kinetis/kinetis_k60irq.h
index 6b134a5..ffddc2a 100644
--- a/arch/arm/include/kinetis/kinetis_k60irq.h
+++ b/arch/arm/include/kinetis/kinetis_k60irq.h
@@ -22,8 +22,8 @@
* only indirectly through nuttx/irq.h
*/
-#ifndef __ARCH_ARM_INCLUDE_KINETIS_KINETIS_60KIRQ_H
-#define __ARCH_ARM_INCLUDE_KINETIS_KINETIS_60KIRQ_H
+#ifndef __ARCH_ARM_INCLUDE_KINETIS_KINETIS_K60IRQ_H
+#define __ARCH_ARM_INCLUDE_KINETIS_KINETIS_K60IRQ_H
/****************************************************************************
* Included Files
@@ -182,4 +182,4 @@ extern "C"
#endif
#endif
-#endif /* __ARCH_ARM_INCLUDE_KINETIS_KINETIS_60KIRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_KINETIS_KINETIS_K60IRQ_H */
diff --git a/arch/arm/include/kinetis/kinetis_k64irq.h b/arch/arm/include/kinetis/kinetis_k64irq.h
index e72ec12..75116ae 100644
--- a/arch/arm/include/kinetis/kinetis_k64irq.h
+++ b/arch/arm/include/kinetis/kinetis_k64irq.h
@@ -22,8 +22,8 @@
* only indirectly through nuttx/irq.h
*/
-#ifndef __ARCH_ARM_INCLUDE_KINETIS_KINETIS_64KIRQ_H
-#define __ARCH_ARM_INCLUDE_KINETIS_KINETIS_64KIRQ_H
+#ifndef __ARCH_ARM_INCLUDE_KINETIS_KINETIS_K64IRQ_H
+#define __ARCH_ARM_INCLUDE_KINETIS_KINETIS_K64IRQ_H
/****************************************************************************
* Included Files
@@ -172,4 +172,4 @@ extern "C"
#endif
#endif
-#endif /* __ARCH_ARM_INCLUDE_KINETIS_KINETIS_64KIRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_KINETIS_KINETIS_K64IRQ_H */
diff --git a/arch/arm/include/lpc17xx_40xx/lpc178x_40xx_irq.h b/arch/arm/include/lpc17xx_40xx/lpc178x_40xx_irq.h
index 8fb5255..cadd3db 100644
--- a/arch/arm/include/lpc17xx_40xx/lpc178x_40xx_irq.h
+++ b/arch/arm/include/lpc17xx_40xx/lpc178x_40xx_irq.h
@@ -22,8 +22,8 @@
* only indirectly through nuttx/irq.h
*/
-#ifndef __ARCH_ARM_INCLUDE_LPC17XX_40XX_LPC178X_IRQ_H
-#define __ARCH_ARM_INCLUDE_LPC17XX_40XX_LPC178X_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_LPC17XX_40XX_LPC178X_40XX_IRQ_H
+#define __ARCH_ARM_INCLUDE_LPC17XX_40XX_LPC178X_40XX_IRQ_H
/****************************************************************************
* Included Files
@@ -272,4 +272,4 @@
* Public Function Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_INCLUDE_LPC17XX_40XX_LPC178X_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_LPC17XX_40XX_LPC178X_40XX_IRQ_H */
diff --git a/arch/arm/include/lpc54xx/lpc546x_irq.h b/arch/arm/include/lpc54xx/lpc546x_irq.h
index 2cd6f32..7a5eecc 100644
--- a/arch/arm/include/lpc54xx/lpc546x_irq.h
+++ b/arch/arm/include/lpc54xx/lpc546x_irq.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_INCLUDE_LPC54XX_LPC543X_IRQ_H
-#define __ARCH_ARM_INCLUDE_LPC54XX_LPC543X_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_LPC54XX_LPC546X_IRQ_H
+#define __ARCH_ARM_INCLUDE_LPC54XX_LPC546X_IRQ_H
/****************************************************************************
* Included Files
@@ -96,4 +96,4 @@
#define NR_IRQS LPC54_IRQ_NIRQS
-#endif /* __ARCH_ARM_INCLUDE_LPC54XX_LPC543X_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_LPC54XX_LPC546X_IRQ_H */
diff --git a/arch/arm/include/max326xx/irq.h b/arch/arm/include/max326xx/irq.h
index 91b7e28..c529c6b 100644
--- a/arch/arm/include/max326xx/irq.h
+++ b/arch/arm/include/max326xx/irq.h
@@ -22,8 +22,8 @@
* only indirectly through nuttx/irq.h
*/
-#ifndef __ARCH_ARM_INCLUDE_MAX326_IRQ_H
-#define __ARCH_ARM_INCLUDE_MAX326_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_MAX326XX_IRQ_H
+#define __ARCH_ARM_INCLUDE_MAX326XX_IRQ_H
/****************************************************************************
* Included Files
@@ -99,4 +99,4 @@ extern "C"
#endif
#endif
-#endif /* __ARCH_ARM_INCLUDE_MAX326_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_MAX326XX_IRQ_H */
diff --git a/arch/arm/include/phy62xx/phy62xx_irq.h b/arch/arm/include/phy62xx/phy62xx_irq.h
index c1b6100..82d0101 100644
--- a/arch/arm/include/phy62xx/phy62xx_irq.h
+++ b/arch/arm/include/phy62xx/phy62xx_irq.h
@@ -22,8 +22,8 @@
* through nuttx/irq.h
*/
-#ifndef __ARCH_ARM_INCLUDE_PHYPLUS_PHY62XX_IRQ_H
-#define __ARCH_ARM_INCLUDE_PHYPLUS_PHY62XX_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_PHY62XX_PHY62XX_IRQ_H
+#define __ARCH_ARM_INCLUDE_PHY62XX_PHY62XX_IRQ_H
/****************************************************************************
* Included Files
@@ -101,4 +101,4 @@ extern "C"
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_INCLUDE_STM32F0L0G0_STM32F0_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_PHY62XX_PHY62XX_IRQ_H */
diff --git a/arch/arm/include/samd5e5/samd5e5_irq.h b/arch/arm/include/samd5e5/samd5e5_irq.h
index 37e3829..f893f51 100644
--- a/arch/arm/include/samd5e5/samd5e5_irq.h
+++ b/arch/arm/include/samd5e5/samd5e5_irq.h
@@ -22,8 +22,8 @@
* only indirectly through nuttx/irq.h
*/
-#ifndef __ARCH_ARM_INCLUDE_SAMD5E5_SAM4L_IRQ_H
-#define __ARCH_ARM_INCLUDE_SAMD5E5_SAM4L_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_SAMD5E5_SAMD5E5_IRQ_H
+#define __ARCH_ARM_INCLUDE_SAMD5E5_SAMD5E5_IRQ_H
/****************************************************************************
* Included Files
@@ -229,4 +229,4 @@ extern "C"
#endif
#endif
-#endif /* __ARCH_ARM_INCLUDE_SAMD5E5_SAM4L_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_SAMD5E5_SAMD5E5_IRQ_H */
diff --git a/arch/arm/include/tiva/cc13x2_cc26x2_irq.h b/arch/arm/include/tiva/cc13x2_cc26x2_irq.h
index 1ad68e9..a5d8448 100644
--- a/arch/arm/include/tiva/cc13x2_cc26x2_irq.h
+++ b/arch/arm/include/tiva/cc13x2_cc26x2_irq.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_INCLUDE_TIVA_CC13X2_CC26x2_IRQ_H
-#define __ARCH_ARM_INCLUDE_TIVA_CC13X2_CC26x2_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_TIVA_CC13X2_CC26X2_IRQ_H
+#define __ARCH_ARM_INCLUDE_TIVA_CC13X2_CC26X2_IRQ_H
/****************************************************************************
* Included Files
@@ -128,4 +128,4 @@
#define NR_GPIO_IRQS (_NGPIOTIRQS - NR_IRQS)
-#endif /* __ARCH_ARM_INCLUDE_TIVA_CC13X2_CC26x2_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_TIVA_CC13X2_CC26X2_IRQ_H */
diff --git a/arch/arm/src/arm/arm.h b/arch/arm/src/arm/arm.h
index 7764965..4dc315b 100644
--- a/arch/arm/src/arm/arm.h
+++ b/arch/arm/src/arm/arm.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_COMMON_ARM_H
-#define __ARCH_ARM_SRC_COMMON_ARM_H
+#ifndef __ARCH_ARM_SRC_ARM_ARM_H
+#define __ARCH_ARM_SRC_ARM_ARM_H
/****************************************************************************
* Included Files
@@ -450,4 +450,4 @@ extern "C"
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_COMMON_ARM_H */
+#endif /* __ARCH_ARM_SRC_ARM_ARM_H */
diff --git a/arch/arm/src/armv6-m/nvic.h b/arch/arm/src/armv6-m/nvic.h
index a26c7ed..688a651 100644
--- a/arch/arm/src/armv6-m/nvic.h
+++ b/arch/arm/src/armv6-m/nvic.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_COMMON_ARMV6_M_NVIC_H
-#define __ARCH_ARM_SRC_COMMON_ARMV6_M_NVIC_H
+#ifndef __ARCH_ARM_SRC_ARMV6_M_NVIC_H
+#define __ARCH_ARM_SRC_ARMV6_M_NVIC_H
/****************************************************************************
* Included Files
@@ -388,4 +388,4 @@ void arm_dumpnvic(FAR const char *msg);
}
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_COMMON_ARMV6_M_NVIC_H */
+#endif /* __ARCH_ARM_SRC_ARMV6_M_NVIC_H */
diff --git a/arch/arm/src/armv6-m/psr.h b/arch/arm/src/armv6-m/psr.h
index 71c4347..95a4175 100644
--- a/arch/arm/src/armv6-m/psr.h
+++ b/arch/arm/src/armv6-m/psr.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_COMMON_ARMV6_M_PSR_H
-#define __ARCH_ARM_SRC_COMMON_ARMV6_M_PSR_H
+#ifndef __ARCH_ARM_SRC_ARMV6_M_PSR_H
+#define __ARCH_ARM_SRC_ARMV6_M_PSR_H
/****************************************************************************
* Included Files
@@ -59,4 +59,4 @@
* Inline Functions
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_COMMON_ARMV6_M_PSR_H */
+#endif /* __ARCH_ARM_SRC_ARMV6_M_PSR_H */
diff --git a/arch/arm/src/armv7-a/barriers.h b/arch/arm/src/armv7-a/barriers.h
index 3d95a09..70e98e5d 100644
--- a/arch/arm/src/armv7-a/barriers.h
+++ b/arch/arm/src/armv7-a/barriers.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_COMMON_ARMV7_A_BARRIERS_H
-#define __ARCH_ARM_SRC_COMMON_ARMV7_A_BARRIERS_H
+#ifndef __ARCH_ARM_SRC_ARMV7_A_BARRIERS_H
+#define __ARCH_ARM_SRC_ARMV7_A_BARRIERS_H
/****************************************************************************
* Included Files
@@ -39,4 +39,4 @@
#define ARM_ISB() arm_isb(15)
#define ARM_DMB() arm_dmb(15)
-#endif /* __ARCH_ARM_SRC_COMMON_ARMV7_A_BARRIERS_H */
+#endif /* __ARCH_ARM_SRC_ARMV7_A_BARRIERS_H */
diff --git a/arch/arm/src/armv7-m/barriers.h b/arch/arm/src/armv7-m/barriers.h
index 5ac66c7..b8d91fd 100644
--- a/arch/arm/src/armv7-m/barriers.h
+++ b/arch/arm/src/armv7-m/barriers.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_COMMON_ARMV7_M_BARRIERS_H
-#define __ARCH_ARM_SRC_COMMON_ARMV7_M_BARRIERS_H
+#ifndef __ARCH_ARM_SRC_ARMV7_M_BARRIERS_H
+#define __ARCH_ARM_SRC_ARMV7_M_BARRIERS_H
/****************************************************************************
* Included Files
@@ -39,4 +39,4 @@
#define ARM_ISB() arm_isb(15)
#define ARM_DMB() arm_dmb(15)
-#endif /* __ARCH_ARM_SRC_COMMON_ARMV7_M_BARRIERS_H */
+#endif /* __ARCH_ARM_SRC_ARMV7_M_BARRIERS_H */
diff --git a/arch/arm/src/armv7-m/fpb.h b/arch/arm/src/armv7-m/fpb.h
index 99358e6..320fc04 100644
--- a/arch/arm/src/armv7-m/fpb.h
+++ b/arch/arm/src/armv7-m/fpb.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_ARMV&-M_FPB_H
-#define __ARCH_ARM_SRC_ARMV&-M_FPB_H
+#ifndef __ARCH_ARM_SRC_ARMV7_M_FPB_H
+#define __ARCH_ARM_SRC_ARMV7_M_FPB_H
/****************************************************************************
* Pre-processor Definitions
@@ -164,4 +164,4 @@
#define FPB_COMP0_ENABLE_SHIFT 0
# define FPB_COMP0_ENABLE 0x00000001
-#endif /* __ARCH_ARM_SRC_ARMV&-M_FPB_H */
+#endif /* __ARCH_ARM_SRC_ARMV7_M_FPB_H */
diff --git a/arch/arm/src/armv7-m/mpu.h b/arch/arm/src/armv7-m/mpu.h
index 870fea6..ff32921 100644
--- a/arch/arm/src/armv7-m/mpu.h
+++ b/arch/arm/src/armv7-m/mpu.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_ARMV7M_MPU_H
-#define __ARCH_ARM_SRC_ARMV7M_MPU_H
+#ifndef __ARCH_ARM_SRC_ARMV7_M_MPU_H
+#define __ARCH_ARM_SRC_ARMV7_M_MPU_H
/****************************************************************************
* Included Files
@@ -473,4 +473,4 @@ void mpu_configure_region(uintptr_t base, size_t size,
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_ARM_MPU */
-#endif /* __ARCH_ARM_SRC_ARMV7M_MPU_H */
+#endif /* __ARCH_ARM_SRC_ARMV7_M_MPU_H */
diff --git a/arch/arm/src/armv7-m/nvic.h b/arch/arm/src/armv7-m/nvic.h
index e2cb025..4ed1b4d 100644
--- a/arch/arm/src/armv7-m/nvic.h
+++ b/arch/arm/src/armv7-m/nvic.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_COMMON_ARMV7_M_NVIC_H
-#define __ARCH_ARM_SRC_COMMON_ARMV7_M_NVIC_H
+#ifndef __ARCH_ARM_SRC_ARMV7_M_NVIC_H
+#define __ARCH_ARM_SRC_ARMV7_M_NVIC_H
/****************************************************************************
* Included Files
@@ -778,4 +778,4 @@
* Public Function Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_COMMON_ARMV7_M_NVIC_H */
+#endif /* __ARCH_ARM_SRC_ARMV7_M_NVIC_H */
diff --git a/arch/arm/src/armv7-m/psr.h b/arch/arm/src/armv7-m/psr.h
index 11fffd0..7cd1cc1 100644
--- a/arch/arm/src/armv7-m/psr.h
+++ b/arch/arm/src/armv7-m/psr.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_COMMON_ARMV7_M_PSR_H
-#define __ARCH_ARM_SRC_COMMON_ARMV7_M_PSR_H
+#ifndef __ARCH_ARM_SRC_ARMV7_M_PSR_H
+#define __ARCH_ARM_SRC_ARMV7_M_PSR_H
/****************************************************************************
* Included Files
@@ -69,4 +69,4 @@
* Inline Functions
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_COMMON_ARMV7_M_PSR_H */
+#endif /* __ARCH_ARM_SRC_ARMV7_M_PSR_H */
diff --git a/arch/arm/src/armv7-m/ram_vectors.h b/arch/arm/src/armv7-m/ram_vectors.h
index 9ed7ae6..b837a52 100644
--- a/arch/arm/src/armv7-m/ram_vectors.h
+++ b/arch/arm/src/armv7-m/ram_vectors.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_COMMON_ARMV7_M_RAM_VECTORS_H
-#define __ARCH_ARM_SRC_COMMON_ARMV7_M_RAM_VECTORS_H
+#ifndef __ARCH_ARM_SRC_ARMV7_M_RAM_VECTORS_H
+#define __ARCH_ARM_SRC_ARMV7_M_RAM_VECTORS_H
/****************************************************************************
* Included Files
@@ -100,4 +100,4 @@ void exception_common(void);
int arm_ramvec_attach(int irq, up_vector_t vector);
#endif /* CONFIG_ARCH_RAMVECTORS */
-#endif /* __ARCH_ARM_SRC_COMMON_ARMV7_M_RAM_VECTORS_H */
+#endif /* __ARCH_ARM_SRC_ARMV7_M_RAM_VECTORS_H */
diff --git a/arch/arm/src/armv7-r/arm.h b/arch/arm/src/armv7-r/arm.h
index 530dba4..be1e24d 100644
--- a/arch/arm/src/armv7-r/arm.h
+++ b/arch/arm/src/armv7-r/arm.h
@@ -25,8 +25,8 @@
* All rights reserved. ARM DDI 0406C.c (ID051414)
*/
-#ifndef __ARCH_ARM_SRC_ARMV7_R_CPSR_H
-#define __ARCH_ARM_SRC_ARMV7_R_CPSR_H
+#ifndef __ARCH_ARM_SRC_ARMV7_R_ARM_H
+#define __ARCH_ARM_SRC_ARMV7_R_ARM_H
/****************************************************************************
* Included Files
@@ -154,4 +154,4 @@ void arm_data_initialize(void);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_ARMV7_R_CPSR_H */
+#endif /* __ARCH_ARM_SRC_ARMV7_R_ARM_H */
diff --git a/arch/arm/src/armv7-r/barriers.h b/arch/arm/src/armv7-r/barriers.h
index 7e32a76..dbdd232 100644
--- a/arch/arm/src/armv7-r/barriers.h
+++ b/arch/arm/src/armv7-r/barriers.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_COMMON_ARMV7_R_BARRIERS_H
-#define __ARCH_ARM_SRC_COMMON_ARMV7_R_BARRIERS_H
+#ifndef __ARCH_ARM_SRC_ARMV7_R_BARRIERS_H
+#define __ARCH_ARM_SRC_ARMV7_R_BARRIERS_H
/****************************************************************************
* Included Files
@@ -39,4 +39,4 @@
#define ARM_ISB() arm_isb(15)
#define ARM_DMB() arm_dmb(15)
-#endif /* __ARCH_ARM_SRC_COMMON_ARMV7_R_BARRIERS_H */
+#endif /* __ARCH_ARM_SRC_ARMV7_R_BARRIERS_H */
diff --git a/arch/arm/src/armv7-r/mpu.h b/arch/arm/src/armv7-r/mpu.h
index 5824353..39d4b97 100644
--- a/arch/arm/src/armv7-r/mpu.h
+++ b/arch/arm/src/armv7-r/mpu.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_ARMV7R_MPU_H
-#define __ARCH_ARM_SRC_ARMV7R_MPU_H
+#ifndef __ARCH_ARM_SRC_ARMV7_R_MPU_H
+#define __ARCH_ARM_SRC_ARMV7_R_MPU_H
/****************************************************************************
* Included Files
@@ -845,4 +845,4 @@ static inline void mpu_user_intsram_wb(uintptr_t base, size_t size)
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_ARMV7R_MPU_H */
+#endif /* __ARCH_ARM_SRC_ARMV7_R_MPU_H */
diff --git a/arch/arm/src/armv8-m/barriers.h b/arch/arm/src/armv8-m/barriers.h
index 1e3da82..789268e 100644
--- a/arch/arm/src/armv8-m/barriers.h
+++ b/arch/arm/src/armv8-m/barriers.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_COMMON_ARMV8_M_BARRIERS_H
-#define __ARCH_ARM_SRC_COMMON_ARMV8_M_BARRIERS_H
+#ifndef __ARCH_ARM_SRC_ARMV8_M_BARRIERS_H
+#define __ARCH_ARM_SRC_ARMV8_M_BARRIERS_H
/****************************************************************************
* Included Files
@@ -39,4 +39,4 @@
#define ARM_ISB() arm_isb(15)
#define ARM_DMB() arm_dmb(15)
-#endif /* __ARCH_ARM_SRC_COMMON_ARMV8_M_BARRIERS_H */
+#endif /* __ARCH_ARM_SRC_ARMV8_M_BARRIERS_H */
diff --git a/arch/arm/src/armv8-m/fpb.h b/arch/arm/src/armv8-m/fpb.h
index 7caa1fc..de14a4c 100644
--- a/arch/arm/src/armv8-m/fpb.h
+++ b/arch/arm/src/armv8-m/fpb.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_ARMV8-M_FPB_H
-#define __ARCH_ARM_SRC_ARMV8-M_FPB_H
+#ifndef __ARCH_ARM_SRC_ARMV8_M_FPB_H
+#define __ARCH_ARM_SRC_ARMV8_M_FPB_H
/****************************************************************************
* Pre-processor Definitions
@@ -173,4 +173,4 @@
#define FPB_COMP0_ENABLE_SHIFT 0
# define FPB_COMP0_ENABLE 0x00000001
-#endif /* __ARCH_ARM_SRC_ARMV8-M_FPB_H */
+#endif /* __ARCH_ARM_SRC_ARMV8_M_FPB_H */
diff --git a/arch/arm/src/armv8-m/mpu.h b/arch/arm/src/armv8-m/mpu.h
index 428a06a..6e5dcdc 100644
--- a/arch/arm/src/armv8-m/mpu.h
+++ b/arch/arm/src/armv8-m/mpu.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_ARMV8M_MPU_H
-#define __ARCH_ARM_SRC_ARMV8M_MPU_H
+#ifndef __ARCH_ARM_SRC_ARMV8_M_MPU_H
+#define __ARCH_ARM_SRC_ARMV8_M_MPU_H
/****************************************************************************
* Included Files
@@ -436,4 +436,4 @@ void mpu_configure_region(uintptr_t base, size_t size,
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_ARM_MPU */
-#endif /* __ARCH_ARM_SRC_ARMV8M_MPU_H */
+#endif /* __ARCH_ARM_SRC_ARMV8_M_MPU_H */
diff --git a/arch/arm/src/armv8-m/nvic.h b/arch/arm/src/armv8-m/nvic.h
index a542e66..d6b0809 100644
--- a/arch/arm/src/armv8-m/nvic.h
+++ b/arch/arm/src/armv8-m/nvic.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_COMMON_ARMV8_M_NVIC_H
-#define __ARCH_ARM_SRC_COMMON_ARMV8_M_NVIC_H
+#ifndef __ARCH_ARM_SRC_ARMV8_M_NVIC_H
+#define __ARCH_ARM_SRC_ARMV8_M_NVIC_H
/****************************************************************************
* Included Files
@@ -896,4 +896,4 @@
* Public Function Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_COMMON_ARMV8_M_NVIC_H */
+#endif /* __ARCH_ARM_SRC_ARMV8_M_NVIC_H */
diff --git a/arch/arm/src/armv8-m/psr.h b/arch/arm/src/armv8-m/psr.h
index fa50970..f97890e 100644
--- a/arch/arm/src/armv8-m/psr.h
+++ b/arch/arm/src/armv8-m/psr.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_COMMON_ARMV8_M_PSR_H
-#define __ARCH_ARM_SRC_COMMON_ARMV8_M_PSR_H
+#ifndef __ARCH_ARM_SRC_ARMV8_M_PSR_H
+#define __ARCH_ARM_SRC_ARMV8_M_PSR_H
/****************************************************************************
* Included Files
@@ -117,4 +117,4 @@
* Inline Functions
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_COMMON_ARMV8_M_PSR_H */
+#endif /* __ARCH_ARM_SRC_ARMV8_M_PSR_H */
diff --git a/arch/arm/src/armv8-m/ram_vectors.h b/arch/arm/src/armv8-m/ram_vectors.h
index cd61140..6c55b53 100644
--- a/arch/arm/src/armv8-m/ram_vectors.h
+++ b/arch/arm/src/armv8-m/ram_vectors.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_COMMON_ARMV8_M_RAM_VECTORS_H
-#define __ARCH_ARM_SRC_COMMON_ARMV8_M_RAM_VECTORS_H
+#ifndef __ARCH_ARM_SRC_ARMV8_M_RAM_VECTORS_H
+#define __ARCH_ARM_SRC_ARMV8_M_RAM_VECTORS_H
/****************************************************************************
* Included Files
@@ -100,4 +100,4 @@ void exception_common(void);
int arm_ramvec_attach(int irq, up_vector_t vector);
#endif /* CONFIG_ARCH_RAMVECTORS */
-#endif /* __ARCH_ARM_SRC_COMMON_ARMV8_M_RAM_VECTORS_H */
+#endif /* __ARCH_ARM_SRC_ARMV8_M_RAM_VECTORS_H */
diff --git a/arch/arm/src/armv8-m/sau.h b/arch/arm/src/armv8-m/sau.h
index 9c3601d..af325a7 100644
--- a/arch/arm/src/armv8-m/sau.h
+++ b/arch/arm/src/armv8-m/sau.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_ARMV8M_SAU_H
-#define __ARCH_ARM_SRC_ARMV8M_SAU_H
+#ifndef __ARCH_ARM_SRC_ARMV8_M_SAU_H
+#define __ARCH_ARM_SRC_ARMV8_M_SAU_H
/****************************************************************************
* Included Files
@@ -188,4 +188,4 @@ void sau_configure_region(uintptr_t base, size_t size, uint32_t flags);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_ARMV8M_SAU_H */
+#endif /* __ARCH_ARM_SRC_ARMV8_M_SAU_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_i2c_bitbang.h b/arch/arm/src/cxd56xx/cxd56_i2c_bitbang.h
index 3b39414..88d6115 100644
--- a/arch/arm/src/cxd56xx/cxd56_i2c_bitbang.h
+++ b/arch/arm/src/cxd56xx/cxd56_i2c_bitbang.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_CXD56_CXD56_I2C_BITBANG_H
-#define __ARCH_ARM_SRC_CXD56_CXD56_I2C_BITBANG_H
+#ifndef __ARCH_ARM_SRC_CXD56XX_CXD56_I2C_BITBANG_H
+#define __ARCH_ARM_SRC_CXD56XX_CXD56_I2C_BITBANG_H
/****************************************************************************
* Included Files
@@ -48,4 +48,4 @@ struct i2c_master_s *cxd56_i2c_bitbang_initialize(uint32_t sda_pin,
}
#endif
-#endif /* __ARCH_ARM_SRC_CXD56_CXD56_I2C_BITBANG_H */
+#endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_I2C_BITBANG_H */
diff --git a/arch/arm/src/cxd56xx/hardware/cxd56_ge2d.h b/arch/arm/src/cxd56xx/hardware/cxd56_ge2d.h
index fbfdc5f..c5e682f 100644
--- a/arch/arm/src/cxd56xx/hardware/cxd56_ge2d.h
+++ b/arch/arm/src/cxd56xx/hardware/cxd56_ge2d.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_CXD56XX_CXD56_GE2D_H
-#define __ARCH_ARM_SRC_CXD56XX_CXD56_GE2D_H
+#ifndef __ARCH_ARM_SRC_CXD56XX_HARDWARE_CXD56_GE2D_H
+#define __ARCH_ARM_SRC_CXD56XX_HARDWARE_CXD56_GE2D_H
/****************************************************************************
* Included Files
diff --git a/arch/arm/src/efm32/efm32_spi.h b/arch/arm/src/efm32/efm32_spi.h
index 1d40479..a688924 100644
--- a/arch/arm/src/efm32/efm32_spi.h
+++ b/arch/arm/src/efm32/efm32_spi.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_EFM32_EFM32_SPI_H
-#define __ARCH_ARM_EFM32_EFM32_SPI_H
+#ifndef __ARCH_ARM_SRC_EFM32_EFM32_SPI_H
+#define __ARCH_ARM_SRC_EFM32_EFM32_SPI_H
/****************************************************************************
* Included Files
@@ -108,4 +108,4 @@ int efm32_spi2_cmddata(struct spi_dev_s *dev, uint32_t devid,
bool cmd);
#endif
-#endif /* __ARCH_ARM_EFM32_EFM32_SPI_H */
+#endif /* __ARCH_ARM_SRC_EFM32_EFM32_SPI_H */
diff --git a/arch/arm/src/efm32/efm32_usb.h b/arch/arm/src/efm32/efm32_usb.h
index 63547df..c85bbe0 100644
--- a/arch/arm/src/efm32/efm32_usb.h
+++ b/arch/arm/src/efm32/efm32_usb.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_EFM32_OTGFS_H
-#define __ARCH_ARM_SRC_EFM32_EFM32_OTGFS_H
+#ifndef __ARCH_ARM_SRC_EFM32_EFM32_USB_H
+#define __ARCH_ARM_SRC_EFM32_EFM32_USB_H
/****************************************************************************
* Included Files
@@ -200,4 +200,4 @@ void efm32_usbsuspend(FAR struct usbdev_s *dev, bool resume);
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_EFM32_OTGFS */
-#endif /* __ARCH_ARM_SRC_EFM32_EFM32_OTGFS_H */
+#endif /* __ARCH_ARM_SRC_EFM32_EFM32_USB_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_acmp.h b/arch/arm/src/efm32/hardware/efm32_acmp.h
index c6083a0..53be0e2 100644
--- a/arch/arm/src/efm32/hardware/efm32_acmp.h
+++ b/arch/arm/src/efm32/hardware/efm32_acmp.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_ACMP_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_ACMP_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_ACMP_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_ACMP_H
/****************************************************************************
* Included Files
@@ -400,4 +400,4 @@
#define ACMP_ROUTE_LOCATION_LOC1 (_ACMP_ROUTE_LOCATION_LOC1 << 8) /* Shifted mode LOC1 for ACMP_ROUTE */
#define ACMP_ROUTE_LOCATION_LOC2 (_ACMP_ROUTE_LOCATION_LOC2 << 8) /* Shifted mode LOC2 for ACMP_ROUTE */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_ACMP_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_ACMP_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_adc.h b/arch/arm/src/efm32/hardware/efm32_adc.h
index f12de7c..b42482f 100644
--- a/arch/arm/src/efm32/hardware/efm32_adc.h
+++ b/arch/arm/src/efm32/hardware/efm32_adc.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_ADC_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_ADC_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_ADC_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_ADC_H
/****************************************************************************
* Included Files
@@ -749,4 +749,4 @@
#define _ADC_BIASPROG_COMPBIAS_DEFAULT 0x00000007UL /* Mode DEFAULT for ADC_BIASPROG */
#define ADC_BIASPROG_COMPBIAS_DEFAULT (_ADC_BIASPROG_COMPBIAS_DEFAULT << 8) /* Shifted mode DEFAULT for ADC_BIASPROG */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_ADC_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_ADC_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_aes.h b/arch/arm/src/efm32/hardware/efm32_aes.h
index a21bc25..c99b5ea 100644
--- a/arch/arm/src/efm32/hardware/efm32_aes.h
+++ b/arch/arm/src/efm32/hardware/efm32_aes.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_AES_H_
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_AES_H_
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_AES_H_
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_AES_H_
/****************************************************************************
* Included Files
@@ -325,4 +325,4 @@
#define _AES_KEYHD_KEYHD_DEFAULT 0x00000000UL /* Mode DEFAULT for AES_KEYHD */
#define AES_KEYHD_KEYHD_DEFAULT (_AES_KEYHD_KEYHD_DEFAULT << 0) /* Shifted mode DEFAULT for AES_KEYHD */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_AES_H_ */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_AES_H_ */
diff --git a/arch/arm/src/efm32/hardware/efm32_burtc.h b/arch/arm/src/efm32/hardware/efm32_burtc.h
index 22a7f12..5c9dc21 100644
--- a/arch/arm/src/efm32/hardware/efm32_burtc.h
+++ b/arch/arm/src/efm32/hardware/efm32_burtc.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_BURTC_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_BURTC_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_BURTC_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_BURTC_H
/****************************************************************************
* Included Files
@@ -468,4 +468,4 @@
#define _BURTC_RET_REG_REG_DEFAULT 0x00000000UL /* Mode DEFAULT for BURTC_RET_REG */
#define BURTC_RET_REG_REG_DEFAULT (_BURTC_RET_REG_REG_DEFAULT << 0) /* Shifted mode DEFAULT for BURTC_RET_REG */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_BURTC_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_BURTC_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_calibrate.h b/arch/arm/src/efm32/hardware/efm32_calibrate.h
index 32026e0..bf184a5 100644
--- a/arch/arm/src/efm32/hardware/efm32_calibrate.h
+++ b/arch/arm/src/efm32/hardware/efm32_calibrate.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_CALIBRATE_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_CALIBRATE_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_CALIBRATE_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_CALIBRATE_H
/****************************************************************************
* Included Files
@@ -90,4 +90,4 @@ struct efm32_calibrate_s
const uint32_t value; /* Default value for calibration register */
};
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_CALIBRATE_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_CALIBRATE_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_cmu.h b/arch/arm/src/efm32/hardware/efm32_cmu.h
index 2e5a4b0..dd2208f 100644
--- a/arch/arm/src/efm32/hardware/efm32_cmu.h
+++ b/arch/arm/src/efm32/hardware/efm32_cmu.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_CMU_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_CMU_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_CMU_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_CMU_H
/****************************************************************************
* Included Files
@@ -1653,4 +1653,4 @@
#define CMU_LOCK_LOCKKEY_LOCKED (_CMU_LOCK_LOCKKEY_LOCKED << 0) /* Shifted mode LOCKED for CMU_LOCK */
#define CMU_LOCK_LOCKKEY_UNLOCK (_CMU_LOCK_LOCKKEY_UNLOCK << 0) /* Shifted mode UNLOCK for CMU_LOCK */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_CMU_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_CMU_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_dac.h b/arch/arm/src/efm32/hardware/efm32_dac.h
index efe4fc3..de84065 100644
--- a/arch/arm/src/efm32/hardware/efm32_dac.h
+++ b/arch/arm/src/efm32/hardware/efm32_dac.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_DAC_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_DAC_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_DAC_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_DAC_H
/****************************************************************************
* Included Files
@@ -881,4 +881,4 @@
#define DAC_OPA2MUX_RESSEL_RES6 (_DAC_OPA2MUX_RESSEL_RES6 << 28) /* Shifted mode RES6 for DAC_OPA2MUX */
#define DAC_OPA2MUX_RESSEL_RES7 (_DAC_OPA2MUX_RESSEL_RES7 << 28) /* Shifted mode RES7 for DAC_OPA2MUX */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_DAC_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_DAC_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_devinfo.h b/arch/arm/src/efm32/hardware/efm32_devinfo.h
index 05472cd..e75532e 100644
--- a/arch/arm/src/efm32/hardware/efm32_devinfo.h
+++ b/arch/arm/src/efm32/hardware/efm32_devinfo.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_DEVINFO_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_DEVINFO_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_DEVINFO_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_DEVINFO_H
/****************************************************************************
* Included Files
@@ -224,4 +224,4 @@
* Public Type Definitions
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_DEVINFO_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_DEVINFO_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_dma.h b/arch/arm/src/efm32/hardware/efm32_dma.h
index b7a7357..2a30335 100644
--- a/arch/arm/src/efm32/hardware/efm32_dma.h
+++ b/arch/arm/src/efm32/hardware/efm32_dma.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_DMA_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_DMA_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_DMA_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_DMA_H
/****************************************************************************
* Included Files
@@ -2285,4 +2285,4 @@ struct dma_descriptor_s
volatile uint32_t user; /* DMA padding register, available for user */
};
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_DMA_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_DMA_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_emu.h b/arch/arm/src/efm32/hardware/efm32_emu.h
index f7b2db8..3cfe957 100644
--- a/arch/arm/src/efm32/hardware/efm32_emu.h
+++ b/arch/arm/src/efm32/hardware/efm32_emu.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_EMU_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_EMU_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_EMU_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_EMU_H
/****************************************************************************
* Included Files
@@ -440,4 +440,4 @@
#define _EMU_BUBODUNREGCAL_RANGE_DEFAULT 0x00000001UL /* Mode DEFAULT for EMU_BUBODUNREGCAL */
#define EMU_BUBODUNREGCAL_RANGE_DEFAULT (_EMU_BUBODUNREGCAL_RANGE_DEFAULT << 3) /* Shifted mode DEFAULT for EMU_BUBODUNREGCAL */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_EMU_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_EMU_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_flash.h b/arch/arm/src/efm32/hardware/efm32_flash.h
index 72fab3a..6bfc432 100644
--- a/arch/arm/src/efm32/hardware/efm32_flash.h
+++ b/arch/arm/src/efm32/hardware/efm32_flash.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_FLASH_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_FLASH_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_FLASH_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_FLASH_H
/****************************************************************************
* Pre-processor Definitions
@@ -39,4 +39,4 @@
# define EFM32_FLASH_PAGESIZE 512
#endif
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_FLASH_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_FLASH_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_gpio.h b/arch/arm/src/efm32/hardware/efm32_gpio.h
index 761c50a..5599de2 100644
--- a/arch/arm/src/efm32/hardware/efm32_gpio.h
+++ b/arch/arm/src/efm32/hardware/efm32_gpio.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_GPIO_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_GPIO_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_GPIO_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_GPIO_H
/****************************************************************************
* Included Files
@@ -1483,4 +1483,4 @@
#define GPIO_EM4WUCAUSE_EM4WUCAUSE_F2 (_GPIO_EM4WUCAUSE_EM4WUCAUSE_F2 << 0) /* Shifted mode F2 for GPIO_EM4WUCAUSE */
#define GPIO_EM4WUCAUSE_EM4WUCAUSE_E13 (_GPIO_EM4WUCAUSE_EM4WUCAUSE_E13 << 0) /* Shifted mode E13 for GPIO_EM4WUCAUSE */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_GPIO_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_GPIO_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_i2c.h b/arch/arm/src/efm32/hardware/efm32_i2c.h
index 939c5f8..3ba4dac 100644
--- a/arch/arm/src/efm32/hardware/efm32_i2c.h
+++ b/arch/arm/src/efm32/hardware/efm32_i2c.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_I2C_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_I2C_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_I2C_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_I2C_H
/****************************************************************************
* Included Files
@@ -798,4 +798,4 @@
#define I2C_ROUTE_LOCATION_LOC5 (_I2C_ROUTE_LOCATION_LOC5 << 8) /* Shifted mode LOC5 for I2C_ROUTE */
#define I2C_ROUTE_LOCATION_LOC6 (_I2C_ROUTE_LOCATION_LOC6 << 8) /* Shifted mode LOC6 for I2C_ROUTE */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_I2C_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_I2C_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_lcd.h b/arch/arm/src/efm32/hardware/efm32_lcd.h
index 0f4dcb9..99bfd55 100644
--- a/arch/arm/src/efm32/hardware/efm32_lcd.h
+++ b/arch/arm/src/efm32/hardware/efm32_lcd.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_LCD_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_LCD_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_LCD_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_LCD_H
/****************************************************************************
* Included Files
@@ -712,4 +712,4 @@
#define _LCD_SEGD7L_SEGD7L_DEFAULT 0x00000000UL /* Mode DEFAULT for LCD_SEGD7L */
#define LCD_SEGD7L_SEGD7L_DEFAULT (_LCD_SEGD7L_SEGD7L_DEFAULT << 0) /* Shifted mode DEFAULT for LCD_SEGD7L */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_LCD_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_LCD_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_lesense.h b/arch/arm/src/efm32/hardware/efm32_lesense.h
index f176678..48fea94 100644
--- a/arch/arm/src/efm32/hardware/efm32_lesense.h
+++ b/arch/arm/src/efm32/hardware/efm32_lesense.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_LESENSE_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_LESENSE_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_LESENSE_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_LESENSE_H
/****************************************************************************
* Included Files
@@ -2158,4 +2158,4 @@
#define _LESENSE_CH_EVAL_SCANRESINV_DEFAULT 0x00000000UL /* Mode DEFAULT for LESENSE_CH_EVAL */
#define LESENSE_CH_EVAL_SCANRESINV_DEFAULT (_LESENSE_CH_EVAL_SCANRESINV_DEFAULT << 19) /* Shifted mode DEFAULT for LESENSE_CH_EVAL */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_LESENSE_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_LESENSE_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_letimer.h b/arch/arm/src/efm32/hardware/efm32_letimer.h
index 25dff51..4eb9d0b 100644
--- a/arch/arm/src/efm32/hardware/efm32_letimer.h
+++ b/arch/arm/src/efm32/hardware/efm32_letimer.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_LETIMER_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_LETIMER_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_LETIMER_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_LETIMER_H
/****************************************************************************
* Included Files
@@ -486,4 +486,4 @@
#define LETIMER_ROUTE_LOCATION_LOC2 (_LETIMER_ROUTE_LOCATION_LOC2 << 8) /* Shifted mode LOC2 for LETIMER_ROUTE */
#define LETIMER_ROUTE_LOCATION_LOC3 (_LETIMER_ROUTE_LOCATION_LOC3 << 8) /* Shifted mode LOC3 for LETIMER_ROUTE */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_LETIMER_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_LETIMER_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_leuart.h b/arch/arm/src/efm32/hardware/efm32_leuart.h
index b8ae69d..03f78b8 100644
--- a/arch/arm/src/efm32/hardware/efm32_leuart.h
+++ b/arch/arm/src/efm32/hardware/efm32_leuart.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_LEUART_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_LEUART_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_LEUART_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_LEUART_H
/****************************************************************************
* Included Files
@@ -825,4 +825,4 @@
# define LEUART_INPUT_RXPRS_DEFAULT (_LEUART_INPUT_RXPRS_DEFAULT << 4) /* Shifted mode DEFAULT for LEUART_INPUT */
#endif
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_LEUART_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_LEUART_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_memorymap.h b/arch/arm/src/efm32/hardware/efm32_memorymap.h
index 42d94a7..dc45fa6 100644
--- a/arch/arm/src/efm32/hardware/efm32_memorymap.h
+++ b/arch/arm/src/efm32/hardware/efm32_memorymap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_MEMORYMAP_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_MEMORYMAP_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_MEMORYMAP_H
/****************************************************************************
* Included Files
@@ -38,4 +38,4 @@
# error "Unsupported EFM32 memory map"
#endif
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_MEMORYMAP_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_msc.h b/arch/arm/src/efm32/hardware/efm32_msc.h
index 7ae8387..5df0bb8 100644
--- a/arch/arm/src/efm32/hardware/efm32_msc.h
+++ b/arch/arm/src/efm32/hardware/efm32_msc.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_EFM32_EFM32_MSC_H
-#define __ARCH_ARM_SRC_EFM32_EFM32_EFM32_MSC_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_MSC_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_MSC_H
/****************************************************************************
* Included Files
diff --git a/arch/arm/src/efm32/hardware/efm32_pcnt.h b/arch/arm/src/efm32/hardware/efm32_pcnt.h
index 0462d8d..0a5c56f 100644
--- a/arch/arm/src/efm32/hardware/efm32_pcnt.h
+++ b/arch/arm/src/efm32/hardware/efm32_pcnt.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_PCNT_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_PCNT_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_PCNT_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_PCNT_H
/****************************************************************************
* Included Files
@@ -527,4 +527,4 @@
#define _PCNT_INPUT_S1PRSEN_DEFAULT 0x00000000UL /* Mode DEFAULT for PCNT_INPUT */
#define PCNT_INPUT_S1PRSEN_DEFAULT (_PCNT_INPUT_S1PRSEN_DEFAULT << 10) /* Shifted mode DEFAULT for PCNT_INPUT */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_PCNT_H*/
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_PCNT_H*/
diff --git a/arch/arm/src/efm32/hardware/efm32_prs.h b/arch/arm/src/efm32/hardware/efm32_prs.h
index 531ef0a..79535fe 100644
--- a/arch/arm/src/efm32/hardware/efm32_prs.h
+++ b/arch/arm/src/efm32/hardware/efm32_prs.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_PRS_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_PRS_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_PRS_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_PRS_H
/****************************************************************************
* Included Files
@@ -608,4 +608,4 @@
#define PRS_LESENSE_DEC1 ((59 << 16) + 1) /* PRS LESENSE Decoder PRS out 1 */
#define PRS_LESENSE_DEC2 ((59 << 16) + 2) /* PRS LESENSE Decoder PRS out 2 */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_PRS_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_PRS_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_rmu.h b/arch/arm/src/efm32/hardware/efm32_rmu.h
index 190f111..24a0af0 100644
--- a/arch/arm/src/efm32/hardware/efm32_rmu.h
+++ b/arch/arm/src/efm32/hardware/efm32_rmu.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_RMU_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_RMU_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_RMU_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_RMU_H
/****************************************************************************
* Included Files
@@ -203,4 +203,4 @@
#define _RMU_CMD_RCCLR_DEFAULT 0x00000000UL /**< Mode DEFAULT for RMU_CMD */
#define RMU_CMD_RCCLR_DEFAULT (_RMU_CMD_RCCLR_DEFAULT << 0) /**< Shifted mode DEFAULT for RMU_CMD */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_RMU_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_RMU_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_romtable.h b/arch/arm/src/efm32/hardware/efm32_romtable.h
index ed223f4..fb5a5a6 100644
--- a/arch/arm/src/efm32/hardware/efm32_romtable.h
+++ b/arch/arm/src/efm32/hardware/efm32_romtable.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_ROMTABLE_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_ROMTABLE_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_ROMTABLE_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_ROMTABLE_H
/****************************************************************************
* Included Files
@@ -111,4 +111,4 @@ struct efm32_romtable_s
const uint32_t cid0; /* Unused */
};
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_ROMTABLE_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_ROMTABLE_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_rtc.h b/arch/arm/src/efm32/hardware/efm32_rtc.h
index 566b50b..7855c29 100644
--- a/arch/arm/src/efm32/hardware/efm32_rtc.h
+++ b/arch/arm/src/efm32/hardware/efm32_rtc.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_RTC_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_RTC_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_RTC_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_RTC_H
/****************************************************************************
* Included Files
@@ -279,4 +279,4 @@
#define _RTC_SYNCBUSY_COMP1_DEFAULT 0x00000000UL /* Mode DEFAULT for RTC_SYNCBUSY */
#define RTC_SYNCBUSY_COMP1_DEFAULT (_RTC_SYNCBUSY_COMP1_DEFAULT << 2) /* Shifted mode DEFAULT for RTC_SYNCBUSY */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_RTC_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_RTC_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_timer.h b/arch/arm/src/efm32/hardware/efm32_timer.h
index aaf2d79..e2df318 100644
--- a/arch/arm/src/efm32/hardware/efm32_timer.h
+++ b/arch/arm/src/efm32/hardware/efm32_timer.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_TIMER_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_TIMER_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_TIMER_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_TIMER_H
/****************************************************************************
* Included Files
@@ -1216,4 +1216,4 @@
#define TIMER_DTLOCK_LOCKKEY_LOCKED (_TIMER_DTLOCK_LOCKKEY_LOCKED << 0) /* Shifted mode LOCKED for TIMER_DTLOCK */
#define TIMER_DTLOCK_LOCKKEY_UNLOCK (_TIMER_DTLOCK_LOCKKEY_UNLOCK << 0) /* Shifted mode UNLOCK for TIMER_DTLOCK */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_TIMER_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_TIMER_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_usart.h b/arch/arm/src/efm32/hardware/efm32_usart.h
index 53405ee..52a0f34 100644
--- a/arch/arm/src/efm32/hardware/efm32_usart.h
+++ b/arch/arm/src/efm32/hardware/efm32_usart.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_USART_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_USART_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_USART_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_USART_H
/****************************************************************************
* Included Files
@@ -1388,4 +1388,4 @@
#define USART_I2SCTRL_FORMAT_W16D8 (_USART_I2SCTRL_FORMAT_W16D8 << 8) /* Shifted mode W16D8 for USART_I2SCTRL */
#define USART_I2SCTRL_FORMAT_W8D8 (_USART_I2SCTRL_FORMAT_W8D8 << 8) /* Shifted mode W8D8 for USART_I2SCTRL */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_USART_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_USART_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_usb.h b/arch/arm/src/efm32/hardware/efm32_usb.h
index b12195d..3ffa970 100644
--- a/arch/arm/src/efm32/hardware/efm32_usb.h
+++ b/arch/arm/src/efm32/hardware/efm32_usb.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_USB_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_USB_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_USB_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_USB_H
/****************************************************************************
* Included Files
@@ -3156,4 +3156,4 @@
#define _USB_FIFORAM_FIFORAM_DEFAULT 0x00000000UL /* Mode DEFAULT for USB_FIFORAM */
#define USB_FIFORAM_FIFORAM_DEFAULT (_USB_FIFORAM_FIFORAM_DEFAULT << 0) /* Shifted mode DEFAULT for USB_FIFORAM */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_USB_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_USB_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_vcmp.h b/arch/arm/src/efm32/hardware/efm32_vcmp.h
index 268ba26..5a2a97e 100644
--- a/arch/arm/src/efm32/hardware/efm32_vcmp.h
+++ b/arch/arm/src/efm32/hardware/efm32_vcmp.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_VCMP_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_VCMP_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_VCMP_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_VCMP_H
/****************************************************************************
* Included Files
@@ -253,4 +253,4 @@
#define _VCMP_IFC_WARMUP_DEFAULT 0x00000000UL /* Mode DEFAULT for VCMP_IFC */
#define VCMP_IFC_WARMUP_DEFAULT (_VCMP_IFC_WARMUP_DEFAULT << 1) /* Shifted mode DEFAULT for VCMP_IFC */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_VCMP_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_VCMP_H */
diff --git a/arch/arm/src/efm32/hardware/efm32_wdog.h b/arch/arm/src/efm32/hardware/efm32_wdog.h
index b446d99..eb6d379 100644
--- a/arch/arm/src/efm32/hardware/efm32_wdog.h
+++ b/arch/arm/src/efm32/hardware/efm32_wdog.h
@@ -58,8 +58,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32_WDOG_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32_WDOG_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_WDOG_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_WDOG_H
/****************************************************************************
* Included Files
@@ -176,4 +176,4 @@
#define _WDOG_SYNCBUSY_CMD_DEFAULT 0x00000000UL /* Mode DEFAULT for WDOG_SYNCBUSY */
#define WDOG_SYNCBUSY_CMD_DEFAULT (_WDOG_SYNCBUSY_CMD_DEFAULT << 1) /* Shifted mode DEFAULT for WDOG_SYNCBUSY */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32_WDOG_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32_WDOG_H */
diff --git a/arch/arm/src/efm32/hardware/efm32g_memorymap.h b/arch/arm/src/efm32/hardware/efm32g_memorymap.h
index 699cdec..e223687 100644
--- a/arch/arm/src/efm32/hardware/efm32g_memorymap.h
+++ b/arch/arm/src/efm32/hardware/efm32g_memorymap.h
@@ -20,8 +20,8 @@
/* Reference: "EFM32G Reference Manual, Gecko Series", Energy Micro */
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32G_MEMORYMAP_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32G_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32G_MEMORYMAP_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32G_MEMORYMAP_H
/****************************************************************************
* Pre-processor Definitions
@@ -83,4 +83,4 @@
#define EFM32_PRS_BASE 0x400cc000 /* PRS base address */
#define EFM32_AES_BASE 0x400e0000 /* AES base address */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32G_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32G_MEMORYMAP_H */
diff --git a/arch/arm/src/efm32/hardware/efm32gg_memorymap.h b/arch/arm/src/efm32/hardware/efm32gg_memorymap.h
index 5b52a1c..8c60f6b 100644
--- a/arch/arm/src/efm32/hardware/efm32gg_memorymap.h
+++ b/arch/arm/src/efm32/hardware/efm32gg_memorymap.h
@@ -56,8 +56,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM32GG_MEMORYMAP_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM32GG_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32GG_MEMORYMAP_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32GG_MEMORYMAP_H
/****************************************************************************
* Pre-processor Definitions
@@ -140,4 +140,4 @@
#define EFM32_USERDATA_SIZE 0x00000800 /* User data page size */
#define EFM32_USERDATA_NPAGES 1 /* User data page number */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM32GG_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM32GG_MEMORYMAP_H */
diff --git a/arch/arm/src/efm32/hardware/efm32tg_memorymap.h b/arch/arm/src/efm32/hardware/efm32tg_memorymap.h
index 62d305f..6b18065 100644
--- a/arch/arm/src/efm32/hardware/efm32tg_memorymap.h
+++ b/arch/arm/src/efm32/hardware/efm32tg_memorymap.h
@@ -56,8 +56,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_EFM32_CHIP_EFM3TG_MEMORYMAP_H
-#define __ARCH_ARM_SRC_EFM32_CHIP_EFM3TG_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_EFM32_HARDWARE_EFM3TG_MEMORYMAP_H
+#define __ARCH_ARM_SRC_EFM32_HARDWARE_EFM3TG_MEMORYMAP_H
/****************************************************************************
* Pre-processor Definitions
@@ -125,4 +125,4 @@
#define EFM32_CALIBRATE_BASE 0x0fe08000 /* CALIBRATE base address */
#define EFM32_DEVINFO_BASE 0x0fe081b0 /* DEVINFO base address */
-#endif /* __ARCH_ARM_SRC_EFM32_CHIP_EFM3TG_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_EFM32_HARDWARE_EFM3TG_MEMORYMAP_H */
diff --git a/arch/arm/src/imx1/chip.h b/arch/arm/src/imx1/chip.h
index ce028cd..ea322ad 100644
--- a/arch/arm/src/imx1/chip.h
+++ b/arch/arm/src/imx1/chip.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_IMX_CHIP_H
-#define __ARCH_ARM_IMX_CHIP_H
+#ifndef __ARCH_ARM_SRC_IMX1_CHIP_H
+#define __ARCH_ARM_SRC_IMX1_CHIP_H
/****************************************************************************
* Included Files
@@ -47,4 +47,4 @@
* Inline Functions
****************************************************************************/
-#endif /* __ARCH_ARM_IMX_CHIP_H */
+#endif /* __ARCH_ARM_SRC_IMX1_CHIP_H */
diff --git a/arch/arm/src/imx1/imx_aitc.h b/arch/arm/src/imx1/imx_aitc.h
index 7409f88..ae1f6a8 100644
--- a/arch/arm/src/imx1/imx_aitc.h
+++ b/arch/arm/src/imx1/imx_aitc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_IMX_AITC_H
-#define __ARCH_ARM_IMX_AITC_H
+#ifndef __ARCH_ARM_SRC_IMX1_IMX_AITC_H
+#define __ARCH_ARM_SRC_IMX1_IMX_AITC_H
/****************************************************************************
* Included Files
@@ -91,13 +91,13 @@
/* AITC Register Bit Definitions ********************************************/
-#define AITC_NIVECSR_NIPRILVL_SHIFT 0 /* Bits 15�0: Priority of highest priority interrupt */
+#define AITC_NIVECSR_NIPRILVL_SHIFT 0 /* Bits 15-0: Priority of highest priority interrupt */
#define AITC_NIVECSR_NIPRILVL_MASK (0x0000ffff << AITC_NIVECSR_NIPRILVL_SHIFT);
-#define AITC_NIVECSR_NIVECTOR_SHIFT 16 /* Bits 31�16: Vector index of highest priority interrupt */
+#define AITC_NIVECSR_NIVECTOR_SHIFT 16 /* Bits 31-16: Vector index of highest priority interrupt */
#define AITC_NIVECSR_NIVECTOR_MASK (0x0000ffff << AITC_NIVECSR_NIVECTOR_SHIFT);
/****************************************************************************
* Inline Functions
****************************************************************************/
-#endif /* __ARCH_ARM_IMX_AITC_H */
+#endif /* __ARCH_ARM_SRC_IMX1_IMX_AITC_H */
diff --git a/arch/arm/src/imx1/imx_cspi.h b/arch/arm/src/imx1/imx_cspi.h
index 3674c87..82b5634 100644
--- a/arch/arm/src/imx1/imx_cspi.h
+++ b/arch/arm/src/imx1/imx_cspi.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_IMX_CSPI_H
-#define __ARCH_ARM_IMX_CSPI_H
+#ifndef __ARCH_ARM_SRC_IMX1_IMX_CSPI_H
+#define __ARCH_ARM_SRC_IMX1_IMX_CSPI_H
/****************************************************************************
* Included Files
@@ -224,4 +224,4 @@ int imx_spicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif /* __cplusplus */
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_IMX_CSPI_H */
+#endif /* __ARCH_ARM_SRC_IMX1_IMX_CSPI_H */
diff --git a/arch/arm/src/imx1/imx_dma.h b/arch/arm/src/imx1/imx_dma.h
index 3e4dda2..22c7be3 100644
--- a/arch/arm/src/imx1/imx_dma.h
+++ b/arch/arm/src/imx1/imx_dma.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_IMX_DMA_H
-#define __ARCH_ARM_IMX_DMA_H
+#ifndef __ARCH_ARM_SRC_IMX1_IMX_DMA_H
+#define __ARCH_ARM_SRC_IMX1_IMX_DMA_H
/****************************************************************************
* Included Files
@@ -232,4 +232,4 @@
* Inline Functions
****************************************************************************/
-#endif /* __ARCH_ARM_IMX_DMA_H */
+#endif /* ___ARCH_ARM_SRC_IMX1_IMX_DMA_H */
diff --git a/arch/arm/src/imx1/imx_eim.h b/arch/arm/src/imx1/imx_eim.h
index a209206..57b4956 100644
--- a/arch/arm/src/imx1/imx_eim.h
+++ b/arch/arm/src/imx1/imx_eim.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_IMX_WIEM_H
-#define __ARCH_ARM_IMX_WIEM_H
+#ifndef __ARCH_ARM_SRC_IMX1_IMX_IEM_H
+#define __ARCH_ARM_SRC_IMX1_IMX_IEM_H
/****************************************************************************
* Included Files
@@ -67,4 +67,4 @@
* Inline Functions
****************************************************************************/
-#endif /* __ARCH_ARM_IMX_EIM_H */
+#endif /* __ARCH_ARM_SRC_IMX1_IMX_IEM_H */
diff --git a/arch/arm/src/imx1/imx_i2c.h b/arch/arm/src/imx1/imx_i2c.h
index c42cbf6..bbf64e5 100644
--- a/arch/arm/src/imx1/imx_i2c.h
+++ b/arch/arm/src/imx1/imx_i2c.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_IMX_I2C_H
-#define __ARCH_ARM_IMX_I2C_H
+#ifndef __ARCH_ARM_SRC_IMX1_IMX_I2C_H
+#define __ARCH_ARM_SRC_IMX1_IMX_I2C_H
/****************************************************************************
* Included Files
diff --git a/arch/arm/src/imx1/imx_memorymap.h b/arch/arm/src/imx1/imx_memorymap.h
index 5e07be2..059b8eb 100644
--- a/arch/arm/src/imx1/imx_memorymap.h
+++ b/arch/arm/src/imx1/imx_memorymap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_IMX_MEMORYMAP_H
-#define __ARCH_ARM_IMX_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_IMX1_IMX_MEMORYMAP_H
+#define __ARCH_ARM_SRC_IMX1_IMX_MEMORYMAP_H
/****************************************************************************
* Included Files
@@ -250,4 +250,4 @@
* Inline Functions
****************************************************************************/
-#endif /* __ARCH_ARM_IMX_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_IMX1_IMX_MEMORYMAP_H */
diff --git a/arch/arm/src/imx1/imx_rtc.h b/arch/arm/src/imx1/imx_rtc.h
index 56f7035..df8daae 100644
--- a/arch/arm/src/imx1/imx_rtc.h
+++ b/arch/arm/src/imx1/imx_rtc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_IMX_RTC_H
-#define __ARCH_ARM_IMX_RTC_H
+#ifndef __ARCH_ARM_SRC_IMX1_IMX_RTC_H
+#define __ARCH_ARM_SRC_IMX1_IMX_RTC_H
/****************************************************************************
* Included Files
@@ -67,4 +67,4 @@
* Inline Functions
****************************************************************************/
-#endif /* __ARCH_ARM_IMX_RTC_H */
+#endif /* __ARCH_ARM_SRC_IMX1_IMX_RTC_H */
diff --git a/arch/arm/src/imx1/imx_system.h b/arch/arm/src/imx1/imx_system.h
index 4f1363b..bf3218a 100644
--- a/arch/arm/src/imx1/imx_system.h
+++ b/arch/arm/src/imx1/imx_system.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_IMX_SYSTEM_H
-#define __ARCH_ARM_IMX_SYSTEM_H
+#ifndef __ARCH_ARM_SRC_IMX1_IMX_SYSTEM_H
+#define __ARCH_ARM_SRC_IMX1_IMX_SYSTEM_H
/****************************************************************************
* Included Files
@@ -69,7 +69,7 @@
#define PLL_CSCR_MPEN (1 << 0) /* Bit 0: 1 = MCU PLL enabled */
#define PLL_CSCR_SPEN (1 << 1) /* Bit 1: System PLL Enable */
-#define PLL_CSCR_BCLKDIV_SHIFT 10 /* Bits 13�10: BClock Divider */
+#define PLL_CSCR_BCLKDIV_SHIFT 10 /* Bits 13-10: BClock Divider */
#define PLL_CSCR_BCLKDIV_MASK (15 << PLL_CSCR_BCLK_DIV_SHIFT)
#define PLL_CSCR_PRESC (1 << 15) /* Bit 15: MPU PLL clock prescaler */
#define PLL_CSCR_SYSTEM_SEL (1 << 16) /* Bit 16: System clock source select */
@@ -77,14 +77,14 @@
#define PLL_CSCR_CLK16_SEL (1 << 18) /* Bit 18: Select BT ref RFBTCLK16 */
#define PLL_CSCR_MPLLRESTART (1 << 21) /* Bit 21: MPLL Restart */
#define PLL_CSCR_SPLLRESTART (1 << 22) /* Bit 22: SPLL Restart */
-#define PLL_CSCR_SDCNT_SHIFT 24 /* Bits 25�24: Shut-Down Control */
+#define PLL_CSCR_SDCNT_SHIFT 24 /* Bits 25-24: Shut-Down Control */
#define PLL_CSCR_SDCNT_MASK (3 << PLL_CSCR_SDCNT_SHIFT)
#define CSCR_SDCNT_2ndEDGE (1 << PLL_CSCR_SDCNT_SHIFT)
#define CSCR_SDCNT_3rdEDGE (2 << PLL_CSCR_SDCNT_SHIFT)
#define CSCR_SDCNT_4thEDGE (3 << PLL_CSCR_SDCNT_SHIFT)
-#define PLL_CSCR_USBDIV_SHIFT 28 /* Bits 28�26: USB Divider */
+#define PLL_CSCR_USBDIV_SHIFT 28 /* Bits 28-26: USB Divider */
#define PLL_CSCR_USBDIV_MASK (7 << PLL_CSCR_USB_DIV_SHIFT)
-#define PLL_CSCR_CLKOSEL_SHIFT 29 /* Bits 31�29: CLKO Select */
+#define PLL_CSCR_CLKOSEL_SHIFT 29 /* Bits 31-29: CLKO Select */
#define PLL_CSCR_CLKOSEL_MASK (7 << PLL_CSCR_CLKOSEL_SHIFT)
#define CSCR_CLKOSEL_PERCLK1 (0 << PLL_CSCR_CLKOSEL_SHIFT)
#define CSCR_CLKOSEL_HCLK (1 << PLL_CSCR_CLKOSEL_SHIFT)
@@ -93,34 +93,34 @@
#define CSCR_CLKOSEL_PREMCLK (4 << PLL_CSCR_CLKOSEL_SHIFT)
#define CSCR_CLKOSEL_FCLK (5 << PLL_CSCR_CLKOSEL_SHIFT)
-#define PLL_MPCTL0_MFN_SHIFT 0 /* Bits 9�0: Multiplication Factor (Numerator) */
+#define PLL_MPCTL0_MFN_SHIFT 0 /* Bits 9-0: Multiplication Factor (Numerator) */
#define PLL_MPCTL0_MFN_MASK (0x03ff << PLL_MPCTL0_MFN_SHIFT)
-#define PLL_MPCTL0_MFI_SHIFT 10 /* Bits 13�10: Multiplication Factor (Integer) */
+#define PLL_MPCTL0_MFI_SHIFT 10 /* Bits 13-10: Multiplication Factor (Integer) */
#define PLL_MPCTL0_MFI_MASK (0x0f << PLL_MPCTL0_MFI_SHIFT)
-#define PLL_MPCTL0_MFD_SHIFT 16 /* Bits 25�16: Multiplication Factor (Denominator) */
+#define PLL_MPCTL0_MFD_SHIFT 16 /* Bits 25-16: Multiplication Factor (Denominator) */
#define PLL_MPCTL0_MFD_MASK (0x03ff << PLL_MPCTL0_MFD_SHIFT)
-#define PLL_MPCTL0_PD_SHIFT 26 /* Bits 29�26: Predivider Factor */
+#define PLL_MPCTL0_PD_SHIFT 26 /* Bits 29-26: Predivider Factor */
#define PLL_MPCTL0_PD_MASK (0x0f << PLL_MPCTL0_PD_SHIFT
#define PLL_MPCTL1_BRMO (1 << 6) /* Bit 6: Controls the BRM order */
-#define PLL_SPCTL0_MFN_SHIFT 0 /* Bits 9�0: Multiplication Factor (Numerator) */
+#define PLL_SPCTL0_MFN_SHIFT 0 /* Bits 9-0: Multiplication Factor (Numerator) */
#define PLL_SPCTL0_MFN_MASK (0x03ff << PLL_SPCTL0_MFN_SHIFT)
-#define PLL_SPCTL0_MFI_SHIFT 10 /* Bits 13�10: Multiplication Factor (Integer) */
+#define PLL_SPCTL0_MFI_SHIFT 10 /* Bits 13-10: Multiplication Factor (Integer) */
#define PLL_SPCTL0_MFI_MASK (0x0f << PLL_SPCTL0_MFI_SHIFT)
-#define PLL_SPCTL0_MFD_SHIFT 16 /* Bits 25�16: Multiplication Factor (Denominator) */
+#define PLL_SPCTL0_MFD_SHIFT 16 /* Bits 25-16: Multiplication Factor (Denominator) */
#define PLL_SPCTL0_MFD_MASK (0x03ff << PLL_SPCTL0_MFD_SHIFT)
-#define PLL_SPCTL0_PD_SHIFT 26 /* Bits 29�26: Predivider Factor */
+#define PLL_SPCTL0_PD_SHIFT 26 /* Bits 29-26: Predivider Factor */
#define PLL_SPCTL0_PD_MASK (0x0f << PLL_SPCTL0_PD_SHIFT)
#define PLL_SPCTL1_BRMO (1 << 6) /* Bit 6: Controls the BRM order */
#define PLL_SPCTL1_LF (1 << 15) /* Bit 15: Indicates if System PLL is locked */
-#define PLL_PCDR_PCLKDIV1_SHIFT 0 /* Bits 3�0: Peripheral Clock Divider 1 */
+#define PLL_PCDR_PCLKDIV1_SHIFT 0 /* Bits 3-0: Peripheral Clock Divider 1 */
#define PLL_PCDR_PCLKDIV1_MASK (0x0f << PLL_PCDR_PCLKDIV1_SHIFT)
-#define PLL_PCDR_PCLKDIV2_SHIFT 4 /* Bits 7�4: Peripheral Clock Divider 2 */
+#define PLL_PCDR_PCLKDIV2_SHIFT 4 /* Bits 7-4: Peripheral Clock Divider 2 */
#define PLL_PCDR_PCLKDIV2_MASK (0x0f << PLL_PCDR_PCLKDIV2_SHIFT)
-#define PLL_PCDR_PCLKDIV3_SHIFT 16 /* Bits 22�16: Peripheral Clock Divider 3 */
+#define PLL_PCDR_PCLKDIV3_SHIFT 16 /* Bits 22-16: Peripheral Clock Divider 3 */
#define PLL_PCDR_PCLKDIV3_MASK (0x7f << PLL_PCDR_PCLKDIV3_SHIFT)
/* PLL Helper Macros ********************************************************/
@@ -168,4 +168,4 @@
* Inline Functions
****************************************************************************/
-#endif /* __ARCH_ARM_IMX_SYSTEM_H */
+#endif /* __ARCH_ARM_SRC_IMX1_IMX_SYSTEM_H */
diff --git a/arch/arm/src/imx1/imx_timer.h b/arch/arm/src/imx1/imx_timer.h
index 1a5b0f3..abffe05 100644
--- a/arch/arm/src/imx1/imx_timer.h
+++ b/arch/arm/src/imx1/imx_timer.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_IMX_TIMER_H
-#define __ARCH_ARM_IMX_TIMER_H
+#ifndef __ARCH_ARM_SRC_IMX1_IMX_TIMER_H
+#define __ARCH_ARM_SRC_IMX1_IMX_TIMER_H
/****************************************************************************
* Included Files
@@ -86,4 +86,4 @@
* Inline Functions
****************************************************************************/
-#endif /* __ARCH_ARM_IMX_TIMER_H */
+#endif /* __ARCH_ARM_SRC_IMX1_IMX_TIMER_H */
diff --git a/arch/arm/src/imx1/imx_uart.h b/arch/arm/src/imx1/imx_uart.h
index b585114..bfcf079 100644
--- a/arch/arm/src/imx1/imx_uart.h
+++ b/arch/arm/src/imx1/imx_uart.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMX1_CHIP_IMX_UART_H
-#define __ARCH_ARM_SRC_IMX1_CHIP_IMX_UART_H
+#ifndef __ARCH_ARM_SRC_IMX1_IMX_UART_H
+#define __ARCH_ARM_SRC_IMX1_IMX_UART_H
/****************************************************************************
* Included Files
@@ -209,4 +209,4 @@
* Inline Functions
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_IMX1_CHIP_IMX_UART_H */
+#endif /* __ARCH_ARM_SRC_IMX1_IMX_UART_H */
diff --git a/arch/arm/src/imx1/imx_usbd.h b/arch/arm/src/imx1/imx_usbd.h
index 7a30dd1..e63d6e7 100644
--- a/arch/arm/src/imx1/imx_usbd.h
+++ b/arch/arm/src/imx1/imx_usbd.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_IMX_USBD_H
-#define __ARCH_ARM_IMX_USBD_H
+#ifndef __ARCH_ARM_SRC_IMX1_IMX_USBD_H
+#define __ARCH_ARM_SRC_IMX1_IMX_USBD_H
/****************************************************************************
* Included Files
@@ -302,4 +302,4 @@
* Inline Functions
****************************************************************************/
-#endif /* __ARCH_ARM_IMX_USBD_H */
+#endif /* __ARCH_ARM_SRC_IMX1_IMX_USBD_H */
diff --git a/arch/arm/src/imx1/imx_wdog.h b/arch/arm/src/imx1/imx_wdog.h
index 03c8de8..19e4089 100644
--- a/arch/arm/src/imx1/imx_wdog.h
+++ b/arch/arm/src/imx1/imx_wdog.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_IMX_WDOG_H
-#define __ARCH_ARM_IMX_WDOG_H
+#ifndef __ARCH_ARM_SRC_IMX1_IMX_WDOG_H
+#define __ARCH_ARM_SRC_IMX1_IMX_WDOG_H
/****************************************************************************
* Included Files
@@ -64,4 +64,4 @@
* Inline Functions
****************************************************************************/
-#endif /* __ARCH_ARM_IMX_WDOG_H */
+#endif /* __ARCH_ARM_SRC_IMX1_IMX_WDOG_H */
diff --git a/arch/arm/src/imx6/hardware/imx_ecspi.h b/arch/arm/src/imx6/hardware/imx_ecspi.h
index 2db5c78..c764f1d 100644
--- a/arch/arm/src/imx6/hardware/imx_ecspi.h
+++ b/arch/arm/src/imx6/hardware/imx_ecspi.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMX6_HARDWARE_ECSPI_H
-#define __ARCH_ARM_SRC_IMX6_HARDWARE_ECSPI_H
+#ifndef __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_ECSPI_H
+#define __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_ECSPI_H
/****************************************************************************
* Included Files
@@ -283,4 +283,4 @@
* Public Function Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_IMX6_HARDWARE_ECSPI_H */
+#endif /* __ARCH_ARM_SRC_IMX6_HARDWARE_IMX_ECSPI_H */
diff --git a/arch/arm/src/imx6/imx_ecspi.h b/arch/arm/src/imx6/imx_ecspi.h
index 7a3ed76..d781c31 100644
--- a/arch/arm/src/imx6/imx_ecspi.h
+++ b/arch/arm/src/imx6/imx_ecspi.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_IMX6_ECSPI_H
-#define __ARCH_ARM_IMX6_ECSPI_H
+#ifndef __ARCH_ARM_IMX6_IMX_ECSPI_H
+#define __ARCH_ARM_IMX6_IMX_ECSPI_H
/****************************************************************************
* Included Files
@@ -155,4 +155,4 @@ int imx_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
#endif /* __cplusplus */
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_IMX6_ECSPI_H */
+#endif /* __ARCH_ARM_IMX6_IMX_ECSPI_H */
diff --git a/arch/arm/src/imxrt/hardware/imxrt_enc.h b/arch/arm/src/imxrt/hardware/imxrt_enc.h
index 2c547bd..7302991 100644
--- a/arch/arm/src/imxrt/hardware/imxrt_enc.h
+++ b/arch/arm/src/imxrt/hardware/imxrt_enc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_ENC_H
-#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_ENC_H
+#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_ENC_H
+#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_ENC_H
/****************************************************************************
* Included Files
@@ -214,4 +214,4 @@
#define ENC_CTRL2_OUTCTL (1 << 9) /* Bit 9: POSMATCH Output Control */
/* Bits 10-15: Reserved */
-#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_ENC_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_ENC_H */
diff --git a/arch/arm/src/imxrt/hardware/imxrt_usbphy.h b/arch/arm/src/imxrt/hardware/imxrt_usbphy.h
index 1d4b7ff..4cd41fe 100644
--- a/arch/arm/src/imxrt/hardware/imxrt_usbphy.h
+++ b/arch/arm/src/imxrt/hardware/imxrt_usbphy.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_USB_PHY_H
-#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_USB_PHY_H
+#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_USBPHY_H
+#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_USBPHY_H
/****************************************************************************
* Included Files
@@ -67,4 +67,4 @@
#define USBPHY_CTRL_SFTRST (1 << 31) /* Bit 31: Soft-reset */
#define USBPHY_CTRL_CLKGATE (1 << 30) /* Bit 30: Gate UTMI clocks */
-#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_USB_PHY_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_USBPHY_H */
diff --git a/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_ccm.h b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_ccm.h
index 9fed4f4..a99630d 100644
--- a/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_ccm.h
+++ b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_ccm.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_CCM_H
-#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_CCM_H
+#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_RT102X_IMXRT102X_CCM_H
+#define __ARCH_ARM_SRC_IMXRT_HARDWARE_RT102X_IMXRT102X_CCM_H
/****************************************************************************
* Included Files
@@ -998,4 +998,4 @@
#define CCM_ANALOG_MISC2_VIDEO_DIV_MASK (0x3 << CCM_ANALOG_MISC2_VIDEO_DIV_SHIFT)
# define CCM_ANALOG_MISC2_VIDEO_DIV(n) ((uint32_t)(n) << CCM_ANALOG_MISC2_VIDEO_DIV_SHIFT)
-#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_CCM_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_RT102X_IMXRT102X_CCM_H */
diff --git a/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_dmamux.h b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_dmamux.h
index b2d7941..546d98c 100644
--- a/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_dmamux.h
+++ b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_dmamux.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_DMAMUX_H
-#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_DMAMUX_H
+#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_RT102X_IMXRT102X_DMAMUX_H
+#define __ARCH_ARM_SRC_IMXRT_HARDWARE_RT102X_IMXRT102X_DMAMUX_H
/****************************************************************************
* Included Files
@@ -124,4 +124,4 @@
#define IMXRT_DMA_NCHANNELS 128 /* Includes reserved channels */
-#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_DMAMUX_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_RT102X_IMXRT102X_DMAMUX_H */
diff --git a/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_gpio.h b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_gpio.h
index 7851be54..4f27652 100644
--- a/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_gpio.h
+++ b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_gpio.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_GPIO_H
-#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_GPIO_H
+#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_RT102X_IMXRT102X_GPIO_H
+#define __ARCH_ARM_SRC_IMXRT_HARDWARE_RT102X_IMXRT102X_GPIO_H
/****************************************************************************
* Included Files
@@ -96,4 +96,4 @@
#define IMXRT_GPIO5_CLEAR (IMXRT_GPIO5_BASE + IMXRT_GPIO_CLEAR_OFFSET)
#define IMXRT_GPIO5_TOGGLE (IMXRT_GPIO5_BASE + IMXRT_GPIO_TOGGLE_OFFSET)
-#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_GPIO_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_RT102X_IMXRT102X_GPIO_H */
diff --git a/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_iomuxc.h b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_iomuxc.h
index 59ad102..50d281d 100644
--- a/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_iomuxc.h
+++ b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_iomuxc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_IOMUXC_H
-#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_IOMUXC_H
+#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_RT102X_IMXRT102X_IOMUXC_H
+#define __ARCH_ARM_SRC_IMXRT_HARDWARE_RT102X_IMXRT102X_IOMUXC_H
/****************************************************************************
* Included Files
@@ -1587,4 +1587,4 @@
#define GPR_GPR25_M7_APC_AC_R3_TOP_MASK (0x1fffffff << GPR_GPR25_M7_APC_AC_R3_TOP_SHIFT)
#define GPR_GPR25_M7_APC_AC_R3_TOP(n) ((uint32_t)(n)) << GPR_GPR25_M7_APC_AC_R3_TOP_SHIFT)
-#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_IOMUXC_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_RT102X_IMXRT102X_IOMUXC_H */
diff --git a/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_memorymap.h b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_memorymap.h
index 5e086f5..70c6bbc 100644
--- a/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_memorymap.h
+++ b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_memorymap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_MEMORYMAP_H
-#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_RT102X_IMXRT102X_MEMORYMAP_H
+#define __ARCH_ARM_SRC_IMXRT_HARDWARE_RT102X_IMXRT102X_MEMORYMAP_H
/****************************************************************************
* Included Files
@@ -328,4 +328,4 @@
#define IMXRT_PROCROM_BASE 0xe00fe000 /* 4KB Processor ROM */
#define IMXRT_PPBROM_BASE 0xe00ff000 /* 4KB PPB ROM */
-#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_RT102X_IMXRT102X_MEMORYMAP_H */
diff --git a/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_pinmux.h b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_pinmux.h
index fa850e3..3a64324 100644
--- a/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_pinmux.h
+++ b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_pinmux.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_PINMUX_H
-#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_PINMUX_H
+#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_RT102X_IMXRT102X_PINMUX_H
+#define __ARCH_ARM_SRC_IMXRT_HARDWARE_RT102X_IMXRT102X_PINMUX_H
/****************************************************************************
* Included Files
@@ -855,4 +855,4 @@
#define GPIO_REF_32K_OUT_1 (GPIO_PERIPH | GPIO_ALT2 | GPIO_PADMUX(IMXRT_PADMUX_GPIO_SD_B0_06_INDEX))
#define GPIO_REF_32K_OUT_2 (GPIO_PERIPH | GPIO_ALT6 | GPIO_PADMUX(IMXRT_PADMUX_GPIO_AD_B0_06_INDEX))
-#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_PINMUX_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_RT102X_IMXRT102X_PINMUX_H */
diff --git a/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_ccm.h b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_ccm.h
index 2ee1bab..f323f20 100644
--- a/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_ccm.h
+++ b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_ccm.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_CCM_H
-#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_CCM_H
+#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_RT105X_IMXRT105X_CCM_H
+#define __ARCH_ARM_SRC_IMXRT_HARDWARE_RT105X_IMXRT105X_CCM_H
/****************************************************************************
* Included Files
@@ -1160,4 +1160,4 @@
#define CCM_ANALOG_MISC2_VIDEO_DIV_MASK (0x3 << CCM_ANALOG_MISC2_VIDEO_DIV_SHIFT)
# define CCM_ANALOG_MISC2_VIDEO_DIV(n) ((uint32_t)(n) << CCM_ANALOG_MISC2_VIDEO_DIV_SHIFT)
-#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_CCM_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_RT105X_IMXRT105X_CCM_H */
diff --git a/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_dmamux.h b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_dmamux.h
index 99fce0c..23c4e12 100644
--- a/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_dmamux.h
+++ b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_dmamux.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_DMAMUX_H
-#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_DMAMUX_H
+#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_RT105X_IMXRT105X_DMAMUX_H
+#define __ARCH_ARM_SRC_IMXRT_HARDWARE_RT105X_IMXRT105X_DMAMUX_H
/****************************************************************************
* Included Files
@@ -150,4 +150,4 @@
#define IMXRT_DMA_NCHANNLES 128 /* Includes reserved channels */
-#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_DMAMUX_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_RT105X_IMXRT105X_DMAMUX_H */
diff --git a/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_gpio.h b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_gpio.h
index 5307b2d..46a80e6 100644
--- a/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_gpio.h
+++ b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_gpio.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_GPIO_H
-#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_GPIO_H
+#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_RT105X_IMXRT105X_GPIO_H
+#define __ARCH_ARM_SRC_IMXRT_HARDWARE_RT105X_IMXRT105X_GPIO_H
/****************************************************************************
* Included Files
@@ -108,4 +108,4 @@
#define IMXRT_GPIO5_CLEAR (IMXRT_GPIO5_BASE + IMXRT_GPIO_CLEAR_OFFSET)
#define IMXRT_GPIO5_TOGGLE (IMXRT_GPIO5_BASE + IMXRT_GPIO_TOGGLE_OFFSET)
-#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_GPIO_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_RT105X_IMXRT105X_GPIO_H */
diff --git a/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_iomuxc.h b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_iomuxc.h
index e1b89a0..61e725a 100644
--- a/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_iomuxc.h
+++ b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_iomuxc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_IOMUXC_H
-#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_IOMUXC_H
+#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_RT105X_IMXRT105X_IOMUXC_H
+#define __ARCH_ARM_SRC_IMXRT_HARDWARE_RT105X_IMXRT105X_IOMUXC_H
/****************************************************************************
* Included Files
@@ -1976,4 +1976,4 @@
#define GPR_GPR25_M7_APC_AC_R3_TOP_MASK (0x1fffffff << GPR_GPR25_M7_APC_AC_R3_TOP_SHIFT)
#define GPR_GPR25_M7_APC_AC_R3_TOP(n) ((uint32_t)(n)) << GPR_GPR25_M7_APC_AC_R3_TOP_SHIFT)
-#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_IOMUXC_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_RT105X_IMXRT105X_IOMUXC_H */
diff --git a/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_memorymap.h b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_memorymap.h
index f6afcb4..ef7d832 100644
--- a/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_memorymap.h
+++ b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_memorymap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_MEMORYMAP_H
-#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_RT105X_IMXRT105X_MEMORYMAP_H
+#define __ARCH_ARM_SRC_IMXRT_HARDWARE_RT105X_IMXRT105X_MEMORYMAP_H
/****************************************************************************
* Included Files
@@ -308,4 +308,4 @@
#define IMXRT_PROCROM_BASE 0xe00fe000 /* 4KB Processor ROM */
#define IMXRT_PPBROM_BASE 0xe00ff000 /* 4KB PPB ROM */
-#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_RT105X_IMXRT105X_MEMORYMAP_H */
diff --git a/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_pinmux.h b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_pinmux.h
index 63a9428..54de9b9 100644
--- a/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_pinmux.h
+++ b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_pinmux.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_PINMUX_H
-#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_PINMUX_H
+#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_RT105X_IMXRT105X_PINMUX_H
+#define __ARCH_ARM_SRC_IMXRT_HARDWARE_RT105X_IMXRT105X_PINMUX_H
/****************************************************************************
* Included Files
@@ -1039,4 +1039,4 @@
#define GPIO_XBAR1_INOUT19_4 (GPIO_PERIPH | GPIO_ALT6 | GPIO_PADMUX(IMXRT_PADMUX_GPIO_AD_B0_07_INDEX))
#define GPIO_XBAR1_XBAR_IN02_1 (GPIO_PERIPH | GPIO_ALT3 | GPIO_PADMUX(IMXRT_PADMUX_GPIO_EMC_00_INDEX))
-#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_PINMUX_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_RT105X_IMXRT105X_PINMUX_H */
diff --git a/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_ccm.h b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_ccm.h
index 40ba0c7..707007a 100644
--- a/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_ccm.h
+++ b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_ccm.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_CCM_H
-#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_CCM_H
+#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_RT106X_IMXRT106X_CCM_H
+#define __ARCH_ARM_SRC_IMXRT_HARDWARE_RT106X_IMXRT106X_CCM_H
/****************************************************************************
* Included Files
@@ -1197,4 +1197,4 @@
#define CCM_ANALOG_MISC2_VIDEO_DIV_MASK (0x3 << CCM_ANALOG_MISC2_VIDEO_DIV_SHIFT)
# define CCM_ANALOG_MISC2_VIDEO_DIV(n) ((uint32_t)(n) << CCM_ANALOG_MISC2_VIDEO_DIV_SHIFT)
-#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_CCM_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_RT106X_IMXRT106X_CCM_H */
diff --git a/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_dmamux.h b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_dmamux.h
index 1b9703b..8f35c84 100644
--- a/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_dmamux.h
+++ b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_dmamux.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_DMAMUX_H
-#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_DMAMUX_H
+#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_RT106X_IMXRT106X_DMAMUX_H
+#define __ARCH_ARM_SRC_IMXRT_HARDWARE_RT106X_IMXRT106X_DMAMUX_H
/****************************************************************************
* Included Files
@@ -155,4 +155,4 @@
#define IMXRT_DMA_NCHANNLES 128 /* Includes reserved channels */
-#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_DMAMUX_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_RT106X_IMXRT106X_DMAMUX_H */
diff --git a/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_gpio.h b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_gpio.h
index 35cb352..f32b059 100644
--- a/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_gpio.h
+++ b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_gpio.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_GPIO_H
-#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_GPIO_H
+#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_RT106X_IMXRT106X_GPIO_H
+#define __ARCH_ARM_SRC_IMXRT_HARDWARE_RT106X_IMXRT106X_GPIO_H
/****************************************************************************
* Included Files
@@ -156,4 +156,4 @@
# define IMXRT_GPIO9_CLEAR (IMXRT_GPIO9_BASE + IMXRT_GPIO_CLEAR_OFFSET)
# define IMXRT_GPIO9_TOGGLE (IMXRT_GPIO9_BASE + IMXRT_GPIO_TOGGLE_OFFSET)
-#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_GPIO_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_RT106X_IMXRT106X_GPIO_H */
diff --git a/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_iomuxc.h b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_iomuxc.h
index f4b9ef4..431df14 100644
--- a/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_iomuxc.h
+++ b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_iomuxc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_IOMUXC_H
-#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_IOMUXC_H
+#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_RT106X_IMXRT106X_IOMUXC_H
+#define __ARCH_ARM_SRC_IMXRT_HARDWARE_RT106X_IMXRT106X_IOMUXC_H
/****************************************************************************
* Included Files
@@ -2528,4 +2528,4 @@
#define GPR_GPR34_SIP_TEST_MUX_BOOT_PIN_SEL(n) ((uint32_t)(n) << GPR_GPR34_SIP_TEST_MUX_BOOT_PIN_SEL_SHIFT)
#define GPR_GPR34_SIP_TEST_MUX_QSPI_SIP_EN (1 << 8)
-#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_IOMUXC_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_RT106X_IMXRT106X_IOMUXC_H */
diff --git a/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_memorymap.h b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_memorymap.h
index ce169e0..84540d0 100644
--- a/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_memorymap.h
+++ b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_memorymap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_MEMORYMAP_H
-#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_RT106X_IMXRT106X_MEMORYMAP_H
+#define __ARCH_ARM_SRC_IMXRT_HARDWARE_RT106X_IMXRT106X_MEMORYMAP_H
/****************************************************************************
* Included Files
@@ -408,4 +408,4 @@
#define IMXRT_PROCROM_BASE 0xe00fe000 /* 4KB Processor ROM */
#define IMXRT_PPBROM_BASE 0xe00ff000 /* 4KB PPB ROM */
-#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_RT106X_IMXRT106X_MEMORYMAP_H */
diff --git a/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_pinmux.h b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_pinmux.h
index 5e828c2..6a9820a 100644
--- a/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_pinmux.h
+++ b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_pinmux.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_PINMUX_H
-#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_PINMUX_H
+#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_RT106X_IMXRT106X_PINMUX_H
+#define __ARCH_ARM_SRC_IMXRT_HARDWARE_RT106X_IMXRT106X_PINMUX_H
/****************************************************************************
* Included Files
@@ -1100,4 +1100,4 @@
#define GPIO_ADC2_CH14 (GPIO_PERIPH | GPIO_ALT5 | GPIO_PADMUX(IMXRT_PADMUX_GPIO_AD_B1_09_INDEX))
#define GPIO_ADC2_CH15 (GPIO_PERIPH | GPIO_ALT5 | GPIO_PADMUX(IMXRT_PADMUX_GPIO_AD_B1_10_INDEX))
-#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_PINMUX_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_RT106X_IMXRT106X_PINMUX_H */
diff --git a/arch/arm/src/imxrt/imxrt_adc.h b/arch/arm/src/imxrt/imxrt_adc.h
index 5ca61c5..135c06f 100644
--- a/arch/arm/src/imxrt/imxrt_adc.h
+++ b/arch/arm/src/imxrt/imxrt_adc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_ADC_H
-#define __ARCH_ARM_SRC_IMXRT_ADC_H
+#ifndef __ARCH_ARM_SRC_IMXRT_IMXRT_ADC_H
+#define __ARCH_ARM_SRC_IMXRT_IMXRT_ADC_H
/****************************************************************************
* Included Files
@@ -77,4 +77,4 @@ FAR struct adc_dev_s *imxrt_adcinitialize(int intf,
}
#endif
-#endif /* __ARCH_ARM_SRC_IMXRT_ADC_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_IMXRT_ADC_H */
diff --git a/arch/arm/src/imxrt/imxrt_clockconfig.h b/arch/arm/src/imxrt/imxrt_clockconfig.h
index 2a78cd5..43c0754 100644
--- a/arch/arm/src/imxrt/imxrt_clockconfig.h
+++ b/arch/arm/src/imxrt/imxrt_clockconfig.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_IMX_CLOCKCONFIG_H
-#define __ARCH_ARM_SRC_IMXRT_IMX_CLOCKCONFIG_H
+#ifndef __ARCH_ARM_SRC_IMXRT_IMXRT_CLOCKCONFIG_H
+#define __ARCH_ARM_SRC_IMXRT_IMXRT_CLOCKCONFIG_H
/****************************************************************************
* Included Files
@@ -43,4 +43,4 @@
void imxrt_clockconfig(void);
-#endif /* __ARCH_ARM_SRC_IMXRT_IMX_CLOCKCONFIG_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_IMXRT_CLOCKCONFIG_H */
diff --git a/arch/arm/src/imxrt/imxrt_enc.c b/arch/arm/src/imxrt/imxrt_enc.c
index fc5b66f..201457d 100644
--- a/arch/arm/src/imxrt/imxrt_enc.c
+++ b/arch/arm/src/imxrt/imxrt_enc.c
@@ -40,6 +40,7 @@
#include "imxrt_periphclks.h"
#include "imxrt_enc.h"
+#include "hardware/imxrt_enc.h"
/* This functionality is dependent on Qencoder Sensor support */
diff --git a/arch/arm/src/imxrt/imxrt_enc.h b/arch/arm/src/imxrt/imxrt_enc.h
index a6399d7..e1cd320 100644
--- a/arch/arm/src/imxrt/imxrt_enc.h
+++ b/arch/arm/src/imxrt/imxrt_enc.h
@@ -25,10 +25,7 @@
* Included Files
****************************************************************************/
-#include <nuttx/config.h>
-
-#include "chip.h"
-#include "hardware/imxrt_enc.h"
+#include <nuttx/sensors/qencoder.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/imxrt/imxrt_iomuxc.h b/arch/arm/src/imxrt/imxrt_iomuxc.h
index be073d7..354667e 100644
--- a/arch/arm/src/imxrt/imxrt_iomuxc.h
+++ b/arch/arm/src/imxrt/imxrt_iomuxc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_IMX_IOMUXC_H
-#define __ARCH_ARM_SRC_IMXRT_IMX_IOMUXC_H
+#ifndef __ARCH_ARM_SRC_IMXRT_IMXRT_IOMUXC_H
+#define __ARCH_ARM_SRC_IMXRT_IMXRT_IOMUXC_H
/****************************************************************************
* Included Files
@@ -152,4 +152,4 @@ unsigned int imxrt_padmux_map(unsigned int padmux);
int imxrt_iomux_configure(uintptr_t padctl, iomux_pinset_t ioset);
-#endif /* __ARCH_ARM_SRC_IMXRT_IMX_IOMUXC_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_IMXRT_IOMUXC_H */
diff --git a/arch/arm/src/imxrt/imxrt_lowputc.h b/arch/arm/src/imxrt/imxrt_lowputc.h
index b6a3cf2..f69fff8 100644
--- a/arch/arm/src/imxrt/imxrt_lowputc.h
+++ b/arch/arm/src/imxrt/imxrt_lowputc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_LOWPUTC_H
-#define __ARCH_ARM_SRC_IMXRT_LOWPUTC_H
+#ifndef __ARCH_ARM_SRC_IMXRT_IMXRT_LOWPUTC_H
+#define __ARCH_ARM_SRC_IMXRT_IMXRT_LOWPUTC_H
/****************************************************************************
* Included Files
@@ -102,4 +102,4 @@ void imxrt_lowputc(int ch);
# define imxrt_lowputc(ch)
#endif
-#endif /* __ARCH_ARM_SRC_IMXRT_LOWPUTC_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_IMXRT_LOWPUTC_H */
diff --git a/arch/arm/src/imxrt/imxrt_lpi2c.h b/arch/arm/src/imxrt/imxrt_lpi2c.h
index ae5191f..c12f985 100644
--- a/arch/arm/src/imxrt/imxrt_lpi2c.h
+++ b/arch/arm/src/imxrt/imxrt_lpi2c.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_IMX_LPI2C_H
-#define __ARCH_ARM_SRC_IMXRT_IMX_LPI2C_H
+#ifndef __ARCH_ARM_SRC_IMXRT_IMXRT_LPI2C_H
+#define __ARCH_ARM_SRC_IMXRT_IMXRT_LPI2C_H
/****************************************************************************
* Included Files
@@ -71,4 +71,4 @@ FAR struct i2c_master_s *imxrt_i2cbus_initialize(int port);
int imxrt_i2cbus_uninitialize(FAR struct i2c_master_s *dev);
-#endif /* __ARCH_ARM_SRC_IMXRT_IMX_LPI2C_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_IMXRT_LPI2C_H */
diff --git a/arch/arm/src/imxrt/imxrt_usdhc.h b/arch/arm/src/imxrt/imxrt_usdhc.h
index 024de3e..7f0bb87 100644
--- a/arch/arm/src/imxrt/imxrt_usdhc.h
+++ b/arch/arm/src/imxrt/imxrt_usdhc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_IMXRT_IMX_USDHC_H
-#define __ARCH_ARM_SRC_IMXRT_IMX_USDHC_H
+#ifndef __ARCH_ARM_SRC_IMXRT_IMXRT_USDHC_H
+#define __ARCH_ARM_SRC_IMXRT_IMXRT_USDHC_H
/****************************************************************************
* Included Files
@@ -72,4 +72,4 @@ void imxrt_usdhc_set_sdio_card_isr(FAR struct sdio_dev_s *dev,
FAR struct sdio_dev_s *imxrt_usdhc_initialize(int slotno);
-#endif /* __ARCH_ARM_SRC_IMXRT_IMX_USDHC_H */
+#endif /* __ARCH_ARM_SRC_IMXRT_IMXRT_USDHC_H */
diff --git a/arch/arm/src/kinetis/hardware/kinetis_i2c.h b/arch/arm/src/kinetis/hardware/kinetis_i2c.h
index 6757727..b2006cf 100644
--- a/arch/arm/src/kinetis/hardware/kinetis_i2c.h
+++ b/arch/arm/src/kinetis/hardware/kinetis_i2c.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_I2CE_H
-#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_I2CE_H
+#ifndef __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_I2C_H
+#define __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_I2C_H
/****************************************************************************
* Included Files
@@ -283,4 +283,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_I2CE_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_I2C_H */
diff --git a/arch/arm/src/kinetis/kinetis_alarm.h b/arch/arm/src/kinetis/kinetis_alarm.h
index a08e50c..323740c 100644
--- a/arch/arm/src/kinetis/kinetis_alarm.h
+++ b/arch/arm/src/kinetis/kinetis_alarm.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_KINETIS_ALARM_H
-#define __ARCH_ARM_SRC_KINETIS_ALARM_H
+#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_ALARM_H
+#define __ARCH_ARM_SRC_KINETIS_KINETIS_ALARM_H
/****************************************************************************
* Included Files
@@ -162,4 +162,4 @@ FAR struct rtc_lowerhalf_s *kinetis_rtc_lowerhalf(void);
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_RTC_ALARM */
-#endif /* __ARCH_ARM_SRC_KINETIS_ALARM_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_ALARM_H */
diff --git a/arch/arm/src/kinetis/kinetis_uid.h b/arch/arm/src/kinetis/kinetis_uid.h
index 627ffd8..0b90f1a 100644
--- a/arch/arm/src/kinetis/kinetis_uid.h
+++ b/arch/arm/src/kinetis/kinetis_uid.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_KINETIS_UID_H
-#define __ARCH_ARM_SRC_KINETIS_UID_H
+#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_UID_H
+#define __ARCH_ARM_SRC_KINETIS_KINETIS_UID_H
/****************************************************************************
* Included Files
@@ -39,4 +39,4 @@
void kinetis_get_uniqueid(uint8_t *uniqueid);
-#endif /* __ARCH_ARM_SRC_KINETIS_UID_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_UID_H */
diff --git a/arch/arm/src/kl/hardware/k25z128_pinmux.h b/arch/arm/src/kl/hardware/k25z128_pinmux.h
index bd7ce68..43b968e 100644
--- a/arch/arm/src/kl/hardware/k25z128_pinmux.h
+++ b/arch/arm/src/kl/hardware/k25z128_pinmux.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_KL25PINMUX_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_KL25PINMUX_H
+#ifndef __ARCH_ARM_SRC_KL_HARDWARE_K25Z128_PINMUX_H
+#define __ARCH_ARM_SRC_KL_HARDWARE_K25Z128_PINMUX_H
/****************************************************************************
* Included Files
@@ -324,4 +324,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_KL_HARDWARE_K25PINMUX_H */
+#endif /* __ARCH_ARM_SRC_KL_HARDWARE_K25Z128_PINMUX_H */
diff --git a/arch/arm/src/kl/kl_config.h b/arch/arm/src/kl/kl_config.h
index 64af212..65999f3 100644
--- a/arch/arm/src/kl/kl_config.h
+++ b/arch/arm/src/kl/kl_config.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_KINETISXX_KL_CONFIG_H
-#define __ARCH_ARM_SRC_KINETISXX_KL_CONFIG_H
+#ifndef __ARCH_ARM_SRC_KL_KL_CONFIG_H
+#define __ARCH_ARM_SRC_KL_KL_CONFIG_H
/****************************************************************************
* Included Files
@@ -98,4 +98,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_KINETISXX_KL_CONFIG_H */
+#endif /* __ARCH_ARM_SRC_KL_KL_CONFIG_H */
diff --git a/arch/arm/src/kl/kl_gpio.h b/arch/arm/src/kl/kl_gpio.h
index f2945c5..253c72d 100644
--- a/arch/arm/src/kl/kl_gpio.h
+++ b/arch/arm/src/kl/kl_gpio.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_KL_KINETIS_GPIO_H
-#define __ARCH_ARM_SRC_KL_KINETIS_GPIO_H
+#ifndef __ARCH_ARM_SRC_KL_KL_GPIO_H
+#define __ARCH_ARM_SRC_KL_KL_GPIO_H
/****************************************************************************
* Included Files
@@ -402,4 +402,4 @@ void kl_gpioirqdisable(uint32_t pinset);
}
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_KL_KINETIS_GPIO_H */
+#endif /* __ARCH_ARM_SRC_KL_KL_GPIO_H */
diff --git a/arch/arm/src/kl/kl_irq.h b/arch/arm/src/kl/kl_irq.h
index afb467e..ee6a15b 100644
--- a/arch/arm/src/kl/kl_irq.h
+++ b/arch/arm/src/kl/kl_irq.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_KL_KINETIS_IRQ_H
-#define __ARCH_ARM_SRC_KL_KINETIS_IRQ_H
+#ifndef __ARCH_ARM_SRC_KL_KL_IRQ_H
+#define __ARCH_ARM_SRC_KL_KL_IRQ_H
/****************************************************************************
* Included Files
@@ -64,4 +64,4 @@ extern "C"
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_KL_KINETIS_IRQ_H */
+#endif /* __ARCH_ARM_SRC_KL_KL_IRQ_H */
diff --git a/arch/arm/src/kl/kl_lowputc.h b/arch/arm/src/kl/kl_lowputc.h
index c079c7a..cea76f9 100644
--- a/arch/arm/src/kl/kl_lowputc.h
+++ b/arch/arm/src/kl/kl_lowputc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_KL_KINETIS_LOWPUTC_H
-#define __ARCH_ARM_SRC_KL_KINETIS_LOWPUTC_H
+#ifndef __ARCH_ARM_SRC_KL_KL_LOWPUTC_H
+#define __ARCH_ARM_SRC_KL_KL_LOWPUTC_H
/****************************************************************************
* Included Files
@@ -110,4 +110,4 @@ void kl_uartconfigure(uintptr_t uart_base, uint32_t baud, uint32_t clock,
}
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_KL_KINETIS_LOWPUTC_H */
+#endif /* __ARCH_ARM_SRC_KL_KL_LOWPUTC_H */
diff --git a/arch/arm/src/kl/kl_pwm.h b/arch/arm/src/kl/kl_pwm.h
index 913817f..9d902fb 100644
--- a/arch/arm/src/kl/kl_pwm.h
+++ b/arch/arm/src/kl/kl_pwm.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_KL_KINETIS_PWM_H
-#define __ARCH_ARM_SRC_KL_KINETIS_PWM_H
+#ifndef __ARCH_ARM_SRC_KL_KL_PWM_H
+#define __ARCH_ARM_SRC_KL_KL_PWM_H
/****************************************************************************
* Included Files
@@ -182,4 +182,4 @@ FAR struct pwm_lowerhalf_s *kl_pwminitialize(int timer);
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_KL_TPMx_PWM */
-#endif /* __ARCH_ARM_SRC_KL_KINETIS_PWM_H */
+#endif /* __ARCH_ARM_SRC_KL_KL_PWM_H */
diff --git a/arch/arm/src/kl/kl_userspace.h b/arch/arm/src/kl/kl_userspace.h
index 35002d5..eb101e2 100644
--- a/arch/arm/src/kl/kl_userspace.h
+++ b/arch/arm/src/kl/kl_userspace.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_KL_KINETIS_USERSPACE_H
-#define __ARCH_ARM_SRC_KL_KINETIS_USERSPACE_H
+#ifndef __ARCH_ARM_SRC_KL_KL_USERSPACE_H
+#define __ARCH_ARM_SRC_KL_KL_USERSPACE_H
/****************************************************************************
* Included Files
@@ -58,4 +58,4 @@
void kl_userspace(void);
#endif
-#endif /* __ARCH_ARM_SRC_KL_KINETIS_USERSPACE_H */
+#endif /* __ARCH_ARM_SRC_KL_KL_USERSPACE_H */
diff --git a/arch/arm/src/lc823450/chip.h b/arch/arm/src/lc823450/chip.h
index 61a8ddc..b840c8f 100644
--- a/arch/arm/src/lc823450/chip.h
+++ b/arch/arm/src/lc823450/chip.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef _ARCH_ARM_SRC_LC823450_CHIP_H
-#define _ARCH_ARM_SRC_LC823450_CHIP_H
+#ifndef __ARCH_ARM_SRC_LC823450_CHIP_H
+#define __ARCH_ARM_SRC_LC823450_CHIP_H
/****************************************************************************
* Included Files
@@ -80,4 +80,4 @@
#endif /* CONFIG_SMP && CONFIG_ARCH_INTERRUPTSTACK > 7 */
#endif /* __ASSEMBLY__ */
-#endif /* _ARCH_ARM_SRC_LC823450_CHIP_H */
+#endif /* __ARCH_ARM_SRC_LC823450_CHIP_H */
diff --git a/arch/arm/src/lc823450/lc823450_start.h b/arch/arm/src/lc823450/lc823450_start.h
index b9dbef7..6d6fe69 100644
--- a/arch/arm/src/lc823450/lc823450_start.h
+++ b/arch/arm/src/lc823450/lc823450_start.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LC823450_LC823450_H
-#define __ARCH_ARM_SRC_LC823450_LC823450_H
+#ifndef __ARCH_ARM_SRC_LC823450_LC823450_START_H
+#define __ARCH_ARM_SRC_LC823450_LC823450_START_H
/****************************************************************************
* Included Files
@@ -31,4 +31,4 @@
* Public Function Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_LC823450_LC823450_H */
+#endif /* __ARCH_ARM_SRC_LC823450_LC823450_START_H */
diff --git a/arch/arm/src/lc823450/lc823450_usbdev.h b/arch/arm/src/lc823450/lc823450_usbdev.h
index 1870c86..2b32e80 100644
--- a/arch/arm/src/lc823450/lc823450_usbdev.h
+++ b/arch/arm/src/lc823450/lc823450_usbdev.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LC823450_USBDEV_H
-#define __ARCH_ARM_SRC_LC823450_USBDEV_H
+#ifndef __ARCH_ARM_SRC_LC823450_LC823450_USBDEV_H
+#define __ARCH_ARM_SRC_LC823450_LC823450_USBDEV_H
/****************************************************************************
* Pre-processor Definitions
@@ -175,4 +175,4 @@
#define USB_EPCOUNT_APPCNT_SHIFT 0
#define USB_EPCOUNT_APPCNT_MASK 0x000007ff
-#endif /* __ARCH_ARM_SRC_LC823450_USBDEV_H */
+#endif /* __ARCH_ARM_SRC_LC823450_LC823450_USBDEV_H */
diff --git a/arch/arm/src/lpc17xx_40xx/hardware/lpc178x_40xx_iocon.h b/arch/arm/src/lpc17xx_40xx/hardware/lpc178x_40xx_iocon.h
index 726153b..47e698a 100644
--- a/arch/arm/src/lpc17xx_40xx/hardware/lpc178x_40xx_iocon.h
+++ b/arch/arm/src/lpc17xx_40xx/hardware/lpc178x_40xx_iocon.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_IOCON_H
-#define __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_IOCON_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_40XX_IOCON_H
+#define __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_40XX_IOCON_H
/****************************************************************************
* Included Files
@@ -357,4 +357,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_IOCON_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_40XX_IOCON_H */
diff --git a/arch/arm/src/lpc17xx_40xx/hardware/lpc178x_40xx_memorymap.h b/arch/arm/src/lpc17xx_40xx/hardware/lpc178x_40xx_memorymap.h
index 384f6a9..d71cd46 100644
--- a/arch/arm/src/lpc17xx_40xx/hardware/lpc178x_40xx_memorymap.h
+++ b/arch/arm/src/lpc17xx_40xx/hardware/lpc178x_40xx_memorymap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_MEMORYMAP_H
-#define __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_40XX_MEMORYMAP_H
+#define __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_40XX_MEMORYMAP_H
/****************************************************************************
* Included Files
@@ -141,4 +141,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_40XX_MEMORYMAP_H */
diff --git a/arch/arm/src/lpc17xx_40xx/hardware/lpc178x_40xx_pinconfig.h b/arch/arm/src/lpc17xx_40xx/hardware/lpc178x_40xx_pinconfig.h
index 20ed62d..aac62f9 100644
--- a/arch/arm/src/lpc17xx_40xx/hardware/lpc178x_40xx_pinconfig.h
+++ b/arch/arm/src/lpc17xx_40xx/hardware/lpc178x_40xx_pinconfig.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_PINCONFIG_H
-#define __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_PINCONFIG_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_40XX_PINCONFIG_H
+#define __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_40XX_PINCONFIG_H
/****************************************************************************
* Included Files
@@ -667,4 +667,4 @@
* Public Function Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_PINCONFIG_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_40XX_PINCONFIG_H */
diff --git a/arch/arm/src/lpc17xx_40xx/hardware/lpc178x_40xx_syscon.h b/arch/arm/src/lpc17xx_40xx/hardware/lpc178x_40xx_syscon.h
index 0eee332..d474976 100644
--- a/arch/arm/src/lpc17xx_40xx/hardware/lpc178x_40xx_syscon.h
+++ b/arch/arm/src/lpc17xx_40xx/hardware/lpc178x_40xx_syscon.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_SYSCON_H
-#define __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_SYSCON_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_40XX_SYSCON_H
+#define __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_40XX_SYSCON_H
/****************************************************************************
* Included Files
@@ -700,4 +700,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_SYSCON_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC178X_40XX_SYSCON_H */
diff --git a/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_adc.h b/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_adc.h
index 9bbad95..32ae1a2 100644
--- a/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_adc.h
+++ b/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_adc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_CHIP_ADC_H
-#define __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_CHIP_ADC_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_ADC_H
+#define __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_ADC_H
/****************************************************************************
* Included Files
@@ -168,4 +168,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_CHIP_ADC_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_ADC_H */
diff --git a/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_can.h b/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_can.h
index 4ea34bf..2971bb2 100644
--- a/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_can.h
+++ b/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_can.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_CHIP_CAN_H
-#define __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_CHIP_CAN_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_CAN_H
+#define __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_CAN_H
/****************************************************************************
* Included Files
@@ -528,4 +528,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_CHIP_CAN_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_CAN_H */
diff --git a/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_dac.h b/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_dac.h
index a69ab21..6a59d59 100644
--- a/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_dac.h
+++ b/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_dac.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_CHIP_DAC_H
-#define __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_CHIP_DAC_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_DAC_H
+#define __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_DAC_H
/****************************************************************************
* Included Files
@@ -82,4 +82,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_CHIP_DAC_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_DAC_H */
diff --git a/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_gpio.h b/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_gpio.h
index 13849b3..fd4fbfc 100644
--- a/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_gpio.h
+++ b/arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_gpio.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_CHIP_GPIO_H
-#define __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_CHIP_GPIO_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_GPIO_H
+#define __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_GPIO_H
/****************************************************************************
* Included Files
@@ -199,4 +199,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_CHIP_GPIO_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_40XX_HARDWARE_LPC17_40_GPIO_H */
diff --git a/arch/arm/src/lpc17xx_40xx/lpc178x_40xx_gpio.h b/arch/arm/src/lpc17xx_40xx/lpc178x_40xx_gpio.h
index 7a88273..17d58a0 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc178x_40xx_gpio.h
+++ b/arch/arm/src/lpc17xx_40xx/lpc178x_40xx_gpio.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC17XX_40XX_LPC178X_GPIO_H
-#define __ARCH_ARM_SRC_LPC17XX_40XX_LPC178X_GPIO_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_40XX_LPC178X_40XX_GPIO_H
+#define __ARCH_ARM_SRC_LPC17XX_40XX_LPC178X_40XX_GPIO_H
/****************************************************************************
* Included Files
@@ -208,4 +208,4 @@ extern "C"
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_LPC17XX_40XX_LPC178X_GPIO_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_40XX_LPC178X_40XX_GPIO_H */
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_i2s.h b/arch/arm/src/lpc17xx_40xx/lpc17_40_i2s.h
index 58e954b..21006f3 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_i2s.h
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_i2s.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC17XX_40XX_CHIP_LPC17_40_I2S_H
-#define __ARCH_ARM_SRC_LPC17XX_40XX_CHIP_LPC17_40_I2S_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_40XX_LPC17_40_I2S_H
+#define __ARCH_ARM_SRC_LPC17XX_40XX_LPC17_40_I2S_H
/****************************************************************************
* Included Files
@@ -44,4 +44,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_LPC17XX_40XX_CHIP_LPC17_40_I2S_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_40XX_LPC17_40_I2S_H */
diff --git a/arch/arm/src/lpc2378/lpc2378.h b/arch/arm/src/lpc2378/lpc2378.h
index 3333dc1..e156ec8 100644
--- a/arch/arm/src/lpc2378/lpc2378.h
+++ b/arch/arm/src/lpc2378/lpc2378.h
@@ -38,8 +38,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC2378_LPC23XX_H
-#define __ARCH_ARM_SRC_LPC2378_LPC23XX_H
+#ifndef __ARCH_ARM_SRC_LPC2378_LPC2378_H
+#define __ARCH_ARM_SRC_LPC2378_LPC2378_H
/****************************************************************************
* Included Files
@@ -67,4 +67,4 @@ void lpc2378_statledon(void);
#endif
-#endif /* __ARCH_ARM_SRC_LPC2378_LPC23XX_H */
+#endif /* __ARCH_ARM_SRC_LPC2378_LPC2378_H */
diff --git a/arch/arm/src/lpc43xx/hardware/lpc4310203050_pinconfig.h b/arch/arm/src/lpc43xx/hardware/lpc4310203050_pinconfig.h
index 94137a7..efb1e1c 100644
--- a/arch/arm/src/lpc43xx/hardware/lpc4310203050_pinconfig.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc4310203050_pinconfig.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4310203050_PINCONF_H
-#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4310203050_PINCONF_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4310203050_PINCONFIG_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4310203050_PINCONFIG_H
/****************************************************************************
* Included Files
@@ -976,4 +976,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4310203050_PINCONF_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4310203050_PINCONFIG_H */
diff --git a/arch/arm/src/lpc43xx/hardware/lpc4337jet100_pinconfig.h b/arch/arm/src/lpc43xx/hardware/lpc4337jet100_pinconfig.h
index e8f87ba..27ce4a6 100644
--- a/arch/arm/src/lpc43xx/hardware/lpc4337jet100_pinconfig.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc4337jet100_pinconfig.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4337JET100_PINCONF_H
-#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4337JET100_PINCONF_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4337JET100_PINCONFIG_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4337JET100_PINCONFIG_H
/****************************************************************************
* Included Files
@@ -975,4 +975,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4337JET100_PINCONF_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4337JET100_PINCONFIG_H */
diff --git a/arch/arm/src/lpc43xx/hardware/lpc4357fet256_pinconfig.h b/arch/arm/src/lpc43xx/hardware/lpc4357fet256_pinconfig.h
index f5a1ffe..78b11a2 100644
--- a/arch/arm/src/lpc43xx/hardware/lpc4357fet256_pinconfig.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc4357fet256_pinconfig.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4357FET256_PINCONF_H
-#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4357FET256_PINCONF_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4357FET256_PINCONFIG_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4357FET256_PINCONFIG_H
/****************************************************************************
* Included Files
@@ -974,4 +974,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4357FET256_PINCONF_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4357FET256_PINCONFIG_H */
diff --git a/arch/arm/src/lpc43xx/hardware/lpc43_qei.h b/arch/arm/src/lpc43xx/hardware/lpc43_qei.h
index 50f3c0e..5ed5951 100644
--- a/arch/arm/src/lpc43xx/hardware/lpc43_qei.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_qei.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43QEI_H
-#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43QEI_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_QEI_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_QEI_H
/****************************************************************************
* Included Files
@@ -204,4 +204,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43QEI_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_QEI_H */
diff --git a/arch/arm/src/lpc43xx/hardware/lpc43_rtc.h b/arch/arm/src/lpc43xx/hardware/lpc43_rtc.h
index 663c86e..0d44a87 100644
--- a/arch/arm/src/lpc43xx/hardware/lpc43_rtc.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_rtc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43RTC_H
-#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43RTC_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_RTC_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_RTC_H
/****************************************************************************
* Included Files
@@ -367,4 +367,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43RTC_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_RTC_H */
diff --git a/arch/arm/src/lpc43xx/hardware/lpc43_scu.h b/arch/arm/src/lpc43xx/hardware/lpc43_scu.h
index d490f77..7ed7e11 100644
--- a/arch/arm/src/lpc43xx/hardware/lpc43_scu.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_scu.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SCU_SCU_H
-#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SCU_SCU_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SCU_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SCU_H
/****************************************************************************
* Included Files
@@ -458,4 +458,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SCU_SCU_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SCU_H */
diff --git a/arch/arm/src/lpc43xx/lpc43_can.h b/arch/arm/src/lpc43xx/lpc43_can.h
index 30c9dd3..c2c29c2 100644
--- a/arch/arm/src/lpc43xx/lpc43_can.h
+++ b/arch/arm/src/lpc43xx/lpc43_can.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC43XX_LPC43_CAN_H_
-#define __ARCH_ARM_SRC_LPC43XX_LPC43_CAN_H_
+#ifndef __ARCH_ARM_SRC_LPC43XX_LPC43_CAN_H
+#define __ARCH_ARM_SRC_LPC43XX_LPC43_CAN_H
/****************************************************************************
* Included Files
@@ -65,4 +65,4 @@ FAR struct can_dev_s *lpc43_caninitialize(int port);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_LPC43XX_LPC43_CAN_H_ */
+#endif /* __ARCH_ARM_SRC_LPC43XX_LPC43_CAN_H */
diff --git a/arch/arm/src/lpc43xx/lpc43_cgu.h b/arch/arm/src/lpc43xx/lpc43_cgu.h
index db600a2..84195a5 100644
--- a/arch/arm/src/lpc43xx/lpc43_cgu.h
+++ b/arch/arm/src/lpc43xx/lpc43_cgu.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC43XX_CGU_H
-#define __ARCH_ARM_SRC_LPC43XX_CGU_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_LPC43_CGU_H
+#define __ARCH_ARM_SRC_LPC43XX_LPC43_CGU_H
/****************************************************************************
* Included Files
@@ -105,4 +105,4 @@ void lpc43_clockconfig(void);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_LPC43XX_CGU_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_LPC43_CGU_H */
diff --git a/arch/arm/src/lpc43xx/lpc43_config.h b/arch/arm/src/lpc43xx/lpc43_config.h
index d354f0b..a7fe3c2 100644
--- a/arch/arm/src/lpc43xx/lpc43_config.h
+++ b/arch/arm/src/lpc43xx/lpc43_config.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC43XX_LPC43XX_CONFIG_H
-#define __ARCH_ARM_SRC_LPC43XX_LPC43XX_CONFIG_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_LPC43_CONFIG_H
+#define __ARCH_ARM_SRC_LPC43XX_LPC43_CONFIG_H
/****************************************************************************
* Included Files
@@ -126,4 +126,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_LPC43XX_LPC43XX_CONFIG_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_LPC43_CONFIG_H */
diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.h b/arch/arm/src/lpc43xx/lpc43_ethernet.h
index c699cee..9cd5c8a 100644
--- a/arch/arm/src/lpc43xx/lpc43_ethernet.h
+++ b/arch/arm/src/lpc43xx/lpc43_ethernet.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC43XX_LPC43_ETH_H
-#define __ARCH_ARM_SRC_LPC43XX_LPC43_ETH_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_LPC43_ETHERNET_H
+#define __ARCH_ARM_SRC_LPC43XX_LPC43_ETHERNET_H
/****************************************************************************
* Included Files
@@ -77,4 +77,4 @@ int lpc43_phy_boardinitialize(int intf);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_LPC43XX_LPC43_ETH_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_LPC43_ETHERNET_H */
diff --git a/arch/arm/src/lpc43xx/lpc43_gpio.h b/arch/arm/src/lpc43xx/lpc43_gpio.h
index 052f6d2..746af14 100644
--- a/arch/arm/src/lpc43xx/lpc43_gpio.h
+++ b/arch/arm/src/lpc43xx/lpc43_gpio.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC43XX_GPIO_H
-#define __ARCH_ARM_SRC_LPC43XX_GPIO_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_LPC43_GPIO_H
+#define __ARCH_ARM_SRC_LPC43XX_LPC43_GPIO_H
/****************************************************************************
* Included Files
@@ -310,4 +310,4 @@ int lpc43_gpio_dump(uint16_t gpiocfg, const char *msg);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_LPC43XX_GPIO_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_LPC43_GPIO_H */
diff --git a/arch/arm/src/lpc43xx/lpc43_pinconfig.h b/arch/arm/src/lpc43xx/lpc43_pinconfig.h
index da0c4c1..b190854 100644
--- a/arch/arm/src/lpc43xx/lpc43_pinconfig.h
+++ b/arch/arm/src/lpc43xx/lpc43_pinconfig.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC43XX_PINCONFIG_H
-#define __ARCH_ARM_SRC_LPC43XX_PINCONFIG_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_LPC43_PINCONFIG_H
+#define __ARCH_ARM_SRC_LPC43XX_LPC43_PINCONFIG_H
/****************************************************************************
* Included Files
@@ -281,4 +281,4 @@ int lpc43_pin_dump(uint32_t pinconf, const char *msg);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_LPC43XX_PINCONFIG_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_LPC43_PINCONFIG_H */
diff --git a/arch/arm/src/lpc43xx/lpc43_spi.h b/arch/arm/src/lpc43xx/lpc43_spi.h
index 64b86e2..334eb9c 100644
--- a/arch/arm/src/lpc43xx/lpc43_spi.h
+++ b/arch/arm/src/lpc43xx/lpc43_spi.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC43XX_SPI_H
-#define __ARCH_ARM_SRC_LPC43XX_SPI_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_LPC43_SPI_H
+#define __ARCH_ARM_SRC_LPC43XX_LPC43_SPI_H
/****************************************************************************
* Included Files
@@ -171,4 +171,4 @@ int lpc43_spiregister(FAR struct spi_dev_s *dev,
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_LPC43_SPI */
-#endif /* __ARCH_ARM_SRC_LPC43XX_SPI_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_LPC43_SPI_H */
diff --git a/arch/arm/src/lpc43xx/lpc43_ssp.h b/arch/arm/src/lpc43xx/lpc43_ssp.h
index 12874cb..d6b308e 100644
--- a/arch/arm/src/lpc43xx/lpc43_ssp.h
+++ b/arch/arm/src/lpc43xx/lpc43_ssp.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC43XX_SSP_H
-#define __ARCH_ARM_SRC_LPC43XX_SSP_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_LPC43_SSP_H
+#define __ARCH_ARM_SRC_LPC43XX_LPC43_SSP_H
/****************************************************************************
* Included Files
@@ -187,4 +187,4 @@ int lpc43_ssp1register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_LPC43_SSP0/1 */
-#endif /* __ARCH_ARM_SRC_LPC43XX_SSP_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_LPC43_SSP_H */
diff --git a/arch/arm/src/lpc43xx/lpc43_timer.h b/arch/arm/src/lpc43xx/lpc43_timer.h
index 120990d..1cdd80c 100644
--- a/arch/arm/src/lpc43xx/lpc43_timer.h
+++ b/arch/arm/src/lpc43xx/lpc43_timer.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC43_TMR_H
-#define __ARCH_ARM_SRC_LPC43_TMR_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_LPC43_TIMER_H
+#define __ARCH_ARM_SRC_LPC43XX_LPC43_TIMER_H
/****************************************************************************
* Included Files
@@ -81,4 +81,4 @@ void lpc43_tmrinitialize(FAR const char *devpath, int irq);
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_TIMER */
-#endif /* __ARCH_ARM_SRC_LPC43_TMR_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_LPC43_TIMER_H */
diff --git a/arch/arm/src/lpc43xx/lpc43_uart.h b/arch/arm/src/lpc43xx/lpc43_uart.h
index 77e280e..f683536 100644
--- a/arch/arm/src/lpc43xx/lpc43_uart.h
+++ b/arch/arm/src/lpc43xx/lpc43_uart.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC43XX_LPC43_LOWSETUP_H
-#define __ARCH_ARM_SRC_LPC43XX_LPC43_LOWSETUP_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_LPC43_UART_H
+#define __ARCH_ARM_SRC_LPC43XX_LPC43_UART_H
/****************************************************************************
* Included Files
@@ -139,4 +139,4 @@ void lpc43_setbaud(uintptr_t uartbase, uint32_t basefreq, uint32_t baud);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_LPC43XX_LPC43_LOWSETUP_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_LPC43_UART_H */
diff --git a/arch/arm/src/lpc43xx/lpc43_wdt.h b/arch/arm/src/lpc43xx/lpc43_wdt.h
index 6c3e4dc..d839b51 100644
--- a/arch/arm/src/lpc43xx/lpc43_wdt.h
+++ b/arch/arm/src/lpc43xx/lpc43_wdt.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_WDT_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_WDT_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_LPC43_WDT_H
+#define __ARCH_ARM_SRC_LPC43XX_LPC43_WDT_H
/****************************************************************************
* Included Files
@@ -79,4 +79,4 @@ void lpc43_wwdtinitialize(FAR const char *devpath);
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_WATCHDOG */
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_WDT_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_LPC43_WDT_H */
diff --git a/arch/arm/src/lpc43xx/spifi/inc/private/spifilib_chiphw.h b/arch/arm/src/lpc43xx/spifi/inc/private/spifilib_chiphw.h
index 4a3a61a..45c3f78 100644
--- a/arch/arm/src/lpc43xx/spifi/inc/private/spifilib_chiphw.h
+++ b/arch/arm/src/lpc43xx/spifi/inc/private/spifilib_chiphw.h
@@ -28,8 +28,8 @@
*
****************************************************************************/
-#ifndef __SPIFILIB_CHIPHW_H_
-#define __SPIFILIB_CHIPHW_H_
+#ifndef __ARCH_ARM_SRC_LPC43XX_SPIFI_INC_PRIVATE_SPIFILIB_CHIPHW_H
+#define __ARCH_ARM_SRC_LPC43XX_SPIFI_INC_PRIVATE_SPIFILIB_CHIPHW_H
/****************************************************************************
* Included Files
@@ -343,4 +343,4 @@ static INLINE void spifi_HW_WaitRESET(LPC_SPIFI_CHIPHW_T *pSpifi)
}
#endif
-#endif /* __SPIFILIB_CHIPHW_H_ */
+#endif /* __ARCH_ARM_SRC_LPC43XX_SPIFI_INC_PRIVATE_SPIFILIB_CHIPHW_H */
diff --git a/arch/arm/src/lpc43xx/spifi/inc/spifilib_api.h b/arch/arm/src/lpc43xx/spifi/inc/spifilib_api.h
index faf3fd4..93a6125 100644
--- a/arch/arm/src/lpc43xx/spifi/inc/spifilib_api.h
+++ b/arch/arm/src/lpc43xx/spifi/inc/spifilib_api.h
@@ -28,8 +28,8 @@
*
****************************************************************************/
-#ifndef __SPIFILIB_API_H_
-#define __SPIFILIB_API_H_
+#ifndef __ARCH_ARM_SRC_LPC43XX_SPIFI_INC_SPIFILIB_API_H
+#define __ARCH_ARM_SRC_LPC43XX_SPIFI_INC_SPIFILIB_API_H
/****************************************************************************
* Included Files
@@ -64,7 +64,7 @@ uint16_t spifiGetLibVersion(void);
* spifiCtrlAddr : Base address of SPIFI controller
* reset : true to reset the SPIFI controller, or false to not reset
* return SPIFI library error code
- * NOTE This function should be called prior to any other SPIFILIB functions.
+ * NOTE This function should be called prior to any other SPIFILIB functions.
* In most cases, a reset isn't needed. Before calling this function, all
* board specific functions related to the SPIFI interface must be setup and
* the SPIFI clock must be enabled. If booting from SPIFI FLASH, this will
@@ -101,7 +101,7 @@ uint32_t spifiGetSuppFamilyCount(void);
* index : Index (0 - n) where n = number of families returned
* by spifiGetSuppFamilyCount() -1
* return a string pointer to the generic device name
- * NOTE Can be used with the spifiGetSuppFamilyCount() to get a list of
+ * NOTE Can be used with the spifiGetSuppFamilyCount() to get a list of
* device families the library is configured for.
*/
@@ -454,4 +454,4 @@ SPIFI_ERR_T spifiEraseByAddr(const SPIFI_HANDLE_T *pHandle,
}
#endif
-#endif /* __SPIFILIB_API_H_ */
+#endif /* __ARCH_ARM_SRC_LPC43XX_SPIFI_INC_SPIFILIB_API_H */
diff --git a/arch/arm/src/lpc43xx/spifi/inc/spifilib_dev.h b/arch/arm/src/lpc43xx/spifi/inc/spifilib_dev.h
index e5345b1..99dd195 100644
--- a/arch/arm/src/lpc43xx/spifi/inc/spifilib_dev.h
+++ b/arch/arm/src/lpc43xx/spifi/inc/spifilib_dev.h
@@ -30,8 +30,8 @@
* this code.
****************************************************************************/
-#ifndef __SPIFILIB_DEV_H_
-#define __SPIFILIB_DEV_H_
+#ifndef __ARCH_ARM_SRC_LPC43XX_SPIFI_INC_SPIFILIB_DEV_H
+#define __ARCH_ARM_SRC_LPC43XX_SPIFI_INC_SPIFILIB_DEV_H
/****************************************************************************
* Included Files
@@ -383,4 +383,4 @@ SPIFI_FAM_NODE_T *spifi_REG_FAMILY_CommonCommandSet(void);
}
#endif
-#endif /* __SPIFILIB_DEV_H_ */
+#endif /* __ARCH_ARM_SRC_LPC43XX_SPIFI_INC_SPIFILIB_DEV_H */
diff --git a/arch/arm/src/lpc54xx/hardware/lpc54_iocon.h b/arch/arm/src/lpc54xx/hardware/lpc54_iocon.h
index 1d3ff59..8bee173 100644
--- a/arch/arm/src/lpc54xx/hardware/lpc54_iocon.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_iocon.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC548X_IOCON_H
-#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC548X_IOCON_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_IOCON_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_IOCON_H
/****************************************************************************
* Included Files
@@ -361,4 +361,4 @@
#define IOCON_PIO4_TYPEA_MASK (0x00000000) /* None */
#define IOCON_PIO5_TYPEA_MASK (0x00000000) /* None */
-#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC548X_IOCON_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_IOCON_H */
diff --git a/arch/arm/src/lpc54xx/lpc546x_power.h b/arch/arm/src/lpc54xx/lpc546x_power.h
index 91ebef2..f646f93 100644
--- a/arch/arm/src/lpc54xx/lpc546x_power.h
+++ b/arch/arm/src/lpc54xx/lpc546x_power.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC54XX_LPC546X_PERIPHPOWER_H
-#define __ARCH_ARM_SRC_LPC54XX_LPC546X_PERIPHPOWER_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_LPC546X_POWER_H
+#define __ARCH_ARM_SRC_LPC54XX_LPC546X_POWER_H
/****************************************************************************
* Included Files
@@ -132,4 +132,4 @@
#define lpc54_eeprom_ispowered() lpc54_ispowered1(SYSCON_PDRUNCFG1_EEPROM)
#define lpc54_rng_ispowered() lpc54_ispowered1(SYSCON_PDRUNCFG1_RNG)
-#endif /* __ARCH_ARM_SRC_LPC54XX_LPC546X_PERIPHPOWER_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_LPC546X_POWER_H */
diff --git a/arch/arm/src/lpc54xx/lpc54_clockconfig.h b/arch/arm/src/lpc54xx/lpc54_clockconfig.h
index 5490b01..01ce1af 100644
--- a/arch/arm/src/lpc54xx/lpc54_clockconfig.h
+++ b/arch/arm/src/lpc54xx/lpc54_clockconfig.h
@@ -40,8 +40,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC54_LPC54_CLOCKCONFIG_H
-#define __ARCH_ARM_SRC_LPC54_LPC54_CLOCKCONFIG_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_LPC54_CLOCKCONFIG_H
+#define __ARCH_ARM_SRC_LPC54XX_LPC54_CLOCKCONFIG_H
/****************************************************************************
* Included Files
@@ -136,4 +136,4 @@ void lpc54_clockconfig(FAR const struct pll_setup_s *pllsetup);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_LPC54_LPC54_CLOCKCONFIG_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_LPC54_CLOCKCONFIG_H */
diff --git a/arch/arm/src/lpc54xx/lpc54_power.h b/arch/arm/src/lpc54xx/lpc54_power.h
index e12a29a..cfe5bc0 100644
--- a/arch/arm/src/lpc54xx/lpc54_power.h
+++ b/arch/arm/src/lpc54xx/lpc54_power.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC54XX_LPC54_PERIPHPOWER_H
-#define __ARCH_ARM_SRC_LPC54XX_LPC54_PERIPHPOWER_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_LPC54_POWER_H
+#define __ARCH_ARM_SRC_LPC54XX_LPC54_POWER_H
/****************************************************************************
* Included Files
@@ -35,4 +35,4 @@
# error "Unsupported LPC54 architecture"
#endif
-#endif /* __ARCH_ARM_SRC_LPC54XX_LPC54_PERIPHPOWER_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_LPC54_POWER_H */
diff --git a/arch/arm/src/lpc54xx/lpc54_spi_master.h b/arch/arm/src/lpc54xx/lpc54_spi_master.h
index 8dde921..cf70aef 100644
--- a/arch/arm/src/lpc54xx/lpc54_spi_master.h
+++ b/arch/arm/src/lpc54xx/lpc54_spi_master.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC54XX_SPI_MASTER_H
-#define __ARCH_ARM_SRC_LPC54XX_SPI_MASTER_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_LPC54_SPI_MASTER_H
+#define __ARCH_ARM_SRC_LPC54XX_LPC54_SPI_MASTER_H
/****************************************************************************
* Included Files
@@ -284,4 +284,4 @@ int lpc54_spi9_register(FAR struct spi_dev_s *dev,
#endif /* __ASSEMBLY__ */
#endif /* HAVE_SPI_MASTER_DEVICE */
-#endif /* __ARCH_ARM_SRC_LPC54XX_SPI_MASTER_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_LPC54_SPI_MASTER_H */
diff --git a/arch/arm/src/lpc54xx/lpc54_usb0_ohci.h b/arch/arm/src/lpc54xx/lpc54_usb0_ohci.h
index d88cb7e..bb88ba9 100644
--- a/arch/arm/src/lpc54xx/lpc54_usb0_ohci.h
+++ b/arch/arm/src/lpc54xx/lpc54_usb0_ohci.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_LPC54XX_LPC54_OHCI_H
-#define __ARCH_ARM_SRC_LPC54XX_LPC54_OHCI_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_LPC54_USB0_OHCI_H
+#define __ARCH_ARM_SRC_LPC54XX_LPC54_USB0_OHCI_H
/****************************************************************************
* Included Files
@@ -78,4 +78,4 @@ FAR struct usbhost_connection_s *lpc54_usbhost_initialize(int controller);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_LPC54XX_LPC54_OHCI_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_LPC54_USB0_OHCI_H */
diff --git a/arch/arm/src/max326xx/max32660/max32660_clockconfig.h b/arch/arm/src/max326xx/max32660/max32660_clockconfig.h
index fc6d3a5..be9a734 100644
--- a/arch/arm/src/max326xx/max32660/max32660_clockconfig.h
+++ b/arch/arm/src/max326xx/max32660/max32660_clockconfig.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_MAX326XX_MAX_32660_MAX32660_CLOCKCONFIG_H
-#define __ARCH_ARM_SRC_MAX326XX_MAX_32660_MAX32660_CLOCKCONFIG_H
+#ifndef __ARCH_ARM_SRC_MAX326XX_MAX32660_MAX32660_CLOCKCONFIG_H
+#define __ARCH_ARM_SRC_MAX326XX_MAX32660_MAX32660_CLOCKCONFIG_H
/****************************************************************************
* Included Files
@@ -81,4 +81,4 @@ extern "C"
}
#endif
-#endif /* __ARCH_ARM_SRC_MAX326XX_MAX_32660_MAX32660_CLOCKCONFIG_H */
+#endif /* __ARCH_ARM_SRC_MAX326XX_MAX32660_MAX32660_CLOCKCONFIG_H */
diff --git a/arch/arm/src/nrf52/nrf52_uid.h b/arch/arm/src/nrf52/nrf52_uid.h
index 94aa9c7..72dc1e3 100644
--- a/arch/arm/src/nrf52/nrf52_uid.h
+++ b/arch/arm/src/nrf52/nrf52_uid.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_NRF52_UID_H
-#define __ARCH_ARM_SRC_NRF52_UID_H
+#ifndef __ARCH_ARM_SRC_NRF52_NRF52_UID_H
+#define __ARCH_ARM_SRC_NRF52_NRF52_UID_H
/****************************************************************************
* Included Files
@@ -33,4 +33,4 @@
void nrf52_get_uniqueid(uint8_t uniqueid[]);
-#endif /* __ARCH_ARM_SRC_NRF52_UID_H */
+#endif /* __ARCH_ARM_SRC_NRF52_NRF52_UID_H */
diff --git a/arch/arm/src/nrf52/nrf52_wdt_lowerhalf.h b/arch/arm/src/nrf52/nrf52_wdt_lowerhalf.h
index c9c82f5..3715f88 100644
--- a/arch/arm/src/nrf52/nrf52_wdt_lowerhalf.h
+++ b/arch/arm/src/nrf52/nrf52_wdt_lowerhalf.h
@@ -34,8 +34,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_NRF52_WDT_LOWERHALF_H
-#define __ARCH_ARM_NRF52_WDT_LOWERHALF_H
+#ifndef __ARCH_ARM_SRC_NRF52_NRF52_WDT_LOWERHALF_H
+#define __ARCH_ARM_SRC_NRF52_NRF52_WDT_LOWERHALF_H
/****************************************************************************
* Included Files
@@ -101,4 +101,4 @@ extern "C"
int nrf52_wdt_initialize(FAR const char *devpath, int16_t mode_sleep,
int16_t mode_halt);
-#endif /* __ARCH_ARM_NRF52_WDT_LOWERHALF_H */
+#endif /* __ARCH_ARM_SRC_NRF52_NRF52_WDT_LOWERHALF_H */
diff --git a/arch/arm/src/nrf52/sdc/core_cm4.h b/arch/arm/src/nrf52/sdc/core_cm4.h
index d79d4a9..ec453d5 100644
--- a/arch/arm/src/nrf52/sdc/core_cm4.h
+++ b/arch/arm/src/nrf52/sdc/core_cm4.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_NRF52_SDC_CORE_CM4_H__
-#define __ARCH_ARM_SRC_NRF52_SDC_CORE_CM4_H__
+#ifndef __ARCH_ARM_SRC_NRF52_SDC_CORE_CM4_H
+#define __ARCH_ARM_SRC_NRF52_SDC_CORE_CM4_H
/****************************************************************************
* Preprocessor Definitions
@@ -38,4 +38,4 @@
#define __OM volatile
#define __IOM volatile
-#endif /* __ARCH_ARM_SRC_NRF52_SDC_CORE_CM4_H__ */
+#endif /* __ARCH_ARM_SRC_NRF52_SDC_CORE_CM4_H */
diff --git a/arch/arm/src/nrf52/sdc/nrf.h b/arch/arm/src/nrf52/sdc/nrf.h
index ce6f662..b48a101 100644
--- a/arch/arm/src/nrf52/sdc/nrf.h
+++ b/arch/arm/src/nrf52/sdc/nrf.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_NRF52_SDC_NRF_H__
-#define __ARCH_ARM_SRC_NRF52_SDC_NRF_H__
+#ifndef __ARCH_ARM_SRC_NRF52_SDC_NRF_H
+#define __ARCH_ARM_SRC_NRF52_SDC_NRF_H
/****************************************************************************
* Public Types
@@ -81,4 +81,4 @@ typedef enum
FPU_IRQn = 38
} IRQn_Type;
-#endif /* __ARCH_ARM_SRC_NRF52_SDC_NRF_H__ */
+#endif /* __ARCH_ARM_SRC_NRF52_SDC_NRF_H */
diff --git a/arch/arm/src/phy62xx/bus_dev.h b/arch/arm/src/phy62xx/bus_dev.h
index 6f5a04e..99d62df 100644
--- a/arch/arm/src/phy62xx/bus_dev.h
+++ b/arch/arm/src/phy62xx/bus_dev.h
@@ -27,8 +27,8 @@
*
****************************************************************************/
-#ifndef __BUS_DEV_H__
-#define __BUS_DEV_H__
+#ifndef __ARCH_ARM_SRC_PHY62XX_BUS_DEV_H
+#define __ARCH_ARM_SRC_PHY62XX_BUS_DEV_H
#ifdef __cplusplus
extern "C"
@@ -130,4 +130,4 @@ typedef enum IRQn
#include "mcu_phy_prime.h"
#endif
-#endif
+#endif /* __ARCH_ARM_SRC_PHY62XX_BUS_DEV_H */
diff --git a/arch/arm/src/phy62xx/gpio.h b/arch/arm/src/phy62xx/gpio.h
index 55c7e43..4ae50c0 100644
--- a/arch/arm/src/phy62xx/gpio.h
+++ b/arch/arm/src/phy62xx/gpio.h
@@ -26,8 +26,8 @@
* @author qing.han
****************************************************************************/
-#ifndef __GPIO_H__
-#define __GPIO_H__
+#ifndef __ARCH_ARM_SRC_PHY62XX_GPIO_H
+#define __ARCH_ARM_SRC_PHY62XX_GPIO_H
#ifdef __cplusplus
extern "C"
@@ -206,4 +206,4 @@ extern int gpio_write(gpio_pin_e pin, uint8_t en);
}
#endif
-#endif
+#endif /* __ARCH_ARM_SRC_PHY62XX_GPIO_H */
diff --git a/arch/arm/src/phy62xx/log.h b/arch/arm/src/phy62xx/log.h
index 496d114..3f69510 100644
--- a/arch/arm/src/phy62xx/log.h
+++ b/arch/arm/src/phy62xx/log.h
@@ -27,8 +27,8 @@
****************************************************************************/
#ifndef ENABLE_LOG_ROM
-#ifndef __LOG_H__
-#define __LOG_H__
+#ifndef __ARCH_ARM_SRC_PHY62XX_LOG_H
+#define __ARCH_ARM_SRC_PHY62XX_LOG_H
#ifdef __cplusplus
extern "C"
@@ -84,12 +84,12 @@ typedef void(*std_putc)(char *data, uint16_t size);
}
#endif
-#endif //__LOG_H__
+#endif /* __ARCH_ARM_SRC_PHY62XX_LOG_H */
#else
-#ifndef __PHY_LOG_H
-#define __PHY_LOG_H
+#ifndef __ARCH_ARM_SRC_PHY62XX_LOG_H
+#define __ARCH_ARM_SRC_PHY62XX_LOG_H
#ifdef __cplusplus
extern "C"
@@ -136,6 +136,6 @@ uint32_t log_get_debug_level(void);
}
#endif
-#endif
+#endif /* __ARCH_ARM_SRC_PHY62XX_LOG_H */
#endif
diff --git a/arch/arm/src/phy62xx/mcu_phy_bumbee.h b/arch/arm/src/phy62xx/mcu_phy_bumbee.h
index 6f4b530..a951cb2 100644
--- a/arch/arm/src/phy62xx/mcu_phy_bumbee.h
+++ b/arch/arm/src/phy62xx/mcu_phy_bumbee.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __MCU_BUMBEE_M0__
-#define __MCU_BUMBEE_M0__
+#ifndef __ARCH_ARM_SRC_PHY62XX_MCU_PHY_BUMBEE_H
+#define __ARCH_ARM_SRC_PHY62XX_MCU_PHY_BUMBEE_H
#ifdef __cplusplus
extern "C"
@@ -837,4 +837,4 @@ typedef struct
#define IRQ_PRIO_THREAD 3
#define IRQ_PRIO_APP 3
-#endif
+#endif /* __ARCH_ARM_SRC_PHY62XX_MCU_PHY_BUMBEE_H */
diff --git a/arch/arm/src/phy62xx/phy6222_irq.h b/arch/arm/src/phy62xx/phy6222_irq.h
index d821a66..92d215a 100644
--- a/arch/arm/src/phy62xx/phy6222_irq.h
+++ b/arch/arm/src/phy62xx/phy6222_irq.h
@@ -22,8 +22,8 @@
* through nuttx/irq.h
*/
-#ifndef __ARCH_ARM_INCLUDE_ARMV6_M_IRQ_H
-#define __ARCH_ARM_INCLUDE_ARMV6_M_IRQ_H
+#ifndef __ARCH_ARM_SRC_PHY62XX_PHY6222_IRQ_H
+#define __ARCH_ARM_SRC_PHY62XX_PHY6222_IRQ_H
/****************************************************************************
* Included Files
@@ -368,5 +368,4 @@ extern "C"
#endif
#endif
-#endif /* __ARCH_ARM_INCLUDE_ARMV6_M_IRQ_H */
-
+#endif /* __ARCH_ARM_SRC_PHY62XX_PHY6222_IRQ_H */
diff --git a/arch/arm/src/phy62xx/phy62xx_ble.h b/arch/arm/src/phy62xx/phy62xx_ble.h
index c255bf0..71104a2 100644
--- a/arch/arm/src/phy62xx/phy62xx_ble.h
+++ b/arch/arm/src/phy62xx/phy62xx_ble.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_PHY62XX_BLE_H
-#define __ARCH_ARM_SRC_PHY62XX_BLE_H
+#ifndef __ARCH_ARM_SRC_PHY62XX_PHY62XX_BLE_H
+#define __ARCH_ARM_SRC_PHY62XX_PHY62XX_BLE_H
/****************************************************************************
* Included Files
@@ -58,4 +58,4 @@ extern llStatus_t LL_TxData(uint16 connId,
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_STM32F0L0G0_STM32_START_H */
\ No newline at end of file
+#endif /* __ARCH_ARM_SRC_PHY62XX_PHY62XX_BLE_H */
diff --git a/arch/arm/src/phy62xx/phyplus_gpio.h b/arch/arm/src/phy62xx/phyplus_gpio.h
index aa1e42d..80602ef 100644
--- a/arch/arm/src/phy62xx/phyplus_gpio.h
+++ b/arch/arm/src/phy62xx/phyplus_gpio.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_SRC_INCLUDE_PHY62XX_PHYPLUS_GPIO_H
-#define __ARCH_SRC_INCLUDE_PHY62XX_PHYPLUS_GPIO_H
+#ifndef __ARCH_ARM_SRC_PHY62XX_PHYPLUS_GPIO_H
+#define __ARCH_ARM_SRC_PHY62XX_PHYPLUS_GPIO_H
/****************************************************************************
* Included Files
@@ -58,5 +58,4 @@ int phyplus_gpio_register(FAR struct phyplus_gpio_param_s
*phyplus_gpio_param);
int phyplus_gpio_unregister(FAR struct phyplus_gpio_param_s
*phyplus_gpio_param);
-#endif
-
+#endif /* __ARCH_ARM_SRC_PHY62XX_PHYPLUS_GPIO_H */
diff --git a/arch/arm/src/phy62xx/phyplus_stub.h b/arch/arm/src/phy62xx/phyplus_stub.h
index 8024c34..fb3ffc0 100644
--- a/arch/arm/src/phy62xx/phyplus_stub.h
+++ b/arch/arm/src/phy62xx/phyplus_stub.h
@@ -22,8 +22,8 @@
* Included Files
****************************************************************************/
-#ifndef __INCLUDE_NUTTX_PHYPLUS_STUB_H
-#define __INCLUDE_NUTTX_PHYPLUS_STUB_H
+#ifndef __ARCH_ARM_SRC_PHY62XX_PHYPLUS_STUB_H
+#define __ARCH_ARM_SRC_PHY62XX_PHYPLUS_STUB_H
enum phyplus_stub_e
{
@@ -34,4 +34,4 @@ enum phyplus_stub_e
PHYPLUS_MAX
};
-#endif
+#endif /* __ARCH_ARM_SRC_PHY62XX_PHYPLUS_STUB_H */
diff --git a/arch/arm/src/phy62xx/phyplus_tim.h b/arch/arm/src/phy62xx/phyplus_tim.h
index 6e9bf16..b32d36d 100644
--- a/arch/arm/src/phy62xx/phyplus_tim.h
+++ b/arch/arm/src/phy62xx/phyplus_tim.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_PHYPLUS_TIM_H
-#define __ARCH_ARM_SRC_PHYPLUS_TIM_H
+#ifndef __ARCH_ARM_SRC_PHY62XX_PHYPLUS_TIM_H
+#define __ARCH_ARM_SRC_PHY62XX_PHYPLUS_TIM_H
/****************************************************************************
* Included Files
@@ -123,4 +123,4 @@ void phyplus_tim_deinit(FAR struct phyplus_tim_dev_s *dev);
#endif
#endif /* __ASSEMBLY__ */
-#endif
+#endif /* __ARCH_ARM_SRC_PHY62XX_PHYPLUS_TIM_H */
diff --git a/arch/arm/src/phy62xx/phyplus_timer_lowerhalf.h b/arch/arm/src/phy62xx/phyplus_timer_lowerhalf.h
index bdbc711..431c21a 100644
--- a/arch/arm/src/phy62xx/phyplus_timer_lowerhalf.h
+++ b/arch/arm/src/phy62xx/phyplus_timer_lowerhalf.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __INCLUDE_NUTTX_PHYPLUS_TIMER_H
-#define __INCLUDE_NUTTX_PHYPLUS_TIMER_H
+#ifndef __ARCH_ARM_SRC_PHY62XX_PHYPLUS_TIMER_LOWERHALF_H
+#define __ARCH_ARM_SRC_PHY62XX_PHYPLUS_TIMER_LOWERHALF_H
/****************************************************************************
* Included Files
@@ -34,4 +34,4 @@ struct phyplus_timer_param_s
uint8_t timer_idx;
};
-#endif
+#endif /* __ARCH_ARM_SRC_PHY62XX_PHYPLUS_TIMER_LOWERHALF_H */
diff --git a/arch/arm/src/phy62xx/pplus_mtd_flash.h b/arch/arm/src/phy62xx/pplus_mtd_flash.h
index bbba4c8..f8e2440 100644
--- a/arch/arm/src/phy62xx/pplus_mtd_flash.h
+++ b/arch/arm/src/phy62xx/pplus_mtd_flash.h
@@ -22,8 +22,8 @@
* Included Files
****************************************************************************/
-#ifndef __INCLUDE_PPLUS_MTD_FLASH_H
-#define __INCLUDE_PPLUS_MTD_FLASH_H
+#ifndef __ARCH_ARM_SRC_PHY62XX_PPLUS_MTD_FLASH_H
+#define __ARCH_ARM_SRC_PHY62XX_PPLUS_MTD_FLASH_H
/****************************************************************************
* Included Files
@@ -52,4 +52,4 @@ struct mtd_dev_s *pplus_fls_initialize(uint32_t offset, uint32_t size);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __INCLUDE_PPLUS_MTD_FLASH_H */
+#endif /* __ARCH_ARM_SRC_PHY62XX_PPLUS_MTD_FLASH_H */
diff --git a/arch/arm/src/phy62xx/rom_sym_def.h b/arch/arm/src/phy62xx/rom_sym_def.h
index aab5e37..4563c83 100644
--- a/arch/arm/src/phy62xx/rom_sym_def.h
+++ b/arch/arm/src/phy62xx/rom_sym_def.h
@@ -22,8 +22,9 @@
* Included Files
****************************************************************************/
-#ifndef __ROM_SYM_H__
-#define __ROM_SYM_H__
+#ifndef __ARCH_ARM_SRC_PHY62XX_ROM_SYM_DEF_H
+#define __ARCH_ARM_SRC_PHY62XX_ROM_SYM_DEF_H
+
#ifdef USE_ROMSYM_ALIAS
/* #define x _symrom_
@@ -973,6 +974,5 @@
#define zigbee_crc16_gen _symrom_zigbee_crc16_gen
#define WaitUs _symrom_WaitUs
-#endif
-#endif
-
+#endif /* USE_ROMSYM_ALIAS */
+#endif /* __ARCH_ARM_SRC_PHY62XX_ROM_SYM_DEF_H */
diff --git a/arch/arm/src/phy62xx/timer.h b/arch/arm/src/phy62xx/timer.h
index 83b2e0c..7d7725a 100644
--- a/arch/arm/src/phy62xx/timer.h
+++ b/arch/arm/src/phy62xx/timer.h
@@ -22,8 +22,8 @@
* Included Files
****************************************************************************/
-#ifndef __TIMER_H__
-#define __TIMER_H__
+#ifndef __ARCH_ARM_SRC_PHY62XX_TIMER_H
+#define __ARCH_ARM_SRC_PHY62XX_TIMER_H
#ifdef __cplusplus
extern "C"
@@ -78,4 +78,4 @@ extern uint32 read_LL_remainder_time(void);
}
#endif
-#endif
+#endif /* __ARCH_ARM_SRC_PHY62XX_TIMER_H */
diff --git a/arch/arm/src/phy62xx/uart.h b/arch/arm/src/phy62xx/uart.h
index 56eba3f..518575c 100644
--- a/arch/arm/src/phy62xx/uart.h
+++ b/arch/arm/src/phy62xx/uart.h
@@ -30,8 +30,8 @@
* @author qing.han
****************************************************************************/
-#ifndef __UART_H__
-#define __UART_H__
+#ifndef __ARCH_ARM_SRC_PHY62XX_UART_H
+#define __ARCH_ARM_SRC_PHY62XX_UART_H
#ifdef __cplusplus
extern "C"
@@ -174,4 +174,4 @@ void __attribute__((weak)) hal_UART1_IRQHandler(void);
}
#endif
-#endif
+#endif /* __ARCH_ARM_SRC_PHY62XX_UART_H */
diff --git a/arch/arm/src/phy62xx/version.h b/arch/arm/src/phy62xx/version.h
index 3f41dba..8fcab02 100644
--- a/arch/arm/src/phy62xx/version.h
+++ b/arch/arm/src/phy62xx/version.h
@@ -26,8 +26,8 @@
* Pre-processor Prototypes
****************************************************************************/
-#ifndef __SDK_VER_H__
-#define __SDK_VER_H__
+#ifndef __ARCH_ARM_SRC_PHY62XX_VERSION_H
+#define __ARCH_ARM_SRC_PHY62XX_VERSION_H
#define __DEF_CHIP_QFN32__ (0x0001)
#define __DEF_CHIP_TSOP16__ (0x0002)
@@ -37,5 +37,5 @@
#define SDK_VER_RELEASE_ID ((SDK_VER_MAJOR<<16)|(SDK_VER_MINOR<<8)|(SDK_VER_REVISION))
#define SDK_VER_CHIP __DEF_CHIP_QFN32__
/* #define SDK_VER_TEST_BUILD "" */
-#endif
+#endif /* __ARCH_ARM_SRC_PHY62XX_VERSION_H */
diff --git a/arch/arm/src/rtl8720c/ameba_efuse.h b/arch/arm/src/rtl8720c/ameba_efuse.h
index bfa4c31..21fe88f 100644
--- a/arch/arm/src/rtl8720c/ameba_efuse.h
+++ b/arch/arm/src/rtl8720c/ameba_efuse.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __INCLUDE_AMEBA_HCI_EFUSE_H
-#define __INCLUDE_AMEBA_HCI_EFUSE_H
+#ifndef __ARCH_ARM_SRC_RTL8720C_AMEBA_EFUSE_H
+#define __ARCH_ARM_SRC_RTL8720C_AMEBA_EFUSE_H
/****************************************************************************
* Included Files
@@ -45,4 +45,4 @@ int ameba_efuse_fw_verify_enable(void);
int ameba_efuse_fw_verify_check(void);
int ameba_efuse_boot_message_disable(void);
int ameba_efuse_boot_message_enable(void);
-#endif /* __INCLUDE_AMEBA_FLASH_H */
+#endif /* __ARCH_ARM_SRC_RTL8720C_AMEBA_EFUSE_H */
diff --git a/arch/arm/src/rtl8720c/ameba_flash.h b/arch/arm/src/rtl8720c/ameba_flash.h
index 2deebb7..28093fc 100644
--- a/arch/arm/src/rtl8720c/ameba_flash.h
+++ b/arch/arm/src/rtl8720c/ameba_flash.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __INCLUDE_AMEBA_FLASH_H
-#define __INCLUDE_AMEBA_FLASH_H
+#ifndef __ARCH_ARM_SRC_RTL8720C_AMEBA_FLASH_H
+#define __ARCH_ARM_SRC_RTL8720C_AMEBA_FLASH_H
/****************************************************************************
* Included Files
@@ -43,4 +43,4 @@
* Public Function Prototypes
****************************************************************************/
-#endif /* __INCLUDE_AMEBA_FLASH_H */
+#endif /* __ARCH_ARM_SRC_RTL8720C_AMEBA_FLASH_H */
diff --git a/arch/arm/src/rtl8720c/ameba_uart.h b/arch/arm/src/rtl8720c/ameba_uart.h
index 9dd0a15..770d354 100644
--- a/arch/arm/src/rtl8720c/ameba_uart.h
+++ b/arch/arm/src/rtl8720c/ameba_uart.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __INCLUDE_NUTTX_SERIAL_UART_AMEBA_H
-#define __INCLUDE_NUTTX_SERIAL_UART_AMEBA_H
+#ifndef __ARCH_ARM_SRC_RTL8720C_AMEBA_UART_H
+#define __ARCH_ARM_SRC_RTL8720C_AMEBA_UART_H
/****************************************************************************
* Included Files
@@ -175,4 +175,4 @@ typedef uint32_t uart_addrwidth_t;
struct file; /* Forward reference */
int uart_ioctl(struct file *filep, int cmd, unsigned long arg);
#endif /* CONFIG_AMEBA_UART */
-#endif /* __INCLUDE_NUTTX_SERIAL_UART_AMEBA_H */
+#endif /* __ARCH_ARM_SRC_RTL8720C_AMEBA_UART_H */
diff --git a/arch/arm/src/rtl8720c/amebaz_depend.h b/arch/arm/src/rtl8720c/amebaz_depend.h
index ca5cf15..dac328f 100644
--- a/arch/arm/src/rtl8720c/amebaz_depend.h
+++ b/arch/arm/src/rtl8720c/amebaz_depend.h
@@ -18,14 +18,13 @@
*
****************************************************************************/
-#ifndef __DRIVERS_WIRELESS_IEEE80211_AMEBAZ_AMEBAZ_DEPEND_H
+#ifndef __ARCH_ARM_SRC_RTL8720C_AMEBAZ_DEPEND_H
+#define __ARCH_ARM_SRC_RTL8720C_AMEBAZ_DEPEND_H
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
-#define __DRIVERS_WIRELESS_IEEE80211_AMEBAZ_AMEBAZ_DEPEND_H
-
/****************************************************************************
* Included Files
****************************************************************************/
@@ -178,4 +177,4 @@ struct osdep_service_ops
uint8_t (*rtw_get_scheduler_state)(void);
void (*rtw_create_secure_context)(uint32_t n);
};
-#endif
+#endif /* __ARCH_ARM_SRC_RTL8720C_AMEBAZ_DEPEND_H */
diff --git a/arch/arm/src/rtl8720c/amebaz_driver.h b/arch/arm/src/rtl8720c/amebaz_driver.h
index ed97f0b..434f2cf 100644
--- a/arch/arm/src/rtl8720c/amebaz_driver.h
+++ b/arch/arm/src/rtl8720c/amebaz_driver.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __DRIVERS_WIRELESS_IEEE80211_AMEBAZ_AMEBAZ_DRIVER_H
-#define __DRIVERS_WIRELESS_IEEE80211_AMEBAZ_AMEBAZ_DRIVER_H
+#ifndef __ARCH_ARM_SRC_RTL8720C_AMEBAZ_DRIVER_H
+#define __ARCH_ARM_SRC_RTL8720C_AMEBAZ_DRIVER_H
/****************************************************************************
* Included Files
@@ -116,4 +116,4 @@ void amebaz_wl_netif_info_handler(int index, void *dev,
unsigned char *addr);
void amebaz_wl_notify_rx_handler(int index, unsigned int len);
-#endif /* __DRIVERS_WIRELESS_IEEE80211_AMEBAZ_AMEBAZ_DRIVER_H */
+#endif /* __ARCH_ARM_SRC_RTL8720C_AMEBAZ_DRIVER_H */
diff --git a/arch/arm/src/rtl8720c/amebaz_hci_board.h b/arch/arm/src/rtl8720c/amebaz_hci_board.h
index 9613387..3861a2b 100644
--- a/arch/arm/src/rtl8720c/amebaz_hci_board.h
+++ b/arch/arm/src/rtl8720c/amebaz_hci_board.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __INCLUDE_AMEBA_HCI_BOARD_H
-#define __INCLUDE_AMEBA_HCI_BOARD_H
+#ifndef __ARCH_ARM_SRC_RTL8720C_AMEBA_HCI_BOARD_H
+#define __ARCH_ARM_SRC_RTL8720C_AMEBA_HCI_BOARD_H
/****************************************************************************
* Included Files
@@ -53,5 +53,4 @@ int hci_get_efuse_iqk_data(uint8_t *data);
int hci_board_init(void);
int hci_board_init_done(void);
-#endif /* __INCLUDE_AMEBA_FLASH_H */
-
+#endif /* __ARCH_ARM_SRC_RTL8720C_AMEBA_HCI_BOARD_H */
diff --git a/arch/arm/src/rtl8720c/amebaz_netdev.h b/arch/arm/src/rtl8720c/amebaz_netdev.h
index 7aa4570..0802a72 100644
--- a/arch/arm/src/rtl8720c/amebaz_netdev.h
+++ b/arch/arm/src/rtl8720c/amebaz_netdev.h
@@ -18,14 +18,13 @@
*
****************************************************************************/
-#ifndef __DRIVERS_WIRELESS_IEEE80211_AMEBAZ_AMEBAZ_NETDEV_H
+#ifndef __ARCH_ARM_SRC_RTL8720C_AMEBAZ_NETDEV_H
+#define __ARCH_ARM_SRC_RTL8720C_AMEBAZ_NETDEV_H
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
-#define __DRIVERS_WIRELESS_IEEE80211_AMEBAZ_AMEBAZ_NETDEV_H
-
/****************************************************************************
* Included Files
****************************************************************************/
@@ -36,4 +35,4 @@
int amebaz_netdev_register(FAR struct amebaz_dev_s *priv);
void amebaz_netdev_notify_receive(FAR struct amebaz_dev_s *priv,
int index, unsigned int len);
-#endif /* __DRIVERS_WIRELESS_IEEE80211_AMEBAZ_AMEBAZ_NETDEV_H */
+#endif /* __ARCH_ARM_SRC_RTL8720C_AMEBAZ_NETDEV_H */
diff --git a/arch/arm/src/rtl8720c/amebaz_wlan.h b/arch/arm/src/rtl8720c/amebaz_wlan.h
index 57bc670..eb814e6 100644
--- a/arch/arm/src/rtl8720c/amebaz_wlan.h
+++ b/arch/arm/src/rtl8720c/amebaz_wlan.h
@@ -18,13 +18,13 @@
*
****************************************************************************/
-#ifndef __DRIVERS_WIRELESS_IEEE80211_AMEBAZ_AMEBAZ_WLAN_H
+#ifndef __ARCH_ARM_SRC_RTL8720C_AMEBAZ_WLAN_H
+#define __ARCH_ARM_SRC_RTL8720C_AMEBAZ_WLAN_H
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
-#define __DRIVERS_WIRELESS_IEEE80211_AMEBAZ_AMEBAZ_WLAN_H
#define WEP_ENABLED 0x0001
#define TKIP_ENABLED 0x0002
#define AES_ENABLED 0x0004
@@ -412,5 +412,4 @@ void netif_rx(int index, unsigned int len);
void netif_post_sleep_processing(void);
void netif_pre_sleep_processing(void);
-#endif /* __DRIVERS_WIRELESS_IEEE80211_AMEBAZ_AMEBAZ_WLAN_H */
-
+#endif /* __ARCH_ARM_SRC_RTL8720C_AMEBAZ_WLAN_H */
diff --git a/arch/arm/src/rtl8720c/chip.h b/arch/arm/src/rtl8720c/chip.h
index 072d37d..b8032c5 100644
--- a/arch/arm/src/rtl8720c/chip.h
+++ b/arch/arm/src/rtl8720c/chip.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_AMEBA_CHIP_H
-#define __ARCH_ARM_SRC_AMEBA_CHIP_H
+#ifndef __ARCH_ARM_SRC_RTL8720C_CHIP_H
+#define __ARCH_ARM_SRC_RTL8720C_CHIP_H
/****************************************************************************
* Included Files
@@ -45,4 +45,4 @@
*/
#define ARMV8M_PERIPHERAL_INTERRUPTS (CONFIG_AMEBA_NR_IRQS - 16)
-#endif /* __ARCH_ARM_SRC_AMEBA_CHIP_H */
+#endif /* __ARCH_ARM_SRC_RTL8720C_CHIP_H */
diff --git a/arch/arm/src/rtl8720c/include/irq.h b/arch/arm/src/rtl8720c/include/irq.h
index cd09924..5f6f1aa 100644
--- a/arch/arm/src/rtl8720c/include/irq.h
+++ b/arch/arm/src/rtl8720c/include/irq.h
@@ -22,8 +22,8 @@
* only indirectly through nuttx/irq.h
*/
-#ifndef __ARCH_ARM_INCLUDE_SONG_IRQ_H
-#define __ARCH_ARM_INCLUDE_SONG_IRQ_H
+#ifndef __ARCH_ARM_SRC_RTL8720C_INCLUDE_IRQ_H
+#define __ARCH_ARM_SRC_RTL8720C_INCLUDE_IRQ_H
/****************************************************************************
* Included Files
@@ -114,5 +114,4 @@ extern "C"
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_INCLUDE_SONG_IRQ_H */
-
+#endif /* __ARCH_ARM_SRC_RTL8720C_INCLUDE_IRQ_H */
diff --git a/arch/arm/src/s32k1xx/hardware/s32k1xx_mcm.h b/arch/arm/src/s32k1xx/hardware/s32k1xx_mcm.h
index 2f36dd2..e208d46 100644
--- a/arch/arm/src/s32k1xx/hardware/s32k1xx_mcm.h
+++ b/arch/arm/src/s32k1xx/hardware/s32k1xx_mcm.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_S32K1XX_HARDWARE_S32K1XX_CMU_H
-#define __ARCH_ARM_SRC_S32K1XX_HARDWARE_S32K1XX_CMU_H
+#ifndef __ARCH_ARM_SRC_S32K1XX_HARDWARE_S32K1XX_MCM_H
+#define __ARCH_ARM_SRC_S32K1XX_HARDWARE_S32K1XX_MCM_H
/****************************************************************************
* Included Files
@@ -268,4 +268,4 @@
/* LMEM Fault Data Low Register (32-bit address data) */
#endif /* CONFIG_ARCH_CHIP_S32K14X */
-#endif /* __ARCH_ARM_SRC_S32K1XX_HARDWARE_S32K1XX_CMU_H */
+#endif /* __ARCH_ARM_SRC_S32K1XX_HARDWARE_S32K1XX_MCM_H */
diff --git a/arch/arm/src/s32k1xx/s32k1xx_eeeprom.h b/arch/arm/src/s32k1xx/s32k1xx_eeeprom.h
index 545c15c..e681b34 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_eeeprom.h
+++ b/arch/arm/src/s32k1xx/s32k1xx_eeeprom.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_S32K1XX_EEEPROM_H
-#define __ARCH_ARM_SRC_S32K1XX_EEEPROM_H
+#ifndef __ARCH_ARM_SRC_S32K1XX_S32K1XX_EEEPROM_H
+#define __ARCH_ARM_SRC_S32K1XX_S32K1XX_EEEPROM_H
/****************************************************************************
* Included Files
@@ -70,4 +70,4 @@ void s32k1xx_eeeprom_init(void);
****************************************************************************/
int s32k1xx_eeeprom_register(int minor, uint32_t size);
-#endif /* __ARCH_ARM_SRC_S32K1XX_EEEPROM_H */
+#endif /* __ARCH_ARM_SRC_S32K1XX_S32K1XX_EEEPROM_H */
diff --git a/arch/arm/src/s32k1xx/s32k1xx_lowputc.h b/arch/arm/src/s32k1xx/s32k1xx_lowputc.h
index 56b5066..b7f3e2c 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_lowputc.h
+++ b/arch/arm/src/s32k1xx/s32k1xx_lowputc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_S32K1XX_LOWPUTC_H
-#define __ARCH_ARM_SRC_S32K1XX_LOWPUTC_H
+#ifndef __ARCH_ARM_SRC_S32K1XX_S32K1XX_LOWPUTC_H
+#define __ARCH_ARM_SRC_S32K1XX_S32K1XX_LOWPUTC_H
/****************************************************************************
* Included Files
@@ -101,4 +101,4 @@ void s32k1xx_lowputc(int ch);
# define s32k1xx_lowputc(ch)
#endif
-#endif /* __ARCH_ARM_SRC_S32K1XX_LOWPUTC_H */
+#endif /* __ARCH_ARM_SRC_S32K1XX_S32K1XX_LOWPUTC_H */
diff --git a/arch/arm/src/s32k1xx/s32k1xx_progmem.h b/arch/arm/src/s32k1xx/s32k1xx_progmem.h
index 07a914a..09bfe9d 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_progmem.h
+++ b/arch/arm/src/s32k1xx/s32k1xx_progmem.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_S32K1XX_PROGMEM_H
-#define __ARCH_ARM_SRC_S32K1XX_PROGMEM_H
+#ifndef __ARCH_ARM_SRC_S32K1XX_S32K1XX_PROGMEM_H
+#define __ARCH_ARM_SRC_S32K1XX_S32K1XX_PROGMEM_H
/****************************************************************************
* Included Files
@@ -77,4 +77,4 @@
void s32k1xx_progmem_init();
-#endif /* __ARCH_ARM_SRC_S32K1XX_PROGMEM_H */
+#endif /* __ARCH_ARM_SRC_S32K1XX_S32K1XX_PROGMEM_H */
diff --git a/arch/arm/src/s32k1xx/s32k1xx_rtc.h b/arch/arm/src/s32k1xx/s32k1xx_rtc.h
index 024e79a..969d4a0 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_rtc.h
+++ b/arch/arm/src/s32k1xx/s32k1xx_rtc.h
@@ -22,8 +22,8 @@
* Included Files
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_s32k1xx_s32k1xx_rtc_H
-#define __ARCH_ARM_SRC_s32k1xx_s32k1xx_rtc_H
+#ifndef __ARCH_ARM_SRC_S32K1XX_S32JK1XX_RTC_H
+#define __ARCH_ARM_SRC_S32K1XX_S32JK1XX_RTC_H
#include <nuttx/config.h>
@@ -95,4 +95,4 @@ bool s32k1xx_rtc_havesettime(void);
#endif
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_S32K1XX_RTC */
-#endif /* __ARCH_ARM_SRC_s32k1xx_s32k1xx_rtc_H */
+#endif /* __ARCH_ARM_SRC_S32K1XX_S32JK1XX_RTC_H */
diff --git a/arch/arm/src/sam34/hardware/sam4l_pinmap.h b/arch/arm/src/sam34/hardware/sam4l_pinmap.h
index c4b1831..37388f4 100644
--- a/arch/arm/src/sam34/hardware/sam4l_pinmap.h
+++ b/arch/arm/src/sam34/hardware/sam4l_pinmap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3U_PINMAP_H
-#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3U_PINMAP_H
+#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_PINMAP_H
+#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_PINMAP_H
/****************************************************************************
* Included Files
@@ -562,4 +562,4 @@ extern "C"
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM3U_PINMAP_H */
+#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_PINMAP_H */
diff --git a/arch/arm/src/sam34/hardware/sam4l_usart.h b/arch/arm/src/sam34/hardware/sam4l_usart.h
index bbfaee3..3a870b3 100644
--- a/arch/arm/src/sam34/hardware/sam4l_usart.h
+++ b/arch/arm/src/sam34/hardware/sam4l_usart.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_UART_H
-#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_UART_H
+#ifndef __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_USART_H
+#define __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_USART_H
/****************************************************************************
* Included Files
@@ -439,4 +439,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_UART_H */
+#endif /* __ARCH_ARM_SRC_SAM34_HARDWARE_SAM4L_USART_H */
diff --git a/arch/arm/src/sam34/sam4cm_freerun.h b/arch/arm/src/sam34/sam4cm_freerun.h
index 3c8b7fc..50c5605 100644
--- a/arch/arm/src/sam34/sam4cm_freerun.h
+++ b/arch/arm/src/sam34/sam4cm_freerun.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_SAM34_SAM_FREERUN_H
-#define __ARCH_ARM_SRC_SAM34_SAM_FREERUN_H
+#ifndef __ARCH_ARM_SRC_SAM34_SAM4CM_FREERUN_H
+#define __ARCH_ARM_SRC_SAM34_SAM4CM_FREERUN_H
/****************************************************************************
* Included Files
@@ -143,4 +143,4 @@ int sam_freerun_uninitialize(struct sam_freerun_s *freerun);
#endif
#endif /* CONFIG_SAM34_FREERUN */
-#endif /* __ARCH_ARM_SRC_SAM34_SAM_FREERUN_H */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM4CM_FREERUN_H */
diff --git a/arch/arm/src/sam34/sam4cm_oneshot.h b/arch/arm/src/sam34/sam4cm_oneshot.h
index b482dcc..6bfd687 100644
--- a/arch/arm/src/sam34/sam4cm_oneshot.h
+++ b/arch/arm/src/sam34/sam4cm_oneshot.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_SAM34_SAM_ONESHOT_H
-#define __ARCH_ARM_SRC_SAM34_SAM_ONESHOT_H
+#ifndef __ARCH_ARM_SRC_SAM34_SAM4CM_ONESHOT_H
+#define __ARCH_ARM_SRC_SAM34_SAM4CM_ONESHOT_H
/****************************************************************************
* Included Files
@@ -194,4 +194,4 @@ int sam_oneshot_cancel(struct sam_oneshot_s *oneshot,
#endif
#endif /* CONFIG_SAM34_ONESHOT */
-#endif /* __ARCH_ARM_SRC_SAM34_SAM_ONESHOT_H */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM4CM_ONESHOT_H */
diff --git a/arch/arm/src/sam34/sam4s_nand.h b/arch/arm/src/sam34/sam4s_nand.h
index 253a664..e7ed5f7 100644
--- a/arch/arm/src/sam34/sam4s_nand.h
+++ b/arch/arm/src/sam34/sam4s_nand.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_SAM4S_SAM_NAND_H
-#define __ARCH_ARM_SRC_SAM4S_SAM_NAND_H
+#ifndef __ARCH_ARM_SRC_SAM34_SAM4S_NAND_H
+#define __ARCH_ARM_SRC_SAM34_SAM4S_NAND_H
/****************************************************************************
* Included Files
@@ -82,6 +82,8 @@
* Public Types
****************************************************************************/
+#ifndef __ASSEMBLY__
+
/* This type represents the state of a raw NAND MTD device on a single chip
* select. The struct nand_raw_s must appear at the beginning of the
* definition so that you can freely cast between pointers to struct
@@ -99,15 +101,12 @@ struct sam_nandcs_s
uint8_t cs; /* Chip select number (0..3) */
gpio_pinset_t rb; /* NAND Ready/Busy detect GPIO pin */
-#endif
};
/****************************************************************************
* Public Data
****************************************************************************/
-#ifndef __ASSEMBLY__
-
#undef EXTERN
#if defined(__cplusplus)
#define EXTERN extern "C"
@@ -177,3 +176,4 @@ int board_nandflash_config(int cs);
#endif
#endif /* __ASSEMBLY__ */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM4S_NAND_H */
diff --git a/arch/arm/src/sam34/sam_emac.h b/arch/arm/src/sam34/sam_emac.h
index b9b675e..92dad6d 100644
--- a/arch/arm/src/sam34/sam_emac.h
+++ b/arch/arm/src/sam34/sam_emac.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_SAM34_SAM_ETHERNET_H
-#define __ARCH_ARM_SRC_SAM34_SAM_ETHERNET_H
+#ifndef __ARCH_ARM_SRC_SAM34_SAM_EMAC_H
+#define __ARCH_ARM_SRC_SAM34_SAM_EMAC_H
/****************************************************************************
* Included Files
@@ -106,4 +106,4 @@ int sam_phy_boardinitialize(int intf);
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_SAM34_EMAC */
-#endif /* __ARCH_ARM_SRC_SAM34_SAM_ETHERNET_H */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM_EMAC_H */
diff --git a/arch/arm/src/sam34/sam_rtt.h b/arch/arm/src/sam34/sam_rtt.h
index 1b1d3da..8597845 100644
--- a/arch/arm/src/sam34/sam_rtt.h
+++ b/arch/arm/src/sam34/sam_rtt.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_SAM34_RTT_H
-#define __ARCH_ARM_SRC_SAM34_RTT_H
+#ifndef __ARCH_ARM_SRC_SAM34_SAM_RTT_H
+#define __ARCH_ARM_SRC_SAM34_SAM_RTT_H
/****************************************************************************
* Included Files
@@ -80,4 +80,4 @@ void sam_rttinitialize(FAR const char *devpath);
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_TIMER */
-#endif /* __ARCH_ARM_SRC_SAM34_RTT_H */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM_RTT_H */
diff --git a/arch/arm/src/sam34/sam_tc.h b/arch/arm/src/sam34/sam_tc.h
index 7870d63..210e32b 100644
--- a/arch/arm/src/sam34/sam_tc.h
+++ b/arch/arm/src/sam34/sam_tc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_SAM34_TC_H
-#define __ARCH_ARM_SRC_SAM34_TC_H
+#ifndef __ARCH_ARM_SRC_SAM34_SAM_TC_H
+#define __ARCH_ARM_SRC_SAM34_SAM_TC_H
/****************************************************************************
* Included Files
@@ -81,4 +81,4 @@ void sam_tcinitialize(FAR const char *devpath, int irq);
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_TIMER */
-#endif /* __ARCH_ARM_SRC_SAM34_TC_H */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM_TC_H */
diff --git a/arch/arm/src/sam34/sam_wdt.h b/arch/arm/src/sam34/sam_wdt.h
index 2ad57a4..f46642f 100644
--- a/arch/arm/src/sam34/sam_wdt.h
+++ b/arch/arm/src/sam34/sam_wdt.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_SAM34_WDT_H
-#define __ARCH_ARM_SRC_SAM34_WDT_H
+#ifndef __ARCH_ARM_SRC_SAM34_SAM_WDT_H
+#define __ARCH_ARM_SRC_SAM34_SAM_WDT_H
/****************************************************************************
* Included Files
@@ -79,4 +79,4 @@ void sam_wdtinitialize(FAR const char *devpath);
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_WATCHDOG */
-#endif /* __ARCH_ARM_SRC_SAM34_WDT_H */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM_WDT_H */
diff --git a/arch/arm/src/sama5/hardware/sam_flexcom_usart.h b/arch/arm/src/sama5/hardware/sam_flexcom_usart.h
index f82f57b..0fc1bb4 100644
--- a/arch/arm/src/sama5/hardware/sam_flexcom_usart.h
+++ b/arch/arm/src/sama5/hardware/sam_flexcom_usart.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_FLEXCOM_FLEXUS_H
-#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_FLEXCOM_FLEXUS_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_FLEXCOM_USART_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_FLEXCOM_USART_H
/****************************************************************************
* Included Files
@@ -575,4 +575,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_FLEXCOM_FLEXUS_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_FLEXCOM_USART_H */
diff --git a/arch/arm/src/sama5/hardware/sam_sdmmc.h b/arch/arm/src/sama5/hardware/sam_sdmmc.h
index 18a6f8b..0439f13 100644
--- a/arch/arm/src/sama5/hardware/sam_sdmmc.h
+++ b/arch/arm/src/sama5/hardware/sam_sdmmc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAMA5_SDMMC_H
-#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAMA5_SDMMC_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_SDMMC_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_SDMMC_H
/****************************************************************************
* Included Files
@@ -610,4 +610,4 @@ enum bus_mode
* Public Data
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAMA5_SDMMC_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_SDMMC_H */
diff --git a/arch/arm/src/sama5/sam_pmecc.h b/arch/arm/src/sama5/sam_pmecc.h
index 133c33b..bfea540 100644
--- a/arch/arm/src/sama5/sam_pmecc.h
+++ b/arch/arm/src/sama5/sam_pmecc.h
@@ -39,8 +39,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_SAMA5_PMECC_H
-#define __ARCH_ARM_SRC_SAMA5_PMECC_H
+#ifndef __ARCH_ARM_SRC_SAMA5_SAM_PMECC_H
+#define __ARCH_ARM_SRC_SAMA5_SAM_PMECC_H
/****************************************************************************
* Included Files
@@ -423,4 +423,4 @@ void pmecc_buildgf(uint32_t mm, int16_t *indexof, int16_t *alphato);
# define pmecc_get_pagesize() (0)
#endif /* CONFIG_SAMA5_HAVE_PMECC */
-#endif /* __ARCH_ARM_SRC_SAMA5_PMECC_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_SAM_PMECC_H */
diff --git a/arch/arm/src/samd5e5/hardware/sam_gmac.h b/arch/arm/src/samd5e5/hardware/sam_gmac.h
index bd2e40f..4f0da65 100644
--- a/arch/arm/src/samd5e5/hardware/sam_gmac.h
+++ b/arch/arm/src/samd5e5/hardware/sam_gmac.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_GMAC_H
-#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_GMAC_H
+#ifndef __ARCH_ARM_SRC_SAMA5E5_HARDWARE_SAM_GMAC_H
+#define __ARCH_ARM_SRC_SAMA5E5_HARDWARE_SAM_GMAC_H
/****************************************************************************
* Included Files
@@ -1063,4 +1063,4 @@ struct gmac_txdesc_s
uint32_t status; /* TX status and controls */
};
-#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_GMAC_H */
+#endif /* __ARCH_ARM_SRC_SAMA5E5_HARDWARE_SAM_GMAC_H */
diff --git a/arch/arm/src/samd5e5/hardware/sam_tc.h b/arch/arm/src/samd5e5/hardware/sam_tc.h
index 7b0ea3a..6640fbc 100644
--- a/arch/arm/src/samd5e5/hardware/sam_tc.h
+++ b/arch/arm/src/samd5e5/hardware/sam_tc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_SAMD5E5_CHIP_SAMD_TC_H
-#define __ARCH_ARM_SRC_SAMD5E5_CHIP_SAMD_TC_H
+#ifndef __ARCH_ARM_SRC_SAMD5E5_HARDWARE_SAM_TC_H
+#define __ARCH_ARM_SRC_SAMD5E5_HARDWARE_SAM_TC_H
/****************************************************************************
* Included Files
@@ -472,4 +472,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_SAMD5E5_CHIP_SAMD_TC_H */
+#endif /* __ARCH_ARM_SRC_SAMD5E5_HARDWARE_SAM_TC_H */
diff --git a/arch/arm/src/samv7/hardware/sam_pio.h b/arch/arm/src/samv7/hardware/sam_pio.h
index 88852e5..2aedf18 100644
--- a/arch/arm/src/samv7/hardware/sam_pio.h
+++ b/arch/arm/src/samv7/hardware/sam_pio.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM4E_PIO_H
-#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM4E_PIO_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_PIO_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_PIO_H
/****************************************************************************
* Included Files
@@ -578,4 +578,4 @@
****************************************************************************/
#endif /* SAMV7_NPIO > 0 */
-#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM4E_PIO_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_PIO_H */
diff --git a/arch/arm/src/samv7/sam_config.h b/arch/arm/src/samv7/sam_config.h
index 0a69f35..0e75912 100644
--- a/arch/arm/src/samv7/sam_config.h
+++ b/arch/arm/src/samv7/sam_config.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_SAMV7_SAMV7_CONFIG_H
-#define __ARCH_ARM_SRC_SAMV7_SAMV7_CONFIG_H
+#ifndef __ARCH_ARM_SRC_SAMV7_SAM_CONFIG_H
+#define __ARCH_ARM_SRC_SAMV7_SAM_CONFIG_H
/****************************************************************************
* Included Files
@@ -330,4 +330,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_SAMV7_SAMV7_CONFIG_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_SAM_CONFIG_H */
diff --git a/arch/arm/src/stm32/hardware/stm32_dma_v1.h b/arch/arm/src/stm32/hardware/stm32_dma_v1.h
index 7c79db9..a9b3803 100644
--- a/arch/arm/src/stm32/hardware/stm32_dma_v1.h
+++ b/arch/arm/src/stm32/hardware/stm32_dma_v1.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32_HARDWARE_STM32_DMA_V1_DMA_H
-#define __ARCH_ARM_SRC_STM32_HARDWARE_STM32_DMA_V1_DMA_H
+#ifndef __ARCH_ARM_SRC_STM32_HARDWARE_STM32_DMA_V1_H
+#define __ARCH_ARM_SRC_STM32_HARDWARE_STM32_DMA_V1_H
/****************************************************************************
* Pre-processor Definitions
@@ -768,4 +768,4 @@
# error "Unknown DMA channel assignments"
#endif
-#endif /* __ARCH_ARM_SRC_STM32_HARDWARE_STM32_DMA_V1_DMA_H */
+#endif /* __ARCH_ARM_SRC_STM32_HARDWARE_STM32_DMA_V1_H */
diff --git a/arch/arm/src/stm32/hardware/stm32_dma_v2.h b/arch/arm/src/stm32/hardware/stm32_dma_v2.h
index 9e13009..b716350 100644
--- a/arch/arm/src/stm32/hardware/stm32_dma_v2.h
+++ b/arch/arm/src/stm32/hardware/stm32_dma_v2.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32_HARDWARE_STM32_DMA_V2_DMA_H
-#define __ARCH_ARM_SRC_STM32_HARDWARE_STM32_DMA_V2_DMA_H
+#ifndef __ARCH_ARM_SRC_STM32_HARDWARE_STM32_DMA_V2_H
+#define __ARCH_ARM_SRC_STM32_HARDWARE_STM32_DMA_V2_H
/****************************************************************************
* Pre-processor Definitions
@@ -556,4 +556,4 @@
#define DMAMAP_TIM8_TRIG STM32_DMA_MAP(DMA2,DMA_STREAM7,DMA_CHAN7)
#define DMAMAP_TIM8_COM STM32_DMA_MAP(DMA2,DMA_STREAM7,DMA_CHAN7)
-#endif /* __ARCH_ARM_SRC_STM32_HARDWARE_STM32_DMA_V2_DMA_H */
+#endif /* __ARCH_ARM_SRC_STM32_HARDWARE_STM32_DMA_V2_H */
diff --git a/arch/arm/src/stm32/hardware/stm32f33xxx_hrtim.h b/arch/arm/src/stm32/hardware/stm32f33xxx_hrtim.h
index b814838..2564458 100644
--- a/arch/arm/src/stm32/hardware/stm32f33xxx_hrtim.h
+++ b/arch/arm/src/stm32/hardware/stm32f33xxx_hrtim.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32_HARDWARE_STM32_HRTIM_H
-#define __ARCH_ARM_SRC_STM32_HARDWARE_STM32_HRTIM_H
+#ifndef __ARCH_ARM_SRC_STM32_HARDWARE_STM32F33XXX_HRTIM_H
+#define __ARCH_ARM_SRC_STM32_HARDWARE_STM32F33XXX_HRTIM_H
/****************************************************************************
* Included Files
@@ -1794,4 +1794,4 @@
#define HRTIM_BDMADR_SHIFT 0 /* Bits 0-31: Burst DMA Data register */
#define HRTIM_BDMADR_MASK (0xffffffff << HRTIM_BDMADR_SHIFT)
-#endif /* __ARCH_ARM_SRC_STM32_HARDWARE_STM32_HRTIM_H */
+#endif /* __ARCH_ARM_SRC_STM32_HARDWARE_STM32F33XXX_HRTIM_H */
diff --git a/arch/arm/src/stm32/hardware/stm32f33xxx_opamp.h b/arch/arm/src/stm32/hardware/stm32f33xxx_opamp.h
index 56b9f73..6b93346 100644
--- a/arch/arm/src/stm32/hardware/stm32f33xxx_opamp.h
+++ b/arch/arm/src/stm32/hardware/stm32f33xxx_opamp.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32_HARDWARE_STM32_OPAMP_H
-#define __ARCH_ARM_SRC_STM32_HARDWARE_STM32_OPAMP_H
+#ifndef __ARCH_ARM_SRC_STM32_HARDWARE_STM32F33XXX_OPAMP_H
+#define __ARCH_ARM_SRC_STM32_HARDWARE_STM32F33XXX_OPAMP_H
/****************************************************************************
* Included Files
@@ -99,4 +99,4 @@
#define OPAMP_CSR_OUTCAL (1 << 30) /* Bit 30: OPAMP output status flag */
#define OPAMP_CSR_LOCK (1 << 31) /* Bit 31: OPAMP 2 lock */
-#endif /* __ARCH_ARM_SRC_STM32_HARDWARE_STM32_OPAMP_H */
+#endif /* __ARCH_ARM_SRC_STM32_HARDWARE_STM32F33XXX_OPAMP_H */
diff --git a/arch/arm/src/stm32/stm32_dfumode.h b/arch/arm/src/stm32/stm32_dfumode.h
index b840e83..a471a58 100644
--- a/arch/arm/src/stm32/stm32_dfumode.h
+++ b/arch/arm/src/stm32/stm32_dfumode.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32_DFUMODE_H
-#define __ARCH_ARM_SRC_STM32_DFUMODE_H
+#ifndef __ARCH_ARM_SRC_STM32_STM32_DFUMODE_H
+#define __ARCH_ARM_SRC_STM32_STM32_DFUMODE_H
/****************************************************************************
* Included Files
@@ -46,4 +46,4 @@
void stm32_dfumode(void) noreturn_function;
#endif
-#endif /* __ARCH_ARM_SRC_STM32_DFUMODE_H */
+#endif /* __ARCH_ARM_SRC_STM32_STM32_DFUMODE_H */
diff --git a/arch/arm/src/stm32/stm32_foc.h b/arch/arm/src/stm32/stm32_foc.h
index 72863b8..8c80621 100644
--- a/arch/arm/src/stm32/stm32_foc.h
+++ b/arch/arm/src/stm32/stm32_foc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32_FOC_H
-#define __ARCH_ARM_SRC_STM32_FOC_H
+#ifndef __ARCH_ARM_SRC_STM32_STM32_FOC_H
+#define __ARCH_ARM_SRC_STM32_STM32_FOC_H
/****************************************************************************
* Included Files
@@ -185,4 +185,4 @@ FAR struct adc_dev_s *stm32_foc_adcget(FAR struct foc_dev_s *dev);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_STM32_FOC_H */
+#endif /* __ARCH_ARM_SRC_STM32_STM32_FOC_H */
diff --git a/arch/arm/src/stm32/stm32_freerun.h b/arch/arm/src/stm32/stm32_freerun.h
index 061e75d..bb5f6b4 100644
--- a/arch/arm/src/stm32/stm32_freerun.h
+++ b/arch/arm/src/stm32/stm32_freerun.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32_FREERUN_H
-#define __ARCH_ARM_SRC_STM32_FREERUN_H
+#ifndef __ARCH_ARM_SRC_STM32_STM32_FREERUN_H
+#define __ARCH_ARM_SRC_STM32_STM32_FREERUN_H
/****************************************************************************
* Included Files
@@ -156,4 +156,4 @@ int stm32_freerun_uninitialize(struct stm32_freerun_s *freerun);
#endif
#endif /* CONFIG_STM32_FREERUN */
-#endif /* __ARCH_ARM_SRC_STM32_FREERUN_H */
+#endif /* __ARCH_ARM_SRC_STM32_STM32_FREERUN_H */
diff --git a/arch/arm/src/stm32/stm32_hciuart.h b/arch/arm/src/stm32/stm32_hciuart.h
index e4d35d7..a8ec296 100644
--- a/arch/arm/src/stm32/stm32_hciuart.h
+++ b/arch/arm/src/stm32/stm32_hciuart.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32_HCIUART_H
-#define __ARCH_ARM_SRC_STM32_HCIUART_H
+#ifndef __ARCH_ARM_SRC_STM32_STM32_HCIUART_H
+#define __ARCH_ARM_SRC_STM32_STM32_HCIUART_H
/****************************************************************************
* Included Files
@@ -91,4 +91,4 @@ void hciuart_initialize(void);
void stm32_serial_dma_poll(void);
#endif
-#endif /* __ARCH_ARM_SRC_STM32_HCIUART_H */
+#endif /* __ARCH_ARM_SRC_STM32_STM32_HCIUART_H */
diff --git a/arch/arm/src/stm32/stm32_i2s.h b/arch/arm/src/stm32/stm32_i2s.h
index f61cedf..6d1e8cf 100644
--- a/arch/arm/src/stm32/stm32_i2s.h
+++ b/arch/arm/src/stm32/stm32_i2s.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32_I2S_H
-#define __ARCH_ARM_SRC_STM32_I2S_H
+#ifndef __ARCH_ARM_SRC_STM32_STM32_I2S_H
+#define __ARCH_ARM_SRC_STM32_STM32_I2S_H
/****************************************************************************
* Included Files
@@ -71,4 +71,4 @@ FAR struct i2s_dev_s *stm32_i2sbus_initialize(int port);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_STM32_I2S_H */
+#endif /* __ARCH_ARM_SRC_STM32_STM32_I2S_H */
diff --git a/arch/arm/src/stm32/stm32_oneshot.h b/arch/arm/src/stm32/stm32_oneshot.h
index 1906c5b..c1366c8 100644
--- a/arch/arm/src/stm32/stm32_oneshot.h
+++ b/arch/arm/src/stm32/stm32_oneshot.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32_ONESHOT_H
-#define __ARCH_ARM_SRC_STM32_ONESHOT_H
+#ifndef __ARCH_ARM_SRC_STM32_STM32_ONESHOT_H
+#define __ARCH_ARM_SRC_STM32_STM32_ONESHOT_H
/****************************************************************************
* Included Files
@@ -192,4 +192,4 @@ int stm32_oneshot_cancel(struct stm32_oneshot_s *oneshot,
#endif
#endif /* CONFIG_STM32_ONESHOT */
-#endif /* __ARCH_ARM_SRC_STM32_ONESHOT_H */
+#endif /* __ARCH_ARM_SRC_STM32_STM32_ONESHOT_H */
diff --git a/arch/arm/src/stm32/stm32_spi.h b/arch/arm/src/stm32/stm32_spi.h
index 45d3f68..8d7c53c 100644
--- a/arch/arm/src/stm32/stm32_spi.h
+++ b/arch/arm/src/stm32/stm32_spi.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_STC_STM32_STM32_SPI_H
-#define __ARCH_ARM_STC_STM32_STM32_SPI_H
+#ifndef __ARCH_ARM_SRC_STM32_STM32_SPI_H
+#define __ARCH_ARM_SRC_STM32_STM32_SPI_H
/****************************************************************************
* Included Files
@@ -204,4 +204,4 @@ int stm32_spi6register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_STC_STM32_STM32_SPI_H */
+#endif /* __ARCH_ARM_SRC_STM32_STM32_SPI_H */
diff --git a/arch/arm/src/stm32/stm32_uid.h b/arch/arm/src/stm32/stm32_uid.h
index 45b8a58..823c232 100644
--- a/arch/arm/src/stm32/stm32_uid.h
+++ b/arch/arm/src/stm32/stm32_uid.h
@@ -33,8 +33,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32_UID_H
-#define __ARCH_ARM_SRC_STM32_UID_H
+#ifndef __ARCH_ARM_SRC_STM32_STM32_UID_H
+#define __ARCH_ARM_SRC_STM32_STM32_UID_H
/****************************************************************************
* Included Files
@@ -48,4 +48,4 @@
void stm32_get_uniqueid(uint8_t uniqueid[12]);
-#endif /* __ARCH_ARM_SRC_STM32_UID_H */
+#endif /* __ARCH_ARM_SRC_STM32_STM32_UID_H */
diff --git a/arch/arm/src/stm32f0l0g0/hardware/stm32_uart_v1.h b/arch/arm/src/stm32f0l0g0/hardware/stm32_uart_v1.h
index 1b02d36..b5c356a 100644
--- a/arch/arm/src/stm32f0l0g0/hardware/stm32_uart_v1.h
+++ b/arch/arm/src/stm32f0l0g0/hardware/stm32_uart_v1.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_STM32F0_UART_V1_H
-#define __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_STM32F0_UART_V1_H
+#ifndef __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_STM32_UART_V1_H
+#define __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_STM32_UART_V1_H
/****************************************************************************
* Included Files
diff --git a/arch/arm/src/stm32f0l0g0/hardware/stm32_uart_v2.h b/arch/arm/src/stm32f0l0g0/hardware/stm32_uart_v2.h
index 046ddc0..9d19830 100644
--- a/arch/arm/src/stm32f0l0g0/hardware/stm32_uart_v2.h
+++ b/arch/arm/src/stm32f0l0g0/hardware/stm32_uart_v2.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_STM32F0_UART_V2_H
-#define __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_STM32F0_UART_V2_H
+#ifndef __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_STM32_UART_V2_H
+#define __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_STM32_UART_V2_H
/****************************************************************************
* Included Files
diff --git a/arch/arm/src/stm32f0l0g0/hardware/stm32f03x_memorymap.h b/arch/arm/src/stm32f0l0g0/hardware/stm32f03x_memorymap.h
index 8fa84ef..ac00667 100644
--- a/arch/arm/src/stm32f0l0g0/hardware/stm32f03x_memorymap.h
+++ b/arch/arm/src/stm32f0l0g0/hardware/stm32f03x_memorymap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_ST32F03X_MEMORYMAP_H
-#define __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_ST32F03X_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_STM32F03X_MEMORYMAP_H
+#define __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_STM32F03X_MEMORYMAP_H
/****************************************************************************
* Pre-processor Definitions
@@ -135,4 +135,4 @@
#define STM32_SCS_BASE 0xe000e000
#define STM32_DEBUGMCU_BASE 0xe0042000
-#endif /* __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_ST32F03X_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_STM32F03X_MEMORYMAP_H */
diff --git a/arch/arm/src/stm32f0l0g0/hardware/stm32f05xf07xf09x_memorymap.h b/arch/arm/src/stm32f0l0g0/hardware/stm32f05xf07xf09x_memorymap.h
index 1e5c59b..919d747 100644
--- a/arch/arm/src/stm32f0l0g0/hardware/stm32f05xf07xf09x_memorymap.h
+++ b/arch/arm/src/stm32f0l0g0/hardware/stm32f05xf07xf09x_memorymap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_ST32F05XF07XF09X_MEMORYMAP_H
-#define __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_ST32F05XF07XF09X_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_STM32F05XF07XF09X_MEMORYMAP_H
+#define __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_STM32F05XF07XF09X_MEMORYMAP_H
/****************************************************************************
* Pre-processor Definitions
@@ -139,4 +139,4 @@
#define STM32_SCS_BASE 0xe000e000
#define STM32_DEBUGMCU_BASE 0xe0042000
-#endif /* __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_ST32F05XF07XF09X_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_STM32F05XF07XF09X_MEMORYMAP_H */
diff --git a/arch/arm/src/stm32f0l0g0/hardware/stm32g0_memorymap.h b/arch/arm/src/stm32f0l0g0/hardware/stm32g0_memorymap.h
index 27a2c30..5d19a73 100644
--- a/arch/arm/src/stm32f0l0g0/hardware/stm32g0_memorymap.h
+++ b/arch/arm/src/stm32f0l0g0/hardware/stm32g0_memorymap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_ST32G0_MEMORYMAP_H
-#define __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_ST32G0_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_STM32G0_MEMORYMAP_H
+#define __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_STM32G0_MEMORYMAP_H
/****************************************************************************
* Pre-processor Definitions
@@ -123,4 +123,4 @@
#define STM32_SCS_BASE 0xe000e000
#define STM32_DEBUGMCU_BASE 0xe0042000
-#endif /* __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_ST32G0_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32F0L0G0_HARDWARE_STM32G0_MEMORYMAP_H */
diff --git a/arch/arm/src/stm32f0l0g0/stm32_spi.h b/arch/arm/src/stm32f0l0g0/stm32_spi.h
index e671a9d..be5c818 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_spi.h
+++ b/arch/arm/src/stm32f0l0g0/stm32_spi.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32_STM32_SPI_H
-#define __ARCH_ARM_SRC_STM32_STM32_SPI_H
+#ifndef __ARCH_ARM_SRC_STM32F0L0G0_STM32_SPI_H
+#define __ARCH_ARM_SRC_STM32F0L0G0_STM32_SPI_H
/****************************************************************************
* Included Files
@@ -154,4 +154,4 @@ int stm32_spi2register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_STM32_STM32_SPI_H */
+#endif /* __ARCH_ARM_SRC_STM32F0L0G0_STM32_SPI_H */
diff --git a/arch/arm/src/stm32f7/hardware/stm32_can.h b/arch/arm/src/stm32f7/hardware/stm32_can.h
index 9767c2f..deaa49b 100644
--- a/arch/arm/src/stm32f7/hardware/stm32_can.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_can.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F7_CAN_H
-#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F7_CAN_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_CAN_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_CAN_H
/****************************************************************************
* Included Files
diff --git a/arch/arm/src/stm32f7/hardware/stm32_qspi.h b/arch/arm/src/stm32f7/hardware/stm32_qspi.h
index aa6e0c9..974c0d1 100644
--- a/arch/arm/src/stm32f7/hardware/stm32_qspi.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_qspi.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F7_QSPI_H
-#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F7_QSPI_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_QSPI_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_QSPI_H
/****************************************************************************
* Included Files
@@ -221,4 +221,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F7_QSPI_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_QSPI_H */
diff --git a/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_adc.h b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_adc.h
index 178d060..9fa38fb 100644
--- a/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_adc.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_adc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_ADC_H
-#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_ADC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX73XX_ADC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX73XX_ADC_H
/****************************************************************************
* Included Files
@@ -480,4 +480,4 @@
* Public Function Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_ADC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX73XX_ADC_H */
diff --git a/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_dbgmcu.h b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_dbgmcu.h
index 76174af..4b0b3ff 100644
--- a/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_dbgmcu.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_dbgmcu.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XXDBGMCU_H
-#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XXDBGMCU_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_DBGMCU_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_DBGMCU_H
/****************************************************************************
* Included Files
@@ -88,4 +88,4 @@
#define DBGMCU_APB2_TIM10STOP (1 << 17) /* Bit 17: TIM10 stopped when core is halted */
#define DBGMCU_APB2_TIM11STOP (1 << 18) /* Bit 18: TIM11 stopped when core is halted */
-#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX74XXDBGMCU_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX74XX_DBGMCU_H */
diff --git a/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_dma.h b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_dma.h
index 34c52a5..ebcf5ed 100644
--- a/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_dma.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_dma.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XXX73XX_DMA_H
-#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XXX73XX_DMA_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_DMA_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_DMA_H
/****************************************************************************
* Included Files
@@ -538,4 +538,4 @@
#define DMAMAP_SDMMC2_2 STM32_DMA_MAP(DMA2,DMA_STREAM5,DMA_CHAN11)
#endif /* CONFIG_STM32F7_STM32F72XX || CONFIG_STM32F7_STM32F73XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XXX73XX_DMA_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_DMA_H */
diff --git a/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_flash.h b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_flash.h
index 2bfb1c9..dfe1ce0 100644
--- a/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_flash.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_flash.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM327_CHIP_STM32F72XX73XX_FLASH_H
-#define __ARCH_ARM_SRC_STM327_CHIP_STM32F72XX73XX_FLASH_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_FLASH_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_FLASH_H
/****************************************************************************
* Pre-processor Definitions
@@ -199,4 +199,4 @@
#define FLASH_OPTCR1_BOOTADD1_MASK (0xffff << FLASH_OPTCR1_BOOTADD1_SHIFT)
# define FLASH_OPTCR1_BOOTADD1(n) ((uint32_t)(n) << FLASH_OPTCR1_BOOTADD1_SHIFT)
-#endif /* __ARCH_ARM_SRC_STM327_CHIP_STM32F72XX73XX_FLASH_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_FLASH_H */
diff --git a/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_memorymap.h b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_memorymap.h
index 2db5fa2..483ea4e 100644
--- a/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_memorymap.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_memorymap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XXX73XXX_MEMORYMAP_H
-#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XXX73XXX_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_MEMORYMAP_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_MEMORYMAP_H
/****************************************************************************
* Included Files
diff --git a/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_dbgmcu.h b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_dbgmcu.h
index 834909f..c08ff81 100644
--- a/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_dbgmcu.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_dbgmcu.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XXDBGMCU_H
-#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XXDBGMCU_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_DBGMCU_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_DBGMCU_H
/****************************************************************************
* Included Files
@@ -93,4 +93,4 @@
#define DBGMCU_APB2_TIM10STOP (1 << 17) /* Bit 17: TIM10 stopped when core is halted */
#define DBGMCU_APB2_TIM11STOP (1 << 18) /* Bit 18: TIM11 stopped when core is halted */
-#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XXDBGMCU_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_DBGMCU_H */
diff --git a/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_dma.h b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_dma.h
index acaab7e..5febd2c 100644
--- a/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_dma.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_dma.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XXX75XX_DMA_H
-#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XXX75XX_DMA_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_DMA_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_DMA_H
/****************************************************************************
* Included Files
@@ -544,4 +544,4 @@
#define DMAMAP_TIM8_COM STM32_DMA_MAP(DMA2,DMA_STREAM7,DMA_CHAN7)
#endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XXX75XX_DMA_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_DMA_H */
diff --git a/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_flash.h b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_flash.h
index df6d3ce..390315c 100644
--- a/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_flash.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_flash.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM327_CHIP_STM32F74XX75XX_FLASH_H
-#define __ARCH_ARM_SRC_STM327_CHIP_STM32F74XX75XX_FLASH_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_FLASH_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_FLASH_H
/****************************************************************************
* Pre-processor Definitions
@@ -187,4 +187,4 @@
#define FLASH_OPTCR1_BOOTADD1_MASK (0xffff << FLASH_OPTCR1_BOOTADD1_SHIFT)
# define FLASH_OPTCR1_BOOTADD1(n) ((uint32_t)(n) << FLASH_OPTCR1_BOOTADD1_SHIFT)
-#endif /* __ARCH_ARM_SRC_STM327_CHIP_STM32F74XX75XX_FLASH_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_FLASH_H */
diff --git a/arch/arm/src/stm32f7/hardware/stm32f74xx77xx_i2c.h b/arch/arm/src/stm32f7/hardware/stm32f74xx77xx_i2c.h
index 8b84323..85f58ed 100644
--- a/arch/arm/src/stm32f7/hardware/stm32f74xx77xx_i2c.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f74xx77xx_i2c.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32F7_STM32F74XX77XX_I2C_H
-#define __ARCH_ARM_SRC_STM32F7_STM32F74XX77XX_I2C_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_I2C_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_I2C_H
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_dbgmcu.h b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_dbgmcu.h
index a85a0ae..c325da5 100644
--- a/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_dbgmcu.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_dbgmcu.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XXDBGMCU_H
-#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XXDBGMCU_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_DBGMCU_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_DBGMCU_H
/****************************************************************************
* Included Files
@@ -94,4 +94,4 @@
#define DBGMCU_APB2_TIM10STOP (1 << 17) /* Bit 17: TIM10 stopped when core is halted */
#define DBGMCU_APB2_TIM11STOP (1 << 18) /* Bit 18: TIM11 stopped when core is halted */
-#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XXDBGMCU_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_DBGMCU_H */
diff --git a/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_dma.h b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_dma.h
index df392e6..3db5f24 100644
--- a/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_dma.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_dma.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XXX77XX_DMA_H
-#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XXX77XX_DMA_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_DMA_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_DMA_H
/****************************************************************************
* Included Files
@@ -584,4 +584,4 @@
#define DMAMAP_SDMMC2_2 STM32_DMA_MAP(DMA2,DMA_STREAM5,DMA_CHAN11)
#endif /* CONFIG_STM32F7_STM32F76XX || CONFIG_STM32F7_STM32F77XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XXX77XX_DMA_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_DMA_H */
diff --git a/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_flash.h b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_flash.h
index 1d65d2f..dd934f4 100644
--- a/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_flash.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_flash.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM327_CHIP_STM32F74XX75XX_FLASH_H
-#define __ARCH_ARM_SRC_STM327_CHIP_STM32F74XX75XX_FLASH_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_FLASH_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_FLASH_H
/****************************************************************************
* Pre-processor Definitions
@@ -204,4 +204,4 @@
#define FLASH_OPTCR1_BOOTADD1_MASK (0xffff << FLASH_OPTCR1_BOOTADD1_SHIFT)
# define FLASH_OPTCR1_BOOTADD1(n) ((uint32_t)(n) << FLASH_OPTCR1_BOOTADD1_SHIFT)
-#endif /* __ARCH_ARM_SRC_STM327_CHIP_STM32F74XX75XX_FLASH_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_FLASH_H */
diff --git a/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_memorymap.h b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_memorymap.h
index 6bef5b1..946045b 100644
--- a/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_memorymap.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_memorymap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XXX77XXX_MEMORYMAP_H
-#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XXX77XXX_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_MEMORYMAP_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_MEMORYMAP_H
/****************************************************************************
* Included Files
@@ -204,4 +204,4 @@
#define STM32_DEBUGMCU_BASE 0xe0042000
#endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XXX75XXX_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_MEMORYMAP_H */
diff --git a/arch/arm/src/stm32f7/stm32_i2c.h b/arch/arm/src/stm32f7/stm32_i2c.h
index 159cc1c..9f693d7 100644
--- a/arch/arm/src/stm32f7/stm32_i2c.h
+++ b/arch/arm/src/stm32f7/stm32_i2c.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32F7_STM32F7_I2C_H
-#define __ARCH_ARM_SRC_STM32F7_STM32F7_I2C_H
+#ifndef __ARCH_ARM_SRC_STM32F7_STM32_I2C_H
+#define __ARCH_ARM_SRC_STM32F7_STM32_I2C_H
/****************************************************************************
* Included Files
@@ -86,4 +86,4 @@ FAR struct i2c_master_s *stm32_i2cbus_initialize(int port);
int stm32_i2cbus_uninitialize(FAR struct i2c_master_s *dev);
-#endif /* __ARCH_ARM_SRC_STM32F7_STM32F7_I2C_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_STM32_I2C_H */
diff --git a/arch/arm/src/stm32f7/stm32_qspi.h b/arch/arm/src/stm32f7/stm32_qspi.h
index bf3c967..941ef62 100644
--- a/arch/arm/src/stm32f7/stm32_qspi.h
+++ b/arch/arm/src/stm32f7/stm32_qspi.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32_STM32F7_QSPI_H
-#define __ARCH_ARM_SRC_STM32_STM32F7_QSPI_H
+#ifndef __ARCH_ARM_SRC_STM32F7_STM32_QSPI_H
+#define __ARCH_ARM_SRC_STM32F7_STM32_QSPI_H
/****************************************************************************
* Included Files
@@ -126,4 +126,4 @@ void stm32f7_qspi_exit_memorymapped(struct qspi_dev_s *dev);
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_STM32F7_QSPI */
-#endif /* __ARCH_ARM_SRC_STM32_STM32F7_QSPI_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_STM32_QSPI_H */
diff --git a/arch/arm/src/stm32f7/stm32_start.h b/arch/arm/src/stm32f7/stm32_start.h
index 00fce45..40e0be4 100644
--- a/arch/arm/src/stm32f7/stm32_start.h
+++ b/arch/arm/src/stm32f7/stm32_start.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_SAMV7_SAM_START_H
-#define __ARCH_ARM_SRC_SAMV7_SAM_START_H
+#ifndef __ARCH_ARM_SRC_STM32F7_STM32_START_H
+#define __ARCH_ARM_SRC_STM32F7_STM32_START_H
/****************************************************************************
* Included Files
@@ -69,4 +69,4 @@ void stm32_boardinitialize(void);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_SAMV7_SAM_START_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_STM32_START_H */
diff --git a/arch/arm/src/stm32f7/stm32_uid.h b/arch/arm/src/stm32f7/stm32_uid.h
index 4a3ed41..667cec3 100644
--- a/arch/arm/src/stm32f7/stm32_uid.h
+++ b/arch/arm/src/stm32f7/stm32_uid.h
@@ -33,8 +33,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32_UID_H
-#define __ARCH_ARM_SRC_STM32_UID_H
+#ifndef __ARCH_ARM_SRC_STM32F7_STM32_UID_H
+#define __ARCH_ARM_SRC_STM32F7_STM32_UID_H
/****************************************************************************
* Included Files
@@ -48,4 +48,4 @@
void stm32_get_uniqueid(uint8_t uniqueid[12]);
-#endif /* __ARCH_ARM_SRC_STM32_UID_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_STM32_UID_H */
diff --git a/arch/arm/src/stm32h7/hardware/stm32_qspi.h b/arch/arm/src/stm32h7/hardware/stm32_qspi.h
index 8a1ccf6..bb4f4e4 100644
--- a/arch/arm/src/stm32h7/hardware/stm32_qspi.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_qspi.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7_QSPI_H
-#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7_QSPI_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_QSPI_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_QSPI_H
/****************************************************************************
* Included Files
@@ -221,4 +221,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H4_QSPI_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_QSPI_H */
diff --git a/arch/arm/src/stm32h7/hardware/stm32_wdg.h b/arch/arm/src/stm32h7/hardware/stm32_wdg.h
index 5fa3b2a..fe88deb 100644
--- a/arch/arm/src/stm32h7/hardware/stm32_wdg.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_wdg.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32_HARDWARE_STM32H7_WDG_H
-#define __ARCH_ARM_SRC_STM32_HARDWARE_STM32H7_WDG_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_WDG_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_WDG_H
/****************************************************************************
* Included Files
@@ -141,4 +141,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_STM32_HARDWARE_STM32H7_WDG_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_WDG_H */
diff --git a/arch/arm/src/stm32h7/hardware/stm32h7x3xx_i2c.h b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_i2c.h
index 7408e90..8b02026 100644
--- a/arch/arm/src/stm32h7/hardware/stm32h7x3xx_i2c.h
+++ b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_i2c.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32H7_STM32H7X3XX_I2C_H
-#define __ARCH_ARM_SRC_STM32H7_STM32H7X3XX_I2C_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_I2C_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_I2C_H
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/stm32h7/stm32.h b/arch/arm/src/stm32h7/stm32.h
index 4bcec03..b262bef 100644
--- a/arch/arm/src/stm32h7/stm32.h
+++ b/arch/arm/src/stm32h7/stm32.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32H7_STM32H7_H
-#define __ARCH_ARM_SRC_STM32H7_STM32H7_H
+#ifndef __ARCH_ARM_SRC_STM32H7_STM32_H
+#define __ARCH_ARM_SRC_STM32H7_STM32_H
/****************************************************************************
* Included Files
diff --git a/arch/arm/src/stm32h7/stm32_i2c.h b/arch/arm/src/stm32h7/stm32_i2c.h
index 2fca2ca..653edce 100644
--- a/arch/arm/src/stm32h7/stm32_i2c.h
+++ b/arch/arm/src/stm32h7/stm32_i2c.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32H7_STM32H7_I2C_H
-#define __ARCH_ARM_SRC_STM32H7_STM32H7_I2C_H
+#ifndef __ARCH_ARM_SRC_STM32H7_STM32_I2C_H
+#define __ARCH_ARM_SRC_STM32H7_STM32_I2C_H
/****************************************************************************
* Included Files
@@ -86,4 +86,4 @@ FAR struct i2c_master_s *stm32_i2cbus_initialize(int port);
int stm32_i2cbus_uninitialize(FAR struct i2c_master_s *dev);
-#endif /* __ARCH_ARM_SRC_STM32H7_STM32H7_I2C_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_STM32_I2C_H */
diff --git a/arch/arm/src/stm32h7/stm32_oneshot.h b/arch/arm/src/stm32h7/stm32_oneshot.h
index 6eb64c6..1ea4f14 100644
--- a/arch/arm/src/stm32h7/stm32_oneshot.h
+++ b/arch/arm/src/stm32h7/stm32_oneshot.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32_ONESHOT_H
-#define __ARCH_ARM_SRC_STM32_ONESHOT_H
+#ifndef __ARCH_ARM_SRC_STM32H7_STM32_ONESHOT_H
+#define __ARCH_ARM_SRC_STM32H7_STM32_ONESHOT_H
/****************************************************************************
* Included Files
@@ -192,4 +192,4 @@ int stm32_oneshot_cancel(struct stm32_oneshot_s *oneshot,
#endif
#endif /* CONFIG_STM32H7_ONESHOT */
-#endif /* __ARCH_ARM_SRC_STM32_ONESHOT_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_STM32_ONESHOT_H */
diff --git a/arch/arm/src/stm32h7/stm32_qspi.h b/arch/arm/src/stm32h7/stm32_qspi.h
index 1ec6bff..1db03bd 100644
--- a/arch/arm/src/stm32h7/stm32_qspi.h
+++ b/arch/arm/src/stm32h7/stm32_qspi.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32_STM32H7_QSPI_H
-#define __ARCH_ARM_SRC_STM32_STM32H7_QSPI_H
+#ifndef __ARCH_ARM_SRC_STM32H7_STM32_QSPI_H
+#define __ARCH_ARM_SRC_STM32H7_STM32_QSPI_H
/****************************************************************************
* Included Files
@@ -126,4 +126,4 @@ void stm32h7_qspi_exit_memorymapped(struct qspi_dev_s *dev);
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_STM32H7_QSPI */
-#endif /* __ARCH_ARM_SRC_STM32_STM32H7_QSPI_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_STM32_QSPI_H */
diff --git a/arch/arm/src/stm32h7/stm32_start.h b/arch/arm/src/stm32h7/stm32_start.h
index 969756f..2cbd962 100644
--- a/arch/arm/src/stm32h7/stm32_start.h
+++ b/arch/arm/src/stm32h7/stm32_start.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32H7_START_H
-#define __ARCH_ARM_SRC_STM32H7_START_H
+#ifndef __ARCH_ARM_SRC_STM32H7_STM32_START_H
+#define __ARCH_ARM_SRC_STM32H7_STM32_START_H
/****************************************************************************
* Included Files
@@ -69,4 +69,4 @@ void stm32_boardinitialize(void);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_STM32H7_START_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_STM32_START_H */
diff --git a/arch/arm/src/stm32h7/stm32_uid.h b/arch/arm/src/stm32h7/stm32_uid.h
index 946d448..12d3231 100644
--- a/arch/arm/src/stm32h7/stm32_uid.h
+++ b/arch/arm/src/stm32h7/stm32_uid.h
@@ -34,8 +34,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32H7_UID_H
-#define __ARCH_ARM_SRC_STM32H7_UID_H
+#ifndef __ARCH_ARM_SRC_STM32H7_STM32_UID_H
+#define __ARCH_ARM_SRC_STM32H7_STM32_UID_H
/****************************************************************************
* Included Files
@@ -49,4 +49,4 @@
void stm32_get_uniqueid(uint8_t uniqueid[12]);
-#endif /* __ARCH_ARM_SRC_STM32H7_UID_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_STM32_UID_H */
diff --git a/arch/arm/src/stm32h7/stm32_wdg.h b/arch/arm/src/stm32h7/stm32_wdg.h
index a473b9f..f78fabe 100644
--- a/arch/arm/src/stm32h7/stm32_wdg.h
+++ b/arch/arm/src/stm32h7/stm32_wdg.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32_STM32_WDG_H
-#define __ARCH_ARM_SRC_STM32_STM32_WDG_H
+#ifndef __ARCH_ARM_SRC_STM32H7_STM32_WDG_H
+#define __ARCH_ARM_SRC_STM32H7_STM32_WDG_H
/****************************************************************************
* Included Files
@@ -101,4 +101,4 @@ void stm32_wwdginitialize(FAR const char *devpath);
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_WATCHDOG */
-#endif /* __ARCH_ARM_SRC_STM32_STM32_WDG_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_STM32_WDG_H */
diff --git a/arch/arm/src/stm32l4/hardware/stm32l4_memorymap.h b/arch/arm/src/stm32l4/hardware/stm32l4_memorymap.h
index 094fc7c..aafb605 100644
--- a/arch/arm/src/stm32l4/hardware/stm32l4_memorymap.h
+++ b/arch/arm/src/stm32l4/hardware/stm32l4_memorymap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32L4_STM32L4_MEMORYMAP_H
-#define __ARCH_ARM_SRC_STM32L4_STM32L4_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_MEMORYMAP_H
+#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_MEMORYMAP_H
/****************************************************************************
* Pre-processor Definitions
@@ -230,4 +230,4 @@
#define STM32L4_SCS_BASE 0xe000e000
#define STM32L4_DEBUGMCU_BASE 0xe0042000
-#endif /* __ARCH_ARM_SRC_STM32L4_STM32L4_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4_MEMORYMAP_H */
diff --git a/arch/arm/src/stm32l4/hardware/stm32l4x3xx_dbgmcu.h b/arch/arm/src/stm32l4/hardware/stm32l4x3xx_dbgmcu.h
index 70b41ae..e8f104c 100644
--- a/arch/arm/src/stm32l4/hardware/stm32l4x3xx_dbgmcu.h
+++ b/arch/arm/src/stm32l4/hardware/stm32l4x3xx_dbgmcu.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_DBGMCU_H
-#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X6XX_DBGMCU_H
+#ifndef __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X3XX_DBGMCU_H
+#define __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X3XX_DBGMCU_H
/****************************************************************************
* Included Files
@@ -88,4 +88,4 @@
#define DBGMCU_APB2_TIM15STOP (1 << 16) /* Bit 16: TIM15 stopped when core is halted */
#define DBGMCU_APB2_TIM16STOP (1 << 17) /* Bit 17: TIM16 stopped when core is halted */
-#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X3XXDBGMCU_H */
+#endif /* __ARCH_ARM_SRC_STM32L4_HARDWARE_STM32L4X3XX_DBGMCU_H */
diff --git a/arch/arm/src/stm32l4/stm32l4_dfumode.h b/arch/arm/src/stm32l4/stm32l4_dfumode.h
index bad5968..14199fb 100644
--- a/arch/arm/src/stm32l4/stm32l4_dfumode.h
+++ b/arch/arm/src/stm32l4/stm32l4_dfumode.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32L4_DFUMODE_H
-#define __ARCH_ARM_SRC_STM32L4_DFUMODE_H
+#ifndef __ARCH_ARM_SRC_STM32L4_STM32L4_DFUMODE_H
+#define __ARCH_ARM_SRC_STM32L4_STM32L4_DFUMODE_H
/****************************************************************************
* Included Files
@@ -43,4 +43,4 @@
void stm32l4_dfumode(void) noreturn_function;
#endif
-#endif /* __ARCH_ARM_SRC_STM32L4_DFUMODE_H */
+#endif /* __ARCH_ARM_SRC_STM32L4_STM32L4_DFUMODE_H */
diff --git a/arch/arm/src/stm32l4/stm32l4_freerun.h b/arch/arm/src/stm32l4/stm32l4_freerun.h
index fdf63d1..3dc25c2 100644
--- a/arch/arm/src/stm32l4/stm32l4_freerun.h
+++ b/arch/arm/src/stm32l4/stm32l4_freerun.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32L4_FREERUN_H
-#define __ARCH_ARM_SRC_STM32L4_FREERUN_H
+#ifndef __ARCH_ARM_SRC_STM32L4_STM32L4_FREERUN_H
+#define __ARCH_ARM_SRC_STM32L4_STM32L4_FREERUN_H
/****************************************************************************
* Included Files
@@ -139,4 +139,4 @@ int stm32l4_freerun_uninitialize(struct stm32l4_freerun_s *freerun);
#endif
#endif /* CONFIG_STM32L4_FREERUN */
-#endif /* __ARCH_ARM_SRC_STM32L4_FREERUN_H */
+#endif /* __ARCH_ARM_SRC_STM32L4_STM32L4_FREERUN_H */
diff --git a/arch/arm/src/stm32l4/stm32l4_oneshot.h b/arch/arm/src/stm32l4/stm32l4_oneshot.h
index 475023b..6023db2 100644
--- a/arch/arm/src/stm32l4/stm32l4_oneshot.h
+++ b/arch/arm/src/stm32l4/stm32l4_oneshot.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32L4_ONESHOT_H
-#define __ARCH_ARM_SRC_STM32L4_ONESHOT_H
+#ifndef __ARCH_ARM_SRC_STM32L4_STM32L4_ONESHOT_H
+#define __ARCH_ARM_SRC_STM32L4_STM32L4_ONESHOT_H
/****************************************************************************
* Included Files
@@ -193,4 +193,4 @@ int stm32l4_oneshot_cancel(struct stm32l4_oneshot_s *oneshot,
#endif
#endif /* CONFIG_STM32L4_ONESHOT */
-#endif /* __ARCH_ARM_SRC_STM32L4_ONESHOT_H */
+#endif /* __ARCH_ARM_SRC_STM32L4_STM32L4_ONESHOT_H */
diff --git a/arch/arm/src/stm32l5/hardware/stm32l562xx_rcc.h b/arch/arm/src/stm32l5/hardware/stm32l562xx_rcc.h
index d2dc00d..a7be5ab 100644
--- a/arch/arm/src/stm32l5/hardware/stm32l562xx_rcc.h
+++ b/arch/arm/src/stm32l5/hardware/stm32l562xx_rcc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32L5_HARDWARE_STM32L562xx_RCC_H
-#define __ARCH_ARM_SRC_STM32L5_HARDWARE_STM32L562xx_RCC_H
+#ifndef __ARCH_ARM_SRC_STM32L5_HARDWARE_STM32L562XX_RCC_H
+#define __ARCH_ARM_SRC_STM32L5_HARDWARE_STM32L562XX_RCC_H
/****************************************************************************
* Included Files
diff --git a/arch/arm/src/stm32l5/hardware/stm32l5_memorymap.h b/arch/arm/src/stm32l5/hardware/stm32l5_memorymap.h
index b3db637..3d190e8 100644
--- a/arch/arm/src/stm32l5/hardware/stm32l5_memorymap.h
+++ b/arch/arm/src/stm32l5/hardware/stm32l5_memorymap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_STM32L5_STM32L5_MEMORYMAP_H
-#define __ARCH_ARM_SRC_STM32L5_STM32L5_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_STM32L5_HARDWARE_STM32L5_MEMORYMAP_H
+#define __ARCH_ARM_SRC_STM32L5_HARDWARE_STM32L5_MEMORYMAP_H
/****************************************************************************
* Pre-processor Definitions
@@ -150,4 +150,4 @@
#define STM32L5_OCTOSPI1_BASE 0x44021000
#define STM32L5_FMC_BASE 0x44020000
-#endif /* __ARCH_ARM_SRC_STM32L5_STM32L5_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32L5_HARDWARE_STM32L5_MEMORYMAP_H */
diff --git a/arch/arm/src/tiva/hardware/cc13x0/cc13x0_ioc.h b/arch/arm/src/tiva/hardware/cc13x0/cc13x0_ioc.h
index a410d81..c67a595 100644
--- a/arch/arm/src/tiva/hardware/cc13x0/cc13x0_ioc.h
+++ b/arch/arm/src/tiva/hardware/cc13x0/cc13x0_ioc.h
@@ -39,8 +39,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X20_CC26X2CC13X20_CC26X2IOC_H
-#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X20_CC26X2CC13X20_CC26X2IOC_H
+#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X0_CC13X0_IOC_H
+#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X0_CC13X0_IOC_H
/****************************************************************************
* Included Files
@@ -239,4 +239,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X20_CC26X2CC13X20_CC26X2IOC_H */
+#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X0_CC13X0_IOC_H */
diff --git a/arch/arm/src/tiva/hardware/cc13x0/cc13x0_memorymap.h b/arch/arm/src/tiva/hardware/cc13x0/cc13x0_memorymap.h
index 594fadb..c309ac1 100644
--- a/arch/arm/src/tiva/hardware/cc13x0/cc13x0_memorymap.h
+++ b/arch/arm/src/tiva/hardware/cc13x0/cc13x0_memorymap.h
@@ -39,8 +39,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_C13X0_C13X0_MEMORYMAP_H
-#define __ARCH_ARM_SRC_TIVA_HARDWARE_C13X0_C13X0_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X0_CC13X0_MEMORYMAP_H
+#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X0_CC13X0_MEMORYMAP_H
/****************************************************************************
* Pre-processor Definitions
@@ -159,4 +159,4 @@
#define TIVA_CPU_TIPROP_BASE 0xe00fe000 /* CPU_TIPROP */
#define TIVA_CPU_ROM_TABLE_BASE 0xe00ff000 /* CPU_ROM_TABLE */
-#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_C13X0_C13X0_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X0_CC13X0_MEMORYMAP_H */
diff --git a/arch/arm/src/tiva/hardware/cc13x0/cc13x0_timer.h b/arch/arm/src/tiva/hardware/cc13x0/cc13x0_timer.h
index 7c255d5..ed9d2ab 100644
--- a/arch/arm/src/tiva/hardware/cc13x0/cc13x0_timer.h
+++ b/arch/arm/src/tiva/hardware/cc13x0/cc13x0_timer.h
@@ -39,8 +39,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_TIMER_H
-#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_TIMER_H
+#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X0_CC13X0_TIMER_H
+#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X0_CC13X0_TIMER_H
/****************************************************************************
* Included Files
@@ -70,4 +70,4 @@
* Public Function Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_TIMER_H */
+#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X0_CC13X0_TIMER_H */
diff --git a/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_i2c.h b/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_i2c.h
index 0119abb..225d6ba 100644
--- a/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_i2c.h
+++ b/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_i2c.h
@@ -39,8 +39,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X20_CC26X2_CC13X20_CC26X2_I2C_H
-#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X20_CC26X2_CC13X20_CC26X2_I2C_H
+#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_I2C_H
+#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_I2C_H
/****************************************************************************
* Pre-processor Definitions
@@ -209,4 +209,4 @@
#define I2C_MCR_MFE (1 << 4) /* Bit 4: I2C master function enable */
#define I2C_MCR_SFE (1 << 5) /* Bit 5: I2C slave function enable */
-#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X20_CC26X2_CC13X20_CC26X2_I2C_H */
+#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_I2C_H */
diff --git a/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_ioc.h b/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_ioc.h
index ca9cba3..f139bf1 100644
--- a/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_ioc.h
+++ b/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_ioc.h
@@ -39,8 +39,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X20_CC26X2CC13X20_CC26X2IOC_H
-#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X20_CC26X2CC13X20_CC26X2IOC_H
+#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_IOC_H
+#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_IOC_H
/****************************************************************************
* Included Files
@@ -246,4 +246,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X20_CC26X2CC13X20_CC26X2IOC_H */
+#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_IOC_H */
diff --git a/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_uart.h b/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_uart.h
index 2a74511..66b6883 100644
--- a/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_uart.h
+++ b/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_uart.h
@@ -39,8 +39,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X20_CC26X2_CC13X20_CC26X2_UART_H
-#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X20_CC26X2_CC13X20_CC26X2_UART_H
+#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_UART_H
+#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_UART_H
/****************************************************************************
* Included Files
@@ -273,4 +273,4 @@
* Public Data
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X20_CC26X2_CC13X20_CC26X2_UART_H */
+#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_UART_H */
diff --git a/arch/arm/src/tiva/hardware/lm/lm3s_sysctrl.h b/arch/arm/src/tiva/hardware/lm/lm3s_sysctrl.h
index 07871f4..9a1ef8a 100644
--- a/arch/arm/src/tiva/hardware/lm/lm3s_sysctrl.h
+++ b/arch/arm/src/tiva/hardware/lm/lm3s_sysctrl.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_SYSCONTROL_H
-#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_SYSCONTROL_H
+#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_SYSCTRL_H
+#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_SYSCTRL_H
/****************************************************************************
* Included Files
@@ -494,4 +494,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_SYSCONTROL_H */
+#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM3S_SYSCTRL_H */
diff --git a/arch/arm/src/tiva/hardware/lm/lm4f_sysctrl.h b/arch/arm/src/tiva/hardware/lm/lm4f_sysctrl.h
index e49ea7d..6ae0bb9 100644
--- a/arch/arm/src/tiva/hardware/lm/lm4f_sysctrl.h
+++ b/arch/arm/src/tiva/hardware/lm/lm4f_sysctrl.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM4F_SYSCONTROL_H
-#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM4F_SYSCONTROL_H
+#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM4F_SYSCTRL_H
+#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM4F_SYSCTRL_H
/****************************************************************************
* Included Files
@@ -1522,4 +1522,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM4F_SYSCONTROL_H */
+#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM_LM4F_SYSCTRL_H */
diff --git a/arch/arm/src/tiva/hardware/tiva_sysctrl.h b/arch/arm/src/tiva/hardware/tiva_sysctrl.h
index 534ff13..52bcdfa 100644
--- a/arch/arm/src/tiva/hardware/tiva_sysctrl.h
+++ b/arch/arm/src/tiva/hardware/tiva_sysctrl.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_SYSCONTROL_H
-#define __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_SYSCONTROL_H
+#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_SYSCTRL_H
+#define __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_SYSCTRL_H
/****************************************************************************
* Included Files
@@ -62,4 +62,4 @@
* Public Function Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_SYSCONTROL_H */
+#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TIVA_SYSCTRL_H */
diff --git a/arch/arm/src/tiva/hardware/tm4c/tm4c123_sysctrl.h b/arch/arm/src/tiva/hardware/tm4c/tm4c123_sysctrl.h
index fd78bfa..b251b10 100644
--- a/arch/arm/src/tiva/hardware/tm4c/tm4c123_sysctrl.h
+++ b/arch/arm/src/tiva/hardware/tm4c/tm4c123_sysctrl.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C123_SYSCONTROL_H
-#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C123_SYSCONTROL_H
+#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C123_SYSCTRL_H
+#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C123_SYSCTRL_H
/****************************************************************************
* Included Files
@@ -1859,4 +1859,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C123_SYSCONTROL_H */
+#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C123_SYSCTRL_H */
diff --git a/arch/arm/src/tiva/hardware/tm4c/tm4c123_timer.h b/arch/arm/src/tiva/hardware/tm4c/tm4c123_timer.h
index 4038c08..bb6e12e 100644
--- a/arch/arm/src/tiva/hardware/tm4c/tm4c123_timer.h
+++ b/arch/arm/src/tiva/hardware/tm4c/tm4c123_timer.h
@@ -46,8 +46,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM_TM4C123_TIMER_H
-#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM_TM4C123_TIMER_H
+#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C123_TIMER_H
+#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C123_TIMER_H
/****************************************************************************
* Included Files
@@ -590,4 +590,4 @@
# define TIMER_PP_SIZE_16 (0 << TIMER_PP_SIZE_SHIFT) /* Timer A/B 16 bits with 8-bit prescale */
# define TIMER_PP_SIZE_32 (1 << TIMER_PP_SIZE_SHIFT) /* Timer A/B 32 bits with 16-bit prescale */
-#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM_TM4C123_TIMER_H */
+#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C123_TIMER_H */
diff --git a/arch/arm/src/tiva/hardware/tm4c/tm4c129_sysctrl.h b/arch/arm/src/tiva/hardware/tm4c/tm4c129_sysctrl.h
index 0fe0a13..3f0541d 100644
--- a/arch/arm/src/tiva/hardware/tm4c/tm4c129_sysctrl.h
+++ b/arch/arm/src/tiva/hardware/tm4c/tm4c129_sysctrl.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C129_SYSCONTROL_H
-#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C129_SYSCONTROL_H
+#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C129_SYSCTRL_H
+#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C129_SYSCTRL_H
/****************************************************************************
* Included Files
@@ -2195,4 +2195,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C129_SYSCONTROL_H */
+#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C129_SYSCTRL_H */
diff --git a/arch/arm/src/tiva/hardware/tm4c/tm4c129_timer.h b/arch/arm/src/tiva/hardware/tm4c/tm4c129_timer.h
index 9ae637b..191eb9d 100644
--- a/arch/arm/src/tiva/hardware/tm4c/tm4c129_timer.h
+++ b/arch/arm/src/tiva/hardware/tm4c/tm4c129_timer.h
@@ -46,8 +46,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_LM_TM4C129_TIMER_H
-#define __ARCH_ARM_SRC_TIVA_HARDWARE_LM_TM4C129_TIMER_H
+#ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C129_TIMER_H
+#define __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C129_TIMER_H
/****************************************************************************
* Included Files
@@ -661,4 +661,4 @@
#define TIMER_CC_ALTCLK (1 << 0) /* Bit 0: Alternate Clock Source */
-#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_LM_TM4C129_TIMER_H */
+#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_TM4C_TM4C129_TIMER_H */
diff --git a/arch/arm/src/tiva/lm/lm3s_gpio.h b/arch/arm/src/tiva/lm/lm3s_gpio.h
index aa83bc2..6bda43e 100644
--- a/arch/arm/src/tiva/lm/lm3s_gpio.h
+++ b/arch/arm/src/tiva/lm/lm3s_gpio.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_TIVA_LM_LM3S_H
-#define __ARCH_ARM_SRC_TIVA_LM_LM3S_H
+#ifndef __ARCH_ARM_SRC_TIVA_LM_LM3S_GPIO_H
+#define __ARCH_ARM_SRC_TIVA_LM_LM3S_GPIO_H
/****************************************************************************
* Included Files
@@ -261,4 +261,4 @@ typedef uint32_t pinconfig_t;
uintptr_t tiva_gpiobaseaddress(unsigned int port);
-#endif /* __ARCH_ARM_SRC_TIVA_LM_LM3S_H */
+#endif /* __ARCH_ARM_SRC_TIVA_LM_LM3S_GPIO_H */
diff --git a/arch/arm/src/tiva/lm/lm4f_gpio.h b/arch/arm/src/tiva/lm/lm4f_gpio.h
index 3239cc3..c7a164e 100644
--- a/arch/arm/src/tiva/lm/lm4f_gpio.h
+++ b/arch/arm/src/tiva/lm/lm4f_gpio.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_TIVA_LM_LM4F_H
-#define __ARCH_ARM_SRC_TIVA_LM_LM4F_H
+#ifndef __ARCH_ARM_SRC_TIVA_LM_LM4F_GPIO_H
+#define __ARCH_ARM_SRC_TIVA_LM_LM4F_GPIO_H
/****************************************************************************
* Included Files
@@ -263,4 +263,4 @@ typedef uint32_t pinconfig_t;
uintptr_t tiva_gpiobaseaddress(unsigned int port);
-#endif /* __ARCH_ARM_SRC_TIVA_LM_LM4F_H */
+#endif /* __ARCH_ARM_SRC_TIVA_LM_LM4F_GPIO_H */
diff --git a/arch/arm/src/tiva/tiva_hciuart.h b/arch/arm/src/tiva/tiva_hciuart.h
index c3ac3eb..f41415f 100644
--- a/arch/arm/src/tiva/tiva_hciuart.h
+++ b/arch/arm/src/tiva/tiva_hciuart.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_TIVA_HCIUART_H
-#define __ARCH_ARM_SRC_TIVA_HCIUART_H
+#ifndef __ARCH_ARM_SRC_TIVA_TIVA_HCIUART_H
+#define __ARCH_ARM_SRC_TIVA_TIVA_HCIUART_H
/****************************************************************************
* Included Files
@@ -108,4 +108,4 @@ void hciuart_initialize(void);
void tiva_serial_dma_poll(void);
#endif
-#endif /* __ARCH_ARM_SRC_TIVA_HCIUART_H */
+#endif /* __ARCH_ARM_SRC_TIVA_TIVA_HCIUART_H */
diff --git a/arch/arm/src/tiva/tiva_sysctrl.h b/arch/arm/src/tiva/tiva_sysctrl.h
index c35f7e4..2e2528a 100644
--- a/arch/arm/src/tiva/tiva_sysctrl.h
+++ b/arch/arm/src/tiva/tiva_sysctrl.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_TIVA_TIVA_SYSCONTROL_H
-#define __ARCH_ARM_SRC_TIVA_TIVA_SYSCONTROL_H
+#ifndef __ARCH_ARM_SRC_TIVA_TIVA_SYSCTRL_H
+#define __ARCH_ARM_SRC_TIVA_TIVA_SYSCTRL_H
/****************************************************************************
* Included Files
@@ -134,4 +134,4 @@ void tiva_clock_configure(void);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_TIVA_TIVA_SYSCONTROL_H */
+#endif /* __ARCH_ARM_SRC_TIVA_TIVA_SYSCTRL_H */
diff --git a/arch/avr/include/debug.h b/arch/avr/include/debug.h
index 8ae052d..2e6f6d2 100644
--- a/arch/avr/include/debug.h
+++ b/arch/avr/include/debug.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __INCLUDE_ARCH_AVR_DEBUG_H
-#define __INCLUDE_ARCH_AVR_DEBUG_H
+#ifndef __ARCH_AVR_INCLUDE_DEBUG_H
+#define __ARCH_AVR_INCLUDE_DEBUG_H
/****************************************************************************
* Included Files
@@ -68,4 +68,4 @@
#endif /* CONFIG_AVR_HAS_MEMX_PTR */
-#endif /* __INCLUDE_ARCH_DEBUG_H */
+#endif /* __ARCH_AVR_INCLUDE_DEBUG_H */
diff --git a/arch/avr/src/at90usb/at90usb.h b/arch/avr/src/at90usb/at90usb.h
index 65e6af5..08ce5ac 100644
--- a/arch/avr/src/at90usb/at90usb.h
+++ b/arch/avr/src/at90usb/at90usb.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_AVR_SRC_ATMEGA_ATMEGA_H
-#define __ARCH_AVR_SRC_ATMEGA_ATMEGA_H
+#ifndef __ARCH_AVR_SRC_AT90USB_AT90USB_H
+#define __ARCH_AVR_SRC_AT90USB_AT90USB_H
/****************************************************************************
* Included Files
@@ -193,4 +193,4 @@ void gpio_irqdisable(int irq);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_AVR_SRC_ATMEGA_ATMEGA_H */
+#endif /* __ARCH_AVR_SRC_AT90USB_AT90USB_H */
diff --git a/arch/avr/src/at90usb/at90usb_config.h b/arch/avr/src/at90usb/at90usb_config.h
index db29ae3..5412461 100644
--- a/arch/avr/src/at90usb/at90usb_config.h
+++ b/arch/avr/src/at90usb/at90usb_config.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_AVR_SRC_ATMEGA_ATMEGA_CONFIG_H
-#define __ARCH_AVR_SRC_ATMEGA_ATMEGA_CONFIG_H
+#ifndef __ARCH_AVR_SRC_AT90USB_AT90USB_CONFIG_H
+#define __ARCH_AVR_SRC_AT90USB_AT90USB_CONFIG_H
/****************************************************************************
* Included Files
@@ -92,4 +92,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_AVR_SRC_ATMEGA_ATMEGA_CONFIG_H */
+#endif /* __ARCH_AVR_SRC_AT90USB_AT90USB_CONFIG_H */
diff --git a/arch/avr/src/at90usb/at90usb_memorymap.h b/arch/avr/src/at90usb/at90usb_memorymap.h
index 99a420c..127b885 100644
--- a/arch/avr/src/at90usb/at90usb_memorymap.h
+++ b/arch/avr/src/at90usb/at90usb_memorymap.h
@@ -18,8 +18,8 @@
*
************************************************************************************/
-#ifndef __ARCH_AVR_SRC_ATMEGA_ATMEGA_MEMORYMAP_H
-#define __ARCH_AVR_SRC_ATMEGA_ATMEGA_MEMORYMAP_H
+#ifndef __ARCH_AVR_SRC_AT90USB_AT90USB_MEMORYMAP_H
+#define __ARCH_AVR_SRC_AT90USB_AT90USB_MEMORYMAP_H
/************************************************************************************
* Included Files
@@ -43,4 +43,4 @@
* Public Functions Prototypes
************************************************************************************/
-#endif /* __ARCH_AVR_SRC_ATMEGA_ATMEGA_MEMORYMAP_H */
+#endif /* __ARCH_AVR_SRC_AT90USB_AT90USB_MEMORYMAP_H */
diff --git a/arch/avr/src/at90usb/chip.h b/arch/avr/src/at90usb/chip.h
index 3980878..0ac80a8 100644
--- a/arch/avr/src/at90usb/chip.h
+++ b/arch/avr/src/at90usb/chip.h
@@ -18,8 +18,8 @@
*
************************************************************************************/
-#ifndef __ARCH_AVR_SRC_ATMEGA_CHIP_H
-#define __ARCH_AVR_SRC_ATMEGA_CHIP_H
+#ifndef __ARCH_AVR_SRC_AT90USB_CHIP_H
+#define __ARCH_AVR_SRC_AT90USB_CHIP_H
/************************************************************************************
* Included Files
@@ -27,6 +27,12 @@
#include <nuttx/config.h>
+/* Include only the memory map. Other chip hardware files should then include this
+ * file for the proper setup
+ */
+
+#include "at90usb_memorymap.h"
+
/************************************************************************************
* Pre-processor Definitions
************************************************************************************/
@@ -65,12 +71,6 @@
# error "Unsupported AVR chip"
#endif
-/* Include only the memory map. Other chip hardware files should then include this
- * file for the proper setup
- */
-
-#include "at90usb_memorymap.h"
-
/************************************************************************************
* Public Types
************************************************************************************/
@@ -83,4 +83,4 @@
* Public Functions Prototypes
************************************************************************************/
-#endif /* __ARCH_AVR_SRC_ATMEGA_CHIP_H */
+#endif /* __ARCH_AVR_SRC_AT90USB_CHIP_H */
diff --git a/arch/avr/src/common/up_internal.h b/arch/avr/src/common/up_internal.h
index ec53104..7b0f492 100644
--- a/arch/avr/src/common/up_internal.h
+++ b/arch/avr/src/common/up_internal.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __UP_INTERNAL_H
-#define __UP_INTERNAL_H
+#ifndef __ARCH_AVR_SRC_COMMON_UP_INTERNAL_H
+#define __ARCH_AVR_SRC_COMMON_UP_INTERNAL_H
/****************************************************************************
* Included Files
@@ -164,4 +164,4 @@ void up_usbuninitialize(void);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __UP_INTERNAL_H */
+#endif /* __ARCH_AVR_SRC_COMMON_UP_INTERNAL_H */
diff --git a/arch/ceva/src/common/up_arch.h b/arch/ceva/src/common/up_arch.h
index d904249..d168eab 100644
--- a/arch/ceva/src/common/up_arch.h
+++ b/arch/ceva/src/common/up_arch.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef ___ARCH_CEVA_SRC_COMMON_UP_ARCH_H
-#define ___ARCH_CEVA_SRC_COMMON_UP_ARCH_H
+#ifndef __ARCH_CEVA_SRC_COMMON_UP_ARCH_H
+#define __ARCH_CEVA_SRC_COMMON_UP_ARCH_H
/****************************************************************************
* Included Files
@@ -73,4 +73,4 @@ void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* ___ARCH_CEVA_SRC_COMMON_UP_ARCH_H */
+#endif /* __ARCH_CEVA_SRC_COMMON_UP_ARCH_H */
diff --git a/arch/hc/include/syscall.h b/arch/hc/include/syscall.h
index 2b194b0..bff3f41 100644
--- a/arch/hc/include/syscall.h
+++ b/arch/hc/include/syscall.h
@@ -22,8 +22,8 @@
* through include/syscall.h or include/sys/sycall.h
*/
-#ifndef _ARCH_HC_INCLUDE_SYSCALL_H
-#define _ARCH_HC_INCLUDE_SYSCALL_H
+#ifndef __ARCH_HC_INCLUDE_SYSCALL_H
+#define __ARCH_HC_INCLUDE_SYSCALL_H
/****************************************************************************
* Included Files
@@ -64,4 +64,4 @@ extern "C"
#endif
#endif
-#endif /* _ARCH_HC_INCLUDE_SYSCALL_H */
+#endif /* __ARCH_HC_INCLUDE_SYSCALL_H */
diff --git a/arch/hc/src/common/up_arch.h b/arch/hc/src/common/up_arch.h
index 5863794..37b0f85 100644
--- a/arch/hc/src/common/up_arch.h
+++ b/arch/hc/src/common/up_arch.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef ___ARCH_HC_SRC_COMMON_UP_ARCH_H
-#define ___ARCH_HC_SRC_COMMON_UP_ARCH_H
+#ifndef __ARCH_HC_SRC_COMMON_UP_ARCH_H
+#define __ARCH_HC_SRC_COMMON_UP_ARCH_H
/****************************************************************************
* Included Files
diff --git a/arch/hc/src/common/up_internal.h b/arch/hc/src/common/up_internal.h
index 92f6ab4..3d1f6fd 100644
--- a/arch/hc/src/common/up_internal.h
+++ b/arch/hc/src/common/up_internal.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __UP_INTERNAL_H
-#define __UP_INTERNAL_H
+#ifndef __ARCH_HC_SRC_COMMON_UP_INTERNAL_H
+#define __ARCH_HC_SRC_COMMON_UP_INTERNAL_H
/****************************************************************************
* Included Files
@@ -185,4 +185,4 @@ void up_usbuninitialize(void);
#endif /* __ASSEMBLY__ */
-#endif /* __UP_INTERNAL_H */
+#endif /* __ARCH_HC_SRC_COMMON_UP_INTERNAL_H */
diff --git a/arch/hc/src/m9s12/m9s12_atd.h b/arch/hc/src/m9s12/m9s12_atd.h
index 0e42c2e..116aef3 100644
--- a/arch/hc/src/m9s12/m9s12_atd.h
+++ b/arch/hc/src/m9s12/m9s12_atd.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_ATD_H
-#define __ARCH_ARM_HC_SRC_M9S12_M9S12_ATD_H
+#ifndef __ARCH_HC_SRC_M9S12_M9S12_ATD_H
+#define __ARCH_HC_SRC_M9S12_M9S12_ATD_H
/****************************************************************************
* Included Files
@@ -310,4 +310,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_ATD_H */
+#endif /* __ARCH_HC_SRC_M9S12_M9S12_ATD_H */
diff --git a/arch/hc/src/m9s12/m9s12_crg.h b/arch/hc/src/m9s12/m9s12_crg.h
index 30a5378..e231498 100644
--- a/arch/hc/src/m9s12/m9s12_crg.h
+++ b/arch/hc/src/m9s12/m9s12_crg.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_CRG_H
-#define __ARCH_ARM_HC_SRC_M9S12_M9S12_CRG_H
+#ifndef __ARCH_HC_SRC_M9S12_M9S12_CRG_H
+#define __ARCH_HC_SRC_M9S12_M9S12_CRG_H
/****************************************************************************
* Included Files
@@ -122,4 +122,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_CRG_H */
+#endif /* __ARCH_HC_SRC_M9S12_M9S12_CRG_H */
diff --git a/arch/hc/src/m9s12/m9s12_emac.h b/arch/hc/src/m9s12/m9s12_emac.h
index b2541e4..ed252ee 100644
--- a/arch/hc/src/m9s12/m9s12_emac.h
+++ b/arch/hc/src/m9s12/m9s12_emac.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_EMAC_H
-#define __ARCH_ARM_HC_SRC_M9S12_M9S12_EMAC_H
+#ifndef __ARCH_HC_SRC_M9S12_M9S12_EMAC_H
+#define __ARCH_HC_SRC_M9S12_M9S12_EMAC_H
/****************************************************************************
* Included Files
@@ -238,4 +238,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_EMAC_H */
+#endif /* __ARCH_HC_SRC_M9S12_M9S12_EMAC_H */
diff --git a/arch/hc/src/m9s12/m9s12_flash.h b/arch/hc/src/m9s12/m9s12_flash.h
index 7a84abc..d878810 100644
--- a/arch/hc/src/m9s12/m9s12_flash.h
+++ b/arch/hc/src/m9s12/m9s12_flash.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_FLASH_H
-#define __ARCH_ARM_HC_SRC_M9S12_M9S12_FLASH_H
+#ifndef __ARCH_HC_SRC_M9S12_M9S12_FLASH_H
+#define __ARCH_HC_SRC_M9S12_M9S12_FLASH_H
/****************************************************************************
* Included Files
@@ -91,7 +91,7 @@
/* Interrupts */
-# define HCS12_UVECTOR_BASE 0xf780 /* 0xf780�0xf7fe: User vector base */
+# define HCS12_UVECTOR_BASE 0xf780 /* 0xf780-0xf7fe: User vector base */
#endif
/* FLASH interface */
@@ -104,7 +104,7 @@
/* Interrupts */
-#define HCS12_VECTOR_BASE 0xff80 /* 0xff80�0xfffe: Actual vector base */
+#define HCS12_VECTOR_BASE 0xff80 /* 0xff80-0xfffe: Actual vector base */
/* Register Offsets *********************************************************/
@@ -191,4 +191,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_FLASH_H */
+#endif /* __ARCH_HC_SRC_M9S12_M9S12_FLASH_H */
diff --git a/arch/hc/src/m9s12/m9s12_iic.h b/arch/hc/src/m9s12/m9s12_iic.h
index 1688fcc..08394f9 100644
--- a/arch/hc/src/m9s12/m9s12_iic.h
+++ b/arch/hc/src/m9s12/m9s12_iic.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_M9S124_M9S124_IIC_H
-#define __ARCH_ARM_HC_SRC_M9S124_M9S124_IIC_H
+#ifndef __ARCH_HC_SRC_M9S12_M9S12_IIC_H
+#define __ARCH_HC_SRC_M9S12_M9S12_IIC_H
/****************************************************************************
* Included Files
@@ -60,9 +60,9 @@
#define IIC_IBCR_IBSWAI (1 << 0) /* Bit 0: I Bus Interface Stop in Wait Mode */
#define IIC_IBCR_RSTA (1 << 2) /* Bit 2: Repeat Start */
-#define IIC_IBCR_TXAK (1 << 3) /* Bit 3: Transmit Acknowledge Enable� */
+#define IIC_IBCR_TXAK (1 << 3) /* Bit 3: Transmit Acknowledge Enable */
#define IIC_IBCR_TX (1 << 4) /* Bit 4: Transmit/Receive Mode Select Bit */
-#define IIC_IBCR_MSSL (1 << 5) /* Bit 5: Master/Slave Mode Select Bit� */
+#define IIC_IBCR_MSSL (1 << 5) /* Bit 5: Master/Slave Mode Select Bit */
#define IIC_IBCR_IBIE (1 << 6) /* Bit 6: I-Bus Interrupt Enable */
#define IIC_IBCR_IBEN (1 << 7) /* Bit 7: I-Bus Enable */
@@ -90,4 +90,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_M9S124_M9S124_IIC_H */
+#endif /* __ARCH_HC_SRC_M9S12_M9S12_IIC_H */
diff --git a/arch/hc/src/m9s12/m9s12_int.h b/arch/hc/src/m9s12/m9s12_int.h
index af65691..96da8de 100644
--- a/arch/hc/src/m9s12/m9s12_int.h
+++ b/arch/hc/src/m9s12/m9s12_int.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_INT_H
-#define __ARCH_ARM_HC_SRC_M9S12_M9S12_INT_H
+#ifndef __ARCH_HC_SRC_M9S12_M9S12_INT_H
+#define __ARCH_HC_SRC_M9S12_M9S12_INT_H
/****************************************************************************
* Included Files
@@ -87,4 +87,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_INT_H */
+#endif /* __ARCH_HC_SRC_M9S12_M9S12_INT_H */
diff --git a/arch/hc/src/m9s12/m9s12_mebi.h b/arch/hc/src/m9s12/m9s12_mebi.h
index 141455a..4752ca0 100644
--- a/arch/hc/src/m9s12/m9s12_mebi.h
+++ b/arch/hc/src/m9s12/m9s12_mebi.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_MEBI_H
-#define __ARCH_ARM_HC_SRC_M9S12_M9S12_MEBI_H
+#ifndef __ARCH_HC_SRC_M9S12_M9S12_MEBI_H
+#define __ARCH_HC_SRC_M9S12_M9S12_MEBI_H
/****************************************************************************
* Included Files
@@ -156,4 +156,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_MEBI_H */
+#endif /* __ARCH_HC_SRC_M9S12_M9S12_MEBI_H */
diff --git a/arch/hc/src/m9s12/m9s12_mmc.h b/arch/hc/src/m9s12/m9s12_mmc.h
index ddef25b..46eb78f 100644
--- a/arch/hc/src/m9s12/m9s12_mmc.h
+++ b/arch/hc/src/m9s12/m9s12_mmc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_MMC_H
-#define __ARCH_ARM_HC_SRC_M9S12_M9S12_MMC_H
+#ifndef __ARCH_HC_SRC_M9S12_M9S12_MMC_H
+#define __ARCH_HC_SRC_M9S12_M9S12_MMC_H
/****************************************************************************
* Included Files
@@ -136,7 +136,7 @@
/* Program Page Index Register Bit-Field Definitions */
-#define MMC_PPAGE_PIX_SHIFT (0) /* Bits 0-5 Program Page Index Bits 5�0 */
+#define MMC_PPAGE_PIX_SHIFT (0) /* Bits 0-5 Program Page Index Bits */
#define MMC_PPAGE_PIX_MASK (0x3f << MMC_PPAGE_PIX_SHIFT)
/****************************************************************************
@@ -151,4 +151,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_MMC_H */
+#endif /* __ARCH_HC_SRC_M9S12_M9S12_MMC_H */
diff --git a/arch/hc/src/m9s12/m9s12_phy.h b/arch/hc/src/m9s12/m9s12_phy.h
index 28cdd6e..9f43b92 100644
--- a/arch/hc/src/m9s12/m9s12_phy.h
+++ b/arch/hc/src/m9s12/m9s12_phy.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_PHY_H
-#define __ARCH_ARM_HC_SRC_M9S12_M9S12_PHY_H
+#ifndef __ARCH_HC_SRC_M9S12_M9S12_PHY_H
+#define __ARCH_HC_SRC_M9S12_M9S12_PHY_H
/****************************************************************************
* Included Files
@@ -79,4 +79,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_PHY_H */
+#endif /* __ARCH_HC_SRC_M9S12_M9S12_PHY_H */
diff --git a/arch/hc/src/m9s12/m9s12_pim.h b/arch/hc/src/m9s12/m9s12_pim.h
index 6858298..7fab31d 100644
--- a/arch/hc/src/m9s12/m9s12_pim.h
+++ b/arch/hc/src/m9s12/m9s12_pim.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_PIM_H
-#define __ARCH_ARM_HC_SRC_M9S12_M9S12_PIM_H
+#ifndef __ARCH_HC_SRC_M9S12_M9S12_PIM_H
+#define __ARCH_HC_SRC_M9S12_M9S12_PIM_H
/****************************************************************************
* Included Files
@@ -232,4 +232,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_PIM_H */
+#endif /* __ARCH_HC_SRC_M9S12_M9S12_PIM_H */
diff --git a/arch/hc/src/m9s12/m9s12_sci.h b/arch/hc/src/m9s12/m9s12_sci.h
index 4e59b82..b1046f9 100644
--- a/arch/hc/src/m9s12/m9s12_sci.h
+++ b/arch/hc/src/m9s12/m9s12_sci.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_SCI_H
-#define __ARCH_ARM_HC_SRC_M9S12_M9S12_SCI_H
+#ifndef __ARCH_HC_SRC_M9S12_M9S12_SCI_H
+#define __ARCH_HC_SRC_M9S12_M9S12_SCI_H
/****************************************************************************
* Included Files
@@ -142,4 +142,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_SCI_H */
+#endif /* __ARCH_HC_SRC_M9S12_M9S12_SCI_H */
diff --git a/arch/hc/src/m9s12/m9s12_serial.h b/arch/hc/src/m9s12/m9s12_serial.h
index efdc8aa..3642817 100644
--- a/arch/hc/src/m9s12/m9s12_serial.h
+++ b/arch/hc/src/m9s12/m9s12_serial.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_HC_SRC_M9S12_CHIP_H
-#define __ARCH_HC_SRC_M9S12_CHIP_H
+#ifndef __ARCH_HC_SRC_M9S12_M9S12_SERIAL_H
+#define __ARCH_HC_SRC_M9S12_M9S12_SERIAL_H
/****************************************************************************
* Included Files
@@ -119,4 +119,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_HC_SRC_M9S12_CHIP_H */
+#endif /* __ARCH_HC_SRC_M9S12_M9S12_SERIAL_H */
diff --git a/arch/hc/src/m9s12/m9s12_spi.h b/arch/hc/src/m9s12/m9s12_spi.h
index dc6d76c..c123fa8 100644
--- a/arch/hc/src/m9s12/m9s12_spi.h
+++ b/arch/hc/src/m9s12/m9s12_spi.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_SPI_H
-#define __ARCH_ARM_HC_SRC_M9S12_M9S12_SPI_H
+#ifndef __ARCH_HC_SRC_M9S12_M9S12_SPI_H
+#define __ARCH_HC_SRC_M9S12_M9S12_SPI_H
/****************************************************************************
* Included Files
@@ -97,4 +97,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_SPI_H */
+#endif /* __ARCH_HC_SRC_M9S12_M9S12_SPI_H */
diff --git a/arch/hc/src/m9s12/m9s12_tim.h b/arch/hc/src/m9s12/m9s12_tim.h
index f879886..b3aca32 100644
--- a/arch/hc/src/m9s12/m9s12_tim.h
+++ b/arch/hc/src/m9s12/m9s12_tim.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_TIM_H
-#define __ARCH_ARM_HC_SRC_M9S12_M9S12_TIM_H
+#ifndef __ARCH_HC_SRC_M9S12_M9S12_TIM_H
+#define __ARCH_HC_SRC_M9S12_M9S12_TIM_H
/****************************************************************************
* Included Files
@@ -243,4 +243,4 @@
* Public Functions Prototypes
****************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_TIM_H */
+#endif /* __ARCH_HC_SRC_M9S12_M9S12_TIM_H */
diff --git a/arch/mips/src/common/mips_arch.h b/arch/mips/src/common/mips_arch.h
index 9f89f29..cf5ff0b 100644
--- a/arch/mips/src/common/mips_arch.h
+++ b/arch/mips/src/common/mips_arch.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef ___ARCH_MIPS_SRC_COMMON_UP_ARCH_H
-#define ___ARCH_MIPS_SRC_COMMON_UP_ARCH_H
+#ifndef ___ARCH_MIPS_SRC_COMMON_MIPS_ARCH_H
+#define ___ARCH_MIPS_SRC_COMMON_MIPS_ARCH_H
/****************************************************************************
* Included Files
@@ -72,4 +72,4 @@ void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* ___ARCH_MIPS_SRC_COMMON_UP_ARCH_H */
+#endif /* ___ARCH_MIPS_SRC_COMMON_MIPS_ARCH_H */
diff --git a/arch/mips/src/common/mips_internal.h b/arch/mips/src/common/mips_internal.h
index 62ec824..1de1319 100644
--- a/arch/mips/src/common/mips_internal.h
+++ b/arch/mips/src/common/mips_internal.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_MIPS_SRC_COMMON_UP_INTERNAL_H
-#define __ARCH_MIPS_SRC_COMMON_UP_INTERNAL_H
+#ifndef __ARCH_MIPS_SRC_COMMON_MIPS_INTERNAL_H
+#define __ARCH_MIPS_SRC_COMMON_MIPS_INTERNAL_H
/****************************************************************************
* Included Files
@@ -260,4 +260,4 @@ void up_usbuninitialize(void);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_MIPS_SRC_COMMON_UP_INTERNAL_H */
+#endif /* __ARCH_MIPS_SRC_COMMON_MIPS_INTERNAL_H */
diff --git a/arch/mips/src/mips32/mips_vfork.h b/arch/mips/src/mips32/mips_vfork.h
index fb57722..b099d4a 100644
--- a/arch/mips/src/mips32/mips_vfork.h
+++ b/arch/mips/src/mips32/mips_vfork.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_MIPS_SRC_MIPS32_VFORK_H
-#define __ARCH_MIPS_SRC_MIPS32_VFORK_H
+#ifndef __ARCH_MIPS_SRC_MIPS32_MIPS_VFORK_H
+#define __ARCH_MIPS_SRC_MIPS32_MIPS_VFORK_H
/****************************************************************************
* Included Files
@@ -115,4 +115,4 @@ struct vfork_s
};
#endif
-#endif /* __ARCH_MIPS_SRC_MIPS32_VFORK_H */
+#endif /* __ARCH_MIPS_SRC_MIPS32_MIPS_VFORK_H */
diff --git a/arch/mips/src/pic32mx/pic32mx_config.h b/arch/mips/src/pic32mx/pic32mx_config.h
index 7489ca5..397ec23 100644
--- a/arch/mips/src/pic32mx/pic32mx_config.h
+++ b/arch/mips/src/pic32mx/pic32mx_config.h
@@ -18,8 +18,8 @@
*
************************************************************************************/
-#ifndef __ARCH_MIPS_SRC_PIC32MX_PIC32MX_PIC32_H
-#define __ARCH_MIPS_SRC_PIC32MX_PIC32MX_PIC32_H
+#ifndef __ARCH_MIPS_SRC_PIC32MX_PIC32MX_CONFIG_H
+#define __ARCH_MIPS_SRC_PIC32MX_PIC32MX_CONFIG_H
/************************************************************************************
* Included Files
@@ -908,4 +908,4 @@
* Public Functions Prototypes
************************************************************************************/
-#endif /* __ARCH_MIPS_SRC_PIC32MX_PIC32MX_PIC32_H */
+#endif /* __ARCH_MIPS_SRC_PIC32MX_PIC32MX_CONFIG_H */
diff --git a/arch/mips/src/pic32mz/hardware/pic32mz_int.h b/arch/mips/src/pic32mz/hardware/pic32mz_int.h
index 414f8cf..961d1a6 100644
--- a/arch/mips/src/pic32mz/hardware/pic32mz_int.h
+++ b/arch/mips/src/pic32mz/hardware/pic32mz_int.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_INT_H
-#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_INT_H
+#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_INT_H
+#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_INT_H
/****************************************************************************
* Included Files
@@ -1248,4 +1248,4 @@ extern "C"
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_INT_H */
+#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_INT_H */
diff --git a/arch/mips/src/pic32mz/hardware/pic32mz_uart.h b/arch/mips/src/pic32mz/hardware/pic32mz_uart.h
index 24ed800..1ead8ff 100644
--- a/arch/mips/src/pic32mz/hardware/pic32mz_uart.h
+++ b/arch/mips/src/pic32mz/hardware/pic32mz_uart.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_UART_H
-#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_UART_H
+#ifndef __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_UART_H
+#define __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_UART_H
/****************************************************************************
* Included Files
@@ -280,4 +280,4 @@ extern "C"
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_UART_H */
+#endif /* __ARCH_MIPS_SRC_PIC32MZ_HARDWARE_PIC32MZ_UART_H */
diff --git a/arch/mips/src/pic32mz/pic32mz_excptmacros.h b/arch/mips/src/pic32mz/pic32mz_excptmacros.h
index e60f089..8647f3d 100644
--- a/arch/mips/src/pic32mz/pic32mz_excptmacros.h
+++ b/arch/mips/src/pic32mz/pic32mz_excptmacros.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_MIPS_SRC_PIC32MZ_EXCPTMACROS_H
-#define __ARCH_MIPS_SRC_PIC32MZ_EXCPTMACROS_H
+#ifndef __ARCH_MIPS_SRC_PIC32MZ_PIC32MZ_EXCPTMACROS_H
+#define __ARCH_MIPS_SRC_PIC32MZ_PIC32MZ_EXCPTMACROS_H
/****************************************************************************
* Included Files
@@ -443,4 +443,4 @@
.endm
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_MIPS_SRC_PIC32MZ_EXCPTMACROS_H */
+#endif /* __ARCH_MIPS_SRC_PIC32MZ_PIC32MZ_EXCPTMACROS_H */
diff --git a/arch/misoc/include/minerva/csrdefs.h b/arch/misoc/include/minerva/csrdefs.h
index ef7b460..1e0767a 100644
--- a/arch/misoc/include/minerva/csrdefs.h
+++ b/arch/misoc/include/minerva/csrdefs.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __RISCV_CSR_DEFS__
-#define __RISCV_CSR_DEFS__
+#ifndef __ARCH_MISOC_INCLUDE_MINERVA_CSRDEFS_H
+#define __ARCH_MISOC_INCLUDE_MINERVA_CSRDEFS_H
/****************************************************************************
* Pre-processor Definitions
@@ -62,4 +62,4 @@
#define CSR_MSTATUS_TSR (1 << 22)
#define CSR_MSTATUS_SD (1 << 31)
-#endif
+#endif /* __ARCH_MISOC_INCLUDE_MINERVA_CSRDEFS_H */
diff --git a/arch/misoc/src/common/hw/ethmac_mem.h b/arch/misoc/src/common/hw/ethmac_mem.h
index cf9ed87..1dd8a1a 100644
--- a/arch/misoc/src/common/hw/ethmac_mem.h
+++ b/arch/misoc/src/common/hw/ethmac_mem.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_MISOC_SRC_COMMON_HW_EMAC_MEM_H
-#define __ARCH_MISOC_SRC_COMMON_HW_EMAC_MEM_H
+#ifndef __ARCH_MISOC_SRC_COMMON_HW_ETHMAC_MEM_H
+#define __ARCH_MISOC_SRC_COMMON_HW_ETHMAC_MEM_H
/****************************************************************************
* Included Files
@@ -36,4 +36,4 @@
#define ETHMAC_TX0_BASE (ETHMAC_BASE+0x1000)
#define ETHMAC_TX1_BASE (ETHMAC_BASE+0x1800)
-#endif /* __ARCH_MISOC_SRC_COMMON_HW_EMAC_MEM_H */
+#endif /* __ARCH_MISOC_SRC_COMMON_HW_ETHMAC_MEM_H */
diff --git a/arch/renesas/include/m16c/inttypes.h b/arch/renesas/include/m16c/inttypes.h
index f1a3bf6..60ae36d 100644
--- a/arch/renesas/include/m16c/inttypes.h
+++ b/arch/renesas/include/m16c/inttypes.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_AVR_INCLUDE_M16C_INTTYPES_H
-#define __ARCH_AVR_INCLUDE_M16C_INTTYPES_H
+#ifndef __ARCH_RENESAS_INCLUDE_M16C_INTTYPES_H
+#define __ARCH_RENESAS_INCLUDE_M16C_INTTYPES_H
/****************************************************************************
* Included Files
@@ -116,4 +116,4 @@
#define UINT32_C(x) x ## ul
#define UINT64_C(x) x ## ull
-#endif /* __ARCH_AVR_INCLUDE_M16C_INTTYPES_H */
+#endif /* __ARCH_RENESAS_INCLUDE_M16C_INTTYPES_H */
diff --git a/arch/renesas/include/m16c/types.h b/arch/renesas/include/m16c/types.h
index b2aecc9..3b2f720 100644
--- a/arch/renesas/include/m16c/types.h
+++ b/arch/renesas/include/m16c/types.h
@@ -18,7 +18,7 @@
*
****************************************************************************/
-/* This file should never be included directly but, rather, only indirectly\
+/* This file should never be included directly but, rather, only indirectly
* through sys/types.h
*/
diff --git a/arch/renesas/include/rx65n/iodefine.h b/arch/renesas/include/rx65n/iodefine.h
index 4777223..aa6717a 100644
--- a/arch/renesas/include/rx65n/iodefine.h
+++ b/arch/renesas/include/rx65n/iodefine.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __RX65NIODEFINE_HEADER__
-#define __RX65NIODEFINE_HEADER__
+#ifndef __ARCH_RENESAS_INCLUDE_RX65N_IODEFINE_H
+#define __ARCH_RENESAS_INCLUDE_RX65N_IODEFINE_H
/****************************************************************************
* Pre-processor Definitions
@@ -38098,5 +38098,4 @@ typedef struct st_s12ad1
#pragma pack()
#endif /* __ASSEMBLER__ */
-#endif
-
+#endif /* __ARCH_RENESAS_INCLUDE_RX65N_IODEFINE_H */
diff --git a/arch/renesas/include/rx65n/types.h b/arch/renesas/include/rx65n/types.h
index eba12b3..d71395d 100644
--- a/arch/renesas/include/rx65n/types.h
+++ b/arch/renesas/include/rx65n/types.h
@@ -18,7 +18,7 @@
*
****************************************************************************/
-/* This file should never be included directly but, rather, only indirectly\
+/* This file should never be included directly but, rather, only indirectly
* through sys/types.h
*/
diff --git a/arch/renesas/include/sh1/inttypes.h b/arch/renesas/include/sh1/inttypes.h
index ffdc9bd..2d1def6 100644
--- a/arch/renesas/include/sh1/inttypes.h
+++ b/arch/renesas/include/sh1/inttypes.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_AVR_INCLUDE_SH1_INTTYPES_H
-#define __ARCH_AVR_INCLUDE_SH1_INTTYPES_H
+#ifndef __ARCH_RENESAS_INCLUDE_SH1_INTTYPES_H
+#define __ARCH_RENESAS_INCLUDE_SH1_INTTYPES_H
/****************************************************************************
* Included Files
@@ -116,4 +116,4 @@
#define UINT32_C(x) x ## u
#define UINT64_C(x) x ## ull
-#endif /* __ARCH_AVR_INCLUDE_SH1_INTTYPES_H */
+#endif /* __ARCH_RENESAS_INCLUDE_SH1_INTTYPES_H */
diff --git a/arch/renesas/include/sh1/types.h b/arch/renesas/include/sh1/types.h
index b25503f..36c2f2b 100644
--- a/arch/renesas/include/sh1/types.h
+++ b/arch/renesas/include/sh1/types.h
@@ -18,7 +18,7 @@
*
****************************************************************************/
-/* This file should never be included directly but, rather, only indirectly\
+/* This file should never be included directly but, rather, only indirectly
* through sys/types.h
*/
diff --git a/arch/renesas/include/sh1Plimits.h b/arch/renesas/include/sh1Plimits.h
index 52cbede..6bdbbc0 100644
--- a/arch/renesas/include/sh1Plimits.h
+++ b/arch/renesas/include/sh1Plimits.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RENESAS_INCLUDE_SH1_LIMITS_H
-#define __ARCH_RENESAS_INCLUDE_SH1_LIMITS_H
+#ifndef __ARCH_RENESAS_INCLUDE_SH1_PLIMITS_H
+#define __ARCH_RENESAS_INCLUDE_SH1_PLIMITS_H
/****************************************************************************
* Included Files
@@ -70,4 +70,4 @@
#define PTR_MAX 2147483647
#define UPTR_MAX 4294967295U
-#endif /* __ARCH_RENESAS_INCLUDE_SH1_LIMITS_H */
+#endif /* __ARCH_RENESAS_INCLUDE_SH1_PLIMITS_H */
diff --git a/arch/renesas/include/sh1Ptypes.h b/arch/renesas/include/sh1Ptypes.h
index 2bb0760..c792376 100644
--- a/arch/renesas/include/sh1Ptypes.h
+++ b/arch/renesas/include/sh1Ptypes.h
@@ -22,8 +22,8 @@
* through sys/types.h
*/
-#ifndef __ARCH_RENESAS_INCLUDE_SH1_TYPES_H
-#define __ARCH_RENESAS_INCLUDE_SH1_TYPES_H
+#ifndef __ARCH_RENESAS_INCLUDE_SH1_PTYPES_H
+#define __ARCH_RENESAS_INCLUDE_SH1_PTYPES_H
/****************************************************************************
* Included Files
@@ -73,4 +73,4 @@ typedef unsigned long irqstate_t;
* Public Function Prototypes
****************************************************************************/
-#endif /* __ARCH_RENESAS_INCLUDE_SH1_TYPES_H */
+#endif /* __ARCH_RENESAS_INCLUDE_SH1_PTYPES_H */
diff --git a/arch/renesas/src/rx65n/chip.h b/arch/renesas/src/rx65n/chip.h
index fd34dcc..c61386a 100644
--- a/arch/renesas/src/rx65n/chip.h
+++ b/arch/renesas/src/rx65n/chip.h
@@ -50,4 +50,4 @@ extern uint16_t ebss;
#endif
#endif
-#endif /* __ARCH_RENESAS_SRC_SH1_CHIP_H */
+#endif /* __ARCH_RENESAS_SRC_RX65N_CHIP_H */
diff --git a/arch/renesas/src/rx65n/rx65n_cgc.h b/arch/renesas/src/rx65n/rx65n_cgc.h
index f5b1269..1b073a4 100644
--- a/arch/renesas/src/rx65n/rx65n_cgc.h
+++ b/arch/renesas/src/rx65n/rx65n_cgc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RENESAS_SRC_RX65N_CGC_H
-#define __ARCH_RENESAS_SRC_RX65N_CGC_H
+#ifndef __ARCH_RENESAS_SRC_RX65N_RX65N_CGC_H
+#define __ARCH_RENESAS_SRC_RX65N_RX65N_CGC_H
/****************************************************************************
* Pre-processor Definitions
@@ -281,4 +281,4 @@
void r_cgc_create(void);
-#endif
+#endif /* __ARCH_RENESAS_SRC_RX65N_RX65N_CGC_H */
diff --git a/arch/renesas/src/rx65n/rx65n_cmt.h b/arch/renesas/src/rx65n/rx65n_cmt.h
index b2acae0..3ac4fe7 100644
--- a/arch/renesas/src/rx65n/rx65n_cmt.h
+++ b/arch/renesas/src/rx65n/rx65n_cmt.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RENESAS_SRC_RX65N_CMT_H
-#define __ARCH_RENESAS_SRC_RX65N_CMT_H
+#ifndef __ARCH_RENESAS_SRC_RX65N_RX65N_CMT_H
+#define __ARCH_RENESAS_SRC_RX65N_RX65N_CMT_H
/****************************************************************************
* Pre-processor Definitions
@@ -48,4 +48,4 @@
#define _0E_CMT_PRIORITY_LEVEL14 (0x0eU) /* Level 14 */
#define _0F_CMT_PRIORITY_LEVEL15 (0x0fU) /* Level 15 (highest) */
-#endif /* __ARCH_RENESAS_SRC_RX65N_CMT_H */
+#endif /* __ARCH_RENESAS_SRC_RX65N_RX65N_CMT_H */
diff --git a/arch/renesas/src/rx65n/rx65n_cmtw.h b/arch/renesas/src/rx65n/rx65n_cmtw.h
index 27f0e79..837c898 100644
--- a/arch/renesas/src/rx65n/rx65n_cmtw.h
+++ b/arch/renesas/src/rx65n/rx65n_cmtw.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RENESAS_SRC_RX65N_CMTW_H
-#define __ARCH_RENESAS_SRC_RX65N_CMTW_H
+#ifndef __ARCH_RENESAS_SRC_RX65N_RX65N_CMTW_H
+#define __ARCH_RENESAS_SRC_RX65N_RX65N_CMTW_H
/****************************************************************************
* Pre-processor Definitions
@@ -241,4 +241,4 @@
#define _0E_CMTW_PRIORITY_LEVEL14 (0x0eU) /* Level 14 */
#define _0F_CMTW_PRIORITY_LEVEL15 (0x0fU) /* Level 15 (highest) */
-#endif /* __ARCH_RENESAS_SRC_RX65N_CMTW_H */
+#endif /* __ARCH_RENESAS_SRC_RX65N_RX65N_CMTW_H */
diff --git a/arch/renesas/src/rx65n/rx65n_cmtw0.h b/arch/renesas/src/rx65n/rx65n_cmtw0.h
index 3de41ed..0ae0cd0 100644
--- a/arch/renesas/src/rx65n/rx65n_cmtw0.h
+++ b/arch/renesas/src/rx65n/rx65n_cmtw0.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RENESAS_SRC_RX65N_CMTW0_H
-#define __ARCH_RENESAS_SRC_RX65N_CMTW0_H
+#ifndef __ARCH_RENESAS_SRC_RX65N_RX65N_CMTW0_H
+#define __ARCH_RENESAS_SRC_RX65N_RX65N_CMTW0_H
/****************************************************************************
* Included Files
@@ -95,4 +95,4 @@ void rx65n_cmtw0_start(uint8_t type, uint32_t timeout);
void rx65n_cmtw0_stop(uint8_t type);
-#endif /* __ARCH_RENESAS_SRC_RX65N_CMTW0_H */
+#endif /* __ARCH_RENESAS_SRC_RX65N_RX65N_CMTW0_H */
diff --git a/arch/renesas/src/rx65n/rx65n_dtc.h b/arch/renesas/src/rx65n/rx65n_dtc.h
index 9609a15..64682b6 100644
--- a/arch/renesas/src/rx65n/rx65n_dtc.h
+++ b/arch/renesas/src/rx65n/rx65n_dtc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RENESAS_SRC_RX65N_DTC_H
-#define __ARCH_RENESAS_SRC_RX65N_DTC_H
+#ifndef __ARCH_RENESAS_SRC_RX65N_RX65N_DTC_H
+#define __ARCH_RENESAS_SRC_RX65N_RX65N_DTC_H
/****************************************************************************
* Included Files
@@ -512,4 +512,4 @@ void rx65n_dtc_stop(DTC_HANDLE handle);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RENESAS_SRC_RX65N_DTC_H */
+#endif /* __ARCH_RENESAS_SRC_RX65N_RX65N_DTC_H */
diff --git a/arch/renesas/src/rx65n/rx65n_macrodriver.h b/arch/renesas/src/rx65n/rx65n_macrodriver.h
index 72d84a8..fbfac12 100644
--- a/arch/renesas/src/rx65n/rx65n_macrodriver.h
+++ b/arch/renesas/src/rx65n/rx65n_macrodriver.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RENESAS_SRC_RX65N_STATUS_H
-#define __ARCH_RENESAS_SRC_RX65N_STATUS_H
+#ifndef __ARCH_RENESAS_SRC_RX65N_RX65N_MACRODRIVER_H
+#define __ARCH_RENESAS_SRC_RX65N_RX65N_MACRODRIVER_H
/****************************************************************************
* Included Files
@@ -82,4 +82,4 @@
#define __TYPEDEF__
#endif
-#endif /* __ARCH_RENESAS_SRC_RX65N_STATUS_H */
+#endif /* __ARCH_RENESAS_SRC_RX65N_RX65N_MACRODRIVER_H */
diff --git a/arch/renesas/src/rx65n/rx65n_port.h b/arch/renesas/src/rx65n/rx65n_port.h
index b49c4be..e0dc46a 100644
--- a/arch/renesas/src/rx65n/rx65n_port.h
+++ b/arch/renesas/src/rx65n/rx65n_port.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RENESAS_SRC_RX65N_PORT_H
-#define __ARCH_RENESAS_SRC_RX65N_PORT_H
+#ifndef __ARCH_RENESAS_SRC_RX65N_RX65N_PORT_H
+#define __ARCH_RENESAS_SRC_RX65N_RX65N_PORT_H
/****************************************************************************
* Pre-processor Definitions
@@ -304,4 +304,4 @@ void r_port_create(void);
void r_ether_port_configuration(void);
#endif
-#endif /* __ARCH_RENESAS_SRC_RX65N_PORT_H */
+#endif /* __ARCH_RENESAS_SRC_RX65N_RX65N_PORT_H */
diff --git a/arch/renesas/src/rx65n/rx65n_rtc.h b/arch/renesas/src/rx65n/rx65n_rtc.h
index 0d63546..85507a5 100644
--- a/arch/renesas/src/rx65n/rx65n_rtc.h
+++ b/arch/renesas/src/rx65n/rx65n_rtc.h
@@ -22,8 +22,8 @@
* Included Files
****************************************************************************/
-#ifndef __ARCH_RENESAS_SRC_RX65N_RTC_H
-#define __ARCH_RENESAS_SRC_RX65N_RTC_H
+#ifndef __ARCH_RENESAS_SRC_RX65N_RX65N_RTC_H
+#define __ARCH_RENESAS_SRC_RX65N_RX65N_RTC_H
#include <nuttx/config.h>
@@ -243,4 +243,4 @@ FAR struct rtc_lowerhalf_s *rx65n_rtc_lowerhalf(void);
}
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RENESAS_SRC_RX65N_RTC_H */
+#endif /* __ARCH_RENESAS_SRC_RX65N_RX65N_RTC_H */
diff --git a/arch/renesas/src/rx65n/rx65n_sbram.h b/arch/renesas/src/rx65n/rx65n_sbram.h
index f1487ee..e4d400c 100644
--- a/arch/renesas/src/rx65n/rx65n_sbram.h
+++ b/arch/renesas/src/rx65n/rx65n_sbram.h
@@ -142,4 +142,4 @@ int rx65n_sbram_savepanic(int fileno, uint8_t *context, int length);
}
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_RX65N_RX65N_SBRAM_H */
+#endif /* __ARCH_RENESAS_SRC_RX65N_RX65N_SBSRAM_H */
diff --git a/arch/renesas/src/rx65n/rx65n_sci.h b/arch/renesas/src/rx65n/rx65n_sci.h
index e6a0dc5..a2f780d 100644
--- a/arch/renesas/src/rx65n/rx65n_sci.h
+++ b/arch/renesas/src/rx65n/rx65n_sci.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RENESAS_SRC_RX65N_SCI_H
-#define __ARCH_RENESAS_SRC_RX65N_SCI_H
+#ifndef __ARCH_RENESAS_SRC_RX65N_RX65N_SCI_H
+#define __ARCH_RENESAS_SRC_RX65N_RX65N_SCI_H
/****************************************************************************
* Pre-processor Definitions
@@ -1380,4 +1380,4 @@ void r_sci12_start(void);
void r_sci12_stop(void);
-#endif /* __ARCH_RENESAS_SRC_RX65N_SCI_H */
+#endif /* __ARCH_RENESAS_SRC_RX65N_RX65N_SCI_H */
diff --git a/arch/renesas/src/rx65n/rx65n_usbdev.h b/arch/renesas/src/rx65n/rx65n_usbdev.h
index 485108c..a72dad7 100644
--- a/arch/renesas/src/rx65n/rx65n_usbdev.h
+++ b/arch/renesas/src/rx65n/rx65n_usbdev.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RENESAS_SRC_RX65N_USBDEV_H
-#define __ARCH_RENESAS_SRC_RX65N_USBDEV_H
+#ifndef __ARCH_RENESAS_SRC_RX65N_RX65N_USBDEV_H
+#define __ARCH_RENESAS_SRC_RX65N_RX65N_USBDEV_H
/****************************************************************************
* Included Files
@@ -91,4 +91,4 @@ extern "C"
#endif
#endif /* __ASSEMBLY__ */
-#endif /* #if defined(CONFIG_USBHOST) && defined(RX65N_NUSBHOST) > 0 */
+#endif /* __ARCH_RENESAS_SRC_RX65N_RX65N_USBDEV_H */
diff --git a/arch/renesas/src/rx65n/rx65n_usbhost.h b/arch/renesas/src/rx65n/rx65n_usbhost.h
index ef93882..15c6025 100644
--- a/arch/renesas/src/rx65n/rx65n_usbhost.h
+++ b/arch/renesas/src/rx65n/rx65n_usbhost.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RENESAS_SRC_RX65N_USBHOST_H
-#define __ARCH_RENESAS_SRC_RX65N_USBHOST_H
+#ifndef __ARCH_RENESAS_SRC_RX65N_RX65N_USBHOST_H
+#define __ARCH_RENESAS_SRC_RX65N_RX65N_USBHOST_H
/****************************************************************************
* Included Files
@@ -245,4 +245,4 @@ FAR struct usbhost_connection_s *rx65n_usbhost_initialize(int controller);
#endif /* __ASSEMBLY__ */
#endif /* #if defined(CONFIG_USBHOST) && defined(RX65N_NUSBHOST) > 0 */
-#endif /* __ARCH_RENESAS_SRC_RX65N_USBHOST_H */
+#endif /* __ARCH_RENESAS_SRC_RX65N_RX65N_USBHOST_H */
diff --git a/arch/renesas/src/sh1/sh1_703x.h b/arch/renesas/src/sh1/sh1_703x.h
index cb15c0b..457a476 100644
--- a/arch/renesas/src/sh1/sh1_703x.h
+++ b/arch/renesas/src/sh1/sh1_703x.h
@@ -18,8 +18,8 @@
*
************************************************************************************/
-#ifndef __ARCH_RENESAS_SRC_SH1_703X_H
-#define __ARCH_RENESAS_SRC_SH1_703X_H
+#ifndef __ARCH_RENESAS_SRC_SH1_SH1_703X_H
+#define __ARCH_RENESAS_SRC_SH1_SH1_703X_H
/************************************************************************************
* Included Files
@@ -444,4 +444,4 @@
* Public Functions Prototypes
************************************************************************************/
-#endif /* __ARCH_RENESAS_SRC_SH1_703X_H */
+#endif /* __ARCH_RENESAS_SRC_SH1_SH1_703X_H */
diff --git a/arch/risc-v/src/bl602/bl602_boot2.h b/arch/risc-v/src/bl602/bl602_boot2.h
index c76791f..7b344cf 100644
--- a/arch/risc-v/src/bl602/bl602_boot2.h
+++ b/arch/risc-v/src/bl602/bl602_boot2.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_BL602_HARDWARE_BL602_BOOT2_H
-#define __ARCH_RISCV_SRC_BL602_HARDWARE_BL602_BOOT2_H
+#ifndef __ARCH_RISCV_SRC_BL602_BL602_BOOT2_H
+#define __ARCH_RISCV_SRC_BL602_BL602_BOOT2_H
/****************************************************************************
* Included Files
@@ -103,4 +103,4 @@ struct boot2_partition_table_s
};
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_BL602_HARDWARE_BL602_BOOT2_H */
+#endif /* __ARCH_RISCV_SRC_BL602_BL602_BOOT2_H */
diff --git a/arch/risc-v/src/bl602/bl602_lowputc.h b/arch/risc-v/src/bl602/bl602_lowputc.h
index ce96029..16e662b 100644
--- a/arch/risc-v/src/bl602/bl602_lowputc.h
+++ b/arch/risc-v/src/bl602/bl602_lowputc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_BL602_LOWPUTC_H
-#define __ARCH_RISCV_SRC_BL602_LOWPUTC_H
+#ifndef __ARCH_RISCV_SRC_BL602_BL602_LOWPUTC_H
+#define __ARCH_RISCV_SRC_BL602_BL602_LOWPUTC_H
/****************************************************************************
* Included Files
@@ -65,4 +65,4 @@ EXTERN void bl602_uart_configure(const struct uart_config_s *config);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_BL602_LOWPUTC_H */
+#endif /* __ARCH_RISCV_SRC_BL602_BL602_LOWPUTC_H */
diff --git a/arch/risc-v/src/bl602/bl602_netdev.h b/arch/risc-v/src/bl602/bl602_netdev.h
index 933c34e..b037835 100644
--- a/arch/risc-v/src/bl602/bl602_netdev.h
+++ b/arch/risc-v/src/bl602/bl602_netdev.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef _BL602_NETDEV_H__
-#define _BL602_NETDEV_H__
+#ifndef __ARCH_RISCV_SRC_BL602_BL602_NETDEV_H
+#define __ARCH_RISCV_SRC_BL602_BL602_NETDEV_H
/****************************************************************************
* Included Files
@@ -132,4 +132,4 @@ void bl602_net_event(int evt, int val);
#endif
#endif /* __INCLUDE_ASSERT_H */
-#endif /* _BL602_NETDEV_H__ */
+#endif /* __ARCH_RISCV_SRC_BL602_BL602_NETDEV_H */
diff --git a/arch/risc-v/src/bl602/bl602_os_hal.h b/arch/risc-v/src/bl602/bl602_os_hal.h
index 876b0d2..5e63a2a 100644
--- a/arch/risc-v/src/bl602/bl602_os_hal.h
+++ b/arch/risc-v/src/bl602/bl602_os_hal.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_BL602_OS_HAL_H
-#define __ARCH_RISCV_SRC_BL602_OS_HAL_H
+#ifndef __ARCH_RISCV_SRC_BL602_BL602_OS_HAL_H
+#define __ARCH_RISCV_SRC_BL602_BL602_OS_HAL_H
/****************************************************************************
* Included Files
@@ -183,4 +183,4 @@ void bl_os_log_write(uint32_t level,
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_BL602_OS_HAL_H*/
+#endif /* __ARCH_RISCV_SRC_BL602_BL602_OS_HAL_H */
diff --git a/arch/risc-v/src/bl602/bl602_romapi.h b/arch/risc-v/src/bl602/bl602_romapi.h
index c2696e3..f9c1701 100644
--- a/arch/risc-v/src/bl602/bl602_romapi.h
+++ b/arch/risc-v/src/bl602/bl602_romapi.h
@@ -43,4 +43,4 @@
#define BL602_ROMAPI_SFLASH_WRITE_WITHLOCK BL602_ROMAPI_FUNC(171)
#define BL602_ROMAPI_SFLASH_EREASE_WITHLOCK BL602_ROMAPI_FUNC(172)
-#endif
+#endif /* __ARCH_RISCV_SRC_BL602_BL602_ROMAPI_H */
diff --git a/arch/risc-v/src/bl602/bl602_rtc.h b/arch/risc-v/src/bl602/bl602_rtc.h
index 86a5ca0..642be23 100644
--- a/arch/risc-v/src/bl602/bl602_rtc.h
+++ b/arch/risc-v/src/bl602/bl602_rtc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_BL602_RTC_LOWERHALF_H
-#define __ARCH_RISCV_SRC_BL602_RTC_LOWERHALF_H
+#ifndef __ARCH_RISCV_SRC_BL602_BL602_RTC_H
+#define __ARCH_RISCV_SRC_BL602_BL602_RTC_H
/****************************************************************************
* Included Files
@@ -167,4 +167,4 @@ void bl602_hbn_get_rtc_timer_val(uint32_t *val_low, uint32_t *val_high);
struct rtc_lowerhalf_s *bl602_rtc_lowerhalf_initialize(void);
-#endif /* __ARCH_RISCV_SRC_BL602_RTC_LOWERHALF_H */
+#endif /* __ARCH_RISCV_SRC_BL602_BL602_RTC_H */
diff --git a/arch/risc-v/src/bl602/bl602_tim_lowerhalf.h b/arch/risc-v/src/bl602/bl602_tim_lowerhalf.h
index d120168..6a6c476 100644
--- a/arch/risc-v/src/bl602/bl602_tim_lowerhalf.h
+++ b/arch/risc-v/src/bl602/bl602_tim_lowerhalf.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_BL602_TIM_LOWERHALF_H
-#define __ARCH_RISCV_SRC_BL602_TIM_LOWERHALF_H
+#ifndef __ARCH_RISCV_SRC_BL602_BL602_TIM_LOWERHALF_H
+#define __ARCH_RISCV_SRC_BL602_BL602_TIM_LOWERHALF_H
/****************************************************************************
* Included Files
@@ -40,4 +40,4 @@
int bl602_timer_initialize(const char *devpath, int timer);
-#endif /* __ARCH_RISCV_SRC_BL602_TIM_LOWERHALF_H */
+#endif /* __ARCH_RISCV_SRC_BL602_BL602_TIM_LOWERHALF_H */
diff --git a/arch/risc-v/src/bl602/chip.h b/arch/risc-v/src/bl602/chip.h
index a41f736..4af6554 100644
--- a/arch/risc-v/src/bl602/chip.h
+++ b/arch/risc-v/src/bl602/chip.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_INCLUDE_BL602_CHIP_H
-#define __ARCH_RISCV_INCLUDE_BL602_CHIP_H
+#ifndef __ARCH_RISCV_SRC_BL602_CHIP_H
+#define __ARCH_RISCV_SRC_BL602_CHIP_H
/****************************************************************************
* Included Files
@@ -32,4 +32,4 @@
#include <arch/irq.h>
-#endif /* __ARCH_RISCV_INCLUDE_BL602_CHIP_H */
+#endif /* __ARCH_RISCV_SRC_BL602_CHIP_H */
diff --git a/arch/risc-v/src/bl602/hardware/bl602_aon.h b/arch/risc-v/src/bl602/hardware/bl602_aon.h
index 81990e3..33308d2 100644
--- a/arch/risc-v/src/bl602/hardware/bl602_aon.h
+++ b/arch/risc-v/src/bl602/hardware/bl602_aon.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_BL602_HARDWARE_AON_SEC_H
-#define __ARCH_RISCV_SRC_BL602_HARDWARE_AON_SEC_H
+#ifndef __ARCH_RISCV_SRC_BL602_HARDWARE_BL602_AON_H
+#define __ARCH_RISCV_SRC_BL602_HARDWARE_BL602_AON_H
/****************************************************************************
* Included Files
@@ -384,4 +384,4 @@
#define GPADC_REG_DEFINE_GPADC_OS_CAL_DATA_MASK (0xffff)
-#endif /* __ARCH_RISCV_SRC_BL602_HARDWARE_AON_SEC_H */
+#endif /* __ARCH_RISCV_SRC_BL602_HARDWARE_BL602_AON_H */
diff --git a/arch/risc-v/src/c906/c906_memorymap.h b/arch/risc-v/src/c906/c906_memorymap.h
index b51cf38..32ae6b6 100644
--- a/arch/risc-v/src/c906/c906_memorymap.h
+++ b/arch/risc-v/src/c906/c906_memorymap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef _ARCH_RISCV_SRC_C906_C906_MEMORYMAP_H
-#define _ARCH_RISCV_SRC_C906_C906_MEMORYMAP_H
+#ifndef __ARCH_RISCV_SRC_C906_C906_MEMORYMAP_H
+#define __ARCH_RISCV_SRC_C906_C906_MEMORYMAP_H
/****************************************************************************
* Included Files
@@ -47,4 +47,4 @@ extern uintptr_t *_default_stack_limit;
#define C906_IDLESTACK0_TOP (C906_IDLESTACK_BASE + CONFIG_IDLETHREAD_STACKSIZE)
#define C906_IDLESTACK_TOP (C906_IDLESTACK0_TOP)
-#endif /* _ARCH_RISCV_SRC_C906_C906_MEMORYMAP_H */
+#endif /* __ARCH_RISCV_SRC_C906_C906_MEMORYMAP_H */
diff --git a/arch/risc-v/src/common/riscv_arch.h b/arch/risc-v/src/common/riscv_arch.h
index 2c5c8eb..a591f9e 100644
--- a/arch/risc-v/src/common/riscv_arch.h
+++ b/arch/risc-v/src/common/riscv_arch.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef ___ARCH_RISCV_SRC_COMMON_UP_ARCH_H
-#define ___ARCH_RISCV_SRC_COMMON_UP_ARCH_H
+#ifndef ___ARCH_RISCV_SRC_COMMON_RISCV_ARCH_H
+#define ___ARCH_RISCV_SRC_COMMON_RISCV_ARCH_H
/****************************************************************************
* Included Files
@@ -72,4 +72,4 @@ void modifyreg32(uintptr_t addr, uint32_t clearbits, uint32_t setbits);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* ___ARCH_ARM_SRC_COMMON_UP_ARCH_H */
+#endif /* ___ARCH_RISCV_SRC_COMMON_RISCV_ARCH_H */
diff --git a/arch/risc-v/src/common/riscv_internal.h b/arch/risc-v/src/common/riscv_internal.h
index 97bf8a1..1e69f5b 100644
--- a/arch/risc-v/src/common/riscv_internal.h
+++ b/arch/risc-v/src/common/riscv_internal.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_COMMON_UP_INTERNAL_H
-#define __ARCH_RISCV_SRC_COMMON_UP_INTERNAL_H
+#ifndef __ARCH_RISCV_SRC_COMMON_RISCV_INTERNAL_H
+#define __ARCH_RISCV_SRC_COMMON_RISCV_INTERNAL_H
/****************************************************************************
* Included Files
@@ -225,4 +225,4 @@ void riscv_stack_color(void *stackbase, size_t nbytes);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_COMMON_UP_INTERNAL_H */
+#endif /* __ARCH_RISCV_SRC_COMMON_RISCV_INTERNAL_H */
diff --git a/arch/risc-v/src/common/riscv_vfork.h b/arch/risc-v/src/common/riscv_vfork.h
index 4230191..cf07984 100644
--- a/arch/risc-v/src/common/riscv_vfork.h
+++ b/arch/risc-v/src/common/riscv_vfork.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/risc-v/src/rv32im/riscv_vfork.h
+ * arch/risc-v/src/common/riscv_vfork.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_RVIM32_VFORK_H
-#define __ARCH_RISCV_SRC_RVIM32_VFORK_H
+#ifndef __ARCH_RISCV_SRC_COMMON_RISCV_VFORK_H
+#define __ARCH_RISCV_SRC_COMMON_RISCV_VFORK_H
/****************************************************************************
* Included Files
@@ -116,4 +116,4 @@ struct vfork_s
};
#endif
-#endif /* __ARCH_RISCVRC_RVIM32_VFORK_H */
+#endif /* __ARCH_RISCV_SRC_COMMON_RISCV_VFORK_H */
diff --git a/arch/risc-v/src/common/svcall.h b/arch/risc-v/src/common/svcall.h
index 555cc3f..9562999 100644
--- a/arch/risc-v/src/common/svcall.h
+++ b/arch/risc-v/src/common/svcall.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/risc-v/src/rv64gc/svcall.h
+ * arch/risc-v/src/common/svcall.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_RV64GC_SVCALL_H
-#define __ARCH_RISCV_SRC_RV64GC_SVCALL_H
+#ifndef __ARCH_RISCV_SRC_COMMON_SVCALL_H
+#define __ARCH_RISCV_SRC_COMMON_SVCALL_H
/****************************************************************************
* Included Files
@@ -135,4 +135,4 @@
#endif /* !CONFIG_BUILD_FLAT */
#endif /* CONFIG_LIB_SYSCALL */
-#endif /* __ARCH_RISCV_SRC_RV64GC_SVCALL_H */
+#endif /* __ARCH_RISCV_SRC_COMMON_SVCALL_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_freerun.h b/arch/risc-v/src/esp32c3/esp32c3_freerun.h
index be2d27c..d984214 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_freerun.h
+++ b/arch/risc-v/src/esp32c3/esp32c3_freerun.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_ESP32C3_FREERUN_H
-#define __ARCH_RISCV_SRC_ESP32C3_FREERUN_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_ESP32C3_FREERUN_H
+#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_FREERUN_H
/****************************************************************************
* Included Files
@@ -142,4 +142,4 @@ int esp32c3_freerun_uninitialize(struct esp32c3_freerun_s *freerun);
#endif
#endif /* CONFIG_ESP32C3_FREERUN */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_FREERUN_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_FREERUN_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_memorymap.h b/arch/risc-v/src/esp32c3/esp32c3_memorymap.h
index e1b3183..1323d96 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_memorymap.h
+++ b/arch/risc-v/src/esp32c3/esp32c3_memorymap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef _ARCH_RISCV_SRC_ESP32C3_ESP32C3_MEMORYMAP_H
-#define _ARCH_RISCV_SRC_ESP32C3_ESP32C3_MEMORYMAP_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_ESP32C3_MEMORYMAP_H
+#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_MEMORYMAP_H
/****************************************************************************
* Included Files
@@ -39,4 +39,4 @@
#define ESP32C3_IDLESTACK_TOP (ESP32C3_IDLESTACK_BASE + CONFIG_IDLETHREAD_STACKSIZE)
-#endif /* _ARCH_RISCV_SRC_ESP32C3_ESP32C3_MEMORYMAP_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_MEMORYMAP_H */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_wifi_utils.h b/arch/risc-v/src/esp32c3/esp32c3_wifi_utils.h
index 8408aee..8c4f2c0 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wifi_utils.h
+++ b/arch/risc-v/src/esp32c3/esp32c3_wifi_utils.h
@@ -22,8 +22,8 @@
* Included Files
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_ESP32C3_ESP32C3_UTILS_H
-#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_UTILS_H
+#ifndef __ARCH_RISCV_SRC_ESP32C3_ESP32C3_WIFI_UTILS_H
+#define __ARCH_RISCV_SRC_ESP32C3_ESP32C3_WIFI_UTILS_H
#include <nuttx/config.h>
#include <nuttx/net/netdev.h>
@@ -117,4 +117,4 @@ int esp_wifi_scan_init(void);
#undef EXTERN
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_UTILS_H */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_ESP32C3_WIFI_UTILS_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/apb_ctrl_reg.h b/arch/risc-v/src/esp32c3/hardware/apb_ctrl_reg.h
index 808a957..88549e0 100644
--- a/arch/risc-v/src/esp32c3/hardware/apb_ctrl_reg.h
+++ b/arch/risc-v/src/esp32c3/hardware/apb_ctrl_reg.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_APB_CTRL_REG_H_
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_APB_CTRL_REG_H_
+#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_APB_CTRL_REG_H
+#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_APB_CTRL_REG_H
/****************************************************************************
* Included Files
@@ -79,4 +79,4 @@
#define APB_CTRL_RETENTION_LINK_ADDR_V 0x7FFFFFF
#define APB_CTRL_RETENTION_LINK_ADDR_S 0
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_APB_CTRL_REG_H_ */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_APB_CTRL_REG_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/bb_reg.h b/arch/risc-v/src/esp32c3/hardware/bb_reg.h
index 262814e..d74bc01 100644
--- a/arch/risc-v/src/esp32c3/hardware/bb_reg.h
+++ b/arch/risc-v/src/esp32c3/hardware/bb_reg.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_BB_REG_H_
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_BB_REG_H_
+#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_BB_REG_H
+#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_BB_REG_H
/****************************************************************************
* Included Files
@@ -46,4 +46,4 @@
#define BB_DC_EST_FORCE_PU_V 1
#define BB_DC_EST_FORCE_PU_S 1
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_BB_REG_H_ */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_BB_REG_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/esp32c3_cache_memory.h b/arch/risc-v/src/esp32c3/hardware/esp32c3_cache_memory.h
index cf3e0aa..1a6e529 100644
--- a/arch/risc-v/src/esp32c3/hardware/esp32c3_cache_memory.h
+++ b/arch/risc-v/src/esp32c3/hardware/esp32c3_cache_memory.h
@@ -15,8 +15,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_CACHE_MEMORY_H_
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_CACHE_MEMORY_H_
+#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_CACHE_MEMORY_H
+#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_CACHE_MEMORY_H
/****************************************************************************
* Included Files
@@ -107,4 +107,4 @@
#define CACHE_MEMORY_IBANK0_ADDR 0x4037c000
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_CACHE_MEMORY_H_ */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_ESP32C3_CACHE_MEMORY_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/extmem_reg.h b/arch/risc-v/src/esp32c3/hardware/extmem_reg.h
index 3706b3a..07d112a 100644
--- a/arch/risc-v/src/esp32c3/hardware/extmem_reg.h
+++ b/arch/risc-v/src/esp32c3/hardware/extmem_reg.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_EXTMEM_REG_H_
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_EXTMEM_REG_H_
+#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_EXTMEM_REG_H
+#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_EXTMEM_REG_H
/****************************************************************************
* Included Files
@@ -87,4 +87,4 @@
#define EXTMEM_ICACHE_TAG_MEM_FORCE_ON_V 0x1
#define EXTMEM_ICACHE_TAG_MEM_FORCE_ON_S 0
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_EXTMEM_REG_H_ */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_EXTMEM_REG_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/fe_reg.h b/arch/risc-v/src/esp32c3/hardware/fe_reg.h
index 97e6049..f65c300 100644
--- a/arch/risc-v/src/esp32c3/hardware/fe_reg.h
+++ b/arch/risc-v/src/esp32c3/hardware/fe_reg.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_FE_REG_H_
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_FE_REG_H_
+#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_FE_REG_H
+#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_FE_REG_H
/****************************************************************************
* Included Files
@@ -47,4 +47,4 @@
#define FE2_TX_INF_FORCE_PU_V 1
#define FE2_TX_INF_FORCE_PU_S 10
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_FE_REG_H_ */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_FE_REG_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/nrx_reg.h b/arch/risc-v/src/esp32c3/hardware/nrx_reg.h
index 68a55cc..e0fa091 100644
--- a/arch/risc-v/src/esp32c3/hardware/nrx_reg.h
+++ b/arch/risc-v/src/esp32c3/hardware/nrx_reg.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_NRX_REG_H_
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_NRX_REG_H_
+#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_NRX_REG_H
+#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_NRX_REG_H
/****************************************************************************
* Included Files
@@ -49,4 +49,4 @@
#define NRX_DEMAP_FORCE_PU_V 1
#define NRX_DEMAP_FORCE_PU_S 1
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_NRX_REG_H_ */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_NRX_REG_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/regi2c_bbpll.h b/arch/risc-v/src/esp32c3/hardware/regi2c_bbpll.h
index 375dc1a..cd36f26 100644
--- a/arch/risc-v/src/esp32c3/hardware/regi2c_bbpll.h
+++ b/arch/risc-v/src/esp32c3/hardware/regi2c_bbpll.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_BBPLL_H_
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_BBPLL_H_
+#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_BBPLL_H
+#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_BBPLL_H
/****************************************************************************
* Pre-processor Definitions
@@ -72,4 +72,4 @@
#define I2C_BBPLL_OC_DIV_7_0_MSB 7
#define I2C_BBPLL_OC_DIV_7_0_LSB 0
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_BBPLL_H_ */
\ No newline at end of file
+#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_BBPLL_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/regi2c_brownout.h b/arch/risc-v/src/esp32c3/hardware/regi2c_brownout.h
index fef4feb..c5a832d 100644
--- a/arch/risc-v/src/esp32c3/hardware/regi2c_brownout.h
+++ b/arch/risc-v/src/esp32c3/hardware/regi2c_brownout.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_BROWNOUT_H_
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_BROWNOUT_H_
+#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_BROWNOUT_H
+#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_BROWNOUT_H
#define I2C_BOD 0x61
#define I2C_BOD_HOSTID 0
@@ -28,4 +28,4 @@
#define I2C_BOD_THRESHOLD_MSB 2
#define I2C_BOD_THRESHOLD_LSB 0
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_BROWNOUT_H_ */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_BROWNOUT_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/regi2c_ctrl.h b/arch/risc-v/src/esp32c3/hardware/regi2c_ctrl.h
index 24807b3..785ac47 100644
--- a/arch/risc-v/src/esp32c3/hardware/regi2c_ctrl.h
+++ b/arch/risc-v/src/esp32c3/hardware/regi2c_ctrl.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_CTRL_H_
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_CTRL_H_
+#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_CTRL_H
+#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_CTRL_H
/****************************************************************************
* Included Files
@@ -66,4 +66,4 @@ extern void rom_i2c_writereg_mask(uint8_t block, uint8_t host_id,
#define REGI2C_READ(block, reg_add) \
rom_i2c_readreg(block, block##_HOSTID, reg_add)
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_CTRL_H_ */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_CTRL_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/regi2c_dig_reg.h b/arch/risc-v/src/esp32c3/hardware/regi2c_dig_reg.h
index 027f425..1ced099 100644
--- a/arch/risc-v/src/esp32c3/hardware/regi2c_dig_reg.h
+++ b/arch/risc-v/src/esp32c3/hardware/regi2c_dig_reg.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_DIG_REG_H_
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_DIG_REG_H_
+#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_DIG_REG_H
+#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_DIG_REG_H
/****************************************************************************
* Pre-processor Definitions
@@ -56,4 +56,4 @@
#define I2C_DIG_REG_XPD_DIG_REG_MSB 3
#define I2C_DIG_REG_XPD_DIG_REG_LSB 3
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_DIG_REG_H_ */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_DIG_REG_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/regi2c_lp_bias.h b/arch/risc-v/src/esp32c3/hardware/regi2c_lp_bias.h
index 623a9b1..b0f16d1 100644
--- a/arch/risc-v/src/esp32c3/hardware/regi2c_lp_bias.h
+++ b/arch/risc-v/src/esp32c3/hardware/regi2c_lp_bias.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_LP_BIAS_H_
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_LP_BIAS_H_
+#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_LP_BIAS_H
+#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_LP_BIAS_H
/****************************************************************************
* Pre-processor Definitions
@@ -57,4 +57,4 @@
#define I2C_ULP_EXT_CODE_MSB 7
#define I2C_ULP_EXT_CODE_LSB 0
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_LP_BIAS_H_ */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_LP_BIAS_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/regi2c_saradc.h b/arch/risc-v/src/esp32c3/hardware/regi2c_saradc.h
index 6447c39..943c822 100644
--- a/arch/risc-v/src/esp32c3/hardware/regi2c_saradc.h
+++ b/arch/risc-v/src/esp32c3/hardware/regi2c_saradc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_SARADC_H_
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_SARADC_H_
+#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_SARADC_H
+#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_SARADC_H
/****************************************************************************
* Pre-processor Definitions
@@ -49,4 +49,4 @@
#define I2C_ADC1_DEF_MSB (0x6)
#define I2C_ADC1_DEF_LSB (0x4)
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_SARADC_H_ */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_REGI2C_SARADC_H */
diff --git a/arch/risc-v/src/esp32c3/hardware/spi_mem_reg.h b/arch/risc-v/src/esp32c3/hardware/spi_mem_reg.h
index 0e479a6..fe402b4 100644
--- a/arch/risc-v/src/esp32c3/hardware/spi_mem_reg.h
+++ b/arch/risc-v/src/esp32c3/hardware/spi_mem_reg.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_SPI_MEM_REG_H_
-#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_SPI_MEM_REG_H_
+#ifndef __ARCH_RISCV_SRC_ESP32C3_HARDWARE_SPI_MEM_REG_H
+#define __ARCH_RISCV_SRC_ESP32C3_HARDWARE_SPI_MEM_REG_H
/****************************************************************************
* Included Files
@@ -43,4 +43,4 @@
#define SPI_MEM_CLK_EN_V 0x1
#define SPI_MEM_CLK_EN_S 0
-#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_SPI_MEM_REG_H_ */
+#endif /* __ARCH_RISCV_SRC_ESP32C3_HARDWARE_SPI_MEM_REG_H */
diff --git a/arch/risc-v/src/fe310/fe310_memorymap.h b/arch/risc-v/src/fe310/fe310_memorymap.h
index 31792f1..f45863b 100644
--- a/arch/risc-v/src/fe310/fe310_memorymap.h
+++ b/arch/risc-v/src/fe310/fe310_memorymap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef _ARCH_RISCV_SRC_FE310_FE310_MEMORYMAP_H
-#define _ARCH_RISCV_SRC_FE310_FE310_MEMORYMAP_H
+#ifndef __ARCH_RISCV_SRC_FE310_FE310_MEMORYMAP_H
+#define __ARCH_RISCV_SRC_FE310_FE310_MEMORYMAP_H
/****************************************************************************
* Included Files
@@ -47,4 +47,4 @@ extern uintptr_t *_default_stack_limit;
#define FE310_IDLESTACK_TOP (FE310_IDLESTACK_BASE + CONFIG_IDLETHREAD_STACKSIZE)
-#endif /* _ARCH_RISCV_SRC_FE310_FE310_MEMORYMAP_H */
+#endif /* __ARCH_RISCV_SRC_FE310_FE310_MEMORYMAP_H */
diff --git a/arch/risc-v/src/k210/k210_memorymap.h b/arch/risc-v/src/k210/k210_memorymap.h
index 4b7c3ec..6ff0867 100644
--- a/arch/risc-v/src/k210/k210_memorymap.h
+++ b/arch/risc-v/src/k210/k210_memorymap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef _ARCH_RISCV_SRC_K210_K210_MEMORYMAP_H
-#define _ARCH_RISCV_SRC_K210_K210_MEMORYMAP_H
+#ifndef __ARCH_RISCV_SRC_K210_K210_MEMORYMAP_H
+#define __ARCH_RISCV_SRC_K210_K210_MEMORYMAP_H
/****************************************************************************
* Included Files
@@ -56,4 +56,4 @@ extern uintptr_t *_default_stack_limit;
#define K210_HEAP_START (K210_IDLESTACK0_TOP)
#endif
-#endif /* _ARCH_RISCV_SRC_K210_K210_MEMORYMAP_H */
+#endif /* __ARCH_RISCV_SRC_K210_K210_MEMORYMAP_H */
diff --git a/arch/risc-v/src/litex/litex_memorymap.h b/arch/risc-v/src/litex/litex_memorymap.h
index d2512af..3abd2f8 100644
--- a/arch/risc-v/src/litex/litex_memorymap.h
+++ b/arch/risc-v/src/litex/litex_memorymap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef _ARCH_RISCV_SRC_LITEX_LITEX_MEMORYMAP_H
-#define _ARCH_RISCV_SRC_LITEX_LITEX_MEMORYMAP_H
+#ifndef __ARCH_RISCV_SRC_LITEX_LITEX_MEMORYMAP_H
+#define __ARCH_RISCV_SRC_LITEX_LITEX_MEMORYMAP_H
/****************************************************************************
* Included Files
@@ -44,4 +44,4 @@
#define LITEX_IDLESTACK_TOP (LITEX_IDLESTACK_BASE + CONFIG_IDLETHREAD_STACKSIZE)
-#endif /* _ARCH_RISCV_SRC_LITEX_LITEX_MEMORYMAP_H */
+#endif /* __ARCH_RISCV_SRC_LITEX_LITEX_MEMORYMAP_H */
diff --git a/arch/risc-v/src/mpfs/hardware/mpfs250t_484_pinmap.h b/arch/risc-v/src/mpfs/hardware/mpfs250t_484_pinmap.h
index 5353e5f..23d0103 100644
--- a/arch/risc-v/src/mpfs/hardware/mpfs250t_484_pinmap.h
+++ b/arch/risc-v/src/mpfs/hardware/mpfs250t_484_pinmap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_MPFS_HARDWARE_MPFS250T_PINMAP_H
-#define __ARCH_RISCV_SRC_MPFS_HARDWARE_MPFS250T_PINMAP_H
+#ifndef __ARCH_RISCV_SRC_MPFS_HARDWARE_MPFS250T_484_PINMAP_H
+#define __ARCH_RISCV_SRC_MPFS_HARDWARE_MPFS250T_484_PINMAP_H
/****************************************************************************
* Included Files
@@ -132,4 +132,4 @@
#endif
-#endif /* __ARCH_RISCV_SRC_MPFS_HARDWARE_MPFS250T_PINMAP_H */
+#endif /* __ARCH_RISCV_SRC_MPFS_HARDWARE_MPFS250T_484_PINMAP_H */
diff --git a/arch/risc-v/src/mpfs/mpfs_i2c.h b/arch/risc-v/src/mpfs/mpfs_i2c.h
index 3761acb..01a5b2d 100755
--- a/arch/risc-v/src/mpfs/mpfs_i2c.h
+++ b/arch/risc-v/src/mpfs/mpfs_i2c.h
@@ -22,8 +22,8 @@
* Included Files
****************************************************************************/
-#ifndef __ARCH_RISCV_SRC_MPFS_I2C_H
-#define __ARCH_RISCV_SRC_MPFS_I2C_H
+#ifndef __ARCH_RISCV_SRC_MPFS_MPFS_I2C_H
+#define __ARCH_RISCV_SRC_MPFS_MPFS_I2C_H
/****************************************************************************
* Included Files
@@ -90,4 +90,4 @@ int mpfs_i2cbus_uninitialize(struct i2c_master_s *dev);
#undef EXTERN
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_RISCV_SRC_MPFS_I2C_H */
+#endif /* __ARCH_RISCV_SRC_MPFS_MPFS_I2C_H */
diff --git a/arch/risc-v/src/mpfs/mpfs_memorymap.h b/arch/risc-v/src/mpfs/mpfs_memorymap.h
index df7e28e..17037f1 100755
--- a/arch/risc-v/src/mpfs/mpfs_memorymap.h
+++ b/arch/risc-v/src/mpfs/mpfs_memorymap.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef _ARCH_RISCV_SRC_MPFS_MPFS_MEMORYMAP_H
-#define _ARCH_RISCV_SRC_MPFS_MPFS_MEMORYMAP_H
+#ifndef __ARCH_RISCV_SRC_MPFS_MPFS_MEMORYMAP_H
+#define __ARCH_RISCV_SRC_MPFS_MPFS_MEMORYMAP_H
/****************************************************************************
* Included Files
@@ -50,4 +50,4 @@ extern uintptr_t *_default_stack_limit;
#define MPFS_IDLESTACK_TOP (MPFS_IDLESTACK0_TOP)
-#endif /* _ARCH_RISCV_SRC_MPFS_MPFS_MEMORYMAP_H */
+#endif /* __ARCH_RISCV_SRC_MPFS_MPFS_MEMORYMAP_H */
diff --git a/arch/risc-v/src/rv32m1/rv32m1_uart.h b/arch/risc-v/src/rv32m1/rv32m1_uart.h
index f82e218..793f6f8 100644
--- a/arch/risc-v/src/rv32m1/rv32m1_uart.h
+++ b/arch/risc-v/src/rv32m1/rv32m1_uart.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef _ARCH_RISCV_SRC_RV32M1_RV32M1_UART_H
-#define _ARCH_RISCV_SRC_RV32M1_RV32M1_UART_H
+#ifndef __ARCH_RISCV_SRC_RV32M1_RV32M1_UART_H
+#define __ARCH_RISCV_SRC_RV32M1_RV32M1_UART_H
/****************************************************************************
* Included Files
@@ -102,4 +102,4 @@ EXTERN void rv32m1_console_uart_putc(char);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* _ARCH_RISCV_SRC_RV32M1_RV32M1_UART_H */
+#endif /* __ARCH_RISCV_SRC_RV32M1_RV32M1_UART_H */
diff --git a/arch/sim/src/sim/up_hcisocket_host.h b/arch/sim/src/sim/up_hcisocket_host.h
index 94c8887..304ad5f 100644
--- a/arch/sim/src/sim/up_hcisocket_host.h
+++ b/arch/sim/src/sim/up_hcisocket_host.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef _ARCH_SIM_SRC_SIM_HCISOCKET_HOST_H_
-#define _ARCH_SIM_SRC_SIM_HCISOCKET_HOST_H_
+#ifndef __ARCH_SIM_SRC_SIM_UP_HCISOCKET_HOST_H
+#define __ARCH_SIM_SRC_SIM_UP_HCISOCKET_HOST_H
/****************************************************************************
* Included Files
@@ -38,4 +38,4 @@ int bthcisock_host_read(int fd, void *data, size_t len);
int bthcisock_host_avail(int fd);
int bthcisock_host_close(int fd);
-#endif /* _ARCH_SIM_SRC_SIM_HCISOCKET_HOST_H_ */
+#endif /* __ARCH_SIM_SRC_SIM_UP_HCISOCKET_HOST_H */
diff --git a/arch/sim/src/sim/up_i2cbus.h b/arch/sim/src/sim/up_i2cbus.h
index 5921eab..4b72639 100644
--- a/arch/sim/src/sim/up_i2cbus.h
+++ b/arch/sim/src/sim/up_i2cbus.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef _ARCH_SIM_SRC_SIM_I2CBUS_H_
-#define _ARCH_SIM_SRC_SIM_I2CBUS_H_
+#ifndef __ARCH_SIM_SRC_SIM_UP_I2CBUS_H
+#define __ARCH_SIM_SRC_SIM_UP_I2CBUS_H
/****************************************************************************
* Included Files
@@ -77,4 +77,4 @@ struct i2c_ops_s
* Public Function Prototypes
****************************************************************************/
-#endif /* _ARCH_SIM_SRC_SIM_I2CBUS_H_ */
+#endif /* __ARCH_SIM_SRC_SIM_UP_I2CBUS_H */
diff --git a/arch/sim/src/sim/up_internal.h b/arch/sim/src/sim/up_internal.h
index 117d49b..7739187 100644
--- a/arch/sim/src/sim/up_internal.h
+++ b/arch/sim/src/sim/up_internal.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_SIM_SRC_UP_INTERNAL_H
-#define __ARCH_SIM_SRC_UP_INTERNAL_H
+#ifndef __ARCH_SIM_SRC_SIM_UP_INTERNAL_H
+#define __ARCH_SIM_SRC_SIM_UP_INTERNAL_H
/****************************************************************************
* Included Files
@@ -356,4 +356,4 @@ void up_stack_color(void *stackbase, size_t nbytes);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_SIM_SRC_UP_INTERNAL_H */
+#endif /* __ARCH_SIM_SRC_SIM_UP_INTERNAL_H */
diff --git a/arch/sim/src/sim/up_spi.h b/arch/sim/src/sim/up_spi.h
index 46df7f5..90dbd1d 100644
--- a/arch/sim/src/sim/up_spi.h
+++ b/arch/sim/src/sim/up_spi.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef _ARCH_SIM_SRC_SIM_SPI_H_
-#define _ARCH_SIM_SRC_SIM_SPI_H_
+#ifndef __ARCH_SIM_SRC_SIM_UP_SPI_H
+#define __ARCH_SIM_SRC_SIM_UP_SPI_H
/****************************************************************************
* Included Files
@@ -153,4 +153,4 @@ struct spi_sequence_s
* Public Function Prototypes
****************************************************************************/
-#endif /* _ARCH_SIM_SRC_SIM_SPI_H_ */
+#endif /* __ARCH_SIM_SRC_SIM_UP_SPI_H */
diff --git a/arch/sim/src/sim/vpnkit/protocol.h b/arch/sim/src/sim/vpnkit/protocol.h
index 7f93d09..04099a8 100644
--- a/arch/sim/src/sim/vpnkit/protocol.h
+++ b/arch/sim/src/sim/vpnkit/protocol.h
@@ -36,8 +36,8 @@
* limitations under the License.
****************************************************************************/
-#ifndef _ARCH_SIM_SRC_SIM_VPNKIT_PROTOCOL_H_
-#define _ARCH_SIM_SRC_SIM_VPNKIT_PROTOCOL_H_
+#ifndef __ARCH_SIM_SRC_SIM_VPNKIT_PROTOCOL_H
+#define __ARCH_SIM_SRC_SIM_VPNKIT_PROTOCOL_H
/****************************************************************************
* Included Files
@@ -156,4 +156,4 @@ extern int read_vif_response(int fd, struct vif_info *vif);
extern int really_read(int fd, uint8_t *buffer, size_t total);
extern int really_write(int fd, uint8_t *buffer, size_t total);
-#endif /* _ARCH_SIM_SRC_SIM_VPNKIT_PROTOCOL_H_ */
+#endif /* __ARCH_SIM_SRC_SIM_VPNKIT_PROTOCOL_H */
diff --git a/arch/x86/src/qemu/chip.h b/arch/x86/src/qemu/chip.h
index a3e9aeb..795aed9 100644
--- a/arch/x86/src/qemu/chip.h
+++ b/arch/x86/src/qemu/chip.h
@@ -18,8 +18,8 @@
*
************************************************************************************/
-#ifndef __ARCH_X86_SRC_QEMU_QEMU_CHIP_H
-#define __ARCH_X86_SRC_QEMU_QEMU_CHIP_H
+#ifndef __ARCH_X86_SRC_QEMU_CHIP_H
+#define __ARCH_X86_SRC_QEMU_CHIP_H
/************************************************************************************
* Included Files
@@ -56,4 +56,4 @@
* Public Functions Prototypes
************************************************************************************/
-#endif /* __ARCH_X86_SRC_QEMU_QEMU_CHIP_H */
+#endif /* __ARCH_X86_SRC_QEMU_CHIP_H */
diff --git a/arch/x86_64/src/intel64/chip.h b/arch/x86_64/src/intel64/chip.h
index 730f548..07f62a9 100644
--- a/arch/x86_64/src/intel64/chip.h
+++ b/arch/x86_64/src/intel64/chip.h
@@ -18,8 +18,8 @@
*
************************************************************************************/
-#ifndef __ARCH_X86_64_SRC_BROADWELL_BROADWELL_CHIP_H
-#define __ARCH_X86_64_SRC_BROADWELL_BROADWELL_CHIP_H
+#ifndef __ARCH_X86_64_SRC_INTEL64_CHIP_H
+#define __ARCH_X86_64_SRC_INTEL64_CHIP_H
/************************************************************************************
* Included Files
@@ -43,4 +43,4 @@
* Public Function Prototypes
************************************************************************************/
-#endif /* __ARCH_X86_64_SRC_BROADWELL_BROADWELL_CHIP_H */
+#endif /* __ARCH_X86_64_SRC_INTEL64_CHIP_H */
diff --git a/arch/xtensa/include/esp32/tie.h b/arch/xtensa/include/esp32/tie.h
index a9ebfb1..d973dfd 100644
--- a/arch/xtensa/include/esp32/tie.h
+++ b/arch/xtensa/include/esp32/tie.h
@@ -32,8 +32,8 @@
*
****************************************************************************/
-#ifndef _ARCH_XTENSA_INCLUDE_ESP32_TIE_H
-#define _ARCH_XTENSA_INCLUDE_ESP32_TIE_H
+#ifndef __ARCH_XTENSA_INCLUDE_ESP32_TIE_H
+#define __ARCH_XTENSA_INCLUDE_ESP32_TIE_H
/****************************************************************************
* Pre-processor Definitions
@@ -191,4 +191,4 @@
3,3,3,3,3,3,3,3,2,2,2,2,2,2,3,3, 3,3,3,3,3,3,3,3,2,2,2,2,2,2,3,3,\
3,3,3,3,3,3,3,3,2,2,2,2,2,2,3,3, 3,3,3,3,3,3,3,3,2,2,2,2,2,2,3,3
-#endif /* _ARCH_XTENSA_INCLUDE_ESP32_TIE_H */
+#endif /* __ARCH_XTENSA_INCLUDE_ESP32_TIE_H */
diff --git a/arch/xtensa/include/esp32s2/tie.h b/arch/xtensa/include/esp32s2/tie.h
index d0feabb..cff6364 100644
--- a/arch/xtensa/include/esp32s2/tie.h
+++ b/arch/xtensa/include/esp32s2/tie.h
@@ -30,8 +30,8 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#ifndef _ARCH_XTENSA_INCLUDE_ESP32S2_TIE_H
-#define _ARCH_XTENSA_INCLUDE_ESP32S2_TIE_H
+#ifndef __ARCH_XTENSA_INCLUDE_ESP32S2_TIE_H
+#define __ARCH_XTENSA_INCLUDE_ESP32S2_TIE_H
/****************************************************************************
* Pre-processor Definitions
@@ -135,4 +135,4 @@
3,3,3,3,3,3,3,3,2,2,2,2,2,2,3,3, 3,3,3,3,3,3,3,3,2,2,2,2,2,2,3,3,\
3,3,3,3,3,3,3,3,2,2,2,2,2,2,3,3, 3,3,3,3,3,3,3,3,2,2,2,2,2,2,3,3
-#endif /* _ARCH_XTENSA_INCLUDE_ESP32S2_TIE_H */
+#endif /* __ARCH_XTENSA_INCLUDE_ESP32S2_TIE_H */
diff --git a/arch/xtensa/include/xtensa/core_macros.h b/arch/xtensa/include/xtensa/core_macros.h
index f8f0a4b..8bfd210 100644
--- a/arch/xtensa/include/xtensa/core_macros.h
+++ b/arch/xtensa/include/xtensa/core_macros.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_XTENSA_INCUDE_XTENSA_CORE_MACRO_H
-#define __ARCH_XTENSA_INCUDE_XTENSA_CORE_MACRO_H
+#ifndef __ARCH_XTENSA_INCUDE_XTENSA_CORE_MACROS_H
+#define __ARCH_XTENSA_INCUDE_XTENSA_CORE_MACROS_H
/****************************************************************************
* Included Files
@@ -40,4 +40,4 @@
__asm__ __volatile__("wsr.ccount %0" :: "a"(__ccount):"memory");\
} while(0)
-#endif /* __ARCH_XTENSA_INCUDE_XTENSA_CORE_H */
+#endif /* __ARCH_XTENSA_INCUDE_XTENSA_CORE_MACROS_H */
diff --git a/arch/xtensa/include/xtensa/xtensa_abi.h b/arch/xtensa/include/xtensa/xtensa_abi.h
index cbee7ee..6d9f610 100644
--- a/arch/xtensa/include/xtensa/xtensa_abi.h
+++ b/arch/xtensa/include/xtensa/xtensa_abi.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/xtensa/src/common/xtensa_abi.h
+ * arch/xtensa/include/xtensa/xtensa_abi.h
*
* Adapted from use in NuttX by:
*
@@ -31,8 +31,8 @@
*
****************************************************************************/
-#ifndef __ARCH_XTENSA_SRC_COMMON_XTENSA_ABI_H
-#define __ARCH_XTENSA_SRC_COMMON_XTENSA_ABI_H
+#ifndef __ARCH_XTENSA_INCLUDE_XTENSA_XTENSA_ABI_H
+#define __ARCH_XTENSA_INCLUDE_XTENSA_XTENSA_ABI_H
/* Windowed ABI
*
@@ -165,4 +165,4 @@
#endif /* __ASSEMBLY_ */
-#endif /* __ARCH_XTENSA_SRC_COMMON_XTENSA_ABI_H */
+#endif /* __ARCH_XTENSA_INCLUDE_XTENSA_XTENSA_ABI_H */
diff --git a/arch/xtensa/src/common/mpu.h b/arch/xtensa/src/common/mpu.h
index 5900398..6065683 100644
--- a/arch/xtensa/src/common/mpu.h
+++ b/arch/xtensa/src/common/mpu.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_XTENSA_SRC_COMMON_XTENSA_MPU_H
-#define __ARCH_XTENSA_SRC_COMMON_XTENSA_MPU_H
+#ifndef __ARCH_XTENSA_SRC_COMMON_MPU_H
+#define __ARCH_XTENSA_SRC_COMMON_MPU_H
/****************************************************************************
* Included Files
@@ -371,4 +371,4 @@ void mpu_configure_region(uintptr_t base, size_t size,
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_XTENSA_SRC_COMMON_XTENSA_MPU_H */
+#endif /* __ARCH_XTENSA_SRC_COMMON_MPU_H */
diff --git a/arch/xtensa/src/esp32/esp32_freerun.h b/arch/xtensa/src/esp32/esp32_freerun.h
index d09d450..c2a6a0f 100644
--- a/arch/xtensa/src/esp32/esp32_freerun.h
+++ b/arch/xtensa/src/esp32/esp32_freerun.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_XTENSA_SRC_ESP32_FREERUN_H
-#define __ARCH_XTENSA_SRC_ESP32_FREERUN_H
+#ifndef __ARCH_XTENSA_SRC_ESP32_ESP32_FREERUN_H
+#define __ARCH_XTENSA_SRC_ESP32_ESP32_FREERUN_H
/****************************************************************************
* Included Files
@@ -139,4 +139,4 @@ int esp32_freerun_uninitialize(struct esp32_freerun_s *freerun);
#endif
#endif /* CONFIG_ESP32_FREERUN */
-#endif /* __ARCH_XTENSA_SRC_ESP32_FREERUN_H */
+#endif /* __ARCH_XTENSA_SRC_ESP32_ESP32_FREERUN_H */
diff --git a/arch/xtensa/src/esp32/esp32_oneshot.h b/arch/xtensa/src/esp32/esp32_oneshot.h
index 4ab25ce..c46c4bc 100644
--- a/arch/xtensa/src/esp32/esp32_oneshot.h
+++ b/arch/xtensa/src/esp32/esp32_oneshot.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_XTENSA_SRC_ESP32_ONESHOT_H
-#define __ARCH_XTENSA_SRC_ESP32_ONESHOT_H
+#ifndef __ARCH_XTENSA_SRC_ESP32_ESP32_ONESHOT_H
+#define __ARCH_XTENSA_SRC_ESP32_ESP32_ONESHOT_H
/****************************************************************************
* Included Files
@@ -199,4 +199,4 @@ int esp32_oneshot_current(struct esp32_oneshot_s *oneshot, uint64_t *usec);
#endif
#endif /* CONFIG_ESP32_ONESHOT */
-#endif /* __ARCH_XTENSA_SRC_ESP32_ONESHOT_H */
+#endif /* __ARCH_XTENSA_SRC_ESP32_ESP32_ONESHOT_H */
diff --git a/arch/xtensa/src/esp32/esp32_pm.h b/arch/xtensa/src/esp32/esp32_pm.h
index 979f8d3..5a375b8 100644
--- a/arch/xtensa/src/esp32/esp32_pm.h
+++ b/arch/xtensa/src/esp32/esp32_pm.h
@@ -22,8 +22,8 @@
* Included Files
****************************************************************************/
-#ifndef __ARCH_XTENSA_SRC_ESP32_ESP32_PMSLEEP_H
-#define __ARCH_XTENSA_SRC_ESP32_ESP32_PMSLEEP_H
+#ifndef __ARCH_XTENSA_SRC_ESP32_ESP32_PM_H
+#define __ARCH_XTENSA_SRC_ESP32_ESP32_PM_H
/****************************************************************************
* Included Files
@@ -245,4 +245,4 @@ uint32_t esp32_pm_lockstatus(void);
#undef EXTERN
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_XTENSA_SRC_ESP32_ESP32_PMSLEEP_H */
+#endif /* __ARCH_XTENSA_SRC_ESP32_ESP32_PM_H */
diff --git a/arch/xtensa/src/esp32/esp32_wifi_utils.h b/arch/xtensa/src/esp32/esp32_wifi_utils.h
index 92f1289..958d5a4 100644
--- a/arch/xtensa/src/esp32/esp32_wifi_utils.h
+++ b/arch/xtensa/src/esp32/esp32_wifi_utils.h
@@ -22,8 +22,8 @@
* Included Files
****************************************************************************/
-#ifndef __ARCH_XTENSA_SRC_ESP32_ESP32_UTILS_H
-#define __ARCH_XTENSA_SRC_ESP32_ESP32_UTILS_H
+#ifndef __ARCH_XTENSA_SRC_ESP32_ESP32_WIFI_UTILS_H
+#define __ARCH_XTENSA_SRC_ESP32_ESP32_WIFI_UTILS_H
#include <nuttx/config.h>
#include <nuttx/net/netdev.h>
@@ -117,4 +117,4 @@ int esp_wifi_scan_init(void);
#undef EXTERN
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_XTENSA_SRC_ESP32_ESP32_UTILS_H */
+#endif /* __ARCH_XTENSA_SRC_ESP32_ESP32_WIFI_UTILS_H */
diff --git a/arch/xtensa/src/esp32/hardware/efuse_reg.h b/arch/xtensa/src/esp32/hardware/efuse_reg.h
index dc8f875..8ec7b6e 100644
--- a/arch/xtensa/src/esp32/hardware/efuse_reg.h
+++ b/arch/xtensa/src/esp32/hardware/efuse_reg.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_XTENSA_INCLUDE_EFUSE_REG_H
-#define __ARCH_XTENSA_INCLUDE_EFUSE_REG_H
+#ifndef __ARCH_XTENSA_SRC_ESP32_HARDWARE_EFUSE_REG_H
+#define __ARCH_XTENSA_SRC_ESP32_HARDWARE_EFUSE_REG_H
/****************************************************************************
* Included Files
@@ -1824,4 +1824,4 @@
#define EFUSE_DATE_V 0xffffffff
#define EFUSE_DATE_S 0
-#endif /* __ARCH_XTENSA_INCLUDE_EFUSE_REG_H */
+#endif /* __ARCH_XTENSA_SRC_ESP32_HARDWARE_EFUSE_REG_H */
diff --git a/arch/xtensa/src/esp32/hardware/esp32_rtc_io.h b/arch/xtensa/src/esp32/hardware/esp32_rtc_io.h
index af25b39..27c84e4 100644
--- a/arch/xtensa/src/esp32/hardware/esp32_rtc_io.h
+++ b/arch/xtensa/src/esp32/hardware/esp32_rtc_io.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_XTENSA_SRC_ESP32_HARDWARE_XTENSA_ESP32_RTC_IO_H
-#define __ARCH_XTENSA_SRC_ESP32_HARDWARE_XTENSA_ESP32_RTC_IO_H
+#ifndef __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_RTC_IO_H
+#define __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_RTC_IO_H
/****************************************************************************
* Included Files
@@ -3197,4 +3197,4 @@
#define RTC_IO_IO_DATE_S 0
#define RTC_IO_RTC_IO_DATE_VERSION 0x1703160
-#endif /* __ARCH_XTENSA_SRC_ESP32_HARDWARE_XTENSA_ESP32_RTC_IO_H */
+#endif /* __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_RTC_IO_H */
diff --git a/arch/xtensa/src/esp32/hardware/esp32_rtccntl.h b/arch/xtensa/src/esp32/hardware/esp32_rtccntl.h
index e661726..c36c63b 100644
--- a/arch/xtensa/src/esp32/hardware/esp32_rtccntl.h
+++ b/arch/xtensa/src/esp32/hardware/esp32_rtccntl.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_XTENSA_SRC_ESP32_HARDWARE_XTENSA_ESP32_H
-#define __ARCH_XTENSA_SRC_ESP32_HARDWARE_XTENSA_ESP32_H
+#ifndef __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_RTCCNTL_H
+#define __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_RTCCNTL_H
/****************************************************************************
* Included Files
@@ -3197,4 +3197,4 @@
#define RTC_IO_DBIAS_XTAL_32K_V 0x3
#define RTC_IO_DBIAS_XTAL_32K_S 1
-#endif /* __ARCH_XTENSA_SRC_ESP32_HARDWARE_XTENSA_ESP32_H */
+#endif /* __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_RTCCNTL_H */
diff --git a/arch/xtensa/src/esp32/rom/esp32_efuse.h b/arch/xtensa/src/esp32/rom/esp32_efuse.h
index 3d2c61e..a82553c 100644
--- a/arch/xtensa/src/esp32/rom/esp32_efuse.h
+++ b/arch/xtensa/src/esp32/rom/esp32_efuse.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __XTENSA_SRC_ESP32_ROM_ESP32_EFUSE_H
-#define __XTENSA_SRC_ESP32_ROM_ESP32_EFUSE_H
+#ifndef __ARCH_XTENSA_SRC_ESP32_ROM_ESP32_EFUSE_H
+#define __ARCH_XTENSA_SRC_ESP32_ROM_ESP32_EFUSE_H
/****************************************************************************
* Included Files
@@ -93,4 +93,4 @@ unsigned char esp_crc8(unsigned char const *p, unsigned int len);
}
#endif
-#endif /* __XTENSA_SRC_ESP32_ROM_ESP32_EFUSE_H */
+#endif /* __ARCH_XTENSA_SRC_ESP32_ROM_ESP32_EFUSE_H */
diff --git a/arch/xtensa/src/esp32s2/esp32s2_freerun.h b/arch/xtensa/src/esp32s2/esp32s2_freerun.h
index f61b42e..bda02f7 100644
--- a/arch/xtensa/src/esp32s2/esp32s2_freerun.h
+++ b/arch/xtensa/src/esp32s2/esp32s2_freerun.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_XTENSA_SRC_ESP32S2_FREERUN_H
-#define __ARCH_XTENSA_SRC_ESP32S2_FREERUN_H
+#ifndef __ARCH_XTENSA_SRC_ESP32S2_ESP32S2_FREERUN_H
+#define __ARCH_XTENSA_SRC_ESP32S2_ESP32S2_FREERUN_H
/****************************************************************************
* Included Files
@@ -142,4 +142,4 @@ int esp32s2_freerun_uninitialize(struct esp32s2_freerun_s *freerun);
#endif
#endif /* CONFIG_ESP32S2_FREERUN */
-#endif /* __ARCH_XTENSA_SRC_ESP32S2_FREERUN_H */
+#endif /* __ARCH_XTENSA_SRC_ESP32S2_ESP32S2_FREERUN_H */
diff --git a/arch/xtensa/src/esp32s2/hardware/esp32s2_cache_memory.h b/arch/xtensa/src/esp32s2/hardware/esp32s2_cache_memory.h
index 2812646..6541077 100644
--- a/arch/xtensa/src/esp32s2/hardware/esp32s2_cache_memory.h
+++ b/arch/xtensa/src/esp32s2/hardware/esp32s2_cache_memory.h
@@ -15,8 +15,8 @@
*
****************************************************************************/
-#ifndef __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_CACHE_MEMORY_H_
-#define __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_CACHE_MEMORY_H_
+#ifndef __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_CACHE_MEMORY_H
+#define __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_CACHE_MEMORY_H
/****************************************************************************
* Included Files
@@ -150,4 +150,4 @@
#define CACHE_MEMORY_BANK2_ADDR 0x3ffb4000
#define CACHE_MEMORY_BANK3_ADDR 0x3ffb6000
-#endif /* __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_CACHE_MEMORY_H_ */
+#endif /* __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_CACHE_MEMORY_H */
diff --git a/arch/xtensa/src/esp32s2/hardware/esp32s2_extmem.h b/arch/xtensa/src/esp32s2/hardware/esp32s2_extmem.h
index 5fdd8e2..96873dc 100644
--- a/arch/xtensa/src/esp32s2/hardware/esp32s2_extmem.h
+++ b/arch/xtensa/src/esp32s2/hardware/esp32s2_extmem.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_EXTMEM_H_
-#define __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_EXTMEM_H_
+#ifndef __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_EXTMEM_H
+#define __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_EXTMEM_H
/****************************************************************************
* Included Files
@@ -66,4 +66,4 @@
#define EXTMEM_PRO_ICACHE_MASK_IRAM1 EXTMEM_PRO_ICACHE_MASK_BUS1
#define EXTMEM_PRO_ICACHE_MASK_DROM0 EXTMEM_PRO_ICACHE_MASK_BUS2
-#endif /* __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_EXTMEM_H_ */
+#endif /* __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_EXTMEM_H */
diff --git a/arch/xtensa/src/esp32s2/hardware/esp32s2_iomux.h b/arch/xtensa/src/esp32s2/hardware/esp32s2_iomux.h
index 818c987..cf19d69 100644
--- a/arch/xtensa/src/esp32s2/hardware/esp32s2_iomux.h
+++ b/arch/xtensa/src/esp32s2/hardware/esp32s2_iomux.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_IOMUM_H
-#define __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_IOMUM_H
+#ifndef __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_IOMUX_H
+#define __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_IOMUX_H
/****************************************************************************
* Included Files
@@ -457,4 +457,4 @@
#define IO_MUX_DATE_S 0
#define IO_MUX_DATE_VERSION 0x1907160
-#endif /* __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_I2CBBPLL_H */
+#endif /* __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_IOMUX_H */
diff --git a/arch/xtensa/src/esp32s2/hardware/esp32s2_rtc_io.h b/arch/xtensa/src/esp32s2/hardware/esp32s2_rtc_io.h
index e0f6f15..4d139f8 100644
--- a/arch/xtensa/src/esp32s2/hardware/esp32s2_rtc_io.h
+++ b/arch/xtensa/src/esp32s2/hardware/esp32s2_rtc_io.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_RTCIO_H
-#define __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_RTCIO_H
+#ifndef __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_RTC_IO_H
+#define __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_RTC_IO_H
/****************************************************************************
* Included Files
@@ -3701,4 +3701,4 @@
#define RTCIO_IO_DATE_V 0x0FFFFFFF
#define RTCIO_IO_DATE_S 0
-#endif /* __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_RTCIO_H */
+#endif /* __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_RTC_IO_H */
diff --git a/arch/xtensa/src/esp32s2/hardware/esp32s2_rtccntl.h b/arch/xtensa/src/esp32s2/hardware/esp32s2_rtccntl.h
index 482bead..4120517 100644
--- a/arch/xtensa/src/esp32s2/hardware/esp32s2_rtccntl.h
+++ b/arch/xtensa/src/esp32s2/hardware/esp32s2_rtccntl.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_RTC_H
-#define __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_RTC_H
+#ifndef __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_RTCCNTL_H
+#define __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_RTCCNTL_H
/****************************************************************************
* Included Files
@@ -4422,4 +4422,4 @@
#define RTC_CNTL_CNTL_DATE_V 0x0FFFFFFF
#define RTC_CNTL_CNTL_DATE_S 0
-#endif /* __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_RTC_H */
+#endif /* __ARCH_XTENSA_SRC_ESP32S2_HARDWARE_ESP32S2_RTCCNTL_H */
diff --git a/arch/xtensa/src/esp32s2/hardware/esp32s2_soc.h b/arch/xtensa/src/esp32s2/hardware/esp32s2_soc.h
index 2bcec25..6bfb4c6 100644
--- a/arch/xtensa/src/esp32s2/hardware/esp32s2_soc.h
+++ b/arch/xtensa/src/esp32s2/hardware/esp32s2_soc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_SOC_H
-#define __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_SOC_H
+#ifndef __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32S2_SOC_H
+#define __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32S2_SOC_H
/****************************************************************************
* Included Files
@@ -764,4 +764,4 @@ static inline bool IRAM_ATTR esp32s2_ptr_exec(const void *p)
|| (ip >= SOC_RTC_IRAM_LOW && ip < SOC_RTC_IRAM_HIGH);
}
-#endif /* __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32_SOC_H */
+#endif /* __ARCH_XTENSA_SRC_ESP32_HARDWARE_ESP32S2_SOC_H */
diff --git a/arch/z16/include/z16f/arch.h b/arch/z16/include/z16f/arch.h
index 3d59c5d..081675d 100644
--- a/arch/z16/include/z16f/arch.h
+++ b/arch/z16/include/z16f/arch.h
@@ -22,8 +22,8 @@
* only indirectly through nuttx/arch.h (via arch/arch.h)
*/
-#ifndef __ARCH_Z16_INCLUDE_Z16F_IRQ_H
-#define __ARCH_Z16_INCLUDE_Z16F_IRQ_H
+#ifndef __ARCH_Z16_INCLUDE_Z16F_ARCH_H
+#define __ARCH_Z16_INCLUDE_Z16F_ARCH_H
/****************************************************************************
* Included Files
@@ -58,4 +58,4 @@ extern "C"
}
#endif
-#endif /* __ARCH_Z16_INCLUDE_Z16F_IRQ_H */
+#endif /* __ARCH_Z16_INCLUDE_Z16F_ARCH_H */
diff --git a/arch/z80/include/z8/types.h b/arch/z80/include/z8/types.h
index 787389b..72e3b71 100644
--- a/arch/z80/include/z8/types.h
+++ b/arch/z80/include/z8/types.h
@@ -22,8 +22,8 @@
* through sys/types.h
*/
-#ifndef __ARCH_Z80_INCLUDE_Z8_IRQ_H
-#define __ARCH_Z80_INCLUDE_Z8_IRQ_H
+#ifndef __ARCH_Z80_INCLUDE_Z8_TYPES_H
+#define __ARCH_Z80_INCLUDE_Z8_TYPES_H
/****************************************************************************
* Included Files
@@ -109,4 +109,4 @@ typedef _uint8_t irqstate_t;
* Public Function Prototypes
****************************************************************************/
-#endif /* __ARCH_Z80_INCLUDE_Z8_IRQ_H */
+#endif /* __ARCH_Z80_INCLUDE_Z8_TYPES_H */
diff --git a/arch/z80/include/z80/arch.h b/arch/z80/include/z80/arch.h
index 1c96450..4dbb8c8 100644
--- a/arch/z80/include/z80/arch.h
+++ b/arch/z80/include/z80/arch.h
@@ -22,8 +22,8 @@
* only indirectly through nuttx/arch.h (via arch/arch.h)
*/
-#ifndef __ARCH_Z80_ARCH_H
-#define __ARCH_Z80_ARCH_H
+#ifndef __ARCH_Z80_INCLUDE_Z80_ARCH_H
+#define __ARCH_Z80_INCLUDE_Z80_ARCH_H
/****************************************************************************
* Included Files
@@ -58,4 +58,4 @@ extern "C"
}
#endif
-#endif /* __ARCH_Z80_ARCH_H */
+#endif /* __ARCH_Z80_INCLUDE_Z80_ARCH_H */
diff --git a/arch/z80/include/z80/io.h b/arch/z80/include/z80/io.h
index 2bf5839..008448c 100644
--- a/arch/z80/include/z80/io.h
+++ b/arch/z80/include/z80/io.h
@@ -22,8 +22,8 @@
* through arch/io.h
*/
-#ifndef __ARCH_Z80_IO_H
-#define __ARCH_Z80_IO_H
+#ifndef __ARCH_Z80_INCLUDE_Z80_IO_H
+#define __ARCH_Z80_INCLUDE_Z80_IO_H
/****************************************************************************
* Included Files
@@ -67,4 +67,4 @@ char inp(char p);
#endif
#endif
-#endif /* __ARCH_Z80_IO_H */
+#endif /* __ARCH_Z80_INCLUDE_Z80_IO_H */
diff --git a/arch/z80/src/ez80/ez80_rtc.h b/arch/z80/src/ez80/ez80_rtc.h
index eec5bd9..0cac5ae 100644
--- a/arch/z80/src/ez80/ez80_rtc.h
+++ b/arch/z80/src/ez80/ez80_rtc.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_EZ80_SRC_EZ80_EZ80_RTC_H
-#define __ARCH_EZ80_SRC_EZ80_EZ80_RTC_H
+#ifndef __ARCH_Z80_SRC_EZ80_EZ80_RTC_H
+#define __ARCH_Z80_SRC_EZ80_EZ80_RTC_H
/****************************************************************************
* Included Files
@@ -191,4 +191,4 @@ int ez80_rtc_cancelalarm(void);
#endif /* CONFIG_RTC_ALARM */
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_EZ80_SRC_EZ80_RTC_H */
+#endif /* __ARCH_Z80_SRC_EZ80_RTC_H */
diff --git a/arch/z80/src/ez80/ez80f91.h b/arch/z80/src/ez80/ez80f91.h
index d78a07e..d796ead 100644
--- a/arch/z80/src/ez80/ez80f91.h
+++ b/arch/z80/src/ez80/ez80f91.h
@@ -14,7 +14,8 @@
* 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. *
+ * under the License.
+ *
************************************************************************************/
#ifndef __ARCH_Z80_SRC_EZ80_EZ80F91_H
diff --git a/arch/z80/src/z80/z80_mem.h b/arch/z80/src/z80/z80_mem.h
index 6949311..acec76c 100644
--- a/arch/z80/src/z80/z80_mem.h
+++ b/arch/z80/src/z80/z80_mem.h
@@ -18,8 +18,8 @@
*
************************************************************************************/
-#ifndef __ARCH_Z80_SRC_COMMON_Z80_MEM_H
-#define __ARCH_Z80_SRC_COMMON_Z80_MEM_H
+#ifndef __ARCH_Z80_SRC_Z80_Z80_MEM_H
+#define __ARCH_Z80_SRC_Z80_Z80_MEM_H
/************************************************************************************
* Included Files
@@ -57,4 +57,4 @@
extern const uint16_t g_heapbase;
-#endif /* __ARCH_Z80_SRC_COMMON_Z80_MEM_H */
+#endif /* __ARCH_Z80_SRC_Z80_Z80_MEM_H */
diff --git a/boards/arm/cxd56xx/spresense/include/cxd56_bcm20706.h b/boards/arm/cxd56xx/spresense/include/cxd56_bcm20706.h
index 3854d72..9991b95 100644
--- a/boards/arm/cxd56xx/spresense/include/cxd56_bcm20706.h
+++ b/boards/arm/cxd56xx/spresense/include/cxd56_bcm20706.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __BSP_BOARD_COMMON_INCLUDE_CXD56_BCM20706_H
-#define __BSP_BOARD_COMMON_INCLUDE_CXD56_BCM20706_H
+#ifndef __BOARDS_ARM_CXD56XX_SPRESENSE_INCLUDE_CXD56_BCM20706_H
+#define __BOARDS_ARM_CXD56XX_SPRESENSE_INCLUDE_CXD56_BCM20706_H
/****************************************************************************
* Included Files
@@ -108,4 +108,4 @@ void board_bluetooth_enable_sleep(bool en);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __BSP_BOARD_COMMON_INCLUDE_CXD56_BCM20706_H */
+#endif /* __BOARDS_ARM_CXD56XX_SPRESENSE_INCLUDE_CXD56_BCM20706_H */
diff --git a/boards/arm/imxrt/teensy-4.x/include/board.h b/boards/arm/imxrt/teensy-4.x/include/board.h
index 0814c2d..356e006 100644
--- a/boards/arm/imxrt/teensy-4.x/include/board.h
+++ b/boards/arm/imxrt/teensy-4.x/include/board.h
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __BOARDS_ARM_IMXRT_TEENSY_4_INCLUDE_BOARD_H
-#define __BOARDS_ARM_IMXRT_TEENSY_4_INCLUDE_BOARD_H
+#ifndef __BOARDS_ARM_IMXRT_TEENSY_4X_INCLUDE_BOARD_H
+#define __BOARDS_ARM_IMXRT_TEENSY_4X_INCLUDE_BOARD_H
/****************************************************************************
* Included Files
@@ -306,4 +306,4 @@ extern "C"
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_ARM_IMXRT_TEENSY_4_INCLUDE_BOARD_H */
+#endif /* __BOARDS_ARM_IMXRT_TEENSY_4X_INCLUDE_BOARD_H */
diff --git a/boards/arm/imxrt/teensy-4.x/src/imxrt_flexspi_nor_boot.h b/boards/arm/imxrt/teensy-4.x/src/imxrt_flexspi_nor_boot.h
index 8f4696a..faf87e8 100644
--- a/boards/arm/imxrt/teensy-4.x/src/imxrt_flexspi_nor_boot.h
+++ b/boards/arm/imxrt/teensy-4.x/src/imxrt_flexspi_nor_boot.h
@@ -25,7 +25,7 @@
* Included Files
****************************************************************************/
-# include <stdint.h>
+#include <stdint.h>
/****************************************************************************
* Pre-processor Definitions
@@ -33,66 +33,66 @@
/* IVT Data */
-# define IVT_MAJOR_VERSION 0x4
-# define IVT_MAJOR_VERSION_SHIFT 0x4
-# define IVT_MAJOR_VERSION_MASK 0xf
-# define IVT_MINOR_VERSION 0x1
-# define IVT_MINOR_VERSION_SHIFT 0x0
-# define IVT_MINOR_VERSION_MASK 0xf
+#define IVT_MAJOR_VERSION 0x4
+#define IVT_MAJOR_VERSION_SHIFT 0x4
+#define IVT_MAJOR_VERSION_MASK 0xf
+#define IVT_MINOR_VERSION 0x1
+#define IVT_MINOR_VERSION_SHIFT 0x0
+#define IVT_MINOR_VERSION_MASK 0xf
-# define IVT_VERSION(major, minor) \
+#define IVT_VERSION(major, minor) \
((((major) & IVT_MAJOR_VERSION_MASK) << IVT_MAJOR_VERSION_SHIFT) | \
(((minor) & IVT_MINOR_VERSION_MASK) << IVT_MINOR_VERSION_SHIFT))
-# define IVT_TAG_HEADER (0xd1) /* Image Vector Table */
-# define IVT_SIZE 0x2000
-# define IVT_PAR IVT_VERSION(IVT_MAJOR_VERSION, IVT_MINOR_VERSION)
+#define IVT_TAG_HEADER (0xd1) /* Image Vector Table */
+#define IVT_SIZE 0x2000
+#define IVT_PAR IVT_VERSION(IVT_MAJOR_VERSION, IVT_MINOR_VERSION)
-# define IVT_HEADER (IVT_TAG_HEADER | (IVT_SIZE << 8) | (IVT_PAR << 24))
-# define IVT_RSVD (uint32_t)(0x00000000)
+#define IVT_HEADER (IVT_TAG_HEADER | (IVT_SIZE << 8) | (IVT_PAR << 24))
+#define IVT_RSVD (uint32_t)(0x00000000)
/* DCD Data */
-# define DCD_TAG_HEADER (0xd2)
-# define DCD_TAG_HEADER_SHIFT (24)
-# define DCD_VERSION (0x41)
-# define DCD_ARRAY_SIZE 1
+#define DCD_TAG_HEADER (0xd2)
+#define DCD_TAG_HEADER_SHIFT (24)
+#define DCD_VERSION (0x41)
+#define DCD_ARRAY_SIZE 1
-# define FLASH_BASE 0x60000000
-# define FLASH_END 0x7f7fffff
+#define FLASH_BASE 0x60000000
+#define FLASH_END 0x7f7fffff
/* This needs to take into account the memory configuration at
* boot bootloader
*/
-# define ROM_BOOTLOADER_OCRAM_RES 0x8000
-# define OCRAM_BASE (0x20200000 + ROM_BOOTLOADER_OCRAM_RES)
-# define OCRAM_END (OCRAM_BASE + (512 * 1024) + (256 * 1024) \
+#define ROM_BOOTLOADER_OCRAM_RES 0x8000
+#define OCRAM_BASE (0x20200000 + ROM_BOOTLOADER_OCRAM_RES)
+#define OCRAM_END (OCRAM_BASE + (512 * 1024) + (256 * 1024) \
- ROM_BOOTLOADER_OCRAM_RES)
-# define SCLK 1
-# if defined(CONFIG_BOOT_RUNFROMFLASH)
-# define IMAGE_DEST FLASH_BASE
-# define IMAGE_DEST_END FLASH_END
-# define IMAGE_DEST_OFFSET 0
-# else
-# define IMAGE_DEST OCRAM_BASE
-# define IMAGE_DEST_END OCRAM_END
-# define IMAGE_DEST_OFFSET IVT_SIZE
-# endif
-
-# define LOCATE_IN_DEST(x) (((uint32_t)(x)) - FLASH_BASE + IMAGE_DEST)
-# define LOCATE_IN_SRC(x) (((uint32_t)(x)) - IMAGE_DEST + FLASH_BASE)
-
-# define DCD_ADDRESS 0
-# define BOOT_DATA_ADDRESS LOCATE_IN_DEST(&g_boot_data)
-# define CSF_ADDRESS 0
-# define PLUGIN_FLAG (uint32_t)0
+#define SCLK 1
+#if defined(CONFIG_BOOT_RUNFROMFLASH)
+# define IMAGE_DEST FLASH_BASE
+# define IMAGE_DEST_END FLASH_END
+# define IMAGE_DEST_OFFSET 0
+#else
+# define IMAGE_DEST OCRAM_BASE
+# define IMAGE_DEST_END OCRAM_END
+# define IMAGE_DEST_OFFSET IVT_SIZE
+#endif
+
+#define LOCATE_IN_DEST(x) (((uint32_t)(x)) - FLASH_BASE + IMAGE_DEST)
+#define LOCATE_IN_SRC(x) (((uint32_t)(x)) - IMAGE_DEST + FLASH_BASE)
+
+#define DCD_ADDRESS 0
+#define BOOT_DATA_ADDRESS LOCATE_IN_DEST(&g_boot_data)
+#define CSF_ADDRESS 0
+#define PLUGIN_FLAG (uint32_t)0
/* Located in Destination Memory */
-# define IMAGE_ENTRY_ADDRESS ((uint32_t)&_vectors)
-# define IMAG_VECTOR_TABLE LOCATE_IN_DEST(&g_image_vector_table)
+#define IMAGE_ENTRY_ADDRESS ((uint32_t)&_vectors)
+#define IMAG_VECTOR_TABLE LOCATE_IN_DEST(&g_image_vector_table)
/****************************************************************************
* Public Types
@@ -101,50 +101,50 @@
/* IVT Data */
struct ivt_s
- {
- /* Header with tag #HAB_TAG_IVT, length and HAB version fields */
+{
+ /* Header with tag #HAB_TAG_IVT, length and HAB version fields */
- uint32_t hdr;
+ uint32_t hdr;
- /* Absolute address of the first instr. to execute from the image */
+ /* Absolute address of the first instr. to execute from the image */
- uint32_t entry;
+ uint32_t entry;
- /* Reserved in this version of HAB: should be NULL. */
+ /* Reserved in this version of HAB: should be NULL. */
- uint32_t reserved1;
+ uint32_t reserved1;
- /* Absolute address of the image DCD: may be NULL. */
+ /* Absolute address of the image DCD: may be NULL. */
- uint32_t dcd;
+ uint32_t dcd;
- /* Absolute address of the Boot Data: may be NULL */
+ /* Absolute address of the Boot Data: may be NULL */
- uint32_t boot_data;
+ uint32_t boot_data;
- /* Absolute address of the IVT. */
+ /* Absolute address of the IVT. */
- uint32_t self;
+ uint32_t self;
- /* Absolute address of the image CSF. */
+ /* Absolute address of the image CSF. */
- uint32_t csf;
+ uint32_t csf;
- /* Reserved in this version of HAB: should be zero. */
+ /* Reserved in this version of HAB: should be zero. */
- uint32_t reserved2;
- };
+ uint32_t reserved2;
+};
/* Boot Data */
struct boot_data_s
- {
- uint32_t start; /* boot start location */
- uint32_t size; /* size */
- uint32_t plugin; /* plugin flag - 1 if downloaded application is
- * plugin */
- uint32_t placeholder; /* placeholder to make even 0x10 size */
- };
+{
+ uint32_t start; /* boot start location */
+ uint32_t size; /* size */
+ uint32_t plugin; /* plugin flag - 1 if downloaded application is
+ * plugin */
+ uint32_t placeholder; /* placeholder to make even 0x10 size */
+};
/****************************************************************************
* Public Data
@@ -154,4 +154,4 @@ extern const struct boot_data_s g_boot_data;
extern const uint8_t g_dcd_data[];
extern const uint32_t _vectors[];
-#endif /* __BOARDS_ARM_IMXRT_TEENSY_4_SRC_IMXRT_FLEXSPI_NOR_BOOT_H */
+#endif /* __BOARDS_ARM_IMXRT_TEENSY_4_SRC_IMXRT_FLEXSPI_NOR_BOOT_H */
diff --git a/boards/arm/imxrt/teensy-4.x/src/imxrt_flexspi_nor_flash.h b/boards/arm/imxrt/teensy-4.x/src/imxrt_flexspi_nor_flash.h
index b57eb14..9011682 100644
--- a/boards/arm/imxrt/teensy-4.x/src/imxrt_flexspi_nor_flash.h
+++ b/boards/arm/imxrt/teensy-4.x/src/imxrt_flexspi_nor_flash.h
@@ -24,8 +24,8 @@
* Included Files
****************************************************************************/
-# include <stdint.h>
-# include <stdbool.h>
+#include <stdint.h>
+#include <stdbool.h>
/****************************************************************************
* Pre-processor Definitions
@@ -33,153 +33,153 @@
/* FLEXSPI memory config block related definitions */
-# define FLEXSPI_CFG_BLK_TAG (0x42464346ul)
-# define FLEXSPI_CFG_BLK_VERSION (0x56010100ul)
-# define FLEXSPI_CFG_BLK_SIZE (512)
+#define FLEXSPI_CFG_BLK_TAG (0x42464346ul)
+#define FLEXSPI_CFG_BLK_VERSION (0x56010100ul)
+#define FLEXSPI_CFG_BLK_SIZE (512)
/* FLEXSPI Feature related definitions */
-# define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
+#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
/* Lookup table related definitions */
-# define CMD_INDEX_READ 0
-# define CMD_INDEX_READSTATUS 1
-# define CMD_INDEX_WRITEENABLE 2
-# define CMD_INDEX_WRITE 4
-
-# define CMD_LUT_SEQ_IDX_READ 0
-# define CMD_LUT_SEQ_IDX_READSTATUS 1
-# define CMD_LUT_SEQ_IDX_WRITEENABLE 3
-# define CMD_LUT_SEQ_IDX_WRITE 9
-
-# define CMD_SDR 0x01
-# define CMD_DDR 0x21
-# define RADDR_SDR 0x02
-# define RADDR_DDR 0x22
-# define CADDR_SDR 0x03
-# define CADDR_DDR 0x23
-# define MODE1_SDR 0x04
-# define MODE1_DDR 0x24
-# define MODE2_SDR 0x05
-# define MODE2_DDR 0x25
-# define MODE4_SDR 0x06
-# define MODE4_DDR 0x26
-# define MODE8_SDR 0x07
-# define MODE8_DDR 0x27
-# define WRITE_SDR 0x08
-# define WRITE_DDR 0x28
-# define READ_SDR 0x09
-# define READ_DDR 0x29
-# define LEARN_SDR 0x0a
-# define LEARN_DDR 0x2a
-# define DATSZ_SDR 0x0b
-# define DATSZ_DDR 0x2b
-# define DUMMY_SDR 0x0c
-# define DUMMY_DDR 0x2c
-# define DUMMY_RWDS_SDR 0x0d
-# define DUMMY_RWDS_DDR 0x2d
-# define JMP_ON_CS 0x1f
-# define STOP 0
-
-# define FLEXSPI_1PAD 0
-# define FLEXSPI_2PAD 1
-# define FLEXSPI_4PAD 2
-# define FLEXSPI_8PAD 3
-
-# define FLEXSPI_LUT_OPERAND0_MASK (0xffu)
-# define FLEXSPI_LUT_OPERAND0_SHIFT (0U)
-# define FLEXSPI_LUT_OPERAND0(x) (((uint32_t) \
+#define CMD_INDEX_READ 0
+#define CMD_INDEX_READSTATUS 1
+#define CMD_INDEX_WRITEENABLE 2
+#define CMD_INDEX_WRITE 4
+
+#define CMD_LUT_SEQ_IDX_READ 0
+#define CMD_LUT_SEQ_IDX_READSTATUS 1
+#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define CMD_LUT_SEQ_IDX_WRITE 9
+
+#define CMD_SDR 0x01
+#define CMD_DDR 0x21
+#define RADDR_SDR 0x02
+#define RADDR_DDR 0x22
+#define CADDR_SDR 0x03
+#define CADDR_DDR 0x23
+#define MODE1_SDR 0x04
+#define MODE1_DDR 0x24
+#define MODE2_SDR 0x05
+#define MODE2_DDR 0x25
+#define MODE4_SDR 0x06
+#define MODE4_DDR 0x26
+#define MODE8_SDR 0x07
+#define MODE8_DDR 0x27
+#define WRITE_SDR 0x08
+#define WRITE_DDR 0x28
+#define READ_SDR 0x09
+#define READ_DDR 0x29
+#define LEARN_SDR 0x0a
+#define LEARN_DDR 0x2a
+#define DATSZ_SDR 0x0b
+#define DATSZ_DDR 0x2b
+#define DUMMY_SDR 0x0c
+#define DUMMY_DDR 0x2c
+#define DUMMY_RWDS_SDR 0x0d
+#define DUMMY_RWDS_DDR 0x2d
+#define JMP_ON_CS 0x1f
+#define STOP 0
+
+#define FLEXSPI_1PAD 0
+#define FLEXSPI_2PAD 1
+#define FLEXSPI_4PAD 2
+#define FLEXSPI_8PAD 3
+
+#define FLEXSPI_LUT_OPERAND0_MASK (0xffu)
+#define FLEXSPI_LUT_OPERAND0_SHIFT (0U)
+#define FLEXSPI_LUT_OPERAND0(x) (((uint32_t) \
(((uint32_t)(x)) << FLEXSPI_LUT_OPERAND0_SHIFT)) & \
FLEXSPI_LUT_OPERAND0_MASK)
-# define FLEXSPI_LUT_NUM_PADS0_MASK (0x300u)
-# define FLEXSPI_LUT_NUM_PADS0_SHIFT (8u)
-# define FLEXSPI_LUT_NUM_PADS0(x) (((uint32_t) \
+#define FLEXSPI_LUT_NUM_PADS0_MASK (0x300u)
+#define FLEXSPI_LUT_NUM_PADS0_SHIFT (8u)
+#define FLEXSPI_LUT_NUM_PADS0(x) (((uint32_t) \
(((uint32_t)(x)) << FLEXSPI_LUT_NUM_PADS0_SHIFT)) & \
FLEXSPI_LUT_NUM_PADS0_MASK)
-# define FLEXSPI_LUT_OPCODE0_MASK (0xfc00u)
-# define FLEXSPI_LUT_OPCODE0_SHIFT (10u)
-# define FLEXSPI_LUT_OPCODE0(x) (((uint32_t) \
+#define FLEXSPI_LUT_OPCODE0_MASK (0xfc00u)
+#define FLEXSPI_LUT_OPCODE0_SHIFT (10u)
+#define FLEXSPI_LUT_OPCODE0(x) (((uint32_t) \
(((uint32_t)(x)) << FLEXSPI_LUT_OPCODE0_SHIFT)) & \
FLEXSPI_LUT_OPCODE0_MASK)
-# define FLEXSPI_LUT_OPERAND1_MASK (0xff0000u)
-# define FLEXSPI_LUT_OPERAND1_SHIFT (16U)
-# define FLEXSPI_LUT_OPERAND1(x) (((uint32_t) \
+#define FLEXSPI_LUT_OPERAND1_MASK (0xff0000u)
+#define FLEXSPI_LUT_OPERAND1_SHIFT (16U)
+#define FLEXSPI_LUT_OPERAND1(x) (((uint32_t) \
(((uint32_t)(x)) << FLEXSPI_LUT_OPERAND1_SHIFT)) & \
FLEXSPI_LUT_OPERAND1_MASK)
-# define FLEXSPI_LUT_NUM_PADS1_MASK (0x3000000u)
-# define FLEXSPI_LUT_NUM_PADS1_SHIFT (24u)
-# define FLEXSPI_LUT_NUM_PADS1(x) (((uint32_t) \
+#define FLEXSPI_LUT_NUM_PADS1_MASK (0x3000000u)
+#define FLEXSPI_LUT_NUM_PADS1_SHIFT (24u)
+#define FLEXSPI_LUT_NUM_PADS1(x) (((uint32_t) \
(((uint32_t)(x)) << FLEXSPI_LUT_NUM_PADS1_SHIFT)) & \
FLEXSPI_LUT_NUM_PADS1_MASK)
-# define FLEXSPI_LUT_OPCODE1_MASK (0xfc000000u)
-# define FLEXSPI_LUT_OPCODE1_SHIFT (26u)
-# define FLEXSPI_LUT_OPCODE1(x) (((uint32_t)(((uint32_t)(x)) << FLEXSPI_LUT_OPCODE1_SHIFT)) & \
+#define FLEXSPI_LUT_OPCODE1_MASK (0xfc000000u)
+#define FLEXSPI_LUT_OPCODE1_SHIFT (26u)
+#define FLEXSPI_LUT_OPCODE1(x) (((uint32_t)(((uint32_t)(x)) << FLEXSPI_LUT_OPCODE1_SHIFT)) & \
FLEXSPI_LUT_OPCODE1_MASK)
-# define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1) \
+#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1) \
(FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | \
FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
/* */
-# define NOR_CMD_INDEX_READ CMD_INDEX_READ
-# define NOR_CMD_INDEX_READSTATUS CMD_INDEX_READSTATUS
-# define NOR_CMD_INDEX_WRITEENABLE CMD_INDEX_WRITEENABLE
-# define NOR_CMD_INDEX_ERASESECTOR 3
-# define NOR_CMD_INDEX_PAGEPROGRAM CMD_INDEX_WRITE
-# define NOR_CMD_INDEX_CHIPERASE 5
-# define NOR_CMD_INDEX_DUMMY 6
-# define NOR_CMD_INDEX_ERASEBLOCK 7
+#define NOR_CMD_INDEX_READ CMD_INDEX_READ
+#define NOR_CMD_INDEX_READSTATUS CMD_INDEX_READSTATUS
+#define NOR_CMD_INDEX_WRITEENABLE CMD_INDEX_WRITEENABLE
+#define NOR_CMD_INDEX_ERASESECTOR 3
+#define NOR_CMD_INDEX_PAGEPROGRAM CMD_INDEX_WRITE
+#define NOR_CMD_INDEX_CHIPERASE 5
+#define NOR_CMD_INDEX_DUMMY 6
+#define NOR_CMD_INDEX_ERASEBLOCK 7
/* READ LUT sequence id in lookupTable stored in config block */
-# define NOR_CMD_LUT_SEQ_IDX_READ CMD_LUT_SEQ_IDX_READ
+#define NOR_CMD_LUT_SEQ_IDX_READ CMD_LUT_SEQ_IDX_READ
/* Read Status LUT sequence id in lookupTable stored in config block */
-# define NOR_CMD_LUT_SEQ_IDX_READSTATUS CMD_LUT_SEQ_IDX_READSTATUS
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS CMD_LUT_SEQ_IDX_READSTATUS
/* 2 Read status DPI/QPI/OPI sequence id in LUT stored in config block */
-# define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 2
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 2
/* 3 Write Enable sequence id in lookupTable stored in config block */
-# define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE CMD_LUT_SEQ_IDX_WRITEENABLE
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE CMD_LUT_SEQ_IDX_WRITEENABLE
/* 4 Write Enable DPI/QPI/OPI sequence id in LUT stored in config block */
-# define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE_XPI 4
/* 5 Erase Sector sequence id in lookupTable stored in config block */
-# define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
/* 8 Erase Block sequence id in lookupTable stored in config block */
-# define NOR_CMD_LUT_SEQ_IDX_ERASEBLOCK 8
+#define NOR_CMD_LUT_SEQ_IDX_ERASEBLOCK 8
/* 9 Program sequence id in lookupTable stored in config block */
-# define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM CMD_LUT_SEQ_IDX_WRITE
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM CMD_LUT_SEQ_IDX_WRITE
/* 11 Chip Erase sequence in lookupTable id stored in config block */
-# define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
/* 13 Read SFDP sequence in lookupTable id stored in config block */
-# define NOR_CMD_LUT_SEQ_IDX_READ_SFDP 13
+#define NOR_CMD_LUT_SEQ_IDX_READ_SFDP 13
/* 14 Restore 0-4-4/0-8-8 mode sequence id in LUT stored in config block */
-# define NOR_CMD_LUT_SEQ_IDX_RESTORE_NOCMD 14
+#define NOR_CMD_LUT_SEQ_IDX_RESTORE_NOCMD 14
/* 15 Exit 0-4-4/0-8-8 mode sequence id in LUT stored in config blobk */
-# define NOR_CMD_LUT_SEQ_IDX_EXIT_NOCMD 15
+#define NOR_CMD_LUT_SEQ_IDX_EXIT_NOCMD 15
/****************************************************************************
* Public Types
diff --git a/boards/arm/imxrt/teensy-4.x/src/teensy-4.h b/boards/arm/imxrt/teensy-4.x/src/teensy-4.h
index 5f40526..15fcbd8 100644
--- a/boards/arm/imxrt/teensy-4.x/src/teensy-4.h
+++ b/boards/arm/imxrt/teensy-4.x/src/teensy-4.h
@@ -19,23 +19,23 @@
****************************************************************************/
#ifndef __BOARDS_ARM_IMXRT_TEENSY_4X_SRC_TEENSY_4_H
-# define __BOARDS_ARM_IMXRT_TEENSY_4X_SRC_TEENSY_4_H
+#define __BOARDS_ARM_IMXRT_TEENSY_4X_SRC_TEENSY_4_H
/****************************************************************************
* Included Files
****************************************************************************/
-# include <nuttx/config.h>
+#include <nuttx/config.h>
-# include <stdint.h>
-# include <stdbool.h>
+#include <stdint.h>
+#include <stdbool.h>
-# include <arch/irq.h>
-# include <nuttx/irq.h>
+#include <arch/irq.h>
+#include <nuttx/irq.h>
-# include "imxrt_gpio.h"
-# include "imxrt_iomuxc.h"
-# include "hardware/imxrt_pinmux.h"
+#include "imxrt_gpio.h"
+#include "imxrt_iomuxc.h"
+#include "hardware/imxrt_pinmux.h"
/****************************************************************************
* Pre-processor Definitions
@@ -57,33 +57,33 @@
* Only a single LED, D3, is under software control.
*/
-# define GPIO_LED (GPIO_OUTPUT | IOMUX_LED_DEFAULT | \
+#define GPIO_LED (GPIO_OUTPUT | IOMUX_LED_DEFAULT | \
GPIO_OUTPUT_ZERO | GPIO_PORT2 | GPIO_PIN3) /* BO_03 */
-# define LED_DRIVER_PATH "/dev/userleds"
+#define LED_DRIVER_PATH "/dev/userleds"
/* LPSPI3 CS: GPIO_AD_B1_12 */
-# define IOMUX_LPSPI3_CS (IOMUX_SLEW_FAST | IOMUX_DRIVE_50OHM | \
+#define IOMUX_LPSPI3_CS (IOMUX_SLEW_FAST | IOMUX_DRIVE_50OHM | \
IOMUX_SPEED_MEDIUM | IOMUX_PULL_UP_100K | \
_IOMUX_PULL_ENABLE)
-# define GPIO_LPSPI3_CS (GPIO_OUTPUT | GPIO_OUTPUT_ONE | \
+#define GPIO_LPSPI3_CS (GPIO_OUTPUT | GPIO_OUTPUT_ONE | \
GPIO_PORT1 | GPIO_PIN28 | IOMUX_LPSPI3_CS)
/* LPSPI4 CS: GPIO_B0_00 */
... 5720 lines suppressed ...