You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/05/03 13:51:00 UTC
[incubator-nuttx] 03/07: arch/arm: Remove FAR and CODE from chip folder(3)
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 972a26039106c92ced505672457f4d233f32c804
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Apr 17 14:01:48 2022 +0800
arch/arm: Remove FAR and CODE from chip folder(3)
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/stm32/stm32_1wire.c | 60 +--
arch/arm/src/stm32/stm32_1wire.h | 4 +-
arch/arm/src/stm32/stm32_adc.c | 416 ++++++++---------
arch/arm/src/stm32/stm32_adc.h | 40 +-
arch/arm/src/stm32/stm32_aes.c | 32 +-
arch/arm/src/stm32/stm32_alarm.h | 4 +-
arch/arm/src/stm32/stm32_allocateheap.c | 22 +-
arch/arm/src/stm32/stm32_bbsram.c | 116 ++---
arch/arm/src/stm32/stm32_can.c | 230 +++++-----
arch/arm/src/stm32/stm32_can.h | 2 +-
arch/arm/src/stm32/stm32_can_sock.c | 202 ++++-----
arch/arm/src/stm32/stm32_capture.c | 32 +-
arch/arm/src/stm32/stm32_capture.h | 18 +-
arch/arm/src/stm32/stm32_ccm.c | 2 +-
arch/arm/src/stm32/stm32_ccm.h | 4 +-
arch/arm/src/stm32/stm32_comp.h | 2 +-
arch/arm/src/stm32/stm32_comp_v1.c | 52 +--
arch/arm/src/stm32/stm32_comp_v2.c | 70 +--
arch/arm/src/stm32/stm32_cordic.c | 38 +-
arch/arm/src/stm32/stm32_cordic.h | 2 +-
arch/arm/src/stm32/stm32_dac.c | 70 +--
arch/arm/src/stm32/stm32_dac.h | 2 +-
arch/arm/src/stm32/stm32_dma.h | 2 +-
arch/arm/src/stm32/stm32_dma2d.c | 88 ++--
arch/arm/src/stm32/stm32_dma2d.h | 32 +-
arch/arm/src/stm32/stm32_dma_v1.c | 6 +-
arch/arm/src/stm32/stm32_dma_v1mux.c | 40 +-
arch/arm/src/stm32/stm32_dma_v2.c | 12 +-
arch/arm/src/stm32/stm32_eth.c | 176 +++----
arch/arm/src/stm32/stm32_exti_alarm.c | 2 +-
arch/arm/src/stm32/stm32_exti_gpio.c | 2 +-
arch/arm/src/stm32/stm32_exti_pwr.c | 2 +-
arch/arm/src/stm32/stm32_exti_wakeup.c | 2 +-
arch/arm/src/stm32/stm32_fdcan.c | 326 ++++++-------
arch/arm/src/stm32/stm32_fdcan.h | 2 +-
arch/arm/src/stm32/stm32_fdcan_sock.c | 270 +++++------
arch/arm/src/stm32/stm32_foc.c | 306 ++++++-------
arch/arm/src/stm32/stm32_foc.h | 36 +-
arch/arm/src/stm32/stm32_freerun.h | 6 +-
arch/arm/src/stm32/stm32_hall3ph.c | 48 +-
arch/arm/src/stm32/stm32_hall3ph.h | 4 +-
arch/arm/src/stm32/stm32_hrtim.c | 408 ++++++++---------
arch/arm/src/stm32/stm32_hrtim.h | 64 +--
arch/arm/src/stm32/stm32_i2c.c | 112 ++---
arch/arm/src/stm32/stm32_i2c.h | 4 +-
arch/arm/src/stm32/stm32_i2c_alt.c | 114 ++---
arch/arm/src/stm32/stm32_i2c_v2.c | 134 +++---
arch/arm/src/stm32/stm32_i2s.c | 8 +-
arch/arm/src/stm32/stm32_i2s.h | 2 +-
arch/arm/src/stm32/stm32_irq.c | 12 +-
arch/arm/src/stm32/stm32_iwdg.c | 58 +--
arch/arm/src/stm32/stm32_ltdc.c | 220 ++++-----
arch/arm/src/stm32/stm32_ltdc.h | 2 +-
arch/arm/src/stm32/stm32_oneshot.h | 2 +-
arch/arm/src/stm32/stm32_oneshot_lowerhalf.c | 56 +--
arch/arm/src/stm32/stm32_opamp.c | 60 +--
arch/arm/src/stm32/stm32_opamp.h | 2 +-
arch/arm/src/stm32/stm32_otgfs.h | 4 +-
arch/arm/src/stm32/stm32_otgfsdev.c | 376 +++++++--------
arch/arm/src/stm32/stm32_otgfshost.c | 536 +++++++++++-----------
arch/arm/src/stm32/stm32_otghs.h | 4 +-
arch/arm/src/stm32/stm32_otghsdev.c | 372 +++++++--------
arch/arm/src/stm32/stm32_otghshost.c | 536 +++++++++++-----------
arch/arm/src/stm32/stm32_pwm.c | 280 ++++++------
arch/arm/src/stm32/stm32_pwm.h | 74 +--
arch/arm/src/stm32/stm32_qencoder.c | 94 ++--
arch/arm/src/stm32/stm32_qencoder.h | 2 +-
arch/arm/src/stm32/stm32_rng.c | 4 +-
arch/arm/src/stm32/stm32_rtc.h | 6 +-
arch/arm/src/stm32/stm32_rtc_lowerhalf.c | 150 +++---
arch/arm/src/stm32/stm32_rtcc.c | 20 +-
arch/arm/src/stm32/stm32_rtcounter.c | 16 +-
arch/arm/src/stm32/stm32_sdadc.c | 130 +++---
arch/arm/src/stm32/stm32_sdadc.h | 2 +-
arch/arm/src/stm32/stm32_sdio.c | 124 ++---
arch/arm/src/stm32/stm32_sdio.h | 8 +-
arch/arm/src/stm32/stm32_serial.c | 2 +-
arch/arm/src/stm32/stm32_spi.c | 176 +++----
arch/arm/src/stm32/stm32_spi.h | 62 +--
arch/arm/src/stm32/stm32_tickless.c | 28 +-
arch/arm/src/stm32/stm32_tim.c | 96 ++--
arch/arm/src/stm32/stm32_tim.h | 34 +-
arch/arm/src/stm32/stm32_tim_lowerhalf.c | 46 +-
arch/arm/src/stm32/stm32_uart.h | 2 +-
arch/arm/src/stm32/stm32_usbdev.c | 8 +-
arch/arm/src/stm32/stm32_usbdev.h | 4 +-
arch/arm/src/stm32/stm32_usbhost.c | 8 +-
arch/arm/src/stm32/stm32_wdg.h | 4 +-
arch/arm/src/stm32/stm32_wwdg.c | 76 ++--
arch/arm/src/stm32/stm32f40xxx_alarm.h | 22 +-
arch/arm/src/stm32/stm32f40xxx_i2c.c | 116 ++---
arch/arm/src/stm32/stm32f40xxx_rtcc.c | 36 +-
arch/arm/src/stm32/stm32l15xxx_alarm.h | 26 +-
arch/arm/src/stm32/stm32l15xxx_rtcc.c | 44 +-
arch/arm/src/stm32f0l0g0/stm32_adc.c | 278 ++++++------
arch/arm/src/stm32f0l0g0/stm32_adc.h | 30 +-
arch/arm/src/stm32f0l0g0/stm32_aes.c | 32 +-
arch/arm/src/stm32f0l0g0/stm32_dma.h | 2 +-
arch/arm/src/stm32f0l0g0/stm32_dma_v1.c | 6 +-
arch/arm/src/stm32f0l0g0/stm32_exti_gpio.c | 2 +-
arch/arm/src/stm32f0l0g0/stm32_i2c.c | 138 +++---
arch/arm/src/stm32f0l0g0/stm32_i2c.h | 4 +-
arch/arm/src/stm32f0l0g0/stm32_irq.c | 6 +-
arch/arm/src/stm32f0l0g0/stm32_pwm.c | 102 ++---
arch/arm/src/stm32f0l0g0/stm32_pwm.h | 7 +-
arch/arm/src/stm32f0l0g0/stm32_rng.c | 4 +-
arch/arm/src/stm32f0l0g0/stm32_serial_v1.c | 174 +++----
arch/arm/src/stm32f0l0g0/stm32_serial_v2.c | 6 +-
arch/arm/src/stm32f0l0g0/stm32_spi.c | 164 +++----
arch/arm/src/stm32f0l0g0/stm32_spi.h | 22 +-
arch/arm/src/stm32f0l0g0/stm32_tim.c | 74 +--
arch/arm/src/stm32f0l0g0/stm32_tim.h | 34 +-
arch/arm/src/stm32f0l0g0/stm32_tim_lowerhalf.c | 56 +--
arch/arm/src/stm32f0l0g0/stm32_timerisr.c | 2 +-
arch/arm/src/stm32f0l0g0/stm32_usbdev.c | 4 +-
arch/arm/src/stm32f0l0g0/stm32_usbdev.h | 4 +-
arch/arm/src/stm32f7/stm32_adc.c | 132 +++---
arch/arm/src/stm32f7/stm32_adc.h | 2 +-
arch/arm/src/stm32f7/stm32_alarm.h | 14 +-
arch/arm/src/stm32f7/stm32_allocateheap.c | 26 +-
arch/arm/src/stm32f7/stm32_bbsram.c | 98 ++--
arch/arm/src/stm32f7/stm32_can.c | 206 ++++-----
arch/arm/src/stm32f7/stm32_can.h | 2 +-
arch/arm/src/stm32f7/stm32_capture.c | 32 +-
arch/arm/src/stm32f7/stm32_capture.h | 18 +-
arch/arm/src/stm32f7/stm32_dma.c | 14 +-
arch/arm/src/stm32f7/stm32_dma.h | 2 +-
arch/arm/src/stm32f7/stm32_dma2d.c | 88 ++--
arch/arm/src/stm32f7/stm32_dma2d.h | 32 +-
arch/arm/src/stm32f7/stm32_dtcm.c | 2 +-
arch/arm/src/stm32f7/stm32_dtcm.h | 4 +-
arch/arm/src/stm32f7/stm32_ethernet.c | 6 +-
arch/arm/src/stm32f7/stm32_exti_alarm.c | 2 +-
arch/arm/src/stm32f7/stm32_exti_wakeup.c | 2 +-
arch/arm/src/stm32f7/stm32_i2c.c | 134 +++---
arch/arm/src/stm32f7/stm32_i2c.h | 4 +-
arch/arm/src/stm32f7/stm32_irq.c | 12 +-
arch/arm/src/stm32f7/stm32_ltdc.c | 228 +++++-----
arch/arm/src/stm32f7/stm32_ltdc.h | 2 +-
arch/arm/src/stm32f7/stm32_otg.h | 4 +-
arch/arm/src/stm32f7/stm32_otgdev.c | 374 +++++++--------
arch/arm/src/stm32f7/stm32_otghost.c | 536 +++++++++++-----------
arch/arm/src/stm32f7/stm32_pwm.c | 104 ++---
arch/arm/src/stm32f7/stm32_pwm.h | 2 +-
arch/arm/src/stm32f7/stm32_qencoder.c | 74 +--
arch/arm/src/stm32f7/stm32_qencoder.h | 2 +-
arch/arm/src/stm32f7/stm32_qspi.c | 14 +-
arch/arm/src/stm32f7/stm32_qspi.h | 2 +-
arch/arm/src/stm32f7/stm32_rng.c | 4 +-
arch/arm/src/stm32f7/stm32_rtc.c | 48 +-
arch/arm/src/stm32f7/stm32_rtc.h | 6 +-
arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c | 128 +++---
arch/arm/src/stm32f7/stm32_sdmmc.c | 118 ++---
arch/arm/src/stm32f7/stm32_sdmmc.h | 6 +-
arch/arm/src/stm32f7/stm32_serial.c | 4 +-
arch/arm/src/stm32f7/stm32_spi.c | 164 +++----
arch/arm/src/stm32f7/stm32_spi.h | 62 +--
arch/arm/src/stm32f7/stm32_tickless.c | 32 +-
arch/arm/src/stm32f7/stm32_tim.c | 50 +-
arch/arm/src/stm32f7/stm32_tim.h | 34 +-
arch/arm/src/stm32f7/stm32_tim_lowerhalf.c | 46 +-
arch/arm/src/stm32h7/stm32_adc.c | 156 +++----
arch/arm/src/stm32h7/stm32_adc.h | 2 +-
arch/arm/src/stm32h7/stm32_alarm.h | 22 +-
arch/arm/src/stm32h7/stm32_allocateheap.c | 20 +-
arch/arm/src/stm32h7/stm32_bbsram.c | 100 ++--
arch/arm/src/stm32h7/stm32_dma.c | 68 +--
arch/arm/src/stm32h7/stm32_dma.h | 2 +-
arch/arm/src/stm32h7/stm32_dtcm.c | 2 +-
arch/arm/src/stm32h7/stm32_dtcm.h | 4 +-
arch/arm/src/stm32h7/stm32_ethernet.c | 6 +-
arch/arm/src/stm32h7/stm32_exti_alarm.c | 2 +-
arch/arm/src/stm32h7/stm32_exti_wakeup.c | 2 +-
arch/arm/src/stm32h7/stm32_flash.c | 26 +-
arch/arm/src/stm32h7/stm32_i2c.c | 134 +++---
arch/arm/src/stm32h7/stm32_i2c.h | 4 +-
arch/arm/src/stm32h7/stm32_irq.c | 12 +-
arch/arm/src/stm32h7/stm32_iwdg.c | 58 +--
arch/arm/src/stm32h7/stm32_lptim.c | 60 +--
arch/arm/src/stm32h7/stm32_lptim.h | 30 +-
arch/arm/src/stm32h7/stm32_oneshot.h | 2 +-
arch/arm/src/stm32h7/stm32_oneshot_lowerhalf.c | 56 +--
arch/arm/src/stm32h7/stm32_otg.h | 4 +-
arch/arm/src/stm32h7/stm32_otgdev.c | 373 ++++++++-------
arch/arm/src/stm32h7/stm32_otghost.c | 536 +++++++++++-----------
arch/arm/src/stm32h7/stm32_pwm.c | 264 +++++------
arch/arm/src/stm32h7/stm32_pwm.h | 62 +--
arch/arm/src/stm32h7/stm32_qencoder.c | 74 +--
arch/arm/src/stm32h7/stm32_qencoder.h | 2 +-
arch/arm/src/stm32h7/stm32_qspi.c | 14 +-
arch/arm/src/stm32h7/stm32_qspi.h | 2 +-
arch/arm/src/stm32h7/stm32_rtc.c | 48 +-
arch/arm/src/stm32h7/stm32_rtc.h | 6 +-
arch/arm/src/stm32h7/stm32_rtc_lowerhalf.c | 128 +++---
arch/arm/src/stm32h7/stm32_sdmmc.c | 118 ++---
arch/arm/src/stm32h7/stm32_sdmmc.h | 8 +-
arch/arm/src/stm32h7/stm32_serial.c | 6 +-
arch/arm/src/stm32h7/stm32_spi.c | 180 ++++----
arch/arm/src/stm32h7/stm32_spi.h | 64 +--
arch/arm/src/stm32h7/stm32_spi_slave.c | 88 ++--
arch/arm/src/stm32h7/stm32_tickless.c | 32 +-
arch/arm/src/stm32h7/stm32_tim.c | 78 ++--
arch/arm/src/stm32h7/stm32_tim.h | 34 +-
arch/arm/src/stm32h7/stm32_uart.h | 2 +-
arch/arm/src/stm32h7/stm32_usbhost.c | 6 +-
arch/arm/src/stm32h7/stm32_wdg.h | 4 +-
arch/arm/src/stm32h7/stm32_wwdg.c | 76 ++--
arch/arm/src/stm32l4/stm32l4_1wire.c | 64 +--
arch/arm/src/stm32l4/stm32l4_1wire.h | 4 +-
arch/arm/src/stm32l4/stm32l4_adc.c | 277 ++++++------
arch/arm/src/stm32l4/stm32l4_adc.h | 30 +-
arch/arm/src/stm32l4/stm32l4_allocateheap.c | 26 +-
arch/arm/src/stm32l4/stm32l4_can.c | 210 ++++-----
arch/arm/src/stm32l4/stm32l4_can.h | 2 +-
arch/arm/src/stm32l4/stm32l4_comp.c | 56 +--
arch/arm/src/stm32l4/stm32l4_comp.h | 10 +-
arch/arm/src/stm32l4/stm32l4_dac.c | 54 +--
arch/arm/src/stm32l4/stm32l4_dac.h | 2 +-
arch/arm/src/stm32l4/stm32l4_dfsdm.c | 136 +++---
arch/arm/src/stm32l4/stm32l4_dfsdm.h | 2 +-
arch/arm/src/stm32l4/stm32l4_dma.h | 2 +-
arch/arm/src/stm32l4/stm32l4_exti_alarm.c | 2 +-
arch/arm/src/stm32l4/stm32l4_exti_comp.c | 2 +-
arch/arm/src/stm32l4/stm32l4_exti_gpio.c | 12 +-
arch/arm/src/stm32l4/stm32l4_exti_pwr.c | 2 +-
arch/arm/src/stm32l4/stm32l4_exti_wakeup.c | 2 +-
arch/arm/src/stm32l4/stm32l4_firewall.c | 2 +-
arch/arm/src/stm32l4/stm32l4_firewall.h | 2 +-
arch/arm/src/stm32l4/stm32l4_freerun.c | 14 +-
arch/arm/src/stm32l4/stm32l4_freerun.h | 6 +-
arch/arm/src/stm32l4/stm32l4_i2c.c | 134 +++---
arch/arm/src/stm32l4/stm32l4_i2c.h | 4 +-
arch/arm/src/stm32l4/stm32l4_irq.c | 12 +-
arch/arm/src/stm32l4/stm32l4_iwdg.c | 66 +--
arch/arm/src/stm32l4/stm32l4_lptim.c | 82 ++--
arch/arm/src/stm32l4/stm32l4_lptim.h | 22 +-
arch/arm/src/stm32l4/stm32l4_oneshot.c | 18 +-
arch/arm/src/stm32l4/stm32l4_oneshot.h | 2 +-
arch/arm/src/stm32l4/stm32l4_oneshot_lowerhalf.c | 58 +--
arch/arm/src/stm32l4/stm32l4_otgfs.h | 4 +-
arch/arm/src/stm32l4/stm32l4_otgfsdev.c | 372 ++++++++-------
arch/arm/src/stm32l4/stm32l4_otgfshost.c | 554 +++++++++++------------
arch/arm/src/stm32l4/stm32l4_pwm.c | 224 ++++-----
arch/arm/src/stm32l4/stm32l4_pwm.h | 71 ++-
arch/arm/src/stm32l4/stm32l4_qencoder.c | 86 ++--
arch/arm/src/stm32l4/stm32l4_qencoder.h | 2 +-
arch/arm/src/stm32l4/stm32l4_qspi.c | 14 +-
arch/arm/src/stm32l4/stm32l4_qspi.h | 2 +-
arch/arm/src/stm32l4/stm32l4_rng.c | 4 +-
arch/arm/src/stm32l4/stm32l4_rtc.c | 46 +-
arch/arm/src/stm32l4/stm32l4_rtc.h | 22 +-
arch/arm/src/stm32l4/stm32l4_rtc_lowerhalf.c | 124 ++---
arch/arm/src/stm32l4/stm32l4_sdmmc.c | 116 ++---
arch/arm/src/stm32l4/stm32l4_sdmmc.h | 6 +-
arch/arm/src/stm32l4/stm32l4_serial.c | 214 ++++-----
arch/arm/src/stm32l4/stm32l4_spi.c | 174 +++----
arch/arm/src/stm32l4/stm32l4_spi.h | 32 +-
arch/arm/src/stm32l4/stm32l4_tickless.c | 14 +-
arch/arm/src/stm32l4/stm32l4_tim.c | 108 ++---
arch/arm/src/stm32l4/stm32l4_tim.h | 44 +-
arch/arm/src/stm32l4/stm32l4_tim_lowerhalf.c | 72 +--
arch/arm/src/stm32l4/stm32l4_usbdev.c | 4 +-
arch/arm/src/stm32l4/stm32l4_usbdev.h | 2 +-
arch/arm/src/stm32l4/stm32l4_usbhost_trace.c | 8 +-
arch/arm/src/stm32l4/stm32l4_wdg.h | 4 +-
arch/arm/src/stm32l4/stm32l4x6xx_dma.c | 6 +-
arch/arm/src/stm32l4/stm32l4xrxx_dma.c | 40 +-
arch/arm/src/stm32l5/stm32l5_allocateheap.c | 26 +-
arch/arm/src/stm32l5/stm32l5_exti_gpio.c | 2 +-
arch/arm/src/stm32l5/stm32l5_irq.c | 12 +-
arch/arm/src/stm32l5/stm32l5_serial.c | 212 ++++-----
arch/arm/src/stm32l5/stm32l5_spi.c | 170 +++----
arch/arm/src/stm32l5/stm32l5_spi.h | 32 +-
arch/arm/src/stm32l5/stm32l5_tim.c | 98 ++--
arch/arm/src/stm32l5/stm32l5_tim.h | 36 +-
arch/arm/src/stm32l5/stm32l5_tim_lowerhalf.c | 72 +--
arch/arm/src/stm32u5/stm32_allocateheap.c | 26 +-
arch/arm/src/stm32u5/stm32_exti_gpio.c | 2 +-
arch/arm/src/stm32u5/stm32_irq.c | 12 +-
arch/arm/src/stm32u5/stm32_serial.c | 234 +++++-----
arch/arm/src/stm32u5/stm32_spi.c | 180 ++++----
arch/arm/src/stm32u5/stm32_spi.h | 34 +-
arch/arm/src/stm32u5/stm32_tim.c | 98 ++--
arch/arm/src/stm32u5/stm32_tim.h | 34 +-
arch/arm/src/stm32u5/stm32_tim_lowerhalf.c | 76 ++--
arch/arm/src/str71x/str71x_serial.c | 2 +-
arch/arm/src/tiva/cc13xx/cc13xx_gpioirq.c | 6 +-
arch/arm/src/tiva/common/lmxx_tm4c_gpioirq.c | 38 +-
arch/arm/src/tiva/common/tiva_adclow.c | 12 +-
arch/arm/src/tiva/common/tiva_allocateheap.c | 10 +-
arch/arm/src/tiva/common/tiva_can.c | 166 +++----
arch/arm/src/tiva/common/tiva_eeprom.c | 48 +-
arch/arm/src/tiva/common/tiva_flash.c | 58 +--
arch/arm/src/tiva/common/tiva_i2c.c | 6 +-
arch/arm/src/tiva/common/tiva_irq.c | 12 +-
arch/arm/src/tiva/common/tiva_pwm.c | 80 ++--
arch/arm/src/tiva/common/tiva_qencoder.c | 64 +--
arch/arm/src/tiva/common/tiva_ssi.c | 46 +-
arch/arm/src/tiva/common/tiva_timerlib.c | 128 +++---
arch/arm/src/tiva/common/tiva_timerlow32.c | 6 +-
arch/arm/src/tiva/lm/lm3s_ethernet.c | 6 +-
arch/arm/src/tiva/tiva_adc.h | 4 +-
arch/arm/src/tiva/tiva_can.h | 2 +-
arch/arm/src/tiva/tiva_eeprom.h | 2 +-
arch/arm/src/tiva/tiva_i2c.h | 4 +-
arch/arm/src/tiva/tiva_pwm.h | 2 +-
arch/arm/src/tiva/tiva_qencoder.h | 2 +-
arch/arm/src/tiva/tiva_ssi.h | 8 +-
arch/arm/src/tiva/tiva_timer.h | 4 +-
arch/arm/src/tiva/tm4c/tm4c_ethernet.c | 176 +++----
arch/arm/src/tms570/tms570_clockconfig.c | 2 +-
arch/arm/src/tms570/tms570_esm.c | 2 +-
arch/arm/src/tms570/tms570_esm.h | 2 +-
arch/arm/src/tms570/tms570_gioirq.c | 2 +-
arch/arm/src/tms570/tms570_irq.c | 6 +-
arch/arm/src/tms570/tms570_lowputc.c | 2 +-
arch/arm/src/tms570/tms570_lowputc.h | 2 +-
arch/arm/src/tms570/tms570_serial.c | 6 +-
arch/arm/src/xmc4/xmc4_allocateheap.c | 10 +-
arch/arm/src/xmc4/xmc4_dma.h | 2 +-
arch/arm/src/xmc4/xmc4_i2c.h | 4 +-
arch/arm/src/xmc4/xmc4_irq.c | 12 +-
arch/arm/src/xmc4/xmc4_lowputc.c | 2 +-
arch/arm/src/xmc4/xmc4_lowputc.h | 2 +-
arch/arm/src/xmc4/xmc4_pwm.h | 2 +-
arch/arm/src/xmc4/xmc4_serial.c | 4 +-
arch/arm/src/xmc4/xmc4_spi.c | 4 +-
arch/arm/src/xmc4/xmc4_spi.h | 38 +-
arch/arm/src/xmc4/xmc4_timerisr.c | 2 +-
329 files changed, 10303 insertions(+), 10309 deletions(-)
diff --git a/arch/arm/src/stm32/stm32_1wire.c b/arch/arm/src/stm32/stm32_1wire.c
index 75aef98631..75c90c318d 100644
--- a/arch/arm/src/stm32/stm32_1wire.c
+++ b/arch/arm/src/stm32/stm32_1wire.c
@@ -145,28 +145,28 @@ static void stm32_1wire_send(struct stm32_1wire_priv_s *priv, int ch);
static void stm32_1wire_set_baud(struct stm32_1wire_priv_s *priv);
static void stm32_1wire_set_apb_clock(struct stm32_1wire_priv_s *priv,
bool on);
-static int stm32_1wire_init(FAR struct stm32_1wire_priv_s *priv);
-static int stm32_1wire_deinit(FAR struct stm32_1wire_priv_s *priv);
-static inline void stm32_1wire_sem_init(FAR struct stm32_1wire_priv_s *priv);
+static int stm32_1wire_init(struct stm32_1wire_priv_s *priv);
+static int stm32_1wire_deinit(struct stm32_1wire_priv_s *priv);
+static inline void stm32_1wire_sem_init(struct stm32_1wire_priv_s *priv);
static inline void stm32_1wire_sem_destroy(
- FAR struct stm32_1wire_priv_s *priv);
-static inline int stm32_1wire_sem_wait(FAR struct stm32_1wire_priv_s *priv);
-static inline void stm32_1wire_sem_post(FAR struct stm32_1wire_priv_s *priv);
+ struct stm32_1wire_priv_s *priv);
+static inline int stm32_1wire_sem_wait(struct stm32_1wire_priv_s *priv);
+static inline void stm32_1wire_sem_post(struct stm32_1wire_priv_s *priv);
static int stm32_1wire_process(struct stm32_1wire_priv_s *priv,
- FAR const struct stm32_1wire_msg_s *msgs,
+ const struct stm32_1wire_msg_s *msgs,
int count);
static int stm32_1wire_isr(int irq, void *context, void *arg);
-static int stm32_1wire_reset(FAR struct onewire_dev_s *dev);
-static int stm32_1wire_write(FAR struct onewire_dev_s *dev,
+static int stm32_1wire_reset(struct onewire_dev_s *dev);
+static int stm32_1wire_write(struct onewire_dev_s *dev,
const uint8_t *buffer, int buflen);
-static int stm32_1wire_read(FAR struct onewire_dev_s *dev, uint8_t *buffer,
+static int stm32_1wire_read(struct onewire_dev_s *dev, uint8_t *buffer,
int buflen);
-static int stm32_1wire_exchange(FAR struct onewire_dev_s *dev, bool reset,
+static int stm32_1wire_exchange(struct onewire_dev_s *dev, bool reset,
const uint8_t *txbuffer, int txbuflen,
uint8_t *rxbuffer, int rxbuflen);
-static int stm32_1wire_writebit(FAR struct onewire_dev_s *dev,
+static int stm32_1wire_writebit(struct onewire_dev_s *dev,
const uint8_t *bit);
-static int stm32_1wire_readbit(FAR struct onewire_dev_s *dev, uint8_t *bit);
+static int stm32_1wire_readbit(struct onewire_dev_s *dev, uint8_t *bit);
/****************************************************************************
* Private Data
@@ -591,7 +591,7 @@ static void stm32_1wire_set_apb_clock(struct stm32_1wire_priv_s *priv,
*
****************************************************************************/
-static int stm32_1wire_init(FAR struct stm32_1wire_priv_s *priv)
+static int stm32_1wire_init(struct stm32_1wire_priv_s *priv)
{
const struct stm32_1wire_config_s *config = priv->config;
uint32_t regval;
@@ -666,7 +666,7 @@ static int stm32_1wire_init(FAR struct stm32_1wire_priv_s *priv)
*
****************************************************************************/
-static int stm32_1wire_deinit(FAR struct stm32_1wire_priv_s *priv)
+static int stm32_1wire_deinit(struct stm32_1wire_priv_s *priv)
{
const struct stm32_1wire_config_s *config = priv->config;
uint32_t regval;
@@ -711,7 +711,7 @@ static int stm32_1wire_deinit(FAR struct stm32_1wire_priv_s *priv)
*
****************************************************************************/
-static inline void stm32_1wire_sem_init(FAR struct stm32_1wire_priv_s *priv)
+static inline void stm32_1wire_sem_init(struct stm32_1wire_priv_s *priv)
{
nxsem_init(&priv->sem_excl, 0, 1);
nxsem_init(&priv->sem_isr, 0, 0);
@@ -732,7 +732,7 @@ static inline void stm32_1wire_sem_init(FAR struct stm32_1wire_priv_s *priv)
****************************************************************************/
static inline void stm32_1wire_sem_destroy(
- FAR struct stm32_1wire_priv_s *priv)
+ struct stm32_1wire_priv_s *priv)
{
nxsem_destroy(&priv->sem_excl);
nxsem_destroy(&priv->sem_isr);
@@ -746,7 +746,7 @@ static inline void stm32_1wire_sem_destroy(
*
****************************************************************************/
-static inline int stm32_1wire_sem_wait(FAR struct stm32_1wire_priv_s *priv)
+static inline int stm32_1wire_sem_wait(struct stm32_1wire_priv_s *priv)
{
return nxsem_wait_uninterruptible(&priv->sem_excl);
}
@@ -759,7 +759,7 @@ static inline int stm32_1wire_sem_wait(FAR struct stm32_1wire_priv_s *priv)
*
****************************************************************************/
-static inline void stm32_1wire_sem_post(FAR struct stm32_1wire_priv_s *priv)
+static inline void stm32_1wire_sem_post(struct stm32_1wire_priv_s *priv)
{
nxsem_post(&priv->sem_excl);
}
@@ -772,7 +772,7 @@ static inline void stm32_1wire_sem_post(FAR struct stm32_1wire_priv_s *priv)
****************************************************************************/
static int stm32_1wire_process(struct stm32_1wire_priv_s *priv,
- FAR const struct stm32_1wire_msg_s *msgs,
+ const struct stm32_1wire_msg_s *msgs,
int count)
{
irqstate_t irqs;
@@ -1044,7 +1044,7 @@ static int stm32_1wire_isr(int irq, void *context, void *arg)
*
****************************************************************************/
-static int stm32_1wire_reset(FAR struct onewire_dev_s *dev)
+static int stm32_1wire_reset(struct onewire_dev_s *dev)
{
struct stm32_1wire_priv_s *priv = ((struct stm32_1wire_inst_s *)dev)->priv;
const struct stm32_1wire_msg_s msgs[1] =
@@ -1063,7 +1063,7 @@ static int stm32_1wire_reset(FAR struct onewire_dev_s *dev)
*
****************************************************************************/
-static int stm32_1wire_write(FAR struct onewire_dev_s *dev,
+static int stm32_1wire_write(struct onewire_dev_s *dev,
const uint8_t *buffer, int buflen)
{
struct stm32_1wire_priv_s *priv = ((struct stm32_1wire_inst_s *)dev)->priv;
@@ -1085,7 +1085,7 @@ static int stm32_1wire_write(FAR struct onewire_dev_s *dev,
*
****************************************************************************/
-static int stm32_1wire_read(FAR struct onewire_dev_s *dev, uint8_t *buffer,
+static int stm32_1wire_read(struct onewire_dev_s *dev, uint8_t *buffer,
int buflen)
{
struct stm32_1wire_priv_s *priv = ((struct stm32_1wire_inst_s *)dev)->priv;
@@ -1109,9 +1109,9 @@ static int stm32_1wire_read(FAR struct onewire_dev_s *dev, uint8_t *buffer,
*
****************************************************************************/
-static int stm32_1wire_exchange(FAR struct onewire_dev_s *dev, bool reset,
- const uint8_t *txbuffer, int txbuflen,
- uint8_t *rxbuffer, int rxbuflen)
+static int stm32_1wire_exchange(struct onewire_dev_s *dev, bool reset,
+ const uint8_t *txbuffer, int txbuflen,
+ uint8_t *rxbuffer, int rxbuflen)
{
int result = ERROR;
struct stm32_1wire_priv_s *priv = ((struct stm32_1wire_inst_s *)dev)->priv;
@@ -1160,7 +1160,7 @@ static int stm32_1wire_exchange(FAR struct onewire_dev_s *dev, bool reset,
*
****************************************************************************/
-static int stm32_1wire_writebit(FAR struct onewire_dev_s *dev,
+static int stm32_1wire_writebit(struct onewire_dev_s *dev,
const uint8_t *bit)
{
struct stm32_1wire_priv_s *priv = ((struct stm32_1wire_inst_s *)dev)->priv;
@@ -1184,7 +1184,7 @@ static int stm32_1wire_writebit(FAR struct onewire_dev_s *dev,
*
****************************************************************************/
-static int stm32_1wire_readbit(FAR struct onewire_dev_s *dev, uint8_t *bit)
+static int stm32_1wire_readbit(struct onewire_dev_s *dev, uint8_t *bit)
{
struct stm32_1wire_priv_s *priv = ((struct stm32_1wire_inst_s *)dev)->priv;
const struct stm32_1wire_msg_s msgs[1] =
@@ -1218,7 +1218,7 @@ static int stm32_1wire_readbit(FAR struct onewire_dev_s *dev, uint8_t *bit)
*
****************************************************************************/
-FAR struct onewire_dev_s *stm32_1wireinitialize(int port)
+struct onewire_dev_s *stm32_1wireinitialize(int port)
{
struct stm32_1wire_priv_s *priv = NULL; /* Private data of device with multiple instances */
struct stm32_1wire_inst_s *inst = NULL; /* Device, single instance */
@@ -1316,7 +1316,7 @@ FAR struct onewire_dev_s *stm32_1wireinitialize(int port)
*
****************************************************************************/
-int stm32_1wireuninitialize(FAR struct onewire_dev_s *dev)
+int stm32_1wireuninitialize(struct onewire_dev_s *dev)
{
struct stm32_1wire_priv_s *priv = ((struct stm32_1wire_inst_s *)dev)->priv;
int irqs;
diff --git a/arch/arm/src/stm32/stm32_1wire.h b/arch/arm/src/stm32/stm32_1wire.h
index 305cb46412..8f336bc1ce 100644
--- a/arch/arm/src/stm32/stm32_1wire.h
+++ b/arch/arm/src/stm32/stm32_1wire.h
@@ -50,7 +50,7 @@
*
****************************************************************************/
-FAR struct onewire_dev_s *stm32_1wireinitialize(int port);
+struct onewire_dev_s *stm32_1wireinitialize(int port);
/****************************************************************************
* Name: stm32_1wireuninitialize
@@ -67,6 +67,6 @@ FAR struct onewire_dev_s *stm32_1wireinitialize(int port);
*
****************************************************************************/
-int stm32_1wireuninitialize(FAR struct onewire_dev_s *dev);
+int stm32_1wireuninitialize(struct onewire_dev_s *dev);
#endif /* __ARCH_ARM_SRC_STM32_STM32_1WIRE_H */
diff --git a/arch/arm/src/stm32/stm32_adc.c b/arch/arm/src/stm32/stm32_adc.c
index 175dd7a987..db646c8341 100644
--- a/arch/arm/src/stm32/stm32_adc.c
+++ b/arch/arm/src/stm32/stm32_adc.c
@@ -394,11 +394,11 @@ struct adccmn_data_s
struct stm32_dev_s
{
#ifdef CONFIG_STM32_ADC_LL_OPS
- FAR const struct stm32_adc_ops_s *llops; /* Low-level ADC ops */
- FAR struct adc_dev_s *dev; /* Upper-half ADC reference */
+ const struct stm32_adc_ops_s *llops; /* Low-level ADC ops */
+ struct adc_dev_s *dev; /* Upper-half ADC reference */
#endif
#ifdef ADC_HAVE_CB
- FAR const struct adc_callback_s *cb;
+ const struct adc_callback_s *cb;
uint8_t irq; /* Interrupt generated by this ADC block */
#endif
#ifdef HAVE_ADC_CMN_DATA
@@ -481,159 +481,159 @@ struct stm32_dev_s
static void stm32_modifyreg32(unsigned int addr, uint32_t clrbits,
uint32_t setbits);
#endif
-static uint32_t adc_getreg(FAR struct stm32_dev_s *priv, int offset);
-static void adc_putreg(FAR struct stm32_dev_s *priv, int offset,
+static uint32_t adc_getreg(struct stm32_dev_s *priv, int offset);
+static void adc_putreg(struct stm32_dev_s *priv, int offset,
uint32_t value);
-static void adc_modifyreg(FAR struct stm32_dev_s *priv, int offset,
+static void adc_modifyreg(struct stm32_dev_s *priv, int offset,
uint32_t clrbits, uint32_t setbits);
#ifdef HAVE_ADC_CMN_REGS
-static uint32_t adccmn_base_get(FAR struct stm32_dev_s *priv);
-static void adccmn_modifyreg(FAR struct stm32_dev_s *priv, uint32_t offset,
+static uint32_t adccmn_base_get(struct stm32_dev_s *priv);
+static void adccmn_modifyreg(struct stm32_dev_s *priv, uint32_t offset,
uint32_t clrbits, uint32_t setbits);
-static uint32_t adccmn_getreg(FAR struct stm32_dev_s *priv, uint32_t offset);
+static uint32_t adccmn_getreg(struct stm32_dev_s *priv, uint32_t offset);
#endif
#ifdef ADC_HAVE_TIMER
-static uint16_t tim_getreg(FAR struct stm32_dev_s *priv, int offset);
-static void tim_putreg(FAR struct stm32_dev_s *priv, int offset,
+static uint16_t tim_getreg(struct stm32_dev_s *priv, int offset);
+static void tim_putreg(struct stm32_dev_s *priv, int offset,
uint16_t value);
-static void tim_modifyreg(FAR struct stm32_dev_s *priv, int offset,
+static void tim_modifyreg(struct stm32_dev_s *priv, int offset,
uint16_t clrbits, uint16_t setbits);
-static void tim_dumpregs(FAR struct stm32_dev_s *priv, FAR const char *msg);
+static void tim_dumpregs(struct stm32_dev_s *priv, const char *msg);
#endif
#ifdef HAVE_ADC_CMN_DATA
-static int adccmn_lock(FAR struct stm32_dev_s *priv, bool lock);
+static int adccmn_lock(struct stm32_dev_s *priv, bool lock);
#endif
-static void adc_rccreset(FAR struct stm32_dev_s *priv, bool reset);
+static void adc_rccreset(struct stm32_dev_s *priv, bool reset);
/* ADC Interrupt Handler */
#ifndef CONFIG_STM32_ADC_NOIRQ
-static int adc_interrupt(FAR struct adc_dev_s *dev);
+static int adc_interrupt(struct adc_dev_s *dev);
# if defined(STM32_IRQ_ADC1) && defined(CONFIG_STM32_ADC1)
-static int adc1_interrupt(int irq, FAR void *context, FAR void *arg);
+static int adc1_interrupt(int irq, void *context, void *arg);
# endif
# if defined(STM32_IRQ_ADC12) && (defined(CONFIG_STM32_ADC1) || \
defined(CONFIG_STM32_ADC2))
-static int adc12_interrupt(int irq, FAR void *context, FAR void *arg);
+static int adc12_interrupt(int irq, void *context, void *arg);
# endif
# if (defined(STM32_IRQ_ADC3) && defined(CONFIG_STM32_ADC3))
-static int adc3_interrupt(int irq, FAR void *context, FAR void *arg);
+static int adc3_interrupt(int irq, void *context, void *arg);
# endif
# if defined(STM32_IRQ_ADC4) && defined(CONFIG_STM32_ADC4)
-static int adc4_interrupt(int irq, FAR void *context, FAR void *arg);
+static int adc4_interrupt(int irq, void *context, void *arg);
# endif
# if defined(STM32_IRQ_ADC)
-static int adc123_interrupt(int irq, FAR void *context, FAR void *arg);
+static int adc123_interrupt(int irq, void *context, void *arg);
# endif
#endif /* CONFIG_STM32_ADC_NOIRQ */
/* ADC Driver Methods */
-static int adc_bind(FAR struct adc_dev_s *dev,
- FAR const struct adc_callback_s *callback);
-static void adc_reset(FAR struct adc_dev_s *dev);
-static int adc_setup(FAR struct adc_dev_s *dev);
-static void adc_shutdown(FAR struct adc_dev_s *dev);
-static void adc_rxint(FAR struct adc_dev_s *dev, bool enable);
-static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg);
-static void adc_enable(FAR struct stm32_dev_s *priv, bool enable);
+static int adc_bind(struct adc_dev_s *dev,
+ const struct adc_callback_s *callback);
+static void adc_reset(struct adc_dev_s *dev);
+static int adc_setup(struct adc_dev_s *dev);
+static void adc_shutdown(struct adc_dev_s *dev);
+static void adc_rxint(struct adc_dev_s *dev, bool enable);
+static int adc_ioctl(struct adc_dev_s *dev, int cmd, unsigned long arg);
+static void adc_enable(struct stm32_dev_s *priv, bool enable);
-static uint32_t adc_sqrbits(FAR struct stm32_dev_s *priv, int first,
+static uint32_t adc_sqrbits(struct stm32_dev_s *priv, int first,
int last, int offset);
-static int adc_set_ch(FAR struct adc_dev_s *dev, uint8_t ch);
+static int adc_set_ch(struct adc_dev_s *dev, uint8_t ch);
-static int adc_ioc_change_ints(FAR struct adc_dev_s *dev, int cmd,
+static int adc_ioc_change_ints(struct adc_dev_s *dev, int cmd,
bool arg);
#ifdef HAVE_ADC_RESOLUTION
-static int adc_resolution_set(FAR struct adc_dev_s *dev, uint8_t res);
+static int adc_resolution_set(struct adc_dev_s *dev, uint8_t res);
#endif
#ifdef HAVE_ADC_VBAT
-static void adc_enable_vbat_channel(FAR struct adc_dev_s *dev, bool enable);
+static void adc_enable_vbat_channel(struct adc_dev_s *dev, bool enable);
#endif
#ifdef HAVE_ADC_POWERDOWN
-static int adc_ioc_change_sleep_between_opers(FAR struct adc_dev_s *dev,
+static int adc_ioc_change_sleep_between_opers(struct adc_dev_s *dev,
int cmd, bool arg);
-static void adc_power_down_idle(FAR struct stm32_dev_s *priv,
+static void adc_power_down_idle(struct stm32_dev_s *priv,
bool pdi_high);
-static void adc_power_down_delay(FAR struct stm32_dev_s *priv,
+static void adc_power_down_delay(struct stm32_dev_s *priv,
bool pdd_high);
#endif
#ifdef CONFIG_STM32_STM32L15XX
-static void adc_dels_after_conversion(FAR struct stm32_dev_s *priv,
+static void adc_dels_after_conversion(struct stm32_dev_s *priv,
uint32_t delay);
-static void adc_select_ch_bank(FAR struct stm32_dev_s *priv,
+static void adc_select_ch_bank(struct stm32_dev_s *priv,
bool chb_selected);
#endif
#ifdef HAVE_HSI_CONTROL
static void adc_enable_hsi(bool enable);
-static void adc_reset_hsi_disable(FAR struct adc_dev_s *dev);
+static void adc_reset_hsi_disable(struct adc_dev_s *dev);
#endif
#ifdef ADC_HAVE_TIMER
-static void adc_timstart(FAR struct stm32_dev_s *priv, bool enable);
-static int adc_timinit(FAR struct stm32_dev_s *priv);
+static void adc_timstart(struct stm32_dev_s *priv, bool enable);
+static int adc_timinit(struct stm32_dev_s *priv);
#endif
#if defined(ADC_HAVE_DMA) && !defined(CONFIG_STM32_ADC_NOIRQ)
static void adc_dmaconvcallback(DMA_HANDLE handle, uint8_t isr,
- FAR void *arg);
+ void *arg);
#endif
-static void adc_reg_startconv(FAR struct stm32_dev_s *priv, bool enable);
+static void adc_reg_startconv(struct stm32_dev_s *priv, bool enable);
#ifdef ADC_HAVE_INJECTED
-static void adc_inj_startconv(FAR struct stm32_dev_s *priv, bool enable);
-static int adc_inj_set_ch(FAR struct adc_dev_s *dev, uint8_t ch);
+static void adc_inj_startconv(struct stm32_dev_s *priv, bool enable);
+static int adc_inj_set_ch(struct adc_dev_s *dev, uint8_t ch);
#endif
#ifdef ADC_HAVE_EXTCFG
-static int adc_extcfg_set(FAR struct stm32_dev_s *priv, uint32_t extcfg);
+static int adc_extcfg_set(struct stm32_dev_s *priv, uint32_t extcfg);
#endif
#ifdef ADC_HAVE_JEXTCFG
-static int adc_jextcfg_set(FAR struct stm32_dev_s *priv, uint32_t jextcfg);
+static int adc_jextcfg_set(struct stm32_dev_s *priv, uint32_t jextcfg);
#endif
-static void adc_dumpregs(FAR struct stm32_dev_s *priv);
+static void adc_dumpregs(struct stm32_dev_s *priv);
#ifdef CONFIG_STM32_ADC_LL_OPS
-static int adc_llops_setup(FAR struct stm32_adc_dev_s *dev);
-static void adc_llops_shutdown(FAR struct stm32_adc_dev_s *dev);
-static void adc_intack(FAR struct stm32_adc_dev_s *dev, uint32_t source);
-static void adc_inten(FAR struct stm32_adc_dev_s *dev, uint32_t source);
-static void adc_intdis(FAR struct stm32_adc_dev_s *dev, uint32_t source);
-static uint32_t adc_intget(FAR struct stm32_adc_dev_s *dev);
-static uint32_t adc_regget(FAR struct stm32_adc_dev_s *dev);
-static void adc_llops_reg_startconv(FAR struct stm32_adc_dev_s *dev,
+static int adc_llops_setup(struct stm32_adc_dev_s *dev);
+static void adc_llops_shutdown(struct stm32_adc_dev_s *dev);
+static void adc_intack(struct stm32_adc_dev_s *dev, uint32_t source);
+static void adc_inten(struct stm32_adc_dev_s *dev, uint32_t source);
+static void adc_intdis(struct stm32_adc_dev_s *dev, uint32_t source);
+static uint32_t adc_intget(struct stm32_adc_dev_s *dev);
+static uint32_t adc_regget(struct stm32_adc_dev_s *dev);
+static void adc_llops_reg_startconv(struct stm32_adc_dev_s *dev,
bool enable);
-static int adc_offset_set(FAR struct stm32_adc_dev_s *dev, uint8_t ch,
+static int adc_offset_set(struct stm32_adc_dev_s *dev, uint8_t ch,
uint8_t i, uint16_t offset);
# ifdef ADC_HAVE_EXTCFG
-static void adc_llops_extcfg_set(FAR struct stm32_adc_dev_s *dev,
+static void adc_llops_extcfg_set(struct stm32_adc_dev_s *dev,
uint32_t extcfg);
# endif
# ifdef ADC_HAVE_JEXTCFG
-static void adc_llops_jextcfg_set(FAR struct stm32_adc_dev_s *dev,
+static void adc_llops_jextcfg_set(struct stm32_adc_dev_s *dev,
uint32_t jextcfg);
# endif
# ifdef ADC_HAVE_DMA
-static int adc_regbufregister(FAR struct stm32_adc_dev_s *dev,
+static int adc_regbufregister(struct stm32_adc_dev_s *dev,
uint16_t *buffer, uint8_t len);
# endif
# ifdef ADC_HAVE_INJECTED
-static uint32_t adc_injget(FAR struct stm32_adc_dev_s *dev, uint8_t chan);
-static void adc_llops_inj_startconv(FAR struct stm32_adc_dev_s *dev,
+static uint32_t adc_injget(struct stm32_adc_dev_s *dev, uint8_t chan);
+static void adc_llops_inj_startconv(struct stm32_adc_dev_s *dev,
bool enable);
# endif
# ifdef CONFIG_STM32_ADC_CHANGE_SAMPLETIME
-static void adc_sampletime_set(FAR struct stm32_adc_dev_s *dev,
- FAR struct adc_sample_time_s *time_samples);
-static void adc_sampletime_write(FAR struct stm32_adc_dev_s *dev);
+static void adc_sampletime_set(struct stm32_adc_dev_s *dev,
+ struct adc_sample_time_s *time_samples);
+static void adc_sampletime_write(struct stm32_adc_dev_s *dev);
# endif
-static void adc_llops_dumpregs(FAR struct stm32_adc_dev_s *dev);
+static void adc_llops_dumpregs(struct stm32_adc_dev_s *dev);
#endif
/****************************************************************************
@@ -1012,7 +1012,7 @@ static void stm32_modifyreg32(unsigned int addr, uint32_t clrbits,
*
****************************************************************************/
-static uint32_t adc_getreg(FAR struct stm32_dev_s *priv, int offset)
+static uint32_t adc_getreg(struct stm32_dev_s *priv, int offset)
{
return getreg32(priv->base + offset);
}
@@ -1033,7 +1033,7 @@ static uint32_t adc_getreg(FAR struct stm32_dev_s *priv, int offset)
*
****************************************************************************/
-static void adc_putreg(FAR struct stm32_dev_s *priv, int offset,
+static void adc_putreg(struct stm32_dev_s *priv, int offset,
uint32_t value)
{
putreg32(value, priv->base + offset);
@@ -1056,7 +1056,7 @@ static void adc_putreg(FAR struct stm32_dev_s *priv, int offset,
*
****************************************************************************/
-static void adc_modifyreg(FAR struct stm32_dev_s *priv, int offset,
+static void adc_modifyreg(struct stm32_dev_s *priv, int offset,
uint32_t clrbits, uint32_t setbits)
{
adc_putreg(priv, offset, (adc_getreg(priv, offset) & ~clrbits) | setbits);
@@ -1068,7 +1068,7 @@ static void adc_modifyreg(FAR struct stm32_dev_s *priv, int offset,
* Name: adccmn_base_get
****************************************************************************/
-static uint32_t adccmn_base_get(FAR struct stm32_dev_s *priv)
+static uint32_t adccmn_base_get(struct stm32_dev_s *priv)
{
uint32_t base = 0;
@@ -1096,7 +1096,7 @@ static uint32_t adccmn_base_get(FAR struct stm32_dev_s *priv)
* Name: adccmn_modifyreg
****************************************************************************/
-static void adccmn_modifyreg(FAR struct stm32_dev_s *priv, uint32_t offset,
+static void adccmn_modifyreg(struct stm32_dev_s *priv, uint32_t offset,
uint32_t clrbits, uint32_t setbits)
{
uint32_t base = 0;
@@ -1114,7 +1114,7 @@ static void adccmn_modifyreg(FAR struct stm32_dev_s *priv, uint32_t offset,
* Name: adccmn_getreg
****************************************************************************/
-static uint32_t adccmn_getreg(FAR struct stm32_dev_s *priv, uint32_t offset)
+static uint32_t adccmn_getreg(struct stm32_dev_s *priv, uint32_t offset)
{
uint32_t base = 0;
@@ -1144,7 +1144,7 @@ static uint32_t adccmn_getreg(FAR struct stm32_dev_s *priv, uint32_t offset)
****************************************************************************/
#ifdef ADC_HAVE_TIMER
-static uint16_t tim_getreg(FAR struct stm32_dev_s *priv, int offset)
+static uint16_t tim_getreg(struct stm32_dev_s *priv, int offset)
{
return getreg16(priv->tbase + offset);
}
@@ -1167,7 +1167,7 @@ static uint16_t tim_getreg(FAR struct stm32_dev_s *priv, int offset)
****************************************************************************/
#ifdef ADC_HAVE_TIMER
-static void tim_putreg(FAR struct stm32_dev_s *priv, int offset,
+static void tim_putreg(struct stm32_dev_s *priv, int offset,
uint16_t value)
{
putreg16(value, priv->tbase + offset);
@@ -1192,7 +1192,7 @@ static void tim_putreg(FAR struct stm32_dev_s *priv, int offset,
****************************************************************************/
#ifdef ADC_HAVE_TIMER
-static void tim_modifyreg(FAR struct stm32_dev_s *priv, int offset,
+static void tim_modifyreg(struct stm32_dev_s *priv, int offset,
uint16_t clrbits, uint16_t setbits)
{
tim_putreg(priv, offset, (tim_getreg(priv, offset) & ~clrbits) | setbits);
@@ -1214,7 +1214,7 @@ static void tim_modifyreg(FAR struct stm32_dev_s *priv, int offset,
****************************************************************************/
#ifdef ADC_HAVE_TIMER
-static void tim_dumpregs(FAR struct stm32_dev_s *priv, FAR const char *msg)
+static void tim_dumpregs(struct stm32_dev_s *priv, const char *msg)
{
ainfo("%s:\n", msg);
ainfo(" CR1: %04x CR2: %04x SMCR: %04x DIER: %04x\n",
@@ -1274,7 +1274,7 @@ static void tim_dumpregs(FAR struct stm32_dev_s *priv, FAR const char *msg)
****************************************************************************/
#ifdef ADC_HAVE_TIMER
-static void adc_timstart(FAR struct stm32_dev_s *priv, bool enable)
+static void adc_timstart(struct stm32_dev_s *priv, bool enable)
{
ainfo("enable: %d\n", enable ? 1 : 0);
@@ -1309,7 +1309,7 @@ static void adc_timstart(FAR struct stm32_dev_s *priv, bool enable)
****************************************************************************/
#ifdef ADC_HAVE_TIMER
-static int adc_timinit(FAR struct stm32_dev_s *priv)
+static int adc_timinit(struct stm32_dev_s *priv)
{
uint32_t prescaler;
uint32_t reload;
@@ -1661,7 +1661,7 @@ static int adc_timinit(FAR struct stm32_dev_s *priv)
****************************************************************************/
#if defined(HAVE_IP_ADC_V2)
-static void adc_reg_startconv(FAR struct stm32_dev_s *priv, bool enable)
+static void adc_reg_startconv(struct stm32_dev_s *priv, bool enable)
{
uint32_t regval;
@@ -1693,7 +1693,7 @@ static void adc_reg_startconv(FAR struct stm32_dev_s *priv, bool enable)
}
}
#elif defined(HAVE_IP_ADC_V1) && !defined(HAVE_BASIC_ADC)
-static void adc_reg_startconv(FAR struct stm32_dev_s *priv, bool enable)
+static void adc_reg_startconv(struct stm32_dev_s *priv, bool enable)
{
ainfo("reg enable: %d\n", enable ? 1 : 0);
@@ -1711,7 +1711,7 @@ static void adc_reg_startconv(FAR struct stm32_dev_s *priv, bool enable)
}
}
#else /* ADV IPv1 BASIC */
-static void adc_reg_startconv(FAR struct stm32_dev_s *priv, bool enable)
+static void adc_reg_startconv(struct stm32_dev_s *priv, bool enable)
{
ainfo("reg enable: %d\n", enable ? 1 : 0);
@@ -1749,7 +1749,7 @@ static void adc_reg_startconv(FAR struct stm32_dev_s *priv, bool enable)
****************************************************************************/
#if defined(HAVE_IP_ADC_V2)
-static void adc_inj_startconv(FAR struct stm32_dev_s *priv, bool enable)
+static void adc_inj_startconv(struct stm32_dev_s *priv, bool enable)
{
uint32_t regval;
@@ -1781,7 +1781,7 @@ static void adc_inj_startconv(FAR struct stm32_dev_s *priv, bool enable)
}
}
#elif defined(HAVE_IP_ADC_V1)
-static void adc_inj_startconv(FAR struct stm32_dev_s *priv, bool enable)
+static void adc_inj_startconv(struct stm32_dev_s *priv, bool enable)
{
ainfo("inj enable: %d\n", enable ? 1 : 0);
@@ -1807,7 +1807,7 @@ static void adc_inj_startconv(FAR struct stm32_dev_s *priv, bool enable)
****************************************************************************/
#ifdef HAVE_ADC_CMN_DATA
-static int adccmn_lock(FAR struct stm32_dev_s *priv, bool lock)
+static int adccmn_lock(struct stm32_dev_s *priv, bool lock)
{
int ret;
@@ -1840,7 +1840,7 @@ static int adccmn_lock(FAR struct stm32_dev_s *priv, bool lock)
****************************************************************************/
#if defined(HAVE_IP_ADC_V1) && defined(HAVE_BASIC_ADC)
-static void adc_rccreset(FAR struct stm32_dev_s *priv, bool reset)
+static void adc_rccreset(struct stm32_dev_s *priv, bool reset)
{
uint32_t adcbit;
@@ -1905,7 +1905,7 @@ static void adc_rccreset(FAR struct stm32_dev_s *priv, bool reset)
}
}
#elif defined(HAVE_IP_ADC_V1)
-static void adc_rccreset(FAR struct stm32_dev_s *priv, bool reset)
+static void adc_rccreset(struct stm32_dev_s *priv, bool reset)
{
uint32_t adcbit;
@@ -1945,7 +1945,7 @@ static void adc_rccreset(FAR struct stm32_dev_s *priv, bool reset)
}
}
#elif defined(HAVE_IP_ADC_V2)
-static void adc_rccreset(FAR struct stm32_dev_s *priv, bool reset)
+static void adc_rccreset(struct stm32_dev_s *priv, bool reset)
{
uint32_t adcbit;
@@ -2015,7 +2015,7 @@ static void adc_rccreset(FAR struct stm32_dev_s *priv, bool reset)
****************************************************************************/
#ifdef CONFIG_STM32_STM32L15XX
-static void adc_power_down_idle(FAR struct stm32_dev_s *priv, bool pdi_high)
+static void adc_power_down_idle(struct stm32_dev_s *priv, bool pdi_high)
{
uint32_t regval;
@@ -2057,7 +2057,7 @@ static void adc_power_down_idle(FAR struct stm32_dev_s *priv, bool pdi_high)
****************************************************************************/
#ifdef CONFIG_STM32_STM32L15XX
-static void adc_power_down_delay(FAR struct stm32_dev_s *priv, bool pdd_high)
+static void adc_power_down_delay(struct stm32_dev_s *priv, bool pdd_high)
{
uint32_t regval;
@@ -2099,7 +2099,7 @@ static void adc_power_down_delay(FAR struct stm32_dev_s *priv, bool pdd_high)
****************************************************************************/
#ifdef CONFIG_STM32_STM32L15XX
-static void adc_dels_after_conversion(FAR struct stm32_dev_s *priv,
+static void adc_dels_after_conversion(struct stm32_dev_s *priv,
uint32_t delay)
{
ainfo("Delay selected: 0x%08x\n", delay);
@@ -2126,7 +2126,7 @@ static void adc_dels_after_conversion(FAR struct stm32_dev_s *priv,
****************************************************************************/
#ifdef CONFIG_STM32_STM32L15XX
-static void adc_select_ch_bank(FAR struct stm32_dev_s *priv,
+static void adc_select_ch_bank(struct stm32_dev_s *priv,
bool chb_selected)
{
ainfo("Bank of channels selected: %c\n", chb_selected ? 'B' : 'A');
@@ -2159,7 +2159,7 @@ static void adc_select_ch_bank(FAR struct stm32_dev_s *priv,
****************************************************************************/
#if defined(HAVE_IP_ADC_V2)
-static void adc_enable(FAR struct stm32_dev_s *priv, bool enable)
+static void adc_enable(struct stm32_dev_s *priv, bool enable)
{
uint32_t regval;
@@ -2193,7 +2193,7 @@ static void adc_enable(FAR struct stm32_dev_s *priv, bool enable)
}
}
#else /* HAVE_IP_ADC_V1 */
-static void adc_enable(FAR struct stm32_dev_s *priv, bool enable)
+static void adc_enable(struct stm32_dev_s *priv, bool enable)
{
#ifdef ADC_SR_ADONS
bool enabled = (adc_getreg(priv, STM32_ADC_SR_OFFSET) & ADC_SR_ADONS) != 0;
@@ -2233,10 +2233,10 @@ static void adc_enable(FAR struct stm32_dev_s *priv, bool enable)
#if defined(ADC_HAVE_DMA) && !defined(CONFIG_STM32_ADC_NOIRQ)
static void adc_dmaconvcallback(DMA_HANDLE handle, uint8_t isr,
- FAR void *arg)
+ void *arg)
{
- FAR struct adc_dev_s *dev = (FAR struct adc_dev_s *)arg;
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
+ struct adc_dev_s *dev = (struct adc_dev_s *)arg;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev->ad_priv;
int i;
/* Verify that the upper-half driver has bound its callback functions */
@@ -2275,11 +2275,11 @@ static void adc_dmaconvcallback(DMA_HANDLE handle, uint8_t isr,
*
****************************************************************************/
-static int adc_bind(FAR struct adc_dev_s *dev,
- FAR const struct adc_callback_s *callback)
+static int adc_bind(struct adc_dev_s *dev,
+ const struct adc_callback_s *callback)
{
#ifdef ADC_HAVE_CB
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev->ad_priv;
DEBUGASSERT(priv != NULL);
priv->cb = callback;
@@ -2296,7 +2296,7 @@ static int adc_bind(FAR struct adc_dev_s *dev,
****************************************************************************/
#if defined(HAVE_IP_ADC_V2)
-static void adc_watchdog_cfg(FAR struct stm32_dev_s *priv)
+static void adc_watchdog_cfg(struct stm32_dev_s *priv)
{
uint32_t clrbits = 0;
uint32_t setbits = 0;
@@ -2316,7 +2316,7 @@ static void adc_watchdog_cfg(FAR struct stm32_dev_s *priv)
adc_modifyreg(priv, STM32_ADC_CFGR1_OFFSET, clrbits, setbits);
}
#else
-static void adc_watchdog_cfg(FAR struct stm32_dev_s *priv)
+static void adc_watchdog_cfg(struct stm32_dev_s *priv)
{
uint32_t clrbits = 0;
uint32_t setbits = 0;
@@ -2343,7 +2343,7 @@ static void adc_watchdog_cfg(FAR struct stm32_dev_s *priv)
****************************************************************************/
#if defined(HAVE_IP_ADC_V2)
-static void adc_calibrate(FAR struct stm32_dev_s *priv)
+static void adc_calibrate(struct stm32_dev_s *priv)
{
#if 0 /* Doesn't work */
/* Calibrate the ADC */
@@ -2359,7 +2359,7 @@ static void adc_calibrate(FAR struct stm32_dev_s *priv)
#endif
}
#elif defined(HAVE_IP_ADC_V1) && defined(HAVE_BASIC_ADC)
-static void adc_calibrate(FAR struct stm32_dev_s *priv)
+static void adc_calibrate(struct stm32_dev_s *priv)
{
/* Power on the ADC */
@@ -2398,7 +2398,7 @@ static void adc_calibrate(FAR struct stm32_dev_s *priv)
****************************************************************************/
#ifdef HAVE_IP_ADC_V2
-static void adc_mode_cfg(FAR struct stm32_dev_s *priv)
+static void adc_mode_cfg(struct stm32_dev_s *priv)
{
uint32_t clrbits = 0;
uint32_t setbits = 0;
@@ -2417,7 +2417,7 @@ static void adc_mode_cfg(FAR struct stm32_dev_s *priv)
adc_modifyreg(priv, STM32_ADC_CFGR1_OFFSET, clrbits, setbits);
}
#else
-static void adc_mode_cfg(FAR struct stm32_dev_s *priv)
+static void adc_mode_cfg(struct stm32_dev_s *priv)
{
uint32_t clrbits = 0;
uint32_t setbits = 0;
@@ -2490,7 +2490,7 @@ static void adc_mode_cfg(FAR struct stm32_dev_s *priv)
****************************************************************************/
#if defined(HAVE_IP_ADC_V2)
-static void adc_voltreg_cfg(FAR struct stm32_dev_s *priv)
+static void adc_voltreg_cfg(struct stm32_dev_s *priv)
{
/* Set ADC voltage regulator to intermediate state */
@@ -2507,7 +2507,7 @@ static void adc_voltreg_cfg(FAR struct stm32_dev_s *priv)
up_udelay(10);
}
#else
-static void adc_voltreg_cfg(FAR struct stm32_dev_s *priv)
+static void adc_voltreg_cfg(struct stm32_dev_s *priv)
{
/* Nothing to do here */
@@ -2519,16 +2519,16 @@ static void adc_voltreg_cfg(FAR struct stm32_dev_s *priv)
* Name: adc_voltreg_cfg
****************************************************************************/
-static void adc_sampletime_cfg(FAR struct adc_dev_s *dev)
+static void adc_sampletime_cfg(struct adc_dev_s *dev)
{
/* Initialize the same sample time for each ADC.
* During sample cycles channel selection bits must remain unchanged.
*/
#ifdef CONFIG_STM32_ADC_CHANGE_SAMPLETIME
- adc_sampletime_write((FAR struct stm32_adc_dev_s *)dev->ad_priv);
+ adc_sampletime_write((struct stm32_adc_dev_s *)dev->ad_priv);
#else
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev->ad_priv;
adc_putreg(priv, STM32_ADC_SMPR1_OFFSET, ADC_SMPR1_DEFAULT);
adc_putreg(priv, STM32_ADC_SMPR2_OFFSET, ADC_SMPR2_DEFAULT);
@@ -2546,7 +2546,7 @@ static void adc_sampletime_cfg(FAR struct adc_dev_s *dev)
****************************************************************************/
#if defined(HAVE_IP_ADC_V2)
-static void adc_common_cfg(FAR struct stm32_dev_s *priv)
+static void adc_common_cfg(struct stm32_dev_s *priv)
{
uint32_t clrbits = 0;
uint32_t setbits = 0;
@@ -2562,7 +2562,7 @@ static void adc_common_cfg(FAR struct stm32_dev_s *priv)
adccmn_modifyreg(priv, STM32_ADC_CCR_OFFSET, clrbits, setbits);
}
#elif defined(HAVE_IP_ADC_V1) && !defined(HAVE_BASIC_ADC)
-static void adc_common_cfg(FAR struct stm32_dev_s *priv)
+static void adc_common_cfg(struct stm32_dev_s *priv)
{
uint32_t clrbits = 0;
uint32_t setbits = 0;
@@ -2581,7 +2581,7 @@ static void adc_common_cfg(FAR struct stm32_dev_s *priv)
adccmn_modifyreg(priv, STM32_ADC_CCR_OFFSET, clrbits, setbits);
}
#else
-static void adc_common_cfg(FAR struct stm32_dev_s *priv)
+static void adc_common_cfg(struct stm32_dev_s *priv)
{
/* Do nothing here */
@@ -2595,7 +2595,7 @@ static void adc_common_cfg(FAR struct stm32_dev_s *priv)
****************************************************************************/
#ifdef HAVE_IP_ADC_V2
-static void adc_dma_cfg(FAR struct stm32_dev_s *priv)
+static void adc_dma_cfg(struct stm32_dev_s *priv)
{
uint32_t clrbits = 0;
uint32_t setbits = 0;
@@ -2624,7 +2624,7 @@ static void adc_dma_cfg(FAR struct stm32_dev_s *priv)
adc_modifyreg(priv, STM32_ADC_CFGR1_OFFSET, clrbits, setbits);
}
#else
-static void adc_dma_cfg(FAR struct stm32_dev_s *priv)
+static void adc_dma_cfg(struct stm32_dev_s *priv)
{
uint32_t clrbits = 0;
uint32_t setbits = 0;
@@ -2660,9 +2660,9 @@ static void adc_dma_cfg(FAR struct stm32_dev_s *priv)
* Name: adc_dma_start
****************************************************************************/
-static void adc_dma_start(FAR struct adc_dev_s *dev)
+static void adc_dma_start(struct adc_dev_s *dev)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev->ad_priv;
/* Stop and free DMA if it was started before */
@@ -2692,9 +2692,9 @@ static void adc_dma_start(FAR struct adc_dev_s *dev)
* Name: adc_configure
****************************************************************************/
-static void adc_configure(FAR struct adc_dev_s *dev)
+static void adc_configure(struct adc_dev_s *dev)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev->ad_priv;
/* Turn off the ADC before configuration */
@@ -2805,9 +2805,9 @@ static void adc_configure(FAR struct adc_dev_s *dev)
*
****************************************************************************/
-static void adc_reset(FAR struct adc_dev_s *dev)
+static void adc_reset(struct adc_dev_s *dev)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev->ad_priv;
irqstate_t flags;
ainfo("intf: %d\n", priv->intf);
@@ -2878,7 +2878,7 @@ out:
****************************************************************************/
#ifdef HAVE_HSI_CONTROL
-static void adc_reset_hsi_disable(FAR struct adc_dev_s *dev)
+static void adc_reset_hsi_disable(struct adc_dev_s *dev)
{
adc_reset(dev);
adc_shutdown(dev);
@@ -2900,9 +2900,9 @@ static void adc_reset_hsi_disable(FAR struct adc_dev_s *dev)
*
****************************************************************************/
-static int adc_setup(FAR struct adc_dev_s *dev)
+static int adc_setup(struct adc_dev_s *dev)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev->ad_priv;
int ret = OK;
/* Do nothing when the ADC device is already set up */
@@ -3009,9 +3009,9 @@ static int adc_setup(FAR struct adc_dev_s *dev)
*
****************************************************************************/
-static void adc_shutdown(FAR struct adc_dev_s *dev)
+static void adc_shutdown(struct adc_dev_s *dev)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev->ad_priv;
/* Decrement count only when ADC device is in use */
@@ -3096,9 +3096,9 @@ static void adc_shutdown(FAR struct adc_dev_s *dev)
*
****************************************************************************/
-static void adc_rxint(FAR struct adc_dev_s *dev, bool enable)
+static void adc_rxint(struct adc_dev_s *dev, bool enable)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev->ad_priv;
uint32_t regval;
ainfo("intf: %d enable: %d\n", priv->intf, enable ? 1 : 0);
@@ -3146,10 +3146,10 @@ static void adc_rxint(FAR struct adc_dev_s *dev, bool enable)
****************************************************************************/
#if defined(HAVE_IP_ADC_V1)
-static void adc_ioc_enable_tvref_register(FAR struct adc_dev_s *dev,
+static void adc_ioc_enable_tvref_register(struct adc_dev_s *dev,
bool enable)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev->ad_priv;
#ifdef HAVE_BASIC_ADC
# if defined(CONFIG_STM32_ADC1)
@@ -3191,9 +3191,9 @@ static void adc_ioc_enable_tvref_register(FAR struct adc_dev_s *dev,
****************************************************************************/
#ifdef HAVE_ADC_RESOLUTION
-static int adc_resolution_set(FAR struct adc_dev_s *dev, uint8_t res)
+static int adc_resolution_set(struct adc_dev_s *dev, uint8_t res)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev->ad_priv;
int ret = OK;
/* Check input */
@@ -3224,7 +3224,7 @@ errout:
****************************************************************************/
#ifdef ADC_HAVE_EXTCFG
-static int adc_extcfg_set(FAR struct stm32_dev_s *priv, uint32_t extcfg)
+static int adc_extcfg_set(struct stm32_dev_s *priv, uint32_t extcfg)
{
uint32_t exten = 0;
uint32_t extsel = 0;
@@ -3265,7 +3265,7 @@ static int adc_extcfg_set(FAR struct stm32_dev_s *priv, uint32_t extcfg)
****************************************************************************/
#ifdef ADC_HAVE_JEXTCFG
-static int adc_jextcfg_set(FAR struct stm32_dev_s *priv, uint32_t jextcfg)
+static int adc_jextcfg_set(struct stm32_dev_s *priv, uint32_t jextcfg)
{
uint32_t jexten = 0;
uint32_t jextsel = 0;
@@ -3305,7 +3305,7 @@ static int adc_jextcfg_set(FAR struct stm32_dev_s *priv, uint32_t jextcfg)
* Name: adc_dumpregs
****************************************************************************/
-static void adc_dumpregs(FAR struct stm32_dev_s *priv)
+static void adc_dumpregs(struct stm32_dev_s *priv)
{
UNUSED(priv);
@@ -3371,9 +3371,9 @@ static void adc_dumpregs(FAR struct stm32_dev_s *priv)
****************************************************************************/
#ifdef HAVE_ADC_VBAT
-static void adc_enable_vbat_channel(FAR struct adc_dev_s *dev, bool enable)
+static void adc_enable_vbat_channel(struct adc_dev_s *dev, bool enable)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev->ad_priv;
if (enable)
{
@@ -3405,10 +3405,10 @@ static void adc_enable_vbat_channel(FAR struct adc_dev_s *dev, bool enable)
****************************************************************************/
#ifdef HAVE_ADC_POWERDOWN
-static int adc_ioc_change_sleep_between_opers(FAR struct adc_dev_s *dev,
+static int adc_ioc_change_sleep_between_opers(struct adc_dev_s *dev,
int cmd, bool arg)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev->ad_priv;
int ret = OK;
adc_enable(priv, false);
@@ -3454,7 +3454,7 @@ static int adc_ioc_change_sleep_between_opers(FAR struct adc_dev_s *dev,
*
****************************************************************************/
-static void adc_ioc_enable_awd_int(FAR struct stm32_dev_s *priv, bool enable)
+static void adc_ioc_enable_awd_int(struct stm32_dev_s *priv, bool enable)
{
if (enable)
{
@@ -3481,7 +3481,7 @@ static void adc_ioc_enable_awd_int(FAR struct stm32_dev_s *priv, bool enable)
*
****************************************************************************/
-static void adc_ioc_enable_eoc_int(FAR struct stm32_dev_s *priv, bool enable)
+static void adc_ioc_enable_eoc_int(struct stm32_dev_s *priv, bool enable)
{
if (enable)
{
@@ -3508,7 +3508,7 @@ static void adc_ioc_enable_eoc_int(FAR struct stm32_dev_s *priv, bool enable)
*
****************************************************************************/
-static void adc_ioc_enable_jeoc_int(FAR struct stm32_dev_s *priv,
+static void adc_ioc_enable_jeoc_int(struct stm32_dev_s *priv,
bool enable)
{
if (enable)
@@ -3536,7 +3536,7 @@ static void adc_ioc_enable_jeoc_int(FAR struct stm32_dev_s *priv,
*
****************************************************************************/
-static void adc_ioc_enable_ovr_int(FAR struct stm32_dev_s *priv, bool enable)
+static void adc_ioc_enable_ovr_int(struct stm32_dev_s *priv, bool enable)
{
if (enable)
{
@@ -3563,9 +3563,9 @@ static void adc_ioc_enable_ovr_int(FAR struct stm32_dev_s *priv, bool enable)
*
****************************************************************************/
-static int adc_ioc_change_ints(FAR struct adc_dev_s *dev, int cmd, bool arg)
+static int adc_ioc_change_ints(struct adc_dev_s *dev, int cmd, bool arg)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev->ad_priv;
int ret = OK;
switch (cmd)
@@ -3616,7 +3616,7 @@ static int adc_ioc_change_ints(FAR struct adc_dev_s *dev, int cmd, bool arg)
****************************************************************************/
#ifdef CONFIG_STM32_STM32L15XX
-static int adc_ioc_wait_rcnr_zeroed(FAR struct stm32_dev_s *priv)
+static int adc_ioc_wait_rcnr_zeroed(struct stm32_dev_s *priv)
{
int i;
@@ -3669,7 +3669,7 @@ static void adc_enable_hsi(bool enable)
* Name: adc_sqrbits
****************************************************************************/
-static uint32_t adc_sqrbits(FAR struct stm32_dev_s *priv, int first,
+static uint32_t adc_sqrbits(struct stm32_dev_s *priv, int first,
int last, int offset)
{
uint32_t bits = 0;
@@ -3700,9 +3700,9 @@ static uint32_t adc_sqrbits(FAR struct stm32_dev_s *priv, int first,
*
****************************************************************************/
-static int adc_set_ch(FAR struct adc_dev_s *dev, uint8_t ch)
+static int adc_set_ch(struct adc_dev_s *dev, uint8_t ch)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev->ad_priv;
uint32_t bits;
int i;
@@ -3759,9 +3759,9 @@ static int adc_set_ch(FAR struct adc_dev_s *dev, uint8_t ch)
* Name: adc_inj_set_ch
****************************************************************************/
-static int adc_inj_set_ch(FAR struct adc_dev_s *dev, uint8_t ch)
+static int adc_inj_set_ch(struct adc_dev_s *dev, uint8_t ch)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev->ad_priv;
uint32_t clrbits;
uint32_t setbits;
int i;
@@ -3816,10 +3816,10 @@ static int adc_inj_set_ch(FAR struct adc_dev_s *dev, uint8_t ch)
*
****************************************************************************/
-static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg)
+static int adc_ioctl(struct adc_dev_s *dev, int cmd, unsigned long arg)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
- int ret = OK;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev->ad_priv;
+ int ret = OK;
switch (cmd)
{
@@ -3995,9 +3995,9 @@ static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg)
*
****************************************************************************/
-static int adc_interrupt(FAR struct adc_dev_s *dev)
+static int adc_interrupt(struct adc_dev_s *dev)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev->ad_priv;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev->ad_priv;
uint32_t regval;
uint32_t pending;
int32_t data;
@@ -4083,7 +4083,7 @@ static int adc_interrupt(FAR struct adc_dev_s *dev)
****************************************************************************/
#if defined(STM32_IRQ_ADC1)
-static int adc1_interrupt(int irq, FAR void *context, FAR void *arg)
+static int adc1_interrupt(int irq, void *context, void *arg)
{
adc_interrupt(&g_adcdev1);
@@ -4105,7 +4105,7 @@ static int adc1_interrupt(int irq, FAR void *context, FAR void *arg)
#if defined(STM32_IRQ_ADC12) && \
(defined(CONFIG_STM32_ADC1) || defined(CONFIG_STM32_ADC2))
-static int adc12_interrupt(int irq, FAR void *context, FAR void *arg)
+static int adc12_interrupt(int irq, void *context, void *arg)
{
#ifdef CONFIG_STM32_ADC1
adc_interrupt(&g_adcdev1);
@@ -4132,7 +4132,7 @@ static int adc12_interrupt(int irq, FAR void *context, FAR void *arg)
****************************************************************************/
#if defined(STM32_IRQ_ADC3) && defined(CONFIG_STM32_ADC3)
-static int adc3_interrupt(int irq, FAR void *context, FAR void *arg)
+static int adc3_interrupt(int irq, void *context, void *arg)
{
adc_interrupt(&g_adcdev3);
@@ -4153,7 +4153,7 @@ static int adc3_interrupt(int irq, FAR void *context, FAR void *arg)
****************************************************************************/
#if defined(STM32_IRQ_ADC4) && defined(CONFIG_STM32_ADC4)
-static int adc4_interrupt(int irq, FAR void *context, FAR void *arg)
+static int adc4_interrupt(int irq, void *context, void *arg)
{
adc_interrupt(&g_adcdev4);
@@ -4174,7 +4174,7 @@ static int adc4_interrupt(int irq, FAR void *context, FAR void *arg)
****************************************************************************/
#if defined(STM32_IRQ_ADC)
-static int adc123_interrupt(int irq, FAR void *context, FAR void *arg)
+static int adc123_interrupt(int irq, void *context, void *arg)
{
#ifdef CONFIG_STM32_ADC1
adc_interrupt(&g_adcdev1);
@@ -4199,9 +4199,9 @@ static int adc123_interrupt(int irq, FAR void *context, FAR void *arg)
* Name: adc_llops_setup
****************************************************************************/
-static int adc_llops_setup(FAR struct stm32_adc_dev_s *dev)
+static int adc_llops_setup(struct stm32_adc_dev_s *dev)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
return adc_setup(priv->dev);
}
@@ -4210,9 +4210,9 @@ static int adc_llops_setup(FAR struct stm32_adc_dev_s *dev)
* Name: adc_llops_shutdown
****************************************************************************/
-static void adc_llops_shutdown(FAR struct stm32_adc_dev_s *dev)
+static void adc_llops_shutdown(struct stm32_adc_dev_s *dev)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
adc_shutdown(priv->dev);
}
@@ -4221,9 +4221,9 @@ static void adc_llops_shutdown(FAR struct stm32_adc_dev_s *dev)
* Name: adc_intack
****************************************************************************/
-static void adc_intack(FAR struct stm32_adc_dev_s *dev, uint32_t source)
+static void adc_intack(struct stm32_adc_dev_s *dev, uint32_t source)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
/* Clear pending interrupts */
@@ -4242,9 +4242,9 @@ static void adc_intack(FAR struct stm32_adc_dev_s *dev, uint32_t source)
* Name: adc_inten
****************************************************************************/
-static void adc_inten(FAR struct stm32_adc_dev_s *dev, uint32_t source)
+static void adc_inten(struct stm32_adc_dev_s *dev, uint32_t source)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
/* Enable interrupts */
@@ -4255,9 +4255,9 @@ static void adc_inten(FAR struct stm32_adc_dev_s *dev, uint32_t source)
* Name: adc_intdis
****************************************************************************/
-static void adc_intdis(FAR struct stm32_adc_dev_s *dev, uint32_t source)
+static void adc_intdis(struct stm32_adc_dev_s *dev, uint32_t source)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
/* Disable interrupts */
@@ -4268,9 +4268,9 @@ static void adc_intdis(FAR struct stm32_adc_dev_s *dev, uint32_t source)
* Name: adc_ackget
****************************************************************************/
-static uint32_t adc_intget(FAR struct stm32_adc_dev_s *dev)
+static uint32_t adc_intget(struct stm32_adc_dev_s *dev)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
uint32_t regval;
uint32_t pending;
@@ -4284,9 +4284,9 @@ static uint32_t adc_intget(FAR struct stm32_adc_dev_s *dev)
* Name: adc_regget
****************************************************************************/
-static uint32_t adc_regget(FAR struct stm32_adc_dev_s *dev)
+static uint32_t adc_regget(struct stm32_adc_dev_s *dev)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
return adc_getreg(priv, STM32_ADC_DR_OFFSET) & ADC_DR_RDATA_MASK;
}
@@ -4295,10 +4295,10 @@ static uint32_t adc_regget(FAR struct stm32_adc_dev_s *dev)
* Name: adc_llops_reg_startconv
****************************************************************************/
-static void adc_llops_reg_startconv(FAR struct stm32_adc_dev_s *dev,
+static void adc_llops_reg_startconv(struct stm32_adc_dev_s *dev,
bool enable)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
adc_reg_startconv(priv, enable);
}
@@ -4308,10 +4308,10 @@ static void adc_llops_reg_startconv(FAR struct stm32_adc_dev_s *dev,
****************************************************************************/
#ifdef HAVE_IP_ADC_V2
-static int adc_offset_set(FAR struct stm32_adc_dev_s *dev, uint8_t ch,
+static int adc_offset_set(struct stm32_adc_dev_s *dev, uint8_t ch,
uint8_t i, uint16_t offset)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
uint32_t regval = 0;
uint32_t reg = 0;
int ret = OK;
@@ -4336,10 +4336,10 @@ errout:
return ret;
}
#else /* HAVE_IP_ADC_V1 */
-static int adc_offset_set(FAR struct stm32_adc_dev_s *dev, uint8_t ch,
+static int adc_offset_set(struct stm32_adc_dev_s *dev, uint8_t ch,
uint8_t i, uint16_t offset)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
uint32_t reg = 0;
int ret = OK;
@@ -4369,10 +4369,10 @@ errout:
****************************************************************************/
#ifdef ADC_HAVE_EXTCFG
-static void adc_llops_extcfg_set(FAR struct stm32_adc_dev_s *dev,
+static void adc_llops_extcfg_set(struct stm32_adc_dev_s *dev,
uint32_t extcfg)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
adc_extcfg_set(priv, extcfg);
}
@@ -4383,10 +4383,10 @@ static void adc_llops_extcfg_set(FAR struct stm32_adc_dev_s *dev,
****************************************************************************/
#ifdef ADC_HAVE_JEXTCFG
-static void adc_llops_jextcfg_set(FAR struct stm32_adc_dev_s *dev,
+static void adc_llops_jextcfg_set(struct stm32_adc_dev_s *dev,
uint32_t jextcfg)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
adc_jextcfg_set(priv, jextcfg);
}
@@ -4397,10 +4397,10 @@ static void adc_llops_jextcfg_set(FAR struct stm32_adc_dev_s *dev,
****************************************************************************/
#ifdef ADC_HAVE_DMA
-static int adc_regbufregister(FAR struct stm32_adc_dev_s *dev,
+static int adc_regbufregister(struct stm32_adc_dev_s *dev,
uint16_t *buffer, uint8_t len)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
stm32_dmasetup(priv->dma,
priv->base + STM32_ADC_DR_OFFSET,
@@ -4421,9 +4421,9 @@ static int adc_regbufregister(FAR struct stm32_adc_dev_s *dev,
****************************************************************************/
#ifdef ADC_HAVE_INJECTED
-static uint32_t adc_injget(FAR struct stm32_adc_dev_s *dev, uint8_t chan)
+static uint32_t adc_injget(struct stm32_adc_dev_s *dev, uint8_t chan)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
uint32_t regval = 0;
if (chan > (priv->cj_channels - 1))
@@ -4444,10 +4444,10 @@ errout:
* Name: adc_llops_inj_startconv
****************************************************************************/
-static void adc_llops_inj_startconv(FAR struct stm32_adc_dev_s *dev,
+static void adc_llops_inj_startconv(struct stm32_adc_dev_s *dev,
bool enable)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
adc_inj_startconv(priv, enable);
}
@@ -4467,9 +4467,9 @@ static void adc_llops_inj_startconv(FAR struct stm32_adc_dev_s *dev,
****************************************************************************/
#ifdef CONFIG_STM32_ADC_CHANGE_SAMPLETIME
-static void adc_sampletime_write(FAR struct stm32_adc_dev_s *dev)
+static void adc_sampletime_write(struct stm32_adc_dev_s *dev)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
uint32_t value = 0;
uint8_t i;
uint8_t shift;
@@ -4566,10 +4566,10 @@ static void adc_sampletime_write(FAR struct stm32_adc_dev_s *dev)
*
****************************************************************************/
-void adc_sampletime_set(FAR struct stm32_adc_dev_s *dev,
- FAR struct adc_sample_time_s *time_samples)
+void adc_sampletime_set(struct stm32_adc_dev_s *dev,
+ struct adc_sample_time_s *time_samples)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
uint8_t ch_index;
uint8_t i;
@@ -4602,9 +4602,9 @@ void adc_sampletime_set(FAR struct stm32_adc_dev_s *dev,
* Name: adc_llops_dumpregs
****************************************************************************/
-static void adc_llops_dumpregs(FAR struct stm32_adc_dev_s *dev)
+static void adc_llops_dumpregs(struct stm32_adc_dev_s *dev)
{
- FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev;
+ struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
adc_dumpregs(priv);
}
@@ -4663,15 +4663,15 @@ static void adc_llops_dumpregs(FAR struct stm32_adc_dev_s *dev)
*
****************************************************************************/
-struct adc_dev_s *stm32_adcinitialize(int intf, FAR const uint8_t *chanlist,
+struct adc_dev_s *stm32_adcinitialize(int intf, const uint8_t *chanlist,
int channels)
{
- FAR struct adc_dev_s *dev;
- FAR struct stm32_dev_s *priv;
+ struct adc_dev_s *dev;
+ struct stm32_dev_s *priv;
uint8_t cr_channels = 0;
uint8_t cj_channels = 0;
#ifdef ADC_HAVE_INJECTED
- FAR uint8_t *j_chanlist = NULL;
+ uint8_t *j_chanlist = NULL;
#endif
switch (intf)
@@ -4686,7 +4686,7 @@ struct adc_dev_s *stm32_adcinitialize(int intf, FAR const uint8_t *chanlist,
# ifdef ADC_HAVE_INJECTED
if (cj_channels > 0)
{
- j_chanlist = (FAR uint8_t *)chanlist + cr_channels;
+ j_chanlist = (uint8_t *)chanlist + cr_channels;
}
# endif
break;
@@ -4703,7 +4703,7 @@ struct adc_dev_s *stm32_adcinitialize(int intf, FAR const uint8_t *chanlist,
# ifdef ADC_HAVE_INJECTED
if (cj_channels > 0)
{
- j_chanlist = (FAR uint8_t *)chanlist + cr_channels;
+ j_chanlist = (uint8_t *)chanlist + cr_channels;
}
# endif
break;
@@ -4720,7 +4720,7 @@ struct adc_dev_s *stm32_adcinitialize(int intf, FAR const uint8_t *chanlist,
# ifdef ADC_HAVE_INJECTED
if (cj_channels > 0)
{
- j_chanlist = (FAR uint8_t *)chanlist + cr_channels;
+ j_chanlist = (uint8_t *)chanlist + cr_channels;
}
# endif
break;
@@ -4737,7 +4737,7 @@ struct adc_dev_s *stm32_adcinitialize(int intf, FAR const uint8_t *chanlist,
# ifdef ADC_HAVE_INJECTED
if (cj_channels > 0)
{
- j_chanlist = (FAR uint8_t *)chanlist + cr_channels;
+ j_chanlist = (uint8_t *)chanlist + cr_channels;
}
# endif
break;
@@ -4753,7 +4753,7 @@ struct adc_dev_s *stm32_adcinitialize(int intf, FAR const uint8_t *chanlist,
/* Configure the selected ADC */
- priv = (FAR struct stm32_dev_s *)dev->ad_priv;
+ priv = (struct stm32_dev_s *)dev->ad_priv;
/* Configure regular channels */
diff --git a/arch/arm/src/stm32/stm32_adc.h b/arch/arm/src/stm32/stm32_adc.h
index b3fb56df41..8334ec1e29 100644
--- a/arch/arm/src/stm32/stm32_adc.h
+++ b/arch/arm/src/stm32/stm32_adc.h
@@ -2144,7 +2144,7 @@ struct stm32_adc_dev_s
{
/* Publicly visible portion of the "lower-half" ADC driver structure */
- FAR const struct stm32_adc_ops_s *llops;
+ const struct stm32_adc_ops_s *llops;
/* Require cast-compatibility with private "lower-half" ADC structure */
};
@@ -2155,80 +2155,80 @@ struct stm32_adc_ops_s
{
/* Low-level ADC setup */
- int (*setup)(FAR struct stm32_adc_dev_s *dev);
+ int (*setup)(struct stm32_adc_dev_s *dev);
/* Low-level ADC shutdown */
- void (*shutdown)(FAR struct stm32_adc_dev_s *dev);
+ void (*shutdown)(struct stm32_adc_dev_s *dev);
/* Acknowledge interrupts */
- void (*int_ack)(FAR struct stm32_adc_dev_s *dev, uint32_t source);
+ void (*int_ack)(struct stm32_adc_dev_s *dev, uint32_t source);
/* Get pending interrupts */
- uint32_t (*int_get)(FAR struct stm32_adc_dev_s *dev);
+ uint32_t (*int_get)(struct stm32_adc_dev_s *dev);
/* Enable interrupts */
- void (*int_en)(FAR struct stm32_adc_dev_s *dev, uint32_t source);
+ void (*int_en)(struct stm32_adc_dev_s *dev, uint32_t source);
/* Disable interrupts */
- void (*int_dis)(FAR struct stm32_adc_dev_s *dev, uint32_t source);
+ void (*int_dis)(struct stm32_adc_dev_s *dev, uint32_t source);
/* Get current ADC data register */
- uint32_t (*val_get)(FAR struct stm32_adc_dev_s *dev);
+ uint32_t (*val_get)(struct stm32_adc_dev_s *dev);
/* Register buffer for ADC DMA transfer */
- int (*regbuf_reg)(FAR struct stm32_adc_dev_s *dev,
+ int (*regbuf_reg)(struct stm32_adc_dev_s *dev,
uint16_t *buffer, uint8_t len);
/* Start/stop regular conversion */
- void (*reg_startconv)(FAR struct stm32_adc_dev_s *dev, bool state);
+ void (*reg_startconv)(struct stm32_adc_dev_s *dev, bool state);
/* Set offset for channel */
- int (*offset_set)(FAR struct stm32_adc_dev_s *dev, uint8_t ch, uint8_t i,
+ int (*offset_set)(struct stm32_adc_dev_s *dev, uint8_t ch, uint8_t i,
uint16_t offset);
#ifdef ADC_HAVE_EXTCFG
/* Configure the ADC external trigger for regular conversion */
- void (*extcfg_set)(FAR struct stm32_adc_dev_s *dev, uint32_t extcfg);
+ void (*extcfg_set)(struct stm32_adc_dev_s *dev, uint32_t extcfg);
#endif
#ifdef ADC_HAVE_JEXTCFG
/* Configure the ADC external trigger for injected conversion */
- void (*jextcfg_set)(FAR struct stm32_adc_dev_s *dev, uint32_t jextcfg);
+ void (*jextcfg_set)(struct stm32_adc_dev_s *dev, uint32_t jextcfg);
#endif
#ifdef ADC_HAVE_INJECTED
/* Get current ADC injected data register */
- uint32_t (*inj_get)(FAR struct stm32_adc_dev_s *dev, uint8_t chan);
+ uint32_t (*inj_get)(struct stm32_adc_dev_s *dev, uint8_t chan);
/* Start/stop injected conversion */
- void (*inj_startconv)(FAR struct stm32_adc_dev_s *dev, bool state);
+ void (*inj_startconv)(struct stm32_adc_dev_s *dev, bool state);
#endif
#ifdef CONFIG_STM32_ADC_CHANGE_SAMPLETIME
/* Set ADC sample time */
- void (*stime_set)(FAR struct stm32_adc_dev_s *dev,
- FAR struct adc_sample_time_s *time_samples);
+ void (*stime_set)(struct stm32_adc_dev_s *dev,
+ struct adc_sample_time_s *time_samples);
/* Write ADC sample time */
- void (*stime_write)(FAR struct stm32_adc_dev_s *dev);
+ void (*stime_write)(struct stm32_adc_dev_s *dev);
#endif
- void (*dump_regs)(FAR struct stm32_adc_dev_s *dev);
+ void (*dump_regs)(struct stm32_adc_dev_s *dev);
};
#endif /* CONFIG_STM32_ADC_LL_OPS */
@@ -2263,7 +2263,7 @@ extern "C"
****************************************************************************/
struct adc_dev_s;
-struct adc_dev_s *stm32_adcinitialize(int intf, FAR const uint8_t *chanlist,
+struct adc_dev_s *stm32_adcinitialize(int intf, const uint8_t *chanlist,
int channels);
#undef EXTERN
diff --git a/arch/arm/src/stm32/stm32_aes.c b/arch/arm/src/stm32/stm32_aes.c
index fca34a0216..851f213eaf 100644
--- a/arch/arm/src/stm32/stm32_aes.c
+++ b/arch/arm/src/stm32/stm32_aes.c
@@ -58,10 +58,10 @@
static void stm32aes_enable(bool on);
static void stm32aes_ccfc(void);
-static void stm32aes_setkey(FAR const void *key, size_t key_len);
-static void stm32aes_setiv(FAR const void *iv);
-static void stm32aes_encryptblock(FAR void *block_out,
- FAR const void *block_in);
+static void stm32aes_setkey(const void *key, size_t key_len);
+static void stm32aes_setiv(const void *iv);
+static void stm32aes_encryptblock(void *block_out,
+ const void *block_in);
static int stm32aes_setup_cr(int mode, int encrypt);
/****************************************************************************
@@ -109,9 +109,9 @@ static void stm32aes_ccfc(void)
/* TODO: Handle other AES key lengths or fail if length is not valid */
-static void stm32aes_setkey(FAR const void *key, size_t key_len)
+static void stm32aes_setkey(const void *key, size_t key_len)
{
- FAR uint32_t *in = (FAR uint32_t *)key;
+ uint32_t *in = (uint32_t *)key;
putreg32(__builtin_bswap32(*in), STM32_AES_KEYR3);
in++;
@@ -122,9 +122,9 @@ static void stm32aes_setkey(FAR const void *key, size_t key_len)
putreg32(__builtin_bswap32(*in), STM32_AES_KEYR0);
}
-static void stm32aes_setiv(FAR const void *iv)
+static void stm32aes_setiv(const void *iv)
{
- FAR uint32_t *in = (FAR uint32_t *)iv;
+ uint32_t *in = (uint32_t *)iv;
putreg32(__builtin_bswap32(*in), STM32_AES_IVR3);
in++;
@@ -135,11 +135,11 @@ static void stm32aes_setiv(FAR const void *iv)
putreg32(__builtin_bswap32(*in), STM32_AES_IVR0);
}
-static void stm32aes_encryptblock(FAR void *block_out,
- FAR const void *block_in)
+static void stm32aes_encryptblock(void *block_out,
+ const void *block_in)
{
- FAR uint32_t *in = (FAR uint32_t *)block_in;
- FAR uint32_t *out = (FAR uint32_t *)block_out;
+ uint32_t *in = (uint32_t *)block_in;
+ uint32_t *out = (uint32_t *)block_out;
putreg32(*in, STM32_AES_DINR);
in++;
@@ -257,8 +257,8 @@ int stm32_aesuninitialize(void)
return OK;
}
-int aes_cypher(FAR void *out, FAR const void *in, uint32_t size,
- FAR const void *iv, FAR const void *key, uint32_t keysize,
+int aes_cypher(void *out, const void *in, uint32_t size,
+ const void *iv, const void *key, uint32_t keysize,
int mode, int encrypt)
{
int ret = OK;
@@ -311,8 +311,8 @@ int aes_cypher(FAR void *out, FAR const void *in, uint32_t size,
while (size)
{
stm32aes_encryptblock(out, in);
- out = (FAR uint8_t *)out + AES_BLOCK_SIZE;
- in = (FAR uint8_t *)in + AES_BLOCK_SIZE;
+ out = (uint8_t *)out + AES_BLOCK_SIZE;
+ in = (uint8_t *)in + AES_BLOCK_SIZE;
size -= AES_BLOCK_SIZE;
}
diff --git a/arch/arm/src/stm32/stm32_alarm.h b/arch/arm/src/stm32/stm32_alarm.h
index ad7851b840..adc6a6f531 100644
--- a/arch/arm/src/stm32/stm32_alarm.h
+++ b/arch/arm/src/stm32/stm32_alarm.h
@@ -39,7 +39,7 @@
/* The form of an alarm callback */
-typedef CODE void (*alarmcb_t)(void);
+typedef void (*alarmcb_t)(void);
/****************************************************************************
* Public Function Prototypes
@@ -70,7 +70,7 @@ extern "C"
****************************************************************************/
struct timespec;
-int stm32_rtc_setalarm(FAR const struct timespec *tp, alarmcb_t callback);
+int stm32_rtc_setalarm(const struct timespec *tp, alarmcb_t callback);
/****************************************************************************
* Name: stm32_rtc_cancelalarm
diff --git a/arch/arm/src/stm32/stm32_allocateheap.c b/arch/arm/src/stm32/stm32_allocateheap.c
index 5d47437bb3..68b437a670 100644
--- a/arch/arm/src/stm32/stm32_allocateheap.c
+++ b/arch/arm/src/stm32/stm32_allocateheap.c
@@ -607,7 +607,7 @@
****************************************************************************/
#ifdef CONFIG_HEAP_COLORATION
-static inline void up_heap_color(FAR void *start, size_t size)
+static inline void up_heap_color(void *start, size_t size)
{
memset(start, HEAP_COLOR, size);
}
@@ -654,7 +654,7 @@ static inline void up_heap_color(FAR void *start, size_t size)
*
****************************************************************************/
-void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
+void up_allocate_heap(void **heap_start, size_t *heap_size)
{
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP)
/* Get the unaligned size and position of the user-space heap.
@@ -682,12 +682,12 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
/* Return the user-space heap settings */
board_autoled_on(LED_HEAPALLOCATE);
- *heap_start = (FAR void *)ubase;
+ *heap_start = (void *)ubase;
*heap_size = usize;
/* Colorize the heap for debug */
- up_heap_color((FAR void *)ubase, usize);
+ up_heap_color((void *)ubase, usize);
/* Allow user-mode access to the user heap memory */
@@ -697,7 +697,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
/* Return the heap settings */
board_autoled_on(LED_HEAPALLOCATE);
- *heap_start = (FAR void *)g_idle_topstack;
+ *heap_start = (void *)g_idle_topstack;
*heap_size = SRAM1_END - g_idle_topstack;
/* Colorize the heap for debug */
@@ -717,7 +717,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
****************************************************************************/
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP)
-void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
+void up_allocate_kheap(void **heap_start, size_t *heap_size)
{
/* Get the unaligned size and position of the user-space heap.
* This heap begins after the user-space .bss section at an offset
@@ -745,7 +745,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size)
* that was not dedicated to the user heap).
*/
- *heap_start = (FAR void *)USERSPACE->us_bssend;
+ *heap_start = (void *)USERSPACE->us_bssend;
*heap_size = ubase - (uintptr_t)USERSPACE->us_bssend;
}
#endif
@@ -773,11 +773,11 @@ void arm_addregion(void)
/* Colorize the heap for debug */
- up_heap_color((FAR void *)SRAM2_START, SRAM2_END - SRAM2_START);
+ up_heap_color((void *)SRAM2_START, SRAM2_END - SRAM2_START);
/* Add the STM32F20xxx/STM32F40xxx CCM SRAM user heap region. */
- kumm_addregion((FAR void *)SRAM2_START, SRAM2_END - SRAM2_START);
+ kumm_addregion((void *)SRAM2_START, SRAM2_END - SRAM2_START);
#endif
#ifdef CONFIG_STM32_EXTERNAL_RAM
@@ -791,11 +791,11 @@ void arm_addregion(void)
/* Colorize the heap for debug */
- up_heap_color((FAR void *)CONFIG_HEAP2_BASE, CONFIG_HEAP2_SIZE);
+ up_heap_color((void *)CONFIG_HEAP2_BASE, CONFIG_HEAP2_SIZE);
/* Add the external FSMC SRAM user heap region. */
- kumm_addregion((FAR void *)CONFIG_HEAP2_BASE, CONFIG_HEAP2_SIZE);
+ kumm_addregion((void *)CONFIG_HEAP2_BASE, CONFIG_HEAP2_SIZE);
#endif
}
#endif
diff --git a/arch/arm/src/stm32/stm32_bbsram.c b/arch/arm/src/stm32/stm32_bbsram.c
index 56cb71ee1b..95db0e55c8 100644
--- a/arch/arm/src/stm32/stm32_bbsram.c
+++ b/arch/arm/src/stm32/stm32_bbsram.c
@@ -86,40 +86,40 @@
struct bbsramfh_s
{
- uint32_t crc; /* CRC calculated over data and this struct
- * starting at fileno */
- uint8_t fileno; /* The minor number */
- uint8_t dirty; /* Data has been written to the file */
- uint16_t len; /* Total Bytes in this file */
- struct timespec lastwrite; /* Last write time */
- uint8_t data[]; /* Data in the file */
+ uint32_t crc; /* CRC calculated over data and this struct
+ * starting at fileno */
+ uint8_t fileno; /* The minor number */
+ uint8_t dirty; /* Data has been written to the file */
+ uint16_t len; /* Total Bytes in this file */
+ struct timespec lastwrite; /* Last write time */
+ uint8_t data[]; /* Data in the file */
};
struct stm32_bbsram_s
{
- sem_t exclsem; /* For atomic accesses to this structure */
- uint8_t refs; /* Number of references */
- FAR struct bbsramfh_s *bbf; /* File in bbram */
+ sem_t exclsem; /* For atomic accesses to this structure */
+ uint8_t refs; /* Number of references */
+ struct bbsramfh_s *bbf; /* File in bbram */
};
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
-static int stm32_bbsram_open(FAR struct file *filep);
-static int stm32_bbsram_close(FAR struct file *filep);
-static off_t stm32_bbsram_seek(FAR struct file *filep, off_t offset,
+static int stm32_bbsram_open(struct file *filep);
+static int stm32_bbsram_close(struct file *filep);
+static off_t stm32_bbsram_seek(struct file *filep, off_t offset,
int whence);
-static ssize_t stm32_bbsram_read(FAR struct file *filep, FAR char *buffer,
+static ssize_t stm32_bbsram_read(struct file *filep, char *buffer,
size_t len);
-static ssize_t stm32_bbsram_write(FAR struct file *filep,
- FAR const char *buffer, size_t len);
-static int stm32_bbsram_ioctl(FAR struct file *filep, int cmd,
+static ssize_t stm32_bbsram_write(struct file *filep,
+ const char *buffer, size_t len);
+static int stm32_bbsram_ioctl(struct file *filep, int cmd,
unsigned long arg);
-static int stm32_bbsram_poll(FAR struct file *filep,
- FAR struct pollfd *fds, bool setup);
+static int stm32_bbsram_poll(struct file *filep,
+ struct pollfd *fds, bool setup);
#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-static int stm32_bbsram_unlink(FAR struct inode *inode);
+static int stm32_bbsram_unlink(struct inode *inode);
#endif
/****************************************************************************
@@ -166,7 +166,7 @@ static void stm32_bbsram_rd(void)
****************************************************************************/
#if defined(CONFIG_BBSRAM_DEBUG)
-static void stm32_bbsram_dump(FAR struct bbsramfh_s *bbf, char *op)
+static void stm32_bbsram_dump(struct bbsramfh_s *bbf, char *op)
{
BBSRAM_DEBUG_READ();
_info("%s:\n", op);
@@ -185,7 +185,7 @@ static void stm32_bbsram_dump(FAR struct bbsramfh_s *bbf, char *op)
* Name: stm32_bbsram_semgive
****************************************************************************/
-static void stm32_bbsram_semgive(FAR struct stm32_bbsram_s *priv)
+static void stm32_bbsram_semgive(struct stm32_bbsram_s *priv)
{
nxsem_post(&priv->exclsem);
}
@@ -204,7 +204,7 @@ static void stm32_bbsram_semgive(FAR struct stm32_bbsram_s *priv)
*
****************************************************************************/
-static int stm32_bbsram_semtake(FAR struct stm32_bbsram_s *priv)
+static int stm32_bbsram_semtake(struct stm32_bbsram_s *priv)
{
return nxsem_wait_uninterruptible(&priv->exclsem);
}
@@ -263,7 +263,7 @@ static inline void stm32_bbsram_lock(void)
*
****************************************************************************/
-static uint32_t stm32_bbsram_crc(FAR struct bbsramfh_s *pf)
+static uint32_t stm32_bbsram_crc(struct bbsramfh_s *pf)
{
return crc32((uint8_t *)pf + BBSRAM_CRCED_OFFSET,
BBSRAM_CRCED_SIZE(pf->len));
@@ -276,14 +276,14 @@ static uint32_t stm32_bbsram_crc(FAR struct bbsramfh_s *pf)
*
****************************************************************************/
-static int stm32_bbsram_open(FAR struct file *filep)
+static int stm32_bbsram_open(struct file *filep)
{
- FAR struct inode *inode = filep->f_inode;
- FAR struct stm32_bbsram_s *bbr;
+ struct inode *inode = filep->f_inode;
+ struct stm32_bbsram_s *bbr;
int ret;
DEBUGASSERT(inode && inode->i_private);
- bbr = (FAR struct stm32_bbsram_s *)inode->i_private;
+ bbr = (struct stm32_bbsram_s *)inode->i_private;
/* Increment the reference count */
@@ -314,7 +314,7 @@ static int stm32_bbsram_open(FAR struct file *filep)
*
****************************************************************************/
-static int stm32_bbsram_internal_close(FAR struct bbsramfh_s *bbf)
+static int stm32_bbsram_internal_close(struct bbsramfh_s *bbf)
{
bbf->dirty = 0;
clock_gettime(CLOCK_REALTIME, &bbf->lastwrite);
@@ -331,14 +331,14 @@ static int stm32_bbsram_internal_close(FAR struct bbsramfh_s *bbf)
*
****************************************************************************/
-static int stm32_bbsram_close(FAR struct file *filep)
+static int stm32_bbsram_close(struct file *filep)
{
- FAR struct inode *inode = filep->f_inode;
- FAR struct stm32_bbsram_s *bbr;
+ struct inode *inode = filep->f_inode;
+ struct stm32_bbsram_s *bbr;
int ret = OK;
DEBUGASSERT(inode && inode->i_private);
- bbr = (FAR struct stm32_bbsram_s *)inode->i_private;
+ bbr = (struct stm32_bbsram_s *)inode->i_private;
ret = stm32_bbsram_semtake(bbr);
if (ret < 0)
@@ -377,16 +377,16 @@ static int stm32_bbsram_close(FAR struct file *filep)
* Name: stm32_bbsram_seek
****************************************************************************/
-static off_t stm32_bbsram_seek(FAR struct file *filep, off_t offset,
+static off_t stm32_bbsram_seek(struct file *filep, off_t offset,
int whence)
{
- FAR struct inode *inode = filep->f_inode;
- FAR struct stm32_bbsram_s *bbr;
+ struct inode *inode = filep->f_inode;
+ struct stm32_bbsram_s *bbr;
off_t newpos;
int ret;
DEBUGASSERT(inode && inode->i_private);
- bbr = (FAR struct stm32_bbsram_s *)inode->i_private;
+ bbr = (struct stm32_bbsram_s *)inode->i_private;
ret = stm32_bbsram_semtake(bbr);
if (ret < 0)
@@ -448,15 +448,15 @@ static off_t stm32_bbsram_seek(FAR struct file *filep, off_t offset,
* Name: stm32_bbsram_read
****************************************************************************/
-static ssize_t stm32_bbsram_read(FAR struct file *filep, FAR char *buffer,
+static ssize_t stm32_bbsram_read(struct file *filep, char *buffer,
size_t len)
{
- FAR struct inode *inode = filep->f_inode;
- FAR struct stm32_bbsram_s *bbr;
+ struct inode *inode = filep->f_inode;
+ struct stm32_bbsram_s *bbr;
int ret;
DEBUGASSERT(inode && inode->i_private);
- bbr = (FAR struct stm32_bbsram_s *)inode->i_private;
+ bbr = (struct stm32_bbsram_s *)inode->i_private;
ret = stm32_bbsram_semtake(bbr);
if (ret < 0)
@@ -481,8 +481,8 @@ static ssize_t stm32_bbsram_read(FAR struct file *filep, FAR char *buffer,
* Name: stm32_bbsram_internal_write
****************************************************************************/
-static ssize_t stm32_bbsram_internal_write(FAR struct bbsramfh_s *bbf,
- FAR const char *buffer,
+static ssize_t stm32_bbsram_internal_write(struct bbsramfh_s *bbf,
+ const char *buffer,
off_t offset, size_t len)
{
bbf->dirty = 1;
@@ -494,15 +494,15 @@ static ssize_t stm32_bbsram_internal_write(FAR struct bbsramfh_s *bbf,
* Name: stm32_bbsram_write
****************************************************************************/
-static ssize_t stm32_bbsram_write(FAR struct file *filep,
- FAR const char *buffer, size_t len)
+static ssize_t stm32_bbsram_write(struct file *filep,
+ const char *buffer, size_t len)
{
- FAR struct inode *inode = filep->f_inode;
- FAR struct stm32_bbsram_s *bbr;
+ struct inode *inode = filep->f_inode;
+ struct stm32_bbsram_s *bbr;
int ret = -EFBIG;
DEBUGASSERT(inode && inode->i_private);
- bbr = (FAR struct stm32_bbsram_s *)inode->i_private;
+ bbr = (struct stm32_bbsram_s *)inode->i_private;
/* Forbid writes past the end of the device */
@@ -540,7 +540,7 @@ static ssize_t stm32_bbsram_write(FAR struct file *filep,
* Name: stm32_bbsram_poll
****************************************************************************/
-static int stm32_bbsram_poll(FAR struct file *filep, FAR struct pollfd *fds,
+static int stm32_bbsram_poll(struct file *filep, struct pollfd *fds,
bool setup)
{
if (setup)
@@ -562,19 +562,19 @@ static int stm32_bbsram_poll(FAR struct file *filep, FAR struct pollfd *fds,
*
****************************************************************************/
-static int stm32_bbsram_ioctl(FAR struct file *filep, int cmd,
+static int stm32_bbsram_ioctl(struct file *filep, int cmd,
unsigned long arg)
{
- FAR struct inode *inode = filep->f_inode;
- FAR struct stm32_bbsram_s *bbr;
+ struct inode *inode = filep->f_inode;
+ struct stm32_bbsram_s *bbr;
int ret = -ENOTTY;
DEBUGASSERT(inode && inode->i_private);
- bbr = (FAR struct stm32_bbsram_s *)inode->i_private;
+ bbr = (struct stm32_bbsram_s *)inode->i_private;
if (cmd == STM32_BBSRAM_GETDESC_IOCTL)
{
- FAR struct bbsramd_s *bbrr = (FAR struct bbsramd_s *)((uintptr_t)arg);
+ struct bbsramd_s *bbrr = (struct bbsramd_s *)((uintptr_t)arg);
ret = stm32_bbsram_semtake(bbr);
if (ret < 0)
@@ -617,13 +617,13 @@ static int stm32_bbsram_ioctl(FAR struct file *filep, int cmd,
****************************************************************************/
#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-static int stm32_bbsram_unlink(FAR struct inode *inode)
+static int stm32_bbsram_unlink(struct inode *inode)
{
- FAR struct stm32_bbsram_s *bbr;
+ struct stm32_bbsram_s *bbr;
int ret;
DEBUGASSERT(inode && inode->i_private);
- bbr = (FAR struct stm32_bbsram_s *)inode->i_private;
+ bbr = (struct stm32_bbsram_s *)inode->i_private;
ret = stm32_bbsram_semtake(bbr);
if (ret < 0)
@@ -818,7 +818,7 @@ int stm32_bbsraminitialize(char *devpath, int *sizes)
#if defined(CONFIG_STM32_SAVE_CRASHDUMP)
int stm32_bbsram_savepanic(int fileno, uint8_t *context, int length)
{
- FAR struct bbsramfh_s *bbf;
+ struct bbsramfh_s *bbf;
int fill;
int ret = -ENOSPC;
diff --git a/arch/arm/src/stm32/stm32_can.c b/arch/arm/src/stm32/stm32_can.c
index 6f6cf776f1..9e9d8e08fb 100644
--- a/arch/arm/src/stm32/stm32_can.c
+++ b/arch/arm/src/stm32/stm32_can.c
@@ -97,21 +97,21 @@ struct stm32_can_s
/* CAN Register access */
-static uint32_t stm32can_getreg(FAR struct stm32_can_s *priv,
+static uint32_t stm32can_getreg(struct stm32_can_s *priv,
int offset);
-static uint32_t stm32can_getfreg(FAR struct stm32_can_s *priv,
+static uint32_t stm32can_getfreg(struct stm32_can_s *priv,
int offset);
-static void stm32can_putreg(FAR struct stm32_can_s *priv, int offset,
+static void stm32can_putreg(struct stm32_can_s *priv, int offset,
uint32_t value);
-static void stm32can_putfreg(FAR struct stm32_can_s *priv, int offset,
+static void stm32can_putfreg(struct stm32_can_s *priv, int offset,
uint32_t value);
#ifdef CONFIG_STM32_CAN_REGDEBUG
-static void stm32can_dumpctrlregs(FAR struct stm32_can_s *priv,
- FAR const char *msg);
-static void stm32can_dumpmbregs(FAR struct stm32_can_s *priv,
- FAR const char *msg);
-static void stm32can_dumpfiltregs(FAR struct stm32_can_s *priv,
- FAR const char *msg);
+static void stm32can_dumpctrlregs(struct stm32_can_s *priv,
+ const char *msg);
+static void stm32can_dumpmbregs(struct stm32_can_s *priv,
+ const char *msg);
+static void stm32can_dumpfiltregs(struct stm32_can_s *priv,
+ const char *msg);
#else
# define stm32can_dumpctrlregs(priv,msg)
# define stm32can_dumpmbregs(priv,msg)
@@ -121,53 +121,53 @@ static void stm32can_dumpfiltregs(FAR struct stm32_can_s *priv,
/* Filtering (todo) */
#ifdef CONFIG_CAN_EXTID
-static int stm32can_addextfilter(FAR struct stm32_can_s *priv,
- FAR struct canioc_extfilter_s *arg);
-static int stm32can_delextfilter(FAR struct stm32_can_s *priv,
+static int stm32can_addextfilter(struct stm32_can_s *priv,
+ struct canioc_extfilter_s *arg);
+static int stm32can_delextfilter(struct stm32_can_s *priv,
int arg);
#endif
-static int stm32can_addstdfilter(FAR struct stm32_can_s *priv,
- FAR struct canioc_stdfilter_s *arg);
-static int stm32can_delstdfilter(FAR struct stm32_can_s *priv,
+static int stm32can_addstdfilter(struct stm32_can_s *priv,
+ struct canioc_stdfilter_s *arg);
+static int stm32can_delstdfilter(struct stm32_can_s *priv,
int arg);
/* CAN driver methods */
-static void stm32can_reset(FAR struct can_dev_s *dev);
-static int stm32can_setup(FAR struct can_dev_s *dev);
-static void stm32can_shutdown(FAR struct can_dev_s *dev);
-static void stm32can_rxint(FAR struct can_dev_s *dev, bool enable);
-static void stm32can_txint(FAR struct can_dev_s *dev, bool enable);
-static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
+static void stm32can_reset(struct can_dev_s *dev);
+static int stm32can_setup(struct can_dev_s *dev);
+static void stm32can_shutdown(struct can_dev_s *dev);
+static void stm32can_rxint(struct can_dev_s *dev, bool enable);
+static void stm32can_txint(struct can_dev_s *dev, bool enable);
+static int stm32can_ioctl(struct can_dev_s *dev, int cmd,
unsigned long arg);
-static int stm32can_remoterequest(FAR struct can_dev_s *dev,
+static int stm32can_remoterequest(struct can_dev_s *dev,
uint16_t id);
-static int stm32can_send(FAR struct can_dev_s *dev,
- FAR struct can_msg_s *msg);
-static bool stm32can_txready(FAR struct can_dev_s *dev);
-static bool stm32can_txempty(FAR struct can_dev_s *dev);
+static int stm32can_send(struct can_dev_s *dev,
+ struct can_msg_s *msg);
+static bool stm32can_txready(struct can_dev_s *dev);
+static bool stm32can_txempty(struct can_dev_s *dev);
#ifdef CONFIG_CAN_ERRORS
-static void stm32can_errint(FAR struct can_dev_s *dev, bool enable);
+static void stm32can_errint(struct can_dev_s *dev, bool enable);
#endif
/* CAN interrupt handling */
-static int stm32can_rxinterrupt(FAR struct can_dev_s *dev, int rxmb);
-static int stm32can_rx0interrupt(int irq, FAR void *context, FAR void *arg);
-static int stm32can_rx1interrupt(int irq, FAR void *context, FAR void *arg);
-static int stm32can_txinterrupt(int irq, FAR void *context, FAR void *arg);
+static int stm32can_rxinterrupt(struct can_dev_s *dev, int rxmb);
+static int stm32can_rx0interrupt(int irq, void *context, void *arg);
+static int stm32can_rx1interrupt(int irq, void *context, void *arg);
+static int stm32can_txinterrupt(int irq, void *context, void *arg);
#ifdef CONFIG_CAN_ERRORS
-static int stm32can_sceinterrupt(int irq, FAR void *context, FAR void *arg);
+static int stm32can_sceinterrupt(int irq, void *context, void *arg);
#endif
/* Initialization */
-static int stm32can_enterinitmode(FAR struct stm32_can_s *priv);
-static int stm32can_exitinitmode(FAR struct stm32_can_s *priv);
-static int stm32can_bittiming(FAR struct stm32_can_s *priv);
-static int stm32can_cellinit(FAR struct stm32_can_s *priv);
-static int stm32can_filterinit(FAR struct stm32_can_s *priv);
+static int stm32can_enterinitmode(struct stm32_can_s *priv);
+static int stm32can_exitinitmode(struct stm32_can_s *priv);
+static int stm32can_bittiming(struct stm32_can_s *priv);
+static int stm32can_cellinit(struct stm32_can_s *priv);
+static int stm32can_filterinit(struct stm32_can_s *priv);
/* TX mailbox status */
@@ -318,23 +318,23 @@ static uint32_t stm32can_vgetreg(uint32_t addr)
return val;
}
-static uint32_t stm32can_getreg(FAR struct stm32_can_s *priv, int offset)
+static uint32_t stm32can_getreg(struct stm32_can_s *priv, int offset)
{
return stm32can_vgetreg(priv->base + offset);
}
-static uint32_t stm32can_getfreg(FAR struct stm32_can_s *priv, int offset)
+static uint32_t stm32can_getfreg(struct stm32_can_s *priv, int offset)
{
return stm32can_vgetreg(priv->fbase + offset);
}
#else
-static uint32_t stm32can_getreg(FAR struct stm32_can_s *priv, int offset)
+static uint32_t stm32can_getreg(struct stm32_can_s *priv, int offset)
{
return getreg32(priv->base + offset);
}
-static uint32_t stm32can_getfreg(FAR struct stm32_can_s *priv, int offset)
+static uint32_t stm32can_getfreg(struct stm32_can_s *priv, int offset)
{
return getreg32(priv->fbase + offset);
}
@@ -370,26 +370,26 @@ static void stm32can_vputreg(uint32_t addr, uint32_t value)
putreg32(value, addr);
}
-static void stm32can_putreg(FAR struct stm32_can_s *priv, int offset,
+static void stm32can_putreg(struct stm32_can_s *priv, int offset,
uint32_t value)
{
stm32can_vputreg(priv->base + offset, value);
}
-static void stm32can_putfreg(FAR struct stm32_can_s *priv, int offset,
+static void stm32can_putfreg(struct stm32_can_s *priv, int offset,
uint32_t value)
{
stm32can_vputreg(priv->fbase + offset, value);
}
#else
-static void stm32can_putreg(FAR struct stm32_can_s *priv, int offset,
+static void stm32can_putreg(struct stm32_can_s *priv, int offset,
uint32_t value)
{
putreg32(value, priv->base + offset);
}
-static void stm32can_putfreg(FAR struct stm32_can_s *priv, int offset,
+static void stm32can_putfreg(struct stm32_can_s *priv, int offset,
uint32_t value)
{
putreg32(value, priv->fbase + offset);
@@ -411,8 +411,8 @@ static void stm32can_putfreg(FAR struct stm32_can_s *priv, int offset,
****************************************************************************/
#ifdef CONFIG_STM32_CAN_REGDEBUG
-static void stm32can_dumpctrlregs(FAR struct stm32_can_s *priv,
- FAR const char *msg)
+static void stm32can_dumpctrlregs(struct stm32_can_s *priv,
+ const char *msg)
{
if (msg)
{
@@ -456,8 +456,8 @@ static void stm32can_dumpctrlregs(FAR struct stm32_can_s *priv,
****************************************************************************/
#ifdef CONFIG_STM32_CAN_REGDEBUG
-static void stm32can_dumpmbregs(FAR struct stm32_can_s *priv,
- FAR const char *msg)
+static void stm32can_dumpmbregs(struct stm32_can_s *priv,
+ const char *msg)
{
if (msg)
{
@@ -522,8 +522,8 @@ static void stm32can_dumpmbregs(FAR struct stm32_can_s *priv,
****************************************************************************/
#ifdef CONFIG_STM32_CAN_REGDEBUG
-static void stm32can_dumpfiltregs(FAR struct stm32_can_s *priv,
- FAR const char *msg)
+static void stm32can_dumpfiltregs(struct stm32_can_s *priv,
+ const char *msg)
{
int i;
@@ -568,9 +568,9 @@ static void stm32can_dumpfiltregs(FAR struct stm32_can_s *priv,
*
****************************************************************************/
-static void stm32can_reset(FAR struct can_dev_s *dev)
+static void stm32can_reset(struct can_dev_s *dev)
{
- FAR struct stm32_can_s *priv = dev->cd_priv;
+ struct stm32_can_s *priv = dev->cd_priv;
uint32_t regval;
uint32_t regbit = 0;
irqstate_t flags;
@@ -632,9 +632,9 @@ static void stm32can_reset(FAR struct can_dev_s *dev)
*
****************************************************************************/
-static int stm32can_setup(FAR struct can_dev_s *dev)
+static int stm32can_setup(struct can_dev_s *dev)
{
- FAR struct stm32_can_s *priv = dev->cd_priv;
+ struct stm32_can_s *priv = dev->cd_priv;
int ret;
#ifdef CONFIG_CAN_ERRORS
@@ -744,9 +744,9 @@ static int stm32can_setup(FAR struct can_dev_s *dev)
*
****************************************************************************/
-static void stm32can_shutdown(FAR struct can_dev_s *dev)
+static void stm32can_shutdown(struct can_dev_s *dev)
{
- FAR struct stm32_can_s *priv = dev->cd_priv;
+ struct stm32_can_s *priv = dev->cd_priv;
caninfo("CAN%" PRIu8 "\n", priv->port);
@@ -787,9 +787,9 @@ static void stm32can_shutdown(FAR struct can_dev_s *dev)
*
****************************************************************************/
-static void stm32can_rxint(FAR struct can_dev_s *dev, bool enable)
+static void stm32can_rxint(struct can_dev_s *dev, bool enable)
{
- FAR struct stm32_can_s *priv = dev->cd_priv;
+ struct stm32_can_s *priv = dev->cd_priv;
uint32_t regval;
caninfo("CAN%" PRIu8 " rxint enable: %d\n", priv->port, enable);
@@ -823,9 +823,9 @@ static void stm32can_rxint(FAR struct can_dev_s *dev, bool enable)
*
****************************************************************************/
-static void stm32can_txint(FAR struct can_dev_s *dev, bool enable)
+static void stm32can_txint(struct can_dev_s *dev, bool enable)
{
- FAR struct stm32_can_s *priv = dev->cd_priv;
+ struct stm32_can_s *priv = dev->cd_priv;
uint32_t regval;
caninfo("CAN%" PRIu8 " txint enable: %d\n", priv->port, enable);
@@ -855,9 +855,9 @@ static void stm32can_txint(FAR struct can_dev_s *dev, bool enable)
*
****************************************************************************/
-static void stm32can_errint(FAR struct can_dev_s *dev, bool enable)
+static void stm32can_errint(struct can_dev_s *dev, bool enable)
{
- FAR struct stm32_can_s *priv = dev->cd_priv;
+ struct stm32_can_s *priv = dev->cd_priv;
uint32_t regval = 0;
caninfo("CAN%" PRIu8 " errint enable: %d\n", priv->port, enable);
@@ -892,10 +892,10 @@ static void stm32can_errint(FAR struct can_dev_s *dev, bool enable)
*
****************************************************************************/
-static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
+static int stm32can_ioctl(struct can_dev_s *dev, int cmd,
unsigned long arg)
{
- FAR struct stm32_can_s *priv;
+ struct stm32_can_s *priv;
int ret = -ENOTTY;
caninfo("cmd=%04x arg=%lu\n", cmd, arg);
@@ -920,8 +920,8 @@ static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
case CANIOC_GET_BITTIMING:
{
- FAR struct canioc_bittiming_s *bt =
- (FAR struct canioc_bittiming_s *)arg;
+ struct canioc_bittiming_s *bt =
+ (struct canioc_bittiming_s *)arg;
uint32_t regval;
uint32_t brp;
@@ -961,8 +961,8 @@ static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
case CANIOC_SET_BITTIMING:
{
- FAR const struct canioc_bittiming_s *bt =
- (FAR const struct canioc_bittiming_s *)arg;
+ const struct canioc_bittiming_s *bt =
+ (const struct canioc_bittiming_s *)arg;
uint32_t brp;
uint32_t can_bit_quanta;
uint32_t tmp;
@@ -1049,8 +1049,8 @@ static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
case CANIOC_GET_CONNMODES:
{
- FAR struct canioc_connmodes_s *bm =
- (FAR struct canioc_connmodes_s *)arg;
+ struct canioc_connmodes_s *bm =
+ (struct canioc_connmodes_s *)arg;
uint32_t regval;
DEBUGASSERT(bm != NULL);
@@ -1076,8 +1076,8 @@ static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
case CANIOC_SET_CONNMODES:
{
- FAR struct canioc_connmodes_s *bm =
- (FAR struct canioc_connmodes_s *)arg;
+ struct canioc_connmodes_s *bm =
+ (struct canioc_connmodes_s *)arg;
uint32_t regval;
DEBUGASSERT(bm != NULL);
@@ -1130,7 +1130,7 @@ static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
{
DEBUGASSERT(arg != 0);
ret = stm32can_addextfilter(priv,
- (FAR struct canioc_extfilter_s *)arg);
+ (struct canioc_extfilter_s *)arg);
}
break;
@@ -1167,7 +1167,7 @@ static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
{
DEBUGASSERT(arg != 0);
ret = stm32can_addstdfilter(priv,
- (FAR struct canioc_stdfilter_s *)arg);
+ (struct canioc_stdfilter_s *)arg);
}
break;
@@ -1264,7 +1264,7 @@ static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
*
****************************************************************************/
-static int stm32can_remoterequest(FAR struct can_dev_s *dev, uint16_t id)
+static int stm32can_remoterequest(struct can_dev_s *dev, uint16_t id)
{
#warning "Remote request not implemented"
return -ENOSYS;
@@ -1293,11 +1293,11 @@ static int stm32can_remoterequest(FAR struct can_dev_s *dev, uint16_t id)
*
****************************************************************************/
-static int stm32can_send(FAR struct can_dev_s *dev,
- FAR struct can_msg_s *msg)
+static int stm32can_send(struct can_dev_s *dev,
+ struct can_msg_s *msg)
{
- FAR struct stm32_can_s *priv = dev->cd_priv;
- FAR uint8_t *ptr;
+ struct stm32_can_s *priv = dev->cd_priv;
+ uint8_t *ptr;
uint32_t regval;
uint32_t tmp;
int dlc;
@@ -1457,9 +1457,9 @@ static int stm32can_send(FAR struct can_dev_s *dev,
*
****************************************************************************/
-static bool stm32can_txready(FAR struct can_dev_s *dev)
+static bool stm32can_txready(struct can_dev_s *dev)
{
- FAR struct stm32_can_s *priv = dev->cd_priv;
+ struct stm32_can_s *priv = dev->cd_priv;
uint32_t regval;
/* Return true if any mailbox is available */
@@ -1489,9 +1489,9 @@ static bool stm32can_txready(FAR struct can_dev_s *dev)
*
****************************************************************************/
-static bool stm32can_txempty(FAR struct can_dev_s *dev)
+static bool stm32can_txempty(struct can_dev_s *dev)
{
- FAR struct stm32_can_s *priv = dev->cd_priv;
+ struct stm32_can_s *priv = dev->cd_priv;
uint32_t regval;
/* Return true if all mailboxes are available */
@@ -1519,9 +1519,9 @@ static bool stm32can_txempty(FAR struct can_dev_s *dev)
*
****************************************************************************/
-static int stm32can_rxinterrupt(FAR struct can_dev_s *dev, int rxmb)
+static int stm32can_rxinterrupt(struct can_dev_s *dev, int rxmb)
{
- FAR struct stm32_can_s *priv;
+ struct stm32_can_s *priv;
struct can_hdr_s hdr;
uint8_t data[CAN_MAXDATALEN];
uint32_t regval;
@@ -1636,9 +1636,9 @@ errout:
*
****************************************************************************/
-static int stm32can_rx0interrupt(int irq, FAR void *context, FAR void *arg)
+static int stm32can_rx0interrupt(int irq, void *context, void *arg)
{
- FAR struct can_dev_s *dev = (FAR struct can_dev_s *)arg;
+ struct can_dev_s *dev = (struct can_dev_s *)arg;
return stm32can_rxinterrupt(dev, 0);
}
@@ -1657,9 +1657,9 @@ static int stm32can_rx0interrupt(int irq, FAR void *context, FAR void *arg)
*
****************************************************************************/
-static int stm32can_rx1interrupt(int irq, FAR void *context, FAR void *arg)
+static int stm32can_rx1interrupt(int irq, void *context, void *arg)
{
- FAR struct can_dev_s *dev = (FAR struct can_dev_s *)arg;
+ struct can_dev_s *dev = (struct can_dev_s *)arg;
return stm32can_rxinterrupt(dev, 1);
}
@@ -1678,10 +1678,10 @@ static int stm32can_rx1interrupt(int irq, FAR void *context, FAR void *arg)
*
****************************************************************************/
-static int stm32can_txinterrupt(int irq, FAR void *context, FAR void *arg)
+static int stm32can_txinterrupt(int irq, void *context, void *arg)
{
- FAR struct can_dev_s *dev = (FAR struct can_dev_s *)arg;
- FAR struct stm32_can_s *priv;
+ struct can_dev_s *dev = (struct can_dev_s *)arg;
+ struct stm32_can_s *priv;
uint32_t regval;
DEBUGASSERT(dev != NULL && dev->cd_priv != NULL);
@@ -1755,15 +1755,15 @@ static int stm32can_txinterrupt(int irq, FAR void *context, FAR void *arg)
*
****************************************************************************/
-static int stm32can_sceinterrupt(int irq, FAR void *context, FAR void *arg)
+static int stm32can_sceinterrupt(int irq, void *context, void *arg)
{
- FAR struct can_dev_s *dev = (FAR struct can_dev_s *)arg;
- FAR struct stm32_can_s *priv = NULL;
- struct can_hdr_s hdr;
- uint32_t regval = 0;
- uint16_t errbits = 0;
- uint8_t data[CAN_ERROR_DLC];
- int ret = OK;
+ struct can_dev_s *dev = (struct can_dev_s *)arg;
+ struct stm32_can_s *priv = NULL;
+ struct can_hdr_s hdr;
+ uint32_t regval = 0;
+ uint16_t errbits = 0;
+ uint8_t data[CAN_ERROR_DLC];
+ int ret = OK;
DEBUGASSERT(dev != NULL && dev->cd_priv != NULL);
priv = dev->cd_priv;
@@ -1962,7 +1962,7 @@ static int stm32can_sceinterrupt(int irq, FAR void *context, FAR void *arg)
*
****************************************************************************/
-static int stm32can_bittiming(FAR struct stm32_can_s *priv)
+static int stm32can_bittiming(struct stm32_can_s *priv)
{
uint32_t tmp;
uint32_t brp;
@@ -2063,7 +2063,7 @@ static int stm32can_bittiming(FAR struct stm32_can_s *priv)
*
****************************************************************************/
-static int stm32can_enterinitmode(FAR struct stm32_can_s *priv)
+static int stm32can_enterinitmode(struct stm32_can_s *priv)
{
uint32_t regval;
volatile uint32_t timeout;
@@ -2114,7 +2114,7 @@ static int stm32can_enterinitmode(FAR struct stm32_can_s *priv)
*
****************************************************************************/
-static int stm32can_exitinitmode(FAR struct stm32_can_s *priv)
+static int stm32can_exitinitmode(struct stm32_can_s *priv)
{
uint32_t regval;
volatile uint32_t timeout;
@@ -2164,7 +2164,7 @@ static int stm32can_exitinitmode(FAR struct stm32_can_s *priv)
*
****************************************************************************/
-static int stm32can_cellinit(FAR struct stm32_can_s *priv)
+static int stm32can_cellinit(struct stm32_can_s *priv)
{
uint32_t regval;
int ret;
@@ -2247,7 +2247,7 @@ static int stm32can_cellinit(FAR struct stm32_can_s *priv)
*
****************************************************************************/
-static int stm32can_filterinit(FAR struct stm32_can_s *priv)
+static int stm32can_filterinit(struct stm32_can_s *priv)
{
uint32_t regval;
uint32_t bitmask;
@@ -2338,8 +2338,8 @@ static int stm32can_filterinit(FAR struct stm32_can_s *priv)
****************************************************************************/
#ifdef CONFIG_CAN_EXTID
-static int stm32can_addextfilter(FAR struct stm32_can_s *priv,
- FAR struct canioc_extfilter_s *arg)
+static int stm32can_addextfilter(struct stm32_can_s *priv,
+ struct canioc_extfilter_s *arg)
{
return -ENOTTY;
}
@@ -2364,7 +2364,7 @@ static int stm32can_addextfilter(FAR struct stm32_can_s *priv,
****************************************************************************/
#ifdef CONFIG_CAN_EXTID
-static int stm32can_delextfilter(FAR struct stm32_can_s *priv, int arg)
+static int stm32can_delextfilter(struct stm32_can_s *priv, int arg)
{
return -ENOTTY;
}
@@ -2387,8 +2387,8 @@ static int stm32can_delextfilter(FAR struct stm32_can_s *priv, int arg)
*
****************************************************************************/
-static int stm32can_addstdfilter(FAR struct stm32_can_s *priv,
- FAR struct canioc_stdfilter_s *arg)
+static int stm32can_addstdfilter(struct stm32_can_s *priv,
+ struct canioc_stdfilter_s *arg)
{
return -ENOTTY;
}
@@ -2411,7 +2411,7 @@ static int stm32can_addstdfilter(FAR struct stm32_can_s *priv,
*
****************************************************************************/
-static int stm32can_delstdfilter(FAR struct stm32_can_s *priv, int arg)
+static int stm32can_delstdfilter(struct stm32_can_s *priv, int arg)
{
return -ENOTTY;
}
@@ -2485,9 +2485,9 @@ static bool stm32can_txmb2empty(uint32_t tsr_regval)
*
****************************************************************************/
-FAR struct can_dev_s *stm32_caninitialize(int port)
+struct can_dev_s *stm32_caninitialize(int port)
{
- FAR struct can_dev_s *dev = NULL;
+ struct can_dev_s *dev = NULL;
caninfo("CAN%" PRIu8 "\n", port);
diff --git a/arch/arm/src/stm32/stm32_can.h b/arch/arm/src/stm32/stm32_can.h
index 37ef72daf2..3127771431 100644
--- a/arch/arm/src/stm32/stm32_can.h
+++ b/arch/arm/src/stm32/stm32_can.h
@@ -121,7 +121,7 @@ extern "C"
****************************************************************************/
struct can_dev_s;
-FAR struct can_dev_s *stm32_caninitialize(int port);
+struct can_dev_s *stm32_caninitialize(int port);
#endif
#ifdef CONFIG_STM32_CAN_SOCKET
diff --git a/arch/arm/src/stm32/stm32_can_sock.c b/arch/arm/src/stm32/stm32_can_sock.c
index 10568461a4..ede1261f26 100644
--- a/arch/arm/src/stm32/stm32_can_sock.c
+++ b/arch/arm/src/stm32/stm32_can_sock.c
@@ -121,8 +121,8 @@ struct stm32_can_s
/* A pointers to the list of TX/RX descriptors */
- FAR struct can_frame *txdesc;
- FAR struct can_frame *rxdesc;
+ struct can_frame *txdesc;
+ struct can_frame *rxdesc;
/* TX/RX pool */
@@ -136,21 +136,21 @@ struct stm32_can_s
/* CAN Register access */
-static uint32_t stm32can_getreg(FAR struct stm32_can_s *priv,
+static uint32_t stm32can_getreg(struct stm32_can_s *priv,
int offset);
-static uint32_t stm32can_getfreg(FAR struct stm32_can_s *priv,
+static uint32_t stm32can_getfreg(struct stm32_can_s *priv,
int offset);
-static void stm32can_putreg(FAR struct stm32_can_s *priv, int offset,
+static void stm32can_putreg(struct stm32_can_s *priv, int offset,
uint32_t value);
-static void stm32can_putfreg(FAR struct stm32_can_s *priv, int offset,
+static void stm32can_putfreg(struct stm32_can_s *priv, int offset,
uint32_t value);
#ifdef CONFIG_STM32_CAN_REGDEBUG
-static void stm32can_dumpctrlregs(FAR struct stm32_can_s *priv,
- FAR const char *msg);
-static void stm32can_dumpmbregs(FAR struct stm32_can_s *priv,
- FAR const char *msg);
-static void stm32can_dumpfiltregs(FAR struct stm32_can_s *priv,
- FAR const char *msg);
+static void stm32can_dumpctrlregs(struct stm32_can_s *priv,
+ const char *msg);
+static void stm32can_dumpmbregs(struct stm32_can_s *priv,
+ const char *msg);
+static void stm32can_dumpfiltregs(struct stm32_can_s *priv,
+ const char *msg);
#else
# define stm32can_dumpctrlregs(priv,msg)
# define stm32can_dumpmbregs(priv,msg)
@@ -159,54 +159,54 @@ static void stm32can_dumpfiltregs(FAR struct stm32_can_s *priv,
/* CAN interrupt enable functions */
-static void stm32can_rx0int(FAR struct stm32_can_s *priv, bool enable);
-static void stm32can_rx1int(FAR struct stm32_can_s *priv, bool enable);
-static void stm32can_txint(FAR struct stm32_can_s *priv, bool enable);
+static void stm32can_rx0int(struct stm32_can_s *priv, bool enable);
+static void stm32can_rx1int(struct stm32_can_s *priv, bool enable);
+static void stm32can_txint(struct stm32_can_s *priv, bool enable);
#ifdef CONFIG_NET_CAN_ERRORS
-static void stm32can_errint(FAR struct stm32_can_s *priv, bool enable);
+static void stm32can_errint(struct stm32_can_s *priv, bool enable);
#endif
/* Common TX logic */
-static int stm32can_transmit(FAR struct stm32_can_s *priv);
-static bool stm32can_txready(FAR struct stm32_can_s *priv);
+static int stm32can_transmit(struct stm32_can_s *priv);
+static bool stm32can_txready(struct stm32_can_s *priv);
static int stm32can_txpoll(struct net_driver_s *dev);
/* CAN RX interrupt handling */
-static int stm32can_rxinterrupt_work(FAR struct stm32_can_s *priv,
+static int stm32can_rxinterrupt_work(struct stm32_can_s *priv,
int rxmb);
-static void stm32can_rx0interrupt_work(FAR void *arg);
-static void stm32can_rx1interrupt_work(FAR void *arg);
-static int stm32can_rxinterrupt(FAR struct stm32_can_s *priv, int rxmb);
+static void stm32can_rx0interrupt_work(void *arg);
+static void stm32can_rx1interrupt_work(void *arg);
+static int stm32can_rxinterrupt(struct stm32_can_s *priv, int rxmb);
-static int stm32can_rx0interrupt(int irq, FAR void *context, FAR void *arg);
-static int stm32can_rx1interrupt(int irq, FAR void *context, FAR void *arg);
+static int stm32can_rx0interrupt(int irq, void *context, void *arg);
+static int stm32can_rx1interrupt(int irq, void *context, void *arg);
/* CAN TX interrupt handling */
-static int stm32can_txinterrupt(int irq, FAR void *context, FAR void *arg);
-static void stm32can_txdone_work(FAR void *arg);
-static void stm32can_txdone(FAR struct stm32_can_s *priv);
+static int stm32can_txinterrupt(int irq, void *context, void *arg);
+static void stm32can_txdone_work(void *arg);
+static void stm32can_txdone(struct stm32_can_s *priv);
#ifdef CONFIG_NET_CAN_ERRORS
/* CAN errors interrupt handling */
-static void stm32can_sceinterrupt_work(FAR void *arg);
-static int stm32can_sceinterrupt(int irq, FAR void *context, FAR void *arg);
+static void stm32can_sceinterrupt_work(void *arg);
+static int stm32can_sceinterrupt(int irq, void *context, void *arg);
#endif
/* Initialization */
-static int stm32can_setup(FAR struct stm32_can_s *priv);
-static void stm32can_shutdown(FAR struct stm32_can_s *priv);
-static void stm32can_reset(FAR struct stm32_can_s *priv);
-static int stm32can_enterinitmode(FAR struct stm32_can_s *priv);
-static int stm32can_exitinitmode(FAR struct stm32_can_s *priv);
-static int stm32can_bittiming(FAR struct stm32_can_s *priv);
-static int stm32can_cellinit(FAR struct stm32_can_s *priv);
-static int stm32can_filterinit(FAR struct stm32_can_s *priv);
+static int stm32can_setup(struct stm32_can_s *priv);
+static void stm32can_shutdown(struct stm32_can_s *priv);
+static void stm32can_reset(struct stm32_can_s *priv);
+static int stm32can_enterinitmode(struct stm32_can_s *priv);
+static int stm32can_exitinitmode(struct stm32_can_s *priv);
+static int stm32can_bittiming(struct stm32_can_s *priv);
+static int stm32can_cellinit(struct stm32_can_s *priv);
+static int stm32can_filterinit(struct stm32_can_s *priv);
/* TX mailbox status */
@@ -219,7 +219,7 @@ static bool stm32can_txmb2empty(uint32_t tsr_regval);
static int stm32can_ifup(struct net_driver_s *dev);
static int stm32can_ifdown(struct net_driver_s *dev);
-static void stm32can_txavail_work(FAR void *arg);
+static void stm32can_txavail_work(void *arg);
static int stm32can_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NETDEV_IOCTL
@@ -342,23 +342,23 @@ static uint32_t stm32can_vgetreg(uint32_t addr)
return val;
}
-static uint32_t stm32can_getreg(FAR struct stm32_can_s *priv, int offset)
+static uint32_t stm32can_getreg(struct stm32_can_s *priv, int offset)
{
return stm32can_vgetreg(priv->base + offset);
}
-static uint32_t stm32can_getfreg(FAR struct stm32_can_s *priv, int offset)
+static uint32_t stm32can_getfreg(struct stm32_can_s *priv, int offset)
{
return stm32can_vgetreg(priv->fbase + offset);
}
#else
-static uint32_t stm32can_getreg(FAR struct stm32_can_s *priv, int offset)
+static uint32_t stm32can_getreg(struct stm32_can_s *priv, int offset)
{
return getreg32(priv->base + offset);
}
-static uint32_t stm32can_getfreg(FAR struct stm32_can_s *priv, int offset)
+static uint32_t stm32can_getfreg(struct stm32_can_s *priv, int offset)
{
return getreg32(priv->fbase + offset);
}
@@ -386,26 +386,26 @@ static void stm32can_vputreg(uint32_t addr, uint32_t value)
putreg32(value, addr);
}
-static void stm32can_putreg(FAR struct stm32_can_s *priv, int offset,
+static void stm32can_putreg(struct stm32_can_s *priv, int offset,
uint32_t value)
{
stm32can_vputreg(priv->base + offset, value);
}
-static void stm32can_putfreg(FAR struct stm32_can_s *priv, int offset,
+static void stm32can_putfreg(struct stm32_can_s *priv, int offset,
uint32_t value)
{
stm32can_vputreg(priv->fbase + offset, value);
}
#else
-static void stm32can_putreg(FAR struct stm32_can_s *priv, int offset,
+static void stm32can_putreg(struct stm32_can_s *priv, int offset,
uint32_t value)
{
putreg32(value, priv->base + offset);
}
-static void stm32can_putfreg(FAR struct stm32_can_s *priv, int offset,
+static void stm32can_putfreg(struct stm32_can_s *priv, int offset,
uint32_t value)
{
putreg32(value, priv->fbase + offset);
@@ -428,8 +428,8 @@ static void stm32can_putfreg(FAR struct stm32_can_s *priv, int offset,
****************************************************************************/
#ifdef CONFIG_STM32_CAN_REGDEBUG
-static void stm32can_dumpctrlregs(FAR struct stm32_can_s *priv,
- FAR const char *msg)
+static void stm32can_dumpctrlregs(struct stm32_can_s *priv,
+ const char *msg)
{
if (msg)
{
@@ -474,8 +474,8 @@ static void stm32can_dumpctrlregs(FAR struct stm32_can_s *priv,
****************************************************************************/
#ifdef CONFIG_STM32_CAN_REGDEBUG
-static void stm32can_dumpmbregs(FAR struct stm32_can_s *priv,
- FAR const char *msg)
+static void stm32can_dumpmbregs(struct stm32_can_s *priv,
+ const char *msg)
{
if (msg)
{
@@ -541,8 +541,8 @@ static void stm32can_dumpmbregs(FAR struct stm32_can_s *priv,
****************************************************************************/
#ifdef CONFIG_STM32_CAN_REGDEBUG
-static void stm32can_dumpfiltregs(FAR struct stm32_can_s *priv,
- FAR const char *msg)
+static void stm32can_dumpfiltregs(struct stm32_can_s *priv,
+ const char *msg)
{
int i;
@@ -586,7 +586,7 @@ static void stm32can_dumpfiltregs(FAR struct stm32_can_s *priv,
*
****************************************************************************/
-static void stm32can_rx0int(FAR struct stm32_can_s *priv, bool enable)
+static void stm32can_rx0int(struct stm32_can_s *priv, bool enable)
{
uint32_t regval = 0;
@@ -621,7 +621,7 @@ static void stm32can_rx0int(FAR struct stm32_can_s *priv, bool enable)
*
****************************************************************************/
-static void stm32can_rx1int(FAR struct stm32_can_s *priv, bool enable)
+static void stm32can_rx1int(struct stm32_can_s *priv, bool enable)
{
uint32_t regval = 0;
@@ -656,7 +656,7 @@ static void stm32can_rx1int(FAR struct stm32_can_s *priv, bool enable)
*
****************************************************************************/
-static void stm32can_txint(FAR struct stm32_can_s *priv, bool enable)
+static void stm32can_txint(struct stm32_can_s *priv, bool enable)
{
uint32_t regval = 0;
@@ -692,7 +692,7 @@ static void stm32can_txint(FAR struct stm32_can_s *priv, bool enable)
*
****************************************************************************/
-static void stm32can_errint(FAR struct stm32_can_s *priv, bool enable)
+static void stm32can_errint(struct stm32_can_s *priv, bool enable)
{
uint32_t regval = 0;
@@ -731,7 +731,7 @@ static void stm32can_errint(FAR struct stm32_can_s *priv, bool enable)
static int stm32can_ifup(struct net_driver_s *dev)
{
- FAR struct stm32_can_s *priv = (FAR struct stm32_can_s *)dev->d_private;
+ struct stm32_can_s *priv = (struct stm32_can_s *)dev->d_private;
/* Setup CAN */
@@ -783,7 +783,7 @@ static int stm32can_ifup(struct net_driver_s *dev)
static int stm32can_ifdown(struct net_driver_s *dev)
{
- FAR struct stm32_can_s *priv = (FAR struct stm32_can_s *)dev->d_private;
+ struct stm32_can_s *priv = (struct stm32_can_s *)dev->d_private;
/* Disable CAN interrupts */
@@ -804,7 +804,7 @@ static int stm32can_ifdown(struct net_driver_s *dev)
*
****************************************************************************/
-static bool stm32can_txready(FAR struct stm32_can_s *priv)
+static bool stm32can_txready(struct stm32_can_s *priv)
{
uint32_t regval;
@@ -837,10 +837,10 @@ static bool stm32can_txready(FAR struct stm32_can_s *priv)
*
****************************************************************************/
-static int stm32can_transmit(FAR struct stm32_can_s *priv)
+static int stm32can_transmit(struct stm32_can_s *priv)
{
struct can_frame *frame = (struct can_frame *)priv->dev.d_buf;
- FAR uint8_t *ptr;
+ uint8_t *ptr;
uint32_t regval;
uint32_t tmp;
int dlc;
@@ -1013,7 +1013,7 @@ static int stm32can_transmit(FAR struct stm32_can_s *priv)
static int stm32can_txpoll(struct net_driver_s *dev)
{
- FAR struct stm32_can_s *priv = (FAR struct stm32_can_s *)dev->d_private;
+ struct stm32_can_s *priv = (struct stm32_can_s *)dev->d_private;
/* If the polling resulted in data that should be sent out on the network,
* the field d_len is set to a value > 0.
@@ -1064,9 +1064,9 @@ static int stm32can_txpoll(struct net_driver_s *dev)
*
****************************************************************************/
-static void stm32can_txavail_work(FAR void *arg)
+static void stm32can_txavail_work(void *arg)
{
- FAR struct stm32_can_s *priv = (FAR struct stm32_can_s *)arg;
+ struct stm32_can_s *priv = (struct stm32_can_s *)arg;
/* Ignore the notification if the interface is not yet up */
@@ -1111,7 +1111,7 @@ static void stm32can_txavail_work(FAR void *arg)
static int stm32can_txavail(struct net_driver_s *dev)
{
- FAR struct stm32_can_s *priv = (FAR struct stm32_can_s *)dev->d_private;
+ struct stm32_can_s *priv = (struct stm32_can_s *)dev->d_private;
/* Is our single work structure available? It may not be if there are
* pending interrupt actions and we will have to ignore the Tx
@@ -1150,8 +1150,8 @@ static int stm32can_txavail(struct net_driver_s *dev)
static int stm32can_netdev_ioctl(struct net_driver_s *dev, int cmd,
unsigned long arg)
{
- FAR struct stm32_can_s *priv = (FAR struct stm32_can_s *)dev->d_private;
- int ret = OK;
+ struct stm32_can_s *priv = (struct stm32_can_s *)dev->d_private;
+ int ret = OK;
switch (cmd)
{
@@ -1182,11 +1182,11 @@ static int stm32can_netdev_ioctl(struct net_driver_s *dev, int cmd,
*
****************************************************************************/
-static int stm32can_rxinterrupt_work(FAR struct stm32_can_s *priv, int rxmb)
+static int stm32can_rxinterrupt_work(struct stm32_can_s *priv, int rxmb)
{
- FAR struct can_frame *frame = (struct can_frame *)priv->rxdesc;
- uint32_t regval;
- int ret = OK;
+ struct can_frame *frame = (struct can_frame *)priv->rxdesc;
+ uint32_t regval;
+ int ret = OK;
DEBUGASSERT(priv != NULL);
@@ -1304,9 +1304,9 @@ errout:
* Name: stm32can_rx0interrupt_work
****************************************************************************/
-static void stm32can_rx0interrupt_work(FAR void *arg)
+static void stm32can_rx0interrupt_work(void *arg)
{
- FAR struct stm32_can_s *priv = (FAR struct stm32_can_s *)arg;
+ struct stm32_can_s *priv = (struct stm32_can_s *)arg;
stm32can_rxinterrupt_work(priv, 0);
}
@@ -1314,9 +1314,9 @@ static void stm32can_rx0interrupt_work(FAR void *arg)
* Name: stm32can_rx1interrupt_work
****************************************************************************/
-static void stm32can_rx1interrupt_work(FAR void *arg)
+static void stm32can_rx1interrupt_work(void *arg)
{
- FAR struct stm32_can_s *priv = (FAR struct stm32_can_s *)arg;
+ struct stm32_can_s *priv = (struct stm32_can_s *)arg;
stm32can_rxinterrupt_work(priv, 1);
}
@@ -1328,7 +1328,7 @@ static void stm32can_rx1interrupt_work(FAR void *arg)
*
****************************************************************************/
-static int stm32can_rxinterrupt(FAR struct stm32_can_s *priv, int rxmb)
+static int stm32can_rxinterrupt(struct stm32_can_s *priv, int rxmb)
{
uint32_t regval = 0;
int npending = 0;
@@ -1382,9 +1382,9 @@ static int stm32can_rxinterrupt(FAR struct stm32_can_s *priv, int rxmb)
*
****************************************************************************/
-static int stm32can_rx0interrupt(int irq, FAR void *context, FAR void *arg)
+static int stm32can_rx0interrupt(int irq, void *context, void *arg)
{
- FAR struct stm32_can_s *priv = (FAR struct stm32_can_s *)arg;
+ struct stm32_can_s *priv = (struct stm32_can_s *)arg;
return stm32can_rxinterrupt(priv, 0);
}
@@ -1403,9 +1403,9 @@ static int stm32can_rx0interrupt(int irq, FAR void *context, FAR void *arg)
*
****************************************************************************/
-static int stm32can_rx1interrupt(int irq, FAR void *context, FAR void *arg)
+static int stm32can_rx1interrupt(int irq, void *context, void *arg)
{
- FAR struct stm32_can_s *priv = (FAR struct stm32_can_s *)arg;
+ struct stm32_can_s *priv = (struct stm32_can_s *)arg;
return stm32can_rxinterrupt(priv, 1);
}
@@ -1424,9 +1424,9 @@ static int stm32can_rx1interrupt(int irq, FAR void *context, FAR void *arg)
*
****************************************************************************/
-static int stm32can_txinterrupt(int irq, FAR void *context, FAR void *arg)
+static int stm32can_txinterrupt(int irq, void *context, void *arg)
{
- FAR struct stm32_can_s *priv = (FAR struct stm32_can_s *)arg;
+ struct stm32_can_s *priv = (struct stm32_can_s *)arg;
uint32_t regval;
DEBUGASSERT(priv != NULL);
@@ -1500,9 +1500,9 @@ static int stm32can_txinterrupt(int irq, FAR void *context, FAR void *arg)
* Name: stm32can_txdone_work
****************************************************************************/
-static void stm32can_txdone_work(FAR void *arg)
+static void stm32can_txdone_work(void *arg)
{
- FAR struct stm32_can_s *priv = (FAR struct stm32_can_s *)arg;
+ struct stm32_can_s *priv = (struct stm32_can_s *)arg;
stm32can_txdone(priv);
@@ -1519,7 +1519,7 @@ static void stm32can_txdone_work(FAR void *arg)
* Name: stm32can_txdone
****************************************************************************/
-static void stm32can_txdone(FAR struct stm32_can_s *priv)
+static void stm32can_txdone(struct stm32_can_s *priv)
{
stm32can_txint(priv, true);
@@ -1542,13 +1542,13 @@ static void stm32can_txdone(FAR struct stm32_can_s *priv)
*
****************************************************************************/
-static void stm32can_sceinterrupt_work(FAR void *arg)
+static void stm32can_sceinterrupt_work(void *arg)
{
- FAR struct stm32_can_s *priv = (FAR struct stm32_can_s *)arg;
- struct can_frame *frame = (struct can_frame *)priv->rxdesc;
- uint32_t regval = 0;
- uint16_t errbits = 0;
- uint8_t data[CAN_ERR_DLC];
+ struct stm32_can_s *priv = (struct stm32_can_s *)arg;
+ struct can_frame *frame = (struct can_frame *)priv->rxdesc;
+ uint32_t regval = 0;
+ uint16_t errbits = 0;
+ uint8_t data[CAN_ERR_DLC];
DEBUGASSERT(priv != NULL);
@@ -1713,9 +1713,9 @@ static void stm32can_sceinterrupt_work(FAR void *arg)
*
****************************************************************************/
-static int stm32can_sceinterrupt(int irq, FAR void *context, FAR void *arg)
+static int stm32can_sceinterrupt(int irq, void *context, void *arg)
{
- FAR struct stm32_can_s *priv = (FAR struct stm32_can_s *)arg;
+ struct stm32_can_s *priv = (struct stm32_can_s *)arg;
/* Disable further CAN SCE interrupts and schedule to perform the
* interrupt processing on the worker thread
@@ -1786,7 +1786,7 @@ static int stm32can_sceinterrupt(int irq, FAR void *context, FAR void *arg)
*
****************************************************************************/
-static int stm32can_bittiming(FAR struct stm32_can_s *priv)
+static int stm32can_bittiming(struct stm32_can_s *priv)
{
uint32_t tmp;
uint32_t brp;
@@ -1875,7 +1875,7 @@ static int stm32can_bittiming(FAR struct stm32_can_s *priv)
* Name: stm32can_setup
****************************************************************************/
-static int stm32can_setup(FAR struct stm32_can_s *priv)
+static int stm32can_setup(struct stm32_can_s *priv)
{
int ret;
@@ -1960,7 +1960,7 @@ static int stm32can_setup(FAR struct stm32_can_s *priv)
* Name: stm32can_shutdown
****************************************************************************/
-static void stm32can_shutdown(FAR struct stm32_can_s *priv)
+static void stm32can_shutdown(struct stm32_can_s *priv)
{
ninfo("CAN%" PRIu8 "\n", priv->port);
@@ -1999,7 +1999,7 @@ static void stm32can_shutdown(FAR struct stm32_can_s *priv)
*
****************************************************************************/
-static void stm32can_reset(FAR struct stm32_can_s *priv)
+static void stm32can_reset(struct stm32_can_s *priv)
{
uint32_t regval;
uint32_t regbit = 0;
@@ -2061,7 +2061,7 @@ static void stm32can_reset(FAR struct stm32_can_s *priv)
*
****************************************************************************/
-static int stm32can_enterinitmode(FAR struct stm32_can_s *priv)
+static int stm32can_enterinitmode(struct stm32_can_s *priv)
{
uint32_t regval;
volatile uint32_t timeout;
@@ -2112,7 +2112,7 @@ static int stm32can_enterinitmode(FAR struct stm32_can_s *priv)
*
****************************************************************************/
-static int stm32can_exitinitmode(FAR struct stm32_can_s *priv)
+static int stm32can_exitinitmode(struct stm32_can_s *priv)
{
uint32_t regval;
volatile uint32_t timeout;
@@ -2162,7 +2162,7 @@ static int stm32can_exitinitmode(FAR struct stm32_can_s *priv)
*
****************************************************************************/
-static int stm32can_cellinit(FAR struct stm32_can_s *priv)
+static int stm32can_cellinit(struct stm32_can_s *priv)
{
uint32_t regval;
int ret;
@@ -2245,7 +2245,7 @@ static int stm32can_cellinit(FAR struct stm32_can_s *priv)
*
****************************************************************************/
-static int stm32can_filterinit(FAR struct stm32_can_s *priv)
+static int stm32can_filterinit(struct stm32_can_s *priv)
{
uint32_t regval;
uint32_t bitmask;
diff --git a/arch/arm/src/stm32/stm32_capture.c b/arch/arm/src/stm32/stm32_capture.c
index 10b30ac96e..7d96912529 100644
--- a/arch/arm/src/stm32/stm32_capture.c
+++ b/arch/arm/src/stm32/stm32_capture.c
@@ -118,7 +118,7 @@ struct stm32_cap_priv_s
/* Get a 16-bit register value by offset */
static inline
-uint16_t stm32_getreg16(FAR const struct stm32_cap_priv_s *priv,
+uint16_t stm32_getreg16(const struct stm32_cap_priv_s *priv,
uint8_t offset)
{
return getreg16(priv->base + offset);
@@ -126,7 +126,7 @@ uint16_t stm32_getreg16(FAR const struct stm32_cap_priv_s *priv,
/* Put a 16-bit register value by offset */
-static inline void stm32_putreg16(FAR const struct stm32_cap_priv_s *priv,
+static inline void stm32_putreg16(const struct stm32_cap_priv_s *priv,
uint8_t offset, uint16_t value)
{
putreg16(value, priv->base + offset);
@@ -134,7 +134,7 @@ static inline void stm32_putreg16(FAR const struct stm32_cap_priv_s *priv,
/* Modify a 16-bit register value by offset */
-static inline void stm32_modifyreg16(FAR const struct stm32_cap_priv_s *priv,
+static inline void stm32_modifyreg16(const struct stm32_cap_priv_s *priv,
uint8_t offset, uint16_t clearbits,
uint16_t setbits)
{
@@ -146,7 +146,7 @@ static inline void stm32_modifyreg16(FAR const struct stm32_cap_priv_s *priv,
*/
static inline
-uint32_t stm32_getreg32(FAR const struct stm32_cap_priv_s *priv,
+uint32_t stm32_getreg32(const struct stm32_cap_priv_s *priv,
uint8_t offset)
{
return getreg32(priv->base + offset);
@@ -156,7 +156,7 @@ uint32_t stm32_getreg32(FAR const struct stm32_cap_priv_s *priv,
* 32-bit registers (CNT, ARR, CRR1-4) in the 32-bit timers TIM2 and TIM5.
*/
-static inline void stm32_putreg32(FAR const struct stm32_cap_priv_s *priv,
+static inline void stm32_putreg32(const struct stm32_cap_priv_s *priv,
uint8_t offset, uint32_t value)
{
putreg32(value, priv->base + offset);
@@ -167,7 +167,7 @@ static inline void stm32_putreg32(FAR const struct stm32_cap_priv_s *priv,
****************************************************************************/
static inline
-uint32_t stm32_cap_gpio(FAR const struct stm32_cap_priv_s *priv,
+uint32_t stm32_cap_gpio(const struct stm32_cap_priv_s *priv,
int channel)
{
switch (priv->base)
@@ -510,7 +510,7 @@ uint32_t stm32_cap_gpio(FAR const struct stm32_cap_priv_s *priv,
return 0;
}
-static inline int stm32_cap_set_rcc(FAR const struct stm32_cap_priv_s *priv,
+static inline int stm32_cap_set_rcc(const struct stm32_cap_priv_s *priv,
bool on)
{
uint32_t offset = 0;
@@ -616,7 +616,7 @@ static inline int stm32_cap_set_rcc(FAR const struct stm32_cap_priv_s *priv,
* Basic Functions
****************************************************************************/
-static int stm32_cap_setclock(FAR struct stm32_cap_dev_s *dev,
+static int stm32_cap_setclock(struct stm32_cap_dev_s *dev,
stm32_cap_clk_t clk,
uint32_t prescaler, uint32_t max)
{
@@ -691,7 +691,7 @@ static int stm32_cap_setclock(FAR struct stm32_cap_dev_s *dev,
return prescaler;
}
-static int stm32_cap_setisr(FAR struct stm32_cap_dev_s *dev, xcpt_t handler,
+static int stm32_cap_setisr(struct stm32_cap_dev_s *dev, xcpt_t handler,
void *arg)
{
const struct stm32_cap_priv_s *priv = (const struct stm32_cap_priv_s *)dev;
@@ -741,7 +741,7 @@ static int stm32_cap_setisr(FAR struct stm32_cap_dev_s *dev, xcpt_t handler,
return OK;
}
-static void stm32_cap_enableint(FAR struct stm32_cap_dev_s *dev,
+static void stm32_cap_enableint(struct stm32_cap_dev_s *dev,
stm32_cap_flags_t src, bool on)
{
const struct stm32_cap_priv_s *priv = (const struct stm32_cap_priv_s *)dev;
@@ -786,7 +786,7 @@ static void stm32_cap_enableint(FAR struct stm32_cap_dev_s *dev,
}
}
-static void stm32_cap_ackflags(FAR struct stm32_cap_dev_s *dev, int flags)
+static void stm32_cap_ackflags(struct stm32_cap_dev_s *dev, int flags)
{
const struct stm32_cap_priv_s *priv = (const struct stm32_cap_priv_s *)dev;
uint16_t mask = 0;
@@ -839,7 +839,7 @@ static void stm32_cap_ackflags(FAR struct stm32_cap_dev_s *dev, int flags)
stm32_putreg16(priv, STM32_BTIM_SR_OFFSET, ~mask);
}
-static stm32_cap_flags_t stm32_cap_getflags(FAR struct stm32_cap_dev_s *dev)
+static stm32_cap_flags_t stm32_cap_getflags(struct stm32_cap_dev_s *dev)
{
const struct stm32_cap_priv_s *priv = (const struct stm32_cap_priv_s *)dev;
uint16_t regval = 0;
@@ -899,7 +899,7 @@ static stm32_cap_flags_t stm32_cap_getflags(FAR struct stm32_cap_dev_s *dev)
* General Functions
****************************************************************************/
-static int stm32_cap_setchannel(FAR struct stm32_cap_dev_s *dev,
+static int stm32_cap_setchannel(struct stm32_cap_dev_s *dev,
uint8_t channel,
stm32_cap_ch_cfg_t cfg)
{
@@ -1008,7 +1008,7 @@ static int stm32_cap_setchannel(FAR struct stm32_cap_dev_s *dev,
return OK;
}
-static uint32_t stm32_cap_getcapture(FAR struct stm32_cap_dev_s *dev,
+static uint32_t stm32_cap_getcapture(struct stm32_cap_dev_s *dev,
uint8_t channel)
{
const struct stm32_cap_priv_s *priv = (const struct stm32_cap_priv_s *)dev;
@@ -1284,7 +1284,7 @@ static inline const struct stm32_cap_priv_s * stm32_cap_get_priv(int timer)
* Public Function - Initialization
****************************************************************************/
-FAR struct stm32_cap_dev_s *stm32_cap_init(int timer)
+struct stm32_cap_dev_s *stm32_cap_init(int timer)
{
const struct stm32_cap_priv_s *priv = stm32_cap_get_priv(timer);
uint32_t gpio;
@@ -1307,7 +1307,7 @@ FAR struct stm32_cap_dev_s *stm32_cap_init(int timer)
return (struct stm32_cap_dev_s *)priv;
}
-int stm32_cap_deinit(FAR struct stm32_cap_dev_s * dev)
+int stm32_cap_deinit(struct stm32_cap_dev_s * dev)
{
const struct stm32_cap_priv_s *priv = (struct stm32_cap_priv_s *)dev;
uint32_t gpio;
diff --git a/arch/arm/src/stm32/stm32_capture.h b/arch/arm/src/stm32/stm32_capture.h
index c3db30f3b6..ad8de8b078 100644
--- a/arch/arm/src/stm32/stm32_capture.h
+++ b/arch/arm/src/stm32/stm32_capture.h
@@ -159,16 +159,16 @@ typedef enum
struct stm32_cap_ops_s
{
- int (*setclock)(FAR struct stm32_cap_dev_s *dev, stm32_cap_clk_t clk,
+ int (*setclock)(struct stm32_cap_dev_s *dev, stm32_cap_clk_t clk,
uint32_t prescaler, uint32_t max);
- int (*setchannel)(FAR struct stm32_cap_dev_s *dev, uint8_t channel,
+ int (*setchannel)(struct stm32_cap_dev_s *dev, uint8_t channel,
stm32_cap_ch_cfg_t cfg);
- uint32_t (*getcapture)(FAR struct stm32_cap_dev_s *dev, uint8_t channel);
- int (*setisr)(FAR struct stm32_cap_dev_s *dev, xcpt_t handler, void *arg);
- void (*enableint)(FAR struct stm32_cap_dev_s *dev, stm32_cap_flags_t src,
+ uint32_t (*getcapture)(struct stm32_cap_dev_s *dev, uint8_t channel);
+ int (*setisr)(struct stm32_cap_dev_s *dev, xcpt_t handler, void *arg);
+ void (*enableint)(struct stm32_cap_dev_s *dev, stm32_cap_flags_t src,
bool on);
- void (*ackflags)(FAR struct stm32_cap_dev_s *dev, int flags);
- stm32_cap_flags_t (*getflags)(FAR struct stm32_cap_dev_s *dev);
+ void (*ackflags)(struct stm32_cap_dev_s *dev, int flags);
+ stm32_cap_flags_t (*getflags)(struct stm32_cap_dev_s *dev);
};
/****************************************************************************
@@ -177,11 +177,11 @@ struct stm32_cap_ops_s
/* Power-up timer and get its structure */
-FAR struct stm32_cap_dev_s *stm32_cap_init(int timer);
+struct stm32_cap_dev_s *stm32_cap_init(int timer);
/* Power-down timer, mark it as unused */
-int stm32_cap_deinit(FAR struct stm32_cap_dev_s *dev);
+int stm32_cap_deinit(struct stm32_cap_dev_s *dev);
#undef EXTERN
#if defined(__cplusplus)
diff --git a/arch/arm/src/stm32/stm32_ccm.c b/arch/arm/src/stm32/stm32_ccm.c
index 60a8baaa57..7c26f40295 100644
--- a/arch/arm/src/stm32/stm32_ccm.c
+++ b/arch/arm/src/stm32/stm32_ccm.c
@@ -32,7 +32,7 @@
* Public Data
****************************************************************************/
-FAR struct mm_heap_s *g_ccm_heap;
+struct mm_heap_s *g_ccm_heap;
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/stm32/stm32_ccm.h b/arch/arm/src/stm32/stm32_ccm.h
index d16d020273..a4da0d03b8 100644
--- a/arch/arm/src/stm32/stm32_ccm.h
+++ b/arch/arm/src/stm32/stm32_ccm.h
@@ -69,7 +69,7 @@
*/
#define ccm_initialize() \
- g_ccm_heap = mm_initialize("ccm", (FAR void *)CCM_START, CCM_END-CCM_START)
+ g_ccm_heap = mm_initialize("ccm", (void *)CCM_START, CCM_END-CCM_START)
/* The ccm_addregion interface could be used if, for example, you want to
* add some other memory region to the CCM heap. I don't really know why
@@ -107,7 +107,7 @@ extern "C"
#define EXTERN extern
#endif
-EXTERN FAR struct mm_heap_s *g_ccm_heap;
+EXTERN struct mm_heap_s *g_ccm_heap;
/****************************************************************************
* Public Function Prototypes
diff --git a/arch/arm/src/stm32/stm32_comp.h b/arch/arm/src/stm32/stm32_comp.h
index 54732bfd51..82cbea7ff9 100644
--- a/arch/arm/src/stm32/stm32_comp.h
+++ b/arch/arm/src/stm32/stm32_comp.h
@@ -76,7 +76,7 @@ extern "C"
*
****************************************************************************/
-FAR struct comp_dev_s *stm32_compinitialize(int intf);
+struct comp_dev_s *stm32_compinitialize(int intf);
#undef EXTERN
#ifdef __cplusplus
diff --git a/arch/arm/src/stm32/stm32_comp_v1.c b/arch/arm/src/stm32/stm32_comp_v1.c
index 988c1f6b80..a2a1a1957a 100644
--- a/arch/arm/src/stm32/stm32_comp_v1.c
+++ b/arch/arm/src/stm32/stm32_comp_v1.c
@@ -156,26 +156,26 @@ struct stm32_comp_s
/* COMP Register access */
-static inline void comp_modify_csr(FAR struct stm32_comp_s *priv,
+static inline void comp_modify_csr(struct stm32_comp_s *priv,
uint32_t clearbits, uint32_t setbits);
-static inline uint32_t comp_getreg_csr(FAR struct stm32_comp_s *priv);
-static inline void comp_putreg_csr(FAR struct stm32_comp_s *priv,
+static inline uint32_t comp_getreg_csr(struct stm32_comp_s *priv);
+static inline void comp_putreg_csr(struct stm32_comp_s *priv,
uint32_t value);
-static bool stm32_complock_get(FAR struct stm32_comp_s *priv);
-static int stm32_complock(FAR struct stm32_comp_s *priv, bool lock);
+static bool stm32_complock_get(struct stm32_comp_s *priv);
+static int stm32_complock(struct stm32_comp_s *priv, bool lock);
/* COMP Driver Methods */
-static void comp_shutdown(FAR struct comp_dev_s *dev);
-static int comp_setup(FAR struct comp_dev_s *dev);
-static int comp_read(FAR struct comp_dev_s *dev);
-static int comp_ioctl(FAR struct comp_dev_s *dev, int cmd,
+static void comp_shutdown(struct comp_dev_s *dev);
+static int comp_setup(struct comp_dev_s *dev);
+static int comp_read(struct comp_dev_s *dev);
+static int comp_ioctl(struct comp_dev_s *dev, int cmd,
unsigned long arg);
/* Initialization */
-static int stm32_compconfig(FAR struct stm32_comp_s *priv);
-static int stm32_compenable(FAR struct stm32_comp_s *priv, bool enable);
+static int stm32_compconfig(struct stm32_comp_s *priv);
+static int stm32_compenable(struct stm32_comp_s *priv, bool enable);
/****************************************************************************
* Private Data
@@ -363,7 +363,7 @@ static struct comp_dev_s g_comp7dev =
*
****************************************************************************/
-static inline void comp_modify_csr(FAR struct stm32_comp_s *priv,
+static inline void comp_modify_csr(struct stm32_comp_s *priv,
uint32_t clearbits, uint32_t setbits)
{
uint32_t csr = priv->csr;
@@ -385,7 +385,7 @@ static inline void comp_modify_csr(FAR struct stm32_comp_s *priv,
*
****************************************************************************/
-static inline uint32_t comp_getreg_csr(FAR struct stm32_comp_s *priv)
+static inline uint32_t comp_getreg_csr(struct stm32_comp_s *priv)
{
uint32_t csr = priv->csr;
@@ -407,7 +407,7 @@ static inline uint32_t comp_getreg_csr(FAR struct stm32_comp_s *priv)
*
****************************************************************************/
-static inline void comp_putreg_csr(FAR struct stm32_comp_s *priv,
+static inline void comp_putreg_csr(struct stm32_comp_s *priv,
uint32_t value)
{
uint32_t csr = priv->csr;
@@ -429,7 +429,7 @@ static inline void comp_putreg_csr(FAR struct stm32_comp_s *priv,
*
****************************************************************************/
-static bool stm32_complock_get(FAR struct stm32_comp_s *priv)
+static bool stm32_complock_get(struct stm32_comp_s *priv)
{
uint32_t regval;
@@ -453,7 +453,7 @@ static bool stm32_complock_get(FAR struct stm32_comp_s *priv)
*
****************************************************************************/
-static int stm32_complock(FAR struct stm32_comp_s *priv, bool lock)
+static int stm32_complock(struct stm32_comp_s *priv, bool lock)
{
bool current;
@@ -497,7 +497,7 @@ static int stm32_complock(FAR struct stm32_comp_s *priv, bool lock)
*
****************************************************************************/
-static int stm32_compconfig(FAR struct stm32_comp_s *priv)
+static int stm32_compconfig(struct stm32_comp_s *priv)
{
uint32_t regval = 0;
int index;
@@ -834,7 +834,7 @@ static int stm32_compconfig(FAR struct stm32_comp_s *priv)
*
****************************************************************************/
-static int stm32_compenable(FAR struct stm32_comp_s *priv, bool enable)
+static int stm32_compenable(struct stm32_comp_s *priv, bool enable)
{
bool lock;
@@ -882,7 +882,7 @@ static int stm32_compenable(FAR struct stm32_comp_s *priv, bool enable)
*
****************************************************************************/
-static int comp_setup(FAR struct comp_dev_s *dev)
+static int comp_setup(struct comp_dev_s *dev)
{
#warning "Missing logic"
@@ -904,7 +904,7 @@ static int comp_setup(FAR struct comp_dev_s *dev)
*
****************************************************************************/
-static void comp_shutdown(FAR struct comp_dev_s *dev)
+static void comp_shutdown(struct comp_dev_s *dev)
{
#warning "Missing logic"
}
@@ -923,9 +923,9 @@ static void comp_shutdown(FAR struct comp_dev_s *dev)
*
****************************************************************************/
-static int comp_read(FAR struct comp_dev_s *dev)
+static int comp_read(struct comp_dev_s *dev)
{
- FAR struct stm32_comp_s *priv;
+ struct stm32_comp_s *priv;
uint32_t regval;
priv = dev->ad_priv;
@@ -950,7 +950,7 @@ static int comp_read(FAR struct comp_dev_s *dev)
*
****************************************************************************/
-static int comp_ioctl(FAR struct comp_dev_s *dev, int cmd, unsigned long arg)
+static int comp_ioctl(struct comp_dev_s *dev, int cmd, unsigned long arg)
{
#warning "Missing logic"
return -ENOTTY;
@@ -978,10 +978,10 @@ static int comp_ioctl(FAR struct comp_dev_s *dev, int cmd, unsigned long arg)
*
****************************************************************************/
-FAR struct comp_dev_s *stm32_compinitialize(int intf)
+struct comp_dev_s *stm32_compinitialize(int intf)
{
- FAR struct comp_dev_s *dev;
- FAR struct stm32_comp_s *comp;
+ struct comp_dev_s *dev;
+ struct stm32_comp_s *comp;
int ret;
switch (intf)
diff --git a/arch/arm/src/stm32/stm32_comp_v2.c b/arch/arm/src/stm32/stm32_comp_v2.c
index 47a47eec3c..8690383873 100644
--- a/arch/arm/src/stm32/stm32_comp_v2.c
+++ b/arch/arm/src/stm32/stm32_comp_v2.c
@@ -80,31 +80,31 @@ struct stm32_comp_s
/* COMP Register access */
-static inline void comp_modify_csr(FAR struct stm32_comp_s *priv,
- uint32_t clearbits, uint32_t setbits);
-static inline uint32_t comp_getreg_csr(FAR struct stm32_comp_s *priv);
-static inline void comp_putreg_csr(FAR struct stm32_comp_s *priv,
- uint32_t value);
+static inline void comp_modify_csr(struct stm32_comp_s *priv,
+ uint32_t clearbits, uint32_t setbits);
+static inline uint32_t comp_getreg_csr(struct stm32_comp_s *priv);
+static inline void comp_putreg_csr(struct stm32_comp_s *priv,
+ uint32_t value);
/* COMP Driver Methods */
#if defined (CONFIG_COMP)
-static void comp_shutdown(FAR struct comp_dev_s *dev);
-static int comp_setup(FAR struct comp_dev_s *dev);
-static int comp_read(FAR struct comp_dev_s *dev);
-static int comp_ioctl(FAR struct comp_dev_s *dev, int cmd,
- unsigned long arg);
+static void comp_shutdown(struct comp_dev_s *dev);
+static int comp_setup(struct comp_dev_s *dev);
+static int comp_read(struct comp_dev_s *dev);
+static int comp_ioctl(struct comp_dev_s *dev, int cmd,
+ unsigned long arg);
#endif
-static int comp_config(FAR struct stm32_comp_s *priv);
-static int comp_enable(FAR struct stm32_comp_s *priv, bool enable);
-static bool comp_lock_get(FAR struct stm32_comp_s *priv);
-static int comp_lock_set(FAR struct stm32_comp_s *priv, bool lock);
+static int comp_config(struct stm32_comp_s *priv);
+static int comp_enable(struct stm32_comp_s *priv, bool enable);
+static bool comp_lock_get(struct stm32_comp_s *priv);
+static int comp_lock_set(struct stm32_comp_s *priv, bool lock);
-static int comp_config_inmpin(FAR struct stm32_comp_s *priv);
-static int comp_config_inppin(FAR struct stm32_comp_s *priv);
+static int comp_config_inmpin(struct stm32_comp_s *priv);
+static int comp_config_inppin(struct stm32_comp_s *priv);
#if defined(COMP_OUT_GPIO)
-static int comp_config_outpin(FAR struct stm32_comp_s *priv);
+static int comp_config_outpin(struct stm32_comp_s *priv);
#endif
/****************************************************************************
@@ -295,7 +295,7 @@ static struct comp_dev_s g_comp7dev =
*
****************************************************************************/
-static inline void comp_modify_csr(FAR struct stm32_comp_s *priv,
+static inline void comp_modify_csr(struct stm32_comp_s *priv,
uint32_t clearbits, uint32_t setbits)
{
uint32_t csr = priv->csr;
@@ -317,7 +317,7 @@ static inline void comp_modify_csr(FAR struct stm32_comp_s *priv,
*
****************************************************************************/
-static inline uint32_t comp_getreg_csr(FAR struct stm32_comp_s *priv)
+static inline uint32_t comp_getreg_csr(struct stm32_comp_s *priv)
{
uint32_t csr = priv->csr;
@@ -339,7 +339,7 @@ static inline uint32_t comp_getreg_csr(FAR struct stm32_comp_s *priv)
*
****************************************************************************/
-static inline void comp_putreg_csr(FAR struct stm32_comp_s *priv,
+static inline void comp_putreg_csr(struct stm32_comp_s *priv,
uint32_t value)
{
uint32_t csr = priv->csr;
@@ -361,7 +361,7 @@ static inline void comp_putreg_csr(FAR struct stm32_comp_s *priv,
*
****************************************************************************/
-static bool comp_lock_get(FAR struct stm32_comp_s *priv)
+static bool comp_lock_get(struct stm32_comp_s *priv)
{
uint32_t regval;
@@ -385,7 +385,7 @@ static bool comp_lock_get(FAR struct stm32_comp_s *priv)
*
****************************************************************************/
-static int comp_lock_set(FAR struct stm32_comp_s *priv, bool lock)
+static int comp_lock_set(struct stm32_comp_s *priv, bool lock)
{
if (comp_lock_get(priv))
{
@@ -425,7 +425,7 @@ static int comp_lock_set(FAR struct stm32_comp_s *priv, bool lock)
*
****************************************************************************/
-static int comp_config_inmpin(FAR struct stm32_comp_s *priv)
+static int comp_config_inmpin(struct stm32_comp_s *priv)
{
# if defined(CONFIG_STM32_COMP1)
if (priv->csr == STM32_COMP1_CSR)
@@ -495,7 +495,7 @@ static int comp_config_inmpin(FAR struct stm32_comp_s *priv)
*
****************************************************************************/
-static int comp_config_inppin(FAR struct stm32_comp_s *priv)
+static int comp_config_inppin(struct stm32_comp_s *priv)
{
# if defined(CONFIG_STM32_COMP1)
if (priv->csr == STM32_COMP1_CSR)
@@ -564,7 +564,7 @@ static int comp_config_inppin(FAR struct stm32_comp_s *priv)
****************************************************************************/
#if defined(COMP_OUT_GPIO)
-static int comp_config_outpin(FAR struct stm32_comp_s *priv)
+static int comp_config_outpin(struct stm32_comp_s *priv)
{
# if defined(CONFIG_STM32_COMP1_OUT)
if (priv->csr == STM32_COMP1_CSR)
@@ -637,7 +637,7 @@ static int comp_config_outpin(FAR struct stm32_comp_s *priv)
*
****************************************************************************/
-static int comp_config(FAR struct stm32_comp_s *priv)
+static int comp_config(struct stm32_comp_s *priv)
{
uint32_t regval = 0;
uint32_t value = 0;
@@ -774,7 +774,7 @@ static int comp_config(FAR struct stm32_comp_s *priv)
*
****************************************************************************/
-static int comp_enable(FAR struct stm32_comp_s *priv, bool enable)
+static int comp_enable(struct stm32_comp_s *priv, bool enable)
{
bool lock;
@@ -823,7 +823,7 @@ static int comp_enable(FAR struct stm32_comp_s *priv, bool enable)
****************************************************************************/
#ifdef CONFIG_COMP
-static int comp_setup(FAR struct comp_dev_s *dev)
+static int comp_setup(struct comp_dev_s *dev)
{
#warning "Missing logic"
@@ -847,7 +847,7 @@ static int comp_setup(FAR struct comp_dev_s *dev)
****************************************************************************/
#ifdef CONFIG_COMP
-static void comp_shutdown(FAR struct comp_dev_s *dev)
+static void comp_shutdown(struct comp_dev_s *dev)
{
# warning "Missing logic"
}
@@ -868,9 +868,9 @@ static void comp_shutdown(FAR struct comp_dev_s *dev)
****************************************************************************/
#ifdef CONFIG_COMP
-static int comp_read(FAR struct comp_dev_s *dev)
+static int comp_read(struct comp_dev_s *dev)
{
- FAR struct stm32_comp_s *priv;
+ struct stm32_comp_s *priv;
uint32_t regval;
priv = dev->ad_priv;
@@ -897,7 +897,7 @@ static int comp_read(FAR struct comp_dev_s *dev)
****************************************************************************/
#ifdef CONFIG_COMP
-static int comp_ioctl(FAR struct comp_dev_s *dev, int cmd, unsigned long arg)
+static int comp_ioctl(struct comp_dev_s *dev, int cmd, unsigned long arg)
{
#warning "Missing logic"
return -ENOTTY;
@@ -926,10 +926,10 @@ static int comp_ioctl(FAR struct comp_dev_s *dev, int cmd, unsigned long arg)
*
****************************************************************************/
-FAR struct comp_dev_s *stm32_compinitialize(int intf)
+struct comp_dev_s *stm32_compinitialize(int intf)
{
- FAR struct comp_dev_s *dev;
- FAR struct stm32_comp_s *comp;
+ struct comp_dev_s *dev;
+ struct stm32_comp_s *comp;
int ret;
switch (intf)
diff --git a/arch/arm/src/stm32/stm32_cordic.c b/arch/arm/src/stm32/stm32_cordic.c
index 7c6adf4284..0a2d3e1fd7 100644
--- a/arch/arm/src/stm32/stm32_cordic.c
+++ b/arch/arm/src/stm32/stm32_cordic.c
@@ -55,9 +55,9 @@
struct stm32_cordic_s
{
- FAR const struct cordic_ops_s *ops; /* Lower half operations */
- uint32_t base; /* The base address of the CORDIC */
- bool inuse; /* True: driver is in-use */
+ const struct cordic_ops_s *ops; /* Lower half operations */
+ uint32_t base; /* The base address of the CORDIC */
+ bool inuse; /* True: driver is in-use */
};
/****************************************************************************
@@ -66,14 +66,14 @@ struct stm32_cordic_s
/* Register access */
-static uint32_t cordic_getreg(FAR struct stm32_cordic_s *priv, int offset);
-static void cordic_putreg(FAR struct stm32_cordic_s *priv, int offset,
+static uint32_t cordic_getreg(struct stm32_cordic_s *priv, int offset);
+static void cordic_putreg(struct stm32_cordic_s *priv, int offset,
uint32_t value);
/* Ops */
-int cordic_calc(FAR struct cordic_lowerhalf_s *lower,
- FAR struct cordic_calc_s *calc);
+int cordic_calc(struct cordic_lowerhalf_s *lower,
+ struct cordic_calc_s *calc);
/****************************************************************************
* Private Data
@@ -103,7 +103,7 @@ struct stm32_cordic_s g_stm32_cordic_dev =
* Name: cordic_getreg
****************************************************************************/
-static uint32_t cordic_getreg(FAR struct stm32_cordic_s *priv, int offset)
+static uint32_t cordic_getreg(struct stm32_cordic_s *priv, int offset)
{
return getreg32(priv->base + offset);
}
@@ -112,7 +112,7 @@ static uint32_t cordic_getreg(FAR struct stm32_cordic_s *priv, int offset)
* Name: cordic_putreg
****************************************************************************/
-static void cordic_putreg(FAR struct stm32_cordic_s *priv, int offset,
+static void cordic_putreg(struct stm32_cordic_s *priv, int offset,
uint32_t value)
{
putreg32(value, priv->base + offset);
@@ -122,14 +122,14 @@ static void cordic_putreg(FAR struct stm32_cordic_s *priv, int offset,
* Name: cordic_calc
****************************************************************************/
-int cordic_calc(FAR struct cordic_lowerhalf_s *lower,
- FAR struct cordic_calc_s *calc)
+int cordic_calc(struct cordic_lowerhalf_s *lower,
+ struct cordic_calc_s *calc)
{
- FAR struct stm32_cordic_s *priv = (FAR struct stm32_cordic_s *)lower;
- int ret = OK;
- uint32_t csr = 0;
- bool arg2_inc = false;
- uint8_t scale = 0;
+ struct stm32_cordic_s *priv = (struct stm32_cordic_s *)lower;
+ int ret = OK;
+ uint32_t csr = 0;
+ bool arg2_inc = false;
+ uint8_t scale = 0;
DEBUGASSERT(lower);
DEBUGASSERT(calc);
@@ -306,9 +306,9 @@ errout:
*
****************************************************************************/
-FAR struct cordic_lowerhalf_s *stm32_cordicinitialize(void)
+struct cordic_lowerhalf_s *stm32_cordicinitialize(void)
{
- FAR struct cordic_lowerhalf_s *lower = NULL;
+ struct cordic_lowerhalf_s *lower = NULL;
if (g_stm32_cordic_dev.inuse == true)
{
@@ -319,7 +319,7 @@ FAR struct cordic_lowerhalf_s *stm32_cordicinitialize(void)
/* Get lower-half device */
- lower = (FAR struct cordic_lowerhalf_s *) &g_stm32_cordic_dev;
+ lower = (struct cordic_lowerhalf_s *) &g_stm32_cordic_dev;
/* The driver is now in-use */
diff --git a/arch/arm/src/stm32/stm32_cordic.h b/arch/arm/src/stm32/stm32_cordic.h
index 2baded4d5b..5b22c359e7 100644
--- a/arch/arm/src/stm32/stm32_cordic.h
+++ b/arch/arm/src/stm32/stm32_cordic.h
@@ -50,6 +50,6 @@
*
****************************************************************************/
-FAR struct cordic_lowerhalf_s *stm32_cordicinitialize(void);
+struct cordic_lowerhalf_s *stm32_cordicinitialize(void);
#endif /* __ARCH_ARM_SRC_STM32_STM32_CORDIC_H */
diff --git a/arch/arm/src/stm32/stm32_dac.c b/arch/arm/src/stm32/stm32_dac.c
index 516f250875..2220a8d3a5 100644
--- a/arch/arm/src/stm32/stm32_dac.c
+++ b/arch/arm/src/stm32/stm32_dac.c
@@ -592,39 +592,39 @@ struct stm32_chan_s
/* DAC Register access */
#ifdef HAVE_TIMER
-static uint32_t tim_getreg(FAR struct stm32_chan_s *chan, int offset);
-static void tim_putreg(FAR struct stm32_chan_s *chan, int offset,
+static uint32_t tim_getreg(struct stm32_chan_s *chan, int offset);
+static void tim_putreg(struct stm32_chan_s *chan, int offset,
uint32_t value);
-static void tim_modifyreg(FAR struct stm32_chan_s *chan, int offset,
+static void tim_modifyreg(struct stm32_chan_s *chan, int offset,
uint32_t clearbits, uint32_t setbits);
#endif
/* Interrupt handler */
#if 0 /* defined(CONFIG_STM32_STM32F20XX) || defined(CONFIG_STM32_STM32F4XXX) */
-static int dac_interrupt(int irq, FAR void *context, FAR void *arg);
+static int dac_interrupt(int irq, void *context, void *arg);
#endif
/* DAC methods */
-static void dac_reset(FAR struct dac_dev_s *dev);
-static int dac_setup(FAR struct dac_dev_s *dev);
-static void dac_shutdown(FAR struct dac_dev_s *dev);
-static void dac_txint(FAR struct dac_dev_s *dev, bool enable);
-static int dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg);
-static int dac_ioctl(FAR struct dac_dev_s *dev, int cmd, unsigned long arg);
+static void dac_reset(struct dac_dev_s *dev);
+static int dac_setup(struct dac_dev_s *dev);
+static void dac_shutdown(struct dac_dev_s *dev);
+static void dac_txint(struct dac_dev_s *dev, bool enable);
+static int dac_send(struct dac_dev_s *dev, struct dac_msg_s *msg);
+static int dac_ioctl(struct dac_dev_s *dev, int cmd, unsigned long arg);
/* Initialization */
#ifdef HAVE_DMA
# ifdef HAVE_TIMER
-static int dac_timinit(FAR struct stm32_chan_s *chan);
+static int dac_timinit(struct stm32_chan_s *chan);
# endif
-static int dma_remap(FAR struct stm32_chan_s *chan);
-static void dma_bufferinit(FAR struct stm32_chan_s *chan, uint16_t *buffer,
+static int dma_remap(struct stm32_chan_s *chan);
+static void dma_bufferinit(struct stm32_chan_s *chan, uint16_t *buffer,
uint16_t len);
#endif
-static int dac_chaninit(FAR struct stm32_chan_s *chan);
+static int dac_chaninit(struct stm32_chan_s *chan);
static int dac_blockinit(void);
/****************************************************************************
@@ -870,7 +870,7 @@ static struct stm32_dac_s g_dacblock;
*
****************************************************************************/
-static inline void stm32_dac_modify_cr(FAR struct stm32_chan_s *chan,
+static inline void stm32_dac_modify_cr(struct stm32_chan_s *chan,
uint32_t clearbits, uint32_t setbits)
{
unsigned int shift;
@@ -905,7 +905,7 @@ static inline void stm32_dac_modify_cr(FAR struct stm32_chan_s *chan,
*
****************************************************************************/
-static uint32_t tim_getreg(FAR struct stm32_chan_s *chan, int offset)
+static uint32_t tim_getreg(struct stm32_chan_s *chan, int offset)
{
return getreg32(chan->tbase + offset);
}
@@ -925,7 +925,7 @@ static uint32_t tim_getreg(FAR struct stm32_chan_s *chan, int offset)
*
****************************************************************************/
-static void tim_putreg(FAR struct stm32_chan_s *chan, int offset,
+static void tim_putreg(struct stm32_chan_s *chan, int offset,
uint32_t value)
{
putreg32(value, chan->tbase + offset);
@@ -948,7 +948,7 @@ static void tim_putreg(FAR struct stm32_chan_s *chan, int offset,
*
****************************************************************************/
-static void tim_modifyreg(FAR struct stm32_chan_s *chan, int offset,
+static void tim_modifyreg(struct stm32_chan_s *chan, int offset,
uint32_t clearbits, uint32_t setbits)
{
modifyreg32(chan->tbase + offset, clearbits, setbits);
@@ -970,7 +970,7 @@ static void tim_modifyreg(FAR struct stm32_chan_s *chan, int offset,
****************************************************************************/
#if 0 /* defined(CONFIG_STM32_STM32F20XX) || defined(CONFIG_STM32_STM32F4XXX) */
-static int dac_interrupt(int irq, FAR void *context, FAR void *arg)
+static int dac_interrupt(int irq, void *context, void *arg)
{
#warning "Missing logic"
return OK;
@@ -993,7 +993,7 @@ static int dac_interrupt(int irq, FAR void *context, FAR void *arg)
*
****************************************************************************/
-static void dac_reset(FAR struct dac_dev_s *dev)
+static void dac_reset(struct dac_dev_s *dev)
{
irqstate_t flags;
@@ -1024,7 +1024,7 @@ static void dac_reset(FAR struct dac_dev_s *dev)
*
****************************************************************************/
-static int dac_setup(FAR struct dac_dev_s *dev)
+static int dac_setup(struct dac_dev_s *dev)
{
#warning "Missing logic"
return OK;
@@ -1044,7 +1044,7 @@ static int dac_setup(FAR struct dac_dev_s *dev)
*
****************************************************************************/
-static void dac_shutdown(FAR struct dac_dev_s *dev)
+static void dac_shutdown(struct dac_dev_s *dev)
{
#warning "Missing logic"
}
@@ -1062,7 +1062,7 @@ static void dac_shutdown(FAR struct dac_dev_s *dev)
*
****************************************************************************/
-static void dac_txint(FAR struct dac_dev_s *dev, bool enable)
+static void dac_txint(struct dac_dev_s *dev, bool enable)
{
#warning "Missing logic"
}
@@ -1081,7 +1081,7 @@ static void dac_txint(FAR struct dac_dev_s *dev, bool enable)
****************************************************************************/
#ifdef HAVE_DMA
-static void dac_dmatxcallback(DMA_HANDLE handle, uint8_t isr, FAR void *arg)
+static void dac_dmatxcallback(DMA_HANDLE handle, uint8_t isr, void *arg)
{
}
#endif
@@ -1099,9 +1099,9 @@ static void dac_dmatxcallback(DMA_HANDLE handle, uint8_t isr, FAR void *arg)
*
****************************************************************************/
-static int dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg)
+static int dac_send(struct dac_dev_s *dev, struct dac_msg_s *msg)
{
- FAR struct stm32_chan_s *chan = dev->ad_priv;
+ struct stm32_chan_s *chan = dev->ad_priv;
/* Enable DAC Channel */
@@ -1200,9 +1200,9 @@ static int dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg)
*
****************************************************************************/
-static int dac_ioctl(FAR struct dac_dev_s *dev, int cmd, unsigned long arg)
+static int dac_ioctl(struct dac_dev_s *dev, int cmd, unsigned long arg)
{
- FAR struct stm32_chan_s *chan = dev->ad_priv;
+ struct stm32_chan_s *chan = dev->ad_priv;
int ret = OK;
switch (cmd)
@@ -1239,7 +1239,7 @@ static int dac_ioctl(FAR struct dac_dev_s *dev, int cmd, unsigned long arg)
* Name: dma_bufferinit
****************************************************************************/
-static void dma_bufferinit(FAR struct stm32_chan_s *chan, uint16_t *buffer,
+static void dma_bufferinit(struct stm32_chan_s *chan, uint16_t *buffer,
uint16_t len)
{
memcpy(chan->dmabuffer, buffer, len);
@@ -1249,7 +1249,7 @@ static void dma_bufferinit(FAR struct stm32_chan_s *chan, uint16_t *buffer,
* Name: dma_remap
****************************************************************************/
-static int dma_remap(FAR struct stm32_chan_s *chan)
+static int dma_remap(struct stm32_chan_s *chan)
{
#if defined(CONFIG_STM32_STM32F33XX) || defined(CONFIG_STM32_STM32F30XX) || \
defined(CONFIG_STM32_STM32F37XX)
@@ -1330,7 +1330,7 @@ static int dma_remap(FAR struct stm32_chan_s *chan)
****************************************************************************/
#ifdef HAVE_TIMER
-static int dac_timinit(FAR struct stm32_chan_s *chan)
+static int dac_timinit(struct stm32_chan_s *chan)
{
uint32_t pclk;
uint32_t prescaler;
@@ -1499,7 +1499,7 @@ static int dac_timinit(FAR struct stm32_chan_s *chan)
*
****************************************************************************/
-static int dac_chaninit(FAR struct stm32_chan_s *chan)
+static int dac_chaninit(struct stm32_chan_s *chan)
{
uint16_t clearbits;
uint16_t setbits;
@@ -1719,10 +1719,10 @@ static int dac_blockinit(void)
*
****************************************************************************/
-FAR struct dac_dev_s *stm32_dacinitialize(int intf)
+struct dac_dev_s *stm32_dacinitialize(int intf)
{
- FAR struct dac_dev_s *dev;
- FAR struct stm32_chan_s *chan;
+ struct dac_dev_s *dev;
+ struct stm32_chan_s *chan;
int ret;
#ifdef CONFIG_STM32_DAC1CH1
diff --git a/arch/arm/src/stm32/stm32_dac.h b/arch/arm/src/stm32/stm32_dac.h
index 6bb47420dc..561d3e2438 100644
--- a/arch/arm/src/stm32/stm32_dac.h
+++ b/arch/arm/src/stm32/stm32_dac.h
@@ -126,7 +126,7 @@ extern "C"
****************************************************************************/
struct dac_dev_s;
-FAR struct dac_dev_s *stm32_dacinitialize(int intf);
+struct dac_dev_s *stm32_dacinitialize(int intf);
#undef EXTERN
#ifdef __cplusplus
diff --git a/arch/arm/src/stm32/stm32_dma.h b/arch/arm/src/stm32/stm32_dma.h
index 825408a1da..21f6f9789b 100644
--- a/arch/arm/src/stm32/stm32_dma.h
+++ b/arch/arm/src/stm32/stm32_dma.h
@@ -65,7 +65,7 @@
* DMA channel (F1) or a DMA stream (F4).
*/
-typedef FAR void *DMA_HANDLE;
+typedef void *DMA_HANDLE;
/* Description:
* This is the type of the callback that is used to inform the user of the
diff --git a/arch/arm/src/stm32/stm32_dma2d.c b/arch/arm/src/stm32/stm32_dma2d.c
index ec0b630a92..2c9372ed29 100644
--- a/arch/arm/src/stm32/stm32_dma2d.c
+++ b/arch/arm/src/stm32/stm32_dma2d.c
@@ -187,24 +187,24 @@ static const uintptr_t stm32_cmar_layer_t[DMA2D_NLAYERS - 1] =
/* Private functions */
static void stm32_dma2d_control(uint32_t setbits, uint32_t clrbits);
-static int stm32_dma2dirq(int irq, void *context, FAR void *arg);
+static int stm32_dma2dirq(int irq, void *context, void *arg);
static int stm32_dma2d_waitforirq(void);
static int stm32_dma2d_start(void);
#ifdef CONFIG_STM32_FB_CMAP
static int stm32_dma2d_loadclut(uintptr_t reg);
#endif
static uint32_t stm32_dma2d_memaddress(
- FAR struct stm32_dma2d_overlay_s *oinfo,
+ struct stm32_dma2d_overlay_s *oinfo,
uint32_t xpos, uint32_t ypos);
static uint32_t stm32_dma2d_lineoffset(
- FAR struct stm32_dma2d_overlay_s *oinfo,
- FAR const struct fb_area_s *area);
-static void stm32_dma2d_lfifo(FAR struct stm32_dma2d_overlay_s *oinfo,
+ struct stm32_dma2d_overlay_s *oinfo,
+ const struct fb_area_s *area);
+static void stm32_dma2d_lfifo(struct stm32_dma2d_overlay_s *oinfo,
int lid,
uint32_t xpos, uint32_t ypos,
- FAR const struct fb_area_s *area);
+ const struct fb_area_s *area);
static void stm32_dma2d_lcolor(int lid, uint32_t argb);
-static void stm32_dma2d_llnr(FAR const struct fb_area_s *area);
+static void stm32_dma2d_llnr(const struct fb_area_s *area);
static int stm32_dma2d_loutpfc(uint8_t fmt);
static void stm32_dma2d_lpfc(int lid, uint32_t blendmode, uint8_t alpha,
uint8_t fmt);
@@ -212,21 +212,21 @@ static void stm32_dma2d_lpfc(int lid, uint32_t blendmode, uint8_t alpha,
/* Public Functions */
#ifdef CONFIG_STM32_FB_CMAP
-static int stm32_dma2d_setclut(FAR const struct fb_cmap_s *cmap);
+static int stm32_dma2d_setclut(const struct fb_cmap_s *cmap);
#endif
-static int stm32_dma2d_fillcolor(FAR struct stm32_dma2d_overlay_s *oinfo,
- FAR const struct fb_area_s *area,
+static int stm32_dma2d_fillcolor(struct stm32_dma2d_overlay_s *oinfo,
+ const struct fb_area_s *area,
uint32_t argb);
-static int stm32_dma2d_blit(FAR struct stm32_dma2d_overlay_s *doverlay,
+static int stm32_dma2d_blit(struct stm32_dma2d_overlay_s *doverlay,
uint32_t destxpos, uint32_t destypos,
- FAR struct stm32_dma2d_overlay_s *soverlay,
- FAR const struct fb_area_s *sarea);
-static int stm32_dma2d_blend(FAR struct stm32_dma2d_overlay_s *doverlay,
+ struct stm32_dma2d_overlay_s *soverlay,
+ const struct fb_area_s *sarea);
+static int stm32_dma2d_blend(struct stm32_dma2d_overlay_s *doverlay,
uint32_t destxpos, uint32_t destypos,
- FAR struct stm32_dma2d_overlay_s *foverlay,
+ struct stm32_dma2d_overlay_s *foverlay,
uint32_t forexpos, uint32_t foreypos,
- FAR struct stm32_dma2d_overlay_s *boverlay,
- FAR const struct fb_area_s *barea);
+ struct stm32_dma2d_overlay_s *boverlay,
+ const struct fb_area_s *barea);
/****************************************************************************
* Private Data
@@ -325,11 +325,11 @@ static void stm32_dma2d_control(uint32_t setbits, uint32_t clrbits)
*
****************************************************************************/
-static int stm32_dma2dirq(int irq, void *context, FAR void *arg)
+static int stm32_dma2dirq(int irq, void *context, void *arg)
{
int ret;
uint32_t regval = getreg32(STM32_DMA2D_ISR);
- FAR struct stm32_interrupt_s *priv = &g_interrupt;
+ struct stm32_interrupt_s *priv = &g_interrupt;
reginfo("irq = %d, regval = %08x\n", irq, regval);
@@ -430,7 +430,7 @@ static int stm32_dma2dirq(int irq, void *context, FAR void *arg)
static int stm32_dma2d_waitforirq(void)
{
int ret;
- FAR struct stm32_interrupt_s *priv = &g_interrupt;
+ struct stm32_interrupt_s *priv = &g_interrupt;
ret = nxsem_wait(priv->sem);
@@ -527,11 +527,11 @@ static int stm32_dma2d_start(void)
****************************************************************************/
static uint32_t stm32_dma2d_memaddress(
- FAR struct stm32_dma2d_overlay_s *oinfo,
+ struct stm32_dma2d_overlay_s *oinfo,
uint32_t xpos, uint32_t ypos)
{
uint32_t offset;
- FAR struct fb_overlayinfo_s *poverlay = oinfo->oinfo;
+ struct fb_overlayinfo_s *poverlay = oinfo->oinfo;
offset = xpos * DMA2D_PF_BYPP(poverlay->bpp) + poverlay->stride * ypos;
@@ -555,8 +555,8 @@ static uint32_t stm32_dma2d_memaddress(
****************************************************************************/
static uint32_t stm32_dma2d_lineoffset(
- FAR struct stm32_dma2d_overlay_s *oinfo,
- FAR const struct fb_area_s *area)
+ struct stm32_dma2d_overlay_s *oinfo,
+ const struct fb_area_s *area)
{
uint32_t loffset;
@@ -581,9 +581,9 @@ static uint32_t stm32_dma2d_lineoffset(
*
****************************************************************************/
-static void stm32_dma2d_lfifo(FAR struct stm32_dma2d_overlay_s *oinfo,
+static void stm32_dma2d_lfifo(struct stm32_dma2d_overlay_s *oinfo,
int lid, uint32_t xpos, uint32_t ypos,
- FAR const struct fb_area_s *area)
+ const struct fb_area_s *area)
{
lcdinfo("oinfo=%p, lid=%d, xpos=%" PRId32 ", ypos=%" PRId32 ", area=%p\n",
oinfo, lid, xpos, ypos, area);
@@ -622,7 +622,7 @@ static void stm32_dma2d_lcolor(int lid, uint32_t argb)
*
****************************************************************************/
-static void stm32_dma2d_llnr(FAR const struct fb_area_s *area)
+static void stm32_dma2d_llnr(const struct fb_area_s *area)
{
uint32_t nlrreg;
@@ -683,7 +683,7 @@ static void stm32_dma2d_lpfc(int lid, uint32_t blendmode, uint8_t alpha,
#ifdef CONFIG_STM32_FB_CMAP
if (fmt == DMA2D_PF_L8)
{
- FAR struct stm32_dma2d_s * layer = &g_dma2ddev;
+ struct stm32_dma2d_s * layer = &g_dma2ddev;
/* Load CLUT automatically */
@@ -744,10 +744,10 @@ static void stm32_dma2d_lpfc(int lid, uint32_t blendmode, uint8_t alpha,
****************************************************************************/
#ifdef CONFIG_STM32_FB_CMAP
-static int stm32_dma2d_setclut(FAR const struct fb_cmap_s *cmap)
+static int stm32_dma2d_setclut(const struct fb_cmap_s *cmap)
{
int n;
- FAR struct stm32_dma2d_s * priv = &g_dma2ddev;
+ struct stm32_dma2d_s * priv = &g_dma2ddev;
lcdinfo("cmap=%p\n", cmap);
@@ -812,12 +812,12 @@ static int stm32_dma2d_setclut(FAR const struct fb_cmap_s *cmap)
*
****************************************************************************/
-static int stm32_dma2d_fillcolor(FAR struct stm32_dma2d_overlay_s *oinfo,
- FAR const struct fb_area_s *area,
+static int stm32_dma2d_fillcolor(struct stm32_dma2d_overlay_s *oinfo,
+ const struct fb_area_s *area,
uint32_t argb)
{
int ret;
- FAR struct stm32_dma2d_s * priv = &g_dma2ddev;
+ struct stm32_dma2d_s * priv = &g_dma2ddev;
DEBUGASSERT(oinfo != NULL && oinfo->oinfo != NULL && area != NULL);
lcdinfo("oinfo=%p, argb=%08" PRIx32 "\n", oinfo, argb);
@@ -893,14 +893,14 @@ static int stm32_dma2d_fillcolor(FAR struct stm32_dma2d_overlay_s *oinfo,
*
****************************************************************************/
-static int stm32_dma2d_blit(FAR struct stm32_dma2d_overlay_s *doverlay,
+static int stm32_dma2d_blit(struct stm32_dma2d_overlay_s *doverlay,
uint32_t destxpos, uint32_t destypos,
- FAR struct stm32_dma2d_overlay_s *soverlay,
- FAR const struct fb_area_s *sarea)
+ struct stm32_dma2d_overlay_s *soverlay,
+ const struct fb_area_s *sarea)
{
int ret;
uint32_t mode;
- FAR struct stm32_dma2d_s * priv = &g_dma2ddev;
+ struct stm32_dma2d_s * priv = &g_dma2ddev;
lcdinfo("doverlay=%p, destxpos=%" PRId32 ", destypos=%" PRId32
", soverlay=%p, sarea=%p\n",
@@ -991,15 +991,15 @@ static int stm32_dma2d_blit(FAR struct stm32_dma2d_overlay_s *doverlay,
*
****************************************************************************/
-static int stm32_dma2d_blend(FAR struct stm32_dma2d_overlay_s *doverlay,
+static int stm32_dma2d_blend(struct stm32_dma2d_overlay_s *doverlay,
uint32_t destxpos, uint32_t destypos,
- FAR struct stm32_dma2d_overlay_s *foverlay,
+ struct stm32_dma2d_overlay_s *foverlay,
uint32_t forexpos, uint32_t foreypos,
- FAR struct stm32_dma2d_overlay_s *boverlay,
- FAR const struct fb_area_s *barea)
+ struct stm32_dma2d_overlay_s *boverlay,
+ const struct fb_area_s *barea)
{
- int ret;
- FAR struct stm32_dma2d_s * priv = &g_dma2ddev;
+ int ret;
+ struct stm32_dma2d_s * priv = &g_dma2ddev;
lcdinfo("doverlay=%p, destxpos=%" PRId32 ", destypos=%" PRId32 ", "
"foverlay=%p, forexpos=%" PRId32 ", foreypos=%" PRId32 ", "
@@ -1176,7 +1176,7 @@ void stm32_dma2duninitialize(void)
*
****************************************************************************/
-FAR struct dma2d_layer_s *stm32_dma2ddev(void)
+struct dma2d_layer_s *stm32_dma2ddev(void)
{
return &g_dma2ddev.dma2d;
}
diff --git a/arch/arm/src/stm32/stm32_dma2d.h b/arch/arm/src/stm32/stm32_dma2d.h
index cad4d9cf9d..d750a87a5f 100644
--- a/arch/arm/src/stm32/stm32_dma2d.h
+++ b/arch/arm/src/stm32/stm32_dma2d.h
@@ -38,11 +38,11 @@
struct stm32_dma2d_overlay_s
{
- uint8_t fmt; /* DMA2D pixel format */
- uint8_t transp_mode; /* DMA2D transparency mode */
- fb_coord_t xres; /* X-resolution overlay */
- fb_coord_t yres; /* Y-resolution overlay */
- FAR struct fb_overlayinfo_s *oinfo; /* Framebuffer overlay information */
+ uint8_t fmt; /* DMA2D pixel format */
+ uint8_t transp_mode; /* DMA2D transparency mode */
+ fb_coord_t xres; /* X-resolution overlay */
+ fb_coord_t yres; /* Y-resolution overlay */
+ struct fb_overlayinfo_s *oinfo; /* Framebuffer overlay information */
};
/* DMA2D is controlled by the following interface */
@@ -64,7 +64,7 @@ struct dma2d_layer_s
*/
#ifdef CONFIG_STM32_FB_CMAP
- int (*setclut)(FAR const struct fb_cmap_s * cmap);
+ int (*setclut)(const struct fb_cmap_s * cmap);
#endif
/* Name: fillcolor
@@ -84,8 +84,8 @@ struct dma2d_layer_s
* On error - -EINVAL
*/
- int (*fillcolor)(FAR struct stm32_dma2d_overlay_s *oinfo,
- FAR const struct fb_area_s *area, uint32_t argb);
+ int (*fillcolor)(struct stm32_dma2d_overlay_s *oinfo,
+ const struct fb_area_s *area, uint32_t argb);
/* Name: blit
*
@@ -107,10 +107,10 @@ struct dma2d_layer_s
* On error - -EINVAL
*/
- int (*blit)(FAR struct stm32_dma2d_overlay_s *doverlay,
+ int (*blit)(struct stm32_dma2d_overlay_s *doverlay,
uint32_t destxpos, uint32_t destypos,
- FAR struct stm32_dma2d_overlay_s *soverlay,
- FAR const struct fb_area_s *sarea);
+ struct stm32_dma2d_overlay_s *soverlay,
+ const struct fb_area_s *sarea);
/* Name: blend
*
@@ -135,12 +135,12 @@ struct dma2d_layer_s
* On error - -EINVAL or -ECANCELED
*/
- int (*blend)(FAR struct stm32_dma2d_overlay_s *doverlay,
+ int (*blend)(struct stm32_dma2d_overlay_s *doverlay,
uint32_t destxpos, uint32_t destypos,
- FAR struct stm32_dma2d_overlay_s *foverlay,
+ struct stm32_dma2d_overlay_s *foverlay,
uint32_t forexpos, uint32_t foreypos,
- FAR struct stm32_dma2d_overlay_s *boverlay,
- FAR const struct fb_area_s *barea);
+ struct stm32_dma2d_overlay_s *boverlay,
+ const struct fb_area_s *barea);
};
/****************************************************************************
@@ -160,7 +160,7 @@ struct dma2d_layer_s
*
****************************************************************************/
-FAR struct dma2d_layer_s *stm32_dma2ddev(void);
+struct dma2d_layer_s *stm32_dma2ddev(void);
/****************************************************************************
* Name: up_dma2dinitialize
diff --git a/arch/arm/src/stm32/stm32_dma_v1.c b/arch/arm/src/stm32/stm32_dma_v1.c
index aafcdcf9db..9caf78d6b9 100644
--- a/arch/arm/src/stm32/stm32_dma_v1.c
+++ b/arch/arm/src/stm32/stm32_dma_v1.c
@@ -277,12 +277,12 @@ static inline void dmachan_putreg(struct stm32_dma_s *dmach,
*
****************************************************************************/
-static int stm32_dmatake(FAR struct stm32_dma_s *dmach)
+static int stm32_dmatake(struct stm32_dma_s *dmach)
{
return nxsem_wait_uninterruptible(&dmach->sem);
}
-static inline void stm32_dmagive(FAR struct stm32_dma_s *dmach)
+static inline void stm32_dmagive(struct stm32_dma_s *dmach)
{
nxsem_post(&dmach->sem);
}
@@ -358,7 +358,7 @@ static int irq_to_channel_index(int irq)
*
****************************************************************************/
-static int stm32_dmainterrupt(int irq, void *context, FAR void *arg)
+static int stm32_dmainterrupt(int irq, void *context, void *arg)
{
struct stm32_dma_s *dmach;
uint32_t isr;
diff --git a/arch/arm/src/stm32/stm32_dma_v1mux.c b/arch/arm/src/stm32/stm32_dma_v1mux.c
index aec09c986c..d4d6010996 100644
--- a/arch/arm/src/stm32/stm32_dma_v1mux.c
+++ b/arch/arm/src/stm32/stm32_dma_v1mux.c
@@ -109,7 +109,7 @@ struct stm32_dmamux_s
uint32_t base; /* DMAMUX base address */
};
-typedef FAR const struct stm32_dmamux_s *DMA_MUX;
+typedef const struct stm32_dmamux_s *DMA_MUX;
/* This structure describes one DMA controller */
@@ -137,7 +137,7 @@ struct stm32_dmach_s
void *arg; /* Argument passed to callback function */
};
-typedef FAR struct stm32_dmach_s *DMA_CHANNEL;
+typedef struct stm32_dmach_s *DMA_CHANNEL;
/* DMA operations */
@@ -145,40 +145,40 @@ struct stm32_dma_ops_s
{
/* Disable the DMA transfer */
- CODE void (*dma_disable)(DMA_CHANNEL dmachan);
+ void (*dma_disable)(DMA_CHANNEL dmachan);
/* DMA interrupt */
- CODE int (*dma_interrupt)(int irq, void *context, FAR void *arg);
+ int (*dma_interrupt)(int irq, void *context, void *arg);
/* Setup the DMA */
- CODE void (*dma_setup)(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
- size_t ntransfers, uint32_t ccr);
+ void (*dma_setup)(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
+ size_t ntransfers, uint32_t ccr);
/* Start the DMA */
- CODE void (*dma_start)(DMA_HANDLE handle, dma_callback_t callback,
- void *arg, bool half);
+ void (*dma_start)(DMA_HANDLE handle, dma_callback_t callback,
+ void *arg, bool half);
/* Read remaining DMA bytes */
- CODE size_t (*dma_residual)(DMA_HANDLE handle);
+ size_t (*dma_residual)(DMA_HANDLE handle);
/* Check the DMA configuration */
- CODE bool (*dma_capable)(uint32_t maddr, uint32_t count, uint32_t ccr);
+ bool (*dma_capable)(uint32_t maddr, uint32_t count, uint32_t ccr);
#ifdef CONFIG_DEBUG_DMA_INFO
/* Sample the DMA registers */
- CODE void (*dma_sample)(DMA_HANDLE handle, struct stm32_dmaregs_s *regs);
+ void (*dma_sample)(DMA_HANDLE handle, struct stm32_dmaregs_s *regs);
/* Dump the DMA registers */
- CODE void (*dma_dump)(DMA_HANDLE handle,
- const struct stm32_dmaregs_s *regs,
- const char *msg);
+ void (*dma_dump)(DMA_HANDLE handle,
+ const struct stm32_dmaregs_s *regs,
+ const char *msg);
#endif
};
@@ -188,7 +188,7 @@ struct stm32_dma_ops_s
#if defined(CONFIG_STM32_DMA1) || defined(CONFIG_STM32_DMA2)
static void stm32_dma12_disable(DMA_CHANNEL dmachan);
-static int stm32_dma12_interrupt(int irq, void *context, FAR void *arg);
+static int stm32_dma12_interrupt(int irq, void *context, void *arg);
static void stm32_dma12_setup(DMA_HANDLE handle, uint32_t paddr,
uint32_t maddr, size_t ntransfers,
uint32_t ccr);
@@ -221,8 +221,8 @@ static void stm32_dmamux_dump(DMA_MUX dmamux, uint8_t channel,
#endif
static DMA_CHANNEL stm32_dma_channel_get(uint8_t channel,
uint8_t controller);
-static void stm32_gdma_limits_get(uint8_t controller, FAR uint8_t *first,
- FAR uint8_t *last);
+static void stm32_gdma_limits_get(uint8_t controller, uint8_t *first,
+ uint8_t *last);
/****************************************************************************
* Private Data
@@ -597,8 +597,8 @@ static DMA_CHANNEL stm32_dma_channel_get(uint8_t channel,
*
****************************************************************************/
-static void stm32_gdma_limits_get(uint8_t controller, FAR uint8_t *first,
- FAR uint8_t *nchan)
+static void stm32_gdma_limits_get(uint8_t controller, uint8_t *first,
+ uint8_t *nchan)
{
DEBUGASSERT(first != NULL);
DEBUGASSERT(nchan != NULL);
@@ -653,7 +653,7 @@ static void stm32_dma12_disable(DMA_CHANNEL dmachan)
*
****************************************************************************/
-static int stm32_dma12_interrupt(int irq, void *context, FAR void *arg)
+static int stm32_dma12_interrupt(int irq, void *context, void *arg)
{
DMA_CHANNEL dmachan;
uint32_t isr;
diff --git a/arch/arm/src/stm32/stm32_dma_v2.c b/arch/arm/src/stm32/stm32_dma_v2.c
index a8b9a5e06b..b37c63dd6e 100644
--- a/arch/arm/src/stm32/stm32_dma_v2.c
+++ b/arch/arm/src/stm32/stm32_dma_v2.c
@@ -235,12 +235,12 @@ static inline void dmast_putreg(struct stm32_dma_s *dmast, uint32_t offset,
*
****************************************************************************/
-static int stm32_dmatake(FAR struct stm32_dma_s *dmast)
+static int stm32_dmatake(struct stm32_dma_s *dmast)
{
return nxsem_wait_uninterruptible(&dmast->sem);
}
-static inline void stm32_dmagive(FAR struct stm32_dma_s *dmast)
+static inline void stm32_dmagive(struct stm32_dma_s *dmast)
{
nxsem_post(&dmast->sem);
}
@@ -254,8 +254,8 @@ static inline void stm32_dmagive(FAR struct stm32_dma_s *dmast)
*
****************************************************************************/
-static inline FAR struct stm32_dma_s *stm32_dmastream(unsigned int stream,
- unsigned int controller)
+static inline struct stm32_dma_s *stm32_dmastream(unsigned int stream,
+ unsigned int controller)
{
int index;
@@ -284,7 +284,7 @@ static inline FAR struct stm32_dma_s *stm32_dmastream(unsigned int stream,
*
****************************************************************************/
-static inline FAR struct stm32_dma_s *stm32_dmamap(unsigned long dmamap)
+static inline struct stm32_dma_s *stm32_dmamap(unsigned long dmamap)
{
/* Extract the DMA controller number from the bit encoded value */
@@ -511,7 +511,7 @@ void weak_function arm_dma_initialize(void)
DMA_HANDLE stm32_dmachannel(unsigned int dmamap)
{
- FAR struct stm32_dma_s *dmast;
+ struct stm32_dma_s *dmast;
int ret;
/* Get the stream index from the bit-encoded channel value */
diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c
index 3ba248160e..7064e70f5c 100644
--- a/arch/arm/src/stm32/stm32_eth.c
+++ b/arch/arm/src/stm32/stm32_eth.c
@@ -608,7 +608,7 @@
* header
*/
-#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf)
+#define BUF ((struct eth_hdr_s *)priv->dev.d_buf)
/****************************************************************************
* Private Types
@@ -678,41 +678,41 @@ static void stm32_checksetup(void);
/* Free buffer management */
-static void stm32_initbuffer(FAR struct stm32_ethmac_s *priv);
-static inline uint8_t *stm32_allocbuffer(FAR struct stm32_ethmac_s *priv);
-static inline void stm32_freebuffer(FAR struct stm32_ethmac_s *priv,
+static void stm32_initbuffer(struct stm32_ethmac_s *priv);
+static inline uint8_t *stm32_allocbuffer(struct stm32_ethmac_s *priv);
+static inline void stm32_freebuffer(struct stm32_ethmac_s *priv,
uint8_t *buffer);
-static inline bool stm32_isfreebuffer(FAR struct stm32_ethmac_s *priv);
+static inline bool stm32_isfreebuffer(struct stm32_ethmac_s *priv);
/* Common TX logic */
-static int stm32_transmit(FAR struct stm32_ethmac_s *priv);
+static int stm32_transmit(struct stm32_ethmac_s *priv);
static int stm32_txpoll(struct net_driver_s *dev);
-static void stm32_dopoll(FAR struct stm32_ethmac_s *priv);
+static void stm32_dopoll(struct stm32_ethmac_s *priv);
/* Interrupt handling */
-static void stm32_enableint(FAR struct stm32_ethmac_s *priv,
+static void stm32_enableint(struct stm32_ethmac_s *priv,
uint32_t ierbit);
-static void stm32_disableint(FAR struct stm32_ethmac_s *priv,
+static void stm32_disableint(struct stm32_ethmac_s *priv,
uint32_t ierbit);
-static void stm32_freesegment(FAR struct stm32_ethmac_s *priv,
- FAR struct eth_rxdesc_s *rxfirst, int segments);
-static int stm32_recvframe(FAR struct stm32_ethmac_s *priv);
-static void stm32_receive(FAR struct stm32_ethmac_s *priv);
-static void stm32_freeframe(FAR struct stm32_ethmac_s *priv);
-static void stm32_txdone(FAR struct stm32_ethmac_s *priv);
+static void stm32_freesegment(struct stm32_ethmac_s *priv,
+ struct eth_rxdesc_s *rxfirst, int segments);
+static int stm32_recvframe(struct stm32_ethmac_s *priv);
+static void stm32_receive(struct stm32_ethmac_s *priv);
+static void stm32_freeframe(struct stm32_ethmac_s *priv);
+static void stm32_txdone(struct stm32_ethmac_s *priv);
-static void stm32_interrupt_work(FAR void *arg);
-static int stm32_interrupt(int irq, FAR void *context, FAR void *arg);
+static void stm32_interrupt_work(void *arg);
+static int stm32_interrupt(int irq, void *context, void *arg);
/* Watchdog timer expirations */
-static void stm32_txtimeout_work(FAR void *arg);
+static void stm32_txtimeout_work(void *arg);
static void stm32_txtimeout_expiry(wdparm_t arg);
-static void stm32_poll_work(FAR void *arg);
+static void stm32_poll_work(void *arg);
static void stm32_poll_expiry(wdparm_t arg);
/* NuttX callback functions */
@@ -720,14 +720,14 @@ static void stm32_poll_expiry(wdparm_t arg);
static int stm32_ifup(struct net_driver_s *dev);
static int stm32_ifdown(struct net_driver_s *dev);
-static void stm32_txavail_work(FAR void *arg);
+static void stm32_txavail_work(void *arg);
static int stm32_txavail(struct net_driver_s *dev);
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
-static int stm32_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
+static int stm32_addmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
#ifdef CONFIG_NET_MCASTGROUP
-static int stm32_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
+static int stm32_rmmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
#ifdef CONFIG_NETDEV_IOCTL
static int stm32_ioctl(struct net_driver_s *dev, int cmd,
@@ -736,13 +736,13 @@ static int stm32_ioctl(struct net_driver_s *dev, int cmd,
/* Descriptor Initialization */
-static void stm32_txdescinit(FAR struct stm32_ethmac_s *priv);
-static void stm32_rxdescinit(FAR struct stm32_ethmac_s *priv);
+static void stm32_txdescinit(struct stm32_ethmac_s *priv);
+static void stm32_rxdescinit(struct stm32_ethmac_s *priv);
/* PHY Initialization */
#if defined(CONFIG_NETDEV_PHY_IOCTL) && defined(CONFIG_ARCH_PHY_INTERRUPT)
-static int stm32_phyintenable(FAR struct stm32_ethmac_s *priv);
+static int stm32_phyintenable(struct stm32_ethmac_s *priv);
#endif
#if defined(CONFIG_STM32_AUTONEG) || defined(CONFIG_NETDEV_PHY_IOCTL) || \
defined(CONFIG_ETH0_PHY_DM9161)
@@ -752,9 +752,9 @@ static int stm32_phyread(uint16_t phydevaddr, uint16_t phyregaddr,
static int stm32_phywrite(uint16_t phydevaddr, uint16_t phyregaddr,
uint16_t value);
#ifdef CONFIG_ETH0_PHY_DM9161
-static inline int stm32_dm9161(FAR struct stm32_ethmac_s *priv);
+static inline int stm32_dm9161(struct stm32_ethmac_s *priv);
#endif
-static int stm32_phyinit(FAR struct stm32_ethmac_s *priv);
+static int stm32_phyinit(struct stm32_ethmac_s *priv);
/* MAC/DMA Initialization */
@@ -764,15 +764,15 @@ static inline void stm32_selectmii(void);
#ifdef CONFIG_STM32_RMII
static inline void stm32_selectrmii(void);
#endif
-static inline void stm32_ethgpioconfig(FAR struct stm32_ethmac_s *priv);
-static int stm32_ethreset(FAR struct stm32_ethmac_s *priv);
-static int stm32_macconfig(FAR struct stm32_ethmac_s *priv);
-static void stm32_macaddress(FAR struct stm32_ethmac_s *priv);
+static inline void stm32_ethgpioconfig(struct stm32_ethmac_s *priv);
+static int stm32_ethreset(struct stm32_ethmac_s *priv);
+static int stm32_macconfig(struct stm32_ethmac_s *priv);
+static void stm32_macaddress(struct stm32_ethmac_s *priv);
#ifdef CONFIG_NET_ICMPv6
-static void stm32_ipv6multicast(FAR struct stm32_ethmac_s *priv);
+static void stm32_ipv6multicast(struct stm32_ethmac_s *priv);
#endif
-static int stm32_macenable(FAR struct stm32_ethmac_s *priv);
-static int stm32_ethconfig(FAR struct stm32_ethmac_s *priv);
+static int stm32_macenable(struct stm32_ethmac_s *priv);
+static int stm32_ethconfig(struct stm32_ethmac_s *priv);
/****************************************************************************
* Private Functions
@@ -917,7 +917,7 @@ static void stm32_checksetup(void)
*
****************************************************************************/
-static void stm32_initbuffer(FAR struct stm32_ethmac_s *priv)
+static void stm32_initbuffer(struct stm32_ethmac_s *priv)
{
uint8_t *buffer;
int i;
@@ -932,7 +932,7 @@ static void stm32_initbuffer(FAR struct stm32_ethmac_s *priv)
i < STM32_ETH_NFREEBUFFERS;
i++, buffer += CONFIG_STM32_ETH_BUFSIZE)
{
- sq_addlast((FAR sq_entry_t *)buffer, &priv->freeb);
+ sq_addlast((sq_entry_t *)buffer, &priv->freeb);
}
}
@@ -955,7 +955,7 @@ static void stm32_initbuffer(FAR struct stm32_ethmac_s *priv)
*
****************************************************************************/
-static inline uint8_t *stm32_allocbuffer(FAR struct stm32_ethmac_s *priv)
+static inline uint8_t *stm32_allocbuffer(struct stm32_ethmac_s *priv)
{
/* Allocate a buffer by returning the head of the free buffer list */
@@ -982,12 +982,12 @@ static inline uint8_t *stm32_allocbuffer(FAR struct stm32_ethmac_s *priv)
*
****************************************************************************/
-static inline void stm32_freebuffer(FAR struct stm32_ethmac_s *priv,
+static inline void stm32_freebuffer(struct stm32_ethmac_s *priv,
uint8_t *buffer)
{
/* Free the buffer by adding it to the end of the free buffer list */
- sq_addlast((FAR sq_entry_t *)buffer, &priv->freeb);
+ sq_addlast((sq_entry_t *)buffer, &priv->freeb);
}
/****************************************************************************
@@ -1008,7 +1008,7 @@ static inline void stm32_freebuffer(FAR struct stm32_ethmac_s *priv,
*
****************************************************************************/
-static inline bool stm32_isfreebuffer(FAR struct stm32_ethmac_s *priv)
+static inline bool stm32_isfreebuffer(struct stm32_ethmac_s *priv)
{
/* Return TRUE if the free buffer list is not empty */
@@ -1035,7 +1035,7 @@ static inline bool stm32_isfreebuffer(FAR struct stm32_ethmac_s *priv)
*
****************************************************************************/
-static int stm32_transmit(FAR struct stm32_ethmac_s *priv)
+static int stm32_transmit(struct stm32_ethmac_s *priv)
{
struct eth_txdesc_s *txdesc;
struct eth_txdesc_s *txfirst;
@@ -1251,8 +1251,8 @@ static int stm32_transmit(FAR struct stm32_ethmac_s *priv)
static int stm32_txpoll(struct net_driver_s *dev)
{
- FAR struct stm32_ethmac_s *priv =
- (FAR struct stm32_ethmac_s *)dev->d_private;
+ struct stm32_ethmac_s *priv =
+ (struct stm32_ethmac_s *)dev->d_private;
DEBUGASSERT(priv->dev.d_buf != NULL);
@@ -1358,9 +1358,9 @@ static int stm32_txpoll(struct net_driver_s *dev)
*
****************************************************************************/
-static void stm32_dopoll(FAR struct stm32_ethmac_s *priv)
+static void stm32_dopoll(struct stm32_ethmac_s *priv)
{
- FAR struct net_driver_s *dev = &priv->dev;
+ struct net_driver_s *dev = &priv->dev;
/* Check if the next TX descriptor is owned by the Ethernet DMA or
* CPU. We cannot perform the TX poll if we are unable to accept
@@ -1419,7 +1419,7 @@ static void stm32_dopoll(FAR struct stm32_ethmac_s *priv)
*
****************************************************************************/
-static void stm32_enableint(FAR struct stm32_ethmac_s *priv,
+static void stm32_enableint(struct stm32_ethmac_s *priv,
uint32_t ierbit)
{
uint32_t regval;
@@ -1448,7 +1448,7 @@ static void stm32_enableint(FAR struct stm32_ethmac_s *priv,
*
****************************************************************************/
-static void stm32_disableint(FAR struct stm32_ethmac_s *priv,
+static void stm32_disableint(struct stm32_ethmac_s *priv,
uint32_t ierbit)
{
uint32_t regval;
@@ -1488,8 +1488,8 @@ static void stm32_disableint(FAR struct stm32_ethmac_s *priv,
*
****************************************************************************/
-static void stm32_freesegment(FAR struct stm32_ethmac_s *priv,
- FAR struct eth_rxdesc_s *rxfirst, int segments)
+static void stm32_freesegment(struct stm32_ethmac_s *priv,
+ struct eth_rxdesc_s *rxfirst, int segments)
{
struct eth_rxdesc_s *rxdesc;
int i;
@@ -1545,7 +1545,7 @@ static void stm32_freesegment(FAR struct stm32_ethmac_s *priv,
*
****************************************************************************/
-static int stm32_recvframe(FAR struct stm32_ethmac_s *priv)
+static int stm32_recvframe(struct stm32_ethmac_s *priv)
{
struct eth_rxdesc_s *rxdesc;
struct eth_rxdesc_s *rxcurr;
@@ -1724,7 +1724,7 @@ static int stm32_recvframe(FAR struct stm32_ethmac_s *priv)
*
****************************************************************************/
-static void stm32_receive(FAR struct stm32_ethmac_s *priv)
+static void stm32_receive(struct stm32_ethmac_s *priv)
{
struct net_driver_s *dev = &priv->dev;
@@ -1896,7 +1896,7 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv)
*
****************************************************************************/
-static void stm32_freeframe(FAR struct stm32_ethmac_s *priv)
+static void stm32_freeframe(struct stm32_ethmac_s *priv)
{
struct eth_txdesc_s *txdesc;
int i;
@@ -1995,7 +1995,7 @@ static void stm32_freeframe(FAR struct stm32_ethmac_s *priv)
*
****************************************************************************/
-static void stm32_txdone(FAR struct stm32_ethmac_s *priv)
+static void stm32_txdone(struct stm32_ethmac_s *priv)
{
DEBUGASSERT(priv->txtail != NULL);
@@ -2038,9 +2038,9 @@ static void stm32_txdone(FAR struct stm32_ethmac_s *priv)
*
****************************************************************************/
-static void stm32_interrupt_work(FAR void *arg)
+static void stm32_interrupt_work(void *arg)
{
- FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)arg;
+ struct stm32_ethmac_s *priv = (struct stm32_ethmac_s *)arg;
uint32_t dmasr;
DEBUGASSERT(priv);
@@ -2145,9 +2145,9 @@ static void stm32_interrupt_work(FAR void *arg)
*
****************************************************************************/
-static int stm32_interrupt(int irq, FAR void *context, FAR void *arg)
+static int stm32_interrupt(int irq, void *context, void *arg)
{
- FAR struct stm32_ethmac_s *priv = &g_stm32ethmac[0];
+ struct stm32_ethmac_s *priv = &g_stm32ethmac[0];
uint32_t dmasr;
/* Get the DMA interrupt status bits (no MAC interrupts are expected) */
@@ -2199,9 +2199,9 @@ static int stm32_interrupt(int irq, FAR void *context, FAR void *arg)
*
****************************************************************************/
-static void stm32_txtimeout_work(FAR void *arg)
+static void stm32_txtimeout_work(void *arg)
{
- FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)arg;
+ struct stm32_ethmac_s *priv = (struct stm32_ethmac_s *)arg;
/* Reset the hardware. Just take the interface down, then back up again. */
@@ -2235,7 +2235,7 @@ static void stm32_txtimeout_work(FAR void *arg)
static void stm32_txtimeout_expiry(wdparm_t arg)
{
- FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)arg;
+ struct stm32_ethmac_s *priv = (struct stm32_ethmac_s *)arg;
nerr("ERROR: Timeout!\n");
@@ -2272,10 +2272,10 @@ static void stm32_txtimeout_expiry(wdparm_t arg)
*
****************************************************************************/
-static void stm32_poll_work(FAR void *arg)
+static void stm32_poll_work(void *arg)
{
- FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)arg;
- FAR struct net_driver_s *dev = &priv->dev;
+ struct stm32_ethmac_s *priv = (struct stm32_ethmac_s *)arg;
+ struct net_driver_s *dev = &priv->dev;
/* Check if the next TX descriptor is owned by the Ethernet DMA or
* CPU. We cannot perform the TX poll if we are unable to accept
@@ -2346,7 +2346,7 @@ static void stm32_poll_work(FAR void *arg)
static void stm32_poll_expiry(wdparm_t arg)
{
- FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)arg;
+ struct stm32_ethmac_s *priv = (struct stm32_ethmac_s *)arg;
/* Schedule to perform the interrupt processing on the worker thread. */
@@ -2373,8 +2373,8 @@ static void stm32_poll_expiry(wdparm_t arg)
static int stm32_ifup(struct net_driver_s *dev)
{
- FAR struct stm32_ethmac_s *priv =
- (FAR struct stm32_ethmac_s *)dev->d_private;
+ struct stm32_ethmac_s *priv =
+ (struct stm32_ethmac_s *)dev->d_private;
int ret;
#ifdef CONFIG_NET_IPv4
@@ -2432,8 +2432,8 @@ static int stm32_ifup(struct net_driver_s *dev)
static int stm32_ifdown(struct net_driver_s *dev)
{
- FAR struct stm32_ethmac_s *priv =
- (FAR struct stm32_ethmac_s *)dev->d_private;
+ struct stm32_ethmac_s *priv =
+ (struct stm32_ethmac_s *)dev->d_private;
irqstate_t flags;
int ret = OK;
@@ -2485,9 +2485,9 @@ static int stm32_ifdown(struct net_driver_s *dev)
*
****************************************************************************/
-static void stm32_txavail_work(FAR void *arg)
+static void stm32_txavail_work(void *arg)
{
- FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)arg;
+ struct stm32_ethmac_s *priv = (struct stm32_ethmac_s *)arg;
ninfo("ifup: %d\n", priv->ifup);
@@ -2525,8 +2525,8 @@ static void stm32_txavail_work(FAR void *arg)
static int stm32_txavail(struct net_driver_s *dev)
{
- FAR struct stm32_ethmac_s *priv =
- (FAR struct stm32_ethmac_s *)dev->d_private;
+ struct stm32_ethmac_s *priv =
+ (struct stm32_ethmac_s *)dev->d_private;
/* Is our single work structure available? It may not be if there are
* pending interrupt actions and we will have to ignore the Tx
@@ -2607,7 +2607,7 @@ static uint32_t stm32_calcethcrc(const uint8_t *data, size_t length)
****************************************************************************/
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
-static int stm32_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
+static int stm32_addmac(struct net_driver_s *dev, const uint8_t *mac)
{
uint32_t crc;
uint32_t hashindex;
@@ -2664,7 +2664,7 @@ static int stm32_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
****************************************************************************/
#ifdef CONFIG_NET_MCASTGROUP
-static int stm32_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
+static int stm32_rmmac(struct net_driver_s *dev, const uint8_t *mac)
{
uint32_t crc;
uint32_t hashindex;
@@ -2724,7 +2724,7 @@ static int stm32_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
-static void stm32_txdescinit(FAR struct stm32_ethmac_s *priv)
+static void stm32_txdescinit(struct stm32_ethmac_s *priv)
{
struct eth_txdesc_s *txdesc;
int i;
@@ -2808,7 +2808,7 @@ static void stm32_txdescinit(FAR struct stm32_ethmac_s *priv)
*
****************************************************************************/
-static void stm32_rxdescinit(FAR struct stm32_ethmac_s *priv)
+static void stm32_rxdescinit(struct stm32_ethmac_s *priv)
{
struct eth_rxdesc_s *rxdesc;
int i;
@@ -2906,8 +2906,8 @@ static void stm32_rxdescinit(FAR struct stm32_ethmac_s *priv)
static int stm32_ioctl(struct net_driver_s *dev, int cmd, unsigned long arg)
{
#if defined(CONFIG_NETDEV_PHY_IOCTL) && defined(CONFIG_ARCH_PHY_INTERRUPT)
- FAR struct stm32_ethmac_s *priv =
- (FAR struct stm32_ethmac_s *)dev->d_private;
+ struct stm32_ethmac_s *priv =
+ (struct stm32_ethmac_s *)dev->d_private;
#endif
int ret;
@@ -3151,7 +3151,7 @@ static int stm32_phywrite(uint16_t phydevaddr,
****************************************************************************/
#ifdef CONFIG_ETH0_PHY_DM9161
-static inline int stm32_dm9161(FAR struct stm32_ethmac_s *priv)
+static inline int stm32_dm9161(struct stm32_ethmac_s *priv)
{
uint16_t phyval;
int ret;
@@ -3216,7 +3216,7 @@ static inline int stm32_dm9161(FAR struct stm32_ethmac_s *priv)
*
****************************************************************************/
-static int stm32_phyinit(FAR struct stm32_ethmac_s *priv)
+static int stm32_phyinit(struct stm32_ethmac_s *priv)
{
#ifdef CONFIG_STM32_AUTONEG
volatile uint32_t timeout;
@@ -3500,7 +3500,7 @@ static inline void stm32_selectrmii(void)
*
****************************************************************************/
-static inline void stm32_ethgpioconfig(FAR struct stm32_ethmac_s *priv)
+static inline void stm32_ethgpioconfig(struct stm32_ethmac_s *priv)
{
/* Configure GPIO pins to support Ethernet */
@@ -3653,7 +3653,7 @@ static inline void stm32_ethgpioconfig(FAR struct stm32_ethmac_s *priv)
*
****************************************************************************/
-static int stm32_ethreset(FAR struct stm32_ethmac_s *priv)
+static int stm32_ethreset(struct stm32_ethmac_s *priv)
{
uint32_t regval;
uint32_t retries;
@@ -3723,7 +3723,7 @@ static int stm32_ethreset(FAR struct stm32_ethmac_s *priv)
*
****************************************************************************/
-static int stm32_macconfig(FAR struct stm32_ethmac_s *priv)
+static int stm32_macconfig(struct stm32_ethmac_s *priv)
{
uint32_t regval;
@@ -3807,9 +3807,9 @@ static int stm32_macconfig(FAR struct stm32_ethmac_s *priv)
*
****************************************************************************/
-static void stm32_macaddress(FAR struct stm32_ethmac_s *priv)
+static void stm32_macaddress(struct stm32_ethmac_s *priv)
{
- FAR struct net_driver_s *dev = &priv->dev;
+ struct net_driver_s *dev = &priv->dev;
uint32_t regval;
ninfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
@@ -3853,7 +3853,7 @@ static void stm32_macaddress(FAR struct stm32_ethmac_s *priv)
****************************************************************************/
#ifdef CONFIG_NET_ICMPv6
-static void stm32_ipv6multicast(FAR struct stm32_ethmac_s *priv)
+static void stm32_ipv6multicast(struct stm32_ethmac_s *priv)
{
struct net_driver_s *dev;
uint16_t tmp16;
@@ -3925,7 +3925,7 @@ static void stm32_ipv6multicast(FAR struct stm32_ethmac_s *priv)
*
****************************************************************************/
-static int stm32_macenable(FAR struct stm32_ethmac_s *priv)
+static int stm32_macenable(struct stm32_ethmac_s *priv)
{
uint32_t regval;
@@ -4012,7 +4012,7 @@ static int stm32_macenable(FAR struct stm32_ethmac_s *priv)
*
****************************************************************************/
-static int stm32_ethconfig(FAR struct stm32_ethmac_s *priv)
+static int stm32_ethconfig(struct stm32_ethmac_s *priv)
{
int ret;
diff --git a/arch/arm/src/stm32/stm32_exti_alarm.c b/arch/arm/src/stm32/stm32_exti_alarm.c
index 576f898f1a..17560d0634 100644
--- a/arch/arm/src/stm32/stm32_exti_alarm.c
+++ b/arch/arm/src/stm32/stm32_exti_alarm.c
@@ -58,7 +58,7 @@ static void *g_callback_arg;
*
****************************************************************************/
-static int stm32_exti_alarm_isr(int irq, void *context, FAR void *arg)
+static int stm32_exti_alarm_isr(int irq, void *context, void *arg)
{
int ret = OK;
diff --git a/arch/arm/src/stm32/stm32_exti_gpio.c b/arch/arm/src/stm32/stm32_exti_gpio.c
index b32b471898..57d89e3623 100644
--- a/arch/arm/src/stm32/stm32_exti_gpio.c
+++ b/arch/arm/src/stm32/stm32_exti_gpio.c
@@ -250,7 +250,7 @@ static int stm32_exti1510_isr(int irq, void *context, void *arg)
int stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
bool event, xcpt_t func, void *arg)
{
- FAR struct gpio_callback_s *shared_cbs;
+ struct gpio_callback_s *shared_cbs;
uint32_t pin = pinset & GPIO_PIN_MASK;
uint32_t exti = STM32_EXTI_BIT(pin);
int irq;
diff --git a/arch/arm/src/stm32/stm32_exti_pwr.c b/arch/arm/src/stm32/stm32_exti_pwr.c
index 6b667095bb..deb26f0ad2 100644
--- a/arch/arm/src/stm32/stm32_exti_pwr.c
+++ b/arch/arm/src/stm32/stm32_exti_pwr.c
@@ -63,7 +63,7 @@ static void *g_callback_arg;
*
****************************************************************************/
-static int stm32_exti_pvd_isr(int irq, void *context, FAR void *arg)
+static int stm32_exti_pvd_isr(int irq, void *context, void *arg)
{
int ret = OK;
diff --git a/arch/arm/src/stm32/stm32_exti_wakeup.c b/arch/arm/src/stm32/stm32_exti_wakeup.c
index 183cfe7cc5..205a630279 100644
--- a/arch/arm/src/stm32/stm32_exti_wakeup.c
+++ b/arch/arm/src/stm32/stm32_exti_wakeup.c
@@ -58,7 +58,7 @@ static void *g_callback_arg;
*
****************************************************************************/
-static int stm32_exti_wakeup_isr(int irq, void *context, FAR void *arg)
+static int stm32_exti_wakeup_isr(int irq, void *context, void *arg)
{
int ret = OK;
diff --git a/arch/arm/src/stm32/stm32_fdcan.c b/arch/arm/src/stm32/stm32_fdcan.c
index 22a8b27cf6..f36ddb2236 100644
--- a/arch/arm/src/stm32/stm32_fdcan.c
+++ b/arch/arm/src/stm32/stm32_fdcan.c
@@ -525,17 +525,17 @@ struct stm32_fdcan_s
/* FDCAN Register access */
-static uint32_t fdcan_getreg(FAR struct stm32_fdcan_s *priv, int offset);
-static void fdcan_putreg(FAR struct stm32_fdcan_s *priv, int offset,
+static uint32_t fdcan_getreg(struct stm32_fdcan_s *priv, int offset);
+static void fdcan_putreg(struct stm32_fdcan_s *priv, int offset,
uint32_t regval);
#ifdef CONFIG_STM32_FDCAN_REGDEBUG
-static void fdcan_dumpregs(FAR struct stm32_fdcan_s *priv,
- FAR const char *msg);
-static void fdcan_dumprxregs(FAR struct stm32_fdcan_s *priv,
- FAR const char *msg);
-static void fdcan_dumptxregs(FAR struct stm32_fdcan_s *priv,
- FAR const char *msg);
-static void fdcan_dumpramlayout(FAR struct stm32_fdcan_s *priv);
+static void fdcan_dumpregs(struct stm32_fdcan_s *priv,
+ const char *msg);
+static void fdcan_dumprxregs(struct stm32_fdcan_s *priv,
+ const char *msg);
+static void fdcan_dumptxregs(struct stm32_fdcan_s *priv,
+ const char *msg);
+static void fdcan_dumpramlayout(struct stm32_fdcan_s *priv);
#else
# define fdcan_dumpregs(priv,msg)
# define fdcan_dumprxregs(priv,msg)
@@ -545,47 +545,47 @@ static void fdcan_dumpramlayout(FAR struct stm32_fdcan_s *priv);
/* FDCAN helpers */
-static uint8_t fdcan_dlc2bytes(FAR struct stm32_fdcan_s *priv, uint8_t dlc);
+static uint8_t fdcan_dlc2bytes(struct stm32_fdcan_s *priv, uint8_t dlc);
#ifdef CONFIG_CAN_EXTID
-static int fdcan_add_extfilter(FAR struct stm32_fdcan_s *priv,
- FAR struct canioc_extfilter_s *extconfig);
-static int fdcan_del_extfilter(FAR struct stm32_fdcan_s *priv, int ndx);
+static int fdcan_add_extfilter(struct stm32_fdcan_s *priv,
+ struct canioc_extfilter_s *extconfig);
+static int fdcan_del_extfilter(struct stm32_fdcan_s *priv, int ndx);
#endif
-static int fdcan_add_stdfilter(FAR struct stm32_fdcan_s *priv,
- FAR struct canioc_stdfilter_s *stdconfig);
-static int fdcan_del_stdfilter(FAR struct stm32_fdcan_s *priv, int ndx);
+static int fdcan_add_stdfilter(struct stm32_fdcan_s *priv,
+ struct canioc_stdfilter_s *stdconfig);
+static int fdcan_del_stdfilter(struct stm32_fdcan_s *priv, int ndx);
static int
-fdcan_start_busoff_recovery_sequence(FAR struct stm32_fdcan_s *priv);
+fdcan_start_busoff_recovery_sequence(struct stm32_fdcan_s *priv);
/* CAN driver methods */
-static void fdcan_reset(FAR struct can_dev_s *dev);
-static int fdcan_setup(FAR struct can_dev_s *dev);
-static void fdcan_shutdown(FAR struct can_dev_s *dev);
-static void fdcan_rxint(FAR struct can_dev_s *dev, bool enable);
-static void fdcan_txint(FAR struct can_dev_s *dev, bool enable);
-static int fdcan_ioctl(FAR struct can_dev_s *dev, int cmd,
+static void fdcan_reset(struct can_dev_s *dev);
+static int fdcan_setup(struct can_dev_s *dev);
+static void fdcan_shutdown(struct can_dev_s *dev);
+static void fdcan_rxint(struct can_dev_s *dev, bool enable);
+static void fdcan_txint(struct can_dev_s *dev, bool enable);
+static int fdcan_ioctl(struct can_dev_s *dev, int cmd,
unsigned long arg);
-static int fdcan_remoterequest(FAR struct can_dev_s *dev, uint16_t id);
-static int fdcan_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg);
-static bool fdcan_txready(FAR struct can_dev_s *dev);
-static bool fdcan_txempty(FAR struct can_dev_s *dev);
+static int fdcan_remoterequest(struct can_dev_s *dev, uint16_t id);
+static int fdcan_send(struct can_dev_s *dev, struct can_msg_s *msg);
+static bool fdcan_txready(struct can_dev_s *dev);
+static bool fdcan_txempty(struct can_dev_s *dev);
/* FDCAN interrupt handling */
#ifdef CONFIG_CAN_ERRORS
-static void fdcan_error(FAR struct can_dev_s *dev, uint32_t status);
+static void fdcan_error(struct can_dev_s *dev, uint32_t status);
#endif
-static void fdcan_receive(FAR struct can_dev_s *dev,
- FAR volatile uint32_t *rxbuffer,
+static void fdcan_receive(struct can_dev_s *dev,
+ volatile uint32_t *rxbuffer,
unsigned long nwords);
-static int fdcan_interrupt(int irq, void *context, FAR void *arg);
+static int fdcan_interrupt(int irq, void *context, void *arg);
/* Hardware initialization */
-static int fdcan_hw_initialize(FAR struct stm32_fdcan_s *priv);
+static int fdcan_hw_initialize(struct stm32_fdcan_s *priv);
/****************************************************************************
* Private Data
@@ -831,11 +831,11 @@ static struct can_dev_s g_fdcan3dev;
****************************************************************************/
#ifdef CONFIG_STM32_FDCAN_REGDEBUG
-static uint32_t fdcan_getreg(FAR struct stm32_fdcan_s *priv, int offset)
+static uint32_t fdcan_getreg(struct stm32_fdcan_s *priv, int offset)
{
- FAR const struct stm32_config_s *config = priv->config;
- uintptr_t regaddr = 0;
- uint32_t regval = 0;
+ const struct stm32_config_s *config = priv->config;
+ uintptr_t regaddr = 0;
+ uint32_t regval = 0;
/* Read the value from the register */
@@ -886,9 +886,9 @@ static uint32_t fdcan_getreg(FAR struct stm32_fdcan_s *priv, int offset)
}
#else
-static uint32_t fdcan_getreg(FAR struct stm32_fdcan_s *priv, int offset)
+static uint32_t fdcan_getreg(struct stm32_fdcan_s *priv, int offset)
{
- FAR const struct stm32_config_s *config = priv->config;
+ const struct stm32_config_s *config = priv->config;
return getreg32(config->base + offset);
}
@@ -911,10 +911,10 @@ static uint32_t fdcan_getreg(FAR struct stm32_fdcan_s *priv, int offset)
****************************************************************************/
#ifdef CONFIG_STM32_FDCAN_REGDEBUG
-static void fdcan_putreg(FAR struct stm32_fdcan_s *priv, int offset,
+static void fdcan_putreg(struct stm32_fdcan_s *priv, int offset,
uint32_t regval)
{
- FAR const struct stm32_config_s *config = priv->config;
+ const struct stm32_config_s *config = priv->config;
uintptr_t regaddr = config->base + offset;
/* Show the register value being written */
@@ -927,10 +927,10 @@ static void fdcan_putreg(FAR struct stm32_fdcan_s *priv, int offset,
}
#else
-static void fdcan_putreg(FAR struct stm32_fdcan_s *priv, int offset,
+static void fdcan_putreg(struct stm32_fdcan_s *priv, int offset,
uint32_t regval)
{
- FAR const struct stm32_config_s *config = priv->config;
+ const struct stm32_config_s *config = priv->config;
putreg32(regval, config->base + offset);
}
@@ -951,10 +951,10 @@ static void fdcan_putreg(FAR struct stm32_fdcan_s *priv, int offset,
****************************************************************************/
#ifdef CONFIG_STM32_FDCAN_REGDEBUG
-static void fdcan_dumpregs(FAR struct stm32_fdcan_s *priv,
- FAR const char *msg)
+static void fdcan_dumpregs(struct stm32_fdcan_s *priv,
+ const char *msg)
{
- FAR const struct stm32_config_s *config = priv->config;
+ const struct stm32_config_s *config = priv->config;
caninfo("CAN%d Control and Status Registers: %s\n", config->port, msg);
caninfo(" Base: %08" PRIx32 "\n", config->base);
@@ -997,10 +997,10 @@ static void fdcan_dumpregs(FAR struct stm32_fdcan_s *priv,
****************************************************************************/
#ifdef CONFIG_STM32_FDCAN_REGDEBUG
-static void fdcan_dumprxregs(FAR struct stm32_fdcan_s *priv,
- FAR const char *msg)
+static void fdcan_dumprxregs(struct stm32_fdcan_s *priv,
+ const char *msg)
{
- FAR const struct stm32_config_s *config = priv->config;
+ const struct stm32_config_s *config = priv->config;
caninfo("CAN%d Rx Registers: %s\n", config->port, msg);
caninfo(" Base: %08" PRIx32 "\n", config->base);
@@ -1040,10 +1040,10 @@ static void fdcan_dumprxregs(FAR struct stm32_fdcan_s *priv,
****************************************************************************/
#ifdef CONFIG_STM32_FDCAN_REGDEBUG
-static void fdcan_dumptxregs(FAR struct stm32_fdcan_s *priv,
- FAR const char *msg)
+static void fdcan_dumptxregs(struct stm32_fdcan_s *priv,
+ const char *msg)
{
- FAR const struct stm32_config_s *config = priv->config;
+ const struct stm32_config_s *config = priv->config;
caninfo("CAN%d Tx Registers: %s\n", config->port, msg);
caninfo(" Base: %08" PRIx32 "\n", config->base);
@@ -1089,9 +1089,9 @@ static void fdcan_dumptxregs(FAR struct stm32_fdcan_s *priv,
****************************************************************************/
#ifdef CONFIG_STM32_FDCAN_REGDEBUG
-static void fdcan_dumpramlayout(FAR struct stm32_fdcan_s *priv)
+static void fdcan_dumpramlayout(struct stm32_fdcan_s *priv)
{
- FAR const struct stm32_config_s *config = priv->config;
+ const struct stm32_config_s *config = priv->config;
caninfo(" ******* FDCAN%d Message RAM layout *******\n", config->port);
caninfo(" Start # Elmnt Elmnt size (words)\n");
@@ -1164,7 +1164,7 @@ static void fdcan_dumpramlayout(FAR struct stm32_fdcan_s *priv)
*
****************************************************************************/
-static uint8_t fdcan_dlc2bytes(FAR struct stm32_fdcan_s *priv, uint8_t dlc)
+static uint8_t fdcan_dlc2bytes(struct stm32_fdcan_s *priv, uint8_t dlc)
{
if (dlc > 8)
{
@@ -1219,15 +1219,15 @@ static uint8_t fdcan_dlc2bytes(FAR struct stm32_fdcan_s *priv, uint8_t dlc)
****************************************************************************/
#ifdef CONFIG_CAN_EXTID
-static int fdcan_add_extfilter(FAR struct stm32_fdcan_s *priv,
- FAR struct canioc_extfilter_s *extconfig)
+static int fdcan_add_extfilter(struct stm32_fdcan_s *priv,
+ struct canioc_extfilter_s *extconfig)
{
- FAR const struct stm32_config_s *config = NULL;
- FAR volatile uint32_t *extfilter = NULL;
- uint32_t regval = 0;
- int word = 0;
- int bit = 0;
- int ndx = 0;
+ const struct stm32_config_s *config = NULL;
+ volatile uint32_t *extfilter = NULL;
+ uint32_t regval = 0;
+ int word = 0;
+ int bit = 0;
+ int ndx = 0;
DEBUGASSERT(priv != NULL && priv->config != NULL && extconfig != NULL);
config = priv->config;
@@ -1368,13 +1368,13 @@ static int fdcan_add_extfilter(FAR struct stm32_fdcan_s *priv,
****************************************************************************/
#ifdef CONFIG_CAN_EXTID
-static int fdcan_del_extfilter(FAR struct stm32_fdcan_s *priv, int ndx)
+static int fdcan_del_extfilter(struct stm32_fdcan_s *priv, int ndx)
{
- FAR const struct stm32_config_s *config = NULL;
- FAR volatile uint32_t *extfilter = NULL;
- uint32_t regval = 0;
- int word = 0;
- int bit = 0;
+ const struct stm32_config_s *config = NULL;
+ volatile uint32_t *extfilter = NULL;
+ uint32_t regval = 0;
+ int word = 0;
+ int bit = 0;
DEBUGASSERT(priv != NULL && priv->config != NULL);
config = priv->config;
@@ -1473,15 +1473,15 @@ static int fdcan_del_extfilter(FAR struct stm32_fdcan_s *priv, int ndx)
*
****************************************************************************/
-static int fdcan_add_stdfilter(FAR struct stm32_fdcan_s *priv,
- FAR struct canioc_stdfilter_s *stdconfig)
+static int fdcan_add_stdfilter(struct stm32_fdcan_s *priv,
+ struct canioc_stdfilter_s *stdconfig)
{
- FAR const struct stm32_config_s *config = NULL;
- FAR volatile uint32_t *stdfilter = NULL;
- uint32_t regval = 0;
- int word = 0;
- int bit = 0;
- int ndx = 0;
+ const struct stm32_config_s *config = NULL;
+ volatile uint32_t *stdfilter = NULL;
+ uint32_t regval = 0;
+ int word = 0;
+ int bit = 0;
+ int ndx = 0;
DEBUGASSERT(priv != NULL && priv->config != NULL);
config = priv->config;
@@ -1615,13 +1615,13 @@ static int fdcan_add_stdfilter(FAR struct stm32_fdcan_s *priv,
*
****************************************************************************/
-static int fdcan_del_stdfilter(FAR struct stm32_fdcan_s *priv, int ndx)
+static int fdcan_del_stdfilter(struct stm32_fdcan_s *priv, int ndx)
{
- FAR const struct stm32_config_s *config = NULL;
- FAR volatile uint32_t *stdfilter = NULL;
- uint32_t regval = 0;
- int word = 0;
- int bit = 0;
+ const struct stm32_config_s *config = NULL;
+ volatile uint32_t *stdfilter = NULL;
+ uint32_t regval = 0;
+ int word = 0;
+ int bit = 0;
DEBUGASSERT(priv != NULL && priv->config != NULL);
config = priv->config;
@@ -1720,7 +1720,7 @@ static int fdcan_del_stdfilter(FAR struct stm32_fdcan_s *priv, int ndx)
****************************************************************************/
static int
-fdcan_start_busoff_recovery_sequence(FAR struct stm32_fdcan_s *priv)
+fdcan_start_busoff_recovery_sequence(struct stm32_fdcan_s *priv)
{
uint32_t regval = 0;
@@ -1758,12 +1758,12 @@ fdcan_start_busoff_recovery_sequence(FAR struct stm32_fdcan_s *priv)
*
****************************************************************************/
-static void fdcan_reset(FAR struct can_dev_s *dev)
+static void fdcan_reset(struct can_dev_s *dev)
{
- FAR struct stm32_fdcan_s *priv = NULL;
- FAR const struct stm32_config_s *config = NULL;
- uint32_t regval = 0;
- irqstate_t flags;
+ struct stm32_fdcan_s *priv = NULL;
+ const struct stm32_config_s *config = NULL;
+ uint32_t regval = 0;
+ irqstate_t flags;
DEBUGASSERT(dev);
priv = dev->cd_priv;
@@ -1825,11 +1825,11 @@ static void fdcan_reset(FAR struct can_dev_s *dev)
*
****************************************************************************/
-static int fdcan_setup(FAR struct can_dev_s *dev)
+static int fdcan_setup(struct can_dev_s *dev)
{
- FAR struct stm32_fdcan_s *priv = NULL;
- FAR const struct stm32_config_s *config = NULL;
- int ret = 0;
+ struct stm32_fdcan_s *priv = NULL;
+ const struct stm32_config_s *config = NULL;
+ int ret = 0;
DEBUGASSERT(dev);
priv = dev->cd_priv;
@@ -1896,11 +1896,11 @@ static int fdcan_setup(FAR struct can_dev_s *dev)
*
****************************************************************************/
-static void fdcan_shutdown(FAR struct can_dev_s *dev)
+static void fdcan_shutdown(struct can_dev_s *dev)
{
- FAR struct stm32_fdcan_s *priv = NULL;
- FAR const struct stm32_config_s *config = NULL;
- uint32_t regval = 0;
+ struct stm32_fdcan_s *priv = NULL;
+ const struct stm32_config_s *config = NULL;
+ uint32_t regval = 0;
DEBUGASSERT(dev);
priv = dev->cd_priv;
@@ -1956,10 +1956,10 @@ static void fdcan_shutdown(FAR struct can_dev_s *dev)
*
****************************************************************************/
-static void fdcan_rxint(FAR struct can_dev_s *dev, bool enable)
+static void fdcan_rxint(struct can_dev_s *dev, bool enable)
{
- FAR struct stm32_fdcan_s *priv = dev->cd_priv;
- uint32_t regval = 0;
+ struct stm32_fdcan_s *priv = dev->cd_priv;
+ uint32_t regval = 0;
DEBUGASSERT(priv && priv->config);
@@ -1995,10 +1995,10 @@ static void fdcan_rxint(FAR struct can_dev_s *dev, bool enable)
*
****************************************************************************/
-static void fdcan_txint(FAR struct can_dev_s *dev, bool enable)
+static void fdcan_txint(struct can_dev_s *dev, bool enable)
{
- FAR struct stm32_fdcan_s *priv = dev->cd_priv;
- uint32_t regval = 0;
+ struct stm32_fdcan_s *priv = dev->cd_priv;
+ uint32_t regval = 0;
DEBUGASSERT(priv && priv->config);
@@ -2034,10 +2034,10 @@ static void fdcan_txint(FAR struct can_dev_s *dev, bool enable)
*
****************************************************************************/
-static int fdcan_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg)
+static int fdcan_ioctl(struct can_dev_s *dev, int cmd, unsigned long arg)
{
- FAR struct stm32_fdcan_s *priv = NULL;
- int ret = -ENOTTY;
+ struct stm32_fdcan_s *priv = NULL;
+ int ret = -ENOTTY;
caninfo("cmd=%04x arg=%lu\n", cmd, arg);
@@ -2061,8 +2061,8 @@ static int fdcan_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg)
case CANIOC_GET_BITTIMING:
{
- FAR struct canioc_bittiming_s *bt =
- (FAR struct canioc_bittiming_s *)arg;
+ struct canioc_bittiming_s *bt =
+ (struct canioc_bittiming_s *)arg;
uint32_t regval;
uint32_t nbrp;
@@ -2103,8 +2103,8 @@ static int fdcan_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg)
case CANIOC_SET_BITTIMING:
{
- FAR const struct canioc_bittiming_s *bt =
- (FAR const struct canioc_bittiming_s *)arg;
+ const struct canioc_bittiming_s *bt =
+ (const struct canioc_bittiming_s *)arg;
uint32_t nbrp;
uint32_t ntseg1;
uint32_t ntseg2;
@@ -2182,7 +2182,7 @@ static int fdcan_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg)
DEBUGASSERT(arg != 0);
ret = fdcan_add_extfilter(priv,
- (FAR struct canioc_extfilter_s *)arg);
+ (struct canioc_extfilter_s *)arg);
}
break;
@@ -2218,7 +2218,7 @@ static int fdcan_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg)
DEBUGASSERT(arg != 0);
ret = fdcan_add_stdfilter(priv,
- (FAR struct canioc_stdfilter_s *)arg);
+ (struct canioc_stdfilter_s *)arg);
}
break;
@@ -2278,7 +2278,7 @@ static int fdcan_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg)
*
****************************************************************************/
-static int fdcan_remoterequest(FAR struct can_dev_s *dev, uint16_t id)
+static int fdcan_remoterequest(struct can_dev_s *dev, uint16_t id)
{
/* REVISIT: Remote request not implemented */
@@ -2308,18 +2308,18 @@ static int fdcan_remoterequest(FAR struct can_dev_s *dev, uint16_t id)
*
****************************************************************************/
-static int fdcan_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
+static int fdcan_send(struct can_dev_s *dev, struct can_msg_s *msg)
{
- FAR struct stm32_fdcan_s *priv = NULL;
- FAR const struct stm32_config_s *config = NULL;
- FAR volatile uint32_t *txbuffer = NULL;
- FAR const uint8_t *src = NULL;
- FAR uint32_t *dest = NULL;
- uint32_t regval = 0;
- unsigned int ndx = 0;
- unsigned int nbytes = 0;
- uint32_t wordbuffer = 0;
- unsigned int i = 0;
+ struct stm32_fdcan_s *priv = NULL;
+ const struct stm32_config_s *config = NULL;
+ volatile uint32_t *txbuffer = NULL;
+ const uint8_t *src = NULL;
+ uint32_t *dest = NULL;
+ uint32_t regval = 0;
+ unsigned int ndx = 0;
+ unsigned int nbytes = 0;
+ uint32_t wordbuffer = 0;
+ unsigned int i = 0;
DEBUGASSERT(dev);
priv = dev->cd_priv;
@@ -2415,7 +2415,7 @@ static int fdcan_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
/* Followed by the amount of data corresponding to the DLC (T2..) */
- dest = (FAR uint32_t *)&txbuffer[2];
+ dest = (uint32_t *)&txbuffer[2];
src = msg->cm_data;
nbytes = fdcan_dlc2bytes(priv, msg->cm_hdr.ch_dlc);
@@ -2461,11 +2461,11 @@ static int fdcan_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
*
****************************************************************************/
-static bool fdcan_txready(FAR struct can_dev_s *dev)
+static bool fdcan_txready(struct can_dev_s *dev)
{
- FAR struct stm32_fdcan_s *priv = dev->cd_priv;
- uint32_t regval = 0;
- bool notfull = false;
+ struct stm32_fdcan_s *priv = dev->cd_priv;
+ uint32_t regval = 0;
+ bool notfull = false;
/* Return the state of the TX FIFOQ. Return TRUE if the TX FIFO/Queue is
* not full.
@@ -2495,12 +2495,12 @@ static bool fdcan_txready(FAR struct can_dev_s *dev)
*
****************************************************************************/
-static bool fdcan_txempty(FAR struct can_dev_s *dev)
+static bool fdcan_txempty(struct can_dev_s *dev)
{
- FAR struct stm32_fdcan_s *priv = dev->cd_priv;
- uint32_t regval = 0;
- int tffl = 0;
- bool empty = false;
+ struct stm32_fdcan_s *priv = dev->cd_priv;
+ uint32_t regval = 0;
+ int tffl = 0;
+ bool empty = false;
DEBUGASSERT(priv != NULL && priv->config != NULL);
@@ -2539,14 +2539,14 @@ static bool fdcan_txempty(FAR struct can_dev_s *dev)
****************************************************************************/
#ifdef CONFIG_CAN_ERRORS
-static void fdcan_error(FAR struct can_dev_s *dev, uint32_t status)
+static void fdcan_error(struct can_dev_s *dev, uint32_t status)
{
- FAR struct stm32_fdcan_s *priv = dev->cd_priv;
- struct can_hdr_s hdr;
- uint32_t psr = 0;
- uint16_t errbits = 0;
- uint8_t data[CAN_ERROR_DLC];
- int ret = 0;
+ struct stm32_fdcan_s *priv = dev->cd_priv;
+ struct can_hdr_s hdr;
+ uint32_t psr = 0;
+ uint16_t errbits = 0;
+ uint8_t data[CAN_ERROR_DLC];
+ int ret = 0;
/* Encode error bits */
@@ -2795,8 +2795,8 @@ static void fdcan_error(FAR struct can_dev_s *dev, uint32_t status)
*
****************************************************************************/
-static void fdcan_receive(FAR struct can_dev_s *dev,
- FAR volatile uint32_t *rxbuffer,
+static void fdcan_receive(struct can_dev_s *dev,
+ volatile uint32_t *rxbuffer,
unsigned long nwords)
{
struct can_hdr_s hdr;
@@ -2871,7 +2871,7 @@ static void fdcan_receive(FAR struct can_dev_s *dev,
/* And provide the CAN message to the upper half logic */
- ret = can_receive(dev, &hdr, (FAR uint8_t *)&rxbuffer[2]);
+ ret = can_receive(dev, &hdr, (uint8_t *)&rxbuffer[2]);
if (ret < 0)
{
canerr("ERROR: can_receive failed: %d\n", ret);
@@ -2892,18 +2892,18 @@ static void fdcan_receive(FAR struct can_dev_s *dev,
*
****************************************************************************/
-static int fdcan_interrupt(int irq, void *context, FAR void *arg)
+static int fdcan_interrupt(int irq, void *context, void *arg)
{
- FAR struct can_dev_s *dev = (FAR struct can_dev_s *)arg;
- FAR struct stm32_fdcan_s *priv = NULL;
- FAR const struct stm32_config_s *config = NULL;
- uint32_t ir = 0;
- uint32_t ie = 0;
- uint32_t pending = 0;
- uint32_t regval = 0;
- uint32_t psr = 0;
- unsigned int nelem = 0;
- unsigned int ndx = 0;
+ struct can_dev_s *dev = (struct can_dev_s *)arg;
+ struct stm32_fdcan_s *priv = NULL;
+ const struct stm32_config_s *config = NULL;
+ uint32_t ir = 0;
+ uint32_t ie = 0;
+ uint32_t pending = 0;
+ uint32_t regval = 0;
+ uint32_t psr = 0;
+ unsigned int nelem = 0;
+ unsigned int ndx = 0;
DEBUGASSERT(dev != NULL);
priv = dev->cd_priv;
@@ -3168,10 +3168,10 @@ static int fdcan_interrupt(int irq, void *context, FAR void *arg)
static int fdcan_hw_initialize(struct stm32_fdcan_s *priv)
{
- FAR const struct stm32_config_s *config = priv->config;
- FAR volatile uint32_t *msgram = NULL;
- uint32_t regval = 0;
- uint32_t cntr = 0;
+ const struct stm32_config_s *config = priv->config;
+ volatile uint32_t *msgram = NULL;
+ uint32_t regval = 0;
+ uint32_t cntr = 0;
caninfo("FDCAN%d\n", config->port);
@@ -3442,11 +3442,11 @@ static int fdcan_hw_initialize(struct stm32_fdcan_s *priv)
*
****************************************************************************/
-FAR struct can_dev_s *stm32_fdcaninitialize(int port)
+struct can_dev_s *stm32_fdcaninitialize(int port)
{
- FAR struct can_dev_s *dev = NULL;
- FAR struct stm32_fdcan_s *priv = NULL;
- FAR const struct stm32_config_s *config = NULL;
+ struct can_dev_s *dev = NULL;
+ struct stm32_fdcan_s *priv = NULL;
+ const struct stm32_config_s *config = NULL;
caninfo("FDCAN%d\n", port);
@@ -3503,7 +3503,7 @@ FAR struct can_dev_s *stm32_fdcaninitialize(int port)
priv->dbtp = config->dbtp;
dev->cd_ops = &g_fdcanops;
- dev->cd_priv = (FAR void *)priv;
+ dev->cd_priv = (void *)priv;
/* And put the hardware in the initial state */
diff --git a/arch/arm/src/stm32/stm32_fdcan.h b/arch/arm/src/stm32/stm32_fdcan.h
index e895e2b0fe..fc33c87d88 100644
--- a/arch/arm/src/stm32/stm32_fdcan.h
+++ b/arch/arm/src/stm32/stm32_fdcan.h
@@ -81,7 +81,7 @@ extern "C"
*
****************************************************************************/
-FAR struct can_dev_s *stm32_fdcaninitialize(int port);
+struct can_dev_s *stm32_fdcaninitialize(int port);
#endif
#ifdef CONFIG_STM32_FDCAN_SOCKET
diff --git a/arch/arm/src/stm32/stm32_fdcan_sock.c b/arch/arm/src/stm32/stm32_fdcan_sock.c
index 52388a61f5..e38bad9dc4 100644
--- a/arch/arm/src/stm32/stm32_fdcan_sock.c
+++ b/arch/arm/src/stm32/stm32_fdcan_sock.c
@@ -544,8 +544,8 @@ struct stm32_fdcan_s
/* A pointers to the list of TX/RX descriptors */
- FAR struct can_frame *txdesc;
- FAR struct can_frame *rxdesc;
+ struct can_frame *txdesc;
+ struct can_frame *rxdesc;
/* TX/RX pool */
@@ -564,17 +564,17 @@ struct stm32_fdcan_s
/* FDCAN Register access */
-static uint32_t fdcan_getreg(FAR struct stm32_fdcan_s *priv, int offset);
-static void fdcan_putreg(FAR struct stm32_fdcan_s *priv, int offset,
+static uint32_t fdcan_getreg(struct stm32_fdcan_s *priv, int offset);
+static void fdcan_putreg(struct stm32_fdcan_s *priv, int offset,
uint32_t regval);
#ifdef CONFIG_STM32_FDCAN_REGDEBUG
-static void fdcan_dumpregs(FAR struct stm32_fdcan_s *priv,
- FAR const char *msg);
-static void fdcan_dumprxregs(FAR struct stm32_fdcan_s *priv,
- FAR const char *msg);
-static void fdcan_dumptxregs(FAR struct stm32_fdcan_s *priv,
- FAR const char *msg);
-static void fdcan_dumpramlayout(FAR struct stm32_fdcan_s *priv);
+static void fdcan_dumpregs(struct stm32_fdcan_s *priv,
+ const char *msg);
+static void fdcan_dumprxregs(struct stm32_fdcan_s *priv,
+ const char *msg);
+static void fdcan_dumptxregs(struct stm32_fdcan_s *priv,
+ const char *msg);
+static void fdcan_dumpramlayout(struct stm32_fdcan_s *priv);
#else
# define fdcan_dumpregs(priv,msg)
# define fdcan_dumprxregs(priv,msg)
@@ -584,68 +584,68 @@ static void fdcan_dumpramlayout(FAR struct stm32_fdcan_s *priv);
/* CAN interrupt enable functions */
-static void fdcan_rx0int(FAR struct stm32_fdcan_s *priv, bool enable);
-static void fdcan_rx1int(FAR struct stm32_fdcan_s *priv, bool enable);
-static void fdcan_txint(FAR struct stm32_fdcan_s *priv, bool enable);
+static void fdcan_rx0int(struct stm32_fdcan_s *priv, bool enable);
+static void fdcan_rx1int(struct stm32_fdcan_s *priv, bool enable);
+static void fdcan_txint(struct stm32_fdcan_s *priv, bool enable);
#ifdef CONFIG_NET_CAN_ERRORS
-static void fdcan_errint(FAR struct stm32_fdcan_s *priv, bool enable);
+static void fdcan_errint(struct stm32_fdcan_s *priv, bool enable);
#endif
/* Common TX logic */
-static int fdcan_send(FAR struct stm32_fdcan_s *priv);
-static bool fdcan_txready(FAR struct stm32_fdcan_s *priv);
+static int fdcan_send(struct stm32_fdcan_s *priv);
+static bool fdcan_txready(struct stm32_fdcan_s *priv);
static int fdcan_txpoll(struct net_driver_s *dev);
/* CAN RX interrupt handling */
-static void fdcan_rx0interrupt_work(FAR void *arg);
-static void fdcan_rx1interrupt_work(FAR void *arg);
+static void fdcan_rx0interrupt_work(void *arg);
+static void fdcan_rx1interrupt_work(void *arg);
/* CAN TX interrupt handling */
-static void fdcan_txdone_work(FAR void *arg);
-static void fdcan_txdone(FAR struct stm32_fdcan_s *priv);
+static void fdcan_txdone_work(void *arg);
+static void fdcan_txdone(struct stm32_fdcan_s *priv);
#ifdef CONFIG_NET_CAN_ERRORS
/* CAN errors interrupt handling */
-static void fdcan_error_work(FAR void *arg);
+static void fdcan_error_work(void *arg);
#endif
/* FDCAN interrupt handling */
#ifdef CONFIG_NET_CAN_ERRORS
-static void fdcan_error(FAR struct stm32_fdcan_s *priv, uint32_t status);
+static void fdcan_error(struct stm32_fdcan_s *priv, uint32_t status);
#endif
-static void fdcan_receive(FAR struct stm32_fdcan_s *priv,
- FAR volatile uint32_t *rxbuffer,
+static void fdcan_receive(struct stm32_fdcan_s *priv,
+ volatile uint32_t *rxbuffer,
unsigned long nwords);
-static int fdcan_interrupt(int irq, void *context, FAR void *arg);
+static int fdcan_interrupt(int irq, void *context, void *arg);
/* Initialization */
-static void fdcan_reset(FAR struct stm32_fdcan_s *priv);
-static int fdcan_setup(FAR struct stm32_fdcan_s *priv);
-static void fdcan_shutdown(FAR struct stm32_fdcan_s *priv);
+static void fdcan_reset(struct stm32_fdcan_s *priv);
+static int fdcan_setup(struct stm32_fdcan_s *priv);
+static void fdcan_shutdown(struct stm32_fdcan_s *priv);
/* FDCAN helpers */
#if 0 /* not used for now */
static int
-fdcan_start_busoff_recovery_sequence(FAR struct stm32_fdcan_s *priv);
+fdcan_start_busoff_recovery_sequence(struct stm32_fdcan_s *priv);
#endif
/* Hardware initialization */
-static int fdcan_hw_initialize(FAR struct stm32_fdcan_s *priv);
+static int fdcan_hw_initialize(struct stm32_fdcan_s *priv);
/* NuttX callback functions */
static int fdcan_ifup(struct net_driver_s *dev);
static int fdcan_ifdown(struct net_driver_s *dev);
-static void fdcan_txavail_work(FAR void *arg);
+static void fdcan_txavail_work(void *arg);
static int fdcan_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NETDEV_IOCTL
@@ -880,11 +880,11 @@ static struct stm32_fdcan_s g_fdcan3priv;
****************************************************************************/
#ifdef CONFIG_STM32_FDCAN_REGDEBUG
-static uint32_t fdcan_getreg(FAR struct stm32_fdcan_s *priv, int offset)
+static uint32_t fdcan_getreg(struct stm32_fdcan_s *priv, int offset)
{
- FAR const struct stm32_config_s *config = priv->config;
- uintptr_t regaddr = 0;
- uint32_t regval = 0;
+ const struct stm32_config_s *config = priv->config;
+ uintptr_t regaddr = 0;
+ uint32_t regval = 0;
/* Read the value from the register */
@@ -935,9 +935,9 @@ static uint32_t fdcan_getreg(FAR struct stm32_fdcan_s *priv, int offset)
}
#else
-static uint32_t fdcan_getreg(FAR struct stm32_fdcan_s *priv, int offset)
+static uint32_t fdcan_getreg(struct stm32_fdcan_s *priv, int offset)
{
- FAR const struct stm32_config_s *config = priv->config;
+ const struct stm32_config_s *config = priv->config;
return getreg32(config->base + offset);
}
@@ -960,10 +960,10 @@ static uint32_t fdcan_getreg(FAR struct stm32_fdcan_s *priv, int offset)
****************************************************************************/
#ifdef CONFIG_STM32_FDCAN_REGDEBUG
-static void fdcan_putreg(FAR struct stm32_fdcan_s *priv, int offset,
+static void fdcan_putreg(struct stm32_fdcan_s *priv, int offset,
uint32_t regval)
{
- FAR const struct stm32_config_s *config = priv->config;
+ const struct stm32_config_s *config = priv->config;
uintptr_t regaddr = config->base + offset;
/* Show the register value being written */
@@ -976,10 +976,10 @@ static void fdcan_putreg(FAR struct stm32_fdcan_s *priv, int offset,
}
#else
-static void fdcan_putreg(FAR struct stm32_fdcan_s *priv, int offset,
+static void fdcan_putreg(struct stm32_fdcan_s *priv, int offset,
uint32_t regval)
{
- FAR const struct stm32_config_s *config = priv->config;
+ const struct stm32_config_s *config = priv->config;
putreg32(regval, config->base + offset);
}
@@ -1000,10 +1000,10 @@ static void fdcan_putreg(FAR struct stm32_fdcan_s *priv, int offset,
****************************************************************************/
#ifdef CONFIG_STM32_FDCAN_REGDEBUG
-static void fdcan_dumpregs(FAR struct stm32_fdcan_s *priv,
- FAR const char *msg)
+static void fdcan_dumpregs(struct stm32_fdcan_s *priv,
+ const char *msg)
{
- FAR const struct stm32_config_s *config = priv->config;
+ const struct stm32_config_s *config = priv->config;
ninfo("CAN%d Control and Status Registers: %s\n", config->port, msg);
ninfo(" Base: %08" PRIx32 "\n", config->base);
@@ -1046,10 +1046,10 @@ static void fdcan_dumpregs(FAR struct stm32_fdcan_s *priv,
****************************************************************************/
#ifdef CONFIG_STM32_FDCAN_REGDEBUG
-static void fdcan_dumprxregs(FAR struct stm32_fdcan_s *priv,
- FAR const char *msg)
+static void fdcan_dumprxregs(struct stm32_fdcan_s *priv,
+ const char *msg)
{
- FAR const struct stm32_config_s *config = priv->config;
+ const struct stm32_config_s *config = priv->config;
ninfo("CAN%d Rx Registers: %s\n", config->port, msg);
ninfo(" Base: %08" PRIx32 "\n", config->base);
@@ -1089,10 +1089,10 @@ static void fdcan_dumprxregs(FAR struct stm32_fdcan_s *priv,
****************************************************************************/
#ifdef CONFIG_STM32_FDCAN_REGDEBUG
-static void fdcan_dumptxregs(FAR struct stm32_fdcan_s *priv,
- FAR const char *msg)
+static void fdcan_dumptxregs(struct stm32_fdcan_s *priv,
+ const char *msg)
{
- FAR const struct stm32_config_s *config = priv->config;
+ const struct stm32_config_s *config = priv->config;
ninfo("CAN%d Tx Registers: %s\n", config->port, msg);
ninfo(" Base: %08" PRIx32 "\n", config->base);
@@ -1138,9 +1138,9 @@ static void fdcan_dumptxregs(FAR struct stm32_fdcan_s *priv,
****************************************************************************/
#ifdef CONFIG_STM32_FDCAN_REGDEBUG
-static void fdcan_dumpramlayout(FAR struct stm32_fdcan_s *priv)
+static void fdcan_dumpramlayout(struct stm32_fdcan_s *priv)
{
- FAR const struct stm32_config_s *config = priv->config;
+ const struct stm32_config_s *config = priv->config;
ninfo(" ******* FDCAN%d Message RAM layout *******\n", config->port);
ninfo(" Start # Elmnt Elmnt size (words)\n");
@@ -1214,7 +1214,7 @@ static void fdcan_dumpramlayout(FAR struct stm32_fdcan_s *priv)
#if 0 /* not used for now */
static int
-fdcan_start_busoff_recovery_sequence(FAR struct stm32_fdcan_s *priv)
+fdcan_start_busoff_recovery_sequence(struct stm32_fdcan_s *priv)
{
uint32_t regval = 0;
@@ -1253,11 +1253,11 @@ fdcan_start_busoff_recovery_sequence(FAR struct stm32_fdcan_s *priv)
*
****************************************************************************/
-static void fdcan_reset(FAR struct stm32_fdcan_s *priv)
+static void fdcan_reset(struct stm32_fdcan_s *priv)
{
- FAR const struct stm32_config_s *config = NULL;
- uint32_t regval = 0;
- irqstate_t flags;
+ const struct stm32_config_s *config = NULL;
+ uint32_t regval = 0;
+ irqstate_t flags;
DEBUGASSERT(priv);
config = priv->config;
@@ -1317,10 +1317,10 @@ static void fdcan_reset(FAR struct stm32_fdcan_s *priv)
*
****************************************************************************/
-static int fdcan_setup(FAR struct stm32_fdcan_s *priv)
+static int fdcan_setup(struct stm32_fdcan_s *priv)
{
- FAR const struct stm32_config_s *config = NULL;
- int ret = 0;
+ const struct stm32_config_s *config = NULL;
+ int ret = 0;
DEBUGASSERT(priv);
config = priv->config;
@@ -1385,10 +1385,10 @@ static int fdcan_setup(FAR struct stm32_fdcan_s *priv)
*
****************************************************************************/
-static void fdcan_shutdown(FAR struct stm32_fdcan_s *priv)
+static void fdcan_shutdown(struct stm32_fdcan_s *priv)
{
- FAR const struct stm32_config_s *config = NULL;
- uint32_t regval = 0;
+ const struct stm32_config_s *config = NULL;
+ uint32_t regval = 0;
DEBUGASSERT(priv);
config = priv->config;
@@ -1442,9 +1442,9 @@ static void fdcan_shutdown(FAR struct stm32_fdcan_s *priv)
*
****************************************************************************/
-static void fdcan_rx0int(FAR struct stm32_fdcan_s *priv, bool enable)
+static void fdcan_rx0int(struct stm32_fdcan_s *priv, bool enable)
{
- FAR const struct stm32_config_s *config = NULL;
+ const struct stm32_config_s *config = NULL;
uint32_t regval = 0;
DEBUGASSERT(priv);
@@ -1483,9 +1483,9 @@ static void fdcan_rx0int(FAR struct stm32_fdcan_s *priv, bool enable)
*
****************************************************************************/
-static void fdcan_rx1int(FAR struct stm32_fdcan_s *priv, bool enable)
+static void fdcan_rx1int(struct stm32_fdcan_s *priv, bool enable)
{
- FAR const struct stm32_config_s *config = NULL;
+ const struct stm32_config_s *config = NULL;
uint32_t regval = 0;
DEBUGASSERT(priv);
@@ -1524,9 +1524,9 @@ static void fdcan_rx1int(FAR struct stm32_fdcan_s *priv, bool enable)
*
****************************************************************************/
-static void fdcan_txint(FAR struct stm32_fdcan_s *priv, bool enable)
+static void fdcan_txint(struct stm32_fdcan_s *priv, bool enable)
{
- FAR const struct stm32_config_s *config = NULL;
+ const struct stm32_config_s *config = NULL;
uint32_t regval = 0;
DEBUGASSERT(priv);
@@ -1566,9 +1566,9 @@ static void fdcan_txint(FAR struct stm32_fdcan_s *priv, bool enable)
*
****************************************************************************/
-static void fdcan_errint(FAR struct stm32_fdcan_s *priv, bool enable)
+static void fdcan_errint(struct stm32_fdcan_s *priv, bool enable)
{
- FAR const struct stm32_config_s *config = NULL;
+ const struct stm32_config_s *config = NULL;
uint32_t regval = 0;
DEBUGASSERT(priv);
@@ -1616,17 +1616,17 @@ static void fdcan_errint(FAR struct stm32_fdcan_s *priv, bool enable)
*
****************************************************************************/
-static int fdcan_send(FAR struct stm32_fdcan_s *priv)
+static int fdcan_send(struct stm32_fdcan_s *priv)
{
- FAR const struct stm32_config_s *config = NULL;
- FAR volatile uint32_t *txbuffer = NULL;
- FAR const uint8_t *src = NULL;
- FAR uint32_t *dest = NULL;
- uint32_t regval = 0;
- unsigned int ndx = 0;
- unsigned int nbytes = 0;
- uint32_t wordbuffer = 0;
- unsigned int i = 0;
+ const struct stm32_config_s *config = NULL;
+ volatile uint32_t *txbuffer = NULL;
+ const uint8_t *src = NULL;
+ uint32_t *dest = NULL;
+ uint32_t regval = 0;
+ unsigned int ndx = 0;
+ unsigned int nbytes = 0;
+ uint32_t wordbuffer = 0;
+ unsigned int i = 0;
DEBUGASSERT(priv);
config = priv->config;
@@ -1777,7 +1777,7 @@ static int fdcan_send(FAR struct stm32_fdcan_s *priv)
}
#endif
- dest = (FAR uint32_t *)&txbuffer[2];
+ dest = (uint32_t *)&txbuffer[2];
/* Writes must be word length */
@@ -1821,7 +1821,7 @@ static int fdcan_send(FAR struct stm32_fdcan_s *priv)
*
****************************************************************************/
-static bool fdcan_txready(FAR struct stm32_fdcan_s *priv)
+static bool fdcan_txready(struct stm32_fdcan_s *priv)
{
uint32_t regval = 0;
bool notfull = false;
@@ -1844,13 +1844,13 @@ static bool fdcan_txready(FAR struct stm32_fdcan_s *priv)
*
****************************************************************************/
-static void fdcan_rx0interrupt_work(FAR void *arg)
+static void fdcan_rx0interrupt_work(void *arg)
{
- FAR struct stm32_fdcan_s *priv = (FAR struct stm32_fdcan_s *)arg;
- FAR const struct stm32_config_s *config = NULL;
- uint32_t regval = 0;
- unsigned int nelem = 0;
- unsigned int ndx = 0;
+ struct stm32_fdcan_s *priv = (struct stm32_fdcan_s *)arg;
+ const struct stm32_config_s *config = NULL;
+ uint32_t regval = 0;
+ unsigned int nelem = 0;
+ unsigned int ndx = 0;
DEBUGASSERT(priv);
config = priv->config;
@@ -1906,13 +1906,13 @@ static void fdcan_rx0interrupt_work(FAR void *arg)
*
****************************************************************************/
-static void fdcan_rx1interrupt_work(FAR void *arg)
+static void fdcan_rx1interrupt_work(void *arg)
{
- FAR struct stm32_fdcan_s *priv = (FAR struct stm32_fdcan_s *)arg;
- FAR const struct stm32_config_s *config = NULL;
- uint32_t regval = 0;
- unsigned int nelem = 0;
- unsigned int ndx = 0;
+ struct stm32_fdcan_s *priv = (struct stm32_fdcan_s *)arg;
+ const struct stm32_config_s *config = NULL;
+ uint32_t regval = 0;
+ unsigned int nelem = 0;
+ unsigned int ndx = 0;
DEBUGASSERT(priv);
config = priv->config;
@@ -1970,9 +1970,9 @@ static void fdcan_rx1interrupt_work(FAR void *arg)
* Name: fdcan_txdone_work
****************************************************************************/
-static void fdcan_txdone_work(FAR void *arg)
+static void fdcan_txdone_work(void *arg)
{
- FAR struct stm32_fdcan_s *priv = (FAR struct stm32_fdcan_s *)arg;
+ struct stm32_fdcan_s *priv = (struct stm32_fdcan_s *)arg;
fdcan_txdone(priv);
@@ -1989,11 +1989,11 @@ static void fdcan_txdone_work(FAR void *arg)
* Name: fdcan_txdone
****************************************************************************/
-static void fdcan_txdone(FAR struct stm32_fdcan_s *priv)
+static void fdcan_txdone(struct stm32_fdcan_s *priv)
{
- FAR const struct stm32_config_s *config = NULL;
- unsigned int ndx = 0;
- uint32_t regval = 0;
+ const struct stm32_config_s *config = NULL;
+ unsigned int ndx = 0;
+ uint32_t regval = 0;
DEBUGASSERT(priv);
config = priv->config;
@@ -2036,13 +2036,13 @@ static void fdcan_txdone(FAR struct stm32_fdcan_s *priv)
* Name: fdcan_error_work
****************************************************************************/
-static void fdcan_error_work(FAR void *arg)
+static void fdcan_error_work(void *arg)
{
- FAR struct stm32_fdcan_s *priv = (FAR struct stm32_fdcan_s *)arg;
- uint32_t pending = 0;
- uint32_t ir = 0;
- uint32_t ie = 0;
- uint32_t psr = 0;
+ struct stm32_fdcan_s *priv = (struct stm32_fdcan_s *)arg;
+ uint32_t pending = 0;
+ uint32_t ir = 0;
+ uint32_t ie = 0;
+ uint32_t psr = 0;
/* Get the set of pending interrupts. */
@@ -2144,7 +2144,7 @@ static void fdcan_error_work(FAR void *arg)
*
****************************************************************************/
-static void fdcan_error(FAR struct stm32_fdcan_s *priv, uint32_t status)
+static void fdcan_error(struct stm32_fdcan_s *priv, uint32_t status)
{
struct can_frame *frame = (struct can_frame *)priv->rxdesc;
uint32_t psr = 0;
@@ -2412,8 +2412,8 @@ static void fdcan_error(FAR struct stm32_fdcan_s *priv, uint32_t status)
*
****************************************************************************/
-static void fdcan_receive(FAR struct stm32_fdcan_s *priv,
- FAR volatile uint32_t *rxbuffer,
+static void fdcan_receive(struct stm32_fdcan_s *priv,
+ volatile uint32_t *rxbuffer,
unsigned long nwords)
{
fdcan_dumprxregs(dev->cd_priv, "Before receive");
@@ -2496,7 +2496,7 @@ static void fdcan_receive(FAR struct stm32_fdcan_s *priv,
else
#endif
{
- FAR struct can_frame *frame = (struct can_frame *)priv->rxdesc;
+ struct can_frame *frame = (struct can_frame *)priv->rxdesc;
/* Format the CAN header */
@@ -2583,10 +2583,10 @@ static void fdcan_receive(FAR struct stm32_fdcan_s *priv,
*
****************************************************************************/
-static int fdcan_interrupt(int irq, void *context, FAR void *arg)
+static int fdcan_interrupt(int irq, void *context, void *arg)
{
- FAR struct stm32_fdcan_s *priv = (FAR struct stm32_fdcan_s *)arg;
- uint32_t pending = 0;
+ struct stm32_fdcan_s *priv = (struct stm32_fdcan_s *)arg;
+ uint32_t pending = 0;
DEBUGASSERT(priv != NULL);
@@ -2669,10 +2669,10 @@ static int fdcan_interrupt(int irq, void *context, FAR void *arg)
static int fdcan_hw_initialize(struct stm32_fdcan_s *priv)
{
- FAR const struct stm32_config_s *config = NULL;
- FAR volatile uint32_t *msgram = NULL;
- uint32_t regval = 0;
- uint32_t cntr = 0;
+ const struct stm32_config_s *config = NULL;
+ volatile uint32_t *msgram = NULL;
+ uint32_t regval = 0;
+ uint32_t cntr = 0;
DEBUGASSERT(priv);
config = priv->config;
@@ -2939,9 +2939,9 @@ static int fdcan_hw_initialize(struct stm32_fdcan_s *priv)
static int fdcan_ifup(struct net_driver_s *dev)
{
- FAR struct stm32_fdcan_s *priv =
- (FAR struct stm32_fdcan_s *)dev->d_private;
- FAR const struct stm32_config_s *config = NULL;
+ struct stm32_fdcan_s *priv =
+ (struct stm32_fdcan_s *)dev->d_private;
+ const struct stm32_config_s *config = NULL;
DEBUGASSERT(priv);
config = priv->config;
@@ -2993,8 +2993,8 @@ static int fdcan_ifup(struct net_driver_s *dev)
static int fdcan_ifdown(struct net_driver_s *dev)
{
- FAR struct stm32_fdcan_s *priv =
- (FAR struct stm32_fdcan_s *)dev->d_private;
+ struct stm32_fdcan_s *priv =
+ (struct stm32_fdcan_s *)dev->d_private;
/* Disable CAN interrupts */
@@ -3034,8 +3034,8 @@ static int fdcan_ifdown(struct net_driver_s *dev)
static int fdcan_txpoll(struct net_driver_s *dev)
{
- FAR struct stm32_fdcan_s *priv =
- (FAR struct stm32_fdcan_s *)dev->d_private;
+ struct stm32_fdcan_s *priv =
+ (struct stm32_fdcan_s *)dev->d_private;
/* If the polling resulted in data that should be sent out on the network,
* the field d_len is set to a value > 0.
@@ -3086,9 +3086,9 @@ static int fdcan_txpoll(struct net_driver_s *dev)
*
****************************************************************************/
-static void fdcan_txavail_work(FAR void *arg)
+static void fdcan_txavail_work(void *arg)
{
- FAR struct stm32_fdcan_s *priv = (FAR struct stm32_fdcan_s *)arg;
+ struct stm32_fdcan_s *priv = (struct stm32_fdcan_s *)arg;
/* Ignore the notification if the interface is not yet up */
@@ -3133,8 +3133,8 @@ static void fdcan_txavail_work(FAR void *arg)
static int fdcan_txavail(struct net_driver_s *dev)
{
- FAR struct stm32_fdcan_s *priv =
- (FAR struct stm32_fdcan_s *)dev->d_private;
+ struct stm32_fdcan_s *priv =
+ (struct stm32_fdcan_s *)dev->d_private;
/* Is our single work structure available? It may not be if there are
* pending interrupt actions and we will have to ignore the Tx
@@ -3173,8 +3173,8 @@ static int fdcan_txavail(struct net_driver_s *dev)
static int fdcan_netdev_ioctl(struct net_driver_s *dev, int cmd,
unsigned long arg);
{
- FAR struct stm32_fdcan_s *priv =
- (FAR struct stm32_fdcan_s *)dev->d_private;
+ struct stm32_fdcan_s *priv =
+ (struct stm32_fdcan_s *)dev->d_private;
int ret = OK;
DEBUGASSERT(priv);
@@ -3212,9 +3212,9 @@ static int fdcan_netdev_ioctl(struct net_driver_s *dev, int cmd,
int stm32_fdcansockinitialize(int port)
{
- FAR struct stm32_fdcan_s *priv = NULL;
- FAR const struct stm32_config_s *config = NULL;
- int ret = OK;
+ struct stm32_fdcan_s *priv = NULL;
+ const struct stm32_config_s *config = NULL;
+ int ret = OK;
ninfo("FDCAN%d\n", port);
diff --git a/arch/arm/src/stm32/stm32_foc.c b/arch/arm/src/stm32/stm32_foc.c
index 3b43649270..1602c17d79 100644
--- a/arch/arm/src/stm32/stm32_foc.c
+++ b/arch/arm/src/stm32/stm32_foc.c
@@ -603,7 +603,7 @@
/* Get arch-specific FOC private part */
#define STM32_FOC_PRIV_FROM_DEV_GET(d) \
- ((FAR struct stm32_foc_priv_s *)(d)->lower->data)
+ ((struct stm32_foc_priv_s *)(d)->lower->data)
/* Get board-specific FOC data */
@@ -691,13 +691,13 @@ struct stm32_foc_dev_s
uint32_t adc_irq; /* ADC irq */
uint32_t jextval; /* JEXT configuration */
- FAR struct stm32_pwm_dev_s *pwm; /* PWM device reference */
- FAR struct adc_dev_s *adc_dev; /* ADC device reference */
- FAR struct stm32_adc_dev_s *adc; /* STM32 ADC device reference */
+ struct stm32_pwm_dev_s *pwm; /* PWM device reference */
+ struct adc_dev_s *adc_dev; /* ADC device reference */
+ struct stm32_adc_dev_s *adc; /* STM32 ADC device reference */
/* Interrupt handler for FOC device */
- CODE int (*adc_isr)(FAR struct foc_dev_s *dev);
+ int (*adc_isr)(struct foc_dev_s *dev);
};
/* STM32 FOC common data */
@@ -735,20 +735,20 @@ struct stm32_foc_priv_s
/* STM32 FOC devices */
- FAR struct stm32_foc_dev_s *dev;
+ struct stm32_foc_dev_s *dev;
/* Board-specific data */
- FAR struct stm32_foc_board_s *board;
+ struct stm32_foc_board_s *board;
/* Upper-half FOC controller callbacks */
- FAR const struct foc_callbacks_s *cb;
+ const struct foc_callbacks_s *cb;
#ifdef FOC_ADC_HAVE_CMN
/* Common data */
- FAR struct stm32_foc_adccmn_s *adc_cmn;
+ struct stm32_foc_adccmn_s *adc_cmn;
#endif
};
@@ -758,52 +758,52 @@ struct stm32_foc_priv_s
/* FOC lower-half operations */
-static int stm32_foc_configure(FAR struct foc_dev_s *dev,
- FAR struct foc_cfg_s *cfg);
-static int stm32_foc_setup(FAR struct foc_dev_s *dev);
-static int stm32_foc_shutdown(FAR struct foc_dev_s *dev);
-static int stm32_foc_start(FAR struct foc_dev_s *dev, bool state);
-static int stm32_foc_pwm_duty_set(FAR struct foc_dev_s *dev,
- FAR foc_duty_t *duty);
-static int stm32_foc_ioctl(FAR struct foc_dev_s *dev, int cmd,
+static int stm32_foc_configure(struct foc_dev_s *dev,
+ struct foc_cfg_s *cfg);
+static int stm32_foc_setup(struct foc_dev_s *dev);
+static int stm32_foc_shutdown(struct foc_dev_s *dev);
+static int stm32_foc_start(struct foc_dev_s *dev, bool state);
+static int stm32_foc_pwm_duty_set(struct foc_dev_s *dev,
+ foc_duty_t *duty);
+static int stm32_foc_ioctl(struct foc_dev_s *dev, int cmd,
unsigned long arg);
-static int stm32_foc_bind(FAR struct foc_dev_s *dev,
- FAR struct foc_callbacks_s *cb);
-static int stm32_foc_fault_clear(FAR struct foc_dev_s *dev);
+static int stm32_foc_bind(struct foc_dev_s *dev,
+ struct foc_callbacks_s *cb);
+static int stm32_foc_fault_clear(struct foc_dev_s *dev);
#ifdef CONFIG_MOTOR_FOC_TRACE
-int stm32_foc_trace_init(FAR struct foc_dev_s *dev);
-void stm32_foc_trace(FAR struct foc_dev_s *dev, int type, bool state);
+int stm32_foc_trace_init(struct foc_dev_s *dev);
+void stm32_foc_trace(struct foc_dev_s *dev, int type, bool state);
#endif
/* ADC handlers */
-static int stm32_foc_adc_handler(int irq, FAR void *context, FAR void *arg);
-static int stm32_foc_adc_calibration_handler(FAR struct foc_dev_s *dev);
-static int stm32_foc_worker_handler(FAR struct foc_dev_s *dev);
+static int stm32_foc_adc_handler(int irq, void *context, void *arg);
+static int stm32_foc_adc_calibration_handler(struct foc_dev_s *dev);
+static int stm32_foc_worker_handler(struct foc_dev_s *dev);
/* Helpers */
-static void stm32_foc_curr_get(FAR struct foc_dev_s *dev,
- FAR int16_t *curr, int shunts);
-static int stm32_foc_notifier_cfg(FAR struct foc_dev_s *dev, uint32_t freq);
-static int stm32_foc_pwm_cfg(FAR struct foc_dev_s *dev, uint32_t freq);
-static int stm32_foc_adc_cfg(FAR struct foc_dev_s *dev);
-static int stm32_foc_pwm_start(FAR struct foc_dev_s *dev, bool state);
-static int stm32_foc_adc_start(FAR struct foc_dev_s *dev, bool state);
-static int stm32_foc_calibration_start(FAR struct foc_dev_s *dev);
-static int stm32_foc_pwm_freq_set(FAR struct foc_dev_s *dev, uint32_t freq);
+static void stm32_foc_curr_get(struct foc_dev_s *dev,
+ int16_t *curr, int shunts);
+static int stm32_foc_notifier_cfg(struct foc_dev_s *dev, uint32_t freq);
+static int stm32_foc_pwm_cfg(struct foc_dev_s *dev, uint32_t freq);
+static int stm32_foc_adc_cfg(struct foc_dev_s *dev);
+static int stm32_foc_pwm_start(struct foc_dev_s *dev, bool state);
+static int stm32_foc_adc_start(struct foc_dev_s *dev, bool state);
+static int stm32_foc_calibration_start(struct foc_dev_s *dev);
+static int stm32_foc_pwm_freq_set(struct foc_dev_s *dev, uint32_t freq);
#if defined(CONFIG_STM32_FOC_ADC_CCR4)
-static void stm32_foc_adc_ccr4_trg_set(FAR struct foc_dev_s *dev,
+static void stm32_foc_adc_ccr4_trg_set(struct foc_dev_s *dev,
uint32_t offset);
#elif defined(CONFIG_STM32_FOC_ADC_TRGO)
-static void stm32_foc_adc_trgo_trg_set(FAR struct foc_dev_s *dev,
+static void stm32_foc_adc_trgo_trg_set(struct foc_dev_s *dev,
uint8_t rcr);
#else
# error Invalid FOC ADC trigger
#endif
-static void stm32_foc_hw_config_get(FAR struct foc_dev_s *dev);
+static void stm32_foc_hw_config_get(struct foc_dev_s *dev);
/****************************************************************************
* Private Data
@@ -885,10 +885,10 @@ static struct foc_dev_s g_foc_dev[CONFIG_MOTOR_FOC_INST];
void stm32_foc_sync_all(void)
{
- FAR struct foc_dev_s *dev = NULL;
- FAR struct stm32_foc_dev_s *foc_dev = NULL;
- uint32_t egr_reg[CONFIG_MOTOR_FOC_INST];
- int i = 0;
+ struct foc_dev_s *dev = NULL;
+ struct stm32_foc_dev_s *foc_dev = NULL;
+ uint32_t egr_reg[CONFIG_MOTOR_FOC_INST];
+ int i = 0;
/* Get registers to write */
@@ -926,11 +926,11 @@ void stm32_foc_sync_all(void)
*
****************************************************************************/
-static int stm32_foc_pwm_cfg(FAR struct foc_dev_s *dev, uint32_t freq)
+static int stm32_foc_pwm_cfg(struct foc_dev_s *dev, uint32_t freq)
{
- FAR struct stm32_foc_board_s *board = STM32_FOC_BOARD_FROM_DEV_GET(dev);
- FAR struct stm32_pwm_dev_s *pwm = PWM_FROM_FOC_DEV_GET(dev);
- int ret = OK;
+ struct stm32_foc_board_s *board = STM32_FOC_BOARD_FROM_DEV_GET(dev);
+ struct stm32_pwm_dev_s *pwm = PWM_FROM_FOC_DEV_GET(dev);
+ int ret = OK;
DEBUGASSERT(dev);
DEBUGASSERT(board);
@@ -980,11 +980,11 @@ errout:
*
****************************************************************************/
-static int stm32_foc_pwm_freq_set(FAR struct foc_dev_s *dev, uint32_t freq)
+static int stm32_foc_pwm_freq_set(struct foc_dev_s *dev, uint32_t freq)
{
- FAR struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
- FAR struct stm32_pwm_dev_s *pwm = PWM_FROM_FOC_DEV_GET(dev);
- int ret = OK;
+ struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
+ struct stm32_pwm_dev_s *pwm = PWM_FROM_FOC_DEV_GET(dev);
+ int ret = OK;
DEBUGASSERT(dev);
DEBUGASSERT(priv);
@@ -1017,7 +1017,7 @@ errout:
*
****************************************************************************/
-static int stm32_foc_start(FAR struct foc_dev_s *dev, bool state)
+static int stm32_foc_start(struct foc_dev_s *dev, bool state)
{
int ret = OK;
@@ -1053,10 +1053,10 @@ errout:
*
****************************************************************************/
-static int stm32_foc_pwm_start(FAR struct foc_dev_s *dev, bool state)
+static int stm32_foc_pwm_start(struct foc_dev_s *dev, bool state)
{
- FAR struct stm32_foc_board_s *board = STM32_FOC_BOARD_FROM_DEV_GET(dev);
- FAR struct stm32_pwm_dev_s *pwm = PWM_FROM_FOC_DEV_GET(dev);
+ struct stm32_foc_board_s *board = STM32_FOC_BOARD_FROM_DEV_GET(dev);
+ struct stm32_pwm_dev_s *pwm = PWM_FROM_FOC_DEV_GET(dev);
DEBUGASSERT(dev);
DEBUGASSERT(board);
@@ -1081,10 +1081,10 @@ static int stm32_foc_pwm_start(FAR struct foc_dev_s *dev, bool state)
*
****************************************************************************/
-static int stm32_foc_adc_start(FAR struct foc_dev_s *dev, bool state)
+static int stm32_foc_adc_start(struct foc_dev_s *dev, bool state)
{
- FAR struct stm32_foc_dev_s *foc_dev = STM32_FOC_DEV_FROM_DEV_GET(dev);
- FAR struct stm32_adc_dev_s *adc = ADC_FROM_FOC_DEV_GET(dev);
+ struct stm32_foc_dev_s *foc_dev = STM32_FOC_DEV_FROM_DEV_GET(dev);
+ struct stm32_adc_dev_s *adc = ADC_FROM_FOC_DEV_GET(dev);
DEBUGASSERT(dev);
DEBUGASSERT(foc_dev);
@@ -1130,9 +1130,9 @@ static int stm32_foc_adc_start(FAR struct foc_dev_s *dev, bool state)
*
****************************************************************************/
-static int stm32_foc_adc_cfg(FAR struct foc_dev_s *dev)
+static int stm32_foc_adc_cfg(struct foc_dev_s *dev)
{
- FAR struct stm32_foc_dev_s *foc_dev = STM32_FOC_DEV_FROM_DEV_GET(dev);
+ struct stm32_foc_dev_s *foc_dev = STM32_FOC_DEV_FROM_DEV_GET(dev);
DEBUGASSERT(dev);
DEBUGASSERT(foc_dev);
@@ -1154,10 +1154,10 @@ static int stm32_foc_adc_cfg(FAR struct foc_dev_s *dev)
*
****************************************************************************/
-static void stm32_foc_adc_ccr4_trg_set(FAR struct foc_dev_s *dev,
+static void stm32_foc_adc_ccr4_trg_set(struct foc_dev_s *dev,
uint32_t offset)
{
- FAR struct stm32_pwm_dev_s *pwm = PWM_FROM_FOC_DEV_GET(dev);
+ struct stm32_pwm_dev_s *pwm = PWM_FROM_FOC_DEV_GET(dev);
DEBUGASSERT(dev);
DEBUGASSERT(pwm);
@@ -1186,10 +1186,10 @@ static void stm32_foc_adc_ccr4_trg_set(FAR struct foc_dev_s *dev,
*
****************************************************************************/
-static void stm32_foc_adc_trgo_trg_set(FAR struct foc_dev_s *dev,
+static void stm32_foc_adc_trgo_trg_set(struct foc_dev_s *dev,
uint8_t rcr)
{
- FAR struct stm32_pwm_dev_s *pwm = PWM_FROM_FOC_DEV_GET(dev);
+ struct stm32_pwm_dev_s *pwm = PWM_FROM_FOC_DEV_GET(dev);
DEBUGASSERT(dev);
DEBUGASSERT(pwm);
@@ -1224,11 +1224,11 @@ static void stm32_foc_adc_trgo_trg_set(FAR struct foc_dev_s *dev,
*
****************************************************************************/
-static int stm32_foc_configure(FAR struct foc_dev_s *dev,
- FAR struct foc_cfg_s *cfg)
+static int stm32_foc_configure(struct foc_dev_s *dev,
+ struct foc_cfg_s *cfg)
{
- FAR struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
- int ret = OK;
+ struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
+ int ret = OK;
DEBUGASSERT(dev);
DEBUGASSERT(cfg);
@@ -1306,14 +1306,14 @@ errout:
*
****************************************************************************/
-static int stm32_foc_setup(FAR struct foc_dev_s *dev)
+static int stm32_foc_setup(struct foc_dev_s *dev)
{
- FAR struct stm32_foc_dev_s *foc_dev = STM32_FOC_DEV_FROM_DEV_GET(dev);
- FAR struct stm32_foc_board_s *board = STM32_FOC_BOARD_FROM_DEV_GET(dev);
- FAR struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
- FAR struct stm32_adc_dev_s *adc = ADC_FROM_FOC_DEV_GET(dev);
- struct adc_sample_time_s stime;
- int ret = OK;
+ struct stm32_foc_dev_s *foc_dev = STM32_FOC_DEV_FROM_DEV_GET(dev);
+ struct stm32_foc_board_s *board = STM32_FOC_BOARD_FROM_DEV_GET(dev);
+ struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
+ struct stm32_adc_dev_s *adc = ADC_FROM_FOC_DEV_GET(dev);
+ struct adc_sample_time_s stime;
+ int ret = OK;
DEBUGASSERT(dev);
DEBUGASSERT(foc_dev);
@@ -1446,12 +1446,12 @@ errout:
*
****************************************************************************/
-static int stm32_foc_shutdown(FAR struct foc_dev_s *dev)
+static int stm32_foc_shutdown(struct foc_dev_s *dev)
{
- FAR struct stm32_foc_dev_s *foc_dev = STM32_FOC_DEV_FROM_DEV_GET(dev);
- FAR struct stm32_foc_board_s *board = STM32_FOC_BOARD_FROM_DEV_GET(dev);
- FAR struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
- int ret = OK;
+ struct stm32_foc_dev_s *foc_dev = STM32_FOC_DEV_FROM_DEV_GET(dev);
+ struct stm32_foc_board_s *board = STM32_FOC_BOARD_FROM_DEV_GET(dev);
+ struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
+ int ret = OK;
DEBUGASSERT(dev);
DEBUGASSERT(foc_dev);
@@ -1522,7 +1522,7 @@ errout:
*
****************************************************************************/
-static int stm32_foc_ioctl(FAR struct foc_dev_s *dev, int cmd,
+static int stm32_foc_ioctl(struct foc_dev_s *dev, int cmd,
unsigned long arg)
{
return -1;
@@ -1536,10 +1536,10 @@ static int stm32_foc_ioctl(FAR struct foc_dev_s *dev, int cmd,
*
****************************************************************************/
-static int stm32_foc_adc_calibration_handler(FAR struct foc_dev_s *dev)
+static int stm32_foc_adc_calibration_handler(struct foc_dev_s *dev)
{
- FAR struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
- int i = 0;
+ struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
+ int i = 0;
DEBUGASSERT(dev);
DEBUGASSERT(priv);
@@ -1588,18 +1588,18 @@ static int stm32_foc_adc_calibration_handler(FAR struct foc_dev_s *dev)
*
****************************************************************************/
-static int stm32_foc_adc_handler(int irq, FAR void *context, FAR void *arg)
+static int stm32_foc_adc_handler(int irq, void *context, void *arg)
{
- FAR struct foc_dev_s *dev = NULL;
- FAR struct stm32_foc_priv_s *priv = NULL;
+ struct foc_dev_s *dev = NULL;
+ struct stm32_foc_priv_s *priv = NULL;
#ifdef CONFIG_MOTOR_FOC_TRACE
- FAR struct stm32_foc_board_s *board = NULL;
+ struct stm32_foc_board_s *board = NULL;
#endif
- FAR struct stm32_adc_dev_s *adc = NULL;
- FAR struct stm32_foc_dev_s *foc_dev = NULL;
- uint32_t pending = 0;
- int ret = OK;
- int i = 0;
+ struct stm32_adc_dev_s *adc = NULL;
+ struct stm32_foc_dev_s *foc_dev = NULL;
+ uint32_t pending = 0;
+ int ret = OK;
+ int i = 0;
UNUSED(irq);
UNUSED(context);
@@ -1685,12 +1685,12 @@ static int stm32_foc_adc_handler(int irq, FAR void *context, FAR void *arg)
*
****************************************************************************/
-static int stm32_foc_worker_handler(FAR struct foc_dev_s *dev)
+static int stm32_foc_worker_handler(struct foc_dev_s *dev)
{
- FAR struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
- FAR struct stm32_foc_board_s *board = STM32_FOC_BOARD_FROM_DEV_GET(dev);
- FAR struct stm32_adc_dev_s *adc = ADC_FROM_FOC_DEV_GET(dev);
- int ret = OK;
+ struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
+ struct stm32_foc_board_s *board = STM32_FOC_BOARD_FROM_DEV_GET(dev);
+ struct stm32_adc_dev_s *adc = ADC_FROM_FOC_DEV_GET(dev);
+ int ret = OK;
DEBUGASSERT(dev);
DEBUGASSERT(priv);
@@ -1727,16 +1727,16 @@ static int stm32_foc_worker_handler(FAR struct foc_dev_s *dev)
*
****************************************************************************/
-static int stm32_foc_calibration_start(FAR struct foc_dev_s *dev)
+static int stm32_foc_calibration_start(struct foc_dev_s *dev)
{
- FAR struct stm32_foc_dev_s *foc_dev = STM32_FOC_DEV_FROM_DEV_GET(dev);
- FAR struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
- FAR struct stm32_foc_board_s *board = STM32_FOC_BOARD_FROM_DEV_GET(dev);
- FAR struct stm32_pwm_dev_s *pwm = PWM_FROM_FOC_DEV_GET(dev);
- FAR struct stm32_adc_dev_s *adc = ADC_FROM_FOC_DEV_GET(dev);
- uint8_t i = 0;
- uint8_t ch = 0;
- int ret = OK;
+ struct stm32_foc_dev_s *foc_dev = STM32_FOC_DEV_FROM_DEV_GET(dev);
+ struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
+ struct stm32_foc_board_s *board = STM32_FOC_BOARD_FROM_DEV_GET(dev);
+ struct stm32_pwm_dev_s *pwm = PWM_FROM_FOC_DEV_GET(dev);
+ struct stm32_adc_dev_s *adc = ADC_FROM_FOC_DEV_GET(dev);
+ uint8_t i = 0;
+ uint8_t ch = 0;
+ int ret = OK;
DEBUGASSERT(dev);
DEBUGASSERT(foc_dev);
@@ -1857,12 +1857,12 @@ errout:
*
****************************************************************************/
-static int stm32_foc_pwm_duty_set(FAR struct foc_dev_s *dev,
- FAR foc_duty_t *duty)
+static int stm32_foc_pwm_duty_set(struct foc_dev_s *dev,
+ foc_duty_t *duty)
{
- FAR struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
- FAR struct stm32_foc_dev_s *foc_dev = STM32_FOC_DEV_FROM_DEV_GET(dev);
- uint16_t ccr[CONFIG_MOTOR_FOC_PHASES];
+ struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
+ struct stm32_foc_dev_s *foc_dev = STM32_FOC_DEV_FROM_DEV_GET(dev);
+ uint16_t ccr[CONFIG_MOTOR_FOC_PHASES];
DEBUGASSERT(dev);
DEBUGASSERT(duty);
@@ -1914,9 +1914,9 @@ static int stm32_foc_pwm_duty_set(FAR struct foc_dev_s *dev,
*
****************************************************************************/
-static void stm32_foc_hw_config_get(FAR struct foc_dev_s *dev)
+static void stm32_foc_hw_config_get(struct foc_dev_s *dev)
{
- FAR struct stm32_foc_board_s *board = STM32_FOC_BOARD_FROM_DEV_GET(dev);
+ struct stm32_foc_board_s *board = STM32_FOC_BOARD_FROM_DEV_GET(dev);
DEBUGASSERT(dev);
DEBUGASSERT(board);
@@ -1935,12 +1935,12 @@ static void stm32_foc_hw_config_get(FAR struct foc_dev_s *dev)
*
****************************************************************************/
-static void stm32_foc_curr_get(FAR struct foc_dev_s *dev,
- FAR int16_t *curr, int shunts)
+static void stm32_foc_curr_get(struct foc_dev_s *dev,
+ int16_t *curr, int shunts)
{
- FAR struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
- FAR struct stm32_adc_dev_s *adc = ADC_FROM_FOC_DEV_GET(dev);
- int i = 0;
+ struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
+ struct stm32_adc_dev_s *adc = ADC_FROM_FOC_DEV_GET(dev);
+ int i = 0;
DEBUGASSERT(dev);
DEBUGASSERT(priv);
@@ -1973,10 +1973,10 @@ static void stm32_foc_curr_get(FAR struct foc_dev_s *dev,
*
****************************************************************************/
-static int stm32_foc_notifier_cfg(FAR struct foc_dev_s *dev, uint32_t freq)
+static int stm32_foc_notifier_cfg(struct foc_dev_s *dev, uint32_t freq)
{
- FAR struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
- int ret = OK;
+ struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
+ int ret = OK;
DEBUGASSERT(dev);
DEBUGASSERT(priv);
@@ -2026,11 +2026,11 @@ errout:
*
****************************************************************************/
-static int stm32_foc_bind(FAR struct foc_dev_s *dev,
- FAR struct foc_callbacks_s *cb)
+static int stm32_foc_bind(struct foc_dev_s *dev,
+ struct foc_callbacks_s *cb)
{
- FAR struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
- int ret = OK;
+ struct stm32_foc_priv_s *priv = STM32_FOC_PRIV_FROM_DEV_GET(dev);
+ int ret = OK;
DEBUGASSERT(dev);
DEBUGASSERT(cb);
@@ -2054,9 +2054,9 @@ static int stm32_foc_bind(FAR struct foc_dev_s *dev,
*
****************************************************************************/
-static int stm32_foc_fault_clear(FAR struct foc_dev_s *dev)
+static int stm32_foc_fault_clear(struct foc_dev_s *dev)
{
- FAR struct stm32_foc_board_s *board = STM32_FOC_BOARD_FROM_DEV_GET(dev);
+ struct stm32_foc_board_s *board = STM32_FOC_BOARD_FROM_DEV_GET(dev);
DEBUGASSERT(dev);
DEBUGASSERT(board);
@@ -2074,9 +2074,9 @@ static int stm32_foc_fault_clear(FAR struct foc_dev_s *dev)
*
****************************************************************************/
-int stm32_foc_trace_init(FAR struct foc_dev_s *dev)
+int stm32_foc_trace_init(struct foc_dev_s *dev)
{
- FAR struct stm32_foc_board_s *board = STM32_FOC_BOARD_FROM_DEV_GET(dev);
+ struct stm32_foc_board_s *board = STM32_FOC_BOARD_FROM_DEV_GET(dev);
DEBUGASSERT(dev);
DEBUGASSERT(board);
@@ -2094,9 +2094,9 @@ int stm32_foc_trace_init(FAR struct foc_dev_s *dev)
*
****************************************************************************/
-void stm32_foc_trace(FAR struct foc_dev_s *dev, int type, bool state)
+void stm32_foc_trace(struct foc_dev_s *dev, int type, bool state)
{
- FAR struct stm32_foc_board_s *board = STM32_FOC_BOARD_FROM_DEV_GET(dev);
+ struct stm32_foc_board_s *board = STM32_FOC_BOARD_FROM_DEV_GET(dev);
DEBUGASSERT(dev);
DEBUGASSERT(board);
@@ -2127,27 +2127,27 @@ void stm32_foc_trace(FAR struct foc_dev_s *dev, int type, bool state)
*
****************************************************************************/
-FAR struct foc_dev_s *
-stm32_foc_initialize(int inst, FAR struct stm32_foc_board_s *board)
+struct foc_dev_s *
+stm32_foc_initialize(int inst, struct stm32_foc_board_s *board)
{
- FAR struct foc_dev_s *dev = NULL;
- FAR struct stm32_foc_adc_s *adc_cfg = NULL;
- FAR struct foc_lower_s *foc_lower = NULL;
- FAR struct stm32_foc_dev_s *foc_dev = NULL;
- FAR struct stm32_foc_priv_s *foc_priv = NULL;
+ struct foc_dev_s *dev = NULL;
+ struct stm32_foc_adc_s *adc_cfg = NULL;
+ struct foc_lower_s *foc_lower = NULL;
+ struct stm32_foc_dev_s *foc_dev = NULL;
+ struct stm32_foc_priv_s *foc_priv = NULL;
#ifdef FOC_ADC_HAVE_CMN
- FAR struct stm32_foc_adccmn_s *adc_cmn = NULL;
-#endif
- uint32_t adc_irq = 0;
- uint32_t pwm_base = 0;
- uint32_t jextval = 0;
- uint8_t pwm_inst = 0;
- uint8_t adc_inst = 0;
- uint32_t pwmfzbit = 0;
- int i = 0;
+ struct stm32_foc_adccmn_s *adc_cmn = NULL;
+#endif
+ uint32_t adc_irq = 0;
+ uint32_t pwm_base = 0;
+ uint32_t jextval = 0;
+ uint8_t pwm_inst = 0;
+ uint8_t adc_inst = 0;
+ uint32_t pwmfzbit = 0;
+ int i = 0;
#ifdef CONFIG_STM32_FOC_G4_ADCCHAN0_WORKAROUND
- FAR uint8_t *adc_chan = NULL;
- uint8_t adc_nchan = 0;
+ uint8_t *adc_chan = NULL;
+ uint8_t adc_nchan = 0;
#endif
DEBUGASSERT(board != NULL);
@@ -2259,7 +2259,7 @@ stm32_foc_initialize(int inst, FAR struct stm32_foc_board_s *board)
/* Get the advanced timer PWM interface */
- foc_dev->pwm = (FAR struct stm32_pwm_dev_s *)stm32_pwminitialize(pwm_inst);
+ foc_dev->pwm = (struct stm32_pwm_dev_s *)stm32_pwminitialize(pwm_inst);
if (foc_dev->pwm == NULL)
{
mtrerr("Failed to get PWM%d interface\n", pwm_inst);
@@ -2346,7 +2346,7 @@ stm32_foc_initialize(int inst, FAR struct stm32_foc_board_s *board)
/* Get ADC private part */
- foc_dev->adc = (FAR struct stm32_adc_dev_s *)foc_dev->adc_dev->ad_priv;
+ foc_dev->adc = (struct stm32_adc_dev_s *)foc_dev->adc_dev->ad_priv;
/* Froze timer and reset outputs when core is halted.
* TODO: move this to stm32_pwm.c and configure from Kconfig
@@ -2371,7 +2371,7 @@ stm32_foc_initialize(int inst, FAR struct stm32_foc_board_s *board)
/* Connect the lower-half device with the upper-half device */
- dev->lower = (FAR void *)foc_lower;
+ dev->lower = (void *)foc_lower;
/* Return upper-half driver instance */
@@ -2402,9 +2402,9 @@ errout:
*
****************************************************************************/
-FAR struct adc_dev_s *stm32_foc_adcget(FAR struct foc_dev_s *dev)
+struct adc_dev_s *stm32_foc_adcget(struct foc_dev_s *dev)
{
- FAR struct stm32_foc_dev_s *foc_dev = STM32_FOC_DEV_FROM_DEV_GET(dev);
+ struct stm32_foc_dev_s *foc_dev = STM32_FOC_DEV_FROM_DEV_GET(dev);
DEBUGASSERT(dev);
DEBUGASSERT(foc_dev);
diff --git a/arch/arm/src/stm32/stm32_foc.h b/arch/arm/src/stm32/stm32_foc.h
index 8c80621ea8..b1df4ae174 100644
--- a/arch/arm/src/stm32/stm32_foc.h
+++ b/arch/arm/src/stm32/stm32_foc.h
@@ -62,15 +62,15 @@ struct stm32_foc_adc_s
/* The list of ADC channels (regular first, then injected) */
- FAR uint8_t *chan;
+ uint8_t *chan;
/* The list of ADC pins */
- FAR uint32_t *pins;
+ uint32_t *pins;
/* The list of ADC channels sample time configuration */
- FAR adc_channel_t *stime;
+ adc_channel_t *stime;
};
/* Board-specific operations.
@@ -83,37 +83,37 @@ struct stm32_foc_board_ops_s
{
/* Board-specific setup */
- CODE int (*setup)(FAR struct foc_dev_s *dev);
+ int (*setup)(struct foc_dev_s *dev);
/* Board-specific shutdown */
- CODE int (*shutdown)(FAR struct foc_dev_s *dev);
+ int (*shutdown)(struct foc_dev_s *dev);
/* Board-specific calibration setup */
- CODE int (*calibration)(FAR struct foc_dev_s *dev, bool state);
+ int (*calibration)(struct foc_dev_s *dev, bool state);
/* Board-specific fault clear */
- CODE int (*fault_clear)(FAR struct foc_dev_s *dev);
+ int (*fault_clear)(struct foc_dev_s *dev);
/* Board-specific PWM start */
- CODE int (*pwm_start)(FAR struct foc_dev_s *dev, bool state);
+ int (*pwm_start)(struct foc_dev_s *dev, bool state);
/* Get phase currents */
- CODE int (*current_get)(FAR struct foc_dev_s *dev, FAR int16_t *curr_raw,
- FAR foc_current_t *curr);
+ int (*current_get)(struct foc_dev_s *dev, int16_t *curr_raw,
+ foc_current_t *curr);
#ifdef CONFIG_MOTOR_FOC_TRACE
/* FOC trace interface setup */
- CODE int (*trace_init)(FAR struct foc_dev_s *dev);
+ int (*trace_init)(struct foc_dev_s *dev);
/* FOC trace */
- CODE void (*trace)(FAR struct foc_dev_s *dev, int type, bool state);
+ void (*trace)(struct foc_dev_s *dev, int type, bool state);
#endif
};
@@ -123,7 +123,7 @@ struct stm32_foc_board_data_s
{
/* ADC configuration */
- FAR struct stm32_foc_adc_s *adc_cfg;
+ struct stm32_foc_adc_s *adc_cfg;
/* PWM deadtime register value */
@@ -144,11 +144,11 @@ struct stm32_foc_board_s
{
/* Board-specific FOC operations */
- FAR struct stm32_foc_board_ops_s *ops;
+ struct stm32_foc_board_ops_s *ops;
/* Board-specific FOC data */
- FAR struct stm32_foc_board_data_s *data;
+ struct stm32_foc_board_data_s *data;
};
/****************************************************************************
@@ -170,14 +170,14 @@ extern "C"
* Name: stm32_foc_initialize
****************************************************************************/
-FAR struct foc_dev_s *
-stm32_foc_initialize(int inst, FAR struct stm32_foc_board_s *board);
+struct foc_dev_s *
+stm32_foc_initialize(int inst, struct stm32_foc_board_s *board);
/****************************************************************************
* Name: stm32_foc_adcget
****************************************************************************/
-FAR struct adc_dev_s *stm32_foc_adcget(FAR struct foc_dev_s *dev);
+struct adc_dev_s *stm32_foc_adcget(struct foc_dev_s *dev);
#undef EXTERN
#if defined(__cplusplus)
diff --git a/arch/arm/src/stm32/stm32_freerun.h b/arch/arm/src/stm32/stm32_freerun.h
index bb5f6b4ef6..49a6544c1a 100644
--- a/arch/arm/src/stm32/stm32_freerun.h
+++ b/arch/arm/src/stm32/stm32_freerun.h
@@ -47,9 +47,9 @@
struct stm32_freerun_s
{
- uint8_t chan; /* The timer/counter in use */
- uint8_t width; /* Width of timer (16- or 32-bits) */
- FAR struct stm32_tim_dev_s *tch; /* Handle returned by stm32_tim_init() */
+ uint8_t chan; /* The timer/counter in use */
+ uint8_t width; /* Width of timer (16- or 32-bits) */
+ struct stm32_tim_dev_s *tch; /* Handle returned by stm32_tim_init() */
uint32_t frequency;
#ifndef CONFIG_CLOCK_TIMEKEEPING
diff --git a/arch/arm/src/stm32/stm32_hall3ph.c b/arch/arm/src/stm32/stm32_hall3ph.c
index 6a997b872d..6600a3a3e2 100644
--- a/arch/arm/src/stm32/stm32_hall3ph.c
+++ b/arch/arm/src/stm32/stm32_hall3ph.c
@@ -47,18 +47,18 @@ struct stm32_lowerhalf_s
* half callback structure:
*/
- FAR const struct hall3_ops_s *ops; /* Lower half callback structure */
- struct stm32_hall3ph_cfg_s cfg; /* Configuration */
+ const struct hall3_ops_s *ops; /* Lower half callback structure */
+ struct stm32_hall3ph_cfg_s cfg; /* Configuration */
};
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
-int stm32_hall3ph_setup(FAR struct hall3_lowerhalf_s *lower);
-int stm32_hall3ph_shutdown(FAR struct hall3_lowerhalf_s *lower);
-int stm32_hall3ph_position(FAR struct hall3_lowerhalf_s *lower,
- FAR uint8_t *pos);
+int stm32_hall3ph_setup(struct hall3_lowerhalf_s *lower);
+int stm32_hall3ph_shutdown(struct hall3_lowerhalf_s *lower);
+int stm32_hall3ph_position(struct hall3_lowerhalf_s *lower,
+ uint8_t *pos);
/****************************************************************************
* Private Data
@@ -83,9 +83,9 @@ struct hall3_ops_s g_hall3ph_ops =
*
****************************************************************************/
-int stm32_hall3ph_setup(FAR struct hall3_lowerhalf_s *lower)
+int stm32_hall3ph_setup(struct hall3_lowerhalf_s *lower)
{
- FAR struct stm32_lowerhalf_s *priv = (FAR struct stm32_lowerhalf_s *)lower;
+ struct stm32_lowerhalf_s *priv = (struct stm32_lowerhalf_s *)lower;
DEBUGASSERT(priv);
@@ -106,9 +106,9 @@ int stm32_hall3ph_setup(FAR struct hall3_lowerhalf_s *lower)
*
****************************************************************************/
-int stm32_hall3ph_shutdown(FAR struct hall3_lowerhalf_s *lower)
+int stm32_hall3ph_shutdown(struct hall3_lowerhalf_s *lower)
{
- FAR struct stm32_lowerhalf_s *priv = (FAR struct stm32_lowerhalf_s *)lower;
+ struct stm32_lowerhalf_s *priv = (struct stm32_lowerhalf_s *)lower;
DEBUGASSERT(priv);
@@ -129,15 +129,15 @@ int stm32_hall3ph_shutdown(FAR struct hall3_lowerhalf_s *lower)
*
****************************************************************************/
-int stm32_hall3ph_position(FAR struct hall3_lowerhalf_s *lower,
- FAR uint8_t *pos)
+int stm32_hall3ph_position(struct hall3_lowerhalf_s *lower,
+ uint8_t *pos)
{
- FAR struct stm32_lowerhalf_s *priv = (FAR struct stm32_lowerhalf_s *)lower;
- uint8_t ha = 0;
- uint8_t hb = 0;
- uint8_t hc = 0;
- uint8_t i = 0;
- uint8_t thr = (priv->cfg.samples / 2);
+ struct stm32_lowerhalf_s *priv = (struct stm32_lowerhalf_s *)lower;
+ uint8_t ha = 0;
+ uint8_t hb = 0;
+ uint8_t hc = 0;
+ uint8_t i = 0;
+ uint8_t thr = (priv->cfg.samples / 2);
DEBUGASSERT(priv);
@@ -171,15 +171,15 @@ int stm32_hall3ph_position(FAR struct hall3_lowerhalf_s *lower,
*
****************************************************************************/
-int stm32_hall3ph_initialize(FAR const char *devpath,
- FAR struct stm32_hall3ph_cfg_s *cfg)
+int stm32_hall3ph_initialize(const char *devpath,
+ struct stm32_hall3ph_cfg_s *cfg)
{
- FAR struct stm32_lowerhalf_s *priv = NULL;
- int ret = OK;
+ struct stm32_lowerhalf_s *priv = NULL;
+ int ret = OK;
/* Allocate the lower-half data structure */
- priv = (FAR struct stm32_lowerhalf_s *)
+ priv = (struct stm32_lowerhalf_s *)
kmm_zalloc(sizeof(struct stm32_lowerhalf_s));
if (priv == NULL)
{
@@ -198,7 +198,7 @@ int stm32_hall3ph_initialize(FAR const char *devpath,
/* Initialize a Hall effect sensor interface. */
- ret = hall3_register(devpath, (FAR struct hall3_lowerhalf_s *)priv);
+ ret = hall3_register(devpath, (struct hall3_lowerhalf_s *)priv);
if (ret < 0)
{
snerr("ERROR: hall3ph_register failed: %d\n", ret);
diff --git a/arch/arm/src/stm32/stm32_hall3ph.h b/arch/arm/src/stm32/stm32_hall3ph.h
index b6efb88a75..7d0ea3b38a 100644
--- a/arch/arm/src/stm32/stm32_hall3ph.h
+++ b/arch/arm/src/stm32/stm32_hall3ph.h
@@ -57,7 +57,7 @@ struct stm32_hall3ph_cfg_s
*
****************************************************************************/
-int stm32_hall3ph_initialize(FAR const char *devpath,
- FAR struct stm32_hall3ph_cfg_s *cfg);
+int stm32_hall3ph_initialize(const char *devpath,
+ struct stm32_hall3ph_cfg_s *cfg);
#endif /* __ARCH_ARM_SRC_STM32_STM32_HALL3PH_H */
diff --git a/arch/arm/src/stm32/stm32_hrtim.c b/arch/arm/src/stm32/stm32_hrtim.c
index a06deae15b..157aa244b9 100644
--- a/arch/arm/src/stm32/stm32_hrtim.c
+++ b/arch/arm/src/stm32/stm32_hrtim.c
@@ -431,7 +431,7 @@ struct stm32_hrtim_timcmn_s
struct stm32_hrtim_tim_s
{
struct stm32_hrtim_timcmn_s tim; /* Common Timer data */
- FAR void *priv; /* Timer private data */
+ void *priv; /* Timer private data */
};
/* Master Timer private data structure */
@@ -625,162 +625,162 @@ struct stm32_hrtim_s
/* HRTIM Driver Methods */
-static int stm32_hrtim_open(FAR struct file *filep);
-static int stm32_hrtim_close(FAR struct file *filep);
-static int stm32_hrtim_ioctl(FAR struct file *filep, int cmd,
+static int stm32_hrtim_open(struct file *filep);
+static int stm32_hrtim_close(struct file *filep);
+static int stm32_hrtim_ioctl(struct file *filep, int cmd,
unsigned long arg);
#endif
/* HRTIM Register access */
-static uint32_t hrtim_cmn_getreg(FAR struct stm32_hrtim_s *priv,
+static uint32_t hrtim_cmn_getreg(struct stm32_hrtim_s *priv,
uint32_t offset);
-static void hrtim_cmn_putreg(FAR struct stm32_hrtim_s *priv, uint32_t offset,
+static void hrtim_cmn_putreg(struct stm32_hrtim_s *priv, uint32_t offset,
uint32_t value);
#ifdef CONFIG_STM32_HRTIM_BURST
-static void hrtim_cmn_modifyreg(FAR struct stm32_hrtim_s *priv,
+static void hrtim_cmn_modifyreg(struct stm32_hrtim_s *priv,
uint32_t offset, uint32_t clrbits,
uint32_t setbits);
#endif
-static void hrtim_tim_putreg(FAR struct stm32_hrtim_s *priv, uint8_t timer,
+static void hrtim_tim_putreg(struct stm32_hrtim_s *priv, uint8_t timer,
uint32_t offset, uint32_t value);
-static void hrtim_tim_modifyreg(FAR struct stm32_hrtim_s *priv,
+static void hrtim_tim_modifyreg(struct stm32_hrtim_s *priv,
uint8_t timer, uint32_t offset,
uint32_t clrbits, uint32_t setbits);
#ifdef CONFIG_DEBUG_TIMER_INFO
-static void hrtim_dumpregs(FAR struct stm32_hrtim_s *priv, uint8_t timer,
- FAR const char *msg);
+static void hrtim_dumpregs(struct stm32_hrtim_s *priv, uint8_t timer,
+ const char *msg);
#else
# define hrtim_dumpregs(priv, timer, msg)
#endif
/* HRTIM helper */
-static uint32_t hrtim_tim_getreg(FAR struct stm32_hrtim_s *priv,
+static uint32_t hrtim_tim_getreg(struct stm32_hrtim_s *priv,
uint8_t timer, uint32_t offset);
-static FAR struct stm32_hrtim_tim_s *
- hrtim_tim_get(FAR struct stm32_hrtim_s *priv,
+static struct stm32_hrtim_tim_s *
+ hrtim_tim_get(struct stm32_hrtim_s *priv,
uint8_t timer);
#if defined(CONFIG_STM32_HRTIM_PWM) || defined(CONFIG_STM32_HRTIM_FAULTS)
-static FAR struct stm32_hrtim_slave_priv_s *
- hrtim_slave_get(FAR struct stm32_hrtim_s *priv, uint8_t timer);
+static struct stm32_hrtim_slave_priv_s *
+ hrtim_slave_get(struct stm32_hrtim_s *priv, uint8_t timer);
#endif
-static uint32_t hrtim_base_get(FAR struct stm32_hrtim_s *priv,
+static uint32_t hrtim_base_get(struct stm32_hrtim_s *priv,
uint8_t timer);
/* Configuration */
-static int hrtim_dll_cal(FAR struct stm32_hrtim_s *priv);
-static int hrtim_tim_clock_config(FAR struct stm32_hrtim_s *priv,
+static int hrtim_dll_cal(struct stm32_hrtim_s *priv);
+static int hrtim_tim_clock_config(struct stm32_hrtim_s *priv,
uint8_t timer, uint8_t pre);
-static int hrtim_tim_clocks_config(FAR struct stm32_hrtim_s *priv);
+static int hrtim_tim_clocks_config(struct stm32_hrtim_s *priv);
#if defined(CONFIG_STM32_HRTIM_PWM) || defined(CONFIG_STM32_HRTIM_SYNC)
-static int hrtim_gpios_config(FAR struct stm32_hrtim_s *priv);
+static int hrtim_gpios_config(struct stm32_hrtim_s *priv);
#endif
#if defined(CONFIG_STM32_HRTIM_CAPTURE)
-static int hrtim_capture_config(FAR struct stm32_hrtim_s *priv);
-static uint16_t hrtim_capture_get(FAR struct hrtim_dev_s *dev, uint8_t timer,
+static int hrtim_capture_config(struct stm32_hrtim_s *priv);
+static uint16_t hrtim_capture_get(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t index);
-static int hrtim_soft_capture(FAR struct hrtim_dev_s *dev, uint8_t timer,
+static int hrtim_soft_capture(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t index);
#endif
#if defined(CONFIG_STM32_HRTIM_SYNC)
-static int hrtim_synch_config(FAR struct stm32_hrtim_s *priv);
+static int hrtim_synch_config(struct stm32_hrtim_s *priv);
#endif
#if defined(CONFIG_STM32_HRTIM_PWM)
-static int hrtim_outputs_config(FAR struct stm32_hrtim_s *priv);
-static int hrtim_outputs_enable(FAR struct hrtim_dev_s *dev,
+static int hrtim_outputs_config(struct stm32_hrtim_s *priv);
+static int hrtim_outputs_enable(struct hrtim_dev_s *dev,
uint16_t outputs, bool state);
-static int hrtim_output_set_set(FAR struct hrtim_dev_s *dev, uint16_t output,
+static int hrtim_output_set_set(struct hrtim_dev_s *dev, uint16_t output,
uint32_t set);
-static int hrtim_output_rst_set(FAR struct hrtim_dev_s *dev, uint16_t output,
+static int hrtim_output_rst_set(struct hrtim_dev_s *dev, uint16_t output,
uint32_t rst);
#endif
#ifdef HRTIM_HAVE_ADC
-static int hrtim_adc_config(FAR struct stm32_hrtim_s *priv);
+static int hrtim_adc_config(struct stm32_hrtim_s *priv);
#endif
#ifdef CONFIG_STM32_HRTIM_DAC
-static int hrtim_dac_config(FAR struct stm32_hrtim_s *priv);
+static int hrtim_dac_config(struct stm32_hrtim_s *priv);
#endif
#ifdef CONFIG_STM32_HRTIM_DMA
-static int hrtim_dma_cfg(FAR struct stm32_hrtim_s *priv);
-static int hrtim_tim_dma_cfg(FAR struct stm32_hrtim_s *priv, uint8_t timer,
+static int hrtim_dma_cfg(struct stm32_hrtim_s *priv);
+static int hrtim_tim_dma_cfg(struct stm32_hrtim_s *priv, uint8_t timer,
uint16_t dma);
#endif
#ifdef CONFIG_STM32_HRTIM_DEADTIME
-static int hrtim_deadtime_update(FAR struct hrtim_dev_s *dev, uint8_t timer,
+static int hrtim_deadtime_update(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t dt, uint16_t value);
-static uint16_t hrtim_deadtime_get(FAR struct hrtim_dev_s *dev,
+static uint16_t hrtim_deadtime_get(struct hrtim_dev_s *dev,
uint8_t timer, uint8_t dt);
-static int hrtim_tim_deadtime_cfg(FAR struct stm32_hrtim_s *priv,
+static int hrtim_tim_deadtime_cfg(struct stm32_hrtim_s *priv,
uint8_t timer);
-static int hrtim_deadtime_config(FAR struct stm32_hrtim_s *priv);
+static int hrtim_deadtime_config(struct stm32_hrtim_s *priv);
#endif
#ifdef CONFIG_STM32_HRTIM_CHOPPER
-static int hrtim_chopper_enable(FAR struct hrtim_dev_s *dev, uint8_t timer,
+static int hrtim_chopper_enable(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t chan, bool state);
-static int hrtim_tim_chopper_cfg(FAR struct stm32_hrtim_s *priv,
+static int hrtim_tim_chopper_cfg(struct stm32_hrtim_s *priv,
uint8_t timer);
-static int hrtim_chopper_config(FAR struct stm32_hrtim_s *priv);
+static int hrtim_chopper_config(struct stm32_hrtim_s *priv);
#endif
#ifdef CONFIG_STM32_HRTIM_BURST
-static int hrtim_burst_enable(FAR struct hrtim_dev_s *dev, bool state);
-static int hrtim_burst_cmp_update(FAR struct hrtim_dev_s *dev, uint16_t cmp);
-static int hrtim_burst_per_update(FAR struct hrtim_dev_s *dev, uint16_t per);
-static uint16_t hrtim_burst_cmp_get(FAR struct hrtim_dev_s *dev);
-static uint16_t hrtim_burst_per_get(FAR struct hrtim_dev_s *dev);
-static int hrtim_burst_pre_update(FAR struct hrtim_dev_s *dev, uint8_t pre);
-static int hrtim_burst_pre_get(FAR struct hrtim_dev_s *dev);
-static int hrtim_burst_config(FAR struct stm32_hrtim_s *priv);
+static int hrtim_burst_enable(struct hrtim_dev_s *dev, bool state);
+static int hrtim_burst_cmp_update(struct hrtim_dev_s *dev, uint16_t cmp);
+static int hrtim_burst_per_update(struct hrtim_dev_s *dev, uint16_t per);
+static uint16_t hrtim_burst_cmp_get(struct hrtim_dev_s *dev);
+static uint16_t hrtim_burst_per_get(struct hrtim_dev_s *dev);
+static int hrtim_burst_pre_update(struct hrtim_dev_s *dev, uint8_t pre);
+static int hrtim_burst_pre_get(struct hrtim_dev_s *dev);
+static int hrtim_burst_config(struct stm32_hrtim_s *priv);
#endif
#ifdef CONFIG_STM32_HRTIM_FAULTS
-static int hrtim_faults_config(FAR struct stm32_hrtim_s *priv);
-static int hrtim_flt_cfg(FAR struct stm32_hrtim_s *priv, uint8_t index);
-static int hrtim_tim_faults_cfg(FAR struct stm32_hrtim_s *priv,
+static int hrtim_faults_config(struct stm32_hrtim_s *priv);
+static int hrtim_flt_cfg(struct stm32_hrtim_s *priv, uint8_t index);
+static int hrtim_tim_faults_cfg(struct stm32_hrtim_s *priv,
uint8_t timer);
#endif
#ifdef CONFIG_STM32_HRTIM_EVENTS
-static int hrtim_events_config(FAR struct stm32_hrtim_s *priv);
-static int hrtim_eev_cfg(FAR struct stm32_hrtim_s *priv, uint8_t index);
+static int hrtim_events_config(struct stm32_hrtim_s *priv);
+static int hrtim_eev_cfg(struct stm32_hrtim_s *priv, uint8_t index);
#endif
#ifdef CONFIG_STM32_HRTIM_INTERRUPTS
-static int hrtim_irq_config(FAR struct stm32_hrtim_s *priv);
-static uint16_t hrtim_irq_get(FAR struct hrtim_dev_s *dev, uint8_t timer);
-static int hrtim_irq_ack(FAR struct hrtim_dev_s *dev, uint8_t timer,
+static int hrtim_irq_config(struct stm32_hrtim_s *priv);
+static uint16_t hrtim_irq_get(struct hrtim_dev_s *dev, uint8_t timer);
+static int hrtim_irq_ack(struct hrtim_dev_s *dev, uint8_t timer,
int source);
#endif
-static int hrtim_cmp_update(FAR struct hrtim_dev_s *dev, uint8_t timer,
+static int hrtim_cmp_update(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t index, uint16_t cmp);
-static int hrtim_per_update(FAR struct hrtim_dev_s *dev, uint8_t timer,
+static int hrtim_per_update(struct hrtim_dev_s *dev, uint8_t timer,
uint16_t per);
-static int hrtim_rep_update(FAR struct hrtim_dev_s *dev, uint8_t timer,
+static int hrtim_rep_update(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t rep);
-static uint16_t hrtim_per_get(FAR struct hrtim_dev_s *dev, uint8_t timer);
-static uint16_t hrtim_cmp_get(FAR struct hrtim_dev_s *dev, uint8_t timer,
+static uint16_t hrtim_per_get(struct hrtim_dev_s *dev, uint8_t timer);
+static uint16_t hrtim_cmp_get(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t index);
-static uint64_t hrtim_fclk_get(FAR struct hrtim_dev_s *dev, uint8_t timer);
-static int hrtim_soft_update(FAR struct hrtim_dev_s *dev, uint8_t timer);
-static int hrtim_soft_reset(FAR struct hrtim_dev_s *dev, uint8_t timer);
-static int hrtim_tim_freq_set(FAR struct hrtim_dev_s *dev, uint8_t timer,
+static uint64_t hrtim_fclk_get(struct hrtim_dev_s *dev, uint8_t timer);
+static int hrtim_soft_update(struct hrtim_dev_s *dev, uint8_t timer);
+static int hrtim_soft_reset(struct hrtim_dev_s *dev, uint8_t timer);
+static int hrtim_tim_freq_set(struct hrtim_dev_s *dev, uint8_t timer,
uint64_t freq);
-static int hrtim_tim_enable(FAR struct hrtim_dev_s *dev, uint8_t timers,
+static int hrtim_tim_enable(struct hrtim_dev_s *dev, uint8_t timers,
bool state);
-static int hrtim_tim_reset_set(FAR struct stm32_hrtim_s *priv,
+static int hrtim_tim_reset_set(struct stm32_hrtim_s *priv,
uint8_t timer, uint64_t reset);
-static int hrtim_reset_config(FAR struct stm32_hrtim_s *priv);
-static int hrtim_tim_update_set(FAR struct stm32_hrtim_s *priv,
+static int hrtim_reset_config(struct stm32_hrtim_s *priv);
+static int hrtim_tim_update_set(struct stm32_hrtim_s *priv,
uint8_t timer,
uint16_t update);
-static int hrtim_update_config(FAR struct stm32_hrtim_s *priv);
+static int hrtim_update_config(struct stm32_hrtim_s *priv);
-static void hrtim_tim_mode_set(FAR struct stm32_hrtim_s *priv, uint8_t timer,
+static void hrtim_tim_mode_set(struct stm32_hrtim_s *priv, uint8_t timer,
uint8_t mode);
-static void hrtim_mode_config(FAR struct stm32_hrtim_s *priv);
+static void hrtim_mode_config(struct stm32_hrtim_s *priv);
/* Initialization */
-static int stm32_hrtimconfig(FAR struct stm32_hrtim_s *priv);
+static int stm32_hrtimconfig(struct stm32_hrtim_s *priv);
/****************************************************************************
* Private Data
@@ -1639,7 +1639,7 @@ struct hrtim_dev_s g_hrtim1dev =
*
****************************************************************************/
-static int stm32_hrtim_open(FAR struct file *filep)
+static int stm32_hrtim_open(struct file *filep)
{
#warning "stm32_hrtim_open: missing logic"
return OK;
@@ -1653,7 +1653,7 @@ static int stm32_hrtim_open(FAR struct file *filep)
*
****************************************************************************/
-static int stm32_hrtim_close(FAR struct file *filep)
+static int stm32_hrtim_close(struct file *filep)
{
#warning "smt32_hrtim_close: missing logic"
return OK;
@@ -1667,12 +1667,12 @@ static int stm32_hrtim_close(FAR struct file *filep)
*
****************************************************************************/
-static int stm32_hrtim_ioctl(FAR struct file *filep, int cmd,
+static int stm32_hrtim_ioctl(struct file *filep, int cmd,
unsigned long arg)
{
- FAR struct inode *inode = filep->f_inode;
- FAR struct hrtim_dev_s *dev;
- FAR struct stm32_hrtim_s *hrtim;
+ struct inode *inode = filep->f_inode;
+ struct hrtim_dev_s *dev;
+ struct stm32_hrtim_s *hrtim;
int ret;
tmrinfo("cmd: %d arg: %ld\n", cmd, arg);
@@ -1715,7 +1715,7 @@ static int stm32_hrtim_ioctl(FAR struct file *filep, int cmd,
*
****************************************************************************/
-static uint32_t hrtim_cmn_getreg(FAR struct stm32_hrtim_s *priv,
+static uint32_t hrtim_cmn_getreg(struct stm32_hrtim_s *priv,
uint32_t offset)
{
return getreg32(priv->base + STM32_HRTIM_CMN_OFFSET + offset);
@@ -1737,7 +1737,7 @@ static uint32_t hrtim_cmn_getreg(FAR struct stm32_hrtim_s *priv,
*
****************************************************************************/
-static void hrtim_cmn_putreg(FAR struct stm32_hrtim_s *priv, uint32_t offset,
+static void hrtim_cmn_putreg(struct stm32_hrtim_s *priv, uint32_t offset,
uint32_t value)
{
putreg32(value, priv->base + STM32_HRTIM_CMN_OFFSET + offset);
@@ -1761,7 +1761,7 @@ static void hrtim_cmn_putreg(FAR struct stm32_hrtim_s *priv, uint32_t offset,
****************************************************************************/
#ifdef CONFIG_STM32_HRTIM_BURST
-static void hrtim_cmn_modifyreg(FAR struct stm32_hrtim_s *priv,
+static void hrtim_cmn_modifyreg(struct stm32_hrtim_s *priv,
uint32_t offset, uint32_t clrbits,
uint32_t setbits)
{
@@ -1785,10 +1785,10 @@ static void hrtim_cmn_modifyreg(FAR struct stm32_hrtim_s *priv,
*
****************************************************************************/
-static FAR struct stm32_hrtim_tim_s *
- hrtim_tim_get(FAR struct stm32_hrtim_s *priv, uint8_t timer)
+static struct stm32_hrtim_tim_s *
+ hrtim_tim_get(struct stm32_hrtim_s *priv, uint8_t timer)
{
- FAR struct stm32_hrtim_tim_s *tim;
+ struct stm32_hrtim_tim_s *tim;
switch (timer)
{
@@ -1864,11 +1864,11 @@ static FAR struct stm32_hrtim_tim_s *
****************************************************************************/
#if defined(CONFIG_STM32_HRTIM_PWM) || defined(CONFIG_STM32_HRTIM_FAULTS)
-static FAR struct stm32_hrtim_slave_priv_s *
- hrtim_slave_get(FAR struct stm32_hrtim_s *priv, uint8_t timer)
+static struct stm32_hrtim_slave_priv_s *
+ hrtim_slave_get(struct stm32_hrtim_s *priv, uint8_t timer)
{
- FAR struct stm32_hrtim_tim_s *tim;
- FAR struct stm32_hrtim_slave_priv_s *slave;
+ struct stm32_hrtim_tim_s *tim;
+ struct stm32_hrtim_slave_priv_s *slave;
/* Sanity checking */
@@ -1911,9 +1911,9 @@ errout:
*
****************************************************************************/
-static uint32_t hrtim_base_get(FAR struct stm32_hrtim_s *priv, uint8_t timer)
+static uint32_t hrtim_base_get(struct stm32_hrtim_s *priv, uint8_t timer)
{
- FAR struct stm32_hrtim_tim_s *tim;
+ struct stm32_hrtim_tim_s *tim;
uint32_t base = 0;
tim = hrtim_tim_get(priv, timer);
@@ -1945,7 +1945,7 @@ errout:
*
****************************************************************************/
-static uint32_t hrtim_tim_getreg(FAR struct stm32_hrtim_s *priv,
+static uint32_t hrtim_tim_getreg(struct stm32_hrtim_s *priv,
uint8_t timer, uint32_t offset)
{
uint32_t base = 0;
@@ -1976,7 +1976,7 @@ static uint32_t hrtim_tim_getreg(FAR struct stm32_hrtim_s *priv,
*
****************************************************************************/
-static void hrtim_tim_putreg(FAR struct stm32_hrtim_s *priv, uint8_t timer,
+static void hrtim_tim_putreg(struct stm32_hrtim_s *priv, uint8_t timer,
uint32_t offset, uint32_t value)
{
uint32_t base = 0;
@@ -2006,7 +2006,7 @@ static void hrtim_tim_putreg(FAR struct stm32_hrtim_s *priv, uint8_t timer,
*
****************************************************************************/
-static void hrtim_tim_modifyreg(FAR struct stm32_hrtim_s *priv,
+static void hrtim_tim_modifyreg(struct stm32_hrtim_s *priv,
uint8_t timer, uint32_t offset,
uint32_t clrbits, uint32_t setbits)
{
@@ -2016,8 +2016,8 @@ static void hrtim_tim_modifyreg(FAR struct stm32_hrtim_s *priv,
}
#ifdef CONFIG_DEBUG_TIMER_INFO
-static void hrtim_dumpregs(FAR struct stm32_hrtim_s *priv, uint8_t timer,
- FAR const char *msg)
+static void hrtim_dumpregs(struct stm32_hrtim_s *priv, uint8_t timer,
+ const char *msg)
{
tmrinfo("%s:\n", msg);
@@ -2202,7 +2202,7 @@ static void hrtim_dumpregs(FAR struct stm32_hrtim_s *priv, uint8_t timer,
*
****************************************************************************/
-static int hrtim_dll_cal(FAR struct stm32_hrtim_s *priv)
+static int hrtim_dll_cal(struct stm32_hrtim_s *priv)
{
uint32_t regval = 0;
@@ -2247,7 +2247,7 @@ static int hrtim_dll_cal(FAR struct stm32_hrtim_s *priv)
*
****************************************************************************/
-static int hrtim_tim_clock_config(FAR struct stm32_hrtim_s *priv,
+static int hrtim_tim_clock_config(struct stm32_hrtim_s *priv,
uint8_t timer, uint8_t pre)
{
int ret = OK;
@@ -2336,7 +2336,7 @@ errout:
*
****************************************************************************/
-static int hrtim_tim_clocks_config(FAR struct stm32_hrtim_s *priv)
+static int hrtim_tim_clocks_config(struct stm32_hrtim_s *priv)
{
int ret = OK;
@@ -2420,13 +2420,13 @@ errout:
****************************************************************************/
#if defined(CONFIG_STM32_HRTIM_PWM) || defined(CONFIG_STM32_HRTIM_SYNC)
-static int hrtim_gpios_config(FAR struct stm32_hrtim_s *priv)
+static int hrtim_gpios_config(struct stm32_hrtim_s *priv)
{
#ifdef CONFIG_STM32_HRTIM_EVENTS
- FAR struct stm32_hrtim_eev_s *eev = priv->eev;
+ struct stm32_hrtim_eev_s *eev = priv->eev;
#endif
#ifdef CONFIG_STM32_HRTIM_FAULTS
- FAR struct stm32_hrtim_faults_s *flt = priv->flt;
+ struct stm32_hrtim_faults_s *flt = priv->flt;
#endif
/* Configure Timer A Outputs */
@@ -2622,7 +2622,7 @@ static int hrtim_gpios_config(FAR struct stm32_hrtim_s *priv)
*
****************************************************************************/
-static int hrtim_tim_capture_cfg(FAR struct stm32_hrtim_s *priv,
+static int hrtim_tim_capture_cfg(struct stm32_hrtim_s *priv,
uint8_t timer, uint8_t index,
uint32_t capture)
{
@@ -2678,9 +2678,9 @@ errout:
*
****************************************************************************/
-static int hrtim_capture_config(FAR struct stm32_hrtim_s *priv)
+static int hrtim_capture_config(struct stm32_hrtim_s *priv)
{
- FAR struct stm32_hrtim_slave_priv_s *slave;
+ struct stm32_hrtim_slave_priv_s *slave;
#ifdef CONFIG_STM32_HRTIM_TIMA_CAP
slave = (struct stm32_hrtim_slave_priv_s *)priv->tima->priv;
@@ -2741,10 +2741,10 @@ static int hrtim_capture_config(FAR struct stm32_hrtim_s *priv)
*
****************************************************************************/
-static uint16_t hrtim_capture_get(FAR struct hrtim_dev_s *dev, uint8_t timer,
+static uint16_t hrtim_capture_get(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t index)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
uint32_t regval = 0;
uint32_t offset = 0;
@@ -2791,10 +2791,10 @@ errout:
*
****************************************************************************/
-static int hrtim_soft_capture(FAR struct hrtim_dev_s *dev, uint8_t timer,
+static int hrtim_soft_capture(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t index)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
uint32_t offset = 0;
switch (index)
@@ -2842,7 +2842,7 @@ errout:
****************************************************************************/
#if defined(CONFIG_STM32_HRTIM_SYNC)
-static int hrtim_synch_config(FAR struct stm32_hrtim_s *priv)
+static int hrtim_synch_config(struct stm32_hrtim_s *priv)
{
#warning "hrtim_synch_config: missing logic"
return OK;
@@ -2864,10 +2864,10 @@ static int hrtim_synch_config(FAR struct stm32_hrtim_s *priv)
****************************************************************************/
#if defined(CONFIG_STM32_HRTIM_PWM)
-static int hrtim_tim_outputs_config(FAR struct stm32_hrtim_s *priv,
+static int hrtim_tim_outputs_config(struct stm32_hrtim_s *priv,
uint8_t timer)
{
- FAR struct stm32_hrtim_slave_priv_s *slave;
+ struct stm32_hrtim_slave_priv_s *slave;
uint32_t regval = 0;
int ret = OK;
@@ -2989,7 +2989,7 @@ errout:
****************************************************************************/
#if defined(CONFIG_STM32_HRTIM_PWM)
-static int hrtim_outputs_config(FAR struct stm32_hrtim_s *priv)
+static int hrtim_outputs_config(struct stm32_hrtim_s *priv)
{
int ret = OK;
@@ -3063,10 +3063,10 @@ errout:
*
****************************************************************************/
-static int hrtim_outputs_enable(FAR struct hrtim_dev_s *dev,
+static int hrtim_outputs_enable(struct hrtim_dev_s *dev,
uint16_t outputs, bool state)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
uint32_t offset = 0;
/* Get register offset */
@@ -3216,11 +3216,11 @@ static uint8_t output_tim_ch_get(uint16_t output)
* Name: hrtim_output_set_set
****************************************************************************/
-static int hrtim_output_set_set(FAR struct hrtim_dev_s *dev, uint16_t output,
+static int hrtim_output_set_set(struct hrtim_dev_s *dev, uint16_t output,
uint32_t set)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
- FAR struct stm32_hrtim_slave_priv_s *slave;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_slave_priv_s *slave;
uint8_t timer = 0;
int ret = OK;
@@ -3270,11 +3270,11 @@ errout:
* Name: hrtim_output_rst_set
****************************************************************************/
-static int hrtim_output_rst_set(FAR struct hrtim_dev_s *dev, uint16_t output,
+static int hrtim_output_rst_set(struct hrtim_dev_s *dev, uint16_t output,
uint32_t rst)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
- FAR struct stm32_hrtim_slave_priv_s *slave;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_slave_priv_s *slave;
uint8_t timer = 0;
int ret = OK;
@@ -3335,7 +3335,7 @@ errout:
****************************************************************************/
#ifdef HRTIM_HAVE_ADC
-static int hrtim_adc_config(FAR struct stm32_hrtim_s *priv)
+static int hrtim_adc_config(struct stm32_hrtim_s *priv)
{
/* Configure ADC Trigger 1 */
@@ -3382,10 +3382,10 @@ static int hrtim_adc_config(FAR struct stm32_hrtim_s *priv)
*
****************************************************************************/
-static int hrtim_tim_dac_cfg(FAR struct stm32_hrtim_s *priv, uint8_t timer,
+static int hrtim_tim_dac_cfg(struct stm32_hrtim_s *priv, uint8_t timer,
uint8_t dac)
{
- FAR struct stm32_hrtim_tim_s *tim;
+ struct stm32_hrtim_tim_s *tim;
uint32_t regval = 0;
tim = hrtim_tim_get(priv, timer);
@@ -3413,9 +3413,9 @@ static int hrtim_tim_dac_cfg(FAR struct stm32_hrtim_s *priv, uint8_t timer,
*
****************************************************************************/
-static int hrtim_dac_config(FAR struct stm32_hrtim_s *priv)
+static int hrtim_dac_config(struct stm32_hrtim_s *priv)
{
- FAR struct stm32_hrtim_timcmn_s *tim;
+ struct stm32_hrtim_timcmn_s *tim;
/* Configure DAC synchronization for Master Timer */
@@ -3468,7 +3468,7 @@ static int hrtim_dac_config(FAR struct stm32_hrtim_s *priv)
* Name: hrtim_dma_cfg
****************************************************************************/
-static int hrtim_tim_dma_cfg(FAR struct stm32_hrtim_s *priv, uint8_t timer,
+static int hrtim_tim_dma_cfg(struct stm32_hrtim_s *priv, uint8_t timer,
uint16_t dma)
{
int ret = OK;
@@ -3519,7 +3519,7 @@ errout:
* Name: hrtim_dma_cfg
****************************************************************************/
-static int hrtim_dma_cfg(FAR struct stm32_hrtim_s *priv)
+static int hrtim_dma_cfg(struct stm32_hrtim_s *priv)
{
#ifdef CONFIG_STM32_HRTIM_MASTER_DMA
hrtim_tim_dma_cfg(priv, HRTIM_TIMER_MASTER, priv->master->tim.dma);
@@ -3554,10 +3554,10 @@ static int hrtim_dma_cfg(FAR struct stm32_hrtim_s *priv)
* Name: hrtim_deadtime_update
****************************************************************************/
-static int hrtim_deadtime_update(FAR struct hrtim_dev_s *dev, uint8_t timer,
+static int hrtim_deadtime_update(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t dt, uint16_t value)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
int ret = OK;
uint32_t regval = 0;
uint32_t shift = 0;
@@ -3611,10 +3611,10 @@ errout:
* Name: hrtim_deadtime_get
****************************************************************************/
-static uint16_t hrtim_deadtime_get(FAR struct hrtim_dev_s *dev,
+static uint16_t hrtim_deadtime_get(struct hrtim_dev_s *dev,
uint8_t timer, uint8_t dt)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
uint16_t regval = 0;
uint32_t shift = 0;
uint32_t mask = 0;
@@ -3660,10 +3660,10 @@ errout:
* Name: hrtim_tim_deadtime_cfg
****************************************************************************/
-static int hrtim_tim_deadtime_cfg(FAR struct stm32_hrtim_s *priv,
+static int hrtim_tim_deadtime_cfg(struct stm32_hrtim_s *priv,
uint8_t timer)
{
- FAR struct stm32_hrtim_slave_priv_s *slave;
+ struct stm32_hrtim_slave_priv_s *slave;
uint32_t regval = 0;
int ret = OK;
@@ -3752,7 +3752,7 @@ errout:
* Name: hrtim_deadtime_config
****************************************************************************/
-static int hrtim_deadtime_config(FAR struct stm32_hrtim_s *priv)
+static int hrtim_deadtime_config(struct stm32_hrtim_s *priv)
{
/* Configure Timer A deadtime */
@@ -3806,10 +3806,10 @@ static int hrtim_deadtime_config(FAR struct stm32_hrtim_s *priv)
*
****************************************************************************/
-static int hrtim_chopper_enable(FAR struct hrtim_dev_s *dev, uint8_t timer,
+static int hrtim_chopper_enable(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t chan, bool state)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
uint32_t val = 0;
int ret = OK;
@@ -3859,10 +3859,10 @@ errout:
* Name: hrtim_chopper_cfg
****************************************************************************/
-static int hrtim_tim_chopper_cfg(FAR struct stm32_hrtim_s *priv,
+static int hrtim_tim_chopper_cfg(struct stm32_hrtim_s *priv,
uint8_t timer)
{
- FAR struct stm32_hrtim_slave_priv_s *slave;
+ struct stm32_hrtim_slave_priv_s *slave;
int ret = OK;
uint32_t regval = 0;
@@ -3908,7 +3908,7 @@ errout:
* Name: hrtim_chopper_config
****************************************************************************/
-static int hrtim_chopper_config(FAR struct stm32_hrtim_s *priv)
+static int hrtim_chopper_config(struct stm32_hrtim_s *priv)
{
/* Configure chopper for Timer A */
@@ -3949,9 +3949,9 @@ static int hrtim_chopper_config(FAR struct stm32_hrtim_s *priv)
* Name: hrtim_burst_enable
****************************************************************************/
-static int hrtim_burst_enable(FAR struct hrtim_dev_s *dev, bool state)
+static int hrtim_burst_enable(struct hrtim_dev_s *dev, bool state)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
if (state)
{
@@ -3980,9 +3980,9 @@ static int hrtim_burst_enable(FAR struct hrtim_dev_s *dev, bool state)
* Name: hrtim_burst_cmp_update
****************************************************************************/
-static int hrtim_burst_cmp_update(FAR struct hrtim_dev_s *dev, uint16_t cmp)
+static int hrtim_burst_cmp_update(struct hrtim_dev_s *dev, uint16_t cmp)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
hrtim_cmn_putreg(priv, STM32_HRTIM_CMN_BMCMPR_OFFSET, cmp);
@@ -3993,9 +3993,9 @@ static int hrtim_burst_cmp_update(FAR struct hrtim_dev_s *dev, uint16_t cmp)
* Name: hrtim_burst_per_update
****************************************************************************/
-static int hrtim_burst_per_update(FAR struct hrtim_dev_s *dev, uint16_t per)
+static int hrtim_burst_per_update(struct hrtim_dev_s *dev, uint16_t per)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
hrtim_cmn_putreg(priv, STM32_HRTIM_CMN_BMPER_OFFSET, per);
@@ -4006,9 +4006,9 @@ static int hrtim_burst_per_update(FAR struct hrtim_dev_s *dev, uint16_t per)
* Name: hrtim_burst_cmp_get
****************************************************************************/
-static uint16_t hrtim_burst_cmp_get(FAR struct hrtim_dev_s *dev)
+static uint16_t hrtim_burst_cmp_get(struct hrtim_dev_s *dev)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
return (uint16_t)hrtim_cmn_getreg(priv, STM32_HRTIM_CMN_BMCMPR_OFFSET);
}
@@ -4017,9 +4017,9 @@ static uint16_t hrtim_burst_cmp_get(FAR struct hrtim_dev_s *dev)
* Name: hrtim_burst_per_get
****************************************************************************/
-static uint16_t hrtim_burst_per_get(FAR struct hrtim_dev_s *dev)
+static uint16_t hrtim_burst_per_get(struct hrtim_dev_s *dev)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
return (uint16_t)hrtim_cmn_getreg(priv, STM32_HRTIM_CMN_BMPER_OFFSET);
}
@@ -4028,9 +4028,9 @@ static uint16_t hrtim_burst_per_get(FAR struct hrtim_dev_s *dev)
* Name: hrtim_burst_pre_update
****************************************************************************/
-static int hrtim_burst_pre_update(FAR struct hrtim_dev_s *dev, uint8_t pre)
+static int hrtim_burst_pre_update(struct hrtim_dev_s *dev, uint8_t pre)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
int ret = OK;
uint32_t regval = 0;
@@ -4068,9 +4068,9 @@ errout:
* Name: hrtim_burst_pre_get
****************************************************************************/
-static int hrtim_burst_pre_get(FAR struct hrtim_dev_s *dev)
+static int hrtim_burst_pre_get(struct hrtim_dev_s *dev)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
int ret = OK;
if (priv->burst->clk != HRTIM_BURST_CLOCK_HRTIM)
@@ -4089,9 +4089,9 @@ errout:
* Name: hrtim_burst_config
****************************************************************************/
-static int hrtim_burst_config(FAR struct stm32_hrtim_s *priv)
+static int hrtim_burst_config(struct stm32_hrtim_s *priv)
{
- FAR struct stm32_hrtim_burst_s *burst = priv->burst;
+ struct stm32_hrtim_burst_s *burst = priv->burst;
uint32_t regval = 0;
/* Configure triggers */
@@ -4145,10 +4145,10 @@ static int hrtim_burst_config(FAR struct stm32_hrtim_s *priv)
*
****************************************************************************/
-static int hrtim_tim_faults_cfg(FAR struct stm32_hrtim_s *priv,
+static int hrtim_tim_faults_cfg(struct stm32_hrtim_s *priv,
uint8_t timer)
{
- FAR struct stm32_hrtim_slave_priv_s *slave;
+ struct stm32_hrtim_slave_priv_s *slave;
uint32_t regval = 0;
int ret = OK;
@@ -4190,9 +4190,9 @@ errout:
*
****************************************************************************/
-static int hrtim_flt_cfg(FAR struct stm32_hrtim_s *priv, uint8_t index)
+static int hrtim_flt_cfg(struct stm32_hrtim_s *priv, uint8_t index)
{
- FAR struct stm32_hrtim_fault_cfg_s *flt;
+ struct stm32_hrtim_fault_cfg_s *flt;
int ret = OK;
uint32_t regval = 0;
@@ -4344,7 +4344,7 @@ errout:
*
****************************************************************************/
-static int hrtim_faults_config(FAR struct stm32_hrtim_s *priv)
+static int hrtim_faults_config(struct stm32_hrtim_s *priv)
{
uint32_t regval = 0;
@@ -4418,7 +4418,7 @@ static int hrtim_faults_config(FAR struct stm32_hrtim_s *priv)
*
****************************************************************************/
-static int hrtim_eev_cfg(FAR struct stm32_hrtim_s *priv, uint8_t index)
+static int hrtim_eev_cfg(struct stm32_hrtim_s *priv, uint8_t index)
{
struct stm32_hrtim_eev_cfg_s *eev;
int ret = OK;
@@ -4612,7 +4612,7 @@ errout:
*
****************************************************************************/
-static int hrtim_events_config(FAR struct stm32_hrtim_s *priv)
+static int hrtim_events_config(struct stm32_hrtim_s *priv)
{
uint32_t regval = 0;
@@ -4674,7 +4674,7 @@ static int hrtim_events_config(FAR struct stm32_hrtim_s *priv)
* Name: hrtim_irq_cfg
****************************************************************************/
-static int hrtim_irq_cfg(FAR struct stm32_hrtim_s *priv, uint8_t timer,
+static int hrtim_irq_cfg(struct stm32_hrtim_s *priv, uint8_t timer,
uint16_t irq)
{
int ret = OK;
@@ -4705,7 +4705,7 @@ static int hrtim_irq_cfg(FAR struct stm32_hrtim_s *priv, uint8_t timer,
*
****************************************************************************/
-static int hrtim_irq_config(FAR struct stm32_hrtim_s *priv)
+static int hrtim_irq_config(struct stm32_hrtim_s *priv)
{
#ifdef CONFIG_STM32_HRTIM_MASTER_IRQ
hrtim_irq_cfg(priv, HRTIM_TIMER_MASTER, priv->master->tim.irq);
@@ -4742,10 +4742,10 @@ static int hrtim_irq_config(FAR struct stm32_hrtim_s *priv)
* Name: hrtim_irq_ack
****************************************************************************/
-static int hrtim_irq_ack(FAR struct hrtim_dev_s *dev, uint8_t timer,
+static int hrtim_irq_ack(struct hrtim_dev_s *dev, uint8_t timer,
int source)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
if (timer == HRTIM_TIMER_COMMON)
{
@@ -4767,9 +4767,9 @@ static int hrtim_irq_ack(FAR struct hrtim_dev_s *dev, uint8_t timer,
* Name: hrtim_irq_get
****************************************************************************/
-static uint16_t hrtim_irq_get(FAR struct hrtim_dev_s *dev, uint8_t timer)
+static uint16_t hrtim_irq_get(struct hrtim_dev_s *dev, uint8_t timer)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
uint32_t regval = 0;
if (timer == HRTIM_TIMER_COMMON)
@@ -4805,7 +4805,7 @@ static uint16_t hrtim_irq_get(FAR struct hrtim_dev_s *dev, uint8_t timer)
*
****************************************************************************/
-static void hrtim_tim_mode_set(FAR struct stm32_hrtim_s *priv, uint8_t timer,
+static void hrtim_tim_mode_set(struct stm32_hrtim_s *priv, uint8_t timer,
uint8_t mode)
{
uint32_t regval = 0;
@@ -4859,7 +4859,7 @@ static void hrtim_tim_mode_set(FAR struct stm32_hrtim_s *priv, uint8_t timer,
*
****************************************************************************/
-static void hrtim_mode_config(FAR struct stm32_hrtim_s *priv)
+static void hrtim_mode_config(struct stm32_hrtim_s *priv)
{
#ifdef CONFIG_STM32_HRTIM_MASTER
hrtim_tim_mode_set(priv, HRTIM_TIMER_MASTER, priv->master->tim.mode);
@@ -4902,10 +4902,10 @@ static void hrtim_mode_config(FAR struct stm32_hrtim_s *priv)
*
****************************************************************************/
-static uint8_t hrtim_cmpcap_mask_get(FAR struct stm32_hrtim_s *priv,
+static uint8_t hrtim_cmpcap_mask_get(struct stm32_hrtim_s *priv,
uint8_t timer)
{
- FAR struct stm32_hrtim_tim_s *tim;
+ struct stm32_hrtim_tim_s *tim;
uint8_t mask = 0;
/* Get Timer data structure */
@@ -4979,10 +4979,10 @@ errout:
*
****************************************************************************/
-static int hrtim_cmp_update(FAR struct hrtim_dev_s *dev, uint8_t timer,
+static int hrtim_cmp_update(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t index, uint16_t cmp)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
int ret = OK;
uint32_t offset = 0;
uint8_t mask = 0;
@@ -5052,10 +5052,10 @@ errout:
*
****************************************************************************/
-static int hrtim_per_update(FAR struct hrtim_dev_s *dev, uint8_t timer,
+static int hrtim_per_update(struct hrtim_dev_s *dev, uint8_t timer,
uint16_t per)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
hrtim_tim_putreg(priv, timer, STM32_HRTIM_TIM_PER_OFFSET, per);
return OK;
@@ -5076,9 +5076,9 @@ static int hrtim_per_update(FAR struct hrtim_dev_s *dev, uint8_t timer,
*
****************************************************************************/
-static uint16_t hrtim_per_get(FAR struct hrtim_dev_s *dev, uint8_t timer)
+static uint16_t hrtim_per_get(struct hrtim_dev_s *dev, uint8_t timer)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
return (uint16_t)hrtim_tim_getreg(priv, timer, STM32_HRTIM_TIM_PER_OFFSET);
}
@@ -5099,10 +5099,10 @@ static uint16_t hrtim_per_get(FAR struct hrtim_dev_s *dev, uint8_t timer)
*
****************************************************************************/
-static int hrtim_rep_update(FAR struct hrtim_dev_s *dev, uint8_t timer,
+static int hrtim_rep_update(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t rep)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
hrtim_tim_putreg(priv, timer, STM32_HRTIM_TIM_REPR_OFFSET, rep);
return OK;
@@ -5124,10 +5124,10 @@ static int hrtim_rep_update(FAR struct hrtim_dev_s *dev, uint8_t timer,
*
****************************************************************************/
-static uint16_t hrtim_cmp_get(FAR struct hrtim_dev_s *dev, uint8_t timer,
+static uint16_t hrtim_cmp_get(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t index)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
uint16_t cmpx = 0;
uint32_t offset = 0;
@@ -5185,10 +5185,10 @@ errout:
*
****************************************************************************/
-static uint64_t hrtim_fclk_get(FAR struct hrtim_dev_s *dev, uint8_t timer)
+static uint64_t hrtim_fclk_get(struct hrtim_dev_s *dev, uint8_t timer)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
- FAR struct stm32_hrtim_tim_s *tim;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_tim_s *tim;
uint64_t fclk = 0;
/* Get Timer data structure */
@@ -5223,9 +5223,9 @@ errout:
*
****************************************************************************/
-static int hrtim_soft_update(FAR struct hrtim_dev_s *dev, uint8_t timer)
+static int hrtim_soft_update(struct hrtim_dev_s *dev, uint8_t timer)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
uint32_t regval = 0;
regval |= (timer & HRTIM_TIMER_MASTER ? HRTIM_CR2_MSWU : 0);
@@ -5271,9 +5271,9 @@ static int hrtim_soft_update(FAR struct hrtim_dev_s *dev, uint8_t timer)
*
****************************************************************************/
-static int hrtim_soft_reset(FAR struct hrtim_dev_s *dev, uint8_t timer)
+static int hrtim_soft_reset(struct hrtim_dev_s *dev, uint8_t timer)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
uint32_t regval = 0;
regval |= (timer & HRTIM_TIMER_MASTER ? HRTIM_CR2_MRST : 0);
@@ -5313,7 +5313,7 @@ static int hrtim_soft_reset(FAR struct hrtim_dev_s *dev, uint8_t timer)
*
****************************************************************************/
-static int hrtim_tim_freq_set(FAR struct hrtim_dev_s *dev, uint8_t timer,
+static int hrtim_tim_freq_set(struct hrtim_dev_s *dev, uint8_t timer,
uint64_t freq)
{
uint64_t per = 0;
@@ -5352,10 +5352,10 @@ errout:
*
****************************************************************************/
-static int hrtim_tim_enable(FAR struct hrtim_dev_s *dev, uint8_t timers,
+static int hrtim_tim_enable(struct hrtim_dev_s *dev, uint8_t timers,
bool state)
{
- FAR struct stm32_hrtim_s *priv = (FAR struct stm32_hrtim_s *)dev->hd_priv;
+ struct stm32_hrtim_s *priv = (struct stm32_hrtim_s *)dev->hd_priv;
uint32_t regval = 0;
regval |= (timers & HRTIM_TIMERS_MASK) << HRTIM_MCR_TCEN_SHIFT;
@@ -5396,7 +5396,7 @@ static int hrtim_tim_enable(FAR struct hrtim_dev_s *dev, uint8_t timers,
*
****************************************************************************/
-static int hrtim_tim_reset_set(FAR struct stm32_hrtim_s *priv, uint8_t timer,
+static int hrtim_tim_reset_set(struct stm32_hrtim_s *priv, uint8_t timer,
uint64_t reset)
{
int ret = OK;
@@ -5586,9 +5586,9 @@ errout:
return ret;
}
-static int hrtim_reset_config(FAR struct stm32_hrtim_s *priv)
+static int hrtim_reset_config(struct stm32_hrtim_s *priv)
{
- FAR struct stm32_hrtim_slave_priv_s *slave;
+ struct stm32_hrtim_slave_priv_s *slave;
#ifdef CONFIG_STM32_HRTIM_TIMA
slave = (struct stm32_hrtim_slave_priv_s *)priv->tima->priv;
@@ -5618,7 +5618,7 @@ static int hrtim_reset_config(FAR struct stm32_hrtim_s *priv)
return OK;
}
-static int hrtim_tim_update_set(FAR struct stm32_hrtim_s *priv,
+static int hrtim_tim_update_set(struct stm32_hrtim_s *priv,
uint8_t timer,
uint16_t update)
{
@@ -5661,9 +5661,9 @@ static int hrtim_tim_update_set(FAR struct stm32_hrtim_s *priv,
return OK;
}
-static int hrtim_update_config(FAR struct stm32_hrtim_s *priv)
+static int hrtim_update_config(struct stm32_hrtim_s *priv)
{
- FAR struct stm32_hrtim_slave_priv_s *slave;
+ struct stm32_hrtim_slave_priv_s *slave;
#ifdef CONFIG_STM32_HRTIM_TIMA
slave = (struct stm32_hrtim_slave_priv_s *)priv->tima->priv;
@@ -5707,7 +5707,7 @@ static int hrtim_update_config(FAR struct stm32_hrtim_s *priv)
*
****************************************************************************/
-static int stm32_hrtimconfig(FAR struct stm32_hrtim_s *priv)
+static int stm32_hrtimconfig(struct stm32_hrtim_s *priv)
{
int ret;
uint32_t regval = 0;
@@ -5977,10 +5977,10 @@ errout:
*
****************************************************************************/
-FAR struct hrtim_dev_s *stm32_hrtiminitialize(void)
+struct hrtim_dev_s *stm32_hrtiminitialize(void)
{
- FAR struct hrtim_dev_s *dev;
- FAR struct stm32_hrtim_s *hrtim;
+ struct hrtim_dev_s *dev;
+ struct stm32_hrtim_s *hrtim;
int ret;
dev = &g_hrtim1dev;
@@ -6009,7 +6009,7 @@ FAR struct hrtim_dev_s *stm32_hrtiminitialize(void)
****************************************************************************/
#ifndef CONFIG_STM32_HRTIM_DISABLE_CHARDRV
-int hrtim_register(FAR const char *path, FAR struct hrtim_dev_s *dev)
+int hrtim_register(const char *path, struct hrtim_dev_s *dev)
{
int ret ;
diff --git a/arch/arm/src/stm32/stm32_hrtim.h b/arch/arm/src/stm32/stm32_hrtim.h
index e43548067f..b0bac5bec5 100644
--- a/arch/arm/src/stm32/stm32_hrtim.h
+++ b/arch/arm/src/stm32/stm32_hrtim.h
@@ -1008,59 +1008,59 @@ enum stm32_hrtim_capture_triggers_e
struct hrtim_dev_s;
struct stm32_hrtim_ops_s
{
- int (*cmp_update)(FAR struct hrtim_dev_s *dev, uint8_t timer,
+ int (*cmp_update)(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t index, uint16_t cmp);
- int (*per_update)(FAR struct hrtim_dev_s *dev,
+ int (*per_update)(struct hrtim_dev_s *dev,
uint8_t timer, uint16_t per);
- int (*rep_update)(FAR struct hrtim_dev_s *dev,
+ int (*rep_update)(struct hrtim_dev_s *dev,
uint8_t timer, uint8_t rep);
- uint16_t (*per_get)(FAR struct hrtim_dev_s *dev, uint8_t timer);
- uint16_t (*cmp_get)(FAR struct hrtim_dev_s *dev, uint8_t timer,
+ uint16_t (*per_get)(struct hrtim_dev_s *dev, uint8_t timer);
+ uint16_t (*cmp_get)(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t index);
- uint64_t (*fclk_get)(FAR struct hrtim_dev_s *dev, uint8_t timer);
- int (*soft_update)(FAR struct hrtim_dev_s *dev, uint8_t timer);
- int (*soft_reset)(FAR struct hrtim_dev_s *dev, uint8_t timer);
- int (*freq_set)(FAR struct hrtim_dev_s *dev, uint8_t timer,
+ uint64_t (*fclk_get)(struct hrtim_dev_s *dev, uint8_t timer);
+ int (*soft_update)(struct hrtim_dev_s *dev, uint8_t timer);
+ int (*soft_reset)(struct hrtim_dev_s *dev, uint8_t timer);
+ int (*freq_set)(struct hrtim_dev_s *dev, uint8_t timer,
uint64_t freq);
- int (*tim_enable)(FAR struct hrtim_dev_s *dev, uint8_t timers,
+ int (*tim_enable)(struct hrtim_dev_s *dev, uint8_t timers,
bool state);
#ifdef CONFIG_STM32_HRTIM_INTERRUPTS
- int (*irq_ack)(FAR struct hrtim_dev_s *dev,
+ int (*irq_ack)(struct hrtim_dev_s *dev,
uint8_t timer, int source);
- uint16_t (*irq_get)(FAR struct hrtim_dev_s *dev, uint8_t timer);
+ uint16_t (*irq_get)(struct hrtim_dev_s *dev, uint8_t timer);
#endif
#ifdef CONFIG_STM32_HRTIM_PWM
- int (*outputs_enable)(FAR struct hrtim_dev_s *dev, uint16_t outputs,
+ int (*outputs_enable)(struct hrtim_dev_s *dev, uint16_t outputs,
bool state);
- int (*output_set_set)(FAR struct hrtim_dev_s *dev, uint16_t output,
+ int (*output_set_set)(struct hrtim_dev_s *dev, uint16_t output,
uint32_t set);
- int (*output_rst_set)(FAR struct hrtim_dev_s *dev, uint16_t output,
+ int (*output_rst_set)(struct hrtim_dev_s *dev, uint16_t output,
uint32_t rst);
#endif
#ifdef CONFIG_STM32_HRTIM_BURST
- int (*burst_enable)(FAR struct hrtim_dev_s *dev, bool state);
- int (*burst_cmp_set)(FAR struct hrtim_dev_s *dev, uint16_t cmp);
- int (*burst_per_set)(FAR struct hrtim_dev_s *dev, uint16_t per);
- int (*burst_pre_set)(FAR struct hrtim_dev_s *dev, uint8_t pre);
- uint16_t (*burst_cmp_get)(FAR struct hrtim_dev_s *dev);
- uint16_t (*burst_per_get)(FAR struct hrtim_dev_s *dev);
- int (*burst_pre_get)(FAR struct hrtim_dev_s *dev);
+ int (*burst_enable)(struct hrtim_dev_s *dev, bool state);
+ int (*burst_cmp_set)(struct hrtim_dev_s *dev, uint16_t cmp);
+ int (*burst_per_set)(struct hrtim_dev_s *dev, uint16_t per);
+ int (*burst_pre_set)(struct hrtim_dev_s *dev, uint8_t pre);
+ uint16_t (*burst_cmp_get)(struct hrtim_dev_s *dev);
+ uint16_t (*burst_per_get)(struct hrtim_dev_s *dev);
+ int (*burst_pre_get)(struct hrtim_dev_s *dev);
#endif
#ifdef CONFIG_STM32_HRTIM_CHOPPER
- int (*chopper_enable)(FAR struct hrtim_dev_s *dev, uint8_t timer,
+ int (*chopper_enable)(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t chan, bool state);
#endif
#ifdef CONFIG_STM32_HRTIM_DEADTIME
- int (*deadtime_update)(FAR struct hrtim_dev_s *dev, uint8_t timer,
+ int (*deadtime_update)(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t dt, uint16_t value);
- uint16_t (*deadtime_get)(FAR struct hrtim_dev_s *dev, uint8_t timer,
+ uint16_t (*deadtime_get)(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t dt);
#endif
#ifdef CONFIG_STM32_HRTIM_CAPTURE
- uint16_t (*capture_get)(FAR struct hrtim_dev_s *dev, uint8_t timer,
+ uint16_t (*capture_get)(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t index);
- int (*soft_capture)(FAR struct hrtim_dev_s *dev, uint8_t timer,
+ int (*soft_capture)(struct hrtim_dev_s *dev, uint8_t timer,
uint8_t index);
#endif
@@ -1079,9 +1079,9 @@ struct hrtim_dev_s
/* Fields provided by lower half HRTIM logic */
- FAR const struct stm32_hrtim_ops_s *hd_ops; /* HRTIM operations */
- FAR void *hd_priv; /* Used by the arch-specific logic */
- bool initialized; /* true: HRTIM driver has been initialized */
+ const struct stm32_hrtim_ops_s *hd_ops; /* HRTIM operations */
+ void *hd_priv; /* Used by the arch-specific logic */
+ bool initialized; /* true: HRTIM driver has been initialized */
};
/****************************************************************************
@@ -1115,14 +1115,14 @@ extern "C"
*
****************************************************************************/
-FAR struct hrtim_dev_s *stm32_hrtiminitialize(void);
+struct hrtim_dev_s *stm32_hrtiminitialize(void);
/****************************************************************************
* Name: hrtim_register
****************************************************************************/
#ifndef CONFIG_STM32_HRTIM_DISABLE_CHARDRV
-int hrtim_register(FAR const char *path, FAR struct hrtim_dev_s *dev);
+int hrtim_register(const char *path, struct hrtim_dev_s *dev);
#endif
#undef EXTERN
diff --git a/arch/arm/src/stm32/stm32_i2c.c b/arch/arm/src/stm32/stm32_i2c.c
index 79a00c4772..3b13cbe61e 100644
--- a/arch/arm/src/stm32/stm32_i2c.c
+++ b/arch/arm/src/stm32/stm32_i2c.c
@@ -263,59 +263,59 @@ struct stm32_i2c_priv_s
* Private Function Prototypes
****************************************************************************/
-static inline uint16_t stm32_i2c_getreg(FAR struct stm32_i2c_priv_s *priv,
+static inline uint16_t stm32_i2c_getreg(struct stm32_i2c_priv_s *priv,
uint8_t offset);
-static inline void stm32_i2c_putreg(FAR struct stm32_i2c_priv_s *priv,
+static inline void stm32_i2c_putreg(struct stm32_i2c_priv_s *priv,
uint8_t offset, uint16_t value);
-static inline void stm32_i2c_modifyreg(FAR struct stm32_i2c_priv_s *priv,
+static inline void stm32_i2c_modifyreg(struct stm32_i2c_priv_s *priv,
uint8_t offset, uint16_t clearbits,
uint16_t setbits);
#ifdef CONFIG_STM32_I2C_DYNTIMEO
-static useconds_t stm32_i2c_tousecs(int msgc, FAR struct i2c_msg_s *msgs);
+static useconds_t stm32_i2c_tousecs(int msgc, struct i2c_msg_s *msgs);
#endif /* CONFIG_STM32_I2C_DYNTIMEO */
-static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv);
-static inline void stm32_i2c_sem_waitstop(FAR struct stm32_i2c_priv_s *priv);
-static inline void stm32_i2c_sem_post(FAR struct stm32_i2c_priv_s *priv);
-static inline void stm32_i2c_sem_init(FAR struct stm32_i2c_priv_s *priv);
-static inline void stm32_i2c_sem_destroy(FAR struct stm32_i2c_priv_s *priv);
+static inline int stm32_i2c_sem_waitdone(struct stm32_i2c_priv_s *priv);
+static inline void stm32_i2c_sem_waitstop(struct stm32_i2c_priv_s *priv);
+static inline void stm32_i2c_sem_post(struct stm32_i2c_priv_s *priv);
+static inline void stm32_i2c_sem_init(struct stm32_i2c_priv_s *priv);
+static inline void stm32_i2c_sem_destroy(struct stm32_i2c_priv_s *priv);
#ifdef CONFIG_I2C_TRACE
-static void stm32_i2c_tracereset(FAR struct stm32_i2c_priv_s *priv);
-static void stm32_i2c_tracenew(FAR struct stm32_i2c_priv_s *priv,
+static void stm32_i2c_tracereset(struct stm32_i2c_priv_s *priv);
+static void stm32_i2c_tracenew(struct stm32_i2c_priv_s *priv,
uint32_t status);
-static void stm32_i2c_traceevent(FAR struct stm32_i2c_priv_s *priv,
+static void stm32_i2c_traceevent(struct stm32_i2c_priv_s *priv,
enum stm32_trace_e event, uint32_t parm);
-static void stm32_i2c_tracedump(FAR struct stm32_i2c_priv_s *priv);
+static void stm32_i2c_tracedump(struct stm32_i2c_priv_s *priv);
#endif /* CONFIG_I2C_TRACE */
-static void stm32_i2c_setclock(FAR struct stm32_i2c_priv_s *priv,
+static void stm32_i2c_setclock(struct stm32_i2c_priv_s *priv,
uint32_t frequency);
-static inline void stm32_i2c_sendstart(FAR struct stm32_i2c_priv_s *priv);
-static inline void stm32_i2c_clrstart(FAR struct stm32_i2c_priv_s *priv);
-static inline void stm32_i2c_sendstop(FAR struct stm32_i2c_priv_s *priv);
+static inline void stm32_i2c_sendstart(struct stm32_i2c_priv_s *priv);
+static inline void stm32_i2c_clrstart(struct stm32_i2c_priv_s *priv);
+static inline void stm32_i2c_sendstop(struct stm32_i2c_priv_s *priv);
static inline
-uint32_t stm32_i2c_getstatus(FAR struct stm32_i2c_priv_s *priv);
+uint32_t stm32_i2c_getstatus(struct stm32_i2c_priv_s *priv);
#ifdef I2C1_FSMC_CONFLICT
static inline
-uint32_t stm32_i2c_disablefsmc(FAR struct stm32_i2c_priv_s *priv);
+uint32_t stm32_i2c_disablefsmc(struct stm32_i2c_priv_s *priv);
static inline void stm32_i2c_enablefsmc(uint32_t ahbenr);
#endif /* I2C1_FSMC_CONFLICT */
static int stm32_i2c_isr_process(struct stm32_i2c_priv_s * priv);
#ifndef CONFIG_I2C_POLLED
-static int stm32_i2c_isr(int irq, void *context, FAR void *arg);
+static int stm32_i2c_isr(int irq, void *context, void *arg);
#endif /* !CONFIG_I2C_POLLED */
-static int stm32_i2c_init(FAR struct stm32_i2c_priv_s *priv);
-static int stm32_i2c_deinit(FAR struct stm32_i2c_priv_s *priv);
-static int stm32_i2c_transfer(FAR struct i2c_master_s *dev,
- FAR struct i2c_msg_s *msgs, int count);
+static int stm32_i2c_init(struct stm32_i2c_priv_s *priv);
+static int stm32_i2c_deinit(struct stm32_i2c_priv_s *priv);
+static int stm32_i2c_transfer(struct i2c_master_s *dev,
+ struct i2c_msg_s *msgs, int count);
#ifdef CONFIG_I2C_RESET
-static int stm32_i2c_reset(FAR struct i2c_master_s *dev);
+static int stm32_i2c_reset(struct i2c_master_s *dev);
#endif
/****************************************************************************
@@ -452,7 +452,7 @@ static struct stm32_i2c_priv_s stm32_i2c3_priv =
*
****************************************************************************/
-static inline uint16_t stm32_i2c_getreg(FAR struct stm32_i2c_priv_s *priv,
+static inline uint16_t stm32_i2c_getreg(struct stm32_i2c_priv_s *priv,
uint8_t offset)
{
return getreg16(priv->config->base + offset);
@@ -466,7 +466,7 @@ static inline uint16_t stm32_i2c_getreg(FAR struct stm32_i2c_priv_s *priv,
*
****************************************************************************/
-static inline void stm32_i2c_putreg(FAR struct stm32_i2c_priv_s *priv,
+static inline void stm32_i2c_putreg(struct stm32_i2c_priv_s *priv,
uint8_t offset, uint16_t value)
{
putreg16(value, priv->config->base + offset);
@@ -480,7 +480,7 @@ static inline void stm32_i2c_putreg(FAR struct stm32_i2c_priv_s *priv,
*
****************************************************************************/
-static inline void stm32_i2c_modifyreg(FAR struct stm32_i2c_priv_s *priv,
+static inline void stm32_i2c_modifyreg(struct stm32_i2c_priv_s *priv,
uint8_t offset, uint16_t clearbits,
uint16_t setbits)
{
@@ -497,7 +497,7 @@ static inline void stm32_i2c_modifyreg(FAR struct stm32_i2c_priv_s *priv,
****************************************************************************/
#ifdef CONFIG_STM32_I2C_DYNTIMEO
-static useconds_t stm32_i2c_tousecs(int msgc, FAR struct i2c_msg_s *msgs)
+static useconds_t stm32_i2c_tousecs(int msgc, struct i2c_msg_s *msgs)
{
size_t bytecount = 0;
int i;
@@ -526,7 +526,7 @@ static useconds_t stm32_i2c_tousecs(int msgc, FAR struct i2c_msg_s *msgs)
****************************************************************************/
#ifndef CONFIG_I2C_POLLED
-static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv)
+static inline int stm32_i2c_sem_waitdone(struct stm32_i2c_priv_s *priv)
{
struct timespec abstime;
irqstate_t flags;
@@ -609,7 +609,7 @@ static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv)
return ret;
}
#else
-static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv)
+static inline int stm32_i2c_sem_waitdone(struct stm32_i2c_priv_s *priv)
{
clock_t timeout;
clock_t start;
@@ -668,7 +668,7 @@ static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static inline void stm32_i2c_sem_waitstop(FAR struct stm32_i2c_priv_s *priv)
+static inline void stm32_i2c_sem_waitstop(struct stm32_i2c_priv_s *priv)
{
clock_t start;
clock_t elapsed;
@@ -746,7 +746,7 @@ static inline void stm32_i2c_sem_post(struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static inline void stm32_i2c_sem_init(FAR struct stm32_i2c_priv_s *priv)
+static inline void stm32_i2c_sem_init(struct stm32_i2c_priv_s *priv)
{
nxsem_init(&priv->sem_excl, 0, 1);
@@ -768,7 +768,7 @@ static inline void stm32_i2c_sem_init(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static inline void stm32_i2c_sem_destroy(FAR struct stm32_i2c_priv_s *priv)
+static inline void stm32_i2c_sem_destroy(struct stm32_i2c_priv_s *priv)
{
nxsem_destroy(&priv->sem_excl);
#ifndef CONFIG_I2C_POLLED
@@ -785,7 +785,7 @@ static inline void stm32_i2c_sem_destroy(FAR struct stm32_i2c_priv_s *priv)
****************************************************************************/
#ifdef CONFIG_I2C_TRACE
-static void stm32_i2c_traceclear(FAR struct stm32_i2c_priv_s *priv)
+static void stm32_i2c_traceclear(struct stm32_i2c_priv_s *priv)
{
struct stm32_trace_s *trace = &priv->trace[priv->tndx];
@@ -796,7 +796,7 @@ static void stm32_i2c_traceclear(FAR struct stm32_i2c_priv_s *priv)
trace->time = 0; /* Time of first status or event */
}
-static void stm32_i2c_tracereset(FAR struct stm32_i2c_priv_s *priv)
+static void stm32_i2c_tracereset(struct stm32_i2c_priv_s *priv)
{
/* Reset the trace info for a new data collection */
@@ -805,7 +805,7 @@ static void stm32_i2c_tracereset(FAR struct stm32_i2c_priv_s *priv)
stm32_i2c_traceclear(priv);
}
-static void stm32_i2c_tracenew(FAR struct stm32_i2c_priv_s *priv,
+static void stm32_i2c_tracenew(struct stm32_i2c_priv_s *priv,
uint32_t status)
{
struct stm32_trace_s *trace = &priv->trace[priv->tndx];
@@ -847,7 +847,7 @@ static void stm32_i2c_tracenew(FAR struct stm32_i2c_priv_s *priv,
}
}
-static void stm32_i2c_traceevent(FAR struct stm32_i2c_priv_s *priv,
+static void stm32_i2c_traceevent(struct stm32_i2c_priv_s *priv,
enum stm32_trace_e event, uint32_t parm)
{
struct stm32_trace_s *trace;
@@ -874,7 +874,7 @@ static void stm32_i2c_traceevent(FAR struct stm32_i2c_priv_s *priv,
}
}
-static void stm32_i2c_tracedump(FAR struct stm32_i2c_priv_s *priv)
+static void stm32_i2c_tracedump(struct stm32_i2c_priv_s *priv)
{
struct stm32_trace_s *trace;
int i;
@@ -901,7 +901,7 @@ static void stm32_i2c_tracedump(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static void stm32_i2c_setclock(FAR struct stm32_i2c_priv_s *priv,
+static void stm32_i2c_setclock(struct stm32_i2c_priv_s *priv,
uint32_t frequency)
{
uint16_t cr1;
@@ -1013,7 +1013,7 @@ static void stm32_i2c_setclock(FAR struct stm32_i2c_priv_s *priv,
*
****************************************************************************/
-static inline void stm32_i2c_sendstart(FAR struct stm32_i2c_priv_s *priv)
+static inline void stm32_i2c_sendstart(struct stm32_i2c_priv_s *priv)
{
/* Disable ACK on receive by default and generate START */
@@ -1029,7 +1029,7 @@ static inline void stm32_i2c_sendstart(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static inline void stm32_i2c_clrstart(FAR struct stm32_i2c_priv_s *priv)
+static inline void stm32_i2c_clrstart(struct stm32_i2c_priv_s *priv)
{
/* "Note: When the STOP, START or PEC bit is set, the software must
* not perform any write access to I2C_CR1 before this bit is
@@ -1060,7 +1060,7 @@ static inline void stm32_i2c_clrstart(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static inline void stm32_i2c_sendstop(FAR struct stm32_i2c_priv_s *priv)
+static inline void stm32_i2c_sendstop(struct stm32_i2c_priv_s *priv)
{
stm32_i2c_modifyreg(priv, STM32_I2C_CR1_OFFSET, I2C_CR1_ACK, I2C_CR1_STOP);
}
@@ -1073,7 +1073,7 @@ static inline void stm32_i2c_sendstop(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static inline uint32_t stm32_i2c_getstatus(FAR struct stm32_i2c_priv_s *priv)
+static inline uint32_t stm32_i2c_getstatus(struct stm32_i2c_priv_s *priv)
{
uint32_t status = stm32_i2c_getreg(priv, STM32_I2C_SR1_OFFSET);
status |= (stm32_i2c_getreg(priv, STM32_I2C_SR2_OFFSET) << 16);
@@ -1095,7 +1095,7 @@ static inline uint32_t stm32_i2c_getstatus(FAR struct stm32_i2c_priv_s *priv)
#ifdef I2C1_FSMC_CONFLICT
static inline
-uint32_t stm32_i2c_disablefsmc(FAR struct stm32_i2c_priv_s *priv)
+uint32_t stm32_i2c_disablefsmc(struct stm32_i2c_priv_s *priv)
{
uint32_t ret = 0;
uint32_t regval;
@@ -1445,7 +1445,7 @@ static int stm32_i2c_isr_process(struct stm32_i2c_priv_s *priv)
****************************************************************************/
#ifndef CONFIG_I2C_POLLED
-static int stm32_i2c_isr(int irq, void *context, FAR void *arg)
+static int stm32_i2c_isr(int irq, void *context, void *arg)
{
struct stm32_i2c_priv_s *priv = (struct stm32_i2c_priv_s *)arg;
@@ -1462,7 +1462,7 @@ static int stm32_i2c_isr(int irq, void *context, FAR void *arg)
*
****************************************************************************/
-static int stm32_i2c_init(FAR struct stm32_i2c_priv_s *priv)
+static int stm32_i2c_init(struct stm32_i2c_priv_s *priv)
{
/* Power-up and configure GPIOs */
@@ -1521,7 +1521,7 @@ static int stm32_i2c_init(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static int stm32_i2c_deinit(FAR struct stm32_i2c_priv_s *priv)
+static int stm32_i2c_deinit(struct stm32_i2c_priv_s *priv)
{
/* Disable I2C */
@@ -1559,10 +1559,10 @@ static int stm32_i2c_deinit(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static int stm32_i2c_transfer(FAR struct i2c_master_s *dev,
- FAR struct i2c_msg_s *msgs, int count)
+static int stm32_i2c_transfer(struct i2c_master_s *dev,
+ struct i2c_msg_s *msgs, int count)
{
- FAR struct stm32_i2c_priv_s *priv = (struct stm32_i2c_priv_s *)dev;
+ struct stm32_i2c_priv_s *priv = (struct stm32_i2c_priv_s *)dev;
uint32_t status = 0;
#ifdef I2C1_FSMC_CONFLICT
uint32_t ahbenr;
@@ -1782,9 +1782,9 @@ static int stm32_i2c_transfer(FAR struct i2c_master_s *dev,
****************************************************************************/
#ifdef CONFIG_I2C_RESET
-static int stm32_i2c_reset(FAR struct i2c_master_s *dev)
+static int stm32_i2c_reset(struct i2c_master_s *dev)
{
- FAR struct stm32_i2c_priv_s *priv = (struct stm32_i2c_priv_s *)dev;
+ struct stm32_i2c_priv_s *priv = (struct stm32_i2c_priv_s *)dev;
unsigned int clock_count;
unsigned int stretch_count;
uint32_t scl_gpio;
@@ -1917,7 +1917,7 @@ out:
*
****************************************************************************/
-FAR struct i2c_master_s *stm32_i2cbus_initialize(int port)
+struct i2c_master_s *stm32_i2cbus_initialize(int port)
{
struct stm32_i2c_priv_s * priv = NULL;
irqstate_t flags;
@@ -1978,9 +1978,9 @@ FAR struct i2c_master_s *stm32_i2cbus_initialize(int port)
*
****************************************************************************/
-int stm32_i2cbus_uninitialize(FAR struct i2c_master_s *dev)
+int stm32_i2cbus_uninitialize(struct i2c_master_s *dev)
{
- FAR struct stm32_i2c_priv_s *priv = (struct stm32_i2c_priv_s *)dev;
+ struct stm32_i2c_priv_s *priv = (struct stm32_i2c_priv_s *)dev;
irqstate_t flags;
DEBUGASSERT(dev);
diff --git a/arch/arm/src/stm32/stm32_i2c.h b/arch/arm/src/stm32/stm32_i2c.h
index 3d30f60931..7dab949001 100644
--- a/arch/arm/src/stm32/stm32_i2c.h
+++ b/arch/arm/src/stm32/stm32_i2c.h
@@ -67,7 +67,7 @@
*
****************************************************************************/
-FAR struct i2c_master_s *stm32_i2cbus_initialize(int port);
+struct i2c_master_s *stm32_i2cbus_initialize(int port);
/****************************************************************************
* Name: stm32_i2cbus_uninitialize
@@ -84,6 +84,6 @@ FAR struct i2c_master_s *stm32_i2cbus_initialize(int port);
*
****************************************************************************/
-int stm32_i2cbus_uninitialize(FAR struct i2c_master_s *dev);
+int stm32_i2cbus_uninitialize(struct i2c_master_s *dev);
#endif /* __ARCH_ARM_SRC_STM32_STM32_I2C_H */
diff --git a/arch/arm/src/stm32/stm32_i2c_alt.c b/arch/arm/src/stm32/stm32_i2c_alt.c
index 10089614c0..7c4f8e8e34 100644
--- a/arch/arm/src/stm32/stm32_i2c_alt.c
+++ b/arch/arm/src/stm32/stm32_i2c_alt.c
@@ -314,59 +314,59 @@ struct stm32_i2c_priv_s
* Private Function Prototypes
****************************************************************************/
-static inline uint16_t stm32_i2c_getreg(FAR struct stm32_i2c_priv_s *priv,
+static inline uint16_t stm32_i2c_getreg(struct stm32_i2c_priv_s *priv,
uint8_t offset);
-static inline void stm32_i2c_putreg(FAR struct stm32_i2c_priv_s *priv,
+static inline void stm32_i2c_putreg(struct stm32_i2c_priv_s *priv,
uint8_t offset, uint16_t value);
-static inline void stm32_i2c_modifyreg(FAR struct stm32_i2c_priv_s *priv,
+static inline void stm32_i2c_modifyreg(struct stm32_i2c_priv_s *priv,
uint8_t offset, uint16_t clearbits,
uint16_t setbits);
#ifdef CONFIG_STM32_I2C_DYNTIMEO
-static useconds_t stm32_i2c_tousecs(int msgc, FAR struct i2c_msg_s *msgs);
+static useconds_t stm32_i2c_tousecs(int msgc, struct i2c_msg_s *msgs);
#endif /* CONFIG_STM32_I2C_DYNTIMEO */
-static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv);
-static inline void stm32_i2c_sem_waitstop(FAR struct stm32_i2c_priv_s *priv);
-static inline void stm32_i2c_sem_post(FAR struct stm32_i2c_priv_s *priv);
-static inline void stm32_i2c_sem_init(FAR struct stm32_i2c_priv_s *priv);
-static inline void stm32_i2c_sem_destroy(FAR struct stm32_i2c_priv_s *priv);
+static inline int stm32_i2c_sem_waitdone(struct stm32_i2c_priv_s *priv);
+static inline void stm32_i2c_sem_waitstop(struct stm32_i2c_priv_s *priv);
+static inline void stm32_i2c_sem_post(struct stm32_i2c_priv_s *priv);
+static inline void stm32_i2c_sem_init(struct stm32_i2c_priv_s *priv);
+static inline void stm32_i2c_sem_destroy(struct stm32_i2c_priv_s *priv);
#ifdef CONFIG_I2C_TRACE
-static void stm32_i2c_tracereset(FAR struct stm32_i2c_priv_s *priv);
-static void stm32_i2c_tracenew(FAR struct stm32_i2c_priv_s *priv,
+static void stm32_i2c_tracereset(struct stm32_i2c_priv_s *priv);
+static void stm32_i2c_tracenew(struct stm32_i2c_priv_s *priv,
uint16_t status);
-static void stm32_i2c_traceevent(FAR struct stm32_i2c_priv_s *priv,
+static void stm32_i2c_traceevent(struct stm32_i2c_priv_s *priv,
uint16_t event, uint32_t parm);
-static void stm32_i2c_tracedump(FAR struct stm32_i2c_priv_s *priv);
+static void stm32_i2c_tracedump(struct stm32_i2c_priv_s *priv);
#endif /* CONFIG_I2C_TRACE */
-static void stm32_i2c_setclock(FAR struct stm32_i2c_priv_s *priv,
+static void stm32_i2c_setclock(struct stm32_i2c_priv_s *priv,
uint32_t frequency);
-static inline void stm32_i2c_sendstart(FAR struct stm32_i2c_priv_s *priv);
-static inline void stm32_i2c_clrstart(FAR struct stm32_i2c_priv_s *priv);
-static inline void stm32_i2c_sendstop(FAR struct stm32_i2c_priv_s *priv);
+static inline void stm32_i2c_sendstart(struct stm32_i2c_priv_s *priv);
+static inline void stm32_i2c_clrstart(struct stm32_i2c_priv_s *priv);
+static inline void stm32_i2c_sendstop(struct stm32_i2c_priv_s *priv);
static inline
-uint32_t stm32_i2c_getstatus(FAR struct stm32_i2c_priv_s *priv);
+uint32_t stm32_i2c_getstatus(struct stm32_i2c_priv_s *priv);
#ifdef I2C1_FSMC_CONFLICT
static inline
-uint32_t stm32_i2c_disablefsmc(FAR struct stm32_i2c_priv_s *priv);
+uint32_t stm32_i2c_disablefsmc(struct stm32_i2c_priv_s *priv);
static inline void stm32_i2c_enablefsmc(uint32_t ahbenr);
#endif /* I2C1_FSMC_CONFLICT */
static int stm32_i2c_isr_process(struct stm32_i2c_priv_s * priv);
#ifndef CONFIG_I2C_POLLED
-static int stm32_i2c_isr(int irq, void *context, FAR void *arg);
+static int stm32_i2c_isr(int irq, void *context, void *arg);
#endif /* !CONFIG_I2C_POLLED */
-static int stm32_i2c_init(FAR struct stm32_i2c_priv_s *priv);
-static int stm32_i2c_deinit(FAR struct stm32_i2c_priv_s *priv);
-static int stm32_i2c_transfer(FAR struct i2c_master_s *dev,
- FAR struct i2c_msg_s *msgs, int count);
+static int stm32_i2c_init(struct stm32_i2c_priv_s *priv);
+static int stm32_i2c_deinit(struct stm32_i2c_priv_s *priv);
+static int stm32_i2c_transfer(struct i2c_master_s *dev,
+ struct i2c_msg_s *msgs, int count);
#ifdef CONFIG_I2C_RESET
-static int stm32_i2c_reset(FAR struct i2c_master_s *dev);
+static int stm32_i2c_reset(struct i2c_master_s *dev);
#endif
/****************************************************************************
@@ -482,7 +482,7 @@ static struct stm32_i2c_priv_s stm32_i2c3_priv =
*
****************************************************************************/
-static inline uint16_t stm32_i2c_getreg(FAR struct stm32_i2c_priv_s *priv,
+static inline uint16_t stm32_i2c_getreg(struct stm32_i2c_priv_s *priv,
uint8_t offset)
{
return getreg16(priv->config->base + offset);
@@ -496,7 +496,7 @@ static inline uint16_t stm32_i2c_getreg(FAR struct stm32_i2c_priv_s *priv,
*
****************************************************************************/
-static inline void stm32_i2c_putreg(FAR struct stm32_i2c_priv_s *priv,
+static inline void stm32_i2c_putreg(struct stm32_i2c_priv_s *priv,
uint8_t offset, uint16_t value)
{
putreg16(value, priv->config->base + offset);
@@ -510,7 +510,7 @@ static inline void stm32_i2c_putreg(FAR struct stm32_i2c_priv_s *priv,
*
****************************************************************************/
-static inline void stm32_i2c_modifyreg(FAR struct stm32_i2c_priv_s *priv,
+static inline void stm32_i2c_modifyreg(struct stm32_i2c_priv_s *priv,
uint8_t offset, uint16_t clearbits,
uint16_t setbits)
{
@@ -527,7 +527,7 @@ static inline void stm32_i2c_modifyreg(FAR struct stm32_i2c_priv_s *priv,
****************************************************************************/
#ifdef CONFIG_STM32_I2C_DYNTIMEO
-static useconds_t stm32_i2c_tousecs(int msgc, FAR struct i2c_msg_s *msgs)
+static useconds_t stm32_i2c_tousecs(int msgc, struct i2c_msg_s *msgs)
{
size_t bytecount = 0;
int i;
@@ -556,7 +556,7 @@ static useconds_t stm32_i2c_tousecs(int msgc, FAR struct i2c_msg_s *msgs)
****************************************************************************/
#ifndef CONFIG_I2C_POLLED
-static int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv)
+static int stm32_i2c_sem_waitdone(struct stm32_i2c_priv_s *priv)
{
struct timespec abstime;
irqstate_t flags;
@@ -639,7 +639,7 @@ static int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv)
return ret;
}
#else
-static int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv)
+static int stm32_i2c_sem_waitdone(struct stm32_i2c_priv_s *priv)
{
clock_t timeout;
clock_t start;
@@ -698,7 +698,7 @@ static int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static inline void stm32_i2c_sem_waitstop(FAR struct stm32_i2c_priv_s *priv)
+static inline void stm32_i2c_sem_waitstop(struct stm32_i2c_priv_s *priv)
{
clock_t start;
clock_t elapsed;
@@ -763,7 +763,7 @@ static inline void stm32_i2c_sem_waitstop(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static inline void stm32_i2c_sem_post(FAR struct stm32_i2c_priv_s *priv)
+static inline void stm32_i2c_sem_post(struct stm32_i2c_priv_s *priv)
{
nxsem_post(&priv->sem_excl);
}
@@ -776,7 +776,7 @@ static inline void stm32_i2c_sem_post(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static inline void stm32_i2c_sem_init(FAR struct stm32_i2c_priv_s *priv)
+static inline void stm32_i2c_sem_init(struct stm32_i2c_priv_s *priv)
{
nxsem_init(&priv->sem_excl, 0, 1);
@@ -798,7 +798,7 @@ static inline void stm32_i2c_sem_init(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static inline void stm32_i2c_sem_destroy(FAR struct stm32_i2c_priv_s *priv)
+static inline void stm32_i2c_sem_destroy(struct stm32_i2c_priv_s *priv)
{
nxsem_destroy(&priv->sem_excl);
#ifndef CONFIG_I2C_POLLED
@@ -815,7 +815,7 @@ static inline void stm32_i2c_sem_destroy(FAR struct stm32_i2c_priv_s *priv)
****************************************************************************/
#ifdef CONFIG_I2C_TRACE
-static void stm32_i2c_traceclear(FAR struct stm32_i2c_priv_s *priv)
+static void stm32_i2c_traceclear(struct stm32_i2c_priv_s *priv)
{
struct stm32_trace_s *trace = &priv->trace[priv->tndx];
@@ -826,7 +826,7 @@ static void stm32_i2c_traceclear(FAR struct stm32_i2c_priv_s *priv)
trace->time = 0; /* Time of first status or event */
}
-static void stm32_i2c_tracereset(FAR struct stm32_i2c_priv_s *priv)
+static void stm32_i2c_tracereset(struct stm32_i2c_priv_s *priv)
{
/* Reset the trace info for a new data collection */
@@ -835,7 +835,7 @@ static void stm32_i2c_tracereset(FAR struct stm32_i2c_priv_s *priv)
stm32_i2c_traceclear(priv);
}
-static void stm32_i2c_tracenew(FAR struct stm32_i2c_priv_s *priv,
+static void stm32_i2c_tracenew(struct stm32_i2c_priv_s *priv,
uint16_t status)
{
struct stm32_trace_s *trace = &priv->trace[priv->tndx];
@@ -877,7 +877,7 @@ static void stm32_i2c_tracenew(FAR struct stm32_i2c_priv_s *priv,
}
}
-static void stm32_i2c_traceevent(FAR struct stm32_i2c_priv_s *priv,
+static void stm32_i2c_traceevent(struct stm32_i2c_priv_s *priv,
uint16_t event, uint32_t parm)
{
struct stm32_trace_s *trace;
@@ -904,7 +904,7 @@ static void stm32_i2c_traceevent(FAR struct stm32_i2c_priv_s *priv,
}
}
-static void stm32_i2c_tracedump(FAR struct stm32_i2c_priv_s *priv)
+static void stm32_i2c_tracedump(struct stm32_i2c_priv_s *priv)
{
struct stm32_trace_s *trace;
int i;
@@ -931,7 +931,7 @@ static void stm32_i2c_tracedump(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static void stm32_i2c_setclock(FAR struct stm32_i2c_priv_s *priv,
+static void stm32_i2c_setclock(struct stm32_i2c_priv_s *priv,
uint32_t frequency)
{
uint16_t cr1;
@@ -1043,7 +1043,7 @@ static void stm32_i2c_setclock(FAR struct stm32_i2c_priv_s *priv,
*
****************************************************************************/
-static inline void stm32_i2c_sendstart(FAR struct stm32_i2c_priv_s *priv)
+static inline void stm32_i2c_sendstart(struct stm32_i2c_priv_s *priv)
{
/* Disable ACK on receive by default and generate START */
@@ -1059,7 +1059,7 @@ static inline void stm32_i2c_sendstart(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static inline void stm32_i2c_clrstart(FAR struct stm32_i2c_priv_s *priv)
+static inline void stm32_i2c_clrstart(struct stm32_i2c_priv_s *priv)
{
/* "Note: When the STOP, START or PEC bit is set, the software must
* not perform any write access to I2C_CR1 before this bit is
@@ -1090,7 +1090,7 @@ static inline void stm32_i2c_clrstart(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static inline void stm32_i2c_sendstop(FAR struct stm32_i2c_priv_s *priv)
+static inline void stm32_i2c_sendstop(struct stm32_i2c_priv_s *priv)
{
stm32_i2c_modifyreg(priv, STM32_I2C_CR1_OFFSET, I2C_CR1_ACK, I2C_CR1_STOP);
}
@@ -1103,7 +1103,7 @@ static inline void stm32_i2c_sendstop(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static inline uint32_t stm32_i2c_getstatus(FAR struct stm32_i2c_priv_s *priv)
+static inline uint32_t stm32_i2c_getstatus(struct stm32_i2c_priv_s *priv)
{
uint32_t status = stm32_i2c_getreg(priv, STM32_I2C_SR1_OFFSET);
status |= (stm32_i2c_getreg(priv, STM32_I2C_SR2_OFFSET) << 16);
@@ -1124,7 +1124,7 @@ static inline uint32_t stm32_i2c_getstatus(FAR struct stm32_i2c_priv_s *priv)
#ifdef I2C1_FSMC_CONFLICT
static inline
-uint32_t stm32_i2c_disablefsmc(FAR struct stm32_i2c_priv_s *priv)
+uint32_t stm32_i2c_disablefsmc(struct stm32_i2c_priv_s *priv)
{
uint32_t ret = 0;
uint32_t regval;
@@ -1947,7 +1947,7 @@ static int stm32_i2c_isr_process(struct stm32_i2c_priv_s *priv)
****************************************************************************/
#ifndef CONFIG_I2C_POLLED
-static int stm32_i2c_isr(int irq, void *context, FAR void *arg)
+static int stm32_i2c_isr(int irq, void *context, void *arg)
{
struct stm32_i2c_priv_s *priv = (struct stm32_i2c_priv_s *)arg;
@@ -1964,7 +1964,7 @@ static int stm32_i2c_isr(int irq, void *context, FAR void *arg)
*
****************************************************************************/
-static int stm32_i2c_init(FAR struct stm32_i2c_priv_s *priv)
+static int stm32_i2c_init(struct stm32_i2c_priv_s *priv)
{
/* Power-up and configure GPIOs */
@@ -2023,7 +2023,7 @@ static int stm32_i2c_init(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static int stm32_i2c_deinit(FAR struct stm32_i2c_priv_s *priv)
+static int stm32_i2c_deinit(struct stm32_i2c_priv_s *priv)
{
/* Disable I2C */
@@ -2061,10 +2061,10 @@ static int stm32_i2c_deinit(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static int stm32_i2c_transfer(FAR struct i2c_master_s *dev,
- FAR struct i2c_msg_s *msgs, int count)
+static int stm32_i2c_transfer(struct i2c_master_s *dev,
+ struct i2c_msg_s *msgs, int count)
{
- FAR struct stm32_i2c_priv_s *priv = (FAR struct stm32_i2c_priv_s *)dev;
+ struct stm32_i2c_priv_s *priv = (struct stm32_i2c_priv_s *)dev;
uint32_t status = 0;
#ifdef I2C1_FSMC_CONFLICT
uint32_t ahbenr;
@@ -2297,9 +2297,9 @@ static int stm32_i2c_transfer(FAR struct i2c_master_s *dev,
****************************************************************************/
#ifdef CONFIG_I2C_RESET
-static int stm32_i2c_reset(FAR struct i2c_master_s * dev)
+static int stm32_i2c_reset(struct i2c_master_s * dev)
{
- FAR struct stm32_i2c_priv_s *priv = (FAR struct stm32_i2c_priv_s *)dev;
+ struct stm32_i2c_priv_s *priv = (struct stm32_i2c_priv_s *)dev;
unsigned int clock_count;
unsigned int stretch_count;
uint32_t scl_gpio;
@@ -2429,7 +2429,7 @@ out:
*
****************************************************************************/
-FAR struct i2c_master_s *stm32_i2cbus_initialize(int port)
+struct i2c_master_s *stm32_i2cbus_initialize(int port)
{
struct stm32_i2c_priv_s *priv = NULL;
irqstate_t flags;
@@ -2490,9 +2490,9 @@ FAR struct i2c_master_s *stm32_i2cbus_initialize(int port)
*
****************************************************************************/
-int stm32_i2cbus_uninitialize(FAR struct i2c_master_s *dev)
+int stm32_i2cbus_uninitialize(struct i2c_master_s *dev)
{
- FAR struct stm32_i2c_priv_s *priv = (FAR struct stm32_i2c_priv_s *)dev;
+ struct stm32_i2c_priv_s *priv = (struct stm32_i2c_priv_s *)dev;
irqstate_t flags;
DEBUGASSERT(dev);
diff --git a/arch/arm/src/stm32/stm32_i2c_v2.c b/arch/arm/src/stm32/stm32_i2c_v2.c
index 4b3a7bc128..737a6bf07c 100644
--- a/arch/arm/src/stm32/stm32_i2c_v2.c
+++ b/arch/arm/src/stm32/stm32_i2c_v2.c
@@ -444,53 +444,53 @@ struct stm32_i2c_inst_s
* Private Function Prototypes
****************************************************************************/
-static inline uint16_t stm32_i2c_getreg(FAR struct stm32_i2c_priv_s *priv,
+static inline uint16_t stm32_i2c_getreg(struct stm32_i2c_priv_s *priv,
uint8_t offset);
-static inline void stm32_i2c_putreg(FAR struct stm32_i2c_priv_s *priv,
+static inline void stm32_i2c_putreg(struct stm32_i2c_priv_s *priv,
uint8_t offset, uint16_t value);
-static inline void stm32_i2c_putreg32(FAR struct stm32_i2c_priv_s *priv,
+static inline void stm32_i2c_putreg32(struct stm32_i2c_priv_s *priv,
uint8_t offset, uint32_t value);
-static inline void stm32_i2c_modifyreg32(FAR struct stm32_i2c_priv_s *priv,
+static inline void stm32_i2c_modifyreg32(struct stm32_i2c_priv_s *priv,
uint8_t offset, uint32_t clearbits,
uint32_t setbits);
#ifdef CONFIG_STM32_I2C_DYNTIMEO
-static useconds_t stm32_i2c_tousecs(int msgc, FAR struct i2c_msg_s *msgs);
+static useconds_t stm32_i2c_tousecs(int msgc, struct i2c_msg_s *msgs);
#endif /* CONFIG_STM32_I2C_DYNTIMEO */
-static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv);
-static inline void stm32_i2c_sem_waitstop(FAR struct stm32_i2c_priv_s *priv);
-static inline void stm32_i2c_sem_post(FAR struct i2c_master_s *dev);
-static inline void stm32_i2c_sem_init(FAR struct i2c_master_s *dev);
-static inline void stm32_i2c_sem_destroy(FAR struct i2c_master_s *dev);
+static inline int stm32_i2c_sem_waitdone(struct stm32_i2c_priv_s *priv);
+static inline void stm32_i2c_sem_waitstop(struct stm32_i2c_priv_s *priv);
+static inline void stm32_i2c_sem_post(struct i2c_master_s *dev);
+static inline void stm32_i2c_sem_init(struct i2c_master_s *dev);
+static inline void stm32_i2c_sem_destroy(struct i2c_master_s *dev);
#ifdef CONFIG_I2C_TRACE
-static void stm32_i2c_tracereset(FAR struct stm32_i2c_priv_s *priv);
-static void stm32_i2c_tracenew(FAR struct stm32_i2c_priv_s *priv,
+static void stm32_i2c_tracereset(struct stm32_i2c_priv_s *priv);
+static void stm32_i2c_tracenew(struct stm32_i2c_priv_s *priv,
uint32_t status);
-static void stm32_i2c_traceevent(FAR struct stm32_i2c_priv_s *priv,
+static void stm32_i2c_traceevent(struct stm32_i2c_priv_s *priv,
enum stm32_trace_e event, uint32_t parm);
-static void stm32_i2c_tracedump(FAR struct stm32_i2c_priv_s *priv);
+static void stm32_i2c_tracedump(struct stm32_i2c_priv_s *priv);
#endif /* CONFIG_I2C_TRACE */
-static void stm32_i2c_setclock(FAR struct stm32_i2c_priv_s *priv,
+static void stm32_i2c_setclock(struct stm32_i2c_priv_s *priv,
uint32_t frequency);
-static inline void stm32_i2c_sendstart(FAR struct stm32_i2c_priv_s *priv);
-static inline void stm32_i2c_sendstop(FAR struct stm32_i2c_priv_s *priv);
+static inline void stm32_i2c_sendstart(struct stm32_i2c_priv_s *priv);
+static inline void stm32_i2c_sendstop(struct stm32_i2c_priv_s *priv);
static inline
-uint32_t stm32_i2c_getstatus(FAR struct stm32_i2c_priv_s *priv);
+uint32_t stm32_i2c_getstatus(struct stm32_i2c_priv_s *priv);
static int stm32_i2c_isr_process(struct stm32_i2c_priv_s * priv);
#ifndef CONFIG_I2C_POLLED
-static int stm32_i2c_isr(int irq, void *context, FAR void *arg);
+static int stm32_i2c_isr(int irq, void *context, void *arg);
#endif
-static int stm32_i2c_init(FAR struct stm32_i2c_priv_s *priv);
-static int stm32_i2c_deinit(FAR struct stm32_i2c_priv_s *priv);
+static int stm32_i2c_init(struct stm32_i2c_priv_s *priv);
+static int stm32_i2c_deinit(struct stm32_i2c_priv_s *priv);
-static int stm32_i2c_process(FAR struct i2c_master_s *dev,
- FAR struct i2c_msg_s *msgs, int count);
-static int stm32_i2c_transfer(FAR struct i2c_master_s *dev,
- FAR struct i2c_msg_s *msgs, int count);
+static int stm32_i2c_process(struct i2c_master_s *dev,
+ struct i2c_msg_s *msgs, int count);
+static int stm32_i2c_transfer(struct i2c_master_s *dev,
+ struct i2c_msg_s *msgs, int count);
#ifdef CONFIG_I2C_RESET
-static int stm32_i2c_reset(FAR struct i2c_master_s * dev);
+static int stm32_i2c_reset(struct i2c_master_s * dev);
#endif
#ifdef CONFIG_PM
-static int stm32_i2c_pm_prepare(FAR struct pm_callback_s *cb, int domain,
+static int stm32_i2c_pm_prepare(struct pm_callback_s *cb, int domain,
enum pm_state_e pmstate);
#endif
@@ -648,7 +648,7 @@ static const struct i2c_ops_s stm32_i2c_ops =
*
****************************************************************************/
-static inline uint16_t stm32_i2c_getreg(FAR struct stm32_i2c_priv_s *priv,
+static inline uint16_t stm32_i2c_getreg(struct stm32_i2c_priv_s *priv,
uint8_t offset)
{
return getreg16(priv->config->base + offset);
@@ -662,7 +662,7 @@ static inline uint16_t stm32_i2c_getreg(FAR struct stm32_i2c_priv_s *priv,
*
****************************************************************************/
-static inline uint32_t stm32_i2c_getreg32(FAR struct stm32_i2c_priv_s *priv,
+static inline uint32_t stm32_i2c_getreg32(struct stm32_i2c_priv_s *priv,
uint8_t offset)
{
return getreg32(priv->config->base + offset);
@@ -676,7 +676,7 @@ static inline uint32_t stm32_i2c_getreg32(FAR struct stm32_i2c_priv_s *priv,
*
****************************************************************************/
-static inline void stm32_i2c_putreg(FAR struct stm32_i2c_priv_s *priv,
+static inline void stm32_i2c_putreg(struct stm32_i2c_priv_s *priv,
uint8_t offset, uint16_t value)
{
putreg16(value, priv->config->base + offset);
@@ -690,7 +690,7 @@ static inline void stm32_i2c_putreg(FAR struct stm32_i2c_priv_s *priv,
*
****************************************************************************/
-static inline void stm32_i2c_putreg32(FAR struct stm32_i2c_priv_s *priv,
+static inline void stm32_i2c_putreg32(struct stm32_i2c_priv_s *priv,
uint8_t offset, uint32_t value)
{
putreg32(value, priv->config->base + offset);
@@ -704,7 +704,7 @@ static inline void stm32_i2c_putreg32(FAR struct stm32_i2c_priv_s *priv,
*
****************************************************************************/
-static inline void stm32_i2c_modifyreg32(FAR struct stm32_i2c_priv_s *priv,
+static inline void stm32_i2c_modifyreg32(struct stm32_i2c_priv_s *priv,
uint8_t offset, uint32_t clearbits,
uint32_t setbits)
{
@@ -721,7 +721,7 @@ static inline void stm32_i2c_modifyreg32(FAR struct stm32_i2c_priv_s *priv,
****************************************************************************/
#ifdef CONFIG_STM32_I2C_DYNTIMEO
-static useconds_t stm32_i2c_tousecs(int msgc, FAR struct i2c_msg_s *msgs)
+static useconds_t stm32_i2c_tousecs(int msgc, struct i2c_msg_s *msgs)
{
size_t bytecount = 0;
int i;
@@ -769,7 +769,7 @@ static inline void stm32_i2c_enableinterrupts(struct stm32_i2c_priv_s *priv)
****************************************************************************/
#ifndef CONFIG_I2C_POLLED
-static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv)
+static inline int stm32_i2c_sem_waitdone(struct stm32_i2c_priv_s *priv)
{
struct timespec abstime;
irqstate_t flags;
@@ -850,7 +850,7 @@ static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv)
return ret;
}
#else
-static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv)
+static inline int stm32_i2c_sem_waitdone(struct stm32_i2c_priv_s *priv)
{
clock_t timeout;
clock_t start;
@@ -909,7 +909,7 @@ static inline int stm32_i2c_sem_waitdone(FAR struct stm32_i2c_priv_s *priv)
****************************************************************************/
static inline void
-stm32_i2c_set_7bit_address(FAR struct stm32_i2c_priv_s *priv)
+stm32_i2c_set_7bit_address(struct stm32_i2c_priv_s *priv)
{
stm32_i2c_modifyreg32(priv, STM32_I2C_CR2_OFFSET, I2C_CR2_SADD7_MASK,
((priv->msgv->addr & 0x7f) << I2C_CR2_SADD7_SHIFT));
@@ -923,8 +923,8 @@ stm32_i2c_set_7bit_address(FAR struct stm32_i2c_priv_s *priv)
****************************************************************************/
static inline void
-stm32_i2c_set_bytes_to_transfer(FAR struct stm32_i2c_priv_s *priv,
- uint8_t n_bytes)
+stm32_i2c_set_bytes_to_transfer(struct stm32_i2c_priv_s *priv,
+ uint8_t n_bytes)
{
stm32_i2c_modifyreg32(priv, STM32_I2C_CR2_OFFSET, I2C_CR2_NBYTES_MASK,
(n_bytes << I2C_CR2_NBYTES_SHIFT));
@@ -938,7 +938,7 @@ stm32_i2c_set_bytes_to_transfer(FAR struct stm32_i2c_priv_s *priv,
****************************************************************************/
static inline void
-stm32_i2c_set_write_transfer_dir(FAR struct stm32_i2c_priv_s *priv)
+stm32_i2c_set_write_transfer_dir(struct stm32_i2c_priv_s *priv)
{
stm32_i2c_modifyreg32(priv, STM32_I2C_CR2_OFFSET, I2C_CR2_RD_WRN, 0);
}
@@ -951,7 +951,7 @@ stm32_i2c_set_write_transfer_dir(FAR struct stm32_i2c_priv_s *priv)
****************************************************************************/
static inline void
-stm32_i2c_set_read_transfer_dir(FAR struct stm32_i2c_priv_s *priv)
+stm32_i2c_set_read_transfer_dir(struct stm32_i2c_priv_s *priv)
{
stm32_i2c_modifyreg32(priv, STM32_I2C_CR2_OFFSET, 0, I2C_CR2_RD_WRN);
}
@@ -964,7 +964,7 @@ stm32_i2c_set_read_transfer_dir(FAR struct stm32_i2c_priv_s *priv)
****************************************************************************/
static inline void
-stm32_i2c_enable_reload(FAR struct stm32_i2c_priv_s *priv)
+stm32_i2c_enable_reload(struct stm32_i2c_priv_s *priv)
{
stm32_i2c_modifyreg32(priv, STM32_I2C_CR2_OFFSET, 0, I2C_CR2_RELOAD);
}
@@ -977,7 +977,7 @@ stm32_i2c_enable_reload(FAR struct stm32_i2c_priv_s *priv)
****************************************************************************/
static inline void
-stm32_i2c_disable_reload(FAR struct stm32_i2c_priv_s *priv)
+stm32_i2c_disable_reload(struct stm32_i2c_priv_s *priv)
{
stm32_i2c_modifyreg32(priv, STM32_I2C_CR2_OFFSET, I2C_CR2_RELOAD, 0);
}
@@ -990,7 +990,7 @@ stm32_i2c_disable_reload(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static inline void stm32_i2c_sem_waitstop(FAR struct stm32_i2c_priv_s *priv)
+static inline void stm32_i2c_sem_waitstop(struct stm32_i2c_priv_s *priv)
{
clock_t start;
clock_t elapsed;
@@ -1051,7 +1051,7 @@ static inline void stm32_i2c_sem_waitstop(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static inline void stm32_i2c_sem_post(FAR struct i2c_master_s *dev)
+static inline void stm32_i2c_sem_post(struct i2c_master_s *dev)
{
nxsem_post(&((struct stm32_i2c_inst_s *)dev)->priv->sem_excl);
}
@@ -1064,7 +1064,7 @@ static inline void stm32_i2c_sem_post(FAR struct i2c_master_s *dev)
*
****************************************************************************/
-static inline void stm32_i2c_sem_init(FAR struct i2c_master_s *dev)
+static inline void stm32_i2c_sem_init(struct i2c_master_s *dev)
{
nxsem_init(&((struct stm32_i2c_inst_s *)dev)->priv->sem_excl, 0, 1);
@@ -1087,7 +1087,7 @@ static inline void stm32_i2c_sem_init(FAR struct i2c_master_s *dev)
*
****************************************************************************/
-static inline void stm32_i2c_sem_destroy(FAR struct i2c_master_s *dev)
+static inline void stm32_i2c_sem_destroy(struct i2c_master_s *dev)
{
nxsem_destroy(&((struct stm32_i2c_inst_s *)dev)->priv->sem_excl);
#ifndef CONFIG_I2C_POLLED
@@ -1104,7 +1104,7 @@ static inline void stm32_i2c_sem_destroy(FAR struct i2c_master_s *dev)
****************************************************************************/
#ifdef CONFIG_I2C_TRACE
-static void stm32_i2c_traceclear(FAR struct stm32_i2c_priv_s *priv)
+static void stm32_i2c_traceclear(struct stm32_i2c_priv_s *priv)
{
struct stm32_trace_s *trace = &priv->trace[priv->tndx];
@@ -1115,7 +1115,7 @@ static void stm32_i2c_traceclear(FAR struct stm32_i2c_priv_s *priv)
trace->time = 0; /* Time of first status or event */
}
-static void stm32_i2c_tracereset(FAR struct stm32_i2c_priv_s *priv)
+static void stm32_i2c_tracereset(struct stm32_i2c_priv_s *priv)
{
/* Reset the trace info for a new data collection */
@@ -1124,7 +1124,7 @@ static void stm32_i2c_tracereset(FAR struct stm32_i2c_priv_s *priv)
stm32_i2c_traceclear(priv);
}
-static void stm32_i2c_tracenew(FAR struct stm32_i2c_priv_s *priv,
+static void stm32_i2c_tracenew(struct stm32_i2c_priv_s *priv,
uint32_t status)
{
struct stm32_trace_s *trace = &priv->trace[priv->tndx];
@@ -1166,7 +1166,7 @@ static void stm32_i2c_tracenew(FAR struct stm32_i2c_priv_s *priv,
}
}
-static void stm32_i2c_traceevent(FAR struct stm32_i2c_priv_s *priv,
+static void stm32_i2c_traceevent(struct stm32_i2c_priv_s *priv,
enum stm32_trace_e event, uint32_t parm)
{
struct stm32_trace_s *trace;
@@ -1193,7 +1193,7 @@ static void stm32_i2c_traceevent(FAR struct stm32_i2c_priv_s *priv,
}
}
-static void stm32_i2c_tracedump(FAR struct stm32_i2c_priv_s *priv)
+static void stm32_i2c_tracedump(struct stm32_i2c_priv_s *priv)
{
struct stm32_trace_s *trace;
int i;
@@ -1264,7 +1264,7 @@ static void stm32_i2c_tracedump(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static void stm32_i2c_setclock(FAR struct stm32_i2c_priv_s *priv,
+static void stm32_i2c_setclock(struct stm32_i2c_priv_s *priv,
uint32_t frequency)
{
uint8_t presc;
@@ -1365,7 +1365,7 @@ static void stm32_i2c_setclock(FAR struct stm32_i2c_priv_s *priv,
*
****************************************************************************/
-static inline void stm32_i2c_sendstart(FAR struct stm32_i2c_priv_s *priv)
+static inline void stm32_i2c_sendstart(struct stm32_i2c_priv_s *priv)
{
bool next_norestart = false;
@@ -1491,7 +1491,7 @@ static inline void stm32_i2c_sendstart(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static inline void stm32_i2c_sendstop(FAR struct stm32_i2c_priv_s *priv)
+static inline void stm32_i2c_sendstop(struct stm32_i2c_priv_s *priv)
{
i2cinfo("Sending STOP\n");
stm32_i2c_traceevent(priv, I2CEVENT_WRITE_STOP, 0);
@@ -1507,7 +1507,7 @@ static inline void stm32_i2c_sendstop(FAR struct stm32_i2c_priv_s *priv)
*
****************************************************************************/
-static inline uint32_t stm32_i2c_getstatus(FAR struct stm32_i2c_priv_s *priv)
+static inline uint32_t stm32_i2c_getstatus(struct stm32_i2c_priv_s *priv)
{
return getreg32(priv->config->base + STM32_I2C_ISR_OFFSET);
}
@@ -2185,7 +2185,7 @@ static int stm32_i2c_isr_process(struct stm32_i2c_priv_s *priv)
****************************************************************************/
#ifndef CONFIG_I2C_POLLED
-static int stm32_i2c_isr(int irq, void *context, FAR void *arg)
+static int stm32_i2c_isr(int irq, void *context, void *arg)
{
struct stm32_i2c_priv_s *priv = (struct stm32_i2c_priv_s *)arg;
@@ -2202,7 +2202,7 @@ static int stm32_i2c_isr(int irq, void *context, FAR void *arg)
*
****************************************************************************/
-static int stm32_i2c_init(FAR struct stm32_i2c_priv_s *priv)
... 46987 lines suppressed ...