From 8d3bf05fd22ce96ca0565a7dac5079090da9ada4 Mon Sep 17 00:00:00 2001 From: Petro Karashchenko Date: Sat, 15 Jan 2022 04:44:35 +0200 Subject: [PATCH] include: fix double include pre-processor guards Signed-off-by: Petro Karashchenko --- 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 +- .../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 +- .../arm/src/efm32/hardware/efm32g_memorymap.h | 6 +- .../src/efm32/hardware/efm32gg_memorymap.h | 6 +- .../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 +- .../src/imxrt/hardware/rt102x/imxrt102x_ccm.h | 6 +- .../imxrt/hardware/rt102x/imxrt102x_dmamux.h | 6 +- .../imxrt/hardware/rt102x/imxrt102x_gpio.h | 6 +- .../imxrt/hardware/rt102x/imxrt102x_iomuxc.h | 6 +- .../hardware/rt102x/imxrt102x_memorymap.h | 6 +- .../imxrt/hardware/rt102x/imxrt102x_pinmux.h | 6 +- .../src/imxrt/hardware/rt105x/imxrt105x_ccm.h | 6 +- .../imxrt/hardware/rt105x/imxrt105x_dmamux.h | 6 +- .../imxrt/hardware/rt105x/imxrt105x_gpio.h | 6 +- .../imxrt/hardware/rt105x/imxrt105x_iomuxc.h | 6 +- .../hardware/rt105x/imxrt105x_memorymap.h | 6 +- .../imxrt/hardware/rt105x/imxrt105x_pinmux.h | 6 +- .../src/imxrt/hardware/rt106x/imxrt106x_ccm.h | 6 +- .../imxrt/hardware/rt106x/imxrt106x_dmamux.h | 6 +- .../imxrt/hardware/rt106x/imxrt106x_gpio.h | 6 +- .../imxrt/hardware/rt106x/imxrt106x_iomuxc.h | 6 +- .../hardware/rt106x/imxrt106x_memorymap.h | 6 +- .../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 +- .../hardware/lpc178x_40xx_iocon.h | 6 +- .../hardware/lpc178x_40xx_memorymap.h | 6 +- .../hardware/lpc178x_40xx_pinconfig.h | 6 +- .../hardware/lpc178x_40xx_syscon.h | 6 +- .../src/lpc17xx_40xx/hardware/lpc17_40_adc.h | 6 +- .../src/lpc17xx_40xx/hardware/lpc17_40_can.h | 6 +- .../src/lpc17xx_40xx/hardware/lpc17_40_dac.h | 6 +- .../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 +- .../hardware/lpc4310203050_pinconfig.h | 6 +- .../hardware/lpc4337jet100_pinconfig.h | 6 +- .../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 +- .../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 +- .../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 +- .../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 +- .../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 +- .../src/stm32/hardware/stm32f33xxx_hrtim.h | 6 +- .../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 +- .../src/stm32f0l0g0/hardware/stm32_uart_v1.h | 4 +- .../src/stm32f0l0g0/hardware/stm32_uart_v2.h | 4 +- .../hardware/stm32f03x_memorymap.h | 6 +- .../hardware/stm32f05xf07xf09x_memorymap.h | 6 +- .../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 +- .../src/stm32f7/hardware/stm32f72xx73xx_adc.h | 6 +- .../stm32f7/hardware/stm32f72xx73xx_dbgmcu.h | 6 +- .../src/stm32f7/hardware/stm32f72xx73xx_dma.h | 6 +- .../stm32f7/hardware/stm32f72xx73xx_flash.h | 6 +- .../hardware/stm32f72xx73xx_memorymap.h | 4 +- .../stm32f7/hardware/stm32f74xx75xx_dbgmcu.h | 6 +- .../src/stm32f7/hardware/stm32f74xx75xx_dma.h | 6 +- .../stm32f7/hardware/stm32f74xx75xx_flash.h | 6 +- .../src/stm32f7/hardware/stm32f74xx77xx_i2c.h | 4 +- .../stm32f7/hardware/stm32f76xx77xx_dbgmcu.h | 6 +- .../src/stm32f7/hardware/stm32f76xx77xx_dma.h | 6 +- .../stm32f7/hardware/stm32f76xx77xx_flash.h | 6 +- .../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 +- .../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 +- .../src/stm32l4/hardware/stm32l4_memorymap.h | 6 +- .../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 +- .../src/stm32l5/hardware/stm32l562xx_rcc.h | 4 +- .../src/stm32l5/hardware/stm32l5_memorymap.h | 6 +- .../arm/src/tiva/hardware/cc13x0/cc13x0_ioc.h | 6 +- .../tiva/hardware/cc13x0/cc13x0_memorymap.h | 6 +- .../src/tiva/hardware/cc13x0/cc13x0_timer.h | 6 +- .../cc13x2_cc26x2/cc13x2_cc26x2_i2c.h | 6 +- .../cc13x2_cc26x2/cc13x2_cc26x2_ioc.h | 6 +- .../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 +- .../src/tiva/hardware/tm4c/tm4c123_sysctrl.h | 6 +- .../src/tiva/hardware/tm4c/tm4c123_timer.h | 6 +- .../src/tiva/hardware/tm4c/tm4c129_sysctrl.h | 6 +- .../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 +- .../src/esp32c3/hardware/apb_ctrl_reg.h | 6 +- arch/risc-v/src/esp32c3/hardware/bb_reg.h | 6 +- .../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 +- .../src/esp32c3/hardware/regi2c_bbpll.h | 6 +- .../src/esp32c3/hardware/regi2c_brownout.h | 6 +- .../risc-v/src/esp32c3/hardware/regi2c_ctrl.h | 6 +- .../src/esp32c3/hardware/regi2c_dig_reg.h | 6 +- .../src/esp32c3/hardware/regi2c_lp_bias.h | 6 +- .../src/esp32c3/hardware/regi2c_saradc.h | 6 +- .../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 +- .../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 +- .../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 +- .../esp32s2/hardware/esp32s2_cache_memory.h | 6 +- .../src/esp32s2/hardware/esp32s2_extmem.h | 6 +- .../src/esp32s2/hardware/esp32s2_iomux.h | 6 +- .../src/esp32s2/hardware/esp32s2_rtc_io.h | 6 +- .../src/esp32s2/hardware/esp32s2_rtccntl.h | 6 +- .../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 +- .../spresense/include/cxd56_bcm20706.h | 6 +- boards/arm/imxrt/teensy-4.x/include/board.h | 6 +- .../teensy-4.x/src/imxrt_flexspi_nor_boot.h | 132 +++++++------- .../teensy-4.x/src/imxrt_flexspi_nor_flash.h | 170 +++++++++--------- boards/arm/imxrt/teensy-4.x/src/teensy-4.h | 40 ++--- .../arm/kinetis/kwikstik-k40/include/board.h | 6 +- .../kinetis/kwikstik-k40/src/kwikstik-k40.h | 6 +- .../arm/kinetis/twr-k60n512/include/board.h | 6 +- .../arm/kinetis/twr-k60n512/src/twr-k60n512.h | 6 +- .../lpc17xx_40xx/lincoln60/src/lincoln60.h | 6 +- .../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 +- .../zkit-arm-1769/src/zkit-arm-1769.h | 6 +- .../lpc31xx/ea3131/include/board_memorymap.h | 6 +- .../lpc31xx/ea3152/include/board_memorymap.h | 6 +- .../lpc43xx/bambino-200e/src/bambino-200e.h | 6 +- .../lpc4330-xplorer/src/lpc4330-xplorer.h | 6 +- .../arm/lpc43xx/lpc4357-evb/src/lpc4357-evb.h | 6 +- .../arm/lpc43xx/lpc4370-link2/include/board.h | 6 +- .../lpc43xx/lpc4370-link2/src/lpc4370-link2.h | 6 +- boards/arm/nrf52/nrf52832-dk/include/board.h | 6 +- .../arm/nuc1xx/nutiny-nuc120/include/board.h | 6 +- boards/arm/phy62xx/phy6222/include/board.h | 6 +- boards/arm/phy62xx/phy6222/src/phy6222.h | 6 +- .../common/include/rp2040_lcd_backpack.h | 6 +- .../src/sam4s-xplained-pro.h | 6 +- .../stm32/clicker2-stm32/src/clicker2-stm32.h | 6 +- .../arm/stm32/common/include/board_hall3ph.h | 6 +- .../arm/stm32/common/include/board_qencoder.h | 6 +- .../arm/stm32/common/include/stm32_apa102.h | 6 +- .../arm/stm32/common/include/stm32_apds9960.h | 6 +- .../arm/stm32/common/include/stm32_bh1750.h | 6 +- .../arm/stm32/common/include/stm32_bmp180.h | 6 +- boards/arm/stm32/common/include/stm32_dhtxx.h | 6 +- .../arm/stm32/common/include/stm32_hcsr04.h | 6 +- .../arm/stm32/common/include/stm32_ihm07m1.h | 6 +- .../arm/stm32/common/include/stm32_ihm08m1.h | 6 +- .../arm/stm32/common/include/stm32_ihm16m1.h | 6 +- .../arm/stm32/common/include/stm32_ina219.h | 6 +- .../arm/stm32/common/include/stm32_l3gd20.h | 6 +- .../stm32/common/include/stm32_lcd_backpack.h | 6 +- .../arm/stm32/common/include/stm32_lis3dsh.h | 6 +- boards/arm/stm32/common/include/stm32_lm75.h | 6 +- .../arm/stm32/common/include/stm32_max31855.h | 6 +- .../arm/stm32/common/include/stm32_max6675.h | 6 +- .../arm/stm32/common/include/stm32_mlx90614.h | 6 +- .../arm/stm32/common/include/stm32_mpl115a.h | 6 +- .../arm/stm32/common/include/stm32_nrf24l01.h | 6 +- .../arm/stm32/common/include/stm32_nunchuck.h | 6 +- .../arm/stm32/common/include/stm32_ssd1306.h | 6 +- boards/arm/stm32/common/include/stm32_tone.h | 6 +- .../arm/stm32/common/include/stm32_veml6070.h | 6 +- .../arm/stm32/common/include/stm32_ws2812.h | 6 +- .../arm/stm32/common/include/stm32_xen1210.h | 6 +- .../stm32/common/include/stm32_zerocross.h | 6 +- .../arm/stm32/fire-stm32v2/src/fire-stm32v2.h | 6 +- .../stm32/hymini-stm32v/src/hymini-stm32v.h | 6 +- .../arm/stm32/nucleo-f103rb/include/board.h | 4 +- .../arm/stm32/nucleo-f207zg/include/board.h | 4 +- .../arm/stm32/nucleo-f302r8/include/board.h | 4 +- .../arm/stm32/nucleo-f303re/include/board.h | 4 +- .../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 +- .../stm32/stm3220g-eval/src/stm3220g-eval.h | 6 +- .../stm32f429i-disco/src/stm32f429i-disco.h | 4 +- .../src/viewtool_stm32f107.h | 6 +- .../stm32f7/stm32f746-ws/src/stm32f746-ws.h | 6 +- .../stm32f746g-disco/src/stm32f746g-disco.h | 4 +- .../stm32f769i-disco/src/stm32f769i-disco.h | 4 +- .../stm32h7/nucleo-h743zi/src/stm32_romfs.h | 6 +- .../arm/stm32l4/stm32l476-mdk/include/board.h | 14 +- .../stm32l4/stm32l476-mdk/src/stm32l476-mdk.h | 6 +- .../stm32l4/stm32l4r9ai-disco/include/board.h | 6 +- .../arm/tiva/ekk-lm3s9b96/src/ekk-lm3s9b96.h | 6 +- .../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 +- .../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 +- .../rx65n/rx65n-rsk1mb/include/board.h | 6 +- .../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 +- .../risc-v/mpfs/m100pfsevp/src/board_config.h | 6 +- boards/sim/sim/sim/include/nsh_romfsimg.h | 6 +- .../intel64/qemu-intel64/include/board.h | 6 +- .../intel64/qemu-intel64/src/qemu_intel64.h | 6 +- .../esp32/common/include/esp32_bmp180.h | 6 +- .../esp32/common/include/esp32_board_i2c.h | 6 +- .../common/include/esp32_board_oneshot.h | 6 +- .../common/include/esp32_board_spiflash.h | 6 +- .../esp32/common/include/esp32_board_wdt.h | 6 +- .../esp32/common/include/esp32_board_wlan.h | 6 +- .../esp32/common/include/esp32_ht16k33.h | 6 +- .../esp32/common/include/esp32_lcd_backpack.h | 6 +- .../esp32/common/include/esp32_mcp2515.h | 6 +- .../xtensa/esp32/common/include/esp32_sht3x.h | 6 +- .../src/esp32-ethernet-kit.h | 6 +- .../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 +- .../wireless/ieee80211/bcm43xxx/bcmf_bdc.h | 6 +- .../wireless/ieee80211/bcm43xxx/bcmf_cdc.h | 6 +- .../wireless/ieee80211/bcm43xxx/bcmf_core.h | 6 +- .../wireless/ieee80211/bcm43xxx/bcmf_driver.h | 6 +- .../wireless/ieee80211/bcm43xxx/bcmf_ioctl.h | 6 +- .../wireless/ieee80211/bcm43xxx/bcmf_netdev.h | 6 +- .../wireless/ieee80211/bcm43xxx/bcmf_sdio.h | 6 +- .../ieee80211/bcm43xxx/bcmf_sdio_core.h | 6 +- .../ieee80211/bcm43xxx/bcmf_sdio_regs.h | 6 +- .../wireless/ieee80211/bcm43xxx/bcmf_sdpcm.h | 6 +- .../wireless/ieee80211/bcm43xxx/bcmf_utils.h | 6 +- .../wireless/ieee802154/mrf24j40/mrf24j40.h | 6 +- .../ieee802154/mrf24j40/mrf24j40_getset.h | 6 +- .../ieee802154/mrf24j40/mrf24j40_radif.h | 6 +- .../ieee802154/mrf24j40/mrf24j40_reg.h | 6 +- .../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 +- .../spirit/include/spirit_linearfifo.h | 6 +- .../wireless/spirit/include/spirit_pktstack.h | 6 +- .../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 +- .../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 +- .../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 +- .../nxfonts/nxfonts_x11-misc-fixed-10x20.h | 6 +- .../nxfonts/nxfonts_x11-misc-fixed-4x6.h | 6 +- .../nxfonts/nxfonts_x11-misc-fixed-5x7.h | 6 +- .../nxfonts/nxfonts_x11-misc-fixed-5x8.h | 6 +- .../nxfonts/nxfonts_x11-misc-fixed-6x10.h | 6 +- .../nxfonts/nxfonts_x11-misc-fixed-6x12.h | 6 +- .../nxfonts/nxfonts_x11-misc-fixed-6x13.h | 6 +- .../nxfonts/nxfonts_x11-misc-fixed-6x13b.h | 6 +- .../nxfonts/nxfonts_x11-misc-fixed-6x13o.h | 6 +- .../nxfonts/nxfonts_x11-misc-fixed-6x9.h | 6 +- .../nxfonts/nxfonts_x11-misc-fixed-7x13.h | 6 +- .../nxfonts/nxfonts_x11-misc-fixed-7x13b.h | 6 +- .../nxfonts/nxfonts_x11-misc-fixed-7x13o.h | 6 +- .../nxfonts/nxfonts_x11-misc-fixed-7x14.h | 6 +- .../nxfonts/nxfonts_x11-misc-fixed-7x14b.h | 6 +- .../nxfonts/nxfonts_x11-misc-fixed-8x13.h | 6 +- .../nxfonts/nxfonts_x11-misc-fixed-8x13b.h | 6 +- .../nxfonts/nxfonts_x11-misc-fixed-8x13o.h | 6 +- .../nxfonts/nxfonts_x11-misc-fixed-9x15.h | 6 +- .../nxfonts/nxfonts_x11-misc-fixed-9x15b.h | 6 +- .../nxfonts/nxfonts_x11-misc-fixed-9x18.h | 6 +- .../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, 2242 insertions(+), 2252 deletions(-) diff --git a/arch/arm/include/armv7-m/nvicpri.h b/arch/arm/include/armv7-m/nvicpri.h index e081aaf5975..0ede47af872 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 c2b2d91948b..24f0e879ef4 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 57cdd6398c0..61ed9f3bd2d 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 bc2e301a7af..27cd6b30a70 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 0617fed37e5..33d5d317505 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 b33a844ac4a..df627868df5 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 6b134a52f46..ffddc2a4ed6 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 e72ec122f24..75116aed1b6 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 8fb5255c6f2..cadd3dbdeb6 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 2cd6f32bd5c..7a5eecc97c2 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 91b7e28f4ad..c529c6b6699 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 c1b6100cce9..82d0101ced5 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 37e38290cb0..f893f51ee03 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 1ad68e922e0..a5d8448ae51 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 7764965a0cc..4dc315b267d 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 a26c7edecd4..688a651e079 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 71c43471166..95a4175cc1d 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 3d95a09b7bb..70e98e5d48b 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 5ac66c7449c..b8d91fddacb 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 99358e6dc3d..320fc04de25 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 870fea62074..ff3292137d8 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 e2cb025f531..4ed1b4d394c 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 11fffd013e7..7cd1cc13b90 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 9ed7ae63bcb..b837a52ef07 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 530dba460c8..be1e24d2c5d 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 7e32a76af66..dbdd2327139 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 5824353908f..39d4b97c784 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 1e3da826976..789268e567c 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 7caa1fcb6e6..de14a4c77be 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 428a06aff7a..6e5dcdc0f72 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 a542e660716..d6b080946e5 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 fa509700b97..f97890ef46c 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 cd611407736..6c55b5340da 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 9c3601d06bc..af325a71e6b 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 3b3941424b9..88d6115192d 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 fbfdc5f737b..c5e682f7345 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 1d404790111..a6889248369 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 63547df4df8..c85bbe0c9df 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 c6083a0029e..53be0e250a8 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 f12de7c29b3..b42482f433f 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 a21bc259307..c99b5ea5f47 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 22a7f1247d2..5c9dc21036a 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 32026e0f57d..bf184a52446 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 2e5a4b075c9..dd2208f2db6 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 efe4fc32c8f..de84065fb7c 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 05472cdeaf9..e75532eb2bf 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 b7a7357e18e..2a3033550aa 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 f7b2db83673..3cfe957161f 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 72fab3a93eb..6bfc4329ea5 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 761c50a51dd..5599de2bcd7 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 939c5f89cb7..3ba4dac90d8 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 0f4dcb9f3ee..99bfd55661a 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 f1766789c45..48fea943153 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 25dff510916..4eb9d0b1246 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 b8ae69d42ba..03f78b8da3f 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 42d94a76d56..dc45fa6455c 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 7ae8387ae35..5df0bb84c1d 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 0462d8d46c3..0a5c56fd0a3 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 531ef0a37e4..79535fe4642 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 190f111b312..24a0af0f8cf 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 ed223f478a3..fb5a5a645c8 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 566b50b7264..7855c2948bb 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 aaf2d796fce..e2df318117b 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 53405eeb18b..52a0f349569 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 b12195daafb..3ffa970ec5f 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 268ba267db8..5a2a97e9b36 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 b446d999d9d..eb6d3792925 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 699cdec6ac2..e223687cf6c 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 5b52a1ceace..8c60f6b24ff 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 62d305f96f0..6b18065d6f6 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 ce028cdb87f..ea322ada162 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 7409f8847d8..ae1f6a8c9ee 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 3674c87c792..82b5634899a 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 3e4dda2af47..22c7be308bd 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 a2092068cab..57b495622a0 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 c42cbf63cd6..bbf64e563c1 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 5e07be26ccc..059b8eb14ae 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 56f70352b3a..df8daae14eb 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 4f1363b61bb..bf3218aa2a9 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 1a5b0f3ac4c..abffe05921e 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 b5851140cff..bfcf0795f1d 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 7a30dd1a056..e63d6e74442 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 03c8de80396..19e4089a1d9 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 2db5c78713a..c764f1d1fa8 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 7a3ed76a6de..d781c319340 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 2c547bd828c..73029916554 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 1d4b7ff4cd0..4cd41fe958d 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 9fed4f46d32..a99630dd09e 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 b2d7941d1a3..546d98c67df 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 7851be548a4..4f276522122 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 59ad102020b..50d281d902f 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 5e086f5b13f..70c6bbcded3 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 fa850e3e648..3a6432447d8 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 2ee1bab3715..f323f20deac 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 99fce0cb2da..23c4e12b0bd 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 5307b2df780..46a80e65b39 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 e1b89a0ca7e..61e725a839f 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 f6afcb4a5be..ef7d8327387 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 63a9428bbdc..54de9b99d41 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 40ba0c73bfc..707007a22fc 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 1b9703b634e..8f35c84e930 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 35cb35253be..f32b0593a70 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 f4b9ef47b79..431df1469a9 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 ce169e007af..84540d026f7 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 5e828c29e08..6a9820ab773 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 5ca61c5cd24..135c06f151b 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 2a78cd54966..43c07546c5e 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 fc5b66fa304..201457dadd7 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 a6399d767bf..e1cd320925d 100644 --- a/arch/arm/src/imxrt/imxrt_enc.h +++ b/arch/arm/src/imxrt/imxrt_enc.h @@ -25,10 +25,7 @@ * Included Files ****************************************************************************/ -#include - -#include "chip.h" -#include "hardware/imxrt_enc.h" +#include /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/imxrt/imxrt_iomuxc.h b/arch/arm/src/imxrt/imxrt_iomuxc.h index be073d74a94..354667e62c7 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 b6a3cf25cb7..f69fff862c1 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 ae5191f43c1..c12f985bc5b 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 024de3e8166..7f0bb87063c 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 67577270692..b2006cfd462 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 a08e50c0b79..323740cc1bc 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 627ffd8e95a..0b90f1a46d5 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 bd7ce685156..43b968ecbf0 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 64af2120123..65999f33c6e 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 f2945c564b8..253c72d2ad7 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 afb467ebdb2..ee6a15b8a3d 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 c079c7a6b68..cea76f9b3a2 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 913817fac59..9d902fb95e9 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 35002d52b4c..eb101e2e78e 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 61a8ddcce04..b840c8fc530 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 b9dbef72662..6d6fe69098d 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 1870c868476..2b32e80a015 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 726153b39f2..47e698abe78 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 384f6a9bdf6..d71cd46a2a5 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 20ed62dbedf..aac62f98ae6 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 0eee332710b..d47497636a4 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 9bbad95d51f..32ae1a2e8d0 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 4ea34bffe6e..2971bb2b0c3 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 a69ab218931..6a59d59e760 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 13849b361d0..fd4fbfce34b 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 7a8827364bd..17d58a0de62 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 58e954b793f..21006f3b291 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 3333dc1bad4..e156ec8d221 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 94137a750b9..efb1e1c1ab5 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 e8f87bae88a..27ce4a6973c 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 f5a1ffe31e2..78b11a20011 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 50f3c0e6828..5ed5951c56b 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 663c86edb11..0d44a871761 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 d490f77bfbc..7ed7e117a29 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 30c9dd32d41..c2c29c28926 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 db600a224a2..84195a51197 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 d354f0b8bea..a7fe3c2322e 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 c699ceebe71..9cd5c8af40b 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 052f6d2221b..746af14180a 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 da0c4c1ff85..b190854bac6 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 64b86e2c3a9..334eb9c6f0c 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 12874cb911f..d6b308e7364 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 120990d5938..1cdd80ca812 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 77e280e0290..f683536bd95 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 6c3e4dcc4cc..d839b511481 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 4a3a61a127e..45c3f78d21e 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 faf3fd4e6b8..93a6125b7ac 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 e5345b1eeef..99dd1952e45 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 1d3ff5955db..8bee173e14d 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 91ebef2e67f..f646f9329c8 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 5490b01f157..01ce1aff7f1 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 e12a29abc2e..cfe5bc0d785 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 8dde9215a53..cf70aefaf14 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 d88cb7e0d1d..bb88ba9e783 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 fc6d3a5c1a9..be9a7349dba 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 94aa9c72c75..72dc1e36223 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 c9c82f5dbd8..3715f88cb0d 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 d79d4a9cd62..ec453d5dba6 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 ce6f662bd0c..b48a10193da 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 6f5a04e1a8f..99d62dff93f 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 55c7e434847..4ae50c01a6a 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 496d114b6a4..3f6951000a5 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 6f4b5300bcd..a951cb2bbe9 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 d821a66051c..92d215aec38 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 c255bf01eef..71104a22fd2 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 aa1e42d61f3..80602ef7496 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 8024c34e89f..fb3ffc08fab 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 6e9bf164e0c..b32d36d06f9 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 bdbc711cea0..431c21af7d1 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 bbba4c83a21..f8e2440550a 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 aab5e372533..4563c838c3a 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 83b2e0c0c44..7d7725a96b5 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 56eba3fc374..518575c3384 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 3f41dbad21a..8fcab02af59 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 bfa4c31f87f..21fe88f9f62 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 2deebb7c719..28093fc51d7 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 9dd0a15a6ab..770d35471f8 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 ca5cf15e9e4..dac328feb12 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 ed97f0b681f..434f2cfc04b 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 96133870f69..3861a2b5b2b 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 7aa45706035..0802a722fb9 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 57bc670e57c..eb814e60685 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 072d37d4631..b8032c50435 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 cd0992457ee..5f6f1aa8aff 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 2f36dd2f3ff..e208d46d26e 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 545c15c95b6..e681b347c1f 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 56b50664b3d..b7f3e2c3e99 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 07a914a3c55..09bfe9de919 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 024e79a90b1..969d4a07b19 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 @@ -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 c4b18312bd9..37388f4c6b3 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 bbfaee3efc1..3a870b3021e 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 3c8b7fc8d37..50c5605d2dd 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 b482dcc3bbd..6bfd687d25f 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 253a6645b26..e7ed5f709a0 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 b9b675e5216..92dad6da436 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 1b1d3dad808..8597845fc30 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 7870d63e70f..210e32bc0de 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 2ad57a47835..f46642f6293 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 f82f57be68e..0fc1bb4c31f 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 18a6f8b6849..0439f13ca67 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 133c33bd6e3..bfea5407b88 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 bd2e40fa0c1..4f0da6508cf 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 7b0ea3a437a..6640fbc6061 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 88852e59feb..2aedf18c8be 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 0a69f35e57e..0e75912ca7f 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 7c79db948a8..a9b38037573 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 9e13009a0b6..b71635068d4 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 b814838caf8..256445820cc 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 56b9f734355..6b933461da2 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 b840e837480..a471a58fa63 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 72863b85ef1..8c80621ea8d 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 061e75da8b7..bb5f6b4ef67 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 e4d35d7a7a4..a8ec296b6df 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 f61cedf8684..6d1e8cf2234 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 1906c5b2910..c1366c809f8 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 45d3f685fb9..8d7c53c106c 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 45b8a5894f6..823c232f1c9 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 1b02d36efff..b5c356a08c6 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 046ddc0d950..9d198302dd9 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 8fa84ef38fd..ac00667b291 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 1e5c59b3b3f..919d747529b 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 27a2c30637e..5d19a734ce3 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 e671a9dabb8..be5c8186a20 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 9767c2f1552..deaa49bcd00 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 aa6e0c998a4..974c0d171c8 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 178d060cacf..9fa38fb02fb 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 76174afc17f..4b0b3ffba5d 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 34c52a575c9..ebcf5ed8fa1 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 2bfb1c95bb3..dfe1ce0599e 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 2db5fa2ffe0..483ea4e479f 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 834909f51ee..c08ff81b8ee 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 acaab7e888f..5febd2c5aaa 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 df6d3ce8b10..390315cad81 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 8b843239232..85f58edd2d9 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 a85a0aec33f..c325da54f5a 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 df392e6f7ed..3db5f24d082 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 1d65d2feddd..dd934f4d217 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 6bef5b110c7..946045b8d7d 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 159cc1c0b4c..9f693d79201 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 bf3c967128a..941ef62bf59 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 00fce451ddd..40e0be430b6 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 4a3ed41db25..667cec3b528 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 8a1ccf6ff8e..bb4f4e43730 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 5fa3b2a6e70..fe88debd324 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 7408e9055f7..8b02026cb9b 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 4bcec036d8f..b262bef986a 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 2fca2ca1444..653edcefab6 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 6eb64c69db9..1ea4f14f7b8 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 1ec6bffc380..1db03bd081d 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 969756fa9b9..2cbd96229c5 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 946d44859d6..12d3231254a 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 a473b9faac7..f78fabe0756 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 094fc7cd10b..aafb605505f 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 70b41aef39f..e8f104cb272 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 bad596819f0..14199fb8640 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 fdf63d1e366..3dc25c2daff 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 475023b8573..6023db220f3 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 d2dc00d234b..a7be5abb4f6 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 b3db6373c31..3d190e89666 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 a410d8168e9..c67a595e4e8 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 594fadb6482..c309ac14cd1 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 7c255d5a113..ed9d2ab16df 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 0119abb74e3..225d6ba01a6 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 ca9cba3b66d..f139bf12840 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 2a74511651a..66b6883f632 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 07871f434a0..9a1ef8aef42 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 e49ea7d46b9..6ae0bb9b408 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 534ff13ac16..52bcdfa068f 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 fd78bfa6c42..b251b10ebad 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 4038c0818aa..bb6e12ebac1 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 0fe0a1366f3..3f0541d0dc5 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 9ae637b15bd..191eb9dff9c 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 aa83bc294d0..6bda43e5b27 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 3239cc3c98c..c7a164e659e 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 c3ac3ebfdff..f41415f61ce 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 c35f7e4ee5a..2e2528a438c 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 8ae052dd6a8..2e6f6d29faf 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 65e6af59bf8..08ce5ace4b3 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 db29ae310c0..5412461bb38 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 99a420c7030..127b885628f 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 3980878ea0f..0ac80a86ea6 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 +/* 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 ec531049da9..7b0f492b3de 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 d9042492358..d168eab53d1 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 2b194b0c6d0..bff3f419ac7 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 58637941382..37b0f8533b5 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 92f6ab46b3c..3d1f6fdca81 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 0e42c2e3ffe..116aef3781b 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 30a537874c8..e2314985d3e 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 b2541e40b7b..ed252ee537d 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 7a84abca2c4..d8788103a59 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 1688fcce0ba..08394f9844e 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 af65691ef0e..96da8de127a 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 141455a14d4..4752ca0a013 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 ddef25bf9d8..46eb78ffaf1 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 28cdd6e59d5..9f43b9290c7 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 685829869d1..7fab31d2e00 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 4e59b829ab5..b1046f96749 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 efdc8aae9aa..3642817c2f5 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 dc6d76ce26c..c123fa8e8e1 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 f879886c778..b3aca329762 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 9f89f297d4a..cf5ff0b11b9 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 62ec8248941..1de13199f1c 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 fb5772236a6..b099d4aaf04 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 7489ca53975..397ec23acc4 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 414f8cf0314..961d1a6572d 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 24ed800047e..1ead8ff331f 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 e60f089fa57..8647f3dcc18 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 ef7b4604924..1e0767a6564 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 cf9ed87538b..1dd8a1a7369 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 f1a3bf6e0f1..60ae36dbfd1 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 b2aecc96baf..3b2f720015b 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 47772234130..aa6717affc0 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 eba12b3ff9e..d71395d52d1 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 ffdc9bd6c44..2d1def6c851 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 b25503fe8c9..36c2f2bbcd2 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 52cbede5b07..6bdbbc09c68 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 2bb0760aed3..c792376287e 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 fd34dcca4c0..c61386ae16d 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 f5b1269fe68..1b073a411a3 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 b2acae06754..3ac4fe72b72 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 27f0e790b54..837c898b816 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 3de41ed7331..0ae0cd0c4f8 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 9609a1508f6..64682b6bb9a 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 72d84a8f5a9..fbfac120941 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 b49c4be77eb..e0dc46ae73c 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 0d63546b5f0..85507a59f11 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 @@ -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 f1487ee9ed9..e4d400caad1 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 e6a0dc543d8..a2f780d9d99 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 485108c5f6e..a72dad7981c 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 ef93882206e..15c60251742 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 cb15c0b59df..457a47681b4 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 c76791fb2f3..7b344cfbbb4 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 ce960298825..16e662b2f42 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 933c34e801c..b0378353bb6 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 876b0d2680d..5e63a2a7bcd 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 c2696e39775..f9c17011d82 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 86a5ca03a8b..642be23f240 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 d120168ff60..6a6c476d760 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 a41f7361c53..4af65547e84 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 -#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 81990e3c89b..33308d2b054 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 b51cf3805db..32ae6b672a9 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 2c5c8eb7d48..a591f9e08c7 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 97bf8a1c102..1e69f5b1090 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 42301919fa4..cf07984b47e 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 555cc3fc77e..95629999bac 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 be2d27c8030..d9842146cc1 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 e1b3183f16e..1323d960aca 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 8408aeeb201..8c4f2c0e5c4 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 #include @@ -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 808a95761cf..88549e04b77 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 262814eeeb6..d74bc01d442 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 cf3e0aabc75..1a6e52968e8 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 3706b3a905e..07d112ab6d8 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 97e60498493..f65c3008e1f 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 68a55cc47e9..e0fa0911326 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 375dc1a4cde..cd36f2692e3 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 fef4feb0b8b..c5a832d5d5b 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 24807b3f1f9..785ac470b29 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 027f4250a2d..1ced0993e64 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 623a9b1701e..b0f16d124f6 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 6447c395130..943c8224584 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 0e479a684ab..fe402b40206 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 31792f1f132..f45863b8b6e 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 4b7c3ecfee5..6ff0867810f 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 d2512af37f8..3abd2f801f2 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 5353e5f4793..23d010359cb 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 3761acbb8fe..01a5b2dcaee 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 df7e28ee53e..17037f1b02c 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 f82e2189571..793f6f840c0 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 94c888714e9..304ad5f5a05 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 5921eabc719..4b726394042 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 117d49ba6cf..77391879ad0 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 46df7f59d96..90dbd1daa86 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 7f93d09fda4..04099a83e8b 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 a3e9aeb334c..795aed97487 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 730f5487079..07f62a96683 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 a9ebfb18e7e..d973dfd0c69 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 d0feabb81b7..cff636438cb 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 f8f0a4b2f83..8bfd210913c 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 cbee7ee0d30..6d9f610092d 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 5900398917e..606568374a8 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 d09d45004ce..c2a6a0f1cc2 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 4ab25ce9a14..c46c4bcc008 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 979f8d368fd..5a375b8c2be 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 92f128991b1..958d5a483e6 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 #include @@ -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 dc8f8755ff2..8ec7b6ea21a 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 af25b390d51..27c84e41fea 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 e661726e12a..c36c63bb522 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 3d2c61e3c62..a82553cd243 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 f61b42e0e8e..bda02f78ce7 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 2812646ddcd..654107723b4 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 5fdd8e2d76f..96873dc81e5 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 818c987236c..cf19d69e8f0 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 e0f6f151305..4d139f8b896 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 482beadbf5d..4120517c01e 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 2bcec25976a..6bfb4c6d973 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 3d59c5d6874..081675d1ecb 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 787389b354e..72e3b7164d7 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 1c964503de9..4dbb8c8dd34 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 2bf58391841..008448cf0bf 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 eec5bd91588..0cac5ae8c11 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 d78a07ed5d0..d796eadb0a4 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 6949311aacd..acec76caf4a 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 3854d7246f4..9991b950098 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 0814c2d20a0..356e0068c20 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 8f4696ad834..faf87e8bc8b 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 +#include /**************************************************************************** * 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 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 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 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 b57eb146731..9011682292c 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 -# include +#include +#include /**************************************************************************** * 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_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_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 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_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 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 5f40526c943..15fcbd8b787 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 +#include -# include -# include +#include +#include -# include -# include +#include +#include -# 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 */ -# define IOMUX_LPSPI4_CS (IOMUX_SLEW_FAST | IOMUX_DRIVE_50OHM | \ +#define IOMUX_LPSPI4_CS (IOMUX_SLEW_FAST | IOMUX_DRIVE_50OHM | \ IOMUX_SPEED_MEDIUM | IOMUX_PULL_UP_100K | \ _IOMUX_PULL_ENABLE) -# define GPIO_LPSPI4_CS (GPIO_OUTPUT | GPIO_OUTPUT_ONE | \ +#define GPIO_LPSPI4_CS (GPIO_OUTPUT | GPIO_OUTPUT_ONE | \ GPIO_PORT2 | GPIO_PIN0 | IOMUX_LPSPI4_CS) /* LCD dispay */ -# define GPIO_LCD_RST (GPIO_OUTPUT | GPIO_OUTPUT_ONE | \ +#define GPIO_LCD_RST (GPIO_OUTPUT | GPIO_OUTPUT_ONE | \ GPIO_PORT2 | GPIO_PIN18 | IOMUX_LPSPI4_CS) /* B1_02 */ -# define GPIO_LCD_CD (GPIO_OUTPUT | GPIO_OUTPUT_ONE | \ +#define GPIO_LCD_CD (GPIO_OUTPUT | GPIO_OUTPUT_ONE | \ GPIO_PORT2 | GPIO_PIN19 | IOMUX_LPSPI4_CS) /* B1_03 */ /* USB OTG ID Pin: GPIO_AD_B1_02 */ @@ -135,7 +135,7 @@ * Public Data ****************************************************************************/ -# ifndef __ASSEMBLY__ +#ifndef __ASSEMBLY__ /**************************************************************************** * Name: imxrt_bringup @@ -145,9 +145,9 @@ * ****************************************************************************/ -# if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) +#if defined(CONFIG_BOARDCTL) || defined(CONFIG_BOARD_LATE_INITIALIZE) int imxrt_bringup(void); -# endif +#endif /**************************************************************************** * Name: imxrt_spidev_initialize diff --git a/boards/arm/kinetis/kwikstik-k40/include/board.h b/boards/arm/kinetis/kwikstik-k40/include/board.h index 6c1bb1c9816..5b37d37b943 100644 --- a/boards/arm/kinetis/kwikstik-k40/include/board.h +++ b/boards/arm/kinetis/kwikstik-k40/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_KINETIS_KWIKSTIK-K40_INCLUDE_BOARD_H -#define __BOARDS_ARM_KINETIS_KWIKSTIK-K40_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_KINETIS_KWIKSTIK_K40_INCLUDE_BOARD_H +#define __BOARDS_ARM_KINETIS_KWIKSTIK_K40_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -240,4 +240,4 @@ #define PIN_I2C1_SCL PIN_I2C1_SCL_2 #define PIN_I2C1_SDA PIN_I2C1_SDA_2 -#endif /* __BOARDS_ARM_KINETIS_KWIKSTIK-K40_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_KINETIS_KWIKSTIK_K40_INCLUDE_BOARD_H */ diff --git a/boards/arm/kinetis/kwikstik-k40/src/kwikstik-k40.h b/boards/arm/kinetis/kwikstik-k40/src/kwikstik-k40.h index 9a2a6733050..ce368907de4 100644 --- a/boards/arm/kinetis/kwikstik-k40/src/kwikstik-k40.h +++ b/boards/arm/kinetis/kwikstik-k40/src/kwikstik-k40.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_KINETIS_KWIKSTK_K40_SRC_KWIKSTIK_H -#define __BOARDS_ARM_KINETIS_KWIKSTK_K40_SRC_KWIKSTIK_H +#ifndef __BOARDS_ARM_KINETIS_KWIKSTK_K40_SRC_KWIKSTIK_K40_H +#define __BOARDS_ARM_KINETIS_KWIKSTK_K40_SRC_KWIKSTIK_K40_H /**************************************************************************** * Included Files @@ -166,4 +166,4 @@ extern void weak_function kinetis_spidev_initialize(void); extern void weak_function kinetis_usbinitialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_KINETIS_KWIKSTK_K40_SRC_KWIKSTIK_H */ +#endif /* __BOARDS_ARM_KINETIS_KWIKSTK_K40_SRC_KWIKSTIK_K40_H */ diff --git a/boards/arm/kinetis/twr-k60n512/include/board.h b/boards/arm/kinetis/twr-k60n512/include/board.h index a68c1c5e42c..458401adb7f 100644 --- a/boards/arm/kinetis/twr-k60n512/include/board.h +++ b/boards/arm/kinetis/twr-k60n512/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_KINETIS_TWR-K60N512_INCLUDE_BOARD_H -#define __BOARDS_ARM_KINETIS_TWR-K60N512_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_KINETIS_TWR_K60N512_INCLUDE_BOARD_H +#define __BOARDS_ARM_KINETIS_TWR_K60N512_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -362,4 +362,4 @@ * B80 EBI_D0 PTC15 */ -#endif /* __BOARDS_ARM_KINETIS_TWR-K60N512_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_KINETIS_TWR_K60N512_INCLUDE_BOARD_H */ diff --git a/boards/arm/kinetis/twr-k60n512/src/twr-k60n512.h b/boards/arm/kinetis/twr-k60n512/src/twr-k60n512.h index a6a4f3a9eba..9639071f291 100644 --- a/boards/arm/kinetis/twr-k60n512/src/twr-k60n512.h +++ b/boards/arm/kinetis/twr-k60n512/src/twr-k60n512.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_KINETIS_TWR_K60N512_SRC_TWRK60_H -#define __BOARDS_ARM_KINETIS_TWR_K60N512_SRC_TWRK60_H +#ifndef __BOARDS_ARM_KINETIS_TWR_K60N512_SRC_TWR_K60N512_H +#define __BOARDS_ARM_KINETIS_TWR_K60N512_SRC_TWR_K60N512_H /**************************************************************************** * Included Files @@ -279,4 +279,4 @@ void weak_function kinetis_spidev_initialize(void); void weak_function kinetis_usbinitialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_KINETIS_TWR_K60N512_SRC_TWRK60_H */ +#endif /* __BOARDS_ARM_KINETIS_TWR_K60N512_SRC_TWR_K60N512_H */ diff --git a/boards/arm/lpc17xx_40xx/lincoln60/src/lincoln60.h b/boards/arm/lpc17xx_40xx/lincoln60/src/lincoln60.h index 52095d39845..3c5ffecc405 100644 --- a/boards/arm/lpc17xx_40xx/lincoln60/src/lincoln60.h +++ b/boards/arm/lpc17xx_40xx/lincoln60/src/lincoln60.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef _BOARDS_ARM_LPC17XX_40XX_LINCOLN60_SRC_LINCOLN60_H -#define _BOARDS_ARM_LPC17XX_40XX_LINCOLN60_SRC_LINCOLN60_H +#ifndef __BOARDS_ARM_LPC17XX_40XX_LINCOLN60_SRC_LINCOLN60_H +#define __BOARDS_ARM_LPC17XX_40XX_LINCOLN60_SRC_LINCOLN60_H /**************************************************************************** * Included Files @@ -98,4 +98,4 @@ void weak_function lincoln60_sspdev_initialize(void); #endif /* __ASSEMBLY__ */ -#endif /* _BOARDS_ARM_LPC17XX_40XX_LINCOLN60_SRC_LINCOLN60_H */ +#endif /* __BOARDS_ARM_LPC17XX_40XX_LINCOLN60_SRC_LINCOLN60_H */ diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/include/board.h b/boards/arm/lpc17xx_40xx/lx_cpu/include/board.h index 5b952eaf40e..ac65b097eae 100644 --- a/boards/arm/lpc17xx_40xx/lx_cpu/include/board.h +++ b/boards/arm/lpc17xx_40xx/lx_cpu/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_LX_CPU_INCLUDE_BOARD_H -#define __BOARDS_ARM_LX_CPU_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_LPC17XX_40XX_LX_CPU_INCLUDE_BOARD_H +#define __BOARDS_ARM_LPC17XX_40XX_LX_CPU_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -483,4 +483,4 @@ struct nuttx_ulan_chip_data_s int nuttx_ulan_get_chip_data(int minor, struct nuttx_ulan_chip_data_s *chip_data); -#endif /* __BOARDS_ARM_LX_CPU_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_LPC17XX_40XX_LX_CPU_INCLUDE_BOARD_H */ diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lx_cpu.h b/boards/arm/lpc17xx_40xx/lx_cpu/src/lx_cpu.h index 136ab78e15a..3cf6dfb12bc 100644 --- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lx_cpu.h +++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lx_cpu.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef _BOARDS_ARM_LPC17XX_40XX_LX_CPU_SRC_LX_CPU_SRC_LX_CPU_H -#define _BOARDS_ARM_LPC17XX_40XX_LX_CPU_SRC_LX_CPU_SRC_LX_CPU_H +#ifndef __BOARDS_ARM_LPC17XX_40XX_LX_CPU_SRC_LX_CPU_H +#define __BOARDS_ARM_LPC17XX_40XX_LX_CPU_SRC_LX_CPU_H /**************************************************************************** * Included Files @@ -171,4 +171,4 @@ int lx_cpu_can_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* _BOARDS_ARM_LPC17XX_40XX_LX_CPU_SRC_LX_CPU_SRC_LX_CPU_H */ +#endif /* __BOARDS_ARM_LPC17XX_40XX_LX_CPU_SRC_LX_CPU_H */ diff --git a/boards/arm/lpc17xx_40xx/mbed/src/mbed.h b/boards/arm/lpc17xx_40xx/mbed/src/mbed.h index 40f17f43dae..7f1bcc7f4fd 100644 --- a/boards/arm/lpc17xx_40xx/mbed/src/mbed.h +++ b/boards/arm/lpc17xx_40xx/mbed/src/mbed.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_LPC17XX40XX_MBED_SRC_MBED_H -#define __BOARDS_ARM_LPC17XX40XX_MBED_SRC_MBED_H +#ifndef __BOARDS_ARM_LPC17XX_40XX_MBED_SRC_MBED_H +#define __BOARDS_ARM_LPC17XX_40XX_MBED_SRC_MBED_H /**************************************************************************** * Included Files @@ -97,4 +97,4 @@ int mbed_adc_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_LPC17XX40XX_MBED_SRC_MBED_H */ +#endif /* __BOARDS_ARM_LPC17XX_40XX_MBED_SRC_MBED_H */ diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/zkit-arm-1769.h b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/zkit-arm-1769.h index 5f4ffee9bdc..fab75766aed 100644 --- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/zkit-arm-1769.h +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/zkit-arm-1769.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_LPC17XX_40XX_ZKITARM_LPC1768_SRC_ZKITARM_H -#define __BOARDS_ARM_LPC17XX_40XX_ZKITARM_LPC1768_SRC_ZKITARM_H +#ifndef __BOARDS_ARM_LPC17XX_40XX_ZKIT_ARM_1768_SRC_ZKIT_ARM_1768_H +#define __BOARDS_ARM_LPC17XX_40XX_ZKIT_ARM_1768_SRC_ZKIT_ARM_1768_H /**************************************************************************** * Included Files @@ -259,4 +259,4 @@ int zkit_can_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_LPC17XX_40XX_ZKITARM_LPC1768_SRC_ZKITARM_H */ +#endif /* __BOARDS_ARM_LPC17XX_40XX_ZKIT_ARM_1768_SRC_ZKIT_ARM_1768_H */ diff --git a/boards/arm/lpc31xx/ea3131/include/board_memorymap.h b/boards/arm/lpc31xx/ea3131/include/board_memorymap.h index ef445c44d23..93b2a38683c 100644 --- a/boards/arm/lpc31xx/ea3131/include/board_memorymap.h +++ b/boards/arm/lpc31xx/ea3131/include/board_memorymap.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_LPC31XX_EA3131_INCLUDE_MEMORYMAP_H -#define __BOARDS_ARM_LPC31XX_EA3131INCLUDE_MEMORYMAP_H +#ifndef __BOARDS_ARM_LPC31XX_EA3131_INCLUDE_BOARD_MEMORYMAP_H +#define __BOARDS_ARM_LPC31XX_EA3131_INCLUDE_BOARD_MEMORYMAP_H /* This file should never be included directly, but only indirectly via * lpc31_memorymap.h. @@ -102,4 +102,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_LPC31XX_EA3131_MEMORYMAP_H */ +#endif /* __BOARDS_ARM_LPC31XX_EA3131_BOARD_MEMORYMAP_H */ diff --git a/boards/arm/lpc31xx/ea3152/include/board_memorymap.h b/boards/arm/lpc31xx/ea3152/include/board_memorymap.h index 31a8899c2d2..82a55dbf207 100644 --- a/boards/arm/lpc31xx/ea3152/include/board_memorymap.h +++ b/boards/arm/lpc31xx/ea3152/include/board_memorymap.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_LPC31XX_EA3152_INCLUDE_MEMORYMAP_H -#define __BOARDS_ARM_LPC31XX_EA3152_INCLUDE_MEMORYMAP_H +#ifndef __BOARDS_ARM_LPC31XX_EA3152_INCLUDE_BOARD_MEMORYMAP_H +#define __BOARDS_ARM_LPC31XX_EA3152_INCLUDE_BOARD_MEMORYMAP_H /* This file should never be included directly, but only indirectly via * lpc31_memorymap.h. @@ -100,4 +100,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_LPC31XX_EA3152_INCLUDE_MEMORYMAP_H */ +#endif /* __BOARDS_ARM_LPC31XX_EA3152_INCLUDE_BOARD_MEMORYMAP_H */ diff --git a/boards/arm/lpc43xx/bambino-200e/src/bambino-200e.h b/boards/arm/lpc43xx/bambino-200e/src/bambino-200e.h index 7445b72e074..d728337a51d 100644 --- a/boards/arm/lpc43xx/bambino-200e/src/bambino-200e.h +++ b/boards/arm/lpc43xx/bambino-200e/src/bambino-200e.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_LPC43X_BAMBINO_200E_SRC_BAMBINO_H -#define __BOARDS_ARM_LPC43X_BAMBINO_200E_SRC_BAMBINO_H +#ifndef __BOARDS_ARM_LPC43X_BAMBINO_200E_SRC_BAMBINO_200E_H +#define __BOARDS_ARM_LPC43X_BAMBINO_200E_SRC_BAMBINO_200E_H /**************************************************************************** * Included Files @@ -185,4 +185,4 @@ int lpc43_timerinitialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_LPC43X_BAMBINO_200E_SRC_BAMBINO_H */ +#endif /* __BOARDS_ARM_LPC43X_BAMBINO_200E_SRC_BAMBINO_200E_H */ diff --git a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc4330-xplorer.h b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc4330-xplorer.h index e7d66ca2fb7..38602774623 100644 --- a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc4330-xplorer.h +++ b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc4330-xplorer.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDSS_ARM_LPC43XX_LPC4330_XPLORER_SRC_XPLORER_H -#define __BOARDSS_ARM_LPC43XX_LPC4330_XPLORER_SRC_XPLORER_H +#ifndef __BOARDSS_ARM_LPC43XX_LPC4330_XPLORER_SRC_LPC4330_XPLORER_H +#define __BOARDSS_ARM_LPC43XX_LPC4330_XPLORER_SRC_LPC4330_XPLORER_H /**************************************************************************** * Included Files @@ -108,4 +108,4 @@ void weak_function lpc43_sspdev_initialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDSS_ARM_LPC43XX_LPC4330_XPLORER_SRC_XPLORER_H */ +#endif /* __BOARDSS_ARM_LPC43XX_LPC4330_XPLORER_SRC_LPC4330_XPLORER_H */ diff --git a/boards/arm/lpc43xx/lpc4357-evb/src/lpc4357-evb.h b/boards/arm/lpc43xx/lpc4357-evb/src/lpc4357-evb.h index 5fddb10d02a..49cf9ed5290 100644 --- a/boards/arm/lpc43xx/lpc4357-evb/src/lpc4357-evb.h +++ b/boards/arm/lpc43xx/lpc4357-evb/src/lpc4357-evb.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_LPC43XX_LPC4357_EVB_SRC_LPC3257_EVB_H -#define __BOARDS_ARM_LPC43XX_LPC4357_EVB_SRC_LPC3257_EVB_H +#ifndef __BOARDS_ARM_LPC43XX_LPC4357_EVB_SRC_LPC4357_EVB_H +#define __BOARDS_ARM_LPC43XX_LPC4357_EVB_SRC_LPC4357_EVB_H /**************************************************************************** * Included Files @@ -80,4 +80,4 @@ ****************************************************************************/ #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_LPC43XX_LPC4357_EVB_SRC_LPC3257_EVB_H */ +#endif /* __BOARDS_ARM_LPC43XX_LPC4357_EVB_SRC_LPC4357_EVB_H */ diff --git a/boards/arm/lpc43xx/lpc4370-link2/include/board.h b/boards/arm/lpc43xx/lpc4370-link2/include/board.h index 5be88d7965d..856158a2327 100644 --- a/boards/arm/lpc43xx/lpc4370-link2/include/board.h +++ b/boards/arm/lpc43xx/lpc4370-link2/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_LPC43XX_LPC4357_LINK2_INCLUDE_BOARD_H -#define __BOARDS_ARM_LPC43XX_LPC4357_LINK2_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_LPC43XX_LPC4370_LINK2_INCLUDE_BOARD_H +#define __BOARDS_ARM_LPC43XX_LPC4370_LINK2_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -304,4 +304,4 @@ #define PINCONF_SSP1_SCK PINCONF_SSP1_SCK_1 #define PINCONF_SSP1_SSEL PINCONF_SSP1_SSEL_1 -#endif /* __BOARDS_ARM_LPC43XX_LPC4357_LINK2_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_LPC43XX_LPC4370_LINK2_INCLUDE_BOARD_H */ diff --git a/boards/arm/lpc43xx/lpc4370-link2/src/lpc4370-link2.h b/boards/arm/lpc43xx/lpc4370-link2/src/lpc4370-link2.h index cad84d3325b..35aadeee3d0 100644 --- a/boards/arm/lpc43xx/lpc4370-link2/src/lpc4370-link2.h +++ b/boards/arm/lpc43xx/lpc4370-link2/src/lpc4370-link2.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_LPC43XX_LPC4370_LINK2_SRC_LPC3257_LINK2_H -#define __BOARDS_ARM_LPC43XX_LPC4370_LINK2_SRC_LPC3257_LINK2_H +#ifndef __BOARDS_ARM_LPC43XX_LPC4370_LINK2_SRC_LPC4370_LINK2_H +#define __BOARDS_ARM_LPC43XX_LPC4370_LINK2_SRC_LPC4370_LINK2_H /**************************************************************************** * Included Files @@ -110,4 +110,4 @@ int lpc43_adc_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_LPC43XX_LPC4370_LINK2_SRC_LPC3257_LINK2_H */ +#endif /* __BOARDS_ARM_LPC43XX_LPC4370_LINK2_SRC_LPC4370_LINK2_H */ diff --git a/boards/arm/nrf52/nrf52832-dk/include/board.h b/boards/arm/nrf52/nrf52832-dk/include/board.h index 80a7a32b5cb..b7768895821 100644 --- a/boards/arm/nrf52/nrf52832-dk/include/board.h +++ b/boards/arm/nrf52/nrf52832-dk/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_NRF52_NRF52_FEATHER_INCLUDE_BOARD_H -#define __BOARDS_ARM_NRF52_NRF52_FEATHER_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NRF52_NRF52832_DK_INCLUDE_BOARD_H +#define __BOARDS_ARM_NRF52_NRF52832_DK_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -107,4 +107,4 @@ #define BOARD_UART0_RX_PIN (GPIO_INPUT | GPIO_PORT0 | GPIO_PIN(8)) #define BOARD_UART0_TX_PIN (GPIO_OUTPUT | GPIO_VALUE_ONE | GPIO_PORT0 | GPIO_PIN(6)) -#endif /* __BOARDS_ARM_NRF52_NRF52_FEATHER_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NRF52_NRF52832_DK_INCLUDE_BOARD_H */ diff --git a/boards/arm/nuc1xx/nutiny-nuc120/include/board.h b/boards/arm/nuc1xx/nutiny-nuc120/include/board.h index cbb196afae6..807ab8111ca 100644 --- a/boards/arm/nuc1xx/nutiny-nuc120/include/board.h +++ b/boards/arm/nuc1xx/nutiny-nuc120/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_NUC1XX_NUTINY_NUC12_INCLUDE_BOARD_H -#define __BOARDS_ARM_NUC1XX_NUTINY_NUC12_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUC1XX_NUTINY_NUC120_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUC1XX_NUTINY_NUC120_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -122,4 +122,4 @@ #define NUM_BUTTONS 0 -#endif /* __BOARDS_ARM_NUC1XX_NUTINY_NUC12_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUC1XX_NUTINY_NUC120_INCLUDE_BOARD_H */ diff --git a/boards/arm/phy62xx/phy6222/include/board.h b/boards/arm/phy62xx/phy6222/include/board.h index 06c7f9ba1a5..750bb8c578f 100644 --- a/boards/arm/phy62xx/phy6222/include/board.h +++ b/boards/arm/phy62xx/phy6222/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_PHY62xx_PHY6222_INCLUDE_BOARD_H -#define __BOARDS_ARM_PHY62xx_PHY6222_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_PHY62XX_PHY6222_INCLUDE_BOARD_H +#define __BOARDS_ARM_PHY62XX_PHY6222_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -33,4 +33,4 @@ #define HCLK_FREQUENCY 32000000ul /* HSI48 for USB, only some STM32F0xx */ -#endif /* phy62xx */ +#endif /* __BOARDS_ARM_PHY62XX_PHY6222_INCLUDE_BOARD_H */ diff --git a/boards/arm/phy62xx/phy6222/src/phy6222.h b/boards/arm/phy62xx/phy6222/src/phy6222.h index d6e059425da..623650a1a00 100644 --- a/boards/arm/phy62xx/phy6222/src/phy6222.h +++ b/boards/arm/phy62xx/phy6222/src/phy6222.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_PHY6222_H -#define __BOARDS_ARM_PHY6222_H +#ifndef __BOARDS_ARM_PHY62XX_PHY6222_SRC_PHY6222_H +#define __BOARDS_ARM_PHY62XX_PHY6222_SRC_PHY6222_H /**************************************************************************** * Included Files @@ -116,4 +116,4 @@ int phy62xx_bringup(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_PHY6222_H */ +#endif /* __BOARDS_ARM_PHY62XX_PHY6222_SRC_PHY6222_H */ diff --git a/boards/arm/rp2040/common/include/rp2040_lcd_backpack.h b/boards/arm/rp2040/common/include/rp2040_lcd_backpack.h index 1caf3107958..b768188485b 100644 --- a/boards/arm/rp2040/common/include/rp2040_lcd_backpack.h +++ b/boards/arm/rp2040/common/include/rp2040_lcd_backpack.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __RP2040_LCD_BACKPACK_H -#define __RP2040_LCD_BACKPACK_H +#ifndef __BOARDS_ARM_RP2040_COMMON_INCLUDE_RP2040_LCD_BACKPACK_H +#define __BOARDS_ARM_RP2040_COMMON_INCLUDE_RP2040_LCD_BACKPACK_H /**************************************************************************** * Included Files @@ -80,4 +80,4 @@ int board_lcd_backpack_init(int devno, int busno, int rows, int cols); } #endif -#endif /* __RP2040_LCD_BACKPACK_H */ +#endif /* __BOARDS_ARM_RP2040_COMMON_INCLUDE_RP2040_LCD_BACKPACK_H */ diff --git a/boards/arm/sam34/sam4s-xplained-pro/src/sam4s-xplained-pro.h b/boards/arm/sam34/sam4s-xplained-pro/src/sam4s-xplained-pro.h index b1e6b4ffd9b..6071f013a5d 100644 --- a/boards/arm/sam34/sam4s-xplained-pro/src/sam4s-xplained-pro.h +++ b/boards/arm/sam34/sam4s-xplained-pro/src/sam4s-xplained-pro.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_SAM34_SAM4S_XPLAINED_SRC_SAM4S_XPLAINED_H -#define __BOARDS_ARM_SAM34_SAM4S_XPLAINED_SRC_SAM4S_XPLAINED_H +#ifndef __BOARDS_ARM_SAM34_SAM4S_XPLAINED_PRO_SRC_SAM4S_XPLAINED_PRO_H +#define __BOARDS_ARM_SAM34_SAM4S_XPLAINED_PRO_SRC_SAM4S_XPLAINED_PRO_H /**************************************************************************** * Included Files @@ -252,4 +252,4 @@ bool sam_writeprotected(int slotno); int sam_watchdog_initialize(void); -#endif /* __BOARDS_ARM_SAM34_SAM4S_XPLAINED_SRC_SAM4S_XPLAINED_H */ +#endif /* __BOARDS_ARM_SAM34_SAM4S_XPLAINED_PRO_SRC_SAM4S_XPLAINED_PRO_H */ diff --git a/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h b/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h index c567d3d910d..61259ea3d62 100644 --- a/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h +++ b/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32_CLICKER2_STM32_SRC_CLICKER2_H -#define __BOARDS_ARM_STM32_CLICKER2_STM32_SRC_CLICKER2_H +#ifndef __BOARDS_ARM_STM32_CLICKER2_STM32_SRC_CLICKER2_STM32_H +#define __BOARDS_ARM_STM32_CLICKER2_STM32_SRC_CLICKER2_STM32_H /**************************************************************************** * Included Files @@ -423,4 +423,4 @@ void stm32_automount_event(int slotno, bool inserted); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_STM32_CLICKER2_STM32_SRC_CLICKER2_H */ +#endif /* __BOARDS_ARM_STM32_CLICKER2_STM32_SRC_CLICKER2_STM32_H */ diff --git a/boards/arm/stm32/common/include/board_hall3ph.h b/boards/arm/stm32/common/include/board_hall3ph.h index 4b1431a5558..d2daea6d681 100644 --- a/boards/arm/stm32/common/include/board_hall3ph.h +++ b/boards/arm/stm32/common/include/board_hall3ph.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARD_HALL3PH_H -#define __BOARD_HALL3PH_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_BOARD_HALL3PH_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_BOARD_HALL3PH_H /**************************************************************************** * Included Files @@ -64,4 +64,4 @@ int board_hall3ph_initialize(int devno, int pha, int phb, int phc); } #endif -#endif // __BOARD_HALL3PH_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_BOARD_HALL3PH_H */ diff --git a/boards/arm/stm32/common/include/board_qencoder.h b/boards/arm/stm32/common/include/board_qencoder.h index 29e05aede1e..bd953f50f0f 100644 --- a/boards/arm/stm32/common/include/board_qencoder.h +++ b/boards/arm/stm32/common/include/board_qencoder.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_QENCODER_H -#define __STM32_QENCODER_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_BOARD_QENCODER_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_BOARD_QENCODER_H /**************************************************************************** * Included Files @@ -70,4 +70,4 @@ int board_qencoder_initialize(int devno, int timerno); } #endif -#endif // __STM32_QENCODER_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_BOARD_QENCODER_H */ diff --git a/boards/arm/stm32/common/include/stm32_apa102.h b/boards/arm/stm32/common/include/stm32_apa102.h index 4d7516ff9ec..1255f92275b 100644 --- a/boards/arm/stm32/common/include/stm32_apa102.h +++ b/boards/arm/stm32/common/include/stm32_apa102.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_APA102_H -#define __STM32_APA102_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_APA102_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_APA102_H /**************************************************************************** * Included Files @@ -81,4 +81,4 @@ int board_apa102_initialize(int devno, int spino); } #endif -#endif // __STM32_APA102_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_APA102_H */ diff --git a/boards/arm/stm32/common/include/stm32_apds9960.h b/boards/arm/stm32/common/include/stm32_apds9960.h index d016b8184ce..93cf125947b 100644 --- a/boards/arm/stm32/common/include/stm32_apds9960.h +++ b/boards/arm/stm32/common/include/stm32_apds9960.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_APDS9960_H -#define __STM32_APDS9960_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_APDS9960_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_APDS9960_H /**************************************************************************** * Included Files @@ -77,4 +77,4 @@ int board_apds9960_initialize(int devno, int busno); } #endif -#endif // __STM32_APDS9960_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_APDS9960_H */ diff --git a/boards/arm/stm32/common/include/stm32_bh1750.h b/boards/arm/stm32/common/include/stm32_bh1750.h index 6af1a54c4af..b3213013eab 100644 --- a/boards/arm/stm32/common/include/stm32_bh1750.h +++ b/boards/arm/stm32/common/include/stm32_bh1750.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_BH1750_H -#define __STM32_BH1750_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_BH1750_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_BH1750_H /**************************************************************************** * Included Files @@ -77,4 +77,4 @@ int board_bh1750_initialize(int devno, int busno); } #endif -#endif // __STM32_BH1750_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_BH1750_H */ diff --git a/boards/arm/stm32/common/include/stm32_bmp180.h b/boards/arm/stm32/common/include/stm32_bmp180.h index 0719374c939..61248a9873e 100644 --- a/boards/arm/stm32/common/include/stm32_bmp180.h +++ b/boards/arm/stm32/common/include/stm32_bmp180.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_BMP180_H -#define __STM32_BMP180_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_BMP180_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_BMP180_H /**************************************************************************** * Included Files @@ -81,4 +81,4 @@ int board_bmp180_initialize(int devno, int busno); } #endif -#endif // __STM32_BMP180_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_BMP180_H */ diff --git a/boards/arm/stm32/common/include/stm32_dhtxx.h b/boards/arm/stm32/common/include/stm32_dhtxx.h index 6915226bc01..e08e70c8d55 100644 --- a/boards/arm/stm32/common/include/stm32_dhtxx.h +++ b/boards/arm/stm32/common/include/stm32_dhtxx.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_DHTXX_H -#define __STM32_DHTXX_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_DHTXX_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_DHTXX_H /**************************************************************************** * Included Files @@ -78,4 +78,4 @@ int board_dhtxx_initialize(int devno); } #endif -#endif // __STM32_DHTXX_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_DHTXX_H */ diff --git a/boards/arm/stm32/common/include/stm32_hcsr04.h b/boards/arm/stm32/common/include/stm32_hcsr04.h index 4ee40558709..f637de272d3 100644 --- a/boards/arm/stm32/common/include/stm32_hcsr04.h +++ b/boards/arm/stm32/common/include/stm32_hcsr04.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_HCSR04_H -#define __STM32_HCSR04_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_HCSR04_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_HCSR04_H /**************************************************************************** * Included Files @@ -78,4 +78,4 @@ int board_hcsr04_initialize(int devno); } #endif -#endif // __STM32_HCSR04_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_HCSR04_H */ diff --git a/boards/arm/stm32/common/include/stm32_ihm07m1.h b/boards/arm/stm32/common/include/stm32_ihm07m1.h index 4ce01ccb3cd..90244dfd65b 100644 --- a/boards/arm/stm32/common/include/stm32_ihm07m1.h +++ b/boards/arm/stm32/common/include/stm32_ihm07m1.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_IHM07M1_H -#define __STM32_IHM07M1_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_IHM07M1_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_IHM07M1_H /**************************************************************************** * Included Files @@ -56,4 +56,4 @@ int board_ihm07m1_initialize(FAR struct stm32_foc_adc_s *adc_cfg); } #endif -#endif // __STM32_IHM07M1_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_IHM07M1_H */ diff --git a/boards/arm/stm32/common/include/stm32_ihm08m1.h b/boards/arm/stm32/common/include/stm32_ihm08m1.h index d60fd75e6f4..138b45d7e28 100644 --- a/boards/arm/stm32/common/include/stm32_ihm08m1.h +++ b/boards/arm/stm32/common/include/stm32_ihm08m1.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_IHM08M1_H -#define __STM32_IHM08M1_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_IHM08M1_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_IHM08M1_H /**************************************************************************** * Included Files @@ -56,4 +56,4 @@ int board_ihm08m1_initialize(FAR struct stm32_foc_adc_s *adc_cfg); } #endif -#endif // __STM32_IHM08M1_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_IHM08M1_H */ diff --git a/boards/arm/stm32/common/include/stm32_ihm16m1.h b/boards/arm/stm32/common/include/stm32_ihm16m1.h index f96520c6f8e..8f28f4d6af7 100644 --- a/boards/arm/stm32/common/include/stm32_ihm16m1.h +++ b/boards/arm/stm32/common/include/stm32_ihm16m1.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_IHM16M1_H -#define __STM32_IHM16M1_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_IHM16M1_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_IHM16M1_H /**************************************************************************** * Included Files @@ -56,4 +56,4 @@ int board_ihm16m1_initialize(FAR struct stm32_foc_adc_s *adc_cfg); } #endif -#endif // __STM32_IHM16M1_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_IHM16M1_H */ diff --git a/boards/arm/stm32/common/include/stm32_ina219.h b/boards/arm/stm32/common/include/stm32_ina219.h index fbb90396785..145859baa05 100644 --- a/boards/arm/stm32/common/include/stm32_ina219.h +++ b/boards/arm/stm32/common/include/stm32_ina219.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_INA219_H -#define __STM32_INA219_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_INA219_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_INA219_H /**************************************************************************** * Included Files @@ -77,4 +77,4 @@ int board_ina219_initialize(int devno, int busno); } #endif -#endif // __STM32_INA219_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_INA219_H */ diff --git a/boards/arm/stm32/common/include/stm32_l3gd20.h b/boards/arm/stm32/common/include/stm32_l3gd20.h index 8b38ebd9b60..fc6cd408dce 100644 --- a/boards/arm/stm32/common/include/stm32_l3gd20.h +++ b/boards/arm/stm32/common/include/stm32_l3gd20.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_L3GD20_H -#define __STM32_L3GD20_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_L3GD20_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_L3GD20_H /**************************************************************************** * Included Files @@ -78,4 +78,4 @@ int board_l3gd20_initialize(int devno, int busno); } #endif -#endif // __STM32_L3GD20_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_L3GD20_H */ diff --git a/boards/arm/stm32/common/include/stm32_lcd_backpack.h b/boards/arm/stm32/common/include/stm32_lcd_backpack.h index 440c7cc192d..97c28ede078 100644 --- a/boards/arm/stm32/common/include/stm32_lcd_backpack.h +++ b/boards/arm/stm32/common/include/stm32_lcd_backpack.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_LCD_BACKPACK_H -#define __STM32_LCD_BACKPACK_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_LCD_BACKPACK_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_LCD_BACKPACK_H /**************************************************************************** * Included Files @@ -80,4 +80,4 @@ int board_lcd_backpack_init(int devno, int busno, int rows, int cols); } #endif -#endif /* __STM32_LCD_BACKPACK_H */ +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_LCD_BACKPACK_H */ diff --git a/boards/arm/stm32/common/include/stm32_lis3dsh.h b/boards/arm/stm32/common/include/stm32_lis3dsh.h index e43b33c6fff..aa14ab90e99 100644 --- a/boards/arm/stm32/common/include/stm32_lis3dsh.h +++ b/boards/arm/stm32/common/include/stm32_lis3dsh.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_LIS3DSH_H -#define __STM32_LIS3DSH_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_LIS3DSH_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_LIS3DSH_H /**************************************************************************** * Included Files @@ -77,4 +77,4 @@ int board_lis3dsh_initialize(int devno, int busno); } #endif -#endif // __STM32_LIS3DSH_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_LIS3DSH_H */ diff --git a/boards/arm/stm32/common/include/stm32_lm75.h b/boards/arm/stm32/common/include/stm32_lm75.h index a39bed226bd..9370fc7343b 100644 --- a/boards/arm/stm32/common/include/stm32_lm75.h +++ b/boards/arm/stm32/common/include/stm32_lm75.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_LM75_H -#define __STM32_LM75_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_LM75_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_LM75_H /**************************************************************************** * Included Files @@ -77,4 +77,4 @@ int board_lm75_initialize(int devno, int busno); } #endif -#endif // __STM32_LM75_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_LM75_H */ diff --git a/boards/arm/stm32/common/include/stm32_max31855.h b/boards/arm/stm32/common/include/stm32_max31855.h index 922c352d025..0a33b68b366 100644 --- a/boards/arm/stm32/common/include/stm32_max31855.h +++ b/boards/arm/stm32/common/include/stm32_max31855.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_MAX31855_H -#define __STM32_MAX31855_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_MAX31855_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_MAX31855_H /**************************************************************************** * Included Files @@ -77,4 +77,4 @@ int board_max31855_initialize(int devno, int busno); } #endif -#endif // __STM32_MAX31855_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_MAX31855_H */ diff --git a/boards/arm/stm32/common/include/stm32_max6675.h b/boards/arm/stm32/common/include/stm32_max6675.h index 7c04e79a607..25829347253 100644 --- a/boards/arm/stm32/common/include/stm32_max6675.h +++ b/boards/arm/stm32/common/include/stm32_max6675.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_MAX6675_C -#define __STM32_MAX6675_C +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_MAX6675_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_MAX6675_H /**************************************************************************** * Included Files @@ -81,4 +81,4 @@ int board_max6675_initialize(int devno, int busno); } #endif -#endif // __STM32_MAX6675_C +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_MAX6675_H */ diff --git a/boards/arm/stm32/common/include/stm32_mlx90614.h b/boards/arm/stm32/common/include/stm32_mlx90614.h index 41917928d1c..68944205834 100644 --- a/boards/arm/stm32/common/include/stm32_mlx90614.h +++ b/boards/arm/stm32/common/include/stm32_mlx90614.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_MLX90614_H -#define __STM32_MLX90614_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_MLX90614_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_MLX90614_H /**************************************************************************** * Included Files @@ -77,4 +77,4 @@ int board_mlx90614_initialize(int devno, int busno); } #endif -#endif // __STM32_MLX90614_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_MLX90614_H */ diff --git a/boards/arm/stm32/common/include/stm32_mpl115a.h b/boards/arm/stm32/common/include/stm32_mpl115a.h index d8ae97de7ff..238552307c9 100644 --- a/boards/arm/stm32/common/include/stm32_mpl115a.h +++ b/boards/arm/stm32/common/include/stm32_mpl115a.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_MPL115A_H -#define __STM32_MPL115A_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_MPL115A_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_MPL115A_H /**************************************************************************** * Included Files @@ -77,4 +77,4 @@ int board_mpl115a_initialize(int devno, int busno); } #endif -#endif // __STM32_MPL115A_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_MPL115A_H */ diff --git a/boards/arm/stm32/common/include/stm32_nrf24l01.h b/boards/arm/stm32/common/include/stm32_nrf24l01.h index 0c13529a5a5..22d0a7f080d 100644 --- a/boards/arm/stm32/common/include/stm32_nrf24l01.h +++ b/boards/arm/stm32/common/include/stm32_nrf24l01.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_NRF24L01_H -#define __STM32_NRF24L01_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_NRF24L01_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_NRF24L01_H /**************************************************************************** * Included Files @@ -76,4 +76,4 @@ int board_nrf24l01_initialize(int busno); } #endif -#endif // __STM32_NRF24L01_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_NRF24L01_H */ diff --git a/boards/arm/stm32/common/include/stm32_nunchuck.h b/boards/arm/stm32/common/include/stm32_nunchuck.h index 82405357fc0..f5d19abc948 100644 --- a/boards/arm/stm32/common/include/stm32_nunchuck.h +++ b/boards/arm/stm32/common/include/stm32_nunchuck.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_NUNCHUCK_H -#define __STM32_NUNCHUCK_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_NUNCHUCK_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_NUNCHUCK_H /**************************************************************************** * Included Files @@ -82,4 +82,4 @@ int board_nunchuck_initialize(int devno, int busno); } #endif -#endif // __STM32_NUNCHUCK_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_NUNCHUCK_H */ diff --git a/boards/arm/stm32/common/include/stm32_ssd1306.h b/boards/arm/stm32/common/include/stm32_ssd1306.h index b87d7bf08ca..c28d20ab868 100644 --- a/boards/arm/stm32/common/include/stm32_ssd1306.h +++ b/boards/arm/stm32/common/include/stm32_ssd1306.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_SSD1306_H -#define __STM32_SSD1306_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_SSD1306_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_SSD1306_H /**************************************************************************** * Included Files @@ -77,4 +77,4 @@ FAR struct lcd_dev_s *board_ssd1306_getdev(void); } #endif -#endif // __STM32_SSD1306_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_SSD1306_H */ diff --git a/boards/arm/stm32/common/include/stm32_tone.h b/boards/arm/stm32/common/include/stm32_tone.h index d28fff06561..f18ac8dc2f0 100644 --- a/boards/arm/stm32/common/include/stm32_tone.h +++ b/boards/arm/stm32/common/include/stm32_tone.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_TONE_H -#define __STM32_TONE_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_TONE_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_TONE_H /**************************************************************************** * Included Files @@ -73,4 +73,4 @@ int board_tone_initialize(int devno); } #endif -#endif // __STM32_TONE_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_TONE_H */ diff --git a/boards/arm/stm32/common/include/stm32_veml6070.h b/boards/arm/stm32/common/include/stm32_veml6070.h index 77ca033d5d1..93285742d0e 100644 --- a/boards/arm/stm32/common/include/stm32_veml6070.h +++ b/boards/arm/stm32/common/include/stm32_veml6070.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_VEML6070_H -#define __STM32_VEML6070_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_VEML6070_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_VEML6070_H /**************************************************************************** * Included Files @@ -82,4 +82,4 @@ int board_veml6070_initialize(int devno, int busno); } #endif -#endif // __STM32_VEML6070_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_VEML6070_H */ diff --git a/boards/arm/stm32/common/include/stm32_ws2812.h b/boards/arm/stm32/common/include/stm32_ws2812.h index 4a002dba8f2..03860b73d5e 100644 --- a/boards/arm/stm32/common/include/stm32_ws2812.h +++ b/boards/arm/stm32/common/include/stm32_ws2812.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_WS2812_H -#define __STM32_WS2812_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_WS2812_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_WS2812_H /**************************************************************************** * Included Files @@ -82,4 +82,4 @@ int board_ws2812_initialize(int devno, int spino, uint16_t nleds); } #endif -#endif // __STM32_WS2812_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_WS2812_H */ diff --git a/boards/arm/stm32/common/include/stm32_xen1210.h b/boards/arm/stm32/common/include/stm32_xen1210.h index f127901d317..bea1714fc77 100644 --- a/boards/arm/stm32/common/include/stm32_xen1210.h +++ b/boards/arm/stm32/common/include/stm32_xen1210.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_XEN1210_H -#define __STM32_XEN1210_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_XEN1210_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_XEN1210_H /**************************************************************************** * Included Files @@ -78,4 +78,4 @@ int board_xen1210_initialize(int devno, int busno); } #endif -#endif // __STM32_XEN1210_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_XEN1210_H */ diff --git a/boards/arm/stm32/common/include/stm32_zerocross.h b/boards/arm/stm32/common/include/stm32_zerocross.h index d742745023e..5ab53fe776d 100644 --- a/boards/arm/stm32/common/include/stm32_zerocross.h +++ b/boards/arm/stm32/common/include/stm32_zerocross.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __STM32_ZEROCROSS_H -#define __STM32_ZEROCROSS_H +#ifndef __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_ZEROCROSS_H +#define __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_ZEROCROSS_H /**************************************************************************** * Included Files @@ -70,4 +70,4 @@ int board_zerocross_initialize(int devno); } #endif -#endif // __STM32_ZEROCROSS_H +#endif /* __BOARDS_ARM_STM32_COMMON_INCLUDE_STM32_ZEROCROSS_H */ diff --git a/boards/arm/stm32/fire-stm32v2/src/fire-stm32v2.h b/boards/arm/stm32/fire-stm32v2/src/fire-stm32v2.h index 7e0388e3e89..fb77044ad30 100644 --- a/boards/arm/stm32/fire-stm32v2/src/fire-stm32v2.h +++ b/boards/arm/stm32/fire-stm32v2/src/fire-stm32v2.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32_FIRE_STM32V2_SRC_FIRE_H -#define __BOARDS_ARM_STM32_FIRE_STM32V2_SRC_FIRE_H +#ifndef __BOARDS_ARM_STM32_FIRE_STM32V2_SRC_FIRE_STM32V2_H +#define __BOARDS_ARM_STM32_FIRE_STM32V2_SRC_FIRE_STM32V2_H /**************************************************************************** * Included Files @@ -330,4 +330,4 @@ int stm32_w25initialize(int minor); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_STM32_FIRE_STM32V2_SRC_FIRE_H */ +#endif /* __BOARDS_ARM_STM32_FIRE_STM32V2_SRC_FIRE_STM32V2_H */ diff --git a/boards/arm/stm32/hymini-stm32v/src/hymini-stm32v.h b/boards/arm/stm32/hymini-stm32v/src/hymini-stm32v.h index 102bd47dae9..88110f95943 100644 --- a/boards/arm/stm32/hymini-stm32v/src/hymini-stm32v.h +++ b/boards/arm/stm32/hymini-stm32v/src/hymini-stm32v.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32_HYMINI_STM32V_H -#define __BOARDS_ARM_STM32_HYMINI_STM32V_H +#ifndef __BOARDS_ARM_STM32_HYMINI_STM32V_SRC_HYMINI_STM32V_H +#define __BOARDS_ARM_STM32_HYMINI_STM32V_SRC_HYMINI_STM32V_H /**************************************************************************** * Included Files @@ -151,4 +151,4 @@ int stm32_tsc_setup(int minor); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_STM32_HYMINI_STM32V_H */ +#endif /* __BOARDS_ARM_STM32_HYMINI_STM32V_SRC_HYMINI_STM32V_H */ diff --git a/boards/arm/stm32/nucleo-f103rb/include/board.h b/boards/arm/stm32/nucleo-f103rb/include/board.h index e3c85beff60..829f49be627 100644 --- a/boards/arm/stm32/nucleo-f103rb/include/board.h +++ b/boards/arm/stm32/nucleo-f103rb/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32_NUCLEOF103RB_INCLUDE_BOARD_H -#define __BOARDS_ARM_STM32_NUCLEOF103RB_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32_NUCLEO_F103RB_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32_NUCLEO_F103RB_INCLUDE_BOARD_H /**************************************************************************** * Included Files diff --git a/boards/arm/stm32/nucleo-f207zg/include/board.h b/boards/arm/stm32/nucleo-f207zg/include/board.h index ec5422481d2..6f0bd850cbc 100644 --- a/boards/arm/stm32/nucleo-f207zg/include/board.h +++ b/boards/arm/stm32/nucleo-f207zg/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32_NUCLEOF207ZG_INCLUDE_BOARD_H -#define __BOARDS_ARM_STM32_NUCLEOF207ZG_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32_NUCLEO_F207ZG_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32_NUCLEO_F207ZG_INCLUDE_BOARD_H /**************************************************************************** * Included Files diff --git a/boards/arm/stm32/nucleo-f302r8/include/board.h b/boards/arm/stm32/nucleo-f302r8/include/board.h index ee64e05161f..e28ead35be5 100644 --- a/boards/arm/stm32/nucleo-f302r8/include/board.h +++ b/boards/arm/stm32/nucleo-f302r8/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32_NUCLEOF302R8_INCLUDE_BOARD_H -#define __BOARDS_ARM_STM32_NUCLEOF302R8_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32_NUCLEO_F302R8_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32_NUCLEO_F302R8_INCLUDE_BOARD_H /**************************************************************************** * Included Files diff --git a/boards/arm/stm32/nucleo-f303re/include/board.h b/boards/arm/stm32/nucleo-f303re/include/board.h index cd23aaa0dd2..af6d2fdf2fa 100644 --- a/boards/arm/stm32/nucleo-f303re/include/board.h +++ b/boards/arm/stm32/nucleo-f303re/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32_STM32F3DISCOVERY_INCLUDE_BOARD_H -#define __BOARDS_ARM_STM32_STM32F3DISCOVERY_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32_NUCLEO_F303RE_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32_NUCLEO_F303RE_INCLUDE_BOARD_H /**************************************************************************** * Included Files diff --git a/boards/arm/stm32/nucleo-f303ze/include/board.h b/boards/arm/stm32/nucleo-f303ze/include/board.h index 42de38701a0..a3b5f0cdc5b 100644 --- a/boards/arm/stm32/nucleo-f303ze/include/board.h +++ b/boards/arm/stm32/nucleo-f303ze/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32_NUCLEOF303ZE_INCLUDE_BOARD_H -#define __BOARDS_ARM_STM32_NUCLEOF303ZE_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32_NUCLEO_F303ZE_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32_NUCLEO_F303ZE_INCLUDE_BOARD_H /**************************************************************************** * Included Files diff --git a/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h b/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h index bb4f1eb4bed..27a6ef81366 100644 --- a/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h +++ b/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32_OLIMEX_STM32_E407_SRC_H -#define __BOARDS_ARM_STM32_OLIMEX_STM32_E407_SRC_H +#ifndef __BOARDS_ARM_STM32_OLIMEX_STM32_E407_SRC_OLIMEX_STM32_E407_H +#define __BOARDS_ARM_STM32_OLIMEX_STM32_E407_SRC_OLIMEX_STM32_E407_H /**************************************************************************** * Included Files @@ -341,4 +341,4 @@ int stm32_mrf24j40_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_STM32_OLIMEX_STM32_E407_SRC_INTERNAL_H */ +#endif /* __BOARDS_ARM_STM32_OLIMEX_STM32_E407_SRC_OLIMEX_STM32_E407_H */ diff --git a/boards/arm/stm32/olimex-stm32-h405/src/olimex-stm32-h405.h b/boards/arm/stm32/olimex-stm32-h405/src/olimex-stm32-h405.h index 5de70f2672a..9e1e9daebea 100644 --- a/boards/arm/stm32/olimex-stm32-h405/src/olimex-stm32-h405.h +++ b/boards/arm/stm32/olimex-stm32-h405/src/olimex-stm32-h405.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32_OLIMEX_STM32_H405_SRC_H -#define __BOARDS_ARM_STM32_OLIMEX_STM32_H405_SRC_H +#ifndef __BOARDS_ARM_STM32_OLIMEX_STM32_H405_SRC_OLIMEX_STM32_H405_H +#define __BOARDS_ARM_STM32_OLIMEX_STM32_H405_SRC_OLIMEX_STM32_H405_H /**************************************************************************** * Included Files @@ -99,4 +99,4 @@ int stm32_can_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_STM32_OLIMEX_STM32_H405_SRC_H */ +#endif /* __BOARDS_ARM_STM32_OLIMEX_STM32_H405_SRC_OLIMEX_STM32_H405_H */ diff --git a/boards/arm/stm32/olimex-stm32-h407/src/olimex-stm32-h407.h b/boards/arm/stm32/olimex-stm32-h407/src/olimex-stm32-h407.h index bf2003721c0..714272573d5 100644 --- a/boards/arm/stm32/olimex-stm32-h407/src/olimex-stm32-h407.h +++ b/boards/arm/stm32/olimex-stm32-h407/src/olimex-stm32-h407.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32_OLIMEX_STM32_H407_SRC_H -#define __BOARDS_ARM_STM32_OLIMEX_STM32_H407_SRC_H +#ifndef __BOARDS_ARM_STM32_OLIMEX_STM32_H407_SRC_OLIMEX_STM32_H407_H +#define __BOARDS_ARM_STM32_OLIMEX_STM32_H407_SRC_OLIMEX_STM32_H407_H /**************************************************************************** * Included Files @@ -259,4 +259,4 @@ int stm32_can_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_STM32_OLIMEX_STM32_H407_SRC_INTERNAL_H */ +#endif /* __BOARDS_ARM_STM32_OLIMEX_STM32_H407_SRC_OLIMEX_STM32_H407_H */ diff --git a/boards/arm/stm32/olimex-stm32-p107/src/olimex-stm32-p107.h b/boards/arm/stm32/olimex-stm32-p107/src/olimex-stm32-p107.h index 91dae798d3a..920a6a209cc 100644 --- a/boards/arm/stm32/olimex-stm32-p107/src/olimex-stm32-p107.h +++ b/boards/arm/stm32/olimex-stm32-p107/src/olimex-stm32-p107.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32_OLIMEX_STM32_P107_SRC_H -#define __BOARDS_ARM_STM32_OLIMEX_STM32_P107_SRC_H +#ifndef __BOARDS_ARM_STM32_OLIMEX_STM32_P107_SRC_OLIMEX_STM32_P107_H +#define __BOARDS_ARM_STM32_OLIMEX_STM32_P107_SRC_OLIMEX_STM32_P107_H /**************************************************************************** * Included Files @@ -82,4 +82,4 @@ int stm32_can_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_STM32_OLIMEX_STM32_P107_SRC_H */ +#endif /* __BOARDS_ARM_STM32_OLIMEX_STM32_P107_SRC_OLIMEX_STM32_P107_H */ diff --git a/boards/arm/stm32/olimex-stm32-p207/src/olimex-stm32-p207.h b/boards/arm/stm32/olimex-stm32-p207/src/olimex-stm32-p207.h index c18c868502f..8334d0548e9 100644 --- a/boards/arm/stm32/olimex-stm32-p207/src/olimex-stm32-p207.h +++ b/boards/arm/stm32/olimex-stm32-p207/src/olimex-stm32-p207.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32_OLIMEX_STM32_P207_SRC_H -#define __BOARDS_ARM_STM32_OLIMEX_STM32_P207_SRC_H +#ifndef __BOARDS_ARM_STM32_OLIMEX_STM32_P207_SRC_OLIMEX_STM32_P207_H +#define __BOARDS_ARM_STM32_OLIMEX_STM32_P207_SRC_OLIMEX_STM32_P207_H /**************************************************************************** * Included Files @@ -136,4 +136,4 @@ int stm32_can_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_STM32_OLIMEX_STM32_P207_SRC_H */ +#endif /* __BOARDS_ARM_STM32_OLIMEX_STM32_P207_SRC_OLIMEX_STM32_P207_H */ diff --git a/boards/arm/stm32/olimex-stm32-p407/src/olimex-stm32-p407.h b/boards/arm/stm32/olimex-stm32-p407/src/olimex-stm32-p407.h index 299a226e426..6d4e2196d75 100644 --- a/boards/arm/stm32/olimex-stm32-p407/src/olimex-stm32-p407.h +++ b/boards/arm/stm32/olimex-stm32-p407/src/olimex-stm32-p407.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32_OLIMEX_STM32_P407_SRC_H -#define __BOARDS_ARM_STM32_OLIMEX_STM32_P407_SRC_H +#ifndef __BOARDS_ARM_STM32_OLIMEX_STM32_P407_SRC_OLIMEX_STM32_P407_H +#define __BOARDS_ARM_STM32_OLIMEX_STM32_P407_SRC_OLIMEX_STM32_P407_H /**************************************************************************** * Included Files @@ -354,4 +354,4 @@ int stm32_djoy_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_STM32_OLIMEX_STM32_P407_SRC_H */ +#endif /* __BOARDS_ARM_STM32_OLIMEX_STM32_P407_SRC_OLIMEX_STM32_P407_H */ diff --git a/boards/arm/stm32/omnibusf4/src/stm32_romfs.h b/boards/arm/stm32/omnibusf4/src/stm32_romfs.h index d4ca3702689..e0a97ff9765 100644 --- a/boards/arm/stm32/omnibusf4/src/stm32_romfs.h +++ b/boards/arm/stm32/omnibusf4/src/stm32_romfs.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32_STM32F4DISCOVERY_SRC_STM32_ROMFS_H -#define __BOARDS_ARM_STM32_STM32F4DISCOVERY_SRC_STM32_ROMFS_H +#ifndef __BOARDS_ARM_STM32_OMNIBUSF4_SRC_STM32_ROMFS_H +#define __BOARDS_ARM_STM32_OMNIBUSF4_SRC_STM32_ROMFS_H /**************************************************************************** * Included Files @@ -73,4 +73,4 @@ int stm32_romfs_initialize(void); #endif /* CONFIG_STM32_ROMFS */ -#endif /* __BOARDS_ARM_STM32_STM32F4DISCOVERY_SRC_STM32_ROMFS_H */ +#endif /* __BOARDS_ARM_STM32_OMNIBUSF4_SRC_STM32_ROMFS_H */ diff --git a/boards/arm/stm32/stm3220g-eval/src/stm3220g-eval.h b/boards/arm/stm32/stm3220g-eval/src/stm3220g-eval.h index 774f950c5c1..a20baf902ec 100644 --- a/boards/arm/stm32/stm3220g-eval/src/stm3220g-eval.h +++ b/boards/arm/stm32/stm3220g-eval/src/stm3220g-eval.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32_STM3220G_EVAL_SRC_STM3220G_H -#define __BOARDS_ARM_STM32_STM3220G_EVAL_SRC_STM3220G_H +#ifndef __BOARDS_ARM_STM32_STM3220G_EVAL_SRC_STM3220G_EVAL_H +#define __BOARDS_ARM_STM32_STM3220G_EVAL_SRC_STM3220G_EVAL_H /**************************************************************************** * Included Files @@ -412,4 +412,4 @@ void stm32_deselectlcd(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_STM32_STM3220G_EVAL_SRC_STM3220G_H */ +#endif /* __BOARDS_ARM_STM32_STM3220G_EVAL_SRC_STM3220G_EVAL_H */ diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h b/boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h index a89185e2464..ec23729c226 100644 --- a/boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h +++ b/boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32_STM32F429I_DISCO_SRC_STM32F429I_DISCO__H -#define __BOARDS_ARM_STM32_STM32F429I_DISCO_SRC_STM32F429I_DISCO__H +#ifndef __BOARDS_ARM_STM32_STM32F429I_DISCO_SRC_STM32F429I_DISCO_H +#define __BOARDS_ARM_STM32_STM32F429I_DISCO_SRC_STM32F429I_DISCO_H /**************************************************************************** * Included Files diff --git a/boards/arm/stm32/viewtool-stm32f107/src/viewtool_stm32f107.h b/boards/arm/stm32/viewtool-stm32f107/src/viewtool_stm32f107.h index f4671e676aa..dabbc4d3717 100644 --- a/boards/arm/stm32/viewtool-stm32f107/src/viewtool_stm32f107.h +++ b/boards/arm/stm32/viewtool-stm32f107/src/viewtool_stm32f107.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32_VIEWTOOL_STM32F107_SRC_H -#define __BOARDS_ARM_STM32_VIEWTOOL_STM32F107_SRC_H +#ifndef __BOARDS_ARM_STM32_VIEWTOOL_STM32F107_SRC_VIEWTOOL_STM32F107_H +#define __BOARDS_ARM_STM32_VIEWTOOL_STM32F107_SRC_VIEWTOOL_STM32F107_H /**************************************************************************** * Included Files @@ -505,4 +505,4 @@ int stm32_max3421e_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_STM32_VIEWTOOL_STM32F107_SRC_H */ +#endif /* __BOARDS_ARM_STM32_VIEWTOOL_STM32F107_SRC_VIEWTOOL_STM32F107_H */ diff --git a/boards/arm/stm32f7/stm32f746-ws/src/stm32f746-ws.h b/boards/arm/stm32f7/stm32f746-ws/src/stm32f746-ws.h index da27d659797..8535ad14687 100644 --- a/boards/arm/stm32f7/stm32f746-ws/src/stm32f746-ws.h +++ b/boards/arm/stm32f7/stm32f746-ws/src/stm32f746-ws.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32F746_WS_SRC_STM32F746_WS_H -#define __BOARDS_ARM_STM32F746_WS_SRC_STM32F746_WS_H +#ifndef __BOARDS_ARM_STM32F7_STM32F746_WS_SRC_STM32F746_WS_H +#define __BOARDS_ARM_STM32F7_STM32F746_WS_SRC_STM32F746_WS_H /**************************************************************************** * Included Files @@ -126,4 +126,4 @@ int stm32_dma_alloc_init(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_STM32F746_WS_SRC_STM32F746_WS_H */ +#endif /* __BOARDS_ARM_STM32F7_STM32F746_WS_SRC_STM32F746_WS_H */ diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32f746g-disco.h b/boards/arm/stm32f7/stm32f746g-disco/src/stm32f746g-disco.h index aa6b18acc92..d69f3a30274 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32f746g-disco.h +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32f746g-disco.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32F7_STM32F746G_DISCO_SRC_STM32F746G_DISCO__H -#define __BOARDS_ARM_STM32F7_STM32F746G_DISCO_SRC_STM32F746G_DISCO__H +#ifndef __BOARDS_ARM_STM32F7_STM32F746G_DISCO_SRC_STM32F746G_DISCO_H +#define __BOARDS_ARM_STM32F7_STM32F746G_DISCO_SRC_STM32F746G_DISCO_H /**************************************************************************** * Included Files diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/stm32f769i-disco.h b/boards/arm/stm32f7/stm32f769i-disco/src/stm32f769i-disco.h index d3ee740c782..17bc7fefdc9 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/src/stm32f769i-disco.h +++ b/boards/arm/stm32f7/stm32f769i-disco/src/stm32f769i-disco.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32F7_STM32F769I_DISCO_SRC_STM32F769I_DISCO__H -#define __BOARDS_ARM_STM32F7_STM32F769I_DISCO_SRC_STM32F769I_DISCO__H +#ifndef __BOARDS_ARM_STM32F7_STM32F769I_DISCO_SRC_STM32F769I_DISCO_H +#define __BOARDS_ARM_STM32F7_STM32F769I_DISCO_SRC_STM32F769I_DISCO_H /**************************************************************************** * Included Files diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_romfs.h b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_romfs.h index 7ad7c718100..7251fa0d5b8 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_romfs.h +++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_romfs.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32H7_NUCLEOH743ZI_SRC_STM32_ROMFS_H -#define __BOARDS_ARM_STM32H7_NUCLEOH743ZI_SRC_STM32_ROMFS_H +#ifndef __BOARDS_ARM_STM32H7_NUCLEO_H743ZI_SRC_STM32_ROMFS_H +#define __BOARDS_ARM_STM32H7_NUCLEO_H743ZI_SRC_STM32_ROMFS_H /**************************************************************************** * Included Files @@ -58,4 +58,4 @@ int stm32_romfs_initialize(void); #endif /* CONFIG_STM32_ROMFS */ -#endif /* __BOARDS_ARM_STM32H7_NUCLEOH743ZI_SRC_STM32_ROMFS_H */ +#endif /* __BOARDS_ARM_STM32H7_NUCLEO_H743ZI_SRC_STM32_ROMFS_H */ diff --git a/boards/arm/stm32l4/stm32l476-mdk/include/board.h b/boards/arm/stm32l4/stm32l476-mdk/include/board.h index 8157e655c96..d99ac7ac05f 100644 --- a/boards/arm/stm32l4/stm32l476-mdk/include/board.h +++ b/boards/arm/stm32l4/stm32l476-mdk/include/board.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32L_STM32L476_MDK_INCLUDE_BOARD_H -#define __BOARDS_ARM_STM32L_STM32L476_MDK_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32L4_STM32L476_MDK_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32L4_STM32L476_MDK_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -45,14 +45,14 @@ # include #endif -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - /* Clocking *****************************************************************/ #include +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + /* DMA Channel/Stream Selections ********************************************/ /* Stream selections are arbitrary for now but might become important in the @@ -217,4 +217,4 @@ void stm32l4_board_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_STM32L_STM32L476_MDK_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_STM32L4_STM32L476_MDK_INCLUDE_BOARD_H */ diff --git a/boards/arm/stm32l4/stm32l476-mdk/src/stm32l476-mdk.h b/boards/arm/stm32l4/stm32l476-mdk/src/stm32l476-mdk.h index e0421e543b8..aceb702deb7 100644 --- a/boards/arm/stm32l4/stm32l476-mdk/src/stm32l476-mdk.h +++ b/boards/arm/stm32l4/stm32l476-mdk/src/stm32l476-mdk.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32L476_MDK_SRC_STM32L476_MDK_H -#define __BOARDS_ARM_STM32L476_MDK_SRC_STM32L476_MDK_H +#ifndef __BOARDS_ARM_STM32L4_STM32L476_MDK_SRC_STM32L476_MDK_H +#define __BOARDS_ARM_STM32L4_STM32L476_MDK_SRC_STM32L476_MDK_H /**************************************************************************** * Included Files @@ -155,4 +155,4 @@ int stm32_bringup(void); void stm32_spiinitialize(void); -#endif /* __BOARDS_ARM_STM32L476_MDK_SRC_STM32L476_MDK_H */ +#endif /* __BOARDS_ARM_STM32L4_STM32L476_MDK_SRC_STM32L476_MDK_H */ diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/include/board.h b/boards/arm/stm32l4/stm32l4r9ai-disco/include/board.h index 69bb60848be..dde2b36630d 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/include/board.h +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_STM32L_STM32L4R9AI_DISCO_INCLUDE_BOARD_H -#define __BOARDS_ARM_STM32L_STM32L4R9AI_DISCO_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32L4_STM32L4R9AI_DISCO_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32L4_STM32L4R9AI_DISCO_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -291,4 +291,4 @@ void stm32l4_board_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_STM32L4R9AI_DISCO_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_STM32L4_STM32L4R9AI_DISCO_INCLUDE_BOARD_H */ diff --git a/boards/arm/tiva/ekk-lm3s9b96/src/ekk-lm3s9b96.h b/boards/arm/tiva/ekk-lm3s9b96/src/ekk-lm3s9b96.h index 84be8e3431c..5e44ca4ecfd 100644 --- a/boards/arm/tiva/ekk-lm3s9b96/src/ekk-lm3s9b96.h +++ b/boards/arm/tiva/ekk-lm3s9b96/src/ekk-lm3s9b96.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_TIVA_EKK_LM3S9B96_SRC_EKKLM3S9B96_H -#define __BOARDS_ARM_TIVA_EKK_LM3S9B96_SRC_EKKLM3S9B96_H +#ifndef __BOARDS_ARM_TIVA_EKK_LM3S9B96_SRC_EKK_LM3S9B96_H +#define __BOARDS_ARM_TIVA_EKK_LM3S9B96_SRC_EKK_LM3S9B96_H /**************************************************************************** * Included Files @@ -92,4 +92,4 @@ extern void weak_function lm_ssidev_initialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_TIVA_EKK_LM3S9B96_SRC_EKKLM3S9B96_H */ +#endif /* __BOARDS_ARM_TIVA_EKK_LM3S9B96_SRC_EKK_LM3S9B96_H */ diff --git a/boards/arm/tiva/lm3s6432-s2e/src/lm3s6432-s2e.h b/boards/arm/tiva/lm3s6432-s2e/src/lm3s6432-s2e.h index 54a54af58d5..215c7afe76f 100644 --- a/boards/arm/tiva/lm3s6432-s2e/src/lm3s6432-s2e.h +++ b/boards/arm/tiva/lm3s6432-s2e/src/lm3s6432-s2e.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_TIVA_LM3S6432_S2E_SRC_LM3S6432S2E_H -#define __BOARDS_ARM_TIVA_LM3S6432_S2E_SRC_LM3S6432S2E_H +#ifndef __BOARDS_ARM_TIVA_LM3S6432_S2E_SRC_LM3S6432_S2E_H +#define __BOARDS_ARM_TIVA_LM3S6432_S2E_SRC_LM3S6432_S2E_H /**************************************************************************** * Included Files @@ -106,4 +106,4 @@ void weak_function lm_ssidev_initialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_TIVA_LM3S6432_S2E_SRC_LM3S6432S2E_H */ +#endif /* __BOARDS_ARM_TIVA_LM3S6432_S2E_SRC_LM3S6432_S2E_H */ diff --git a/boards/arm/tiva/lm3s6965-ek/src/lm3s6965-ek.h b/boards/arm/tiva/lm3s6965-ek/src/lm3s6965-ek.h index 5a3130df0d3..a9aa9380f20 100644 --- a/boards/arm/tiva/lm3s6965-ek/src/lm3s6965-ek.h +++ b/boards/arm/tiva/lm3s6965-ek/src/lm3s6965-ek.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_TIVA_LM3S6965_EK_SRC_LM3S6965EK_H -#define __BOARDS_ARM_TIVA_LM3S6965_EK_SRC_LM3S6965EK_H +#ifndef __BOARDS_ARM_TIVA_LM3S6965_EK_SRC_LM3S6965_EK_H +#define __BOARDS_ARM_TIVA_LM3S6965_EK_SRC_LM3S6965_EK_H /**************************************************************************** * Included Files @@ -134,4 +134,4 @@ int lm_bringup(void); void weak_function lm_ssidev_initialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_TIVA_LM3S6965_EK_SRC_LM3S6965EK_H */ +#endif /* __BOARDS_ARM_TIVA_LM3S6965_EK_SRC_LM3S6965_EK_H */ diff --git a/boards/arm/tiva/lm3s8962-ek/src/lm3s8962-ek.h b/boards/arm/tiva/lm3s8962-ek/src/lm3s8962-ek.h index 5e97c581b76..02bf84447fc 100644 --- a/boards/arm/tiva/lm3s8962-ek/src/lm3s8962-ek.h +++ b/boards/arm/tiva/lm3s8962-ek/src/lm3s8962-ek.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_TIVA_LM3S8962_EK_SRC_LM3S8962EK_H -#define __BOARDS_ARM_TIVA_LM3S8962_EK_SRC_LM3S8962EK_H +#ifndef __BOARDS_ARM_TIVA_LM3S8962_EK_SRC_LM3S8962_EK_H +#define __BOARDS_ARM_TIVA_LM3S8962_EK_SRC_LM3S8962_EK_H /**************************************************************************** * Included Files @@ -114,4 +114,4 @@ void weak_function lm_ssidev_initialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_TIVA_LM3S8962_EK_SRC_LM3S8962EK_H */ +#endif /* __BOARDS_ARM_TIVA_LM3S8962_EK_SRC_LM3S8962_EK_H */ diff --git a/boards/avr/at90usb/teensy-2.0/src/teensy-20.h b/boards/avr/at90usb/teensy-2.0/src/teensy-20.h index 10633910c49..8855114dc0c 100644 --- a/boards/avr/at90usb/teensy-2.0/src/teensy-20.h +++ b/boards/avr/at90usb/teensy-2.0/src/teensy-20.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_AVR_AT90USB_TEENSY_20_SRC_TEENSY_H -#define __BOARDS_AVR_AT90USB_TEENSY_20_SRC_TEENSY_H +#ifndef __BOARDS_AVR_AT90USB_TEENSY_20_SRC_TEENSY_20_H +#define __BOARDS_AVR_AT90USB_TEENSY_20_SRC_TEENSY_20_H /**************************************************************************** * Included Files @@ -72,4 +72,4 @@ void at90usb_led_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_AVR_AT90USB_TEENSY_20_SRC_TEENSY_H */ +#endif /* __BOARDS_AVR_AT90USB_TEENSY_20_SRC_TEENSY_20_H */ diff --git a/boards/hc/m9s12/demo9s12ne64/include/board.h b/boards/hc/m9s12/demo9s12ne64/include/board.h index 5c7b7a18bc0..7058807b403 100644 --- a/boards/hc/m9s12/demo9s12ne64/include/board.h +++ b/boards/hc/m9s12/demo9s12ne64/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_HC_MCS92S12NE64_DEMO9S12NE64_INCLUDE_BOARD_H -#define __BOARDS_HC_MCS92S12NE64_DEMO9S12NE64_INCLUDE_BOARD_H +#ifndef __BOARDS_HC_M9S12_DEMO9S12NE64_INCLUDE_BOARD_H +#define __BOARDS_HC_M9S12_DEMO9S12NE64_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -77,4 +77,4 @@ /* Button definitions *******************************************************/ -#endif /* __BOARDS_HC_MCS92S12NE64_DEMO9S12NE64_INCLUDE_BOARD_H */ +#endif /* __BOARDS_HC_M9S12_DEMO9S12NE64_INCLUDE_BOARD_H */ diff --git a/boards/hc/m9s12/demo9s12ne64/src/demo9s12ne64.h b/boards/hc/m9s12/demo9s12ne64/src/demo9s12ne64.h index ce497107eda..88950c4d5df 100644 --- a/boards/hc/m9s12/demo9s12ne64/src/demo9s12ne64.h +++ b/boards/hc/m9s12/demo9s12ne64/src/demo9s12ne64.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_HC_MCS92S12NE64_DEMO9S12NE64_SRC_DEMO9S12NE64_H -#define __BOARDS_HC_MCS92S12NE64_DEMO9S12NE64_SRC_DEMO9S12NE64_H +#ifndef __BOARDS_HC_M9S12_DEMO9S12NE64_SRC_DEMO9S12NE64_H +#define __BOARDS_HC_M9S12_DEMO9S12NE64_SRC_DEMO9S12NE64_H /**************************************************************************** * Included Files @@ -60,4 +60,4 @@ void weak_function hcs12_spidev_initialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_HC_MCS92S12NE64_DEMO9S12NE64_SRC_DEMO9S12NE64_H */ +#endif /* __BOARDS_HC_M9S12_DEMO9S12NE64_SRC_DEMO9S12NE64_H */ diff --git a/boards/hc/m9s12/ne64badge/include/board.h b/boards/hc/m9s12/ne64badge/include/board.h index 2b6da2e436e..976696966ee 100644 --- a/boards/hc/m9s12/ne64badge/include/board.h +++ b/boards/hc/m9s12/ne64badge/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_HC_MCS92S12NE64_NE64BADGE_INCLUDE_BOARD_H -#define __BOARDS_HC_MCS92S12NE64_NE64BADGE_INCLUDE_BOARD_H +#ifndef __BOARDS_HC_M9S12_NE64BADGE_INCLUDE_BOARD_H +#define __BOARDS_HC_M9S12_NE64BADGE_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -86,4 +86,4 @@ #define BUTTON1 1 /* Bit 0: SW1 button is depressed */ #define BUTTON2 2 /* Bit 1: SW2 button is depressed */ -#endif /* __BOARDS_HC_MCS92S12NE64_NE64BADGE_INCLUDE_BOARD_H */ +#endif /* __BOARDS_HC_M9S12_NE64BADGE_INCLUDE_BOARD_H */ diff --git a/boards/hc/m9s12/ne64badge/src/ne64badge.h b/boards/hc/m9s12/ne64badge/src/ne64badge.h index bc8cf123815..10f0686ab6d 100644 --- a/boards/hc/m9s12/ne64badge/src/ne64badge.h +++ b/boards/hc/m9s12/ne64badge/src/ne64badge.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_HC_MSC92S12NE64_NE64BADGE_SRC_NE64BADGE_H -#define __BOARDS_HC_MSC92S12NE64_NE64BADGE_SRC_NE64BADGE_H +#ifndef __BOARDS_HC_M9S12_NE64BADGE_SRC_NE64BADGE_H +#define __BOARDS_HC_M9S12_NE64BADGE_SRC_NE64BADGE_H /**************************************************************************** * Included Files @@ -175,4 +175,4 @@ void weak_function hcs12_spidev_initialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_HC_MSC92S12NE64_NE64BADGE_SRC_NE64BADGE_H */ +#endif /* __BOARDS_HC_M9S12_NE64BADGE_SRC_NE64BADGE_H */ diff --git a/boards/misoc/lm32/misoc/include/board.h b/boards/misoc/lm32/misoc/include/board.h index c9d5fdb5eab..d106761c02a 100644 --- a/boards/misoc/lm32/misoc/include/board.h +++ b/boards/misoc/lm32/misoc/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_MISOC_AMBER_INCLUDE_BOARD_H -#define __BOARDS_MISOC_AMBER_INCLUDE_BOARD_H +#ifndef __BOARDS_MISOC_LM32_MICOS_INCLUDE_BOARD_H +#define __BOARDS_MISOC_LM32_MICOS_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -83,4 +83,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_MISOC_AMBER_INCLUDE_BOARD_H */ +#endif /* __BOARDS_MISOC_LM32_MICOS_INCLUDE_BOARD_H */ diff --git a/boards/renesas/m16c/skp16c26/include/board.h b/boards/renesas/m16c/skp16c26/include/board.h index dd60f109f4d..19e5a502a2d 100644 --- a/boards/renesas/m16c/skp16c26/include/board.h +++ b/boards/renesas/m16c/skp16c26/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_RENESAS_M32262F8_SKP16C26_INCLUDE_BOARD_H -#define __BOARDS_RENESAS_M32262F8_SKP16C26_INCLUDE_BOARD_H +#ifndef __BOARDS_RENESAS_M16C_SKP16C26_INCLUDE_BOARD_H +#define __BOARDS_RENESAS_M16C_SKP16C26_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -117,4 +117,4 @@ #endif -#endif /* __BOARDS_RENESAS_M32262F8_SKP16C26_INCLUDE_BOARD_H */ +#endif /* __BOARDS_RENESAS_M16C_SKP16C26_INCLUDE_BOARD_H */ diff --git a/boards/renesas/m16c/skp16c26/src/skp16c26.h b/boards/renesas/m16c/skp16c26/src/skp16c26.h index c2ea846166f..2c4fff2fae3 100644 --- a/boards/renesas/m16c/skp16c26/src/skp16c26.h +++ b/boards/renesas/m16c/skp16c26/src/skp16c26.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_RENESAS_M32262F8_SKP16C26_SRC_SKP16C26_H -#define __BOARDS_RENESAS_M32262F8_SKP16C26_SRC_SKP16C26_H +#ifndef __BOARDS_RENESAS_MC16_SKP16C26_SRC_SKP16C26_H +#define __BOARDS_RENESAS_MC16_SKP16C26_SRC_SKP16C26_H /**************************************************************************** * Included Files @@ -45,4 +45,4 @@ #endif -#endif /* __BOARDS_RENESAS_M32262F8_SKP16C26_SRC_SKP16C26_H */ +#endif /* __BOARDS_RENESAS_MC16_SKP16C26_SRC_SKP16C26_H */ diff --git a/boards/renesas/rx65n/rx65n-rsk1mb/include/board.h b/boards/renesas/rx65n/rx65n-rsk1mb/include/board.h index f07c89ce36c..7a74c77fd6f 100644 --- a/boards/renesas/rx65n/rx65n-rsk1mb/include/board.h +++ b/boards/renesas/rx65n/rx65n-rsk1mb/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_RENESAS_RX65N_RX65N_RSKLMB_INCLUDE_BOARD_H -#define __BOARDS_RENESAS_RX65N_RX65N_RSKLMB_INCLUDE_BOARD_H +#ifndef __BOARDS_RENESAS_RX65N_RX65N_RSK1MB_INCLUDE_BOARD_H +#define __BOARDS_RENESAS_RX65N_RX65N_RSK1MB_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -128,4 +128,4 @@ extern "C" #endif #endif -#endif /* __BOARDS_RENESAS_RX65N_RX65N_RSKLMB_INCLUDE_BOARD_H */ +#endif /* __BOARDS_RENESAS_RX65N_RX65N_RSK1MB_INCLUDE_BOARD_H */ diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_rsk2mb.h b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_rsk2mb.h index 9ca33e97499..14aa391f76c 100644 --- a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_rsk2mb.h +++ b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_rsk2mb.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_RENESAS_RX65N_GRROSE_SRC_RX65N_GRROSE_H -#define __BOARDS_RENESAS_RX65N_GRROSE_SRC_RX65N_GRROSE_H +#ifndef __BOARDS_RENESAS_RX65N_RX65N_RSK2MB_SRC_RX65N_RSK2MB_H +#define __BOARDS_RENESAS_RX65N_RX65N_RSK2MB_SRC_RX65N_RSK2MB_H /**************************************************************************** * Included Files @@ -72,4 +72,4 @@ int rx65n_sbram_int(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_RENESAS_RX65N_GRROSE_SRC_RX65N_GRROSE_H */ +#endif /* __BOARDS_RENESAS_RX65N_RX65N_RSK2MB_SRC_RX65N_RSK2MB_H */ diff --git a/boards/renesas/sh1/us7032evb1/include/board.h b/boards/renesas/sh1/us7032evb1/include/board.h index 1d1461bf221..3ff31b44613 100644 --- a/boards/renesas/sh1/us7032evb1/include/board.h +++ b/boards/renesas/sh1/us7032evb1/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_RENESAS_SH7032_US7032EVB1_BOARD_H -#define __BOARDS_RENESAS_SH7032_US7032EVB1_BOARD_H +#ifndef __BOARDS_RENESAS_SH1_US7032EVB1_INCLUDE_BOARD_H +#define __BOARDS_RENESAS_SH1_US7032EVB1_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -78,4 +78,4 @@ extern "C" #endif #endif -#endif /* __BOARDS_RENESAS_SH7032_US7032EVB1_BOARD_H */ +#endif /* __BOARDS_RENESAS_SH1_US7032EVB1_INCLUDE_BOARD_H */ diff --git a/boards/risc-v/mpfs/icicle/include/board.h b/boards/risc-v/mpfs/icicle/include/board.h index a7ec4d209c4..354569bf2a7 100755 --- a/boards/risc-v/mpfs/icicle/include/board.h +++ b/boards/risc-v/mpfs/icicle/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_RISCV_ICICLE_MPFS_INCLUDE_BOARD_H -#define __BOARDS_RISCV_ICICLE_MPFS_INCLUDE_BOARD_H +#ifndef __BOARDS_RISCV_MPFS_ICICLE_INCLUDE_BOARD_H +#define __BOARDS_RISCV_MPFS_ICICLE_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -109,4 +109,4 @@ void mpfs_boardinitialize(void); } #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_RISCV_ICICLE_MPFS_INCLUDE_BOARD_H */ +#endif /* __BOARDS_RISCV_MPFS_ICICLE_INCLUDE_BOARD_H */ diff --git a/boards/risc-v/mpfs/icicle/src/board_config.h b/boards/risc-v/mpfs/icicle/src/board_config.h index 217e3678f39..2e41e265d80 100755 --- a/boards/risc-v/mpfs/icicle/src/board_config.h +++ b/boards/risc-v/mpfs/icicle/src/board_config.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_RISCV_ICICLE_MPFS_SRC_BOARD_CONFIG_H -#define __BOARDS_RISCV_ICICLE_MPFS_SRC_BOARD_CONFIG_H +#ifndef __BOARDS_RISCV_MPFS_ICICLE_SRC_BOARD_CONFIG_H +#define __BOARDS_RISCV_MPFS_ICICLE_SRC_BOARD_CONFIG_H /**************************************************************************** * Included Files @@ -50,4 +50,4 @@ int mpfs_board_i2c_init(void); int mpfs_board_emmcsd_init(void); int mpfs_pwm_setup(void); -#endif /* __BOARDS_RISCV_ICICLE_MPFS_SRC_BOARD_CONFIG_H */ +#endif /* __BOARDS_RISCV_MPFS_ICICLE_SRC_BOARD_CONFIG_H */ diff --git a/boards/risc-v/mpfs/m100pfsevp/include/board.h b/boards/risc-v/mpfs/m100pfsevp/include/board.h index 14447acbef4..17818f28bff 100755 --- a/boards/risc-v/mpfs/m100pfsevp/include/board.h +++ b/boards/risc-v/mpfs/m100pfsevp/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_RISCV_M100PFSEVP_MPFS_INCLUDE_BOARD_H -#define __BOARDS_RISCV_M100PFSEVP_MPFS_INCLUDE_BOARD_H +#ifndef __BOARDS_RISCV_MPFS_M100PFSEVP_INCLUDE_BOARD_H +#define __BOARDS_RISCV_MPFS_M100PFSEVP_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -84,4 +84,4 @@ void mpfs_boardinitialize(void); } #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_RISCV_M100PFSEVP_MPFS_INCLUDE_BOARD_H */ +#endif /* __BOARDS_RISCV_MPFS_M100PFSEVP_INCLUDE_BOARD_H */ diff --git a/boards/risc-v/mpfs/m100pfsevp/src/board_config.h b/boards/risc-v/mpfs/m100pfsevp/src/board_config.h index 8208a4e08af..2dc26307f5f 100755 --- a/boards/risc-v/mpfs/m100pfsevp/src/board_config.h +++ b/boards/risc-v/mpfs/m100pfsevp/src/board_config.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_RISCV_M100PFSEVP_MPFS_SRC_BOARD_CONFIG_H -#define __BOARDS_RISCV_M100PFSEVP_MPFS_SRC_BOARD_CONFIG_H +#ifndef __BOARDS_RISCV_MPFS_M100PFSEVP_SRC_BOARD_CONFIG_H +#define __BOARDS_RISCV_MPFS_M100PFSEVP_SRC_BOARD_CONFIG_H /**************************************************************************** * Included Files @@ -36,4 +36,4 @@ int mpfs_board_i2c_init(void); int mpfs_pwm_setup(void); int mpfs_board_emmcsd_init(void); -#endif /* __BOARDS_RISCV_M100PFSEVP_MPFS_SRC_BOARD_CONFIG_H */ +#endif /* __BOARDS_RISCV_MPFS_M100PFSEVP_SRC_BOARD_CONFIG_H */ diff --git a/boards/sim/sim/sim/include/nsh_romfsimg.h b/boards/sim/sim/sim/include/nsh_romfsimg.h index a60bce57a74..f2024724671 100644 --- a/boards/sim/sim/sim/include/nsh_romfsimg.h +++ b/boards/sim/sim/sim/include/nsh_romfsimg.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __CONFIGS_SIM_INCLUDE_NSH_ROMFSIMG_H -#define __CONFIGS_SIM_INCLUDE_NSH_ROMFSIMG_H +#ifndef __BOARDS_SIM_SIM_SIM_INCLUDE_NSH_ROMFSIMG_H +#define __BOARDS_SIM_SIM_SIM_INCLUDE_NSH_ROMFSIMG_H extern const unsigned char romfs_img[]; extern const unsigned int romfs_img_len; -#endif +#endif /* __BOARDS_SIM_SIM_SIM_INCLUDE_NSH_ROMFSIMG_H */ diff --git a/boards/x86_64/intel64/qemu-intel64/include/board.h b/boards/x86_64/intel64/qemu-intel64/include/board.h index c749e8f8a76..9cb23e995b3 100644 --- a/boards/x86_64/intel64/qemu-intel64/include/board.h +++ b/boards/x86_64/intel64/qemu-intel64/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_X86_64_INTEL64_QEMU_INCLUDE_BOARD_H -#define __BOARDS_X86_64_INTEL64_QEMU_INCLUDE_BOARD_H +#ifndef __BOARDS_X86_64_INTEL64_QEMU_INTEL64_INCLUDE_BOARD_H +#define __BOARDS_X86_64_INTEL64_QEMU_INTEL64_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -72,4 +72,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_X86_64_INTEL64_QEMU_INCLUDE_BOARD_H */ +#endif /* __BOARDS_X86_64_INTEL64_QEMU_INTEL64_INCLUDE_BOARD_H */ diff --git a/boards/x86_64/intel64/qemu-intel64/src/qemu_intel64.h b/boards/x86_64/intel64/qemu-intel64/src/qemu_intel64.h index 94a854d633b..9a711ee577d 100644 --- a/boards/x86_64/intel64/qemu-intel64/src/qemu_intel64.h +++ b/boards/x86_64/intel64/qemu-intel64/src/qemu_intel64.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_X86_64_INTEL64_QEMU_SRC_QEMU_INTEL64_H -#define __BOARDS_X86_64_INTEL64_QEMU_SRC_QEMU_INTEL64_H +#ifndef __BOARDS_X86_64_INTEL64_QEMU_INTEL64_SRC_QEMU_INTEL64_H +#define __BOARDS_X86_64_INTEL64_QEMU_INTEL64_SRC_QEMU_INTEL64_H /**************************************************************************** * Included Files @@ -51,4 +51,4 @@ int qemu_bringup(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_X86_64_INTEL64_QEMU_SRC_QEMU_INTEL64_H */ +#endif /* __BOARDS_X86_64_INTEL64_QEMU_INTEL64_SRC_QEMU_INTEL64_H */ diff --git a/boards/xtensa/esp32/common/include/esp32_bmp180.h b/boards/xtensa/esp32/common/include/esp32_bmp180.h index eb4f37181ad..d74edcc70d9 100644 --- a/boards/xtensa/esp32/common/include/esp32_bmp180.h +++ b/boards/xtensa/esp32/common/include/esp32_bmp180.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_BMP180_H -#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_BMP180_H +#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BMP180_H +#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BMP180_H /**************************************************************************** * Included Files @@ -81,4 +81,4 @@ int board_bmp180_initialize(int devno, int busno); } #endif -#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_BMP180_H */ +#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BMP180_H */ diff --git a/boards/xtensa/esp32/common/include/esp32_board_i2c.h b/boards/xtensa/esp32/common/include/esp32_board_i2c.h index 13717078bda..ac36171403a 100644 --- a/boards/xtensa/esp32/common/include/esp32_board_i2c.h +++ b/boards/xtensa/esp32/common/include/esp32_board_i2c.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_I2C_H -#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_I2C_H +#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BOARD_I2C_H +#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BOARD_I2C_H /**************************************************************************** * Included Files @@ -66,4 +66,4 @@ int esp32_i2c_register(int bus); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_I2C_H */ \ No newline at end of file +#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BOARD_I2C_H */ diff --git a/boards/xtensa/esp32/common/include/esp32_board_oneshot.h b/boards/xtensa/esp32/common/include/esp32_board_oneshot.h index 40050f25fab..66ce46c5e9d 100644 --- a/boards/xtensa/esp32/common/include/esp32_board_oneshot.h +++ b/boards/xtensa/esp32/common/include/esp32_board_oneshot.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_ONESHOT_H -#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_ONESHOT_H +#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BOARD_ONESHOT_H +#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BOARD_ONESHOT_H /**************************************************************************** * Included Files @@ -78,4 +78,4 @@ int esp32_oneshot_init(int timer, uint16_t resolution); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_ONESHOT_H */ \ No newline at end of file +#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BOARD_ONESHOT_H */ diff --git a/boards/xtensa/esp32/common/include/esp32_board_spiflash.h b/boards/xtensa/esp32/common/include/esp32_board_spiflash.h index 33c64acface..0dd4257572e 100644 --- a/boards/xtensa/esp32/common/include/esp32_board_spiflash.h +++ b/boards/xtensa/esp32/common/include/esp32_board_spiflash.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_SPIFLASH_H -#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_SPIFLASH_H +#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BOARD_SPIFLASH_H +#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BOARD_SPIFLASH_H /**************************************************************************** * Included Files @@ -65,4 +65,4 @@ int esp32_spiflash_init(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_SPIFLASH_H */ +#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BOARD_SPIFLASH_H */ diff --git a/boards/xtensa/esp32/common/include/esp32_board_wdt.h b/boards/xtensa/esp32/common/include/esp32_board_wdt.h index 4755ed79924..152c16e467e 100644 --- a/boards/xtensa/esp32/common/include/esp32_board_wdt.h +++ b/boards/xtensa/esp32/common/include/esp32_board_wdt.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_WDT_H -#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_WDT_H +#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BOARD_WDT_H +#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BOARD_WDT_H /**************************************************************************** * Included Files @@ -70,4 +70,4 @@ int board_wdt_init(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_WDT_H */ +#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BOARD_WDT_H */ diff --git a/boards/xtensa/esp32/common/include/esp32_board_wlan.h b/boards/xtensa/esp32/common/include/esp32_board_wlan.h index 4a8c7cf5a8f..7f096193522 100644 --- a/boards/xtensa/esp32/common/include/esp32_board_wlan.h +++ b/boards/xtensa/esp32/common/include/esp32_board_wlan.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_WLAN_H -#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_WLAN_H +#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BOARD_WLAN_H +#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BOARD_WLAN_H /**************************************************************************** * Included Files @@ -70,4 +70,4 @@ int board_wlan_init(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_WLAN_H */ +#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_BOARD_WLAN_H */ diff --git a/boards/xtensa/esp32/common/include/esp32_ht16k33.h b/boards/xtensa/esp32/common/include/esp32_ht16k33.h index 877c9d4102a..2edebb2edb4 100644 --- a/boards/xtensa/esp32/common/include/esp32_ht16k33.h +++ b/boards/xtensa/esp32/common/include/esp32_ht16k33.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_HT16K33_H -#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_HT16K33_H +#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_HT16K33_H +#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_HT16K33_H /**************************************************************************** * Included Files @@ -81,4 +81,4 @@ int board_ht16k33_initialize(int devno, int busno); } #endif -#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_HT16K33_H */ +#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_HT16K33_H */ diff --git a/boards/xtensa/esp32/common/include/esp32_lcd_backpack.h b/boards/xtensa/esp32/common/include/esp32_lcd_backpack.h index 7a3ebfa5080..ea53469640a 100644 --- a/boards/xtensa/esp32/common/include/esp32_lcd_backpack.h +++ b/boards/xtensa/esp32/common/include/esp32_lcd_backpack.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __ESP32_LCD_BACKPACK_H -#define __ESP32_LCD_BACKPACK_H +#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_LCD_BACKPACK_H +#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_LCD_BACKPACK_H /**************************************************************************** * Included Files @@ -80,4 +80,4 @@ int board_lcd_backpack_init(int devno, int busno, int rows, int cols); } #endif -#endif /* __ESP3232_LCD_BACKPACK_H */ +#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_LCD_BACKPACK_H */ diff --git a/boards/xtensa/esp32/common/include/esp32_mcp2515.h b/boards/xtensa/esp32/common/include/esp32_mcp2515.h index f207965c6ed..89d30fc7d3e 100644 --- a/boards/xtensa/esp32/common/include/esp32_mcp2515.h +++ b/boards/xtensa/esp32/common/include/esp32_mcp2515.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_MCP2515_H -#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_MCP2515_H +#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_MCP2515_H +#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_MCP2515_H /**************************************************************************** * Included Files @@ -80,4 +80,4 @@ int board_mcp2515_initialize(int devno); } #endif -#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_BMP180_H */ +#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_MCP2515_H */ diff --git a/boards/xtensa/esp32/common/include/esp32_sht3x.h b/boards/xtensa/esp32/common/include/esp32_sht3x.h index 639ad904e29..37d5d563354 100644 --- a/boards/xtensa/esp32/common/include/esp32_sht3x.h +++ b/boards/xtensa/esp32/common/include/esp32_sht3x.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_SHT3X_H -#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_SHT3X_H +#ifndef __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_SHT3X_H +#define __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_SHT3X_H /**************************************************************************** * Included Files @@ -81,4 +81,4 @@ int board_sht3x_initialize(int devno, int busno); } #endif -#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_BOARD_SHT3X_H */ +#endif /* __BOARDS_XTENSA_ESP32_COMMON_INCLUDE_ESP32_SHT3X_H */ diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32-ethernet-kit.h b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32-ethernet-kit.h index 1e72116c5b3..a8d992c4ea6 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32-ethernet-kit.h +++ b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32-ethernet-kit.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_XTENSA_ESP32_ESP32_ETHERNETKIT_SRC_ESP32_ETHERNETKIT_H -#define __BOARDS_XTENSA_ESP32_ESP32_ETHERNETKIT_SRC_ESP32_ETHERNETKIT_H +#ifndef __BOARDS_XTENSA_ESP32_ESP32_ETHERNET_KIT_SRC_ESP32_ETHERNET_KIT_H +#define __BOARDS_XTENSA_ESP32_ESP32_ETHERNET_KIT_SRC_ESP32_ETHERNET_KIT_H /**************************************************************************** * Included Files @@ -100,4 +100,4 @@ int esp32_mmcsd_initialize(int minor); int esp32_spiflash_init(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_XTENSA_ESP32_ESP32_ETHERNETKIT_SRC_ESP32_ETHERNETKIT_H */ +#endif /* __BOARDS_XTENSA_ESP32_ESP32_ETHERNET_KIT_SRC_ESP32_ETHERNET_KIT_H */ diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/include/board.h b/boards/xtensa/esp32s2/esp32s2-saola-1/include/board.h index 9c0880fb6e4..0d462d92f9f 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/include/board.h +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/include/board.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_XTENSA_ESP32S2_ESP32S2_CORE_INCLUDE_BOARD_H -#define __BOARDS_XTENSA_ESP32S2_ESP32S2_CORE_INCLUDE_BOARD_H +#ifndef __BOARDS_XTENSA_ESP32S2_ESP32S2_SAOLA_1_INCLUDE_BOARD_H +#define __BOARDS_XTENSA_ESP32S2_ESP32S2_SAOLA_1_INCLUDE_BOARD_H /**************************************************************************** * Pre-processor Definitions @@ -78,4 +78,4 @@ #define BOARD_NGPIOIN 1 /* Amount of GPIO Input without Interruption */ #define BOARD_NGPIOINT 1 /* Amount of GPIO Input w/ Interruption pins */ -#endif /* __BOARDS_XTENSA_ESP32S2_ESP32S2_CORE_INCLUDE_BOARD_H */ +#endif /* __BOARDS_XTENSA_ESP32S2_ESP32S2_SAOLA_1_INCLUDE_BOARD_H */ diff --git a/drivers/modem/altair/altmdm_pm_state.h b/drivers/modem/altair/altmdm_pm_state.h index ba78916f605..b7f0160c5fc 100644 --- a/drivers/modem/altair/altmdm_pm_state.h +++ b/drivers/modem/altair/altmdm_pm_state.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_MODEM_ALTMDM_ALTMDM_PM_STATE_H -#define __DRIVERS_MODEM_ALTMDM_ALTMDM_PM_STATE_H +#ifndef __DRIVERS_MODEM_ALTAIR_ALTMDM_PM_STATE_H +#define __DRIVERS_MODEM_ALTAIR_ALTMDM_PM_STATE_H #if defined(CONFIG_MODEM_ALTMDM) @@ -68,4 +68,4 @@ uint32_t altmdm_pm_getinternalstate(void); void altmdm_pm_setinternalstate(uint32_t state); #endif -#endif /* __DRIVERS_MODEM_ALTMDM_ALTMDM_PM_STATE_H */ +#endif /* __DRIVERS_MODEM_ALTAIR_ALTMDM_PM_STATE_H */ diff --git a/drivers/modem/altair/altmdm_spi.h b/drivers/modem/altair/altmdm_spi.h index 7c06c7e3eb7..48def41c140 100644 --- a/drivers/modem/altair/altmdm_spi.h +++ b/drivers/modem/altair/altmdm_spi.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_MODEM_ALTMDM_ALTMDM_ALTMDM_SPI_H -#define __DRIVERS_MODEM_ALTMDM_ALTMDM_ALTMDM_SPI_H +#ifndef __DRIVERS_MODEM_ALTAIR_ALTMDM_SPI_H +#define __DRIVERS_MODEM_ALTAIR_ALTMDM_SPI_H /**************************************************************************** * Included Files @@ -169,4 +169,4 @@ struct altmdm_spi_dev_s }; #endif -#endif /* __DRIVERS_MODEM_ALTMDM_ALTMDM_SPI_H */ +#endif /* __DRIVERS_MODEM_ALTAIR_ALTMDM_SPI_H */ diff --git a/drivers/modem/altair/altmdm_sys.h b/drivers/modem/altair/altmdm_sys.h index c6b1d419d66..aea624faa5f 100644 --- a/drivers/modem/altair/altmdm_sys.h +++ b/drivers/modem/altair/altmdm_sys.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_MODEM_ALTMDM_ALTMDM_SYS_H -#define __DRIVERS_MODEM_ALTMDM_ALTMDM_SYS_H +#ifndef __DRIVERS_MODEM_ALTAIR_ALTMDM_SYS_H +#define __DRIVERS_MODEM_ALTAIR_ALTMDM_SYS_H #if defined(CONFIG_MODEM_ALTMDM) @@ -256,4 +256,4 @@ int altmdm_sys_restarttimer(timer_t timerid, int first_ms, int interval_ms); void altmdm_sys_stoptimer(timer_t timerid); #endif -#endif /* __DRIVERS_MODEM_ALTMDM_ALTMDM_SYS_H */ +#endif /* __DRIVERS_MODEM_ALTAIR_ALTMDM_SYS_H */ diff --git a/drivers/video/video_framebuff.h b/drivers/video/video_framebuff.h index beda4d45fcf..f1623f47a61 100644 --- a/drivers/video/video_framebuff.h +++ b/drivers/video/video_framebuff.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __VIDEO_VIDEO_FRAMEBUFF_H__ -#define __VIDEO_VIDEO_FRAMEBUFF_H__ +#ifndef __DRIVERS_VIDEO_VIDEO_FRAMEBUFF_H +#define __DRIVERS_VIDEO_VIDEO_FRAMEBUFF_H /**************************************************************************** * Included Files @@ -84,4 +84,4 @@ void video_framebuff_capture_done void video_framebuff_change_mode (video_framebuff_t *fbuf, enum v4l2_buf_mode mode); -#endif // __VIDEO_VIDEO_FRAMEBUFF_H__ +#endif /* __DRIVERS_VIDEO_VIDEO_FRAMEBUFF_H */ diff --git a/drivers/video/vnc/vnc_server.h b/drivers/video/vnc/vnc_server.h index 139f97c0825..0ba47d0fa86 100644 --- a/drivers/video/vnc/vnc_server.h +++ b/drivers/video/vnc/vnc_server.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __GRAPHICS_VNC_SERVER_VNC_SERVER_H -#define __GRAPHICS_VNC_SERVER_VNC_SERVER_H +#ifndef __DRIVERS_VIDEO_VNC_VNC_SERVER_H +#define __DRIVERS_VIDEO_VNC_VNC_SERVER_H /**************************************************************************** * Included Files @@ -560,4 +560,4 @@ int vnc_colors(FAR struct vnc_session_s *session, } #endif -#endif /* __GRAPHICS_VNC_SERVER_VNC_SERVER_H */ +#endif /* __DRIVERS_VIDEO_VNC_VNC_SERVER_H */ diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_bdc.h b/drivers/wireless/ieee80211/bcm43xxx/bcmf_bdc.h index 68ebb088ead..40f1d0cbee0 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_bdc.h +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_bdc.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_WIRELESS_IEEE80211_BCMF_BDC_H -#define __DRIVERS_WIRELESS_IEEE80211_BCMF_BDC_H +#ifndef __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_BDC_H +#define __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_BDC_H /**************************************************************************** * Included Files @@ -83,4 +83,4 @@ int bcmf_event_unregister(FAR struct bcmf_dev_s *priv, int bcmf_event_push_config(FAR struct bcmf_dev_s *priv); -#endif /* __DRIVERS_WIRELESS_IEEE80211_BCMF_BDC_H */ +#endif /* __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_BDC_H */ diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_cdc.h b/drivers/wireless/ieee80211/bcm43xxx/bcmf_cdc.h index 15f4cf7ca91..5e835b24b5f 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_cdc.h +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_cdc.h @@ -22,8 +22,8 @@ * Included Files ****************************************************************************/ -#ifndef __DRIVERS_WIRELESS_IEEE80211_BCMF_CDC_H -#define __DRIVERS_WIRELESS_IEEE80211_BCMF_CDC_H +#ifndef __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_CDC_H +#define __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_CDC_H #include "bcmf_driver.h" #include @@ -53,4 +53,4 @@ int bcmf_cdc_iovar_request_unsafe(FAR struct bcmf_dev_s *priv, int bcmf_cdc_process_control_frame(FAR struct bcmf_dev_s *priv, struct bcmf_frame_s *frame); -#endif /* __DRIVERS_WIRELESS_IEEE80211_BCMF_CDC_H */ +#endif /* __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_CDC_H */ diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_core.h b/drivers/wireless/ieee80211/bcm43xxx/bcmf_core.h index 1c428dfa9d2..3709f464aee 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_core.h +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_core.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_WIRELESS_IEEE80211_BCMF_CORE_H -#define __DRIVERS_WIRELESS_IEEE80211_BCMF_CORE_H +#ifndef __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_CORE_H +#define __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_CORE_H /**************************************************************************** * Included Files @@ -79,4 +79,4 @@ static inline int bcmf_write_sbregw(FAR struct bcmf_sdio_dev_s *sbus, return bcmf_write_sbreg(sbus, address, (uint8_t *)®, 4); } -#endif /* __DRIVERS_WIRELESS_IEEE80211_BCMF_CORE_H */ +#endif /* __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_CORE_H */ diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h b/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h index bc465cce63a..e3f5dea4cef 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_WIRELESS_IEEE80211_BCMF_DRIVER_H -#define __DRIVERS_WIRELESS_IEEE80211_BCMF_DRIVER_H +#ifndef __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_DRIVER_H +#define __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_DRIVER_H /**************************************************************************** * Included Files @@ -156,4 +156,4 @@ int bcmf_wl_set_mode(FAR struct bcmf_dev_s *priv, struct iwreq *iwr); int bcmf_wl_set_ssid(FAR struct bcmf_dev_s *priv, struct iwreq *iwr); -#endif /* __DRIVERS_WIRELESS_IEEE80211_BCMF_DRIVER_H */ +#endif /* __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_DRIVER_H */ diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_ioctl.h b/drivers/wireless/ieee80211/bcm43xxx/bcmf_ioctl.h index f02894b3ce7..80fd7fda480 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_ioctl.h +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_ioctl.h @@ -42,8 +42,8 @@ * Broadcom 802.11abg Networking Device Driver */ -#ifndef __DRIVERS_WIRELESS_IEEE80211_BCMF_IOCTL_H -#define __DRIVERS_WIRELESS_IEEE80211_BCMF_IOCTL_H +#ifndef __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_IOCTL_H +#define __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_IOCTL_H /**************************************************************************** * Included Files @@ -3053,4 +3053,4 @@ typedef enum WLC_E_REASON_FORCE_32_BIT = 0x7ffffffe /* Force enum to be stored in 32 bit variable */ } wl_event_reason_t; -#endif /* __DRIVERS_WIRELESS_IEEE80211_BCMF_IOCTL_H */ +#endif /* __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_IOCTL_H */ diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.h b/drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.h index c20fdd57bf1..07d851d9ce5 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.h +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_WIRELESS_IEEE80211_BCMF_NETDEV_H -#define __DRIVERS_WIRELESS_IEEE80211_BCMF_NETDEV_H +#ifndef __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_NETDEV_H +#define __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_NETDEV_H /**************************************************************************** * Included Files @@ -37,4 +37,4 @@ void bcmf_netdev_notify_rx(FAR struct bcmf_dev_s *priv); void bcmf_netdev_notify_tx_done(FAR struct bcmf_dev_s *priv); -#endif /* __DRIVERS_WIRELESS_IEEE80211_BCMF_NETDEV_H */ +#endif /* __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_NETDEV_H */ diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.h b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.h index 470ea8bd773..3a6206f1719 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.h +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_WIRELESS_IEEE80211_BCMF_SDIO_H -#define __DRIVERS_WIRELESS_IEEE80211_BCMF_SDIO_H +#ifndef __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_SDIO_H +#define __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_SDIO_H /**************************************************************************** * Included Files @@ -163,4 +163,4 @@ struct bcmf_sdio_frame *bcmf_sdio_allocate_frame(FAR struct bcmf_dev_s *priv, void bcmf_sdio_free_frame(FAR struct bcmf_dev_s *priv, struct bcmf_sdio_frame *sframe); -#endif /* __DRIVERS_WIRELESS_IEEE80211_BCMF_SDIO_H */ +#endif /* __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_SDIO_H */ diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio_core.h b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio_core.h index 641e7493ae5..d56d678a8ea 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio_core.h +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio_core.h @@ -15,8 +15,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_WIRELESS_IEEE80211_BCMF_SDIO_CORE_H -#define __DRIVERS_WIRELESS_IEEE80211_BCMF_SDIO_CORE_H +#ifndef __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_SDIO_CORE_H +#define __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_SDIO_CORE_H /**************************************************************************** * Included Files @@ -253,4 +253,4 @@ struct sdpcmd_regs * Public Functions Prototypes ****************************************************************************/ -#endif /* __DRIVERS_WIRELESS_IEEE80211_BCMF_SDIO_CORE_H */ +#endif /* __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_SDIO_CORE_H */ diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio_regs.h b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio_regs.h index 4ef437c1a88..8e03fc814da 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio_regs.h +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio_regs.h @@ -15,8 +15,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_WIRELESS_IEEE80211_BCMF_SDIO_REGS_H -#define __DRIVERS_WIRELESS_IEEE80211_BCMF_SDIO_REGS_H +#ifndef __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_SDIO_REGS_H +#define __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_SDIO_REGS_H #define SDIO_FUNC_0 0 #define SDIO_FUNC_1 1 @@ -246,4 +246,4 @@ #define SBSDIO_SBWINDOW_MASK 0xffff8000 -#endif /* __DRIVERS_WIRELESS_IEEE80211_BCMF_SDIO_REGS_H */ +#endif /* __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_SDIO_REGS_H */ diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdpcm.h b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdpcm.h index c354426a708..057308c16fc 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdpcm.h +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdpcm.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_WIRELESS_IEEE80211_BCMF_SDPCM_H -#define __DRIVERS_WIRELESS_IEEE80211_BCMF_SDPCM_H +#ifndef __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_SDPCM_H +#define __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_SDPCM_H /**************************************************************************** * Included Files @@ -47,4 +47,4 @@ struct bcmf_frame_s *bcmf_sdpcm_alloc_frame(FAR struct bcmf_dev_s *priv, struct bcmf_frame_s *bcmf_sdpcm_get_rx_frame(FAR struct bcmf_dev_s *priv); -#endif /* __DRIVERS_WIRELESS_IEEE80211_BCMF_SDPCM_H */ +#endif /* __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_SDPCM_H */ diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_utils.h b/drivers/wireless/ieee80211/bcm43xxx/bcmf_utils.h index 26492386b1d..9f99f665add 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_utils.h +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_utils.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_WIRELESS_IEEE80211_BCMF_UTILS_H -#define __DRIVERS_WIRELESS_IEEE80211_BCMF_UTILS_H +#ifndef __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_UTILS_H +#define __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_UTILS_H /**************************************************************************** * Included Files @@ -64,4 +64,4 @@ static inline uint32_t bcmf_getle32(void *val) return (uint32_t)bcmf_getle16(valw) << 16 | bcmf_getle16(valw + 1); } -#endif /* __DRIVERS_WIRELESS_IEEE80211_BCMF_UTILS_H */ +#endif /* __DRIVERS_WIRELESS_IEEE80211_BCM43XXX_BCMF_UTILS_H */ diff --git a/drivers/wireless/ieee802154/mrf24j40/mrf24j40.h b/drivers/wireless/ieee802154/mrf24j40/mrf24j40.h index fc87d1b15f9..cfa02860cfa 100644 --- a/drivers/wireless/ieee802154/mrf24j40/mrf24j40.h +++ b/drivers/wireless/ieee802154/mrf24j40/mrf24j40.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_WIRELESS_IEEE802154_MRF24J40_H -#define __DRIVERS_WIRELESS_IEEE802154_MRF24J40_H +#ifndef __DRIVERS_WIRELESS_IEEE802154_MRF24J40_MRF24J40_H +#define __DRIVERS_WIRELESS_IEEE802154_MRF24J40_MRF24J40_H /**************************************************************************** * Included Files @@ -211,4 +211,4 @@ void mrf24j40_setup_fifo(FAR struct mrf24j40_radio_s *dev, void mrf24j40_norm_trigger(FAR struct mrf24j40_radio_s *dev); void mrf24j40_beacon_trigger(FAR struct mrf24j40_radio_s *dev); -#endif /* __DRIVERS_WIRELESS_IEEE802154_MRF24J40_H */ +#endif /* __DRIVERS_WIRELESS_IEEE802154_MRF24J40_MRF24J40_H */ diff --git a/drivers/wireless/ieee802154/mrf24j40/mrf24j40_getset.h b/drivers/wireless/ieee802154/mrf24j40/mrf24j40_getset.h index 4e57da0dfe6..fdc85122f11 100644 --- a/drivers/wireless/ieee802154/mrf24j40/mrf24j40_getset.h +++ b/drivers/wireless/ieee802154/mrf24j40/mrf24j40_getset.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_WIRELESS_IEEE802154_MRF24J40_GETSET_H -#define __DRIVERS_WIRELESS_IEEE802154_MRF24J40_GETSET_H +#ifndef __DRIVERS_WIRELESS_IEEE802154_MRF24J40_MRF24J40_GETSET_H +#define __DRIVERS_WIRELESS_IEEE802154_MRF24J40_MRF24J40_GETSET_H int mrf24j40_setrxmode(FAR struct mrf24j40_radio_s *dev, int mode); @@ -49,4 +49,4 @@ int mrf24j40_setcca(FAR struct mrf24j40_radio_s *dev, int mrf24j40_setpamode(FAR struct mrf24j40_radio_s *dev, int mode); -#endif /* __DRIVERS_WIRELESS_IEEE802154_MRF24J40_GETSET_H */ +#endif /* __DRIVERS_WIRELESS_IEEE802154_MRF24J40_MRF24J40_GETSET_H */ diff --git a/drivers/wireless/ieee802154/mrf24j40/mrf24j40_radif.h b/drivers/wireless/ieee802154/mrf24j40/mrf24j40_radif.h index 8a4490fbc8c..52ec787cddf 100644 --- a/drivers/wireless/ieee802154/mrf24j40/mrf24j40_radif.h +++ b/drivers/wireless/ieee802154/mrf24j40/mrf24j40_radif.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_WIRELESS_IEEE802154_MRF24J40_RADIF_H -#define __DRIVERS_WIRELESS_IEEE802154_MRF24J40_RADIF_H +#ifndef __DRIVERS_WIRELESS_IEEE802154_MRF24J40_MRF24J40_RADIF_H +#define __DRIVERS_WIRELESS_IEEE802154_MRF24J40_MRF24J40_RADIF_H int mrf24j40_bind(FAR struct ieee802154_radio_s *radio, FAR struct ieee802154_radiocb_s *radiocb); @@ -57,4 +57,4 @@ int mrf24j40_beaconstop(FAR struct ieee802154_radio_s *radio); int mrf24j40_sfupdate(FAR struct ieee802154_radio_s *radio, FAR const struct ieee802154_superframespec_s *sfspec); -#endif /* __DRIVERS_WIRELESS_IEEE802154_MRF24J40_RADIF_H */ +#endif /* __DRIVERS_WIRELESS_IEEE802154_MRF24J40_MRF24J40_RADIF_H */ diff --git a/drivers/wireless/ieee802154/mrf24j40/mrf24j40_reg.h b/drivers/wireless/ieee802154/mrf24j40/mrf24j40_reg.h index 32a9a6fcf7e..b538c0735cd 100644 --- a/drivers/wireless/ieee802154/mrf24j40/mrf24j40_reg.h +++ b/drivers/wireless/ieee802154/mrf24j40/mrf24j40_reg.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_WIRELESS_IEEE802154_MRF24J40_REG_H -#define __DRIVERS_WIRELESS_IEEE802154_MRF24J40_REG_H +#ifndef __DRIVERS_WIRELESS_IEEE802154_MRF24J40_MRF24J40_REG_H +#define __DRIVERS_WIRELESS_IEEE802154_MRF24J40_MRF24J40_REG_H /* MRF24J40 Registers *******************************************************/ @@ -284,4 +284,4 @@ #define MRF24J40_SLPCON1_CLKOUT_DISABLED 0x20 -#endif /* __DRIVERS_WIRELESS_IEEE802154_MRF24J40_REG_H */ +#endif /* __DRIVERS_WIRELESS_IEEE802154_MRF24J40_MRF24J40_REG_H */ diff --git a/drivers/wireless/ieee802154/mrf24j40/mrf24j40_regops.h b/drivers/wireless/ieee802154/mrf24j40/mrf24j40_regops.h index 8c87f0b3105..c28ef99b6df 100644 --- a/drivers/wireless/ieee802154/mrf24j40/mrf24j40_regops.h +++ b/drivers/wireless/ieee802154/mrf24j40/mrf24j40_regops.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_WIRELESS_IEEE802154_MRF24J40_REGOPS_H -#define __DRIVERS_WIRELESS_IEEE802154_MRF24J40_REGOPS_H +#ifndef __DRIVERS_WIRELESS_IEEE802154_MRF24J40_MRF24J40_REGOPS_H +#define __DRIVERS_WIRELESS_IEEE802154_MRF24J40_MRF24J40_REGOPS_H void mrf24j40_setreg(FAR struct spi_dev_s *spi, uint32_t addr, uint8_t val); @@ -27,4 +27,4 @@ uint8_t mrf24j40_getreg(FAR struct spi_dev_s *spi, uint32_t addr); int mrf24j40_regdump(FAR struct mrf24j40_radio_s *dev); -#endif /* __DRIVERS_WIRELESS_IEEE802154_MRF24J40_REGOPS_H */ +#endif /* __DRIVERS_WIRELESS_IEEE802154_MRF24J40_MRF24J40_REGOPS_H */ diff --git a/drivers/wireless/ieee802154/xbee/xbee.h b/drivers/wireless/ieee802154/xbee/xbee.h index ca4718783e9..247e6adcace 100644 --- a/drivers/wireless/ieee802154/xbee/xbee.h +++ b/drivers/wireless/ieee802154/xbee/xbee.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_WIRELESS_IEEE802154_XBEE_H -#define __DRIVERS_WIRELESS_IEEE802154_XBEE_H +#ifndef __DRIVERS_WIRELESS_IEEE802154_XBEE_XBEE_H +#define __DRIVERS_WIRELESS_IEEE802154_XBEE_XBEE_H /**************************************************************************** * Included Files @@ -485,4 +485,4 @@ void xbee_enable_coord(FAR struct xbee_priv_s *priv, bool enable); void xbee_regdump(FAR struct xbee_priv_s *priv); -#endif /* __DRIVERS_WIRELESS_IEEE802154_XBEE_H */ +#endif /* __DRIVERS_WIRELESS_IEEE802154_XBEE_XBEE_H */ diff --git a/drivers/wireless/ieee802154/xbee/xbee_mac.h b/drivers/wireless/ieee802154/xbee/xbee_mac.h index d53fba8f62b..de1194ffa17 100644 --- a/drivers/wireless/ieee802154/xbee/xbee_mac.h +++ b/drivers/wireless/ieee802154/xbee/xbee_mac.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_WIRELESS_IEEE802154_XBEE_MAC_H -#define __DRIVERS_WIRELESS_IEEE802154_XBEE_MAC_H +#ifndef __DRIVERS_WIRELESS_IEEE802154_XBEE_XBEE_MAC_H +#define __DRIVERS_WIRELESS_IEEE802154_XBEE_XBEE_MAC_H /**************************************************************************** * Included Files @@ -231,4 +231,4 @@ int xbee_req_associate(XBEEHANDLE xbee, int xbee_req_reset(XBEEHANDLE xbee, bool resetattr); -#endif /* __DRIVERS_WIRELESS_IEEE802154_XBEE_MAC_H */ +#endif /* __DRIVERS_WIRELESS_IEEE802154_XBEE_XBEE_MAC_H */ diff --git a/drivers/wireless/lpwan/sx127x/sx127x.h b/drivers/wireless/lpwan/sx127x/sx127x.h index 1d6fe590aa4..07d67eb82e9 100644 --- a/drivers/wireless/lpwan/sx127x/sx127x.h +++ b/drivers/wireless/lpwan/sx127x/sx127x.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_WIRELESS_LPWAN_SX127X_H -#define __DRIVERS_WIRELESS_LPWAN_SX127X_H +#ifndef __DRIVERS_WIRELESS_LPWAN_SX127X_SX127X_H +#define __DRIVERS_WIRELESS_LPWAN_SX127X_SX127X_H /**************************************************************************** * Included Files @@ -834,4 +834,4 @@ } #endif -#endif /* __DRIVERS_WIRELESS_LPWAN_SX127X_H */ +#endif /* __DRIVERS_WIRELESS_LPWAN_SX127X_SX127X_H */ diff --git a/drivers/wireless/spirit/include/spirit_linearfifo.h b/drivers/wireless/spirit/include/spirit_linearfifo.h index cf054ebfa73..c4c226c15f2 100644 --- a/drivers/wireless/spirit/include/spirit_linearfifo.h +++ b/drivers/wireless/spirit/include/spirit_linearfifo.h @@ -32,8 +32,8 @@ * ******************************************************************************/ -#ifndef __DRIVERS_WIRELESS_SPIRIT_INCLUDE_SPIRIT_FIFO_H -#define __DRIVERS_WIRELESS_SPIRIT_INCLUDE_SPIRIT_FIFO_H +#ifndef __DRIVERS_WIRELESS_SPIRIT_INCLUDE_SPIRIT_LINEARFIFO_H +#define __DRIVERS_WIRELESS_SPIRIT_INCLUDE_SPIRIT_LINEARFIFO_H /****************************************************************************** * Included Files @@ -255,4 +255,4 @@ uint8_t spirit_fifo_get_txalmostempty(FAR struct spirit_library_s *spirit); } #endif -#endif /* __DRIVERS_WIRELESS_SPIRIT_INCLUDE_SPIRIT_FIFO_H */ +#endif /* __DRIVERS_WIRELESS_SPIRIT_INCLUDE_SPIRIT_LINEARFIFO_H */ diff --git a/drivers/wireless/spirit/include/spirit_pktstack.h b/drivers/wireless/spirit/include/spirit_pktstack.h index f31c787ebc0..a0e66d693bd 100644 --- a/drivers/wireless/spirit/include/spirit_pktstack.h +++ b/drivers/wireless/spirit/include/spirit_pktstack.h @@ -32,8 +32,8 @@ * ******************************************************************************/ -#ifndef __INCLUDE_NUTT_WIRELESS_SPIRIT_SPIRIT_PKTSTACK_H -#define __INCLUDE_NUTT_WIRELESS_SPIRIT_SPIRIT_PKTSTACK_H +#ifndef __DRIVERS_WIRELESS_SPIRIT_INCLUDE_SPIRIT_PKTSTACK_H +#define __DRIVERS_WIRELESS_SPIRIT_INCLUDE_SPIRIT_PKTSTACK_H /* This module can be used to manage the configuration of Spirit STack * packets, and it is quite similar to the Basic packets one since the @@ -482,4 +482,4 @@ int spirit_pkstack_enable_rxsource_addrfilter( } #endif -#endif /* __INCLUDE_NUTT_WIRELESS_SPIRIT_SPIRIT_PKTSTACK_H */ +#endif /* __DRIVERS_WIRELESS_SPIRIT_INCLUDE_SPIRIT_PKTSTACK_H */ diff --git a/drivers/wireless/spirit/include/spirit_types.h b/drivers/wireless/spirit/include/spirit_types.h index c91bd3b9510..65670818b5d 100644 --- a/drivers/wireless/spirit/include/spirit_types.h +++ b/drivers/wireless/spirit/include/spirit_types.h @@ -32,8 +32,8 @@ * ******************************************************************************/ -#ifndef __INCLUDE_NUTT_WIRELESS_SPIRIT_INCLUDE_SPIRIT_TYPES_H -#define __INCLUDE_NUTT_WIRELESS_SPIRIT_INCLUDE_SPIRIT_TYPES_H +#ifndef __DRIVERS_WIRELESS_SPIRIT_INCLUDE_SPIRIT_TYPES_H +#define __DRIVERS_WIRELESS_SPIRIT_INCLUDE_SPIRIT_TYPES_H /* This module provide some types definitions which will be used in * all the modules of this library. Here is defined also the global @@ -171,4 +171,4 @@ struct spirit_library_s } #endif -#endif /* __INCLUDE_NUTT_WIRELESS_SPIRIT_INCLUDE_SPIRIT_TYPES_H */ +#endif /* __DRIVERS_WIRELESS_SPIRIT_INCLUDE_SPIRIT_TYPES_H */ diff --git a/fs/inode/inode.h b/fs/inode/inode.h index f9793acd890..37317169020 100644 --- a/fs/inode/inode.h +++ b/fs/inode/inode.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __FS_INODE_H -#define __FS_INODE_H +#ifndef __FS_INODE_INODE_H +#define __FS_INODE_INODE_H /**************************************************************************** * Included Files @@ -424,4 +424,4 @@ int files_allocate(FAR struct inode *inode, int oflags, off_t pos, } #endif -#endif /* __FS_INODE_H */ +#endif /* __FS_INODE_INODE_H */ diff --git a/fs/mmap/fs_rammap.h b/fs/mmap/fs_rammap.h index ec4fbbc87c7..fd476645d80 100644 --- a/fs/mmap/fs_rammap.h +++ b/fs/mmap/fs_rammap.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __FS_MMAP_RAMMAP_H -#define __FS_MMAP_RAMMAP_H +#ifndef __FS_MMAP_FS_RAMMAP_H +#define __FS_MMAP_FS_RAMMAP_H /**************************************************************************** * Included Files @@ -111,4 +111,4 @@ int rammap(FAR struct file *filep, size_t length, off_t offset, bool kernel, FAR void **mapped); #endif /* CONFIG_FS_RAMMAP */ -#endif /* __FS_MMAP_RAMMAP_H */ +#endif /* __FS_MMAP_FS_RAMMAP_H */ diff --git a/fs/rpmsgfs/rpmsgfs.h b/fs/rpmsgfs/rpmsgfs.h index 7f1014dc662..59cc3ab15ec 100644 --- a/fs/rpmsgfs/rpmsgfs.h +++ b/fs/rpmsgfs/rpmsgfs.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __FS_RPMSGFS_H -#define __FS_RPMSGFS_H +#ifndef __FS_RPMSGFS_RPMSGFS_H +#define __FS_RPMSGFS_RPMSGFS_H /**************************************************************************** * Included Files @@ -243,4 +243,4 @@ int rpmsgfs_client_stat(FAR void *handle, FAR const char *path, int rpmsgfs_client_chstat(FAR void *handle, FAR const char *path, FAR const struct stat *buf, int flags); -#endif /* __FS_RPMSGFS_H */ +#endif /* __FS_RPMSGFS_RPMSGFS_H */ diff --git a/include/nuttx/drivers/drivers.h b/include/nuttx/drivers/drivers.h index 4fd76ccfc01..cfbf640ede1 100644 --- a/include/nuttx/drivers/drivers.h +++ b/include/nuttx/drivers/drivers.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_FS_DRIVERS_H -#define __INCLUDE_NUTTX_FS_DRIVERS_H +#ifndef __INCLUDE_NUTTX_DRIVERS_DRIVERS_H +#define __INCLUDE_NUTTX_DRIVERS_DRIVERS_H /**************************************************************************** * Included Files @@ -222,4 +222,4 @@ void lwlconsole_init(void); } #endif -#endif /* __INCLUDE_NUTTX_FS_DRIVERS_H */ +#endif /* __INCLUDE_NUTTX_DRIVERS_DRIVERS_H */ diff --git a/include/nuttx/eeprom/spi_xx25xx.h b/include/nuttx/eeprom/spi_xx25xx.h index 883ccbba8fa..5a1f7608293 100644 --- a/include/nuttx/eeprom/spi_xx25xx.h +++ b/include/nuttx/eeprom/spi_xx25xx.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_EEPROM_M25XX_H -#define __INCLUDE_NUTTX_EEPROM_M25XX_H +#ifndef __INCLUDE_NUTTX_EEPROM_SPI_XX25XX_H +#define __INCLUDE_NUTTX_EEPROM_SPI_XX25XX_H /**************************************************************************** * Public Types @@ -95,4 +95,4 @@ struct spi_dev_s; int ee25xx_initialize(FAR struct spi_dev_s *dev, FAR char *devname, int devtype, int readonly); -#endif /* __INCLUDE__NUTTX_EEPROM_M25XX_H */ +#endif /* __INCLUDE_NUTTX_EEPROM_SPI_XX25XX_H */ diff --git a/include/nuttx/fs/automount.h b/include/nuttx/fs/automount.h index ed952283655..7c4c1987e16 100644 --- a/include/nuttx/fs/automount.h +++ b/include/nuttx/fs/automount.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_AUDIO_AUTOMOUNT_H -#define __INCLUDE_NUTTX_AUDIO_AUTOMOUNT_H +#ifndef __INCLUDE_NUTTX_FS_AUTOMOUNT_H +#define __INCLUDE_NUTTX_FS_AUTOMOUNT_H /**************************************************************************** * Included Files @@ -179,4 +179,4 @@ void automount_uninitialize(FAR void *handle); #endif #endif /* CONFIG_FS_AUTOMOUNTER */ -#endif /* __INCLUDE_NUTTX_AUDIO_AUTOMOUNT_H */ +#endif /* __INCLUDE_NUTTX_FS_AUTOMOUNT_H */ diff --git a/include/nuttx/fs/smart.h b/include/nuttx/fs/smart.h index be792f1a294..935804ed7bb 100644 --- a/include/nuttx/fs/smart.h +++ b/include/nuttx/fs/smart.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_SMART_H -#define __INCLUDE_NUTTX_SMART_H +#ifndef __INCLUDE_NUTTX_FS_SMART_H +#define __INCLUDE_NUTTX_FS_SMART_H /**************************************************************************** * Included Files @@ -158,4 +158,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __INCLUDE_NUTTX_SMART_H */ +#endif /* __INCLUDE_NUTTX_FS_SMART_H */ diff --git a/include/nuttx/i2c/i2c_bitbang.h b/include/nuttx/i2c/i2c_bitbang.h index 0aa1381258d..1e8e6c4f97d 100644 --- a/include/nuttx/i2c/i2c_bitbang.h +++ b/include/nuttx/i2c/i2c_bitbang.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_I2C_I2C_BITBANG_H -#define __DRIVERS_I2C_I2C_BITBANG_H +#ifndef __INCLUDE_NUTTX_I2C_I2C_BITBANG_H +#define __INCLUDE_NUTTX_I2C_I2C_BITBANG_H /**************************************************************************** * Included Files @@ -79,4 +79,4 @@ struct i2c_bitbang_lower_dev_s FAR struct i2c_master_s *i2c_bitbang_initialize( FAR struct i2c_bitbang_lower_dev_s *lower); -#endif /* __DRIVERS_I2C_I2C_BITBANG_H */ +#endif /* __INCLUDE_NUTTX_I2C_I2C_BITBANG_H */ diff --git a/include/nuttx/i2c/pca9540bdp.h b/include/nuttx/i2c/pca9540bdp.h index cb787be8462..e44d6f4c280 100644 --- a/include/nuttx/i2c/pca9540bdp.h +++ b/include/nuttx/i2c/pca9540bdp.h @@ -37,8 +37,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_I2C_PCA9540BDP_H -#define __INCLUDE_I2C_PCA9540BDP_H +#ifndef __INCLUDE_NUTTX_I2C_PCA9540BDP_H +#define __INCLUDE_NUTTX_I2C_PCA9540BDP_H /**************************************************************************** * Included Files @@ -121,4 +121,4 @@ FAR struct pca9540bdp_dev_s * } #endif -#endif /* __INCLUDE_I2C_PCA9540BDP_H */ +#endif /* __INCLUDE_NUTTX_I2C_PCA9540BDP_H */ diff --git a/include/nuttx/input/cypress_mbr3108.h b/include/nuttx/input/cypress_mbr3108.h index 2ebbffb19a8..fa18fc96a26 100644 --- a/include/nuttx/input/cypress_mbr3108.h +++ b/include/nuttx/input/cypress_mbr3108.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_INPUT_CYPRESS_MBR3108_H_ -#define __INCLUDE_NUTTX_INPUT_CYPRESS_MBR3108_H_ +#ifndef __INCLUDE_NUTTX_INPUT_CYPRESS_MBR3108_H +#define __INCLUDE_NUTTX_INPUT_CYPRESS_MBR3108_H /**************************************************************************** * Included Files @@ -127,4 +127,4 @@ int cypress_mbr3108_register(FAR const char *devpath, struct mbr3108_board_s *board_config, const struct mbr3108_sensor_conf_s *sensor_conf); -#endif /* __INCLUDE_NUTTX_INPUT_CYPRESS_MBR3108_H_ */ +#endif /* __INCLUDE_NUTTX_INPUT_CYPRESS_MBR3108_H */ diff --git a/include/nuttx/lcd/gc9a01.h b/include/nuttx/lcd/gc9a01.h index 6717eb11301..667b6cbdc4b 100644 --- a/include/nuttx/lcd/gc9a01.h +++ b/include/nuttx/lcd/gc9a01.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_GC9A01_H -#define __INCLUDE_NUTTX_GC9A01_H +#ifndef __INCLUDE_NUTTX_LCD_GC9A01_H +#define __INCLUDE_NUTTX_LCD_GC9A01_H /**************************************************************************** * Included Files @@ -69,4 +69,4 @@ FAR struct lcd_dev_s *gc9a01_lcdinitialize(FAR struct spi_dev_s *spi); } #endif -#endif /* __INCLUDE_NUTTX_GC9A01_H */ +#endif /* __INCLUDE_NUTTX_LCD_GC9A01_H */ diff --git a/include/nuttx/lcd/hd4478ou.h b/include/nuttx/lcd/hd4478ou.h index fb548f61348..8934dd23f05 100644 --- a/include/nuttx/lcd/hd4478ou.h +++ b/include/nuttx/lcd/hd4478ou.h @@ -21,8 +21,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_HD4478OU_H -#define __INCLUDE_NUTTX_HD4478OU_H +#ifndef __INCLUDE_NUTTX_LCD_HD4478OU_H +#define __INCLUDE_NUTTX_LCD_HD4478OU_H /**************************************************************************** * Included Files @@ -121,4 +121,4 @@ int up_lcd1602_initialize(void); } #endif -#endif /* __INCLUDE_NUTTX_HD4478OU_H */ +#endif /* __INCLUDE_NUTTX_LCD_HD4478OU_H */ diff --git a/include/nuttx/lcd/ht16k33.h b/include/nuttx/lcd/ht16k33.h index 63e52d0d937..9f35ef58a3e 100644 --- a/include/nuttx/lcd/ht16k33.h +++ b/include/nuttx/lcd/ht16k33.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_LEDS_HT16K33_H -#define __INCLUDE_NUTTX_LEDS_HT16K33_H +#ifndef __INCLUDE_NUTTX_LCD_HT16K33_H +#define __INCLUDE_NUTTX_LCD_HT16K33_H /**************************************************************************** * Included Files @@ -218,4 +218,4 @@ int ht16k33_register(int devno, FAR struct i2c_master_s *i2c); #endif #endif /* CONFIG_I2C && CONFIG_HT16K33 */ -#endif /* __INCLUDE_NUTTX_LEDS_HT16K33_H */ +#endif /* __INCLUDE_NUTTX_LCD_HT16K33_H */ diff --git a/include/nuttx/lcd/lcd.h b/include/nuttx/lcd/lcd.h index 3ca7d92ff1c..a3090577b53 100644 --- a/include/nuttx/lcd/lcd.h +++ b/include/nuttx/lcd/lcd.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_LCD_H -#define __INCLUDE_NUTTX_LCD_H +#ifndef __INCLUDE_NUTTX_LCD_LCD_H +#define __INCLUDE_NUTTX_LCD_LCD_H /**************************************************************************** * Included Files @@ -231,4 +231,4 @@ extern "C" } #endif -#endif /* __INCLUDE_NUTTX_LCD_H */ +#endif /* __INCLUDE_NUTTX_LCD_LCD_H */ diff --git a/include/nuttx/lcd/lcd_dev.h b/include/nuttx/lcd/lcd_dev.h index abc25fa5505..16193e14725 100644 --- a/include/nuttx/lcd/lcd_dev.h +++ b/include/nuttx/lcd/lcd_dev.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_LCD_LCD_DEV_H -#define __DRIVERS_LCD_LCD_DEV_H +#ifndef __INCLUDE_NUTTX_LCD_LCD_DEV_H +#define __INCLUDE_NUTTX_LCD_LCD_DEV_H /**************************************************************************** * Included Files @@ -114,4 +114,4 @@ int lcddev_register(int devno); } #endif -#endif /* __DRIVERS_LCD_LCD_DEV_H */ +#endif /* __INCLUDE_NUTTX_LCD_LCD_DEV_H */ diff --git a/include/nuttx/lcd/memlcd.h b/include/nuttx/lcd/memlcd.h index 36cf503dd10..5b19c58d3b6 100644 --- a/include/nuttx/lcd/memlcd.h +++ b/include/nuttx/lcd/memlcd.h @@ -19,8 +19,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_MEMLCD_H -#define __INCLUDE_NUTTX_MEMLCD_H +#ifndef __INCLUDE_NUTTX_LCD_MEMLCD_H +#define __INCLUDE_NUTTX_LCD_MEMLCD_H /**************************************************************************** * Included Files @@ -104,4 +104,4 @@ FAR struct lcd_dev_s *memlcd_initialize(FAR struct spi_dev_s *spi, } #endif -#endif /* __INCLUDE_NUTTX_MEMLCD_H */ +#endif /* __INCLUDE_NUTTX_LCD_MEMLCD_H */ diff --git a/include/nuttx/lcd/p14201.h b/include/nuttx/lcd/p14201.h index aaf907d46a8..4234b98cfd7 100644 --- a/include/nuttx/lcd/p14201.h +++ b/include/nuttx/lcd/p14201.h @@ -19,8 +19,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_P14201_H -#define __INCLUDE_NUTTX_P14201_H +#ifndef __INCLUDE_NUTTX_LCD_P14201_H +#define __INCLUDE_NUTTX_LCD_P14201_H /**************************************************************************** * Included Files @@ -114,4 +114,4 @@ FAR struct lcd_dev_s *rit_initialize(FAR struct spi_dev_s *spi, } #endif -#endif /* __INCLUDE_NUTTX_P14201_H */ +#endif /* __INCLUDE_NUTTX_LCD_P14201_H */ diff --git a/include/nuttx/lcd/pcd8544.h b/include/nuttx/lcd/pcd8544.h index 8ad3974899a..152826970ab 100644 --- a/include/nuttx/lcd/pcd8544.h +++ b/include/nuttx/lcd/pcd8544.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_PCD8544_H -#define __INCLUDE_NUTTX_PCD8544_H +#ifndef __INCLUDE_NUTTX_LCD_PCD8544_H +#define __INCLUDE_NUTTX_LCD_PCD8544_H /**************************************************************************** * Included Files @@ -107,4 +107,4 @@ FAR struct lcd_dev_s *pcd8544_initialize(FAR struct spi_dev_s *spi, } #endif -#endif /* __INCLUDE_NUTTX_PCD8544_H */ +#endif /* __INCLUDE_NUTTX_LCD_PCD8544_H */ diff --git a/include/nuttx/lcd/ssd1306.h b/include/nuttx/lcd/ssd1306.h index b47f54d946c..0815f04188a 100644 --- a/include/nuttx/lcd/ssd1306.h +++ b/include/nuttx/lcd/ssd1306.h @@ -22,8 +22,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_SSD1306_H -#define __INCLUDE_NUTTX_SSD1306_H +#ifndef __INCLUDE_NUTTX_LCD_SSD1306_H +#define __INCLUDE_NUTTX_LCD_SSD1306_H /**************************************************************************** * Included Files @@ -74,7 +74,7 @@ * * "The serial interface consists of serial clock SCL, serial data SI, A0 and * CS. SI is shifted into an 8-bit shift register on every rising edge of - * SCL in the order of D7, D6, … and D0. A0 is sampled on every eighth + * SCL in the order of D7, D6, ... and D0. A0 is sampled on every eighth * clock and the data byte in the shift register is written to the display * data RAM or command register in the same clock." * @@ -86,10 +86,10 @@ #ifdef CONFIG_LCD_SSD1306_SPI /* "This module determines whether the input data is interpreted as data or - * command. When A0 = H, the inputs at D7 - D0 are interpreted as data and be - * written to display RAM. When A0 = L, the inputs at D7 - D0 are interpreted - * as command, they will be decoded and be written to the corresponding - * command registers." + * command. When A0 = "H," the inputs at D7 - D0 are interpreted as data and + * be written to display RAM. When A0 = "L", the inputs at D7 - D0 are + * interpreted as command, they will be decoded and be written to the + * corresponding command registers." */ #ifndef CONFIG_SPI_CMDDATA @@ -253,4 +253,4 @@ int ssd1306_fill(FAR struct lcd_dev_s *dev, uint8_t color); #endif #endif /* CONFIG_LCD_SSD1306 */ -#endif /* __INCLUDE_NUTTX_SSD1306_H */ +#endif /* __INCLUDE_NUTTX_LCD_SSD1306_H */ diff --git a/include/nuttx/lcd/st7032.h b/include/nuttx/lcd/st7032.h index 1890ed93407..0aad550f4a4 100644 --- a/include/nuttx/lcd/st7032.h +++ b/include/nuttx/lcd/st7032.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_LEDS_ST7032_H -#define __INCLUDE_NUTTX_LEDS_ST7032_H +#ifndef __INCLUDE_NUTTX_LCD_ST7032_H +#define __INCLUDE_NUTTX_LCD_ST7032_H /**************************************************************************** * Included Files @@ -140,4 +140,4 @@ int st7032_register(FAR const char *devpath, FAR struct i2c_master_s *i2c); #endif #endif /* CONFIG_I2C && CONFIG_ST7032 */ -#endif /* __INCLUDE_NUTTX_LEDS_ST7032_H */ +#endif /* __INCLUDE_NUTTX_LCD_ST7032_H */ diff --git a/include/nuttx/lcd/st7565.h b/include/nuttx/lcd/st7565.h index db50198c863..e3b288a2e0e 100644 --- a/include/nuttx/lcd/st7565.h +++ b/include/nuttx/lcd/st7565.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_ST7565_H -#define __INCLUDE_NUTTX_ST7565_H +#ifndef __INCLUDE_NUTTX_LCD_ST7565_H +#define __INCLUDE_NUTTX_LCD_ST7565_H /**************************************************************************** * Included Files @@ -121,4 +121,4 @@ FAR struct lcd_dev_s *st7565_initialize(FAR struct st7565_lcd_s *lcd, } #endif -#endif /* __INCLUDE_NUTTX_ST7567_H */ +#endif /* __INCLUDE_NUTTX_LCD_ST7567_H */ diff --git a/include/nuttx/lcd/st7567.h b/include/nuttx/lcd/st7567.h index 34c032a4d54..4baeddbe8ae 100644 --- a/include/nuttx/lcd/st7567.h +++ b/include/nuttx/lcd/st7567.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_ST7567_H -#define __INCLUDE_NUTTX_ST7567_H +#ifndef __INCLUDE_NUTTX_LCD_ST7567_H +#define __INCLUDE_NUTTX_LCD_ST7567_H /**************************************************************************** * Included Files @@ -135,4 +135,4 @@ void st7567_power(unsigned int devno, bool on); } #endif -#endif /* __INCLUDE_NUTTX_ST7567_H */ +#endif /* __INCLUDE_NUTTX_LCD_ST7567_H */ diff --git a/include/nuttx/lcd/st7735.h b/include/nuttx/lcd/st7735.h index 6d4d74b5d12..63715d1b81a 100644 --- a/include/nuttx/lcd/st7735.h +++ b/include/nuttx/lcd/st7735.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_ST7735_H -#define __INCLUDE_NUTTX_ST7735_H +#ifndef __INCLUDE_NUTTX_LCD_ST7735_H +#define __INCLUDE_NUTTX_LCD_ST7735_H /**************************************************************************** * Included Files @@ -69,4 +69,4 @@ FAR struct lcd_dev_s *st7735_lcdinitialize(FAR struct spi_dev_s *spi); } #endif -#endif /* __INCLUDE_NUTTX_ST7735_H */ +#endif /* __INCLUDE_NUTTX_LCD_ST7735_H */ diff --git a/include/nuttx/lcd/st7789.h b/include/nuttx/lcd/st7789.h index 850c46326af..3e0e505f806 100644 --- a/include/nuttx/lcd/st7789.h +++ b/include/nuttx/lcd/st7789.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_ST7789_H -#define __INCLUDE_NUTTX_ST7789_H +#ifndef __INCLUDE_NUTTX_LCD_ST7789_H +#define __INCLUDE_NUTTX_LCD_ST7789_H /**************************************************************************** * Included Files @@ -69,4 +69,4 @@ FAR struct lcd_dev_s *st7789_lcdinitialize(FAR struct spi_dev_s *spi); } #endif -#endif /* __INCLUDE_NUTTX_ST7789_H */ +#endif /* __INCLUDE_NUTTX_LCD_ST7789_H */ diff --git a/include/nuttx/lcd/ug-2864ambag01.h b/include/nuttx/lcd/ug-2864ambag01.h index 8b2f15b8e20..069717efb7f 100644 --- a/include/nuttx/lcd/ug-2864ambag01.h +++ b/include/nuttx/lcd/ug-2864ambag01.h @@ -21,8 +21,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_UG_8264AMBAG01_H -#define __INCLUDE_NUTTX_UG_8264AMBAG01_H +#ifndef __INCLUDE_NUTTX_LCD_UG_8264AMBAG01_H +#define __INCLUDE_NUTTX_LCD_UG_8264AMBAG01_H /**************************************************************************** * Included Files @@ -69,9 +69,9 @@ * * "The serial interface consists of serial clock SCL, serial data SI, A0 and * CS . SI is shifted into an 8-bit shift register on every rising edge of - * SCL in the order of D7, D6, … and D0. A0 is sampled on every eighth clock - * and the data byte in the shift register is written to the display data - * RAM or command register in the same clock." + * SCL in the order of D7, D6, ... and D0. A0 is sampled on every eighth + * clock and the data byte in the shift register is written to the display + * data RAM or command register in the same clock." * * MODE 3: * Clock polarity: High (CPOL=1) @@ -83,8 +83,8 @@ #endif /* "This module determines whether the input data is interpreted as data or - * command. When A0 = “H”, the inputs at D7 - D0 are interpreted as data and - * be written to display RAM. When A0 = “L”, the inputs at D7 - D0 are + * command. When A0 = "H", the inputs at D7 - D0 are interpreted as data and + * be written to display RAM. When A0 = "L", the inputs at D7 - D0 are * interpreted as command, they will be decoded and be written to the * corresponding command registers. */ @@ -229,4 +229,4 @@ void ug2864ambag01_fill(FAR struct lcd_dev_s *dev, uint8_t color); #endif #endif /* CONFIG_LCD_UG2864AMBAG01 */ -#endif /* __INCLUDE_NUTTX_UG_8264AMBAG01_H */ +#endif /* __INCLUDE_NUTTX_LCD_UG_8264AMBAG01_H */ diff --git a/include/nuttx/lcd/ug-9664hswag01.h b/include/nuttx/lcd/ug-9664hswag01.h index 19cdec98eba..96e196310a1 100644 --- a/include/nuttx/lcd/ug-9664hswag01.h +++ b/include/nuttx/lcd/ug-9664hswag01.h @@ -21,8 +21,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_UG_9664HSWAG01_H -#define __INCLUDE_NUTTX_UG_9664HSWAG01_H +#ifndef __INCLUDE_NUTTX_LCD_UG_9664HSWAG01_H +#define __INCLUDE_NUTTX_LCD_UG_9664HSWAG01_H /**************************************************************************** * Included Files @@ -140,4 +140,4 @@ void ug_power(unsigned int devno, bool on); } #endif -#endif /* __INCLUDE_NUTTX_UG_9664HSWAG01_H */ +#endif /* __INCLUDE_NUTTX_LCD_UG_9664HSWAG01_H */ diff --git a/include/nuttx/mm/iob.h b/include/nuttx/mm/iob.h index 5aa9980f481..afd63c01cb3 100644 --- a/include/nuttx/mm/iob.h +++ b/include/nuttx/mm/iob.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef _INCLUDE_NUTTX_MM_IOB_H -#define _INCLUDE_NUTTX_MM_IOB_H +#ifndef __INCLUDE_NUTTX_MM_IOB_H +#define __INCLUDE_NUTTX_MM_IOB_H /**************************************************************************** * Included Files @@ -630,4 +630,4 @@ FAR struct iob_userstats_s * iob_getuserstats(enum iob_user_e userid); #endif #endif /* CONFIG_MM_IOB */ -#endif /* _INCLUDE_NUTTX_MM_IOB_H */ +#endif /* __INCLUDE_NUTTX_MM_IOB_H */ diff --git a/include/nuttx/mtd/hamming.h b/include/nuttx/mtd/hamming.h index 274a5d7a3e0..94f5fd59276 100644 --- a/include/nuttx/mtd/hamming.h +++ b/include/nuttx/mtd/hamming.h @@ -32,8 +32,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_HAMMING_H -#define __INCLUDE_NUTTX_HAMMING_H +#ifndef __INCLUDE_NUTTX_MTD_HAMMING_H +#define __INCLUDE_NUTTX_MTD_HAMMING_H /**************************************************************************** * Included Files @@ -139,4 +139,4 @@ int hamming_verify256x(FAR uint8_t *data, #endif #endif /* __ASSEMBLY__ */ -#endif /* __INCLUDE_NUTTX_HAMMING_H */ +#endif /* __INCLUDE_NUTTX_MTD_HAMMING_H */ diff --git a/include/nuttx/mtd/nand_ecc.h b/include/nuttx/mtd/nand_ecc.h index 8247a258a86..0eb7f8f28c6 100644 --- a/include/nuttx/mtd/nand_ecc.h +++ b/include/nuttx/mtd/nand_ecc.h @@ -32,8 +32,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_MTD_ECC_H -#define __INCLUDE_NUTTX_MTD_ECC_H +#ifndef __INCLUDE_NUTTX_MTD_NAND_ECC_H +#define __INCLUDE_NUTTX_MTD_NAND_ECC_H /**************************************************************************** * Included Files @@ -126,4 +126,4 @@ int nandecc_writepage(FAR struct nand_dev_s *nand, off_t block, #endif #endif /* __ASSEMBLY__ */ -#endif /* __INCLUDE_NUTTX_MTD_ECC_H */ +#endif /* __INCLUDE_NUTTX_MTD_NAND_ECC_H */ diff --git a/include/nuttx/mtd/nand_scheme.h b/include/nuttx/mtd/nand_scheme.h index 99633048cac..e818b7bd636 100644 --- a/include/nuttx/mtd/nand_scheme.h +++ b/include/nuttx/mtd/nand_scheme.h @@ -32,8 +32,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_MTD_SCHEME_H -#define __INCLUDE_NUTTX_MTD_SCHEME_H +#ifndef __INCLUDE_NUTTX_MTD_NAND_SCHEME_H +#define __INCLUDE_NUTTX_MTD_NAND_SCHEME_H /**************************************************************************** * Included Files @@ -312,4 +312,4 @@ int nandscheme_build4086(FAR struct nand_scheme_s *scheme, #endif #endif /* __ASSEMBLY__ */ -#endif /* __INCLUDE_NUTTX_MTD_SCHEME_H */ +#endif /* __INCLUDE_NUTTX_MTD_NAND_SCHEME_H */ diff --git a/include/nuttx/net/icmpv6.h b/include/nuttx/net/icmpv6.h index e47566aef68..23a6b8a3c12 100644 --- a/include/nuttx/net/icmpv6.h +++ b/include/nuttx/net/icmpv6.h @@ -39,8 +39,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NET_ICMPv6_H -#define __INCLUDE_NUTTX_NET_ICMPv6_H +#ifndef __INCLUDE_NUTTX_NET_ICMPV6_H +#define __INCLUDE_NUTTX_NET_ICMPV6_H /**************************************************************************** * Included Files @@ -380,4 +380,4 @@ extern "C" #ifdef __cplusplus } #endif -#endif /* __INCLUDE_NUTTX_NET_ICMPv6_H */ +#endif /* __INCLUDE_NUTTX_NET_ICMPV6_H */ diff --git a/include/nuttx/nx/nx.h b/include/nuttx/nx/nx.h index 2a242ed94d9..b0e0010371a 100644 --- a/include/nuttx/nx/nx.h +++ b/include/nuttx/nx/nx.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef _INCLUDE_NUTTX_NX_NX_H -#define _INCLUDE_NUTTX_NX_NX_H +#ifndef __INCLUDE_NUTTX_NX_NX_H +#define __INCLUDE_NUTTX_NX_NX_H /**************************************************************************** * Included Files @@ -1069,4 +1069,4 @@ int nx_constructwindow(NXHANDLE handle, NXWINDOW hwnd, uint8_t flags, } #endif -#endif /* _INCLUDE_NUTTX_NX_NX_H */ +#endif /* __INCLUDE_NUTTX_NX_NX_H */ diff --git a/include/nuttx/power/bq2429x.h b/include/nuttx/power/bq2429x.h index 63b5a9e24e1..67a323818ac 100644 --- a/include/nuttx/power/bq2429x.h +++ b/include/nuttx/power/bq2429x.h @@ -36,8 +36,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_POWER_BQ2429X_H -#define __DRIVERS_POWER_BQ2429X_H +#ifndef __INCLUDE_NUTTX_POWER_BQ2429X_H +#define __INCLUDE_NUTTX_POWER_BQ2429X_H /**************************************************************************** * Pre-processor Definitions @@ -242,4 +242,4 @@ #define BQ24296M_VENDOR_ID 0x20 /* BQ24296M */ #define BQ24297_VENDOR_ID 0x60 /* BQ24297 */ -#endif /* __DRIVERS_POWER_BQ2429X_H */ +#endif /* __INCLUDE_NUTTX_POWER_BQ2429X_H */ diff --git a/include/nuttx/power/bq27426.h b/include/nuttx/power/bq27426.h index 2ba88c59cf9..ab7d1120cfb 100644 --- a/include/nuttx/power/bq27426.h +++ b/include/nuttx/power/bq27426.h @@ -19,8 +19,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_POWER_BQ27426_H -#define __DRIVERS_POWER_BQ27426_H +#ifndef __INCLUDE_NUTTX_POWER_BQ27426_H +#define __INCLUDE_NUTTX_POWER_BQ27426_H /**************************************************************************** * Pre-processor Definitions @@ -201,10 +201,10 @@ #define BQ27426_OPCONFIG_BATLOWEN (1 << 2) #define BQ27426_OPCONFIG_TEMPS (1 << 0) -#define BQ27426_ACCESS_SUB_CLASS_80 0x50 -#define BQ27426_ACCESS_SUB_CLASS_81 0x51 -#define BQ27426_ACCESS_SUB_CLASS_82 0x52 -#define BQ27426_ACCESS_SUB_CLASS_89 0x59 -#define BQ27426_ACCESS_SUB_CLASS_64 0x40 +#define BQ27426_ACCESS_SUB_CLASS_80 0x50 +#define BQ27426_ACCESS_SUB_CLASS_81 0x51 +#define BQ27426_ACCESS_SUB_CLASS_82 0x52 +#define BQ27426_ACCESS_SUB_CLASS_89 0x59 +#define BQ27426_ACCESS_SUB_CLASS_64 0x40 -#endif /* __DRIVERS_POWER_BQ27426_H */ +#endif /* __INCLUDE_NUTTX_POWER_BQ27426_H */ diff --git a/include/nuttx/power/bq769x0.h b/include/nuttx/power/bq769x0.h index 0d44ef1386c..53942cca304 100644 --- a/include/nuttx/power/bq769x0.h +++ b/include/nuttx/power/bq769x0.h @@ -19,8 +19,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_POWER_BQ769X0_H -#define __DRIVERS_POWER_BQ769X0_H +#ifndef __INCLUDE_NUTTX_POWER_BQ769X0_H +#define __INCLUDE_NUTTX_POWER_BQ769X0_H /**************************************************************************** * Pre-processor Definitions @@ -168,16 +168,16 @@ /* REG_PROTECT1 */ -#define BQ769X0_RSNS (1 << 7 ) /* Selects low or high input range for OCD/SCD */ - /* Bit 6: Reserved */ - /* Bit 5: Reserved */ -#define BQ769X0_SCD_DELAY_SHIFT (3) /* Short circuit in discharge delay timer */ +#define BQ769X0_RSNS (1 << 7) /* Selects low or high input range for OCD/SCD */ + /* Bit 6: Reserved */ + /* Bit 5: Reserved */ +#define BQ769X0_SCD_DELAY_SHIFT (3) /* Short circuit in discharge delay timer */ #define BQ769X0_SCD_DELAY_MASK (0x03 << BQ769X0_SCD_DELAY_SHIFT) # define BQ769X0_SCD_DELAY_70US (0 << BQ769X0_SCD_DELAY_SHIFT) # define BQ769X0_SCD_DELAY_100US (1 << BQ769X0_SCD_DELAY_SHIFT) # define BQ769X0_SCD_DELAY_200US (2 << BQ769X0_SCD_DELAY_SHIFT) # define BQ769X0_SCD_DELAY_400US (3 << BQ769X0_SCD_DELAY_SHIFT) -#define BQ769X0_SCD_THRESH_SHIFT (0) /* Short circuit in discharge threshold value */ +#define BQ769X0_SCD_THRESH_SHIFT (0) /* Short circuit in discharge threshold value */ #define BQ769X0_SCD_THRESH_MASK (0x07 << BQ769X0_SCD_THRESH_SHIFT) /* These defines apply when RSNS is 0 */ @@ -281,4 +281,4 @@ #define BQ769X0_ADCGAIN2_SHIFT (5) #define BQ769X0_ADCGAIN2_MASK (0x07 << BQ769X0_ADCGAIN2_SHIFT) -#endif /* __DRIVERS_POWER_BQ769X0_H */ +#endif /* __INCLUDE_NUTTX_POWER_BQ769X0_H */ diff --git a/include/nuttx/power/mcp73871.h b/include/nuttx/power/mcp73871.h index ef293d35a92..02d9ef021f3 100644 --- a/include/nuttx/power/mcp73871.h +++ b/include/nuttx/power/mcp73871.h @@ -19,8 +19,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_POWER_MCP73871_H -#define __DRIVERS_POWER_MCP73871_H +#ifndef __INCLUDE_NUTTX_POWER_MCP73871_H +#define __INCLUDE_NUTTX_POWER_MCP73871_H /**************************************************************************** * Pre-processor Definitions @@ -74,4 +74,4 @@ struct mcp73871_config_s FAR struct battery_charger_dev_s * mcp73871_initialize(FAR struct mcp73871_config_s *config); -#endif /* __DRIVERS_POWER_MCP73871_H */ +#endif /* __INCLUDE_NUTTX_POWER_MCP73871_H */ diff --git a/include/nuttx/power/powerled.h b/include/nuttx/power/powerled.h index 34a9bcdaba7..7e0090bf88a 100644 --- a/include/nuttx/power/powerled.h +++ b/include/nuttx/power/powerled.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_DRIVERS_POWER_POWERLED_H -#define __INCLUDE_NUTTX_DRIVERS_POWER_POWERLED_H +#ifndef __INCLUDE_NUTTX_POWER_POWERLED_H +#define __INCLUDE_NUTTX_POWER_POWERLED_H /* The powerled driver is split into two parts: * @@ -243,4 +243,4 @@ int powerled_register(FAR const char *path, FAR struct powerled_dev_s *dev, #endif #endif /* CONFIG_DRIVERS_POWERLED */ -#endif /* __INCLUDE_NUTTX_DRIVERS_POWER_POWERLED_H */ +#endif /* __INCLUDE_NUTTX_POWER_POWERLED_H */ diff --git a/include/nuttx/power/smps.h b/include/nuttx/power/smps.h index a1c2917b39b..e12bbb036b1 100644 --- a/include/nuttx/power/smps.h +++ b/include/nuttx/power/smps.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_DRIVERS_POWER_SMPS_H -#define __INCLUDE_NUTTX_DRIVERS_POWER_SMPS_H +#ifndef __INCLUDE_NUTTX_POWER_SMPS_H +#define __INCLUDE_NUTTX_POWER_SMPS_H /* The SMPS (switched-mode power supply) driver is split into two parts: * @@ -289,4 +289,4 @@ int smps_register(FAR const char *path, FAR struct smps_dev_s *dev, #endif #endif /* CONFIG_DRIVERS_SMPS */ -#endif /* __INCLUDE_NUTTX_DRIVERS_POWER_SMPS_H */ +#endif /* __INCLUDE_NUTTX_POWER_SMPS_H */ diff --git a/include/nuttx/rf/dat-31r5-sp.h b/include/nuttx/rf/dat-31r5-sp.h index 19e1fe68943..000931c76d6 100644 --- a/include/nuttx/rf/dat-31r5-sp.h +++ b/include/nuttx/rf/dat-31r5-sp.h @@ -17,8 +17,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_RF_DAT_31R5_SP_H_ -#define __INCLUDE_NUTTX_RF_DAT_31R5_SP_H_ +#ifndef __INCLUDE_NUTTX_RF_DAT_31R5_SP_H +#define __INCLUDE_NUTTX_RF_DAT_31R5_SP_H /**************************************************************************** * Included Files @@ -78,4 +78,4 @@ int dat31r5sp_register(FAR const char *devpath, } #endif -#endif /* __INCLUDE_NUTTX_RF_DAT_31R5_SP_H_ */ +#endif /* __INCLUDE_NUTTX_RF_DAT_31R5_SP_H */ diff --git a/include/nuttx/sensors/adxl345.h b/include/nuttx/sensors/adxl345.h index 43d79aa4dc4..900e63dc18b 100644 --- a/include/nuttx/sensors/adxl345.h +++ b/include/nuttx/sensors/adxl345.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_INPUT_ADXL345_H -#define __INCLUDE_NUTTX_INPUT_ADXL345_H +#ifndef __INCLUDE_NUTTX_SENSORS_ADXL345_H +#define __INCLUDE_NUTTX_SENSORS_ADXL345_H /**************************************************************************** * Included Files @@ -378,4 +378,4 @@ int adxl345_register(ADXL345_HANDLE handle, int minor); #endif #endif /* CONFIG_SENSORS_ADXL345 */ -#endif /* __INCLUDE_NUTTX_INPUT_ADXL345_H */ +#endif /* __INCLUDE_NUTTX_SENSORS_ADXL345_H */ diff --git a/include/nuttx/sensors/aht10.h b/include/nuttx/sensors/aht10.h index 86352c1ec28..29ec4fdd414 100644 --- a/include/nuttx/sensors/aht10.h +++ b/include/nuttx/sensors/aht10.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTT_SENSORS_AHT10_H -#define __INCLUDE_NUTT_SENSORS_AHT10_H +#ifndef __INCLUDE_NUTTX_SENSORS_AHT10_H +#define __INCLUDE_NUTTX_SENSORS_AHT10_H /**************************************************************************** * Included Files @@ -69,4 +69,4 @@ struct aht10_conv_data_s int aht10_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, uint8_t addr); -#endif /* __INCLUDE_NUTT_SENSORS_AHT10_H */ +#endif /* __INCLUDE_NUTTX_SENSORS_AHT10_H */ diff --git a/include/nuttx/sensors/as5048b.h b/include/nuttx/sensors/as5048b.h index 189564cdbab..5e8a92ac420 100644 --- a/include/nuttx/sensors/as5048b.h +++ b/include/nuttx/sensors/as5048b.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_SENSORS_AS5048B -#define __INCLUDE_NUTTX_SENSORS_AS5048B +#ifndef __INCLUDE_NUTTX_SENSORS_AS5048B_H +#define __INCLUDE_NUTTX_SENSORS_AS5048B_H /**************************************************************************** * Included Files @@ -127,4 +127,4 @@ FAR struct qe_lowerhalf_s *as5048b_initialize(FAR struct i2c_master_s *i2c, #endif #endif /* CONFIG_I2C && CONFIG_SENSORS_QENCODER && CONFIG_SENSORS_AS5048B */ -#endif /* __INCLUDE_NUTTX_SENSORS_AS5048B */ +#endif /* __INCLUDE_NUTTX_SENSORS_AS5048B_H */ diff --git a/include/nuttx/sensors/hc_sr04.h b/include/nuttx/sensors/hc_sr04.h index ab78cd70ffe..a3ebf9836df 100644 --- a/include/nuttx/sensors/hc_sr04.h +++ b/include/nuttx/sensors/hc_sr04.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTT_SENSORS_HCSR04_H -#define __INCLUDE_NUTT_SENSORS_HCSR04_H +#ifndef __INCLUDE_NUTTX_SENSORS_HC_SR04_H +#define __INCLUDE_NUTTX_SENSORS_HC_SR04_H /**************************************************************************** * Included Files @@ -52,4 +52,4 @@ struct hcsr04_config_s int hcsr04_register(FAR const char *devpath, FAR struct hcsr04_config_s *config); -#endif /* __INCLUDE_NUTT_SENSORS_HCSR04_H */ +#endif /* __INCLUDE_NUTTX_SENSORS_HC_SR04_H */ diff --git a/include/nuttx/sensors/hdc1008.h b/include/nuttx/sensors/hdc1008.h index 52ad61c9d30..1593802f51d 100644 --- a/include/nuttx/sensors/hdc1008.h +++ b/include/nuttx/sensors/hdc1008.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTT_SENSORS_HDC1008_H -#define __INCLUDE_NUTT_SENSORS_HDC1008_H +#ifndef __INCLUDE_NUTTX_SENSORS_HDC1008_H +#define __INCLUDE_NUTTX_SENSORS_HDC1008_H /**************************************************************************** * Included Files @@ -92,4 +92,4 @@ struct hdc1008_conv_data_s int hdc1008_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, uint8_t addr); -#endif /* __INCLUDE_NUTT_SENSORS_HDC1008_H */ +#endif /* __INCLUDE_NUTTX_SENSORS_HDC1008_H */ diff --git a/include/nuttx/sensors/hts221.h b/include/nuttx/sensors/hts221.h index 83b9399215c..9d982f177e0 100644 --- a/include/nuttx/sensors/hts221.h +++ b/include/nuttx/sensors/hts221.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTT_SENSORS_HTS221_H -#define __INCLUDE_NUTT_SENSORS_HTS221_H +#ifndef __INCLUDE_NUTTX_SENSORS_HTS221_H +#define __INCLUDE_NUTTX_SENSORS_HTS221_H /**************************************************************************** * Included Files @@ -144,4 +144,4 @@ typedef struct hts221_status_s int hts221_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, uint8_t addr, hts221_config_t * config); -#endif /* __INCLUDE_NUTT_SENSORS_HTS221_H */ +#endif /* __INCLUDE_NUTTX_SENSORS_HTS221_H */ diff --git a/include/nuttx/sensors/isl29023.h b/include/nuttx/sensors/isl29023.h index 22addb02510..c249876088a 100644 --- a/include/nuttx/sensors/isl29023.h +++ b/include/nuttx/sensors/isl29023.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_SENSORS_ISL29023 -#define __INCLUDE_NUTTX_SENSORS_ISL29023 +#ifndef __INCLUDE_NUTTX_SENSORS_ISL29023_H +#define __INCLUDE_NUTTX_SENSORS_ISL29023_H /**************************************************************************** * Included Files @@ -108,4 +108,4 @@ int isl29023_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, #endif #endif /* CONFIG_I2C && CONFIG_SENSORS_ISL29023 */ -#endif /* __INCLUDE_NUTTX_SENSORS_ISL29023 */ +#endif /* __INCLUDE_NUTTX_SENSORS_ISL29023_H */ diff --git a/include/nuttx/sensors/lps25h.h b/include/nuttx/sensors/lps25h.h index b683c7b67cf..ac45efa24ea 100644 --- a/include/nuttx/sensors/lps25h.h +++ b/include/nuttx/sensors/lps25h.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTT_SENSORS_LPS25H_H -#define __INCLUDE_NUTT_SENSORS_LPS25H_H +#ifndef __INCLUDE_NUTTX_SENSORS_LPS25H_H +#define __INCLUDE_NUTTX_SENSORS_LPS25H_H /**************************************************************************** * Included Files @@ -88,4 +88,4 @@ typedef struct lps25h_config_s int lps25h_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, uint8_t addr, FAR lps25h_config_t *config); -#endif /* __INCLUDE_NUTT_SENSORS_LPS25H_H */ +#endif /* __INCLUDE_NUTTX_SENSORS_LPS25H_H */ diff --git a/include/nuttx/sensors/lsm303agr.h b/include/nuttx/sensors/lsm303agr.h index 158e8e7d765..f9486026d0e 100644 --- a/include/nuttx/sensors/lsm303agr.h +++ b/include/nuttx/sensors/lsm303agr.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_SENSORS_LSM303AGR -#define __INCLUDE_NUTTX_SENSORS_LSM303AGR +#ifndef __INCLUDE_NUTTX_SENSORS_LSM303AGR_H +#define __INCLUDE_NUTTX_SENSORS_LSM303AGR_H /**************************************************************************** * Included Files @@ -210,4 +210,4 @@ int lsm303agr_sensor_register(FAR const char *devpath, #endif #endif /* CONFIG_I2C && CONFIG_SENSORS_LSM303AGR */ -#endif /* __INCLUDE_NUTTX_SENSORS_LSM303AGR */ +#endif /* __INCLUDE_NUTTX_SENSORS_LSM303AGR_H */ diff --git a/include/nuttx/sensors/lsm6dsl.h b/include/nuttx/sensors/lsm6dsl.h index b7ce452f1ff..c1b47038e9c 100644 --- a/include/nuttx/sensors/lsm6dsl.h +++ b/include/nuttx/sensors/lsm6dsl.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_SENSORS_LSM6DSL -#define __INCLUDE_NUTTX_SENSORS_LSM6DSL +#ifndef __INCLUDE_NUTTX_SENSORS_LSM6DSL_H +#define __INCLUDE_NUTTX_SENSORS_LSM6DSL_H /**************************************************************************** * Included Files @@ -880,4 +880,4 @@ int lsm6dsl_sensor_register(FAR const char *devpath, #endif #endif /* CONFIG_I2C && CONFIG_SENSORS_LSM9DS1 */ -#endif /* __INCLUDE_NUTTX_SENSORS_LSM9DS1 */ +#endif /* __INCLUDE_NUTTX_SENSORS_LSM6DSL_H */ diff --git a/include/nuttx/sensors/lsm9ds1.h b/include/nuttx/sensors/lsm9ds1.h index 8fa80eec8f2..a5cd2c6c35c 100644 --- a/include/nuttx/sensors/lsm9ds1.h +++ b/include/nuttx/sensors/lsm9ds1.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_SENSORS_LSM9DS1 -#define __INCLUDE_NUTTX_SENSORS_LSM9DS1 +#ifndef __INCLUDE_NUTTX_SENSORS_LSM9DS1_H +#define __INCLUDE_NUTTX_SENSORS_LSM9DS1_H /**************************************************************************** * Included Files @@ -131,4 +131,4 @@ int lsm9ds1mag_register(FAR const char *devpath, #endif #endif /* CONFIG_I2C && CONFIG_SENSORS_LSM9DS1 */ -#endif /* __INCLUDE_NUTTX_SENSORS_LSM9DS1 */ +#endif /* __INCLUDE_NUTTX_SENSORS_LSM9DS1_H */ diff --git a/include/nuttx/sensors/max44009.h b/include/nuttx/sensors/max44009.h index 2509c66a48d..2de72369303 100644 --- a/include/nuttx/sensors/max44009.h +++ b/include/nuttx/sensors/max44009.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_SENSORS_MAX44009 -#define __INCLUDE_NUTTX_SENSORS_MAX44009 +#ifndef __INCLUDE_NUTTX_SENSORS_MAX44009_H +#define __INCLUDE_NUTTX_SENSORS_MAX44009_H /**************************************************************************** * Included Files @@ -105,4 +105,4 @@ struct max44009_data_s int max44009_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, uint8_t addr, FAR struct max44009_config_s *config); -#endif /* __INCLUDE_NUTTX_SENSORS_MAX44009 */ +#endif /* __INCLUDE_NUTTX_SENSORS_MAX44009_H */ diff --git a/include/nuttx/sensors/mb7040.h b/include/nuttx/sensors/mb7040.h index 63170c4d713..fab1b354457 100644 --- a/include/nuttx/sensors/mb7040.h +++ b/include/nuttx/sensors/mb7040.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_SENSORS_MB7040 -#define __INCLUDE_NUTTX_SENSORS_MB7040 +#ifndef __INCLUDE_NUTTX_SENSORS_MB7040_H +#define __INCLUDE_NUTTX_SENSORS_MB7040_H /**************************************************************************** * Included Files @@ -98,4 +98,4 @@ int mb7040_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, #endif #endif /* CONFIG_I2C && CONFIG_SENSORS_MB7040 */ -#endif /* __INCLUDE_NUTTX_SENSORS_MB7040 */ +#endif /* __INCLUDE_NUTTX_SENSORS_MB7040_H */ diff --git a/include/nuttx/sensors/ms58xx.h b/include/nuttx/sensors/ms58xx.h index 699b89f8e95..79836231ddb 100644 --- a/include/nuttx/sensors/ms58xx.h +++ b/include/nuttx/sensors/ms58xx.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_SENSORS_MS58XX -#define __INCLUDE_NUTTX_SENSORS_MS58XX +#ifndef __INCLUDE_NUTTX_SENSORS_MS58XX_H +#define __INCLUDE_NUTTX_SENSORS_MS58XX_H /**************************************************************************** * Included Files @@ -112,4 +112,4 @@ int ms58xx_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, #endif #endif /* CONFIG_I2C && CONFIG_SENSORS_MS58XX */ -#endif /* __INCLUDE_NUTTX_SENSORS_MS58XX */ +#endif /* __INCLUDE_NUTTX_SENSORS_MS58XX_H */ diff --git a/include/nuttx/sensors/msa301.h b/include/nuttx/sensors/msa301.h index 686b815a704..e9d58663b0e 100644 --- a/include/nuttx/sensors/msa301.h +++ b/include/nuttx/sensors/msa301.h @@ -19,8 +19,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_SENSORS_MSA301 -#define __INCLUDE_NUTTX_SENSORS_MSA301 +#ifndef __INCLUDE_NUTTX_SENSORS_MSA301_H +#define __INCLUDE_NUTTX_SENSORS_MSA301_H #if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_MSA301) @@ -158,5 +158,4 @@ int msa301_sensor_register(FAR const char *devpath, #endif #endif /* CONFIG_I2C && CONFIG_SENSORS_MSA301 */ -#endif - +#endif /* __INCLUDE_NUTTX_SENSORS_MSA301_H */ diff --git a/include/nuttx/sensors/qencoder.h b/include/nuttx/sensors/qencoder.h index ba3e6e01a71..40a91cda953 100644 --- a/include/nuttx/sensors/qencoder.h +++ b/include/nuttx/sensors/qencoder.h @@ -78,13 +78,13 @@ /* See include/nuttx/sensors/as5048b.h */ -#define QE_AS5048B_FIRST (QE_TIVA_FIRST + QEIOC_TIVA_NCMDS) +#define QE_AS5048B_FIRST (QE_TIVA_FIRST + QE_TIVA_NCMDS) #define QE_AS5048B_NCMDS 4 /* See arch/arm/src/imxrt/imxrt_enc.h */ -#define QE_IMXRT_FIRST (QE_FIRST + QE_NCMDS) -#define QE_IMXRT_NCMDS 7 +#define QE_IMXRT_FIRST (QE_AS5048B_FIRST + QE_AS5048B_NCMDS) +#define QE_IMXRT_NCMDS 7 /**************************************************************************** * Public Types diff --git a/include/nuttx/sensors/scd30.h b/include/nuttx/sensors/scd30.h index 12c816e326e..b48acdb0e05 100644 --- a/include/nuttx/sensors/scd30.h +++ b/include/nuttx/sensors/scd30.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTT_SENSORS_SCD30_H -#define __INCLUDE_NUTT_SENSORS_SCD30_H +#ifndef __INCLUDE_NUTTX_SENSORS_SCD30_H +#define __INCLUDE_NUTTX_SENSORS_SCD30_H /**************************************************************************** * Included Files @@ -73,4 +73,4 @@ int scd30_register_i2c(FAR const char *devpath, FAR struct i2c_master_s *i2c, uint8_t addr); #endif -#endif /* __INCLUDE_NUTT_SENSORS_SHT21_H */ +#endif /* __INCLUDE_NUTTX_SENSORS_SCD30_H */ diff --git a/include/nuttx/sensors/sgp30.h b/include/nuttx/sensors/sgp30.h index e10a4cbb63b..67eb820cf5e 100644 --- a/include/nuttx/sensors/sgp30.h +++ b/include/nuttx/sensors/sgp30.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTT_SENSORS_SGP30_H -#define __INCLUDE_NUTT_SENSORS_SGP30_H +#ifndef __INCLUDE_NUTTX_SENSORS_SGP30_H +#define __INCLUDE_NUTTX_SENSORS_SGP30_H /**************************************************************************** * Included Files @@ -87,4 +87,4 @@ struct sgp30_baseline_s int sgp30_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, uint8_t addr); -#endif /* __INCLUDE_NUTT_SENSORS_SHT21_H */ +#endif /* __INCLUDE_NUTTX_SENSORS_SGP30_H */ diff --git a/include/nuttx/sensors/sht21.h b/include/nuttx/sensors/sht21.h index 32d7b503300..d3a1a915def 100644 --- a/include/nuttx/sensors/sht21.h +++ b/include/nuttx/sensors/sht21.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTT_SENSORS_SHT21_H -#define __INCLUDE_NUTT_SENSORS_SHT21_H +#ifndef __INCLUDE_NUTTX_SENSORS_SHT21_H +#define __INCLUDE_NUTTX_SENSORS_SHT21_H /**************************************************************************** * Included Files @@ -70,4 +70,4 @@ struct sht21_conv_data_s int sht21_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, uint8_t addr); -#endif /* __INCLUDE_NUTT_SENSORS_SHT21_H */ +#endif /* __INCLUDE_NUTTX_SENSORS_SHT21_H */ diff --git a/include/nuttx/sensors/sht3x.h b/include/nuttx/sensors/sht3x.h index 92548123e5a..c90fd0b1a20 100644 --- a/include/nuttx/sensors/sht3x.h +++ b/include/nuttx/sensors/sht3x.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTT_SENSORS_SHT3X_H -#define __INCLUDE_NUTT_SENSORS_SHT3X_H +#ifndef __INCLUDE_NUTTX_SENSORS_SHT3X_H +#define __INCLUDE_NUTTX_SENSORS_SHT3X_H /**************************************************************************** * Included Files @@ -67,4 +67,4 @@ struct sht3x_meas_data_s int sht3x_register(FAR const char *devpath, FAR struct i2c_master_s *i2c, uint8_t addr); -#endif /* __INCLUDE_NUTT_SENSORS_SHT3X_H */ +#endif /* __INCLUDE_NUTTX_SENSORS_SHT3X_H */ diff --git a/include/nuttx/sensors/sps30.h b/include/nuttx/sensors/sps30.h index a9144c439bf..b2057f888ab 100644 --- a/include/nuttx/sensors/sps30.h +++ b/include/nuttx/sensors/sps30.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTT_SENSORS_SPS30_H -#define __INCLUDE_NUTT_SENSORS_SPS30_H +#ifndef __INCLUDE_NUTTX_SENSORS_SPS30_H +#define __INCLUDE_NUTTX_SENSORS_SPS30_H /**************************************************************************** * Included Files @@ -93,4 +93,4 @@ int sps30_register_i2c(FAR const char *devpath, FAR struct i2c_master_s *i2c, uint8_t addr); #endif -#endif /* __INCLUDE_NUTT_SENSORS_SHT21_H */ +#endif /* __INCLUDE_NUTTX_SENSORS_SPS30_H */ diff --git a/include/nuttx/spi/qspi.h b/include/nuttx/spi/qspi.h index 51c95476ea2..fd2de28e8bd 100644 --- a/include/nuttx/spi/qspi.h +++ b/include/nuttx/spi/qspi.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_QSPI_QSPI_H -#define __INCLUDE_NUTTX_QSPI_QSPI_H +#ifndef __INCLUDE_NUTTX_SPI_QSPI_H +#define __INCLUDE_NUTTX_SPI_QSPI_H /**************************************************************************** * Included Files @@ -310,4 +310,4 @@ extern "C" #if defined(__cplusplus) } #endif -#endif /* __INCLUDE_NUTTX_QSPI_QSPI_H */ +#endif /* __INCLUDE_NUTTX_SPI_QSPI_H */ diff --git a/include/nuttx/timers/pwm.h b/include/nuttx/timers/pwm.h index 1c2a93e53f3..6207720e7c2 100644 --- a/include/nuttx/timers/pwm.h +++ b/include/nuttx/timers/pwm.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_DRIVERS_PWM_H -#define __INCLUDE_NUTTX_DRIVERS_PWM_H +#ifndef __INCLUDE_NUTTX_TIMERS_PWM_H +#define __INCLUDE_NUTTX_TIMERS_PWM_H /* For the purposes of this driver, a PWM device is any device that generates * periodic output pulses s of controlled frequency and pulse width. Such a @@ -314,4 +314,4 @@ void pwm_expired(FAR void *handle); } #endif -#endif /* __INCLUDE_NUTTX_DRIVERS_PWM_H */ +#endif /* __INCLUDE_NUTTX_TIMERS_PWM_H */ diff --git a/include/nuttx/video/vesagtf.h b/include/nuttx/video/vesagtf.h index a58649b28e3..fed7ad68fe1 100644 --- a/include/nuttx/video/vesagtf.h +++ b/include/nuttx/video/vesagtf.h @@ -40,8 +40,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_VIDEO_VESAGTF -#define __INCLUDE_NUTTX_VIDEO_VESAGTF +#ifndef __INCLUDE_NUTTX_VIDEO_VESAGTF_H +#define __INCLUDE_NUTTX_VIDEO_VESAGTF_H /**************************************************************************** * Pre-processor Definitions @@ -120,4 +120,4 @@ void vesagtf_mode_params(unsigned int x, unsigned int flags, FAR struct videomode_s *videomode); -#endif /* __INCLUDE_NUTTX_VIDEO_VESAGTF */ +#endif /* __INCLUDE_NUTTX_VIDEO_VESAGTF_H */ diff --git a/include/nuttx/video/video.h b/include/nuttx/video/video.h index 63e83fbd968..d9c9480ad27 100644 --- a/include/nuttx/video/video.h +++ b/include/nuttx/video/video.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_VIDEO_H -#define __INCLUDE_NUTTX_VIDEO_H +#ifndef __INCLUDE_NUTTX_VIDEO_VIDEO_H +#define __INCLUDE_NUTTX_VIDEO_VIDEO_H /**************************************************************************** * Included Files @@ -661,4 +661,4 @@ int video_uninitialize(void); #ifdef __cplusplus } #endif -#endif /* __INCLUDE_NUTTX_VIDEO_H */ +#endif /* __INCLUDE_NUTTX_VIDEO_VIDEO_H */ diff --git a/include/nuttx/video/video_controls.h b/include/nuttx/video/video_controls.h index ca23c8c62a9..3f286f158a5 100644 --- a/include/nuttx/video/video_controls.h +++ b/include/nuttx/video/video_controls.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_VIDEO_CONTROLS_H -#define __INCLUDE_NUTTX_VIDEO_CONTROLS_H +#ifndef __INCLUDE_NUTTX_VIDEO_VIDEO_CONTROLS_H +#define __INCLUDE_NUTTX_VIDEO_VIDEO_CONTROLS_H /**************************************************************************** * Included Files @@ -219,4 +219,4 @@ enum v4l2_flash_led_mode #define V4L2_CID_JPEG_COMPRESSION_QUALITY (0) /**< JPEG quality */ -#endif /* __INCLUDE_NUTTX_VIDEO_CONTROLS_H */ +#endif /* __INCLUDE_NUTTX_VIDEO_VIDEO_CONTROLS_H */ diff --git a/include/nuttx/wireless/bluetooth/bt_uart_shim.h b/include/nuttx/wireless/bluetooth/bt_uart_shim.h index c1240cb5186..6f3d82e8674 100644 --- a/include/nuttx/wireless/bluetooth/bt_uart_shim.h +++ b/include/nuttx/wireless/bluetooth/bt_uart_shim.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_WIRELESS_BT_UART_SHIM_H -#define __INCLUDE_NUTTX_WIRELESS_BT_UART_SHIM_H +#ifndef __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_UART_SHIM_H +#define __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_UART_SHIM_H /**************************************************************************** * Included Files @@ -35,5 +35,5 @@ FAR struct btuart_lowerhalf_s *btuart_shim_getdevice(FAR const char *path); -#endif -#endif +#endif /* CONFIG_BLUETOOTH_UART_SHIM */ +#endif /* __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_UART_SHIM_H */ diff --git a/include/nuttx/wireless/ieee802154/at86rf23x.h b/include/nuttx/wireless/ieee802154/at86rf23x.h index c6749e5860e..e844ac32b2d 100644 --- a/include/nuttx/wireless/ieee802154/at86rf23x.h +++ b/include/nuttx/wireless/ieee802154/at86rf23x.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_IEEE802154_AT86RF23X_H -#define __INCLUDE_NUTTX_IEEE802154_AT86RF23X_H +#ifndef __INCLUDE_NUTTX_WIRELESS_IEEE802154_AT86RF23X_H +#define __INCLUDE_NUTTX_WIRELESS_IEEE802154_AT86RF23X_H /**************************************************************************** * Included Files @@ -96,4 +96,4 @@ FAR struct ieee802154_radio_s * } #endif -#endif /* __INCLUDE_NUTTX_IEEE802154__AT86RF23X_H */ +#endif /* __INCLUDE_NUTTX_WIRELESS_IEEE802154_AT86RF23X_H */ diff --git a/include/nuttx/wireless/lpwan/sx127x.h b/include/nuttx/wireless/lpwan/sx127x.h index 94f375748d5..e1a5c12149c 100644 --- a/include/nuttx/wireless/lpwan/sx127x.h +++ b/include/nuttx/wireless/lpwan/sx127x.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_SX127X_H -#define __INCLUDE_NUTTX_SX127X_H +#ifndef __INCLUDE_NUTTX_WIRELESS_LPWAN_SX127X_H +#define __INCLUDE_NUTTX_WIRELESS_LPWAN_SX127X_H /**************************************************************************** * Included Files @@ -295,4 +295,4 @@ struct sx127x_lower_s int sx127x_register(FAR struct spi_dev_s *spi, FAR const struct sx127x_lower_s *lower); -#endif /* __INCLUDE_NUTTX_SX127X_H */ +#endif /* __INCLUDE_NUTTX_WIRELESS_LPWAN_SX127X_H */ diff --git a/include/nuttx/wireless/nrf24l01.h b/include/nuttx/wireless/nrf24l01.h index e0e4e2fb8a5..fce95a4ccf5 100644 --- a/include/nuttx/wireless/nrf24l01.h +++ b/include/nuttx/wireless/nrf24l01.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NRF24L01_H -#define __INCLUDE_NUTTX_NRF24L01_H +#ifndef __INCLUDE_NUTTX_WIRELESS_NRF24L01_H +#define __INCLUDE_NUTTX_WIRELESS_NRF24L01_H /**************************************************************************** * Included Files @@ -532,4 +532,4 @@ void nrf24l01_dumprxfifo(FAR struct nrf24l01_dev_s *dev); } #endif -#endif /* __INCLUDE_NUTTX_NRF24L01_H */ +#endif /* __INCLUDE_NUTTX_WIRELESS_NRF24L01_H */ diff --git a/libs/libc/aio/aio.h b/libs/libc/aio/aio.h index 66c2f3b8f60..e29d3c5c0d9 100644 --- a/libs/libc/aio/aio.h +++ b/libs/libc/aio/aio.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBC_AIO_AIO_H -#define __LIBC_AIO_AIO_H +#ifndef __LIBS_LIBC_AIO_AIO_H +#define __LIBS_LIBC_AIO_AIO_H /**************************************************************************** * Included Files @@ -60,4 +60,4 @@ extern "C" #endif #endif /* CONFIG_FS_AIO */ -#endif /* __LIBC_AIO_AIO_H */ +#endif /* __LIBS_LIBC_AIO_AIO_H */ diff --git a/libs/libc/libc.h b/libs/libc/libc.h index 28726cc1da4..7e2c2a6332d 100644 --- a/libs/libc/libc.h +++ b/libs/libc/libc.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBC_LIBC_H -#define __LIBC_LIBC_H +#ifndef __LIBS_LIBC_LIBC_H +#define __LIBS_LIBC_LIBC_H /**************************************************************************** * Included Files @@ -163,4 +163,4 @@ int lib_restoredir(void); } #endif -#endif /* __LIBC_LIBC_H */ +#endif /* __LIBS_LIBC_LIBC_H */ diff --git a/libs/libc/lzf/lzf.h b/libs/libc/lzf/lzf.h index af66134e08d..8dcc4c6b122 100644 --- a/libs/libc/lzf/lzf.h +++ b/libs/libc/lzf/lzf.h @@ -28,8 +28,8 @@ * ****************************************************************************/ -#ifndef __LIBC_LZF_LZF_H -#define __LIBC_LZF_LZF_H +#ifndef __LIBS_LIBC_LZF_LZF_H +#define __LIBS_LIBC_LZF_LZF_H /**************************************************************************** * Included Files @@ -92,4 +92,4 @@ using namespace std; * Public Types ****************************************************************************/ -#endif /* __LIBC_LZF_LZF_H */ +#endif /* __LIBS_LIBC_LZF_LZF_H */ diff --git a/libs/libc/modlib/modlib.h b/libs/libc/modlib/modlib.h index eef7689ae80..9bac61afa2c 100644 --- a/libs/libc/modlib/modlib.h +++ b/libs/libc/modlib/modlib.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBC_MODLIB_MODLIB_H -#define __LIBC_MODLIB_MODLIB_H +#ifndef __LIBS_LIBC_MODLIB_MODLIB_H +#define __LIBS_LIBC_MODLIB_MODLIB_H /**************************************************************************** * Included Files @@ -189,4 +189,4 @@ int modlib_reallocbuffer(FAR struct mod_loadinfo_s *loadinfo, int modlib_freebuffers(FAR struct mod_loadinfo_s *loadinfo); -#endif /* __LIBC_MODLIB_MODLIB_H */ +#endif /* __LIBS_LIBC_MODLIB_MODLIB_H */ diff --git a/libs/libc/syslog/syslog.h b/libs/libc/syslog/syslog.h index 9b2c31c7a88..f05efe8facd 100644 --- a/libs/libc/syslog/syslog.h +++ b/libs/libc/syslog/syslog.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBC_SYSLOG_SYSLOG_H -#define __LIBC_SYSLOG_SYSLOG_H +#ifndef __LIBS_LIBC_SYSLOG_SYSLOG_H +#define __LIBS_LIBC_SYSLOG_SYSLOG_H /**************************************************************************** * Included Files @@ -53,4 +53,4 @@ EXTERN uint8_t g_syslog_mask; } #endif -#endif /* __LIBC_SYSLOG_SYSLOG_H */ +#endif /* __LIBS_LIBC_SYSLOG_SYSLOG_H */ diff --git a/libs/libc/unistd/unistd.h b/libs/libc/unistd/unistd.h index 2ddbbdfdf1f..86c5c90ab2e 100644 --- a/libs/libc/unistd/unistd.h +++ b/libs/libc/unistd/unistd.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBC_UNISTD_UNISTD_H -#define __LIBC_UNISTD_UNISTD_H +#ifndef __LIBS_LIBC_UNISTD_UNISTD_H +#define __LIBS_LIBC_UNISTD_UNISTD_H /**************************************************************************** * Included Files @@ -105,4 +105,4 @@ int getopt_common(int argc, FAR char * const argv[], } #endif -#endif /* __LIBC_UNISTD_UNISTD_H */ +#endif /* __LIBS_LIBC_UNISTD_UNISTD_H */ diff --git a/libs/libc/wqueue/wqueue.h b/libs/libc/wqueue/wqueue.h index d9886c276a5..e8b5d36a124 100644 --- a/libs/libc/wqueue/wqueue.h +++ b/libs/libc/wqueue/wqueue.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBC_WQUEUE_WQUEUE_H -#define __LIBC_WQUEUE_WQUEUE_H +#ifndef __LIBS_LIBC_WQUEUE_WQUEUE_H +#define __LIBS_LIBC_WQUEUE_WQUEUE_H /**************************************************************************** * Included Files @@ -64,4 +64,4 @@ extern struct usr_wqueue_s g_usrwork; ****************************************************************************/ #endif /* CONFIG_LIBC_USRWORK && !__KERNEL__*/ -#endif /* __LIBC_WQUEUE_WQUEUE_H */ +#endif /* __LIBS_LIBC_WQUEUE_WQUEUE_H */ diff --git a/libs/libnx/nxfonts/nxfonts.h b/libs/libnx/nxfonts/nxfonts.h index b01545e1799..ff738164073 100644 --- a/libs/libnx/nxfonts/nxfonts.h +++ b/libs/libnx/nxfonts/nxfonts.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_H -#define __LIBNX_NXFONTS_NXFONTS_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_H /**************************************************************************** * Included Files @@ -67,4 +67,4 @@ EXTERN struct nx_font_s g_fonts; } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_H */ diff --git a/libs/libnx/nxfonts/nxfonts_mono5x8.h b/libs/libnx/nxfonts/nxfonts_mono5x8.h index a62f3dbb176..a18ada9a62a 100644 --- a/libs/libnx/nxfonts/nxfonts_mono5x8.h +++ b/libs/libnx/nxfonts/nxfonts_mono5x8.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_MONO5X8_H -#define __LIBNX_NXFONTS_NXFONTS_MONO5X8_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_MONO5X8_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_MONO5X8_H #define NXFONT_ID FONTID_MONO5X8 @@ -794,4 +794,4 @@ #define NXFONT_METRICS_255 {1, 5, 8, 0, 0, 0} #define NXFONT_BITMAP_255 {0x0, 0x90, 0x0, 0x90, 0x90, 0x70, 0x90, 0x60} -#endif +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_MONO5X8_H */ diff --git a/libs/libnx/nxfonts/nxfonts_pixel-lcd-machine.h b/libs/libnx/nxfonts/nxfonts_pixel-lcd-machine.h index b2429d66828..19bfbaa09fc 100644 --- a/libs/libnx/nxfonts/nxfonts_pixel-lcd-machine.h +++ b/libs/libnx/nxfonts/nxfonts_pixel-lcd-machine.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_PIXEL_LCD_MACHINE_H -#define __LIBNX_NXFONTS_NXFONTS_PIXEL_LCD_MACHINE_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_PIXEL_LCD_MACHINE_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_PIXEL_LCD_MACHINE_H /**************************************************************************** * Included Files @@ -692,4 +692,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_PIXEL_LCD_MACHINE_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_PIXEL_LCD_MACHINE_H */ diff --git a/libs/libnx/nxfonts/nxfonts_pixel-unicode.h b/libs/libnx/nxfonts/nxfonts_pixel-unicode.h index 7ac50bfa143..7e8668eb129 100644 --- a/libs/libnx/nxfonts/nxfonts_pixel-unicode.h +++ b/libs/libnx/nxfonts/nxfonts_pixel-unicode.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_PIXEL_UNICODE_H -#define __LIBNX_NXFONTS_NXFONTS_PIXEL_UNICODE_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_PIXEL_UNICODE_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_PIXEL_UNICODE_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_PIXEL_UNICODE_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_PIXEL_UNICODE_H */ diff --git a/libs/libnx/nxfonts/nxfonts_sans17x22.h b/libs/libnx/nxfonts/nxfonts_sans17x22.h index 78c13af2d87..6421191b861 100644 --- a/libs/libnx/nxfonts/nxfonts_sans17x22.h +++ b/libs/libnx/nxfonts/nxfonts_sans17x22.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_SANS17X22_H -#define __LIBNX_NXFONTS_NXFONTS_SANS17X22_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_SANS17X22_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_SANS17X22_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_SANS17X22_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_SANS17X22_H */ diff --git a/libs/libnx/nxfonts/nxfonts_sans17x23b.h b/libs/libnx/nxfonts/nxfonts_sans17x23b.h index 60f6a913a0f..2d4ef50623c 100644 --- a/libs/libnx/nxfonts/nxfonts_sans17x23b.h +++ b/libs/libnx/nxfonts/nxfonts_sans17x23b.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_SANS17X23B_H -#define __LIBNX_NXFONTS_NXFONTS_SANS17X23B_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_SANS17X23B_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_SANS17X23B_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_SANS17X23B_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_SANS17X23B_H */ diff --git a/libs/libnx/nxfonts/nxfonts_sans20x26.h b/libs/libnx/nxfonts/nxfonts_sans20x26.h index 1ae26efa400..155d908910d 100644 --- a/libs/libnx/nxfonts/nxfonts_sans20x26.h +++ b/libs/libnx/nxfonts/nxfonts_sans20x26.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_SANS20X26_H -#define __LIBNX_NXFONTS_NXFONTS_SANS20X26_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_SANS20X26_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_SANS20X26_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_SANS20X26_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_SANS20X26_H */ diff --git a/libs/libnx/nxfonts/nxfonts_sans20x27b.h b/libs/libnx/nxfonts/nxfonts_sans20x27b.h index 849077e5dea..5794ba72773 100644 --- a/libs/libnx/nxfonts/nxfonts_sans20x27b.h +++ b/libs/libnx/nxfonts/nxfonts_sans20x27b.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_SANS20X27B_H -#define __LIBNX_NXFONTS_NXFONTS_SANS20X27B_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_SANS20X27B_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_SANS20X27B_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_SANS20X27B_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_SANS20X27B_H */ diff --git a/libs/libnx/nxfonts/nxfonts_sans22x29.h b/libs/libnx/nxfonts/nxfonts_sans22x29.h index 378c261ae5f..14a0ca72df7 100644 --- a/libs/libnx/nxfonts/nxfonts_sans22x29.h +++ b/libs/libnx/nxfonts/nxfonts_sans22x29.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_SANS22X29_H -#define __LIBNX_NXFONTS_NXFONTS_SANS22X29_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_SANS22X29_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_SANS22X29_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_SANS22X29_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_SANS22X29_H */ diff --git a/libs/libnx/nxfonts/nxfonts_sans22x29b.h b/libs/libnx/nxfonts/nxfonts_sans22x29b.h index 8924d617dcd..e891b1533e4 100644 --- a/libs/libnx/nxfonts/nxfonts_sans22x29b.h +++ b/libs/libnx/nxfonts/nxfonts_sans22x29b.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_SANS22X29B_H -#define __LIBNX_NXFONTS_NXFONTS_SANS22X29B_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_SANS22X29B_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_SANS22X29B_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_SANS22X29B_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_SANS22X29B_H */ diff --git a/libs/libnx/nxfonts/nxfonts_sans23x27.h b/libs/libnx/nxfonts/nxfonts_sans23x27.h index 78e2e005e10..2e0b3abd678 100644 --- a/libs/libnx/nxfonts/nxfonts_sans23x27.h +++ b/libs/libnx/nxfonts/nxfonts_sans23x27.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_SANS23X27_H -#define __LIBNX_NXFONTS_NXFONTS_SANS23X27_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_SANS23X27_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_SANS23X27_H /**************************************************************************** * Included Files @@ -842,4 +842,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_SANS23X27_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_SANS23X27_H */ diff --git a/libs/libnx/nxfonts/nxfonts_sans28x37.h b/libs/libnx/nxfonts/nxfonts_sans28x37.h index eb490490d08..7e6ee75acc2 100644 --- a/libs/libnx/nxfonts/nxfonts_sans28x37.h +++ b/libs/libnx/nxfonts/nxfonts_sans28x37.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_SANS28X37_H -#define __LIBNX_NXFONTS_NXFONTS_SANS28X37_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_SANS28X37_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_SANS28X37_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_SANS28X37_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_SANS28X37_H */ diff --git a/libs/libnx/nxfonts/nxfonts_sans28x37b.h b/libs/libnx/nxfonts/nxfonts_sans28x37b.h index f493dd344e5..54e3713f3bb 100644 --- a/libs/libnx/nxfonts/nxfonts_sans28x37b.h +++ b/libs/libnx/nxfonts/nxfonts_sans28x37b.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_SANS28X37B_H -#define __LIBNX_NXFONTS_NXFONTS_SANS28X37B_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_SANS28X37B_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_SANS28X37B_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_SANS28X37B_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_SANS28X37B_H */ diff --git a/libs/libnx/nxfonts/nxfonts_sans39x48.h b/libs/libnx/nxfonts/nxfonts_sans39x48.h index f45852806c9..a75b7308777 100644 --- a/libs/libnx/nxfonts/nxfonts_sans39x48.h +++ b/libs/libnx/nxfonts/nxfonts_sans39x48.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_SANS39X48_H -#define __LIBNX_NXFONTS_NXFONTS_SANS39X48_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_SANS39X48_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_SANS39X48_H /**************************************************************************** * Included Files @@ -891,4 +891,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_SANS39X48_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_SANS39X48_H */ diff --git a/libs/libnx/nxfonts/nxfonts_sans40x49b.h b/libs/libnx/nxfonts/nxfonts_sans40x49b.h index ae0c78b7d17..7b43bfc9876 100644 --- a/libs/libnx/nxfonts/nxfonts_sans40x49b.h +++ b/libs/libnx/nxfonts/nxfonts_sans40x49b.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_SANS40X49B_H -#define __LIBNX_NXFONTS_NXFONTS_SANS40X49B_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_SANS40X49B_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_SANS40X49B_H /**************************************************************************** * Included Files @@ -900,4 +900,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_SANS40X49B_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_SANS40X49B_H */ diff --git a/libs/libnx/nxfonts/nxfonts_serif22x28b.h b/libs/libnx/nxfonts/nxfonts_serif22x28b.h index 52775cfbb5d..613dec39a75 100644 --- a/libs/libnx/nxfonts/nxfonts_serif22x28b.h +++ b/libs/libnx/nxfonts/nxfonts_serif22x28b.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_SERIF22X28B_H -#define __LIBNX_NXFONTS_NXFONTS_SERIF22X28B_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_SERIF22X28B_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_SERIF22X28B_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_SERIF22X28B_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_SERIF22X28B_H */ diff --git a/libs/libnx/nxfonts/nxfonts_serif22x29.h b/libs/libnx/nxfonts/nxfonts_serif22x29.h index 01957894cd1..5b03ec43a7a 100644 --- a/libs/libnx/nxfonts/nxfonts_serif22x29.h +++ b/libs/libnx/nxfonts/nxfonts_serif22x29.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_SERIF22X29_H -#define __LIBNX_NXFONTS_NXFONTS_SERIF22X29_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_SERIF22X29_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_SERIF22X29_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_SERIF22X29_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_SERIF22X29_H */ diff --git a/libs/libnx/nxfonts/nxfonts_serif27x38b.h b/libs/libnx/nxfonts/nxfonts_serif27x38b.h index 32352cd4005..d5130223023 100644 --- a/libs/libnx/nxfonts/nxfonts_serif27x38b.h +++ b/libs/libnx/nxfonts/nxfonts_serif27x38b.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_SERIF27X38B_H -#define __LIBNX_NXFONTS_NXFONTS_SERIF27X38B_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_SERIF27X38B_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_SERIF27X38B_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_SERIF27X38B_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_SERIF27X38B_H */ diff --git a/libs/libnx/nxfonts/nxfonts_serif29x37.h b/libs/libnx/nxfonts/nxfonts_serif29x37.h index 362d4d6b698..1388a3b4cf4 100644 --- a/libs/libnx/nxfonts/nxfonts_serif29x37.h +++ b/libs/libnx/nxfonts/nxfonts_serif29x37.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_SERIF29X37_H -#define __LIBNX_NXFONTS_NXFONTS_SERIF29X37_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_SERIF29X37_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_SERIF29X37_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_SERIF29X37_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_SERIF29X37_H */ diff --git a/libs/libnx/nxfonts/nxfonts_serif38x48.h b/libs/libnx/nxfonts/nxfonts_serif38x48.h index d05b286aa75..84e7afb1799 100644 --- a/libs/libnx/nxfonts/nxfonts_serif38x48.h +++ b/libs/libnx/nxfonts/nxfonts_serif38x48.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_SERIF38X48_H -#define __LIBNX_NXFONTS_NXFONTS_SERIF38X48_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_SERIF38X48_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_SERIF38X48_H /**************************************************************************** * Included Files @@ -863,4 +863,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_SERIF38X48_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_SERIF38X48_H */ diff --git a/libs/libnx/nxfonts/nxfonts_serif38x49b.h b/libs/libnx/nxfonts/nxfonts_serif38x49b.h index 4e2e15e973e..b69788e7015 100644 --- a/libs/libnx/nxfonts/nxfonts_serif38x49b.h +++ b/libs/libnx/nxfonts/nxfonts_serif38x49b.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_SERIF38X49B_H -#define __LIBNX_NXFONTS_NXFONTS_SERIF38X49B_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_SERIF38X49B_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_SERIF38X49B_H /**************************************************************************** * Included Files @@ -873,4 +873,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_SERIF38X49B_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_SERIF38X49B_H */ diff --git a/libs/libnx/nxfonts/nxfonts_tom-thumb-4x6.h b/libs/libnx/nxfonts/nxfonts_tom-thumb-4x6.h index 1b1897db23d..117905ddda4 100644 --- a/libs/libnx/nxfonts/nxfonts_tom-thumb-4x6.h +++ b/libs/libnx/nxfonts/nxfonts_tom-thumb-4x6.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_TOM_THUMB_4X6_H -#define __LIBNX_NXFONTS_NXFONTS_TOM_THUMB_4X6_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_TOM_THUMB_4X6_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_TOM_THUMB_4X6_H /**************************************************************************** * Included Files @@ -806,4 +806,4 @@ #define NXFONT_METRICS_255 {1, 4, 6, 0, 0, 0} #define NXFONT_BITMAP_255 {0xa0, 0x0, 0xa0, 0x60, 0x20, 0x40} -#endif +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_TOM_THUMB_4X6_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-10x20.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-10x20.h index d624d4d8f33..cb53c06370f 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-10x20.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-10x20.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_10x20_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_10x20_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_10x20_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_10x20_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_10x20_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_10x20_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-4x6.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-4x6.h index 774624538c1..61ded52af12 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-4x6.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-4x6.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_4X6_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_4X6_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_4X6_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_4X6_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_4X6_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_4X6_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x7.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x7.h index 0403855167c..9501e44ad38 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x7.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x7.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_5X7_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_5X7_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_5X7_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_5X7_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_5X7_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_5X7_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x8.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x8.h index e73b40a1654..597ce81b640 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x8.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-5x8.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_5X8_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_5X8_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_5X8_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_5X8_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_5X8_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_5X8_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x10.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x10.h index 8b1dad6391f..56dec10f903 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x10.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x10.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X10_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X10_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X10_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X10_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X10_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X10_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x12.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x12.h index 1f896b9c071..4dbbc527b5f 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x12.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x12.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X12_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X12_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X12_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X12_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X12_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X12_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13.h index 1f7a8f14083..5c8f533ede7 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X13_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X13_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X13_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X13_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X13_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X13_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13b.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13b.h index 3da1c5712e5..fe98dec899b 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13b.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13b.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X13B_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X13B_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X13B_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X13B_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X13B_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X13B_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13o.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13o.h index 0992ad80a12..31b918cf9a4 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13o.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x13o.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X13O_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X13O_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X13O_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X13O_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X13O_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X13O_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x9.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x9.h index 7cab32721ca..6dcc792f750 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x9.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-6x9.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X9_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X9_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X9_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X9_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X9_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_6X9_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13.h index 1572208f3f7..5051f228740 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X13_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X13_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X13_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X13_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X13_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X13_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13b.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13b.h index eb82fcea22b..3aca78e1dbc 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13b.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13b.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X13B_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X13B_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X13B_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X13B_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X13B_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X13B_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13o.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13o.h index c040c2c41be..d7ebca38c0e 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13o.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x13o.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X13O_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X13O_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X13O_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X13O_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X13O_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X13O_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14.h index 0d99075b5c4..6c84ea7095b 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X14_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X14_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X14_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X14_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X14_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X14_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14b.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14b.h index a7ffefdabd0..204a01a9032 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14b.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-7x14b.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X14B_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X14B_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X14B_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X14B_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X14B_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_7X14B_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13.h index 1810b4a140c..e0ea3cb8064 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_8X13_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_8X13_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_8X13_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_8X13_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_8X13_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_8X13_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13b.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13b.h index 25453cf91cd..a64a620dafe 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13b.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13b.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_8X13B_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_8X13B_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_8X13B_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_8X13B_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_8X13B_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_8X13B_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13o.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13o.h index 1ddef3340d2..b5d18e3168b 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13o.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-8x13o.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_8X13O_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_8X13O_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_8X13O_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_8X13O_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_8X13O_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_8X13O_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15.h index 7197798dce9..e81e6aad53b 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X15_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X15_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X15_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X15_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X15_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X15_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15b.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15b.h index fc0fda68b49..9101095f442 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15b.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x15b.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X15B_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X15B_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X15B_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X15B_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X15B_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X15B_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18.h index bfe6050fbdc..3c46bccde63 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X18_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X18_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X18_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X18_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X18_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X18_H */ diff --git a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18b.h b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18b.h index 56283681e18..2d320ab8820 100644 --- a/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18b.h +++ b/libs/libnx/nxfonts/nxfonts_x11-misc-fixed-9x18b.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X18B_H -#define __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X18B_H +#ifndef __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X18B_H +#define __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X18B_H /**************************************************************************** * Included Files @@ -832,4 +832,4 @@ extern "C" } #endif -#endif /* __LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X18B_H */ +#endif /* __LIBS_LIBNX_NXFONTS_NXFONTS_X11_MISC_FIXED_9X18B_H */ diff --git a/libs/libnx/nxtk/nxtk.h b/libs/libnx/nxtk/nxtk.h index f26bf1b0bfc..012b00bb6e6 100644 --- a/libs/libnx/nxtk/nxtk.h +++ b/libs/libnx/nxtk/nxtk.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef __LIBNX_NXTK_NXTK_H -#define __LIBNX_NXTK_NXTK_H +#ifndef __LIBS_LIBNX_NXTK_NXTK_H +#define __LIBS_LIBNX_NXTK_NXTK_H /**************************************************************************** * Included Files @@ -209,4 +209,4 @@ int nxtk_drawframe(FAR struct nxtk_framedwindow_s *fwnd, } #endif -#endif /* __LIBNX_NXTK_NXTK_H */ +#endif /* __LIBS_LIBNX_NXTK_NXTK_H */ diff --git a/libs/libxx/libxx.hxx b/libs/libxx/libxx.hxx index 0640100906e..9dfd110fdb5 100644 --- a/libs/libxx/libxx.hxx +++ b/libs/libxx/libxx.hxx @@ -17,8 +17,8 @@ // //*************************************************************************** -#ifndef __LIBXX_LIBXX_HXX -#define __LIBXX_LIBXX_HXX 1 +#ifndef __LIBS_LIBXX_LIBXX_HXX +#define __LIBS_LIBXX_LIBXX_HXX 1 //*************************************************************************** // Included Files @@ -46,4 +46,4 @@ extern "C" FAR void *__dso_handle weak_data; extern "C" int __cxa_atexit(__cxa_exitfunc_t func, void *arg, void *dso_handle); -#endif // __LIBXX_LIBXX_HXX +#endif // __LIBS_LIBXX_LIBXX_HXX diff --git a/net/bluetooth/bluetooth.h b/net/bluetooth/bluetooth.h index f4b5051819b..c337b2cf1fd 100644 --- a/net/bluetooth/bluetooth.h +++ b/net/bluetooth/bluetooth.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef _NET_BLUETOOTH_BLUETOOTH_H -#define _NET_BLUETOOTH_BLUETOOTH_H +#ifndef __NET_BLUETOOTH_BLUETOOTH_H +#define __NET_BLUETOOTH_BLUETOOTH_H /**************************************************************************** * Included Files @@ -448,4 +448,4 @@ void bluetooth_container_free(FAR struct bluetooth_container_s *container); #endif #endif /* CONFIG_NET_BLUETOOTH */ -#endif /* _NET_BLUETOOTH_BLUETOOTH_H */ +#endif /* __NET_BLUETOOTH_BLUETOOTH_H */ diff --git a/net/devif/devif.h b/net/devif/devif.h index 072deb275af..122e5bf6be4 100644 --- a/net/devif/devif.h +++ b/net/devif/devif.h @@ -36,8 +36,8 @@ * ****************************************************************************/ -#ifndef _NET_DEVIF_DEVIF_H -#define _NET_DEVIF_DEVIF_H +#ifndef __NET_DEVIF_DEVIF_H +#define __NET_DEVIF_DEVIF_H /**************************************************************************** * Included Files @@ -526,4 +526,4 @@ void devif_can_send(FAR struct net_driver_s *dev, FAR const void *buf, #endif #endif /* CONFIG_NET */ -#endif /* _NET_DEVIF_DEVIF_H */ +#endif /* __NET_DEVIF_DEVIF_H */ diff --git a/net/ieee802154/ieee802154.h b/net/ieee802154/ieee802154.h index 104f66a4ed9..9555fc5fc53 100644 --- a/net/ieee802154/ieee802154.h +++ b/net/ieee802154/ieee802154.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef _NET_IEEE802154_IEEE802154_H -#define _NET_IEEE802154_IEEE802154_H +#ifndef __NET_IEEE802154_IEEE802154_H +#define __NET_IEEE802154_IEEE802154_H /**************************************************************************** * Included Files @@ -462,4 +462,4 @@ void ieee802154_container_free(FAR struct ieee802154_container_s *container); #endif #endif /* CONFIG_NET_IEEE802154 */ -#endif /* _NET_IEEE802154_IEEE802154_H */ +#endif /* __NET_IEEE802154_IEEE802154_H */ diff --git a/net/igmp/igmp.h b/net/igmp/igmp.h index a15d666567e..11b076095cd 100644 --- a/net/igmp/igmp.h +++ b/net/igmp/igmp.h @@ -51,8 +51,8 @@ * +-------------------+ */ -#ifndef _NET_IGMP_IGMP_H -#define _NET_IGMP_IGMP_H +#ifndef __NET_IGMP_IGMP_H +#define __NET_IGMP_IGMP_H /**************************************************************************** * Included Files @@ -377,4 +377,4 @@ void igmp_removemcastmac(FAR struct net_driver_s *dev, FAR in_addr_t *ip); #endif #endif /* CONFIG_NET_IGMP */ -#endif /* _NET_IGMP_IGMP_H */ +#endif /* __NET_IGMP_IGMP_H */ diff --git a/net/mld/mld.h b/net/mld/mld.h index 7a89131cb0e..685e694910d 100644 --- a/net/mld/mld.h +++ b/net/mld/mld.h @@ -82,8 +82,8 @@ * ----------------- */ -#ifndef __NET_NETLINK_MLD_H -#define __NET_NETLINK_MLD_H +#ifndef __NET_MLD_MLD_H +#define __NET_MLD_MLD_H /**************************************************************************** * Included Files @@ -510,4 +510,4 @@ void mld_removemcastmac(FAR struct net_driver_s *dev, #endif #endif /* CONFIG_NET_MLD */ -#endif /* __NET_NETLINK_MLD_H */ +#endif /* __NET_MLD_MLD_H */ diff --git a/net/pkt/pkt.h b/net/pkt/pkt.h index 56b8a2d7bb4..a3f8266e28c 100644 --- a/net/pkt/pkt.h +++ b/net/pkt/pkt.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef _NET_PKT_PKT_H -#define _NET_PKT_PKT_H +#ifndef __NET_PKT_PKT_H +#define __NET_PKT_PKT_H /**************************************************************************** * Included Files @@ -295,4 +295,4 @@ ssize_t pkt_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg, #endif #endif /* CONFIG_NET_PKT */ -#endif /* _NET_PKT_PKT_H */ +#endif /* __NET_PKT_PKT_H */ diff --git a/net/sixlowpan/sixlowpan.h b/net/sixlowpan/sixlowpan.h index f1896ad3ab6..3185fc111d6 100644 --- a/net/sixlowpan/sixlowpan.h +++ b/net/sixlowpan/sixlowpan.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef _NET_SIXLOWPAN_SIXLOWPAN_H -#define _NET_SIXLOWPAN_SIXLOWPAN_H +#ifndef __NET_SIXLOWPAN_SIXLOWPAN_H +#define __NET_SIXLOWPAN_SIXLOWPAN_H /**************************************************************************** * Included Files @@ -260,4 +260,4 @@ void sixlowpan_udp_send(FAR struct net_driver_s *dev, #endif #endif /* CONFIG_NET_6LOWPAN */ -#endif /* _NET_SIXLOWPAN_SIXLOWPAN_H */ +#endif /* __NET_SIXLOWPAN_SIXLOWPAN_H */ diff --git a/net/sixlowpan/sixlowpan_internal.h b/net/sixlowpan/sixlowpan_internal.h index c70f7ef185a..29626af8f6c 100644 --- a/net/sixlowpan/sixlowpan_internal.h +++ b/net/sixlowpan/sixlowpan_internal.h @@ -52,8 +52,8 @@ * ****************************************************************************/ -#ifndef _NET_SIXLOWPAN_SIXLOWPAN_INTERNAL_H -#define _NET_SIXLOWPAN_SIXLOWPAN_INTERNAL_H +#ifndef __NET_SIXLOWPAN_SIXLOWPAN_INTERNAL_H +#define __NET_SIXLOWPAN_SIXLOWPAN_INTERNAL_H /**************************************************************************** * Included Files @@ -805,4 +805,4 @@ FAR struct sixlowpan_reassbuf_s * void sixlowpan_reass_free(FAR struct sixlowpan_reassbuf_s *reass); #endif /* CONFIG_NET_6LOWPAN */ -#endif /* _NET_SIXLOWPAN_SIXLOWPAN_INTERNAL_H */ +#endif /* __NET_SIXLOWPAN_SIXLOWPAN_INTERNAL_H */ diff --git a/net/socket/socket.h b/net/socket/socket.h index fad063afcfe..1a9829f6900 100644 --- a/net/socket/socket.h +++ b/net/socket/socket.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef _NET_SOCKET_SOCKET_H -#define _NET_SOCKET_SOCKET_H +#ifndef __NET_SOCKET_SOCKET_H +#define __NET_SOCKET_SOCKET_H /**************************************************************************** * Included Files @@ -171,4 +171,4 @@ int net_timeo(clock_t start_time, socktimeo_t timeo); #endif #endif /* CONFIG_NET */ -#endif /* _NET_SOCKET_SOCKET_H */ +#endif /* __NET_SOCKET_SOCKET_H */ diff --git a/net/tcp/tcp.h b/net/tcp/tcp.h index a42bfe638b0..273db1466d9 100644 --- a/net/tcp/tcp.h +++ b/net/tcp/tcp.h @@ -18,8 +18,8 @@ * ****************************************************************************/ -#ifndef _NET_TCP_TCP_H -#define _NET_TCP_TCP_H +#ifndef __NET_TCP_TCP_H +#define __NET_TCP_TCP_H /**************************************************************************** * Included Files @@ -1928,4 +1928,4 @@ void tcp_sendbuffer_notify(FAR struct tcp_conn_s *conn); #endif #endif /* CONFIG_NET_TCP && !CONFIG_NET_TCP_NO_STACK */ -#endif /* _NET_TCP_TCP_H */ +#endif /* __NET_TCP_TCP_H */