diff --git a/boards/arm/sam34/arduino-due/src/sam_mmcsd.c b/boards/arm/sam34/arduino-due/src/sam_mmcsd.c index 1f403f6739..3712d3c64f 100644 --- a/boards/arm/sam34/arduino-due/src/sam_mmcsd.c +++ b/boards/arm/sam34/arduino-due/src/sam_mmcsd.c @@ -99,11 +99,11 @@ * Private Function Prototypes ****************************************************************************/ -static void spi_select(FAR struct spi_bitbang_s *priv, uint32_t devid, +static void spi_select(struct spi_bitbang_s *priv, uint32_t devid, bool selected); -static uint8_t spi_status(FAR struct spi_bitbang_s *priv, uint32_t devid); +static uint8_t spi_status(struct spi_bitbang_s *priv, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -static int spi_cmddata(FAR struct spi_bitbang_s *priv, uint32_t devid, +static int spi_cmddata(struct spi_bitbang_s *priv, uint32_t devid, bool cmd); #endif @@ -127,7 +127,7 @@ static int spi_cmddata(FAR struct spi_bitbang_s *priv, uint32_t devid, * ****************************************************************************/ -static void spi_select(FAR struct spi_bitbang_s *priv, uint32_t devid, +static void spi_select(struct spi_bitbang_s *priv, uint32_t devid, bool selected) { if (devid == SPIDEV_MMCSD(0)) @@ -158,7 +158,7 @@ static void spi_select(FAR struct spi_bitbang_s *priv, uint32_t devid, * ****************************************************************************/ -static uint8_t spi_status(FAR struct spi_bitbang_s *priv, uint32_t devid) +static uint8_t spi_status(struct spi_bitbang_s *priv, uint32_t devid) { if (devid == SPIDEV_MMCSD(0)) { @@ -185,7 +185,7 @@ static uint8_t spi_status(FAR struct spi_bitbang_s *priv, uint32_t devid) ****************************************************************************/ #ifdef CONFIG_SPI_CMDDATA -static int spi_cmddata(FAR struct spi_bitbang_s *priv, uint32_t devid, +static int spi_cmddata(struct spi_bitbang_s *priv, uint32_t devid, bool cmd) { return OK; @@ -206,7 +206,7 @@ static int spi_cmddata(FAR struct spi_bitbang_s *priv, uint32_t devid, * ****************************************************************************/ -static FAR struct spi_dev_s *sam_mmcsd_spiinitialize(void) +static struct spi_dev_s *sam_mmcsd_spiinitialize(void) { /* Initialize GPIOs */ @@ -234,7 +234,7 @@ static FAR struct spi_dev_s *sam_mmcsd_spiinitialize(void) int sam_sdinitialize(int minor) { - FAR struct spi_dev_s *spi; + struct spi_dev_s *spi; int ret; /* Get the SPI driver instance for the SD chip select */ diff --git a/boards/arm/sam34/arduino-due/src/sam_touchscreen.c b/boards/arm/sam34/arduino-due/src/sam_touchscreen.c index f0d2e076ba..29f852e30d 100644 --- a/boards/arm/sam34/arduino-due/src/sam_touchscreen.c +++ b/boards/arm/sam34/arduino-due/src/sam_touchscreen.c @@ -112,11 +112,11 @@ /* Lower-half SPI */ -static void spi_select(FAR struct spi_bitbang_s *priv, uint32_t devid, +static void spi_select(struct spi_bitbang_s *priv, uint32_t devid, bool selected); -static uint8_t spi_status(FAR struct spi_bitbang_s *priv, uint32_t devid); +static uint8_t spi_status(struct spi_bitbang_s *priv, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -static int spi_cmddata(FAR struct spi_bitbang_s *priv, uint32_t devid, +static int spi_cmddata(struct spi_bitbang_s *priv, uint32_t devid, bool cmd); #endif @@ -132,11 +132,11 @@ static int spi_cmddata(FAR struct spi_bitbang_s *priv, uint32_t devid, * pendown - Return the state of the pen down GPIO input */ -static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t isr); -static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable); -static void tsc_clear(FAR struct ads7843e_config_s *state); -static bool tsc_busy(FAR struct ads7843e_config_s *state); -static bool tsc_pendown(FAR struct ads7843e_config_s *state); +static int tsc_attach(struct ads7843e_config_s *state, xcpt_t isr); +static void tsc_enable(struct ads7843e_config_s *state, bool enable); +static void tsc_clear(struct ads7843e_config_s *state); +static bool tsc_busy(struct ads7843e_config_s *state); +static bool tsc_pendown(struct ads7843e_config_s *state); /**************************************************************************** * Private Data @@ -183,7 +183,7 @@ static struct ads7843e_config_s g_tscinfo = * ****************************************************************************/ -static void spi_select(FAR struct spi_bitbang_s *priv, uint32_t devid, +static void spi_select(struct spi_bitbang_s *priv, uint32_t devid, bool selected) { /* The touchscreen controller is always selected */ @@ -204,7 +204,7 @@ static void spi_select(FAR struct spi_bitbang_s *priv, uint32_t devid, * ****************************************************************************/ -static uint8_t spi_status(FAR struct spi_bitbang_s *priv, uint32_t devid) +static uint8_t spi_status(struct spi_bitbang_s *priv, uint32_t devid) { return 0; } @@ -226,7 +226,7 @@ static uint8_t spi_status(FAR struct spi_bitbang_s *priv, uint32_t devid) ****************************************************************************/ #ifdef CONFIG_SPI_CMDDATA -static int spi_cmddata(FAR struct spi_bitbang_s *priv, uint32_t devid, +static int spi_cmddata(struct spi_bitbang_s *priv, uint32_t devid, bool cmd) { return OK; @@ -247,7 +247,7 @@ static int spi_cmddata(FAR struct spi_bitbang_s *priv, uint32_t devid, * ****************************************************************************/ -static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t isr) +static int tsc_attach(struct ads7843e_config_s *state, xcpt_t isr) { /* Attach the XPT2046 interrupt */ @@ -255,7 +255,7 @@ static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t isr) return irq_attach(SAM_TSC_IRQ, isr, NULL); } -static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable) +static void tsc_enable(struct ads7843e_config_s *state, bool enable) { /* Attach and enable, or detach and disable */ @@ -270,17 +270,17 @@ static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable) } } -static void tsc_clear(FAR struct ads7843e_config_s *state) +static void tsc_clear(struct ads7843e_config_s *state) { /* Does nothing */ } -static bool tsc_busy(FAR struct ads7843e_config_s *state) +static bool tsc_busy(struct ads7843e_config_s *state) { return false; /* The BUSY signal is not connected */ } -static bool tsc_pendown(FAR struct ads7843e_config_s *state) +static bool tsc_pendown(struct ads7843e_config_s *state) { /* The /PENIRQ value is active low */ @@ -303,7 +303,7 @@ static bool tsc_pendown(FAR struct ads7843e_config_s *state) * ****************************************************************************/ -static FAR struct spi_dev_s *sam_tsc_spiinitialize(void) +static struct spi_dev_s *sam_tsc_spiinitialize(void) { /* Configure the SPI bit-bang pins */ @@ -339,7 +339,7 @@ static FAR struct spi_dev_s *sam_tsc_spiinitialize(void) int sam_tsc_setup(int minor) { - FAR struct spi_dev_s *dev; + struct spi_dev_s *dev; int ret; iinfo("minor %d\n", minor); diff --git a/boards/arm/sam34/flipnclick-sam3x/src/flipnclick-sam3x.h b/boards/arm/sam34/flipnclick-sam3x/src/flipnclick-sam3x.h index 399236b333..b6a11d14aa 100644 --- a/boards/arm/sam34/flipnclick-sam3x/src/flipnclick-sam3x.h +++ b/boards/arm/sam34/flipnclick-sam3x/src/flipnclick-sam3x.h @@ -258,7 +258,7 @@ int sam_bringup(void); #ifdef HAVE_SSD1306 struct lcd_dev_s; /* Forward reference */ -FAR struct lcd_dev_s *sam_graphics_setup(unsigned int devno); +struct lcd_dev_s *sam_graphics_setup(unsigned int devno); #endif #endif /* __ASSEMBLY__ */ diff --git a/boards/arm/sam34/flipnclick-sam3x/src/sam_spi0.c b/boards/arm/sam34/flipnclick-sam3x/src/sam_spi0.c index 1fed8fb3eb..585b4cb5f5 100644 --- a/boards/arm/sam34/flipnclick-sam3x/src/sam_spi0.c +++ b/boards/arm/sam34/flipnclick-sam3x/src/sam_spi0.c @@ -154,7 +154,7 @@ void sam_spi0select(uint32_t devid, bool selected) * ****************************************************************************/ -uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi0status(struct spi_dev_s *dev, uint32_t devid) { spiinfo("Returning nothing\n"); return 0; @@ -185,7 +185,7 @@ uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) ****************************************************************************/ #ifdef CONFIG_SPI_CMDDATA -int sam_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi0cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { spiinfo("devid: %08x %s\n", (unsigned int)devid, cmd ? "cmd" : "data"); diff --git a/boards/arm/sam34/flipnclick-sam3x/src/sam_ssd1306.c b/boards/arm/sam34/flipnclick-sam3x/src/sam_ssd1306.c index 6308169944..f39bc7c0ed 100644 --- a/boards/arm/sam34/flipnclick-sam3x/src/sam_ssd1306.c +++ b/boards/arm/sam34/flipnclick-sam3x/src/sam_ssd1306.c @@ -84,10 +84,10 @@ * ****************************************************************************/ -FAR struct lcd_dev_s *sam_graphics_setup(unsigned int devno) +struct lcd_dev_s *sam_graphics_setup(unsigned int devno) { - FAR struct spi_dev_s *spi; - FAR struct lcd_dev_s *dev; + struct spi_dev_s *spi; + struct lcd_dev_s *dev; /* Configure the OLED GPIOs. This initial configuration is RESET low, * putting the OLED into reset state. @@ -151,7 +151,7 @@ FAR struct lcd_dev_s *sam_graphics_setup(unsigned int devno) ****************************************************************************/ #ifdef CONFIG_NXSTART_EXTERNINIT -FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) +struct lcd_dev_s *board_graphics_setup(unsigned int devno) { return sam_graphics_setup(devno); } diff --git a/boards/arm/sam34/sam3u-ek/src/sam_appinit.c b/boards/arm/sam34/sam3u-ek/src/sam_appinit.c index 12cafb0b00..bc60de065f 100644 --- a/boards/arm/sam34/sam3u-ek/src/sam_appinit.c +++ b/boards/arm/sam34/sam3u-ek/src/sam_appinit.c @@ -116,7 +116,7 @@ int board_app_initialize(uintptr_t arg) int ret; #ifdef NSH_HAVE_MMCSD - FAR struct sdio_dev_s *sdio; + struct sdio_dev_s *sdio; /* Mount the SDIO-based MMC/SD block driver */ diff --git a/boards/arm/sam34/sam3u-ek/src/sam_buttons.c b/boards/arm/sam34/sam3u-ek/src/sam_buttons.c index 60200094a7..ae7255dc5c 100644 --- a/boards/arm/sam34/sam3u-ek/src/sam_buttons.c +++ b/boards/arm/sam34/sam3u-ek/src/sam_buttons.c @@ -148,7 +148,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { if (id == BUTTON1) { diff --git a/boards/arm/sam34/sam3u-ek/src/sam_lcd.c b/boards/arm/sam34/sam3u-ek/src/sam_lcd.c index f87f6260dd..1feed6f5b1 100644 --- a/boards/arm/sam34/sam3u-ek/src/sam_lcd.c +++ b/boards/arm/sam34/sam3u-ek/src/sam_lcd.c @@ -314,18 +314,18 @@ static void sam_dumpreg(uint8_t startreg, uint8_t endreg); /* LCD Data Transfer Methods */ static int sam_putrun(fb_coord_t row, fb_coord_t col, - FAR const uint8_t *buffer, + const uint8_t *buffer, size_t npixels); static int sam_getrun(fb_coord_t row, fb_coord_t col, - FAR uint8_t *buffer, + uint8_t *buffer, size_t npixels); /* LCD Configuration */ -static int sam_getvideoinfo(FAR struct lcd_dev_s *dev, - FAR struct fb_videoinfo_s *vinfo); -static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, - FAR struct lcd_planeinfo_s *pinfo); +static int sam_getvideoinfo(struct lcd_dev_s *dev, + struct fb_videoinfo_s *vinfo); +static int sam_getplaneinfo(struct lcd_dev_s *dev, unsigned int planeno, + struct lcd_planeinfo_s *pinfo); /* LCD RGB Mapping */ @@ -592,7 +592,7 @@ static void sam_dumpreg(uint8_t startreg, uint8_t endreg) ****************************************************************************/ static int sam_putrun(fb_coord_t row, fb_coord_t col, - FAR const uint8_t *buffer, + const uint8_t *buffer, size_t npixels) { uint16_t *run = (uint16_t *)buffer; @@ -662,7 +662,7 @@ static int sam_putrun(fb_coord_t row, fb_coord_t col, * ****************************************************************************/ -static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, +static int sam_getrun(fb_coord_t row, fb_coord_t col, uint8_t *buffer, size_t npixels) { uint16_t *run = (uint16_t *)buffer; @@ -721,8 +721,8 @@ static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, * ****************************************************************************/ -static int sam_getvideoinfo(FAR struct lcd_dev_s *dev, - FAR struct fb_videoinfo_s *vinfo) +static int sam_getvideoinfo(struct lcd_dev_s *dev, + struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n", @@ -740,8 +740,8 @@ static int sam_getvideoinfo(FAR struct lcd_dev_s *dev, * ****************************************************************************/ -static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, - FAR struct lcd_planeinfo_s *pinfo) +static int sam_getplaneinfo(struct lcd_dev_s *dev, unsigned int planeno, + struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(dev && pinfo && planeno == 0); lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); @@ -1060,7 +1060,7 @@ int board_lcd_initialize(void) * ****************************************************************************/ -FAR struct lcd_dev_s *board_lcd_getdev(int lcddev) +struct lcd_dev_s *board_lcd_getdev(int lcddev) { lcdinfo("lcddev: %d\n", lcddev); return lcddev == 0 ? &g_lcddev_s.dev : NULL; diff --git a/boards/arm/sam34/sam3u-ek/src/sam_spi.c b/boards/arm/sam34/sam3u-ek/src/sam_spi.c index 60e1109465..6849c8ead3 100644 --- a/boards/arm/sam34/sam3u-ek/src/sam_spi.c +++ b/boards/arm/sam34/sam3u-ek/src/sam_spi.c @@ -156,7 +156,7 @@ void sam_spi0select(uint32_t devid, bool selected) * ****************************************************************************/ -uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi0status(struct spi_dev_s *dev, uint32_t devid) { return 0; } diff --git a/boards/arm/sam34/sam3u-ek/src/sam_touchscreen.c b/boards/arm/sam34/sam3u-ek/src/sam_touchscreen.c index 41945ba900..d1b53d3ac3 100644 --- a/boards/arm/sam34/sam3u-ek/src/sam_touchscreen.c +++ b/boards/arm/sam34/sam3u-ek/src/sam_touchscreen.c @@ -91,11 +91,11 @@ * pendown - Return the state of the pen down GPIO input */ -static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t isr); -static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable); -static void tsc_clear(FAR struct ads7843e_config_s *state); -static bool tsc_busy(FAR struct ads7843e_config_s *state); -static bool tsc_pendown(FAR struct ads7843e_config_s *state); +static int tsc_attach(struct ads7843e_config_s *state, xcpt_t isr); +static void tsc_enable(struct ads7843e_config_s *state, bool enable); +static void tsc_clear(struct ads7843e_config_s *state); +static bool tsc_busy(struct ads7843e_config_s *state); +static bool tsc_pendown(struct ads7843e_config_s *state); /**************************************************************************** * Private Data @@ -138,7 +138,7 @@ static struct ads7843e_config_s g_tscinfo = * pendown - Return the state of the pen down GPIO input */ -static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t isr) +static int tsc_attach(struct ads7843e_config_s *state, xcpt_t isr) { /* Attach the ADS7843E interrupt */ @@ -146,7 +146,7 @@ static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t isr) return irq_attach(SAM_TCS_IRQ, isr, NULL); } -static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable) +static void tsc_enable(struct ads7843e_config_s *state, bool enable) { /* Attach and enable, or detach and disable */ @@ -161,12 +161,12 @@ static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable) } } -static void tsc_clear(FAR struct ads7843e_config_s *state) +static void tsc_clear(struct ads7843e_config_s *state) { /* Does nothing */ } -static bool tsc_busy(FAR struct ads7843e_config_s *state) +static bool tsc_busy(struct ads7843e_config_s *state) { #if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_INFO) static bool last = (bool)-1; @@ -188,7 +188,7 @@ static bool tsc_busy(FAR struct ads7843e_config_s *state) return busy; } -static bool tsc_pendown(FAR struct ads7843e_config_s *state) +static bool tsc_pendown(struct ads7843e_config_s *state) { /* The /PENIRQ value is active low */ @@ -220,7 +220,7 @@ static bool tsc_pendown(FAR struct ads7843e_config_s *state) int sam_tsc_setup(int minor) { - FAR struct spi_dev_s *dev; + struct spi_dev_s *dev; int ret; iinfo("minor %d\n", minor); diff --git a/boards/arm/sam34/sam3u-ek/src/sam_usbdev.c b/boards/arm/sam34/sam3u-ek/src/sam_usbdev.c index 49f4fd2245..dde9b052da 100644 --- a/boards/arm/sam34/sam3u-ek/src/sam_usbdev.c +++ b/boards/arm/sam34/sam3u-ek/src/sam_usbdev.c @@ -59,7 +59,7 @@ * ****************************************************************************/ -void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume) +void sam_usbsuspend(struct usbdev_s *dev, bool resume) { uinfo("resume: %d\n", resume); } diff --git a/boards/arm/sam34/sam3u-ek/src/sam_usbmsc.c b/boards/arm/sam34/sam3u-ek/src/sam_usbmsc.c index e83b59e29f..f281b02f68 100644 --- a/boards/arm/sam34/sam3u-ek/src/sam_usbmsc.c +++ b/boards/arm/sam34/sam3u-ek/src/sam_usbmsc.c @@ -66,7 +66,7 @@ int board_usbmsc_initialize(int port) { - FAR struct sdio_dev_s *sdio; + struct sdio_dev_s *sdio; int ret; /* First, get an instance of the SDIO interface */ diff --git a/boards/arm/sam34/sam4e-ek/src/sam_ads7843e.c b/boards/arm/sam34/sam4e-ek/src/sam_ads7843e.c index d6132822a8..de39e54442 100644 --- a/boards/arm/sam34/sam4e-ek/src/sam_ads7843e.c +++ b/boards/arm/sam34/sam4e-ek/src/sam_ads7843e.c @@ -88,11 +88,11 @@ * pendown - Return the state of the pen down GPIO input */ -static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t isr); -static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable); -static void tsc_clear(FAR struct ads7843e_config_s *state); -static bool tsc_busy(FAR struct ads7843e_config_s *state); -static bool tsc_pendown(FAR struct ads7843e_config_s *state); +static int tsc_attach(struct ads7843e_config_s *state, xcpt_t isr); +static void tsc_enable(struct ads7843e_config_s *state, bool enable); +static void tsc_clear(struct ads7843e_config_s *state); +static bool tsc_busy(struct ads7843e_config_s *state); +static bool tsc_pendown(struct ads7843e_config_s *state); /**************************************************************************** * Private Data @@ -135,7 +135,7 @@ static struct ads7843e_config_s g_tscinfo = * pendown - Return the state of the pen down GPIO input */ -static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t isr) +static int tsc_attach(struct ads7843e_config_s *state, xcpt_t isr) { /* Attach the ADS7843E interrupt */ @@ -143,7 +143,7 @@ static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t isr) return irq_attach(SAM_TCS_IRQ, isr, NULL); } -static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable) +static void tsc_enable(struct ads7843e_config_s *state, bool enable) { /* Attach and enable, or detach and disable */ @@ -158,12 +158,12 @@ static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable) } } -static void tsc_clear(FAR struct ads7843e_config_s *state) +static void tsc_clear(struct ads7843e_config_s *state) { /* Does nothing */ } -static bool tsc_busy(FAR struct ads7843e_config_s *state) +static bool tsc_busy(struct ads7843e_config_s *state) { #if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_INFO) static bool last = (bool)-1; @@ -185,7 +185,7 @@ static bool tsc_busy(FAR struct ads7843e_config_s *state) return busy; } -static bool tsc_pendown(FAR struct ads7843e_config_s *state) +static bool tsc_pendown(struct ads7843e_config_s *state) { /* The /PENIRQ value is active low */ @@ -217,7 +217,7 @@ static bool tsc_pendown(FAR struct ads7843e_config_s *state) int sam_tsc_setup(int minor) { - FAR struct spi_dev_s *dev; + struct spi_dev_s *dev; int ret; iinfo("minor %d\n", minor); diff --git a/boards/arm/sam34/sam4e-ek/src/sam_at25.c b/boards/arm/sam34/sam4e-ek/src/sam_at25.c index 4d77738d22..5378157cea 100644 --- a/boards/arm/sam34/sam4e-ek/src/sam_at25.c +++ b/boards/arm/sam34/sam4e-ek/src/sam_at25.c @@ -58,8 +58,8 @@ int sam_at25_automount(int minor) { - FAR struct spi_dev_s *spi; - FAR struct mtd_dev_s *mtd; + struct spi_dev_s *spi; + struct mtd_dev_s *mtd; static bool initialized = false; int ret; diff --git a/boards/arm/sam34/sam4e-ek/src/sam_buttons.c b/boards/arm/sam34/sam4e-ek/src/sam_buttons.c index ee19657c37..880779f4c3 100644 --- a/boards/arm/sam34/sam4e-ek/src/sam_buttons.c +++ b/boards/arm/sam34/sam4e-ek/src/sam_buttons.c @@ -151,7 +151,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { switch (id) { diff --git a/boards/arm/sam34/sam4e-ek/src/sam_ethernet.c b/boards/arm/sam34/sam4e-ek/src/sam_ethernet.c index d71f9040cd..f44fa11ff3 100644 --- a/boards/arm/sam34/sam4e-ek/src/sam_ethernet.c +++ b/boards/arm/sam34/sam4e-ek/src/sam_ethernet.c @@ -173,7 +173,7 @@ void weak_function sam_netinitialize(void) ****************************************************************************/ #ifdef CONFIG_SAM34_GPIOD_IRQ -int arch_phy_irq(FAR const char *intf, xcpt_t handler, void *arg, +int arch_phy_irq(const char *intf, xcpt_t handler, void *arg, phy_enable_t *enable) { irqstate_t flags; diff --git a/boards/arm/sam34/sam4e-ek/src/sam_hsmci.c b/boards/arm/sam34/sam4e-ek/src/sam_hsmci.c index 3e82ca3c9d..7cfe2a67f0 100644 --- a/boards/arm/sam34/sam4e-ek/src/sam_hsmci.c +++ b/boards/arm/sam34/sam4e-ek/src/sam_hsmci.c @@ -76,7 +76,7 @@ static struct sam_hsmci_state_s g_hsmci; * ****************************************************************************/ -static int sam_hsmci_cardetect(int irq, void *regs, FAR void *arg) +static int sam_hsmci_cardetect(int irq, void *regs, void *arg) { bool inserted; diff --git a/boards/arm/sam34/sam4e-ek/src/sam_ili9325.c b/boards/arm/sam34/sam4e-ek/src/sam_ili9325.c index f14b0f8e7f..af7b6d2854 100644 --- a/boards/arm/sam34/sam4e-ek/src/sam_ili9325.c +++ b/boards/arm/sam34/sam4e-ek/src/sam_ili9325.c @@ -291,24 +291,24 @@ static void sam_set_cursor(uint16_t col, uint16_t row); static void sam_disable_backlight(void); static void sam_set_backlight(unsigned int power); -static int sam_poweroff(FAR struct sam_dev_s *priv); +static int sam_poweroff(struct sam_dev_s *priv); /* LCD Data Transfer Methods */ static int sam_putrun(fb_coord_t row, fb_coord_t col, - FAR const uint8_t *buffer, + const uint8_t *buffer, size_t npixels); static int sam_getrun(fb_coord_t row, fb_coord_t col, - FAR uint8_t *buffer, + uint8_t *buffer, size_t npixels); /* LCD Configuration */ -static int sam_getvideoinfo(FAR struct lcd_dev_s *dev, - FAR struct fb_videoinfo_s *vinfo); -static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, +static int sam_getvideoinfo(struct lcd_dev_s *dev, + struct fb_videoinfo_s *vinfo); +static int sam_getplaneinfo(struct lcd_dev_s *dev, unsigned int planeno, - FAR struct lcd_planeinfo_s *pinfo); + struct lcd_planeinfo_s *pinfo); /* LCD RGB Mapping */ @@ -545,7 +545,7 @@ static void sam_set_cursor(uint16_t col, uint16_t row) ****************************************************************************/ #if 0 /* Sometimes useful */ -static void sam_dumprun(FAR const char *msg, FAR uint16_t *run, +static void sam_dumprun(const char *msg, uint16_t *run, size_t npixels) { int i; @@ -636,7 +636,7 @@ static void sam_set_backlight(unsigned int power) * ****************************************************************************/ -static int sam_poweroff(FAR struct sam_dev_s *priv) +static int sam_poweroff(struct sam_dev_s *priv) { /* Turn the display off */ @@ -667,15 +667,15 @@ static int sam_poweroff(FAR struct sam_dev_s *priv) ****************************************************************************/ static int sam_putrun(fb_coord_t row, fb_coord_t col, - FAR const uint8_t *buffer, + const uint8_t *buffer, size_t npixels) { #if defined(CONFIG_SAM4EEK_LCD_RGB565) - FAR const uint16_t *src = (FAR const uint16_t *)buffer; + const uint16_t *src = (const uint16_t *)buffer; #elif defined(CONFIG_SAM4EEK_LCD_RGB24) - FAR const uint8_t *src = (FAR const uint8_t *)buffer; + const uint8_t *src = (const uint8_t *)buffer; #elif defined(CONFIG_SAM4EEK_LCD_RGB32) - FAR const uint32_t *src = (FAR const uint32_t *)buffer; + const uint32_t *src = (const uint32_t *)buffer; #endif /* Buffer must be provided and aligned to a 16-bit address boundary */ @@ -729,12 +729,12 @@ static int sam_putrun(fb_coord_t row, fb_coord_t col, * ****************************************************************************/ -static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, +static int sam_getrun(fb_coord_t row, fb_coord_t col, uint8_t *buffer, size_t npixels) { uint8_t value[2]; #if defined(CONFIG_SAM4EEK_LCD_RGB24) - FAR uint8_t *ptr = (FAR uint8_t *)buffer; + uint8_t *ptr = (uint8_t *)buffer; #endif /* Set the cursor position */ @@ -794,8 +794,8 @@ static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, * ****************************************************************************/ -static int sam_getvideoinfo(FAR struct lcd_dev_s *dev, - FAR struct fb_videoinfo_s *vinfo) +static int sam_getvideoinfo(struct lcd_dev_s *dev, + struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n", @@ -813,8 +813,8 @@ static int sam_getvideoinfo(FAR struct lcd_dev_s *dev, * ****************************************************************************/ -static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, - FAR struct lcd_planeinfo_s *pinfo) +static int sam_getplaneinfo(struct lcd_dev_s *dev, unsigned int planeno, + struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(dev && pinfo && planeno == 0); lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); @@ -834,7 +834,7 @@ static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, static int sam_getpower(struct lcd_dev_s *dev) { - FAR struct sam_dev_s *priv = (FAR struct sam_dev_s *)dev; + struct sam_dev_s *priv = (struct sam_dev_s *)dev; lcdinfo("power: %d\n", 0); return priv->power; @@ -852,7 +852,7 @@ static int sam_getpower(struct lcd_dev_s *dev) static int sam_setpower(struct lcd_dev_s *dev, int power) { - FAR struct sam_dev_s *priv = (FAR struct sam_dev_s *)dev; + struct sam_dev_s *priv = (struct sam_dev_s *)dev; lcdinfo("power: %d\n", power); DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER); @@ -1312,7 +1312,7 @@ static inline int sam_lcd_initialize(void) int board_lcd_initialize(void) { - FAR struct sam_dev_s *priv = &g_lcddev; + struct sam_dev_s *priv = &g_lcddev; int ret; lcdinfo("Initializing\n"); @@ -1356,7 +1356,7 @@ int board_lcd_initialize(void) * ****************************************************************************/ -FAR struct lcd_dev_s *board_lcd_getdev(int lcddev) +struct lcd_dev_s *board_lcd_getdev(int lcddev) { DEBUGASSERT(lcddev == 0); return &g_lcddev.dev; @@ -1372,7 +1372,7 @@ FAR struct lcd_dev_s *board_lcd_getdev(int lcddev) void board_lcd_uninitialize(void) { - FAR struct sam_dev_s *priv = &g_lcddev; + struct sam_dev_s *priv = &g_lcddev; /* Put the LCD in the lowest possible power state */ diff --git a/boards/arm/sam34/sam4e-ek/src/sam_ili9341.c b/boards/arm/sam34/sam4e-ek/src/sam_ili9341.c index bf03f9c224..88bb6b79a5 100644 --- a/boards/arm/sam34/sam4e-ek/src/sam_ili9341.c +++ b/boards/arm/sam34/sam4e-ek/src/sam_ili9341.c @@ -283,9 +283,9 @@ struct sam_dev_s /* Low Level LCD access */ -static void sam_putreg(uint8_t regaddr, FAR const uint8_t *buffer, +static void sam_putreg(uint8_t regaddr, const uint8_t *buffer, unsigned int buflen); -static void sam_getreg(uint8_t regaddr, FAR uint8_t *buffer, +static void sam_getreg(uint8_t regaddr, uint8_t *buffer, unsigned int buflen); static void sam_setwindow(sam_color_t row, sam_color_t col, sam_color_t width, sam_color_t height); @@ -298,24 +298,24 @@ static inline sam_color_t sam_gram_read(void); static void sam_disable_backlight(void); static void sam_set_backlight(unsigned int power); -static int sam_poweroff(FAR struct sam_dev_s *priv); +static int sam_poweroff(struct sam_dev_s *priv); /* LCD Data Transfer Methods */ static int sam_putrun(fb_coord_t row, fb_coord_t col, - FAR const uint8_t *buffer, + const uint8_t *buffer, size_t npixels); static int sam_getrun(fb_coord_t row, fb_coord_t col, - FAR uint8_t *buffer, + uint8_t *buffer, size_t npixels); /* LCD Configuration */ -static int sam_getvideoinfo(FAR struct lcd_dev_s *dev, - FAR struct fb_videoinfo_s *vinfo); -static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, +static int sam_getvideoinfo(struct lcd_dev_s *dev, + struct fb_videoinfo_s *vinfo); +static int sam_getplaneinfo(struct lcd_dev_s *dev, unsigned int planeno, - FAR struct lcd_planeinfo_s *pinfo); + struct lcd_planeinfo_s *pinfo); /* LCD RGB Mapping */ @@ -428,7 +428,7 @@ static struct sam_dev_s g_lcddev = * ****************************************************************************/ -static void sam_putreg(uint8_t regaddr, FAR const uint8_t *buffer, +static void sam_putreg(uint8_t regaddr, const uint8_t *buffer, unsigned int buflen) { LCD_INDEX = 0; @@ -450,7 +450,7 @@ static void sam_putreg(uint8_t regaddr, FAR const uint8_t *buffer, * ****************************************************************************/ -static void sam_getreg(uint8_t regaddr, FAR uint8_t *buffer, +static void sam_getreg(uint8_t regaddr, uint8_t *buffer, unsigned int buflen) { LCD_INDEX = 0; @@ -579,7 +579,7 @@ static inline sam_color_t sam_gram_read(void) ****************************************************************************/ #if 0 /* Sometimes useful */ -static void sam_dumprun(FAR const char *msg, FAR uint16_t *run, +static void sam_dumprun(const char *msg, uint16_t *run, size_t npixels) { int i; @@ -672,7 +672,7 @@ static void sam_set_backlight(unsigned int power) * ****************************************************************************/ -static int sam_poweroff(FAR struct sam_dev_s *priv) +static int sam_poweroff(struct sam_dev_s *priv) { lcdinfo("OFF\n"); @@ -705,15 +705,15 @@ static int sam_poweroff(FAR struct sam_dev_s *priv) ****************************************************************************/ static int sam_putrun(fb_coord_t row, fb_coord_t col, - FAR const uint8_t *buffer, + const uint8_t *buffer, size_t npixels) { #if defined(CONFIG_SAM4EEK_LCD_RGB565) - FAR const uint16_t *src = (FAR const uint16_t *)buffer; + const uint16_t *src = (const uint16_t *)buffer; #elif defined(CONFIG_SAM4EEK_LCD_RGB24) - FAR const uint8_t *src = (FAR const uint8_t *)buffer; + const uint8_t *src = (const uint8_t *)buffer; #elif defined(CONFIG_SAM4EEK_LCD_RGB32) - FAR const uint32_t *src = (FAR const uint32_t *)buffer; + const uint32_t *src = (const uint32_t *)buffer; #endif /* Buffer must be provided and aligned to a 16-bit address boundary */ @@ -763,15 +763,15 @@ static int sam_putrun(fb_coord_t row, fb_coord_t col, * ****************************************************************************/ -static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, +static int sam_getrun(fb_coord_t row, fb_coord_t col, uint8_t *buffer, size_t npixels) { #if defined(CONFIG_SAM4EEK_LCD_RGB565) - FAR uint16_t *dest = (FAR uint16_t *)buffer; + uint16_t *dest = (uint16_t *)buffer; #elif defined(CONFIG_SAM4EEK_LCD_RGB24) - FAR uint8_t *dest = (FAR uint8_t *)buffer; + uint8_t *dest = (uint8_t *)buffer; #elif defined(dest) - FAR uint32_t *dest = (FAR uint32_t *)buffer; + uint32_t *dest = (uint32_t *)buffer; #endif /* Buffer must be provided and aligned to a 16-bit address boundary */ @@ -815,8 +815,8 @@ static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, * ****************************************************************************/ -static int sam_getvideoinfo(FAR struct lcd_dev_s *dev, - FAR struct fb_videoinfo_s *vinfo) +static int sam_getvideoinfo(struct lcd_dev_s *dev, + struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n", @@ -834,8 +834,8 @@ static int sam_getvideoinfo(FAR struct lcd_dev_s *dev, * ****************************************************************************/ -static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, - FAR struct lcd_planeinfo_s *pinfo) +static int sam_getplaneinfo(struct lcd_dev_s *dev, unsigned int planeno, + struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(dev && pinfo && planeno == 0); lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); @@ -855,7 +855,7 @@ static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, static int sam_getpower(struct lcd_dev_s *dev) { - FAR struct sam_dev_s *priv = (FAR struct sam_dev_s *)dev; + struct sam_dev_s *priv = (struct sam_dev_s *)dev; lcdinfo("power: %d\n", 0); return priv->power; @@ -873,7 +873,7 @@ static int sam_getpower(struct lcd_dev_s *dev) static int sam_setpower(struct lcd_dev_s *dev, int power) { - FAR struct sam_dev_s *priv = (FAR struct sam_dev_s *)dev; + struct sam_dev_s *priv = (struct sam_dev_s *)dev; lcdinfo("power: %d\n", power); DEBUGASSERT((unsigned)power <= CONFIG_LCD_MAXPOWER); @@ -1178,7 +1178,7 @@ static inline int sam_lcd_initialize(void) int board_lcd_initialize(void) { - FAR struct sam_dev_s *priv = &g_lcddev; + struct sam_dev_s *priv = &g_lcddev; int ret; lcdinfo("Initializing\n"); @@ -1222,7 +1222,7 @@ int board_lcd_initialize(void) * ****************************************************************************/ -FAR struct lcd_dev_s *board_lcd_getdev(int lcddev) +struct lcd_dev_s *board_lcd_getdev(int lcddev) { DEBUGASSERT(lcddev == 0); return &g_lcddev.dev; @@ -1238,7 +1238,7 @@ FAR struct lcd_dev_s *board_lcd_getdev(int lcddev) void board_lcd_uninitialize(void) { - FAR struct sam_dev_s *priv = &g_lcddev; + struct sam_dev_s *priv = &g_lcddev; /* Put the LCD in the lowest possible power state */ diff --git a/boards/arm/sam34/sam4e-ek/src/sam_spi.c b/boards/arm/sam34/sam4e-ek/src/sam_spi.c index de3cbb6f5b..429b1ebb3a 100644 --- a/boards/arm/sam34/sam4e-ek/src/sam_spi.c +++ b/boards/arm/sam34/sam4e-ek/src/sam_spi.c @@ -173,7 +173,7 @@ void sam_spi0select(uint32_t devid, bool selected) * ****************************************************************************/ -uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi0status(struct spi_dev_s *dev, uint32_t devid) { return 0; } diff --git a/boards/arm/sam34/sam4e-ek/src/sam_udp.c b/boards/arm/sam34/sam4e-ek/src/sam_udp.c index e519b3c25e..0f42e4ac76 100644 --- a/boards/arm/sam34/sam4e-ek/src/sam_udp.c +++ b/boards/arm/sam34/sam4e-ek/src/sam_udp.c @@ -69,7 +69,7 @@ * ****************************************************************************/ -void sam_udp_suspend(FAR struct usbdev_s *dev, bool resume) +void sam_udp_suspend(struct usbdev_s *dev, bool resume) { uinfo("resume: %d\n", resume); } diff --git a/boards/arm/sam34/sam4l-xplained/src/sam_buttons.c b/boards/arm/sam34/sam4l-xplained/src/sam_buttons.c index 5666418581..bb50280109 100644 --- a/boards/arm/sam34/sam4l-xplained/src/sam_buttons.c +++ b/boards/arm/sam34/sam4l-xplained/src/sam_buttons.c @@ -93,7 +93,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/sam34/sam4l-xplained/src/sam_mmcsd.c b/boards/arm/sam34/sam4l-xplained/src/sam_mmcsd.c index df3f0149bf..1f388a21c6 100644 --- a/boards/arm/sam34/sam4l-xplained/src/sam_mmcsd.c +++ b/boards/arm/sam34/sam4l-xplained/src/sam_mmcsd.c @@ -75,7 +75,7 @@ int sam_sdinitialize(int minor) { - FAR struct spi_dev_s *spi; + struct spi_dev_s *spi; int ret; /* Get the SPI driver instance for the SD chip select */ diff --git a/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c b/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c index a5a4a2841d..ed6971e8ef 100644 --- a/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c +++ b/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c @@ -231,7 +231,7 @@ struct slcd_instream_s { struct lib_instream_s stream; - FAR const char *buffer; + const char *buffer; ssize_t nbytes; }; @@ -260,8 +260,8 @@ struct slcd_pixel_s /* Debug */ #ifdef CONFIG_DEBUG_LCD_INFO -static void slcd_dumpstate(FAR const char *msg); -static void slcd_dumpslcd(FAR const char *msg); +static void slcd_dumpstate(const char *msg); +static void slcd_dumpslcd(const char *msg); #else # define slcd_dumpstate(msg) # define slcd_dumpslcd(msg) @@ -272,11 +272,11 @@ static void slcd_dumpslcd(FAR const char *msg); #if 0 /* Not used */ static void slcd_clear(void); #endif -static void slcd_setpixel(FAR const struct slcd_pixel_s *info); -static void slcd_clrpixel(FAR const struct slcd_pixel_s *info); +static void slcd_setpixel(const struct slcd_pixel_s *info); +static void slcd_clrpixel(const struct slcd_pixel_s *info); static inline void slcd_setdp(uint8_t curpos); static inline void slcd_clrdp(uint8_t curpos); -static int slcd_getstream(FAR struct lib_instream_s *instream); +static int slcd_getstream(struct lib_instream_s *instream); static uint8_t slcd_getcontrast(void); static int slcd_setcontrast(unsigned int contrast); static void slcd_writech(uint8_t ch, uint8_t curpos, uint8_t options); @@ -284,10 +284,10 @@ static void slcd_action(enum slcdcode_e code, uint8_t count); /* Character driver methods */ -static ssize_t slcd_read(FAR struct file *, FAR char *, size_t); -static ssize_t slcd_write(FAR struct file *, FAR const char *, size_t); -static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg); -static int slcd_poll(FAR struct file *filep, FAR struct pollfd *fds, +static ssize_t slcd_read(struct file *, char *, size_t); +static ssize_t slcd_write(struct file *, const char *, size_t); +static int slcd_ioctl(struct file *filep, int cmd, unsigned long arg); +static int slcd_poll(struct file *filep, struct pollfd *fds, bool setup); /**************************************************************************** @@ -393,7 +393,7 @@ static const struct slcd_pixel_s g_einfo[SLCD_NE] = ****************************************************************************/ #ifdef CONFIG_DEBUG_LCD_INFO -static void slcd_dumpstate(FAR const char *msg) +static void slcd_dumpstate(const char *msg) { lcdinfo("%s:\n", msg); lcdinfo(" curpos: %d\n", @@ -418,7 +418,7 @@ static void slcd_dumpstate(FAR const char *msg) ****************************************************************************/ #ifdef CONFIG_DEBUG_LCD_INFO -static void slcd_dumpslcd(FAR const char *msg) +static void slcd_dumpslcd(const char *msg) { lcdinfo("%s:\n", msg); lcdinfo(" CFG: %08x TIM: %08x SR: %08x\n", @@ -458,7 +458,7 @@ static void slcd_clear(void) * Name: slcd_setpixel ****************************************************************************/ -static void slcd_setpixel(FAR const struct slcd_pixel_s *info) +static void slcd_setpixel(const struct slcd_pixel_s *info) { uintptr_t regaddr; uint32_t regval; @@ -473,7 +473,7 @@ static void slcd_setpixel(FAR const struct slcd_pixel_s *info) * Name: slcd_clrpixel ****************************************************************************/ -static void slcd_clrpixel(FAR const struct slcd_pixel_s *info) +static void slcd_clrpixel(const struct slcd_pixel_s *info) { uintptr_t regaddr; uint32_t regval; @@ -522,10 +522,10 @@ static inline void slcd_clrdp(uint8_t curpos) * ****************************************************************************/ -static int slcd_getstream(FAR struct lib_instream_s *instream) +static int slcd_getstream(struct lib_instream_s *instream) { - FAR struct slcd_instream_s *slcdstream = - (FAR struct slcd_instream_s *)instream; + struct slcd_instream_s *slcdstream = + (struct slcd_instream_s *)instream; DEBUGASSERT(slcdstream && slcdstream->buffer); if (slcdstream->nbytes > 0) @@ -858,8 +858,8 @@ static void slcd_action(enum slcdcode_e code, uint8_t count) * Name: slcd_read ****************************************************************************/ -static ssize_t slcd_read(FAR struct file *filep, - FAR char *buffer, size_t len) +static ssize_t slcd_read(struct file *filep, + char *buffer, size_t len) { int ret = 0; int i; @@ -896,8 +896,8 @@ static ssize_t slcd_read(FAR struct file *filep, * Name: slcd_write ****************************************************************************/ -static ssize_t slcd_write(FAR struct file *filep, - FAR const char *buffer, size_t len) +static ssize_t slcd_write(struct file *filep, + const char *buffer, size_t len) { struct slcd_instream_s instream; struct slcdstate_s state; @@ -1011,7 +1011,7 @@ static ssize_t slcd_write(FAR struct file *filep, * Name: slcd_poll ****************************************************************************/ -static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) +static int slcd_ioctl(struct file *filep, int cmd, unsigned long arg) { switch (cmd) { @@ -1023,8 +1023,8 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case SLCDIOC_GETATTRIBUTES: { - FAR struct slcd_attributes_s *attr = - (FAR struct slcd_attributes_s *)((uintptr_t)arg); + struct slcd_attributes_s *attr = + (struct slcd_attributes_s *)((uintptr_t)arg); lcdinfo("SLCDIOC_GETATTRIBUTES:\n"); @@ -1049,8 +1049,8 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case SLCDIOC_CURPOS: { - FAR struct slcd_curpos_s *curpos = - (FAR struct slcd_curpos_s *)((uintptr_t)arg); + struct slcd_curpos_s *curpos = + (struct slcd_curpos_s *)((uintptr_t)arg); lcdinfo("SLCDIOC_CURPOS: row=0 column=%d\n", g_slcdstate.curpos); @@ -1119,7 +1119,7 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case SLCDIOC_GETCONTRAST: { - FAR int *contrast = (FAR int *)((uintptr_t)arg); + int *contrast = (int *)((uintptr_t)arg); if (!contrast) { return -EINVAL; @@ -1161,8 +1161,8 @@ static int slcd_ioctl(FAR struct file *filep, int cmd, unsigned long arg) * Name: slcd_poll ****************************************************************************/ -static int slcd_poll(FAR struct file *filep, FAR struct pollfd *fds, - bool setup) +static int slcd_poll(struct file *filep, struct pollfd *fds, + bool setup) { if (setup) { diff --git a/boards/arm/sam34/sam4l-xplained/src/sam_spi.c b/boards/arm/sam34/sam4l-xplained/src/sam_spi.c index 25cb7557c3..812e9bb1b3 100644 --- a/boards/arm/sam34/sam4l-xplained/src/sam_spi.c +++ b/boards/arm/sam34/sam4l-xplained/src/sam_spi.c @@ -169,7 +169,7 @@ void sam_spi0select(uint32_t devid, bool selected) * ****************************************************************************/ -uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi0status(struct spi_dev_s *dev, uint32_t devid) { uint8_t ret = 0; @@ -217,7 +217,7 @@ uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) ****************************************************************************/ #ifdef CONFIG_SPI_CMDDATA -int sam_spic0mddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spic0mddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { #ifdef CONFIG_SAM4L_XPLAINED_OLED1MODULE if (devid == SPIDEV_DISPLAY(0)) diff --git a/boards/arm/sam34/sam4l-xplained/src/sam_ug2832hsweg04.c b/boards/arm/sam34/sam4l-xplained/src/sam_ug2832hsweg04.c index d97fc47466..e5802f771d 100644 --- a/boards/arm/sam34/sam4l-xplained/src/sam_ug2832hsweg04.c +++ b/boards/arm/sam34/sam4l-xplained/src/sam_ug2832hsweg04.c @@ -92,10 +92,10 @@ * ****************************************************************************/ -FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) +struct lcd_dev_s *board_graphics_setup(unsigned int devno) { - FAR struct spi_dev_s *spi; - FAR struct lcd_dev_s *dev; + struct spi_dev_s *spi; + struct lcd_dev_s *dev; /* Configure the OLED GPIOs. This initial configuration is RESET low, * putting the OLED into reset state. diff --git a/boards/arm/sam34/sam4s-xplained-pro/src/sam_buttons.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_buttons.c index 10cb1f631f..f2fb3f8b15 100644 --- a/boards/arm/sam34/sam4s-xplained-pro/src/sam_buttons.c +++ b/boards/arm/sam34/sam4s-xplained-pro/src/sam_buttons.c @@ -94,7 +94,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/sam34/sam4s-xplained-pro/src/sam_hsmci.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_hsmci.c index d27904cb3a..34edca83a5 100644 --- a/boards/arm/sam34/sam4s-xplained-pro/src/sam_hsmci.c +++ b/boards/arm/sam34/sam4s-xplained-pro/src/sam_hsmci.c @@ -80,7 +80,7 @@ static struct sam_hsmci_state_s g_hsmci; ****************************************************************************/ #ifdef CONFIG_MMCSD_HAVE_CARDDETECT -static int sam_hsmci_cardetect_int(int irq, void *regs, FAR void *arg) +static int sam_hsmci_cardetect_int(int irq, void *regs, void *arg) { bool inserted; diff --git a/boards/arm/sam34/sam4s-xplained-pro/src/sam_nandflash.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_nandflash.c index 1b123fb174..c0800d6c4c 100644 --- a/boards/arm/sam34/sam4s-xplained-pro/src/sam_nandflash.c +++ b/boards/arm/sam34/sam4s-xplained-pro/src/sam_nandflash.c @@ -184,7 +184,7 @@ int board_nandflash_config(int cs) int sam_nand_automount(int minor) { - FAR struct mtd_dev_s *mtd; + struct mtd_dev_s *mtd; static bool initialized = false; /* Have we already initialized? */ diff --git a/boards/arm/sam34/sam4s-xplained-pro/src/sam_spi.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_spi.c index 6b097f6fe6..da7a3f4626 100644 --- a/boards/arm/sam34/sam4s-xplained-pro/src/sam_spi.c +++ b/boards/arm/sam34/sam4s-xplained-pro/src/sam_spi.c @@ -150,7 +150,7 @@ void sam_spi0select(uint32_t devid, bool selected) ****************************************************************************/ #ifdef CONFIG_SAM34_SPI0 -uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi0status(struct spi_dev_s *dev, uint32_t devid) { return SPI_STATUS_PRESENT; } @@ -158,7 +158,7 @@ uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) int sam_sdinitialize(int port, int minor) { - FAR struct spi_dev_s *spi; + struct spi_dev_s *spi; int ret; /* Get the SPI driver instance for the SD chip select */ diff --git a/boards/arm/sam34/sam4s-xplained-pro/src/sam_udp.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_udp.c index f1b047fa02..9dc36e9195 100644 --- a/boards/arm/sam34/sam4s-xplained-pro/src/sam_udp.c +++ b/boards/arm/sam34/sam4s-xplained-pro/src/sam_udp.c @@ -69,7 +69,7 @@ * ****************************************************************************/ -void sam_udp_suspend(FAR struct usbdev_s *dev, bool resume) +void sam_udp_suspend(struct usbdev_s *dev, bool resume) { uinfo("resume: %d\n", resume); } diff --git a/boards/arm/sam34/sam4s-xplained-pro/src/sam_wdt.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_wdt.c index 05b5d28132..f6952e95b5 100644 --- a/boards/arm/sam34/sam4s-xplained-pro/src/sam_wdt.c +++ b/boards/arm/sam34/sam4s-xplained-pro/src/sam_wdt.c @@ -80,7 +80,7 @@ #if defined(CONFIG_WDT_THREAD) static int wdog_daemon(int argc, char *argv[]) { - FAR struct file filestruct; + struct file filestruct; int ret; /* Open the watchdog device for reading */ @@ -137,7 +137,7 @@ errout: int sam_watchdog_initialize(void) { #if (defined(CONFIG_SAM34_WDT) && !defined(CONFIG_WDT_DISABLE_ON_RESET)) - FAR struct file filestruct; + struct file filestruct; int ret; /* Initialize the watchdog timer device */ @@ -188,7 +188,7 @@ int sam_watchdog_initialize(void) int taskid = kthread_create(CONFIG_WDT_THREAD_NAME, CONFIG_WDT_THREAD_PRIORITY, CONFIG_WDT_THREAD_STACKSIZE, - (main_t)wdog_daemon, (FAR char * const *)NULL); + (main_t)wdog_daemon, (char * const *)NULL); DEBUGASSERT(taskid > 0); UNUSED(taskid); diff --git a/boards/arm/sam34/sam4s-xplained/src/sam_buttons.c b/boards/arm/sam34/sam4s-xplained/src/sam_buttons.c index 6ea3586643..8078727dd2 100644 --- a/boards/arm/sam34/sam4s-xplained/src/sam_buttons.c +++ b/boards/arm/sam34/sam4s-xplained/src/sam_buttons.c @@ -94,7 +94,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/sama5/giant-board/src/sam_ajoystick.c b/boards/arm/sama5/giant-board/src/sam_ajoystick.c index a0fc1d9f01..c205938326 100644 --- a/boards/arm/sama5/giant-board/src/sam_ajoystick.c +++ b/boards/arm/sama5/giant-board/src/sam_ajoystick.c @@ -85,18 +85,18 @@ * Private Function Prototypes ****************************************************************************/ -static ajoy_buttonset_t ajoy_supported(FAR const struct ajoy_lowerhalf_s +static ajoy_buttonset_t ajoy_supported(const struct ajoy_lowerhalf_s *lower); -static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, - FAR struct ajoy_sample_s *sample); -static ajoy_buttonset_t ajoy_buttons(FAR const struct ajoy_lowerhalf_s +static int ajoy_sample(const struct ajoy_lowerhalf_s *lower, + struct ajoy_sample_s *sample); +static ajoy_buttonset_t ajoy_buttons(const struct ajoy_lowerhalf_s *lower); -static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower, - ajoy_buttonset_t press, ajoy_buttonset_t release, - ajoy_handler_t handler, FAR void *arg); +static void ajoy_enable(const struct ajoy_lowerhalf_s *lower, + ajoy_buttonset_t press, ajoy_buttonset_t release, + ajoy_handler_t handler, void *arg); static void ajoy_disable(void); -static int ajoy_interrupt(int irq, FAR void *context, FAR void *arg); +static int ajoy_interrupt(int irq, void *context, void *arg); /**************************************************************************** * Private Data @@ -135,7 +135,7 @@ static struct file g_adcfile; /* Current interrupt handler and argument */ static ajoy_handler_t g_ajoyhandler; -static FAR void *g_ajoyarg; +static void *g_ajoyarg; /**************************************************************************** * Private Functions @@ -149,7 +149,7 @@ static FAR void *g_ajoyarg; * ****************************************************************************/ -static ajoy_buttonset_t ajoy_supported(FAR const struct ajoy_lowerhalf_s +static ajoy_buttonset_t ajoy_supported(const struct ajoy_lowerhalf_s *lower) { iinfo("Supported: %02x\n", AJOY_SUPPORTED); @@ -164,11 +164,11 @@ static ajoy_buttonset_t ajoy_supported(FAR const struct ajoy_lowerhalf_s * ****************************************************************************/ -static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, - FAR struct ajoy_sample_s *sample) +static int ajoy_sample(const struct ajoy_lowerhalf_s *lower, + struct ajoy_sample_s *sample) { struct adc_msg_s adcmsg[SAM_ADC_NCHANNELS]; - FAR struct adc_msg_s *ptr; + struct adc_msg_s *ptr; ssize_t nread; ssize_t offset; int have; @@ -245,7 +245,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, * ****************************************************************************/ -static ajoy_buttonset_t ajoy_buttons(FAR const struct ajoy_lowerhalf_s +static ajoy_buttonset_t ajoy_buttons(const struct ajoy_lowerhalf_s *lower) { ajoy_buttonset_t ret = 0; @@ -278,9 +278,9 @@ static ajoy_buttonset_t ajoy_buttons(FAR const struct ajoy_lowerhalf_s * ****************************************************************************/ -static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower, - ajoy_buttonset_t press, ajoy_buttonset_t release, - ajoy_handler_t handler, FAR void *arg) +static void ajoy_enable(const struct ajoy_lowerhalf_s *lower, + ajoy_buttonset_t press, ajoy_buttonset_t release, + ajoy_handler_t handler, void *arg) { irqstate_t flags; ajoy_buttonset_t either = press | release; @@ -367,7 +367,7 @@ static void ajoy_disable(void) * ****************************************************************************/ -static int ajoy_interrupt(int irq, FAR void *context, FAR void *arg) +static int ajoy_interrupt(int irq, void *context, void *arg) { DEBUGASSERT(g_ajoyhandler); if (g_ajoyhandler) diff --git a/boards/arm/sama5/giant-board/src/sam_bringup.c b/boards/arm/sama5/giant-board/src/sam_bringup.c index caf888afc3..c4e940b768 100644 --- a/boards/arm/sama5/giant-board/src/sam_bringup.c +++ b/boards/arm/sama5/giant-board/src/sam_bringup.c @@ -84,7 +84,7 @@ #ifdef HAVE_I2CTOOL static void sam_i2c_register(int bus) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; i2c = sam_i2cbus_initialize(bus); diff --git a/boards/arm/sama5/giant-board/src/sam_sdmmc.c b/boards/arm/sama5/giant-board/src/sam_sdmmc.c index d8acf89733..05d5b99ee7 100644 --- a/boards/arm/sama5/giant-board/src/sam_sdmmc.c +++ b/boards/arm/sama5/giant-board/src/sam_sdmmc.c @@ -80,7 +80,7 @@ struct sam_sdmmc_state_s /* SDMMC device state */ #ifdef CONFIG_SAMA5_SDMMC0 -static int sam_sdmmc0_cardetect(int irq, void *regs, FAR void *arg); +static int sam_sdmmc0_cardetect(int irq, void *regs, void *arg); static struct sam_sdmmc_state_s g_sdmmc0 = { @@ -92,7 +92,7 @@ static struct sam_sdmmc_state_s g_sdmmc0 = #endif #ifdef CONFIG_SAMA5_SDMMC1 -static int sam_sdmmc1_cardetect(int irq, void *regs, FAR void *arg); +static int sam_sdmmc1_cardetect(int irq, void *regs, void *arg); static struct sam_sdmmc_state_s g_sdmmc1 = { @@ -157,14 +157,14 @@ static int sam_sdmmc_cardetect(struct sam_sdmmc_state_s *state) } #ifdef CONFIG_SAMA5_SDMMC0 -static int sam_sdmmc0_cardetect(int irq, void *regs, FAR void *arg) +static int sam_sdmmc0_cardetect(int irq, void *regs, void *arg) { return sam_sdmmc_cardetect(&g_sdmmc0); } #endif #ifdef CONFIG_SAMA5_SDMMC1 -static int sam_sdmmc1_cardetect(int irq, void *regs, FAR void *arg) +static int sam_sdmmc1_cardetect(int irq, void *regs, void *arg) { return sam_sdmmc_cardetect(&g_sdmmc1); } diff --git a/boards/arm/sama5/giant-board/src/sam_spi.c b/boards/arm/sama5/giant-board/src/sam_spi.c index 80ec8f1b30..57268aa7d2 100644 --- a/boards/arm/sama5/giant-board/src/sam_spi.c +++ b/boards/arm/sama5/giant-board/src/sam_spi.c @@ -150,14 +150,14 @@ void sam_spi1select(uint32_t devid, bool selected) ****************************************************************************/ #ifdef CONFIG_SAMA5_SPI0 -uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi0status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_SAMA5_SPI0 -uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } diff --git a/boards/arm/sama5/giant-board/src/sam_usb.c b/boards/arm/sama5/giant-board/src/sam_usb.c index c0e8829eb0..f02a54e30c 100644 --- a/boards/arm/sama5/giant-board/src/sam_usb.c +++ b/boards/arm/sama5/giant-board/src/sam_usb.c @@ -293,7 +293,7 @@ int sam_usbhost_initialize(void) ret = kthread_create("OHCI Monitor", CONFIG_SAMA5D27_GIANT_BOARD_USBHOST_PRIO, CONFIG_SAMA5D27_GIANT_BOARD_USBHOST_STACKSIZE, - (main_t)ohci_waiter, (FAR char * const *)NULL); + (main_t)ohci_waiter, (char * const *)NULL); if (ret < 0) { uerr("ERROR: Failed to create ohci_waiter task: %d\n", ret); @@ -316,7 +316,7 @@ int sam_usbhost_initialize(void) ret = kthread_create("EHCI Monitor", CONFIG_SAMA5D27_GIANT_BOARD_USBHOST_PRIO, CONFIG_SAMA5D27_GIANT_BOARD_USBHOST_STACKSIZE, - (main_t)ehci_waiter, (FAR char * const *)NULL); + (main_t)ehci_waiter, (char * const *)NULL); if (ret < 0) { uerr("ERROR: Failed to create ehci_waiter task: %d\n", ret); @@ -470,7 +470,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler) ****************************************************************************/ #ifdef CONFIG_USBDEV -void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume) +void sam_usbsuspend(struct usbdev_s *dev, bool resume) { uinfo("resume: %d\n", resume); } diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_ajoystick.c b/boards/arm/sama5/sama5d2-xult/src/sam_ajoystick.c index c8ce3def3f..e1e3059e11 100644 --- a/boards/arm/sama5/sama5d2-xult/src/sam_ajoystick.c +++ b/boards/arm/sama5/sama5d2-xult/src/sam_ajoystick.c @@ -85,18 +85,18 @@ * Private Function Prototypes ****************************************************************************/ -static ajoy_buttonset_t ajoy_supported(FAR const struct ajoy_lowerhalf_s +static ajoy_buttonset_t ajoy_supported(const struct ajoy_lowerhalf_s *lower); -static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, - FAR struct ajoy_sample_s *sample); -static ajoy_buttonset_t ajoy_buttons(FAR const struct ajoy_lowerhalf_s +static int ajoy_sample(const struct ajoy_lowerhalf_s *lower, + struct ajoy_sample_s *sample); +static ajoy_buttonset_t ajoy_buttons(const struct ajoy_lowerhalf_s *lower); -static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower, - ajoy_buttonset_t press, ajoy_buttonset_t release, - ajoy_handler_t handler, FAR void *arg); +static void ajoy_enable(const struct ajoy_lowerhalf_s *lower, + ajoy_buttonset_t press, ajoy_buttonset_t release, + ajoy_handler_t handler, void *arg); static void ajoy_disable(void); -static int ajoy_interrupt(int irq, FAR void *context, FAR void *arg); +static int ajoy_interrupt(int irq, void *context, void *arg); /**************************************************************************** * Private Data @@ -135,7 +135,7 @@ static struct file g_adcfile; /* Current interrupt handler and argument */ static ajoy_handler_t g_ajoyhandler; -static FAR void *g_ajoyarg; +static void *g_ajoyarg; /**************************************************************************** * Private Functions @@ -149,7 +149,7 @@ static FAR void *g_ajoyarg; * ****************************************************************************/ -static ajoy_buttonset_t ajoy_supported(FAR const struct ajoy_lowerhalf_s +static ajoy_buttonset_t ajoy_supported(const struct ajoy_lowerhalf_s *lower) { iinfo("Supported: %02x\n", AJOY_SUPPORTED); @@ -164,11 +164,11 @@ static ajoy_buttonset_t ajoy_supported(FAR const struct ajoy_lowerhalf_s * ****************************************************************************/ -static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, - FAR struct ajoy_sample_s *sample) +static int ajoy_sample(const struct ajoy_lowerhalf_s *lower, + struct ajoy_sample_s *sample) { struct adc_msg_s adcmsg[SAM_ADC_NCHANNELS]; - FAR struct adc_msg_s *ptr; + struct adc_msg_s *ptr; ssize_t nread; ssize_t offset; int have; @@ -245,7 +245,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, * ****************************************************************************/ -static ajoy_buttonset_t ajoy_buttons(FAR const struct ajoy_lowerhalf_s +static ajoy_buttonset_t ajoy_buttons(const struct ajoy_lowerhalf_s *lower) { ajoy_buttonset_t ret = 0; @@ -278,9 +278,9 @@ static ajoy_buttonset_t ajoy_buttons(FAR const struct ajoy_lowerhalf_s * ****************************************************************************/ -static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower, - ajoy_buttonset_t press, ajoy_buttonset_t release, - ajoy_handler_t handler, FAR void *arg) +static void ajoy_enable(const struct ajoy_lowerhalf_s *lower, + ajoy_buttonset_t press, ajoy_buttonset_t release, + ajoy_handler_t handler, void *arg) { irqstate_t flags; ajoy_buttonset_t either = press | release; @@ -367,7 +367,7 @@ static void ajoy_disable(void) * ****************************************************************************/ -static int ajoy_interrupt(int irq, FAR void *context, FAR void *arg) +static int ajoy_interrupt(int irq, void *context, void *arg) { DEBUGASSERT(g_ajoyhandler); if (g_ajoyhandler) diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_at25.c b/boards/arm/sama5/sama5d2-xult/src/sam_at25.c index 4fa08d8b1a..cda4091aeb 100644 --- a/boards/arm/sama5/sama5d2-xult/src/sam_at25.c +++ b/boards/arm/sama5/sama5d2-xult/src/sam_at25.c @@ -57,8 +57,8 @@ int sam_at25_automount(int minor) { - FAR struct spi_dev_s *spi; - FAR struct mtd_dev_s *mtd; + struct spi_dev_s *spi; + struct mtd_dev_s *mtd; static bool initialized = false; int ret; diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_bringup.c b/boards/arm/sama5/sama5d2-xult/src/sam_bringup.c index d9e490099b..3bb43e5686 100644 --- a/boards/arm/sama5/sama5d2-xult/src/sam_bringup.c +++ b/boards/arm/sama5/sama5d2-xult/src/sam_bringup.c @@ -84,7 +84,7 @@ #ifdef HAVE_I2CTOOL static void sam_i2c_register(int bus) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; i2c = sam_i2cbus_initialize(bus); diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_buttons.c b/boards/arm/sama5/sama5d2-xult/src/sam_buttons.c index a36348bb37..5ffd2739d8 100644 --- a/boards/arm/sama5/sama5d2-xult/src/sam_buttons.c +++ b/boards/arm/sama5/sama5d2-xult/src/sam_buttons.c @@ -104,7 +104,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #if defined(CONFIG_SAMA5_PIOB_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_ethernet.c b/boards/arm/sama5/sama5d2-xult/src/sam_ethernet.c index a5e850d97c..7b1eb8e044 100644 --- a/boards/arm/sama5/sama5d2-xult/src/sam_ethernet.c +++ b/boards/arm/sama5/sama5d2-xult/src/sam_ethernet.c @@ -241,7 +241,7 @@ void weak_function sam_netinitialize(void) ****************************************************************************/ #ifdef CONFIG_SAMA5_PIOE_IRQ -int arch_phy_irq(FAR const char *intf, xcpt_t handler, void *arg, +int arch_phy_irq(const char *intf, xcpt_t handler, void *arg, phy_enable_t *enable) { irqstate_t flags; diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_nandflash.c b/boards/arm/sama5/sama5d2-xult/src/sam_nandflash.c index 407a68f3b9..0656932594 100644 --- a/boards/arm/sama5/sama5d2-xult/src/sam_nandflash.c +++ b/boards/arm/sama5/sama5d2-xult/src/sam_nandflash.c @@ -152,7 +152,7 @@ int board_nandflash_config(int cs) #ifdef HAVE_NAND int sam_nand_automount(int minor) { - FAR struct mtd_dev_s *mtd; + struct mtd_dev_s *mtd; static bool initialized = false; int ret; diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_sdmmc.c b/boards/arm/sama5/sama5d2-xult/src/sam_sdmmc.c index e96fc8409e..8826ffdb1b 100644 --- a/boards/arm/sama5/sama5d2-xult/src/sam_sdmmc.c +++ b/boards/arm/sama5/sama5d2-xult/src/sam_sdmmc.c @@ -97,7 +97,7 @@ struct sam_sdmmc_state_s /* SDMMC device state */ #ifdef CONFIG_SAMA5_SDMMC0 -static int sam_sdmmc0_cardetect(int irq, void *regs, FAR void *arg); +static int sam_sdmmc0_cardetect(int irq, void *regs, void *arg); static struct sam_sdmmc_state_s g_sdmmc0 = { @@ -109,7 +109,7 @@ static struct sam_sdmmc_state_s g_sdmmc0 = #endif #ifdef CONFIG_SAMA5_SDMMC1 -static int sam_sdmmc1_cardetect(int irq, void *regs, FAR void *arg); +static int sam_sdmmc1_cardetect(int irq, void *regs, void *arg); static struct sam_sdmmc_state_s g_sdmmc1 = { @@ -174,14 +174,14 @@ static int sam_sdmmc_cardetect(struct sam_sdmmc_state_s *state) } #ifdef CONFIG_SAMA5_SDMMC0 -static int sam_sdmmc0_cardetect(int irq, void *regs, FAR void *arg) +static int sam_sdmmc0_cardetect(int irq, void *regs, void *arg) { return sam_sdmmc_cardetect(&g_sdmmc0); } #endif #ifdef CONFIG_SAMA5_SDMMC1 -static int sam_sdmmc1_cardetect(int irq, void *regs, FAR void *arg) +static int sam_sdmmc1_cardetect(int irq, void *regs, void *arg) { return sam_sdmmc_cardetect(&g_sdmmc1); } diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_spi.c b/boards/arm/sama5/sama5d2-xult/src/sam_spi.c index e10598491f..2896b36ff9 100644 --- a/boards/arm/sama5/sama5d2-xult/src/sam_spi.c +++ b/boards/arm/sama5/sama5d2-xult/src/sam_spi.c @@ -163,14 +163,14 @@ void sam_spi1select(uint32_t devid, bool selected) ****************************************************************************/ #ifdef CONFIG_SAMA5_SPI0 -uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi0status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_SAMA5_SPI0 -uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_usb.c b/boards/arm/sama5/sama5d2-xult/src/sam_usb.c index 5ed9194368..5f47460ab6 100644 --- a/boards/arm/sama5/sama5d2-xult/src/sam_usb.c +++ b/boards/arm/sama5/sama5d2-xult/src/sam_usb.c @@ -340,7 +340,7 @@ int sam_usbhost_initialize(void) ret = kthread_create("OHCI Monitor", CONFIG_SAMA5D2XULT_USBHOST_PRIO, CONFIG_SAMA5D2XULT_USBHOST_STACKSIZE, - (main_t)ohci_waiter, (FAR char * const *)NULL); + (main_t)ohci_waiter, (char * const *)NULL); if (ret < 0) { uerr("ERROR: Failed to create ohci_waiter task: %d\n", ret); @@ -362,7 +362,7 @@ int sam_usbhost_initialize(void) ret = kthread_create("EHCI Monitor", CONFIG_SAMA5D2XULT_USBHOST_PRIO, CONFIG_SAMA5D2XULT_USBHOST_STACKSIZE, - (main_t)ehci_waiter, (FAR char * const *)NULL); + (main_t)ehci_waiter, (char * const *)NULL); if (ret < 0) { uerr("ERROR: Failed to create ehci_waiter task: %d\n", ret); @@ -518,7 +518,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler) ****************************************************************************/ #ifdef CONFIG_USBDEV -void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume) +void sam_usbsuspend(struct usbdev_s *dev, bool resume) { uinfo("resume: %d\n", resume); } diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_ajoystick.c b/boards/arm/sama5/sama5d3-xplained/src/sam_ajoystick.c index 7ab59d0364..42a0ce74bf 100644 --- a/boards/arm/sama5/sama5d3-xplained/src/sam_ajoystick.c +++ b/boards/arm/sama5/sama5d3-xplained/src/sam_ajoystick.c @@ -86,17 +86,17 @@ ****************************************************************************/ static ajoy_buttonset_t -ajoy_supported(FAR const struct ajoy_lowerhalf_s *lower); -static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, - FAR struct ajoy_sample_s *sample); +ajoy_supported(const struct ajoy_lowerhalf_s *lower); +static int ajoy_sample(const struct ajoy_lowerhalf_s *lower, + struct ajoy_sample_s *sample); static ajoy_buttonset_t -ajoy_buttons(FAR const struct ajoy_lowerhalf_s *lower); -static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower, +ajoy_buttons(const struct ajoy_lowerhalf_s *lower); +static void ajoy_enable(const struct ajoy_lowerhalf_s *lower, ajoy_buttonset_t press, ajoy_buttonset_t release, - ajoy_handler_t handler, FAR void *arg); + ajoy_handler_t handler, void *arg); static void ajoy_disable(void); -static int ajoy_interrupt(int irq, FAR void *context, FAR void *arg); +static int ajoy_interrupt(int irq, void *context, void *arg); /**************************************************************************** * Private Data @@ -135,7 +135,7 @@ static struct file g_adcfile; /* Current interrupt handler and argument */ static ajoy_handler_t g_ajoyhandler; -static FAR void *g_ajoyarg; +static void *g_ajoyarg; /**************************************************************************** * Private Functions @@ -150,7 +150,7 @@ static FAR void *g_ajoyarg; ****************************************************************************/ static ajoy_buttonset_t -ajoy_supported(FAR const struct ajoy_lowerhalf_s *lower) +ajoy_supported(const struct ajoy_lowerhalf_s *lower) { iinfo("Supported: %02x\n", AJOY_SUPPORTED); return (ajoy_buttonset_t)AJOY_SUPPORTED; @@ -164,11 +164,11 @@ ajoy_supported(FAR const struct ajoy_lowerhalf_s *lower) * ****************************************************************************/ -static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, - FAR struct ajoy_sample_s *sample) +static int ajoy_sample(const struct ajoy_lowerhalf_s *lower, + struct ajoy_sample_s *sample) { struct adc_msg_s adcmsg[SAM_ADC_NCHANNELS]; - FAR struct adc_msg_s *ptr; + struct adc_msg_s *ptr; ssize_t nread; ssize_t offset; int have; @@ -246,7 +246,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, ****************************************************************************/ static ajoy_buttonset_t -ajoy_buttons(FAR const struct ajoy_lowerhalf_s *lower) +ajoy_buttons(const struct ajoy_lowerhalf_s *lower) { ajoy_buttonset_t ret = 0; int i; @@ -278,9 +278,9 @@ ajoy_buttons(FAR const struct ajoy_lowerhalf_s *lower) * ****************************************************************************/ -static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower, - ajoy_buttonset_t press, ajoy_buttonset_t release, - ajoy_handler_t handler, FAR void *arg) +static void ajoy_enable(const struct ajoy_lowerhalf_s *lower, + ajoy_buttonset_t press, ajoy_buttonset_t release, + ajoy_handler_t handler, void *arg) { irqstate_t flags; ajoy_buttonset_t either = press | release; @@ -367,7 +367,7 @@ static void ajoy_disable(void) * ****************************************************************************/ -static int ajoy_interrupt(int irq, FAR void *context, FAR void *arg) +static int ajoy_interrupt(int irq, void *context, void *arg) { DEBUGASSERT(g_ajoyhandler); if (g_ajoyhandler) diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_at25.c b/boards/arm/sama5/sama5d3-xplained/src/sam_at25.c index cf2a421894..885c7d3ef7 100644 --- a/boards/arm/sama5/sama5d3-xplained/src/sam_at25.c +++ b/boards/arm/sama5/sama5d3-xplained/src/sam_at25.c @@ -57,8 +57,8 @@ int sam_at25_automount(int minor) { - FAR struct spi_dev_s *spi; - FAR struct mtd_dev_s *mtd; + struct spi_dev_s *spi; + struct mtd_dev_s *mtd; static bool initialized = false; int ret; diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_bringup.c b/boards/arm/sama5/sama5d3-xplained/src/sam_bringup.c index 8796c96ce1..f87190ab4a 100644 --- a/boards/arm/sama5/sama5d3-xplained/src/sam_bringup.c +++ b/boards/arm/sama5/sama5d3-xplained/src/sam_bringup.c @@ -75,7 +75,7 @@ #ifdef HAVE_I2CTOOL static void sam_i2c_register(int bus) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; i2c = sam_i2cbus_initialize(bus); diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_buttons.c b/boards/arm/sama5/sama5d3-xplained/src/sam_buttons.c index 090fbd32ae..4955ffa3a8 100644 --- a/boards/arm/sama5/sama5d3-xplained/src/sam_buttons.c +++ b/boards/arm/sama5/sama5d3-xplained/src/sam_buttons.c @@ -108,7 +108,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #if defined(CONFIG_SAMA5_PIOE_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_ethernet.c b/boards/arm/sama5/sama5d3-xplained/src/sam_ethernet.c index 094363dd61..331d81d2bb 100644 --- a/boards/arm/sama5/sama5d3-xplained/src/sam_ethernet.c +++ b/boards/arm/sama5/sama5d3-xplained/src/sam_ethernet.c @@ -241,7 +241,7 @@ void weak_function sam_netinitialize(void) ****************************************************************************/ #ifdef CONFIG_SAMA5_PIOE_IRQ -int arch_phy_irq(FAR const char *intf, xcpt_t handler, void *arg, +int arch_phy_irq(const char *intf, xcpt_t handler, void *arg, phy_enable_t *enable) { irqstate_t flags; diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_hsmci.c b/boards/arm/sama5/sama5d3-xplained/src/sam_hsmci.c index 32df6cf89f..298498032f 100644 --- a/boards/arm/sama5/sama5d3-xplained/src/sam_hsmci.c +++ b/boards/arm/sama5/sama5d3-xplained/src/sam_hsmci.c @@ -96,7 +96,7 @@ struct sam_hsmci_state_s /* HSCMI device state */ #ifdef CONFIG_SAMA5_HSMCI0 -static int sam_hsmci0_cardetect(int irq, void *regs, FAR void *arg); +static int sam_hsmci0_cardetect(int irq, void *regs, void *arg); static struct sam_hsmci_state_s g_hsmci0 = { @@ -108,7 +108,7 @@ static struct sam_hsmci_state_s g_hsmci0 = #endif #ifdef CONFIG_SAMA5_HSMCI1 -static int sam_hsmci1_cardetect(int irq, void *regs, FAR void *arg); +static int sam_hsmci1_cardetect(int irq, void *regs, void *arg); static struct sam_hsmci_state_s g_hsmci1 = { @@ -173,14 +173,14 @@ static int sam_hsmci_cardetect(struct sam_hsmci_state_s *state) } #ifdef CONFIG_SAMA5_HSMCI0 -static int sam_hsmci0_cardetect(int irq, void *regs, FAR void *arg) +static int sam_hsmci0_cardetect(int irq, void *regs, void *arg) { return sam_hsmci_cardetect(&g_hsmci0); } #endif #ifdef CONFIG_SAMA5_HSMCI1 -static int sam_hsmci1_cardetect(int irq, void *regs, FAR void *arg) +static int sam_hsmci1_cardetect(int irq, void *regs, void *arg) { return sam_hsmci_cardetect(&g_hsmci1); } diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_nandflash.c b/boards/arm/sama5/sama5d3-xplained/src/sam_nandflash.c index ab1209b0d3..e18166bf47 100644 --- a/boards/arm/sama5/sama5d3-xplained/src/sam_nandflash.c +++ b/boards/arm/sama5/sama5d3-xplained/src/sam_nandflash.c @@ -152,7 +152,7 @@ int board_nandflash_config(int cs) #ifdef HAVE_NAND int sam_nand_automount(int minor) { - FAR struct mtd_dev_s *mtd; + struct mtd_dev_s *mtd; static bool initialized = false; int ret; diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_spi.c b/boards/arm/sama5/sama5d3-xplained/src/sam_spi.c index 9e0188a8ad..72994f6245 100644 --- a/boards/arm/sama5/sama5d3-xplained/src/sam_spi.c +++ b/boards/arm/sama5/sama5d3-xplained/src/sam_spi.c @@ -163,14 +163,14 @@ void sam_spi1select(uint32_t devid, bool selected) ****************************************************************************/ #ifdef CONFIG_SAMA5_SPI0 -uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi0status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_SAMA5_SPI0 -uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_usb.c b/boards/arm/sama5/sama5d3-xplained/src/sam_usb.c index d973bfbaa5..870ed8b705 100644 --- a/boards/arm/sama5/sama5d3-xplained/src/sam_usb.c +++ b/boards/arm/sama5/sama5d3-xplained/src/sam_usb.c @@ -348,7 +348,7 @@ int sam_usbhost_initialize(void) ret = kthread_create("OHCI Monitor", CONFIG_SAMA5D3XPLAINED_USBHOST_PRIO, CONFIG_SAMA5D3XPLAINED_USBHOST_STACKSIZE, - (main_t)ohci_waiter, (FAR char * const *)NULL); + (main_t)ohci_waiter, (char * const *)NULL); if (ret < 0) { uerr("ERROR: Failed to create ohci_waiter task: %d\n", ret); @@ -370,7 +370,7 @@ int sam_usbhost_initialize(void) ret = kthread_create("EHCI Monitor", CONFIG_SAMA5D3XPLAINED_USBHOST_PRIO, CONFIG_SAMA5D3XPLAINED_USBHOST_STACKSIZE, - (main_t)ehci_waiter, (FAR char * const *)NULL); + (main_t)ehci_waiter, (char * const *)NULL); if (ret < 0) { uerr("ERROR: Failed to create ehci_waiter task: %d\n", ret); @@ -535,7 +535,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler) ****************************************************************************/ #ifdef CONFIG_USBDEV -void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume) +void sam_usbsuspend(struct usbdev_s *dev, bool resume) { uinfo("resume: %d\n", resume); } diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_at24.c b/boards/arm/sama5/sama5d3x-ek/src/sam_at24.c index d7d779bbed..1e27758f2d 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_at24.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_at24.c @@ -75,8 +75,8 @@ int sam_at24_automount(int minor) { - FAR struct i2c_master_s *i2c; - FAR struct mtd_dev_s *mtd; + struct i2c_master_s *i2c; + struct mtd_dev_s *mtd; static bool initialized = false; int ret; diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_at25.c b/boards/arm/sama5/sama5d3x-ek/src/sam_at25.c index 49883b2eee..2860e66989 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_at25.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_at25.c @@ -57,8 +57,8 @@ int sam_at25_automount(int minor) { - FAR struct spi_dev_s *spi; - FAR struct mtd_dev_s *mtd; + struct spi_dev_s *spi; + struct mtd_dev_s *mtd; static bool initialized = false; int ret; diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_buttons.c b/boards/arm/sama5/sama5d3x-ek/src/sam_buttons.c index 31e585c1dc..b0b09872cc 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_buttons.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_buttons.c @@ -108,7 +108,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #if defined(CONFIG_SAMA5_PIOE_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_ethernet.c b/boards/arm/sama5/sama5d3x-ek/src/sam_ethernet.c index 5fb303d607..392682796d 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_ethernet.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_ethernet.c @@ -241,7 +241,7 @@ void weak_function sam_netinitialize(void) ****************************************************************************/ #ifdef CONFIG_SAMA5_PIOE_IRQ -int arch_phy_irq(FAR const char *intf, xcpt_t handler, void *arg, +int arch_phy_irq(const char *intf, xcpt_t handler, void *arg, phy_enable_t *enable) { irqstate_t flags; diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_hsmci.c b/boards/arm/sama5/sama5d3x-ek/src/sam_hsmci.c index 1d92f7fa86..640f0d85c0 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_hsmci.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_hsmci.c @@ -97,7 +97,7 @@ struct sam_hsmci_state_s /* HSCMI device state */ #ifdef CONFIG_SAMA5_HSMCI0 -static int sam_hsmci0_cardetect(int irq, void *regs, FAR void *arg); +static int sam_hsmci0_cardetect(int irq, void *regs, void *arg); static struct sam_hsmci_state_s g_hsmci0 = { @@ -109,7 +109,7 @@ static struct sam_hsmci_state_s g_hsmci0 = #endif #ifdef CONFIG_SAMA5_HSMCI1 -static int sam_hsmci1_cardetect(int irq, void *regs, FAR void *arg); +static int sam_hsmci1_cardetect(int irq, void *regs, void *arg); static struct sam_hsmci_state_s g_hsmci1 = { @@ -174,14 +174,14 @@ static int sam_hsmci_cardetect(struct sam_hsmci_state_s *state) } #ifdef CONFIG_SAMA5_HSMCI0 -static int sam_hsmci0_cardetect(int irq, void *regs, FAR void *arg) +static int sam_hsmci0_cardetect(int irq, void *regs, void *arg) { return sam_hsmci_cardetect(&g_hsmci0); } #endif #ifdef CONFIG_SAMA5_HSMCI1 -static int sam_hsmci1_cardetect(int irq, void *regs, FAR void *arg) +static int sam_hsmci1_cardetect(int irq, void *regs, void *arg) { return sam_hsmci_cardetect(&g_hsmci1); } diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_nandflash.c b/boards/arm/sama5/sama5d3x-ek/src/sam_nandflash.c index 371565eede..74a1c15a03 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_nandflash.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_nandflash.c @@ -152,7 +152,7 @@ int board_nandflash_config(int cs) #ifdef HAVE_NAND int sam_nand_automount(int minor) { - FAR struct mtd_dev_s *mtd; + struct mtd_dev_s *mtd; static bool initialized = false; int ret; diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_ov2640.c b/boards/arm/sama5/sama5d3x-ek/src/sam_ov2640.c index 6be357f36a..10ddd7b2ab 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_ov2640.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_ov2640.c @@ -63,9 +63,9 @@ * Name: ov2640_lcd_initialize ****************************************************************************/ -static inline FAR struct fb_vtable_s *ov2640_lcd_initialize(void) +static inline struct fb_vtable_s *ov2640_lcd_initialize(void) { - FAR struct fb_vtable_s *vplane; + struct fb_vtable_s *vplane; int ret; /* Initialize the frame buffer device */ @@ -143,7 +143,7 @@ static inline FAR struct fb_vtable_s *ov2640_lcd_initialize(void) static inline int ov2640_camera_initialize(void) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; uint32_t actual; int ret; @@ -223,7 +223,7 @@ static inline int ov2640_camera_initialize(void) int ov2640_main(int argc, char *argv[]) { - FAR struct fb_vtable_s *vplane; + struct fb_vtable_s *vplane; int ret; /* First, initialize the display */ diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_spi.c b/boards/arm/sama5/sama5d3x-ek/src/sam_spi.c index 62bf86629f..b454471286 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_spi.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_spi.c @@ -162,14 +162,14 @@ void sam_spi1select(uint32_t devid, bool selected) ****************************************************************************/ #ifdef CONFIG_SAMA5_SPI0 -uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi0status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_SAMA5_SPI0 -uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_usb.c b/boards/arm/sama5/sama5d3x-ek/src/sam_usb.c index 6582853e6d..3dcff48672 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_usb.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_usb.c @@ -347,7 +347,7 @@ int sam_usbhost_initialize(void) ret = kthread_create("OHCI Monitor", CONFIG_SAMA5D3XEK_USBHOST_PRIO, CONFIG_SAMA5D3XEK_USBHOST_STACKSIZE, - (main_t)ohci_waiter, (FAR char * const *)NULL); + (main_t)ohci_waiter, (char * const *)NULL); if (ret < 0) { uerr("ERROR: Failed to create ohci_waiter task: %d\n", ret); @@ -369,7 +369,7 @@ int sam_usbhost_initialize(void) ret = kthread_create("EHCI Monitor", CONFIG_SAMA5D3XEK_USBHOST_PRIO, CONFIG_SAMA5D3XEK_USBHOST_STACKSIZE, - (main_t)ehci_waiter, (FAR char * const *)NULL); + (main_t)ehci_waiter, (char * const *)NULL); if (ret < 0) { uerr("ERROR: Failed to create ehci_waiter task: %d\n", ret); @@ -528,7 +528,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler) ****************************************************************************/ #ifdef CONFIG_USBDEV -void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume) +void sam_usbsuspend(struct usbdev_s *dev, bool resume) { uinfo("resume: %d\n", resume); } diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_wm8904.c b/boards/arm/sama5/sama5d3x-ek/src/sam_wm8904.c index 7f4cd44ac4..bef50be7ae 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_wm8904.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_wm8904.c @@ -65,7 +65,7 @@ struct sama5d3ek_mwinfo_s /* Extensions for the sama5d3x-ek board */ wm8904_handler_t handler; - FAR void *arg; + void *arg; }; /**************************************************************************** @@ -82,9 +82,9 @@ struct sama5d3ek_mwinfo_s * enable - Enable or disable the PIO interrupt */ -static int wm8904_attach(FAR const struct wm8904_lower_s *lower, - wm8904_handler_t isr, FAR void *arg); -static bool wm8904_enable(FAR const struct wm8904_lower_s *lower, +static int wm8904_attach(const struct wm8904_lower_s *lower, + wm8904_handler_t isr, void *arg); +static bool wm8904_enable(const struct wm8904_lower_s *lower, bool enable); /**************************************************************************** @@ -133,8 +133,8 @@ static struct sama5d3ek_mwinfo_s g_wm8904info = * ****************************************************************************/ -static int wm8904_attach(FAR const struct wm8904_lower_s *lower, - wm8904_handler_t isr, FAR void *arg) +static int wm8904_attach(const struct wm8904_lower_s *lower, + wm8904_handler_t isr, void *arg) { if (isr) { @@ -158,7 +158,7 @@ static int wm8904_attach(FAR const struct wm8904_lower_s *lower, return OK; } -static bool wm8904_enable(FAR const struct wm8904_lower_s *lower, +static bool wm8904_enable(const struct wm8904_lower_s *lower, bool enable) { static bool enabled; @@ -191,7 +191,7 @@ static bool wm8904_enable(FAR const struct wm8904_lower_s *lower, return ret; } -static int wm8904_interrupt(int irq, FAR void *context, FAR void *arg) +static int wm8904_interrupt(int irq, void *context, void *arg) { /* Just forward the interrupt to the WM8904 driver */ @@ -232,10 +232,10 @@ static int wm8904_interrupt(int irq, FAR void *context, FAR void *arg) int sam_wm8904_initialize(int minor) { - FAR struct audio_lowerhalf_s *wm8904; - FAR struct audio_lowerhalf_s *pcm; - FAR struct i2c_master_s *i2c; - FAR struct i2s_dev_s *i2s; + struct audio_lowerhalf_s *wm8904; + struct audio_lowerhalf_s *pcm; + struct i2c_master_s *i2c; + struct i2s_dev_s *i2s; static bool initialized = false; char devname[12]; int ret; diff --git a/boards/arm/sama5/sama5d4-ek/src/at25_main.c b/boards/arm/sama5/sama5d4-ek/src/at25_main.c index 10d1388dcc..864d02187b 100644 --- a/boards/arm/sama5/sama5d4-ek/src/at25_main.c +++ b/boards/arm/sama5/sama5d4-ek/src/at25_main.c @@ -144,7 +144,7 @@ int at25_main(int argc, char *argv) * which we can buffer the binary data. */ - lib_memsostream(&memoutstream, (FAR char *)SAM_DDRCS_VSECTION, + lib_memsostream(&memoutstream, (char *)SAM_DDRCS_VSECTION, CONFIG_SAMA5D4EK_AT25_PROGSIZE); /* We are ready to load the Intel HEX stream into DRAM. diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_at25.c b/boards/arm/sama5/sama5d4-ek/src/sam_at25.c index ade985bcf6..38b326d247 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_at25.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_at25.c @@ -58,8 +58,8 @@ int sam_at25_automount(int minor) { - FAR struct spi_dev_s *spi; - FAR struct mtd_dev_s *mtd; + struct spi_dev_s *spi; + struct mtd_dev_s *mtd; #ifdef CONFIG_SAMA5D4EK_AT25_CHARDEV #if defined(CONFIG_BCH) char blockdev[18]; diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_audio_null.c b/boards/arm/sama5/sama5d4-ek/src/sam_audio_null.c index 9fe281b1ea..6e4a8ea3bc 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_audio_null.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_audio_null.c @@ -79,8 +79,8 @@ int sam_audio_null_initialize(int minor) { - FAR struct audio_lowerhalf_s *nullaudio; - FAR struct audio_lowerhalf_s *pcm; + struct audio_lowerhalf_s *nullaudio; + struct audio_lowerhalf_s *pcm; static bool initialized = false; char devname[12]; int ret; diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_automount.c b/boards/arm/sama5/sama5d4-ek/src/sam_automount.c index 0f3685cd7e..9601c457ac 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_automount.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_automount.c @@ -44,7 +44,7 @@ ****************************************************************************/ #ifndef NULL -# define NULL (FAR void *)0 +# define NULL (void *)0 #endif #ifndef OK @@ -59,10 +59,10 @@ struct sam_automount_state_s { - volatile automount_handler_t handler; /* Upper half handler */ - FAR void *arg; /* Handler argument */ - bool enable; /* Fake interrupt enable */ - bool pending; /* Set if there an event while disabled */ + volatile automount_handler_t handler; /* Upper half handler */ + void *arg; /* Handler argument */ + bool enable; /* Fake interrupt enable */ + bool pending; /* Set if there an event while disabled */ }; /* This structure represents the static configuration of an automounter */ @@ -73,20 +73,20 @@ struct sam_automount_config_s * struct automount_lower_s to struct sam_automount_config_s */ - struct automount_lower_s lower; /* Publicly visible part */ - uint8_t hsmci; /* HSMCI0_SLOTNO or HSMCI1_SLOTNO */ - FAR struct sam_automount_state_s *state; /* Changeable state */ + struct automount_lower_s lower; /* Publicly visible part */ + uint8_t hsmci; /* HSMCI0_SLOTNO or HSMCI1_SLOTNO */ + struct sam_automount_state_s *state; /* Changeable state */ }; /**************************************************************************** * Private Function Prototypes ****************************************************************************/ -static int sam_attach(FAR const struct automount_lower_s *lower, - automount_handler_t isr, FAR void *arg); -static void sam_enable(FAR const struct automount_lower_s *lower, +static int sam_attach(const struct automount_lower_s *lower, + automount_handler_t isr, void *arg); +static void sam_enable(const struct automount_lower_s *lower, bool enable); -static bool sam_inserted(FAR const struct automount_lower_s *lower); +static bool sam_inserted(const struct automount_lower_s *lower); /**************************************************************************** * Private Data @@ -152,15 +152,15 @@ static const struct sam_automount_config_s g_hsmci1config = * ****************************************************************************/ -static int sam_attach(FAR const struct automount_lower_s *lower, - automount_handler_t isr, FAR void *arg) +static int sam_attach(const struct automount_lower_s *lower, + automount_handler_t isr, void *arg) { - FAR const struct sam_automount_config_s *config; - FAR struct sam_automount_state_s *state; + const struct sam_automount_config_s *config; + struct sam_automount_state_s *state; /* Recover references to our structure */ - config = (FAR struct sam_automount_config_s *)lower; + config = (struct sam_automount_config_s *)lower; DEBUGASSERT(config && config->state); state = config->state; @@ -191,16 +191,16 @@ static int sam_attach(FAR const struct automount_lower_s *lower, * ****************************************************************************/ -static void sam_enable(FAR const struct automount_lower_s *lower, +static void sam_enable(const struct automount_lower_s *lower, bool enable) { - FAR const struct sam_automount_config_s *config; - FAR struct sam_automount_state_s *state; + const struct sam_automount_config_s *config; + struct sam_automount_state_s *state; irqstate_t flags; /* Recover references to our structure */ - config = (FAR struct sam_automount_config_s *)lower; + config = (struct sam_automount_config_s *)lower; DEBUGASSERT(config && config->state); state = config->state; @@ -242,11 +242,11 @@ static void sam_enable(FAR const struct automount_lower_s *lower, * ****************************************************************************/ -static bool sam_inserted(FAR const struct automount_lower_s *lower) +static bool sam_inserted(const struct automount_lower_s *lower) { - FAR const struct sam_automount_config_s *config; + const struct sam_automount_config_s *config; - config = (FAR struct sam_automount_config_s *)lower; + config = (struct sam_automount_config_s *)lower; DEBUGASSERT(config && config->state); return sam_cardinserted(config->hsmci); @@ -272,7 +272,7 @@ static bool sam_inserted(FAR const struct automount_lower_s *lower) void sam_automount_initialize(void) { - FAR void *handle; + void *handle; finfo("Initializing automounter(s)\n"); @@ -325,8 +325,8 @@ void sam_automount_initialize(void) void sam_automount_event(int slotno, bool inserted) { - FAR const struct sam_automount_config_s *config; - FAR struct sam_automount_state_s *state; + const struct sam_automount_config_s *config; + struct sam_automount_state_s *state; #ifdef CONFIG_SAMA5D4EK_HSMCI0_AUTOMOUNT /* Is this a change in the HSMCI0 insertion state? */ diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_bringup.c b/boards/arm/sama5/sama5d4-ek/src/sam_bringup.c index b169f7982b..0d1a3c27e4 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_bringup.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_bringup.c @@ -70,7 +70,7 @@ #ifdef HAVE_I2CTOOL static void sam_i2c_register(int bus) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; i2c = sam_i2cbus_initialize(bus); diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_buttons.c b/boards/arm/sama5/sama5d4-ek/src/sam_buttons.c index 54211ebf77..f7321fa410 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_buttons.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_buttons.c @@ -104,7 +104,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #if defined(CONFIG_SAMA5_PIOE_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_ethernet.c b/boards/arm/sama5/sama5d4-ek/src/sam_ethernet.c index cce0364631..b4569580f4 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_ethernet.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_ethernet.c @@ -209,7 +209,7 @@ void weak_function sam_netinitialize(void) ****************************************************************************/ #ifdef CONFIG_SAMA5_PIOE_IRQ -int arch_phy_irq(FAR const char *intf, xcpt_t handler, void *arg, +int arch_phy_irq(const char *intf, xcpt_t handler, void *arg, phy_enable_t *enable) { irqstate_t flags; diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_hsmci.c b/boards/arm/sama5/sama5d4-ek/src/sam_hsmci.c index 709f44179d..4943b1be8b 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_hsmci.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_hsmci.c @@ -110,7 +110,7 @@ struct sam_hsmci_state_s /* HSCMI device state */ #ifdef CONFIG_SAMA5_HSMCI0 -static int sam_hsmci0_cardetect(int irq, void *regs, FAR void *arg); +static int sam_hsmci0_cardetect(int irq, void *regs, void *arg); static struct sam_hsmci_state_s g_hsmci0 = { @@ -122,7 +122,7 @@ static struct sam_hsmci_state_s g_hsmci0 = #endif #ifdef CONFIG_SAMA5_HSMCI1 -static int sam_hsmci1_cardetect(int irq, void *regs, FAR void *arg); +static int sam_hsmci1_cardetect(int irq, void *regs, void *arg); static struct sam_hsmci_state_s g_hsmci1 = { @@ -188,7 +188,7 @@ static int sam_hsmci_cardetect(struct sam_hsmci_state_s *state) } #ifdef CONFIG_SAMA5_HSMCI0 -static int sam_hsmci0_cardetect(int irq, FAR void *regs, FAR void *arg) +static int sam_hsmci0_cardetect(int irq, void *regs, void *arg) { int ret; @@ -210,7 +210,7 @@ static int sam_hsmci0_cardetect(int irq, FAR void *regs, FAR void *arg) #endif #ifdef CONFIG_SAMA5_HSMCI1 -static int sam_hsmci1_cardetect(int irq, FAR void *regs, FAR void *arg) +static int sam_hsmci1_cardetect(int irq, void *regs, void *arg) { int ret; diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_maxtouch.c b/boards/arm/sama5/sama5d4-ek/src/sam_maxtouch.c index 5d47c16e6c..6a1c95f8bb 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_maxtouch.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_maxtouch.c @@ -75,7 +75,7 @@ struct sama5d4ek_tscinfo_s /* Extensions for the sama5d4ek board */ mxt_handler_t handler; - FAR void *arg; + void *arg; }; /**************************************************************************** @@ -93,11 +93,11 @@ struct sama5d4ek_tscinfo_s * clear - Acknowledge/clear any pending PIO interrupt */ -static int mxt_attach(FAR const struct mxt_lower_s *lower, +static int mxt_attach(const struct mxt_lower_s *lower, mxt_handler_t isr, - FAR void *arg); -static void mxt_enable(FAR const struct mxt_lower_s *lower, bool enable); -static void mxt_clear(FAR const struct mxt_lower_s *lower); + void *arg); +static void mxt_enable(const struct mxt_lower_s *lower, bool enable); +static void mxt_clear(const struct mxt_lower_s *lower); /**************************************************************************** * Private Data @@ -141,8 +141,8 @@ static struct sama5d4ek_tscinfo_s g_mxtinfo = * ****************************************************************************/ -static int mxt_attach(FAR const struct mxt_lower_s *lower, mxt_handler_t isr, - FAR void *arg) +static int mxt_attach(const struct mxt_lower_s *lower, mxt_handler_t isr, + void *arg) { if (isr) { @@ -166,7 +166,7 @@ static int mxt_attach(FAR const struct mxt_lower_s *lower, mxt_handler_t isr, return OK; } -static void mxt_enable(FAR const struct mxt_lower_s *lower, bool enable) +static void mxt_enable(const struct mxt_lower_s *lower, bool enable) { /* Enable or disable interrupts */ @@ -180,12 +180,12 @@ static void mxt_enable(FAR const struct mxt_lower_s *lower, bool enable) } } -static void mxt_clear(FAR const struct mxt_lower_s *lower) +static void mxt_clear(const struct mxt_lower_s *lower) { /* Does nothing */ } -static int mxt_interrupt(int irq, FAR void *context, FAR void *arg) +static int mxt_interrupt(int irq, void *context, void *arg) { /* Just forward the interrupt to the maXTouch driver */ @@ -225,7 +225,7 @@ static int mxt_interrupt(int irq, FAR void *context, FAR void *arg) int sam_tsc_setup(int minor) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; iinfo("minor %d\n", minor); diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_nandflash.c b/boards/arm/sama5/sama5d4-ek/src/sam_nandflash.c index 9327634dff..41682d95c4 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_nandflash.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_nandflash.c @@ -152,7 +152,7 @@ int board_nandflash_config(int cs) #ifdef HAVE_NAND int sam_nand_automount(int minor) { - FAR struct mtd_dev_s *mtd; + struct mtd_dev_s *mtd; static bool initialized = false; int ret; diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_pmic.c b/boards/arm/sama5/sama5d4-ek/src/sam_pmic.c index 16caf40bfc..d689fe74a6 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_pmic.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_pmic.c @@ -56,7 +56,7 @@ void sam_pmic_initialize(void) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; struct i2c_config_s config; uint8_t buffer[2]; diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_spi.c b/boards/arm/sama5/sama5d4-ek/src/sam_spi.c index 71d80227a8..d2c0181688 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_spi.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_spi.c @@ -162,14 +162,14 @@ void sam_spi1select(uint32_t devid, bool selected) ****************************************************************************/ #ifdef CONFIG_SAMA5_SPI0 -uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi0status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_SAMA5_SPI0 -uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_usb.c b/boards/arm/sama5/sama5d4-ek/src/sam_usb.c index ae8606c448..2a38275b35 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_usb.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_usb.c @@ -346,7 +346,7 @@ int sam_usbhost_initialize(void) ret = kthread_create("OHCI Monitor", CONFIG_SAMA5D4EK_USBHOST_PRIO, CONFIG_SAMA5D4EK_USBHOST_STACKSIZE, - (main_t)ohci_waiter, (FAR char * const *)NULL); + (main_t)ohci_waiter, (char * const *)NULL); if (ret < 0) { uerr("ERROR: Failed to create ohci_waiter task: %d\n", ret); @@ -368,7 +368,7 @@ int sam_usbhost_initialize(void) ret = kthread_create("EHCI Monitor", CONFIG_SAMA5D4EK_USBHOST_PRIO, CONFIG_SAMA5D4EK_USBHOST_STACKSIZE, - (main_t)ehci_waiter, (FAR char * const *)NULL); + (main_t)ehci_waiter, (char * const *)NULL); if (ret < 0) { uerr("ERROR: Failed to create ehci_waiter task: %d\n", ret); @@ -528,7 +528,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler) ****************************************************************************/ #ifdef CONFIG_USBDEV -void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume) +void sam_usbsuspend(struct usbdev_s *dev, bool resume) { uinfo("resume: %d\n", resume); } diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_wm8904.c b/boards/arm/sama5/sama5d4-ek/src/sam_wm8904.c index 94fb8b2582..56b05922f7 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_wm8904.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_wm8904.c @@ -65,7 +65,7 @@ struct sama5d4ek_mwinfo_s /* Extensions for the sama5d4ek board */ wm8904_handler_t handler; - FAR void *arg; + void *arg; }; /**************************************************************************** @@ -82,9 +82,9 @@ struct sama5d4ek_mwinfo_s * enable - Enable or disable the PIO interrupt */ -static int wm8904_attach(FAR const struct wm8904_lower_s *lower, - wm8904_handler_t isr, FAR void *arg); -static bool wm8904_enable(FAR const struct wm8904_lower_s *lower, +static int wm8904_attach(const struct wm8904_lower_s *lower, + wm8904_handler_t isr, void *arg); +static bool wm8904_enable(const struct wm8904_lower_s *lower, bool enable); /**************************************************************************** @@ -133,8 +133,8 @@ static struct sama5d4ek_mwinfo_s g_wm8904info = * ****************************************************************************/ -static int wm8904_attach(FAR const struct wm8904_lower_s *lower, - wm8904_handler_t isr, FAR void *arg) +static int wm8904_attach(const struct wm8904_lower_s *lower, + wm8904_handler_t isr, void *arg) { if (isr) { @@ -158,7 +158,7 @@ static int wm8904_attach(FAR const struct wm8904_lower_s *lower, return OK; } -static bool wm8904_enable(FAR const struct wm8904_lower_s *lower, +static bool wm8904_enable(const struct wm8904_lower_s *lower, bool enable) { static bool enabled; @@ -191,7 +191,7 @@ static bool wm8904_enable(FAR const struct wm8904_lower_s *lower, return ret; } -static int wm8904_interrupt(int irq, FAR void *context, FAR void *arg) +static int wm8904_interrupt(int irq, void *context, void *arg) { /* Just forward the interrupt to the WM8904 driver */ @@ -232,10 +232,10 @@ static int wm8904_interrupt(int irq, FAR void *context, FAR void *arg) int sam_wm8904_initialize(int minor) { - FAR struct audio_lowerhalf_s *wm8904; - FAR struct audio_lowerhalf_s *pcm; - FAR struct i2c_master_s *i2c; - FAR struct i2s_dev_s *i2s; + struct audio_lowerhalf_s *wm8904; + struct audio_lowerhalf_s *pcm; + struct i2c_master_s *i2c; + struct i2s_dev_s *i2s; static bool initialized = false; char devname[12]; int ret; diff --git a/boards/arm/samd2l2/arduino-m0/src/sam_spi.c b/boards/arm/samd2l2/arduino-m0/src/sam_spi.c index b9f17c52bd..e046bde749 100644 --- a/boards/arm/samd2l2/arduino-m0/src/sam_spi.c +++ b/boards/arm/samd2l2/arduino-m0/src/sam_spi.c @@ -119,42 +119,42 @@ void weak_function sam_spidev_initialize(void) ****************************************************************************/ #ifdef SAMD2L2_HAVE_SPI0 -void sam_spi0select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi0select(struct spi_dev_s *dev, uint32_t devid, bool selected) { } #endif #ifdef SAMD2L2_HAVE_SPI1 -void sam_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { } #endif #ifdef SAMD2L2_HAVE_SPI2 -void sam_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { } #endif #ifdef SAMD2L2_HAVE_SPI3 -void sam_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi3select(struct spi_dev_s *dev, uint32_t devid, bool selected) { } #endif #ifdef SAMD2L2_HAVE_SPI4 -void sam_spi4select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi4select(struct spi_dev_s *dev, uint32_t devid, bool selected) { } #endif #ifdef SAMD2L2_HAVE_SPI5 -void sam_spi5select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi5select(struct spi_dev_s *dev, uint32_t devid, bool selected) { } @@ -176,42 +176,42 @@ void sam_spi5select(FAR struct spi_dev_s *dev, uint32_t devid, ****************************************************************************/ #ifdef SAMD2L2_HAVE_SPI0 -uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi0status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef SAMD2L2_HAVE_SPI1 -uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef SAMD2L2_HAVE_SPI2 -uint8_t sam_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef SAMD2L2_HAVE_SPI3 -uint8_t sam_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi3status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef SAMD2L2_HAVE_SPI4 -uint8_t sam_spi4status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi4status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef SAMD2L2_HAVE_SPI5 -uint8_t sam_spi5status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi5status(struct spi_dev_s *dev, uint32_t devid) { uint8_t ret = 0; return ret; @@ -244,42 +244,42 @@ uint8_t sam_spi5status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef SAMD2L2_HAVE_SPI0 -int sam_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi0cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef SAMD2L2_HAVE_SPI1 -int sam_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef SAMD2L2_HAVE_SPI2 -int sam_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef SAMD2L2_HAVE_SPI3 -int sam_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef SAMD2L2_HAVE_SPI4 -int sam_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi4cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef SAMD2L2_HAVE_SPI5 -int sam_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi5cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } diff --git a/boards/arm/samd2l2/arduino-m0/src/sam_usb.c b/boards/arm/samd2l2/arduino-m0/src/sam_usb.c index 43517d6c71..697da08b14 100644 --- a/boards/arm/samd2l2/arduino-m0/src/sam_usb.c +++ b/boards/arm/samd2l2/arduino-m0/src/sam_usb.c @@ -101,7 +101,7 @@ void weak_function sam_usbinitialize(void) ****************************************************************************/ #ifdef CONFIG_USBDEV -void sam_usb_suspend(FAR struct usbdev_s *dev, bool resume) +void sam_usb_suspend(struct usbdev_s *dev, bool resume) { uinfo("board: resume: %d\n", resume); } diff --git a/boards/arm/samd2l2/circuit-express/src/sam_usb.c b/boards/arm/samd2l2/circuit-express/src/sam_usb.c index eed0eca887..ce635016a6 100644 --- a/boards/arm/samd2l2/circuit-express/src/sam_usb.c +++ b/boards/arm/samd2l2/circuit-express/src/sam_usb.c @@ -78,7 +78,7 @@ void weak_function sam_usbinitialize(void) ****************************************************************************/ #ifdef CONFIG_USBDEV -void sam_usb_suspend(FAR struct usbdev_s *dev, bool resume) +void sam_usb_suspend(struct usbdev_s *dev, bool resume) { uinfo("board: resume: %d\n", resume); } diff --git a/boards/arm/samd2l2/samd20-xplained/src/sam_buttons.c b/boards/arm/samd2l2/samd20-xplained/src/sam_buttons.c index cb5929bf1c..cd6a6335a3 100644 --- a/boards/arm/samd2l2/samd20-xplained/src/sam_buttons.c +++ b/boards/arm/samd2l2/samd20-xplained/src/sam_buttons.c @@ -96,7 +96,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #if defined(CONFIG_PORTA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/samd2l2/samd20-xplained/src/sam_mmcsd.c b/boards/arm/samd2l2/samd20-xplained/src/sam_mmcsd.c index 81884d1823..7968e2f0c1 100644 --- a/boards/arm/samd2l2/samd20-xplained/src/sam_mmcsd.c +++ b/boards/arm/samd2l2/samd20-xplained/src/sam_mmcsd.c @@ -77,7 +77,7 @@ int sam_sdinitialize(int port, int minor) { - FAR struct spi_dev_s *spi; + struct spi_dev_s *spi; int ret; /* Get the SPI driver instance for the SD chip select */ diff --git a/boards/arm/samd2l2/samd20-xplained/src/sam_spi.c b/boards/arm/samd2l2/samd20-xplained/src/sam_spi.c index f5dbc61c07..2e15b495b9 100644 --- a/boards/arm/samd2l2/samd20-xplained/src/sam_spi.c +++ b/boards/arm/samd2l2/samd20-xplained/src/sam_spi.c @@ -134,7 +134,7 @@ void weak_function sam_spidev_initialize(void) ****************************************************************************/ #ifdef SAMD2L2_HAVE_SPI0 -void sam_spi0select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi0select(struct spi_dev_s *dev, uint32_t devid, bool selected) { #ifdef CONFIG_SAMD20_XPLAINED_IOMODULE_EXT1 @@ -162,7 +162,7 @@ void sam_spi0select(FAR struct spi_dev_s *dev, uint32_t devid, #endif #ifdef SAMD2L2_HAVE_SPI1 -void sam_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { #ifdef CONFIG_SAMD20_XPLAINED_IOMODULE_EXT2 @@ -190,28 +190,28 @@ void sam_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, #endif #ifdef SAMD2L2_HAVE_SPI2 -void sam_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { } #endif #ifdef SAMD2L2_HAVE_SPI3 -void sam_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi3select(struct spi_dev_s *dev, uint32_t devid, bool selected) { } #endif #ifdef SAMD2L2_HAVE_SPI4 -void sam_spi4select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi4select(struct spi_dev_s *dev, uint32_t devid, bool selected) { } #endif #ifdef SAMD2L2_HAVE_SPI5 -void sam_spi5select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi5select(struct spi_dev_s *dev, uint32_t devid, bool selected) { } @@ -233,7 +233,7 @@ void sam_spi5select(FAR struct spi_dev_s *dev, uint32_t devid, ****************************************************************************/ #ifdef SAMD2L2_HAVE_SPI0 -uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi0status(struct spi_dev_s *dev, uint32_t devid) { uint8_t ret = 0; @@ -256,7 +256,7 @@ uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) #endif #ifdef SAMD2L2_HAVE_SPI1 -uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi1status(struct spi_dev_s *dev, uint32_t devid) { uint8_t ret = 0; @@ -279,28 +279,28 @@ uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) #endif #ifdef SAMD2L2_HAVE_SPI2 -uint8_t sam_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef SAMD2L2_HAVE_SPI3 -uint8_t sam_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi3status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef SAMD2L2_HAVE_SPI4 -uint8_t sam_spi4status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi4status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef SAMD2L2_HAVE_SPI5 -uint8_t sam_spi5status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi5status(struct spi_dev_s *dev, uint32_t devid) { uint8_t ret = 0; return ret; @@ -333,7 +333,7 @@ uint8_t sam_spi5status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef SAMD2L2_HAVE_SPI0 -int sam_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi0cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { #ifdef CONFIG_SAMD20_XPLAINED_OLED1MODULE_EXT1 if (devid == SPIDEV_DISPLAY(0)) @@ -354,7 +354,7 @@ int sam_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) #endif #ifdef SAMD2L2_HAVE_SPI1 -int sam_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { #ifdef CONFIG_SAMD20_XPLAINED_OLED1MODULE_EXT2 if (devid == SPIDEV_DISPLAY(0)) @@ -375,28 +375,28 @@ int sam_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) #endif #ifdef SAMD2L2_HAVE_SPI2 -int sam_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef SAMD2L2_HAVE_SPI3 -int sam_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef SAMD2L2_HAVE_SPI4 -int sam_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi4cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef SAMD2L2_HAVE_SPI5 -int sam_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi5cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } diff --git a/boards/arm/samd2l2/samd20-xplained/src/sam_ug2832hsweg04.c b/boards/arm/samd2l2/samd20-xplained/src/sam_ug2832hsweg04.c index 51f044564d..8c01848bcd 100644 --- a/boards/arm/samd2l2/samd20-xplained/src/sam_ug2832hsweg04.c +++ b/boards/arm/samd2l2/samd20-xplained/src/sam_ug2832hsweg04.c @@ -45,10 +45,10 @@ * 10 DISPLAY_RESET 10 PB05 PORT 10 PB15 PORT * ----------------- ---------------------- ---------------------- * 11 N/C 11 PA08 SERCOM2 PAD[0] 11 PA08 SERCOM2 PAD[0] - * I²C SDA I²C SDA + * I�C SDA I�C SDA * ----------------- ---------------------- ---------------------- * 12 N/C 12 PA09 SERCOM2 PAD[1] 12 PA09 SERCOM2 PAD[1] - * I²C SCL I²C SCL + * I�C SCL I�C SCL * ----------------- ---------------------- ---------------------- * 13 N/C 13 PB09 SERCOM4 PAD[1] 13 PB13 SERCOM4 PAD[1] * USART RX USART RX @@ -143,10 +143,10 @@ * ****************************************************************************/ -FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) +struct lcd_dev_s *board_graphics_setup(unsigned int devno) { - FAR struct spi_dev_s *spi; - FAR struct lcd_dev_s *dev; + struct spi_dev_s *spi; + struct lcd_dev_s *dev; /* Configure the OLED PORTs. This initial configuration is RESET low, * putting the OLED into reset state. diff --git a/boards/arm/samd2l2/samd21-xplained/src/sam_buttons.c b/boards/arm/samd2l2/samd21-xplained/src/sam_buttons.c index 32b5a2f1e7..594efa5b11 100644 --- a/boards/arm/samd2l2/samd21-xplained/src/sam_buttons.c +++ b/boards/arm/samd2l2/samd21-xplained/src/sam_buttons.c @@ -96,7 +96,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #if defined(CONFIG_PORTA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/samd2l2/samd21-xplained/src/sam_mmcsd.c b/boards/arm/samd2l2/samd21-xplained/src/sam_mmcsd.c index 45d772c254..55a5a431fa 100644 --- a/boards/arm/samd2l2/samd21-xplained/src/sam_mmcsd.c +++ b/boards/arm/samd2l2/samd21-xplained/src/sam_mmcsd.c @@ -77,7 +77,7 @@ int sam_sdinitialize(int port, int minor) { - FAR struct spi_dev_s *spi; + struct spi_dev_s *spi; int ret; /* Get the SPI driver instance for the SD chip select */ diff --git a/boards/arm/samd2l2/samd21-xplained/src/sam_spi.c b/boards/arm/samd2l2/samd21-xplained/src/sam_spi.c index 922a25d335..b3e03b985a 100644 --- a/boards/arm/samd2l2/samd21-xplained/src/sam_spi.c +++ b/boards/arm/samd2l2/samd21-xplained/src/sam_spi.c @@ -134,7 +134,7 @@ void weak_function sam_spidev_initialize(void) ****************************************************************************/ #ifdef SAMD2L2_HAVE_SPI0 -void sam_spi0select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi0select(struct spi_dev_s *dev, uint32_t devid, bool selected) { #ifdef CONFIG_SAMD21_XPLAINED_IOMODULE_EXT1 @@ -162,7 +162,7 @@ void sam_spi0select(FAR struct spi_dev_s *dev, uint32_t devid, #endif #ifdef SAMD2L2_HAVE_SPI1 -void sam_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { #ifdef CONFIG_SAMD21_XPLAINED_IOMODULE_EXT2 @@ -190,28 +190,28 @@ void sam_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, #endif #ifdef SAMD2L2_HAVE_SPI2 -void sam_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { } #endif #ifdef SAMD2L2_HAVE_SPI3 -void sam_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi3select(struct spi_dev_s *dev, uint32_t devid, bool selected) { } #endif #ifdef SAMD2L2_HAVE_SPI4 -void sam_spi4select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi4select(struct spi_dev_s *dev, uint32_t devid, bool selected) { } #endif #ifdef SAMD2L2_HAVE_SPI5 -void sam_spi5select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi5select(struct spi_dev_s *dev, uint32_t devid, bool selected) { } @@ -233,7 +233,7 @@ void sam_spi5select(FAR struct spi_dev_s *dev, uint32_t devid, ****************************************************************************/ #ifdef SAMD2L2_HAVE_SPI0 -uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi0status(struct spi_dev_s *dev, uint32_t devid) { uint8_t ret = 0; @@ -256,7 +256,7 @@ uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) #endif #ifdef SAMD2L2_HAVE_SPI1 -uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi1status(struct spi_dev_s *dev, uint32_t devid) { uint8_t ret = 0; @@ -279,28 +279,28 @@ uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) #endif #ifdef SAMD2L2_HAVE_SPI2 -uint8_t sam_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef SAMD2L2_HAVE_SPI3 -uint8_t sam_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi3status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef SAMD2L2_HAVE_SPI4 -uint8_t sam_spi4status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi4status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef SAMD2L2_HAVE_SPI5 -uint8_t sam_spi5status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi5status(struct spi_dev_s *dev, uint32_t devid) { uint8_t ret = 0; return ret; @@ -333,7 +333,7 @@ uint8_t sam_spi5status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef SAMD2L2_HAVE_SPI0 -int sam_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi0cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { #ifdef CONFIG_SAMD21_XPLAINED_OLED1MODULE_EXT1 if (devid == SPIDEV_DISPLAY(0)) @@ -354,7 +354,7 @@ int sam_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) #endif #ifdef SAMD2L2_HAVE_SPI1 -int sam_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { #ifdef CONFIG_SAMD21_XPLAINED_OLED1MODULE_EXT2 if (devid == SPIDEV_DISPLAY(0)) @@ -375,28 +375,28 @@ int sam_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) #endif #ifdef SAMD2L2_HAVE_SPI2 -int sam_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef SAMD2L2_HAVE_SPI3 -int sam_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef SAMD2L2_HAVE_SPI4 -int sam_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi4cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef SAMD2L2_HAVE_SPI5 -int sam_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi5cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } diff --git a/boards/arm/samd2l2/samd21-xplained/src/sam_ug2832hsweg04.c b/boards/arm/samd2l2/samd21-xplained/src/sam_ug2832hsweg04.c index 13b6f20c52..ff6875a65f 100644 --- a/boards/arm/samd2l2/samd21-xplained/src/sam_ug2832hsweg04.c +++ b/boards/arm/samd2l2/samd21-xplained/src/sam_ug2832hsweg04.c @@ -45,10 +45,10 @@ * 10 DISPLAY_RESET 10 PB05 PORT 10 PB15 PORT * ----------------- ---------------------- ---------------------- * 11 N/C 11 PA08 SERCOM2 PAD[0] 11 PA08 SERCOM2 PAD[0] - * I²C SDA I²C SDA + * I�C SDA I�C SDA * ----------------- ---------------------- ---------------------- * 12 N/C 12 PA09 SERCOM2 PAD[1] 12 PA09 SERCOM2 PAD[1] - * I²C SCL I²C SCL + * I�C SCL I�C SCL * ----------------- ---------------------- ---------------------- * 13 N/C 13 PB09 SERCOM4 PAD[1] 13 PB11 SERCOM4 PAD[1] * USART RX USART RX @@ -143,10 +143,10 @@ * ****************************************************************************/ -FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) +struct lcd_dev_s *board_graphics_setup(unsigned int devno) { - FAR struct spi_dev_s *spi; - FAR struct lcd_dev_s *dev; + struct spi_dev_s *spi; + struct lcd_dev_s *dev; /* Configure the OLED PORTs. This initial configuration is RESET low, * putting the OLED into reset state. diff --git a/boards/arm/samd2l2/saml21-xplained/src/sam_buttons.c b/boards/arm/samd2l2/saml21-xplained/src/sam_buttons.c index ca4d90df84..2b7a8afc77 100644 --- a/boards/arm/samd2l2/saml21-xplained/src/sam_buttons.c +++ b/boards/arm/samd2l2/saml21-xplained/src/sam_buttons.c @@ -95,7 +95,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #if defined(CONFIG_PORTA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/samd2l2/saml21-xplained/src/sam_mmcsd.c b/boards/arm/samd2l2/saml21-xplained/src/sam_mmcsd.c index 2804d502a0..6bf1477eb5 100644 --- a/boards/arm/samd2l2/saml21-xplained/src/sam_mmcsd.c +++ b/boards/arm/samd2l2/saml21-xplained/src/sam_mmcsd.c @@ -77,7 +77,7 @@ int sam_sdinitialize(int port, int minor) { - FAR struct spi_dev_s *spi; + struct spi_dev_s *spi; int ret; /* Get the SPI driver instance for the SD chip select */ diff --git a/boards/arm/samd2l2/saml21-xplained/src/sam_spi.c b/boards/arm/samd2l2/saml21-xplained/src/sam_spi.c index 1b6b2ebc8d..e48f660a29 100644 --- a/boards/arm/samd2l2/saml21-xplained/src/sam_spi.c +++ b/boards/arm/samd2l2/saml21-xplained/src/sam_spi.c @@ -134,7 +134,7 @@ void weak_function sam_spidev_initialize(void) ****************************************************************************/ #ifdef SAMD2L2_HAVE_SPI0 -void sam_spi0select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi0select(struct spi_dev_s *dev, uint32_t devid, bool selected) { #ifdef CONFIG_SAML21_XPLAINED_IOMODULE_EXT1 @@ -162,7 +162,7 @@ void sam_spi0select(FAR struct spi_dev_s *dev, uint32_t devid, #endif #ifdef SAMD2L2_HAVE_SPI1 -void sam_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { #ifdef CONFIG_SAML21_XPLAINED_IOMODULE_EXT2 @@ -190,28 +190,28 @@ void sam_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, #endif #ifdef SAMD2L2_HAVE_SPI2 -void sam_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { } #endif #ifdef SAMD2L2_HAVE_SPI3 -void sam_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi3select(struct spi_dev_s *dev, uint32_t devid, bool selected) { } #endif #ifdef SAMD2L2_HAVE_SPI4 -void sam_spi4select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi4select(struct spi_dev_s *dev, uint32_t devid, bool selected) { } #endif #ifdef SAMD2L2_HAVE_SPI5 -void sam_spi5select(FAR struct spi_dev_s *dev, uint32_t devid, +void sam_spi5select(struct spi_dev_s *dev, uint32_t devid, bool selected) { } @@ -233,7 +233,7 @@ void sam_spi5select(FAR struct spi_dev_s *dev, uint32_t devid, ****************************************************************************/ #ifdef SAMD2L2_HAVE_SPI0 -uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi0status(struct spi_dev_s *dev, uint32_t devid) { uint8_t ret = 0; @@ -256,7 +256,7 @@ uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) #endif #ifdef SAMD2L2_HAVE_SPI1 -uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi1status(struct spi_dev_s *dev, uint32_t devid) { uint8_t ret = 0; @@ -279,28 +279,28 @@ uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) #endif #ifdef SAMD2L2_HAVE_SPI2 -uint8_t sam_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef SAMD2L2_HAVE_SPI3 -uint8_t sam_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi3status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef SAMD2L2_HAVE_SPI4 -uint8_t sam_spi4status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi4status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef SAMD2L2_HAVE_SPI5 -uint8_t sam_spi5status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi5status(struct spi_dev_s *dev, uint32_t devid) { uint8_t ret = 0; return ret; @@ -333,7 +333,7 @@ uint8_t sam_spi5status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef SAMD2L2_HAVE_SPI0 -int sam_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi0cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { #ifdef CONFIG_SAML21_XPLAINED_OLED1MODULE_EXT1 if (devid == SPIDEV_DISPLAY(0)) @@ -354,7 +354,7 @@ int sam_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) #endif #ifdef SAMD2L2_HAVE_SPI1 -int sam_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { #ifdef CONFIG_SAML21_XPLAINED_OLED1MODULE_EXT2 if (devid == SPIDEV_DISPLAY(0)) @@ -375,28 +375,28 @@ int sam_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) #endif #ifdef SAMD2L2_HAVE_SPI2 -int sam_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef SAMD2L2_HAVE_SPI3 -int sam_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef SAMD2L2_HAVE_SPI4 -int sam_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi4cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef SAMD2L2_HAVE_SPI5 -int sam_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi5cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } diff --git a/boards/arm/samd2l2/saml21-xplained/src/sam_ug2832hsweg04.c b/boards/arm/samd2l2/saml21-xplained/src/sam_ug2832hsweg04.c index 481d59370b..3c9f37563f 100644 --- a/boards/arm/samd2l2/saml21-xplained/src/sam_ug2832hsweg04.c +++ b/boards/arm/samd2l2/saml21-xplained/src/sam_ug2832hsweg04.c @@ -45,10 +45,10 @@ * 10 DISPLAY_RESET 10 PB05 PORT 10 PB15 PORT * ----------------- ---------------------- ---------------------- * 11 N/C 11 PA08 SERCOM2 PAD[0] 11 PA08 SERCOM2 PAD[0] - * I²C SDA I²C SDA + * I�C SDA I�C SDA * ----------------- ---------------------- ---------------------- * 12 N/C 12 PA09 SERCOM2 PAD[1] 12 PA09 SERCOM2 PAD[1] - * I²C SCL I²C SCL + * I�C SCL I�C SCL * ----------------- ---------------------- ---------------------- * 13 N/C 13 PB09 SERCOM4 PAD[1] 13 PB13 SERCOM4 PAD[1] * USART RX USART RX @@ -143,10 +143,10 @@ * ****************************************************************************/ -FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) +struct lcd_dev_s *board_graphics_setup(unsigned int devno) { - FAR struct spi_dev_s *spi; - FAR struct lcd_dev_s *dev; + struct spi_dev_s *spi; + struct lcd_dev_s *dev; /* Configure the OLED PORTs. This initial configuration is RESET low, * putting the OLED into reset state. diff --git a/boards/arm/samd5e5/metro-m4/src/metro-m4.h b/boards/arm/samd5e5/metro-m4/src/metro-m4.h index 8aef6db2a4..23081daa42 100644 --- a/boards/arm/samd5e5/metro-m4/src/metro-m4.h +++ b/boards/arm/samd5e5/metro-m4/src/metro-m4.h @@ -143,7 +143,7 @@ void sam_automount_event(bool inserted); #endif #ifdef CONFIG_SAMD5E5_SERCOM5_ISI2C -FAR struct i2c_master_s *g_i2c5_dev; +struct i2c_master_s *g_i2c5_dev; int metro_m4_i2cdev_initialize(void); #endif @@ -152,7 +152,7 @@ int sam_smartfs_initialize(void); #endif #ifdef CONFIG_BQ27426 -int sam_bq27426_initialize(FAR const char *devname); +int sam_bq27426_initialize(const char *devname); #endif #ifdef CONFIG_DEV_GPIO diff --git a/boards/arm/samd5e5/metro-m4/src/sam_at24.c b/boards/arm/samd5e5/metro-m4/src/sam_at24.c index 278fc00471..38da046f44 100644 --- a/boards/arm/samd5e5/metro-m4/src/sam_at24.c +++ b/boards/arm/samd5e5/metro-m4/src/sam_at24.c @@ -54,11 +54,11 @@ * ****************************************************************************/ -extern FAR struct i2c_master_s *g_i2c5_dev; +extern struct i2c_master_s *g_i2c5_dev; int sam_at24_automount(int minor) { - FAR struct mtd_dev_s *mtd; + struct mtd_dev_s *mtd; static bool initialized = false; int ret; diff --git a/boards/arm/samd5e5/metro-m4/src/sam_automount.c b/boards/arm/samd5e5/metro-m4/src/sam_automount.c index 7b8b77446d..ff81bdf579 100644 --- a/boards/arm/samd5e5/metro-m4/src/sam_automount.c +++ b/boards/arm/samd5e5/metro-m4/src/sam_automount.c @@ -44,7 +44,7 @@ ****************************************************************************/ #ifndef NULL -# define NULL (FAR void *)0 +# define NULL (void *)0 #endif #ifndef OK @@ -59,10 +59,10 @@ struct sam_automount_state_s { - volatile automount_handler_t handler; /* Upper half handler */ - FAR void *arg; /* Handler argument */ - bool enable; /* Fake interrupt enable */ - bool pending; /* Set if there an event while disabled */ + volatile automount_handler_t handler; /* Upper half handler */ + void *arg; /* Handler argument */ + bool enable; /* Fake interrupt enable */ + bool pending; /* Set if there an event while disabled */ bool inserted; }; @@ -74,19 +74,19 @@ struct sam_automount_config_s * struct automount_lower_s to struct sam_automount_config_s */ - struct automount_lower_s lower; /* Publicly visible part */ - FAR struct sam_automount_state_s *state; /* Changeable state */ + struct automount_lower_s lower; /* Publicly visible part */ + struct sam_automount_state_s *state; /* Changeable state */ }; /**************************************************************************** * Private Function Prototypes ****************************************************************************/ -static int sam_attach(FAR const struct automount_lower_s *lower, - automount_handler_t isr, FAR void *arg); -static void sam_enable(FAR const struct automount_lower_s *lower, +static int sam_attach(const struct automount_lower_s *lower, + automount_handler_t isr, void *arg); +static void sam_enable(const struct automount_lower_s *lower, bool enable); -static bool sam_inserted(FAR const struct automount_lower_s *lower); +static bool sam_inserted(const struct automount_lower_s *lower); /**************************************************************************** * Private Data @@ -131,17 +131,17 @@ static const struct sam_automount_config_s g_port0config = * ****************************************************************************/ -static int sam_attach(FAR const struct automount_lower_s *lower, - automount_handler_t isr, FAR void *arg) +static int sam_attach(const struct automount_lower_s *lower, + automount_handler_t isr, void *arg) { - FAR const struct sam_automount_config_s *config; - FAR struct sam_automount_state_s *state; + const struct sam_automount_config_s *config; + struct sam_automount_state_s *state; finfo("Entry\n"); /* Recover references to our structure */ - config = (FAR struct sam_automount_config_s *)lower; + config = (struct sam_automount_config_s *)lower; DEBUGASSERT(config && config->state); state = config->state; @@ -172,18 +172,18 @@ static int sam_attach(FAR const struct automount_lower_s *lower, * ****************************************************************************/ -static void sam_enable(FAR const struct automount_lower_s *lower, +static void sam_enable(const struct automount_lower_s *lower, bool enable) { - FAR const struct sam_automount_config_s *config; - FAR struct sam_automount_state_s *state; + const struct sam_automount_config_s *config; + struct sam_automount_state_s *state; irqstate_t flags; finfo("Entry\n"); /* Recover references to our structure */ - config = (FAR struct sam_automount_config_s *)lower; + config = (struct sam_automount_config_s *)lower; DEBUGASSERT(config && config->state); state = config->state; @@ -224,11 +224,11 @@ static void sam_enable(FAR const struct automount_lower_s *lower, * ****************************************************************************/ -static bool sam_inserted(FAR const struct automount_lower_s *lower) +static bool sam_inserted(const struct automount_lower_s *lower) { - FAR const struct sam_automount_config_s *config; + const struct sam_automount_config_s *config; - config = (FAR struct sam_automount_config_s *)lower; + config = (struct sam_automount_config_s *)lower; DEBUGASSERT(config && config->state); finfo("inserted:%d\n", config->state->inserted); return config->state->inserted; @@ -254,7 +254,7 @@ static bool sam_inserted(FAR const struct automount_lower_s *lower) void sam_automount_initialize(void) { - FAR void *handle; + void *handle; finfo("Initializing automounter(s)\n"); @@ -290,8 +290,8 @@ void sam_automount_initialize(void) void sam_automount_event(bool inserted) { - FAR const struct sam_automount_config_s *config; - FAR struct sam_automount_state_s *state; + const struct sam_automount_config_s *config; + struct sam_automount_state_s *state; #ifdef CONFIG_METRO_M4_USB_AUTOMOUNT config = &g_port0config; diff --git a/boards/arm/samd5e5/metro-m4/src/sam_bq27426.c b/boards/arm/samd5e5/metro-m4/src/sam_bq27426.c index 19a2e54c2d..923b4ed09e 100644 --- a/boards/arm/samd5e5/metro-m4/src/sam_bq27426.c +++ b/boards/arm/samd5e5/metro-m4/src/sam_bq27426.c @@ -61,11 +61,11 @@ * ****************************************************************************/ -int sam_bq27426_initialize(FAR const char *devname) +int sam_bq27426_initialize(const char *devname) { - FAR struct battery_gauge_dev_s *bq27426_m4; + struct battery_gauge_dev_s *bq27426_m4; - bq27426_m4 = (FAR struct battery_gauge_dev_s *)bq27426_initialize( + bq27426_m4 = (struct battery_gauge_dev_s *)bq27426_initialize( g_i2c5_dev, BQ27426_I2C_ADDRESS, 100000); diff --git a/boards/arm/samd5e5/metro-m4/src/sam_composite.c b/boards/arm/samd5e5/metro-m4/src/sam_composite.c index 88a901bea6..b576aaeebb 100644 --- a/boards/arm/samd5e5/metro-m4/src/sam_composite.c +++ b/boards/arm/samd5e5/metro-m4/src/sam_composite.c @@ -42,7 +42,7 @@ ****************************************************************************/ #ifdef CONFIG_USBMSC_COMPOSITE -static FAR void *g_mschandle; +static void *g_mschandle; #endif /**************************************************************************** @@ -74,8 +74,8 @@ static FAR void *g_mschandle; #ifdef CONFIG_USBMSC_COMPOSITE static int board_mscclassobject(int minor, - FAR struct usbdev_devinfo_s *devinfo, - FAR struct usbdevclass_driver_s **classdev) + struct usbdev_devinfo_s *devinfo, + struct usbdevclass_driver_s **classdev) { int ret; @@ -138,7 +138,7 @@ static int board_mscclassobject(int minor, ****************************************************************************/ #ifdef CONFIG_USBMSC_COMPOSITE -static void board_mscuninitialize(FAR struct usbdevclass_driver_s *classdev) +static void board_mscuninitialize(struct usbdevclass_driver_s *classdev) { DEBUGASSERT(g_mschandle != NULL); usbmsc_uninitialize(g_mschandle); @@ -181,7 +181,7 @@ int board_composite_initialize(int port) * ****************************************************************************/ -FAR void *board_composite_connect(int port, int configid) +void *board_composite_connect(int port, int configid) { /* Here we are composing the configuration of the usb composite device. * diff --git a/boards/arm/samd5e5/metro-m4/src/sam_gpio.c b/boards/arm/samd5e5/metro-m4/src/sam_gpio.c index 1506bc9b05..6edf4c6cca 100644 --- a/boards/arm/samd5e5/metro-m4/src/sam_gpio.c +++ b/boards/arm/samd5e5/metro-m4/src/sam_gpio.c @@ -68,15 +68,15 @@ irqstate_t flags; ****************************************************************************/ #if BOARD_NGPIOIN > 0 -static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value); +static int gpin_read(struct gpio_dev_s *dev, bool *value); #endif -static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value); -static int gpout_write(FAR struct gpio_dev_s *dev, bool value); +static int gpout_read(struct gpio_dev_s *dev, bool *value); +static int gpout_write(struct gpio_dev_s *dev, bool value); -static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value); -static int gpint_attach(FAR struct gpio_dev_s *dev, +static int gpint_read(struct gpio_dev_s *dev, bool *value); +static int gpint_attach(struct gpio_dev_s *dev, pin_interrupt_t callback); -static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable); +static int gpint_enable(struct gpio_dev_s *dev, bool enable); /**************************************************************************** * Private Data @@ -152,7 +152,7 @@ static struct samgpint_dev_s g_gpint[BOARD_NGPIOINT]; static int samgpio_interrupt(int irq, void *context, void *arg) { - FAR struct samgpint_dev_s *samgpint = (FAR struct samgpint_dev_s *)arg; + struct samgpint_dev_s *samgpint = (struct samgpint_dev_s *)arg; DEBUGASSERT(samgpint != NULL && samgpint->callback != NULL); gpioinfo("Interrupt! callback=%p\n", samgpint->callback); @@ -162,9 +162,9 @@ static int samgpio_interrupt(int irq, void *context, void *arg) } #if BOARD_NGPIOIN > 0 -static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpin_read(struct gpio_dev_s *dev, bool *value) { - FAR struct samgpio_dev_s *samgpio = (FAR struct samgpio_dev_s *)dev; + struct samgpio_dev_s *samgpio = (struct samgpio_dev_s *)dev; DEBUGASSERT(samgpio != NULL && value != NULL); DEBUGASSERT(samgpio->id < BOARD_NGPIOIN); @@ -175,9 +175,9 @@ static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value) } #endif -static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpout_read(struct gpio_dev_s *dev, bool *value) { - FAR struct samgpio_dev_s *samgpio = (FAR struct samgpio_dev_s *)dev; + struct samgpio_dev_s *samgpio = (struct samgpio_dev_s *)dev; DEBUGASSERT(samgpio != NULL && value != NULL); DEBUGASSERT(samgpio->id < BOARD_NGPIOOUT); @@ -187,9 +187,9 @@ static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value) return OK; } -static int gpout_write(FAR struct gpio_dev_s *dev, bool value) +static int gpout_write(struct gpio_dev_s *dev, bool value) { - FAR struct samgpio_dev_s *samgpio = (FAR struct samgpio_dev_s *)dev; + struct samgpio_dev_s *samgpio = (struct samgpio_dev_s *)dev; DEBUGASSERT(samgpio != NULL); DEBUGASSERT(samgpio->id < BOARD_NGPIOOUT); @@ -199,9 +199,9 @@ static int gpout_write(FAR struct gpio_dev_s *dev, bool value) return OK; } -static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpint_read(struct gpio_dev_s *dev, bool *value) { - FAR struct samgpint_dev_s *samgpint = (FAR struct samgpint_dev_s *)dev; + struct samgpint_dev_s *samgpint = (struct samgpint_dev_s *)dev; DEBUGASSERT(samgpint != NULL && value != NULL); DEBUGASSERT(samgpint->samgpio.id < BOARD_NGPIOINT); @@ -211,10 +211,10 @@ static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value) return OK; } -static int gpint_attach(FAR struct gpio_dev_s *dev, +static int gpint_attach(struct gpio_dev_s *dev, pin_interrupt_t callback) { - FAR struct samgpint_dev_s *samgpint = (FAR struct samgpint_dev_s *)dev; + struct samgpint_dev_s *samgpint = (struct samgpint_dev_s *)dev; gpioinfo("Attaching the callback\n"); @@ -240,9 +240,9 @@ static int gpint_attach(FAR struct gpio_dev_s *dev, return OK; } -static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable) +static int gpint_enable(struct gpio_dev_s *dev, bool enable) { - FAR struct samgpint_dev_s *samgpint = (FAR struct samgpint_dev_s *)dev; + struct samgpint_dev_s *samgpint = (struct samgpint_dev_s *)dev; flags = enter_critical_section(); if (enable) { diff --git a/boards/arm/samd5e5/metro-m4/src/sam_smartfs.c b/boards/arm/samd5e5/metro-m4/src/sam_smartfs.c index 2bd90c8418..c3fd8e3e62 100644 --- a/boards/arm/samd5e5/metro-m4/src/sam_smartfs.c +++ b/boards/arm/samd5e5/metro-m4/src/sam_smartfs.c @@ -53,8 +53,8 @@ #ifdef CONFIG_FS_SMARTFS int ret; - FAR struct mtd_dev_s *mtd; - FAR struct mtd_geometry_s geo; + struct mtd_dev_s *mtd; + struct mtd_geometry_s geo; #endif #if defined(CONFIG_MTD_PARTITION_NAMES) @@ -100,7 +100,7 @@ int sam_smartfs_initialize(void) int erasesize; const char *partstring = "256"; const char *ptr; - FAR struct mtd_dev_s *mtd_part; + struct mtd_dev_s *mtd_part; char partref[16]; /* Now create a partition on the FLASH device */ diff --git a/boards/arm/samd5e5/metro-m4/src/sam_usbdev.c b/boards/arm/samd5e5/metro-m4/src/sam_usbdev.c index 8f54ebaf87..e0495cedb4 100644 --- a/boards/arm/samd5e5/metro-m4/src/sam_usbdev.c +++ b/boards/arm/samd5e5/metro-m4/src/sam_usbdev.c @@ -65,7 +65,7 @@ void sam_usbinitialize(void) * ****************************************************************************/ -int sam_usbpullup(FAR struct usbdev_s *dev, bool enable) +int sam_usbpullup(struct usbdev_s *dev, bool enable) { usbtrace(TRACE_DEVPULLUP, (uint16_t)enable); return OK; @@ -82,7 +82,7 @@ int sam_usbpullup(FAR struct usbdev_s *dev, bool enable) * ****************************************************************************/ -void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume) +void sam_usbsuspend(struct usbdev_s *dev, bool resume) { uinfo("resume: %d\n", resume); } diff --git a/boards/arm/samd5e5/metro-m4/src/sam_usbhost.c b/boards/arm/samd5e5/metro-m4/src/sam_usbhost.c index f9da729c08..796249b841 100644 --- a/boards/arm/samd5e5/metro-m4/src/sam_usbhost.c +++ b/boards/arm/samd5e5/metro-m4/src/sam_usbhost.c @@ -220,7 +220,7 @@ int samd_usbhost_initialize(void) uinfo("Start usbhost_waiter\n"); ret = kthread_create("usbhost", CONFIG_METRO_M4_USBHOST_PRIO, CONFIG_METRO_M4_USBHOST_STACKSIZE, - (main_t)usbhost_waiter, (FAR char *const *)NULL); + (main_t)usbhost_waiter, (char *const *)NULL); return ret < 0 ? -ENOEXEC : OK; } diff --git a/boards/arm/samv7/common/src/sam_automount.c b/boards/arm/samv7/common/src/sam_automount.c index 41199e1c67..bcd7115446 100644 --- a/boards/arm/samv7/common/src/sam_automount.c +++ b/boards/arm/samv7/common/src/sam_automount.c @@ -50,10 +50,10 @@ struct sam_automount_state_s { - volatile automount_handler_t handler; /* Upper half handler */ - FAR void *arg; /* Handler argument */ - bool enable; /* Fake interrupt enable */ - bool pending; /* Set if there an event while disabled */ + volatile automount_handler_t handler; /* Upper half handler */ + void *arg; /* Handler argument */ + bool enable; /* Fake interrupt enable */ + bool pending; /* Set if there an event while disabled */ }; /* This structure represents the static configuration of an automounter */ @@ -64,20 +64,20 @@ struct sam_automount_config_s * struct automount_lower_s to struct sam_automount_config_s */ - struct automount_lower_s lower; /* Publicly visible part */ - uint8_t hsmci; /* HSMCI0_SLOTNO or HSMCI1_SLOTNO */ - FAR struct sam_automount_state_s *state; /* Changeable state */ + struct automount_lower_s lower; /* Publicly visible part */ + uint8_t hsmci; /* HSMCI0_SLOTNO or HSMCI1_SLOTNO */ + struct sam_automount_state_s *state; /* Changeable state */ }; /**************************************************************************** * Private Function Prototypes ****************************************************************************/ -static int sam_attach(FAR const struct automount_lower_s *lower, - automount_handler_t isr, FAR void *arg); -static void sam_enable(FAR const struct automount_lower_s *lower, +static int sam_attach(const struct automount_lower_s *lower, + automount_handler_t isr, void *arg); +static void sam_enable(const struct automount_lower_s *lower, bool enable); -static bool sam_inserted(FAR const struct automount_lower_s *lower); +static bool sam_inserted(const struct automount_lower_s *lower); /**************************************************************************** * Private Data @@ -123,15 +123,15 @@ static const struct sam_automount_config_s g_hsmci0config = * ****************************************************************************/ -static int sam_attach(FAR const struct automount_lower_s *lower, - automount_handler_t isr, FAR void *arg) +static int sam_attach(const struct automount_lower_s *lower, + automount_handler_t isr, void *arg) { - FAR const struct sam_automount_config_s *config; - FAR struct sam_automount_state_s *state; + const struct sam_automount_config_s *config; + struct sam_automount_state_s *state; /* Recover references to our structure */ - config = (FAR struct sam_automount_config_s *)lower; + config = (struct sam_automount_config_s *)lower; DEBUGASSERT(config && config->state); state = config->state; @@ -162,16 +162,16 @@ static int sam_attach(FAR const struct automount_lower_s *lower, * ****************************************************************************/ -static void sam_enable(FAR const struct automount_lower_s *lower, +static void sam_enable(const struct automount_lower_s *lower, bool enable) { - FAR const struct sam_automount_config_s *config; - FAR struct sam_automount_state_s *state; + const struct sam_automount_config_s *config; + struct sam_automount_state_s *state; irqstate_t flags; /* Recover references to our structure */ - config = (FAR struct sam_automount_config_s *)lower; + config = (struct sam_automount_config_s *)lower; DEBUGASSERT(config && config->state); state = config->state; @@ -213,11 +213,11 @@ static void sam_enable(FAR const struct automount_lower_s *lower, * ****************************************************************************/ -static bool sam_inserted(FAR const struct automount_lower_s *lower) +static bool sam_inserted(const struct automount_lower_s *lower) { - FAR const struct sam_automount_config_s *config; + const struct sam_automount_config_s *config; - config = (FAR struct sam_automount_config_s *)lower; + config = (struct sam_automount_config_s *)lower; DEBUGASSERT(config && config->state); return sam_cardinserted(config->hsmci); @@ -243,7 +243,7 @@ static bool sam_inserted(FAR const struct automount_lower_s *lower) void sam_automount_initialize(void) { - FAR void *handle; + void *handle; finfo("Initializing automounter(s)\n"); @@ -286,8 +286,8 @@ void sam_automount_initialize(void) void sam_automount_event(int slotno, bool inserted) { - FAR const struct sam_automount_config_s *config; - FAR struct sam_automount_state_s *state; + const struct sam_automount_config_s *config; + struct sam_automount_state_s *state; #ifdef CONFIG_SAMV7_HSMCI0_AUTOMOUNT /* Is this a change in the HSMCI0 insertion state? */ diff --git a/boards/arm/samv7/common/src/sam_boot_image.c b/boards/arm/samv7/common/src/sam_boot_image.c index f499739597..15678ce531 100644 --- a/boards/arm/samv7/common/src/sam_boot_image.c +++ b/boards/arm/samv7/common/src/sam_boot_image.c @@ -136,7 +136,7 @@ static void systick_disable(void) * ****************************************************************************/ -int board_boot_image(FAR const char *path, uint32_t hdr_size) +int board_boot_image(const char *path, uint32_t hdr_size) { static struct arm_vector_table vt; int fd; diff --git a/boards/arm/samv7/common/src/sam_hsmci.c b/boards/arm/samv7/common/src/sam_hsmci.c index 4a70abaec5..e0a2bd8e09 100644 --- a/boards/arm/samv7/common/src/sam_hsmci.c +++ b/boards/arm/samv7/common/src/sam_hsmci.c @@ -124,8 +124,8 @@ static int sam_hsmci_cardetect(struct sam_hsmci_state_s *state) return OK; } -static int sam_hsmci_cardetect_handler(int irq, FAR void *context, - FAR void *arg) +static int sam_hsmci_cardetect_handler(int irq, void *context, + void *arg) { struct sam_hsmci_state_s *state = (struct sam_hsmci_state_s *)arg; int ret; @@ -226,7 +226,7 @@ int sam_hsmci_initialize(int slotno, int minor, gpio_pinset_t cdcfg, /* Configure card detect interrupts */ sam_gpioirq(state->cdcfg); - irq_attach(state->cdirq, sam_hsmci_cardetect_handler, (FAR void *)state); + irq_attach(state->cdirq, sam_hsmci_cardetect_handler, (void *)state); /* Then inform the HSMCI driver if there is or is not a card in the slot. */ diff --git a/boards/arm/samv7/common/src/sam_progmem.c b/boards/arm/samv7/common/src/sam_progmem.c index cf387728a1..c8bdaad960 100644 --- a/boards/arm/samv7/common/src/sam_progmem.c +++ b/boards/arm/samv7/common/src/sam_progmem.c @@ -61,8 +61,8 @@ * ****************************************************************************/ -static int sam_progmem_register_driver(int minor, FAR struct mtd_dev_s *mtd, - FAR const char *devpath) +static int sam_progmem_register_driver(int minor, struct mtd_dev_s *mtd, + const char *devpath) { #ifdef CONFIG_BCH char blockdev[18]; @@ -118,7 +118,7 @@ static int sam_progmem_register_driver(int minor, FAR struct mtd_dev_s *mtd, * ****************************************************************************/ -static struct mtd_dev_s *sam_progmem_alloc_mtdpart(FAR struct mtd_dev_s *mtd, +static struct mtd_dev_s *sam_progmem_alloc_mtdpart(struct mtd_dev_s *mtd, size_t mtd_offset, size_t mtd_size) { @@ -168,7 +168,7 @@ static struct mtd_dev_s *sam_progmem_alloc_mtdpart(FAR struct mtd_dev_s *mtd, int board_progmem_init(int minor, struct mtd_partition_s *table, size_t count) { - FAR struct mtd_dev_s *progmem_mtd; + struct mtd_dev_s *progmem_mtd; size_t i; int ret = OK; diff --git a/boards/arm/samv7/same70-qmtech/src/sam_buttons.c b/boards/arm/samv7/same70-qmtech/src/sam_buttons.c index c9eebeb0d6..758c893083 100644 --- a/boards/arm/samv7/same70-qmtech/src/sam_buttons.c +++ b/boards/arm/samv7/same70-qmtech/src/sam_buttons.c @@ -156,7 +156,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { #ifdef HAVE_IRQBUTTONS if (id == BUTTON_SW0) diff --git a/boards/arm/samv7/same70-qmtech/src/sam_gpio.c b/boards/arm/samv7/same70-qmtech/src/sam_gpio.c index 6eaf9a3775..476c5a68a6 100644 --- a/boards/arm/samv7/same70-qmtech/src/sam_gpio.c +++ b/boards/arm/samv7/same70-qmtech/src/sam_gpio.c @@ -58,17 +58,17 @@ struct samgpint_dev_s ****************************************************************************/ #if BOARD_NGPIOIN > 0 -static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value); +static int gpin_read(struct gpio_dev_s *dev, bool *value); #endif #if BOARD_NGPIOOUT > 0 -static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value); -static int gpout_write(FAR struct gpio_dev_s *dev, bool value); +static int gpout_read(struct gpio_dev_s *dev, bool *value); +static int gpout_write(struct gpio_dev_s *dev, bool value); #endif #if BOARD_NGPIOINT > 0 -static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value); -static int gpint_attach(FAR struct gpio_dev_s *dev, +static int gpint_read(struct gpio_dev_s *dev, bool *value); +static int gpint_attach(struct gpio_dev_s *dev, pin_interrupt_t callback); -static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable); +static int gpint_enable(struct gpio_dev_s *dev, bool enable); #endif /**************************************************************************** @@ -149,9 +149,9 @@ static struct samgpint_dev_s g_gpint[BOARD_NGPIOINT]; #if BOARD_NGPIOIN > 0 -static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpin_read(struct gpio_dev_s *dev, bool *value) { - FAR struct samgpio_dev_s *samgpio = (FAR struct samgpio_dev_s *)dev; + struct samgpio_dev_s *samgpio = (struct samgpio_dev_s *)dev; DEBUGASSERT(samgpio != NULL && value != NULL); DEBUGASSERT(samgpio->id < BOARD_NGPIOIN); @@ -165,9 +165,9 @@ static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value) #if BOARD_NGPIOOUT > 0 -static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpout_read(struct gpio_dev_s *dev, bool *value) { - FAR struct samgpio_dev_s *samgpio = (FAR struct samgpio_dev_s *)dev; + struct samgpio_dev_s *samgpio = (struct samgpio_dev_s *)dev; DEBUGASSERT(samgpio != NULL && value != NULL); DEBUGASSERT(samgpio->id < BOARD_NGPIOOUT); @@ -177,9 +177,9 @@ static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value) return OK; } -static int gpout_write(FAR struct gpio_dev_s *dev, bool value) +static int gpout_write(struct gpio_dev_s *dev, bool value) { - FAR struct samgpio_dev_s *samgpio = (FAR struct samgpio_dev_s *)dev; + struct samgpio_dev_s *samgpio = (struct samgpio_dev_s *)dev; DEBUGASSERT(samgpio != NULL); DEBUGASSERT(samgpio->id < BOARD_NGPIOOUT); @@ -195,7 +195,7 @@ static int gpout_write(FAR struct gpio_dev_s *dev, bool value) static int samgpio_interrupt(int irq, void *context, void *arg) { - FAR struct samgpint_dev_s *samgpint = (FAR struct samgpint_dev_s *)arg; + struct samgpint_dev_s *samgpint = (struct samgpint_dev_s *)arg; DEBUGASSERT(samgpint != NULL && samgpint->callback != NULL); gpioinfo("Interrupt callback=%p", samgpint->callback); @@ -204,9 +204,9 @@ static int samgpio_interrupt(int irq, void *context, void *arg) return OK; } -static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpint_read(struct gpio_dev_s *dev, bool *value) { - FAR struct samgpint_dev_s *samgpint = (FAR struct samgpint_dev_s *)dev; + struct samgpint_dev_s *samgpint = (struct samgpint_dev_s *)dev; DEBUGASSERT(samgpint != NULL && value != NULL); DEBUGASSERT(samgpint->samgpio.id < BOARD_NGPIOINT); @@ -216,10 +216,10 @@ static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value) return OK; } -static int gpint_attach(FAR struct gpio_dev_s *dev, +static int gpint_attach(struct gpio_dev_s *dev, pin_interrupt_t callback) { - FAR struct samgpint_dev_s *samgpint = (FAR struct samgpint_dev_s *)dev; + struct samgpint_dev_s *samgpint = (struct samgpint_dev_s *)dev; irqstate_t flags; gpioinfo("Attaching the callback"); @@ -239,9 +239,9 @@ static int gpint_attach(FAR struct gpio_dev_s *dev, return OK; } -static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable) +static int gpint_enable(struct gpio_dev_s *dev, bool enable) { - FAR struct samgpint_dev_s *samgpint = (FAR struct samgpint_dev_s *)dev; + struct samgpint_dev_s *samgpint = (struct samgpint_dev_s *)dev; irqstate_t flags; flags = enter_critical_section(); diff --git a/boards/arm/samv7/same70-qmtech/src/sam_spi.c b/boards/arm/samv7/same70-qmtech/src/sam_spi.c index b60016a982..270d804d86 100644 --- a/boards/arm/samv7/same70-qmtech/src/sam_spi.c +++ b/boards/arm/samv7/same70-qmtech/src/sam_spi.c @@ -161,14 +161,14 @@ void sam_spi1select(uint32_t devid, bool selected) ****************************************************************************/ #ifdef CONFIG_SAMV7_SPI0_MASTER -uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi0status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_SAMV7_SPI1_MASTER -uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } diff --git a/boards/arm/samv7/same70-xplained/src/sam_bringup.c b/boards/arm/samv7/same70-xplained/src/sam_bringup.c index 83dd694902..84911fcebf 100644 --- a/boards/arm/samv7/same70-xplained/src/sam_bringup.c +++ b/boards/arm/samv7/same70-xplained/src/sam_bringup.c @@ -117,7 +117,7 @@ static const size_t g_mtd_partition_table_size = #ifdef HAVE_I2CTOOL static void sam_i2c_register(int bus) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; i2c = sam_i2cbus_initialize(bus); diff --git a/boards/arm/samv7/same70-xplained/src/sam_buttons.c b/boards/arm/samv7/same70-xplained/src/sam_buttons.c index 5e65296d7f..e8c9234097 100644 --- a/boards/arm/samv7/same70-xplained/src/sam_buttons.c +++ b/boards/arm/samv7/same70-xplained/src/sam_buttons.c @@ -156,7 +156,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { #ifdef HAVE_IRQBUTTONS if (id == BUTTON_SW0) diff --git a/boards/arm/samv7/same70-xplained/src/sam_ethernet.c b/boards/arm/samv7/same70-xplained/src/sam_ethernet.c index 3d4886bfc6..912e209fc8 100644 --- a/boards/arm/samv7/same70-xplained/src/sam_ethernet.c +++ b/boards/arm/samv7/same70-xplained/src/sam_ethernet.c @@ -278,7 +278,7 @@ int sam_emac0_setmac(void) ****************************************************************************/ #ifdef CONFIG_SAMV7_GPIOA_IRQ -int arch_phy_irq(FAR const char *intf, xcpt_t handler, void *arg, +int arch_phy_irq(const char *intf, xcpt_t handler, void *arg, phy_enable_t *enable) { irqstate_t flags; diff --git a/boards/arm/samv7/same70-xplained/src/sam_mrf24j40.c b/boards/arm/samv7/same70-xplained/src/sam_mrf24j40.c index e7b0453cc3..d23ac971c6 100644 --- a/boards/arm/samv7/same70-xplained/src/sam_mrf24j40.c +++ b/boards/arm/samv7/same70-xplained/src/sam_mrf24j40.c @@ -76,11 +76,11 @@ struct sam_priv_s * irq_enable - Enable or disable the GPIO interrupt */ -static int sam_attach_irq(FAR const struct mrf24j40_lower_s *lower, - xcpt_t handler, FAR void *arg); -static void sam_enable_irq(FAR const struct mrf24j40_lower_s *lower, +static int sam_attach_irq(const struct mrf24j40_lower_s *lower, + xcpt_t handler, void *arg); +static void sam_enable_irq(const struct mrf24j40_lower_s *lower, bool state); -static int sam_mrf24j40_devsetup(FAR struct sam_priv_s *priv); +static int sam_mrf24j40_devsetup(struct sam_priv_s *priv); /**************************************************************************** * Private Data @@ -139,10 +139,10 @@ static struct sam_priv_s g_mrf24j40_mb2_priv = * irq_enable - Enable or disable the GPIO interrupt */ -static int sam_attach_irq(FAR const struct mrf24j40_lower_s *lower, - xcpt_t handler, FAR void *arg) +static int sam_attach_irq(const struct mrf24j40_lower_s *lower, + xcpt_t handler, void *arg) { - FAR struct sam_priv_s *priv = (FAR struct sam_priv_s *)lower; + struct sam_priv_s *priv = (struct sam_priv_s *)lower; int ret; DEBUGASSERT(priv != NULL); @@ -156,10 +156,10 @@ static int sam_attach_irq(FAR const struct mrf24j40_lower_s *lower, return ret; } -static void sam_enable_irq(FAR const struct mrf24j40_lower_s *lower, - bool state) +static void sam_enable_irq(const struct mrf24j40_lower_s *lower, + bool state) { - FAR struct sam_priv_s *priv = (FAR struct sam_priv_s *)lower; + struct sam_priv_s *priv = (struct sam_priv_s *)lower; static bool enabled; irqstate_t flags; @@ -206,11 +206,11 @@ static void sam_enable_irq(FAR const struct mrf24j40_lower_s *lower, * ****************************************************************************/ -static int sam_mrf24j40_devsetup(FAR struct sam_priv_s *priv) +static int sam_mrf24j40_devsetup(struct sam_priv_s *priv) { - FAR struct ieee802154_radio_s *radio; + struct ieee802154_radio_s *radio; MACHANDLE mac; - FAR struct spi_dev_s *spi; + struct spi_dev_s *spi; int ret; #ifdef BEE_RESET diff --git a/boards/arm/samv7/same70-xplained/src/sam_spi.c b/boards/arm/samv7/same70-xplained/src/sam_spi.c index 6561f5e29a..c79f52cda5 100644 --- a/boards/arm/samv7/same70-xplained/src/sam_spi.c +++ b/boards/arm/samv7/same70-xplained/src/sam_spi.c @@ -203,14 +203,14 @@ void sam_spi1select(uint32_t devid, bool selected) ****************************************************************************/ #ifdef CONFIG_SAMV7_SPI0_MASTER -uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi0status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_SAMV7_SPI1_MASTER -uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } diff --git a/boards/arm/samv7/same70-xplained/src/sam_usbdev.c b/boards/arm/samv7/same70-xplained/src/sam_usbdev.c index def4c63f37..dc271ebcc8 100644 --- a/boards/arm/samv7/same70-xplained/src/sam_usbdev.c +++ b/boards/arm/samv7/same70-xplained/src/sam_usbdev.c @@ -78,7 +78,7 @@ void sam_usbinitialize(void) * ****************************************************************************/ -void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume) +void sam_usbsuspend(struct usbdev_s *dev, bool resume) { uinfo("resume: %d\n", resume); } diff --git a/boards/arm/samv7/same70-xplained/src/sam_xbee.c b/boards/arm/samv7/same70-xplained/src/sam_xbee.c index 0c9aa217b8..a770e43300 100644 --- a/boards/arm/samv7/same70-xplained/src/sam_xbee.c +++ b/boards/arm/samv7/same70-xplained/src/sam_xbee.c @@ -77,13 +77,13 @@ struct sam_priv_s * irq_enable - Enable or disable the GPIO interrupt */ -static void sam_reset(FAR const struct xbee_lower_s *lower); -static int sam_attach_irq(FAR const struct xbee_lower_s *lower, - xcpt_t handler, FAR void *arg); -static void sam_enable_irq(FAR const struct xbee_lower_s *lower, +static void sam_reset(const struct xbee_lower_s *lower); +static int sam_attach_irq(const struct xbee_lower_s *lower, + xcpt_t handler, void *arg); +static void sam_enable_irq(const struct xbee_lower_s *lower, bool state); -static bool sam_poll_attn(FAR const struct xbee_lower_s *lower); -static int sam_xbee_devsetup(FAR struct sam_priv_s *priv); +static bool sam_poll_attn(const struct xbee_lower_s *lower); +static int sam_xbee_devsetup(struct sam_priv_s *priv); /**************************************************************************** * Private Data @@ -131,9 +131,9 @@ static struct sam_priv_s g_xbee_mb2_priv = * Private Functions ****************************************************************************/ -static void sam_reset(FAR const struct xbee_lower_s *lower) +static void sam_reset(const struct xbee_lower_s *lower) { - FAR struct sam_priv_s *priv = (FAR struct sam_priv_s *)lower; + struct sam_priv_s *priv = (struct sam_priv_s *)lower; DEBUGASSERT(priv != NULL); @@ -146,10 +146,10 @@ static void sam_reset(FAR const struct xbee_lower_s *lower) up_mdelay(100); } -static int sam_attach_irq(FAR const struct xbee_lower_s *lower, - xcpt_t handler, FAR void *arg) +static int sam_attach_irq(const struct xbee_lower_s *lower, + xcpt_t handler, void *arg) { - FAR struct sam_priv_s *priv = (FAR struct sam_priv_s *)lower; + struct sam_priv_s *priv = (struct sam_priv_s *)lower; int ret; DEBUGASSERT(priv != NULL); @@ -163,10 +163,10 @@ static int sam_attach_irq(FAR const struct xbee_lower_s *lower, return ret; } -static void sam_enable_irq(FAR const struct xbee_lower_s *lower, - bool state) +static void sam_enable_irq(const struct xbee_lower_s *lower, + bool state) { - FAR struct sam_priv_s *priv = (FAR struct sam_priv_s *)lower; + struct sam_priv_s *priv = (struct sam_priv_s *)lower; static bool enabled; irqstate_t flags; @@ -201,9 +201,9 @@ static void sam_enable_irq(FAR const struct xbee_lower_s *lower, leave_critical_section(flags); } -static bool sam_poll_attn(FAR const struct xbee_lower_s *lower) +static bool sam_poll_attn(const struct xbee_lower_s *lower) { - FAR struct sam_priv_s *priv = (FAR struct sam_priv_s *)lower; + struct sam_priv_s *priv = (struct sam_priv_s *)lower; return !sam_gpioread(priv->attncfg); } @@ -220,10 +220,10 @@ static bool sam_poll_attn(FAR const struct xbee_lower_s *lower) * ****************************************************************************/ -static int sam_xbee_devsetup(FAR struct sam_priv_s *priv) +static int sam_xbee_devsetup(struct sam_priv_s *priv) { - FAR struct xbee_mac_s *xbee; - FAR struct spi_dev_s *spi; + struct xbee_mac_s *xbee; + struct spi_dev_s *spi; int ret; sam_configgpio(priv->rstcfg); diff --git a/boards/arm/samv7/samv71-xult/README.txt b/boards/arm/samv7/samv71-xult/README.txt index 501be46d8b..8b002d871d 100644 --- a/boards/arm/samv7/samv71-xult/README.txt +++ b/boards/arm/samv7/samv71-xult/README.txt @@ -2561,7 +2561,7 @@ Configuration sub-directories while (sem_wait(&session->queuesem) < 0) ... - rect = (FAR struct vnc_fbupdate_s *)sq_remfirst(&session->updqueue); + rect = (struct vnc_fbupdate_s *)sq_remfirst(&session->updqueue); DEBUGASSERT(rect != NULL); I would think that could mean only that the semaphore counting is diff --git a/boards/arm/samv7/samv71-xult/src/atmxt-xpro.h b/boards/arm/samv7/samv71-xult/src/atmxt-xpro.h index 830a767e3b..f05d2119a8 100644 --- a/boards/arm/samv7/samv71-xult/src/atmxt-xpro.h +++ b/boards/arm/samv7/samv71-xult/src/atmxt-xpro.h @@ -354,7 +354,7 @@ struct atmxt_config_s uint16_t addr; uint8_t id; uint8_t nbytes; - FAR const uint8_t *bytes; + const uint8_t *bytes; }; /**************************************************************************** diff --git a/boards/arm/samv7/samv71-xult/src/sam_atmxtconfig.c b/boards/arm/samv7/samv71-xult/src/sam_atmxtconfig.c index 2bfc7a540c..a8dc4e2025 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_atmxtconfig.c +++ b/boards/arm/samv7/samv71-xult/src/sam_atmxtconfig.c @@ -233,7 +233,7 @@ const struct atmxt_config_s g_atmxt_config[] = .addr = 0x0000, .id = 0x00, .nbytes = 0x00, - .bytes = (FAR uint8_t *)0 + .bytes = (uint8_t *)0 } }; diff --git a/boards/arm/samv7/samv71-xult/src/sam_audio_null.c b/boards/arm/samv7/samv71-xult/src/sam_audio_null.c index 1ce3d95ae3..a78f1fc0f7 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_audio_null.c +++ b/boards/arm/samv7/samv71-xult/src/sam_audio_null.c @@ -79,8 +79,8 @@ int sam_audio_null_initialize(int minor) { - FAR struct audio_lowerhalf_s *nullaudio; - FAR struct audio_lowerhalf_s *pcm; + struct audio_lowerhalf_s *nullaudio; + struct audio_lowerhalf_s *pcm; static bool initialized = false; char devname[12]; int ret; diff --git a/boards/arm/samv7/samv71-xult/src/sam_bringup.c b/boards/arm/samv7/samv71-xult/src/sam_bringup.c index 8e82ab1bc2..c0cd15c988 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_bringup.c +++ b/boards/arm/samv7/samv71-xult/src/sam_bringup.c @@ -142,7 +142,7 @@ static const size_t g_mtd_partition_table_size = #ifdef HAVE_I2CTOOL static void sam_i2c_register(int bus) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; i2c = sam_i2cbus_initialize(bus); @@ -203,13 +203,13 @@ static void sam_i2ctool(void) int sam_bringup(void) { #ifdef HAVE_S25FL1 - FAR struct qspi_dev_s *qspi; + struct qspi_dev_s *qspi; #endif #if defined(HAVE_S25FL1) - FAR struct mtd_dev_s *mtd; + struct mtd_dev_s *mtd; #endif #if defined(HAVE_RTC_DSXXXX) || defined(HAVE_RTC_PCF85263) - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; #endif #if defined(HAVE_S25FL1_CHARDEV) #if defined(CONFIG_BCH) diff --git a/boards/arm/samv7/samv71-xult/src/sam_buttons.c b/boards/arm/samv7/samv71-xult/src/sam_buttons.c index 20f138d00e..341c1dc44b 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_buttons.c +++ b/boards/arm/samv7/samv71-xult/src/sam_buttons.c @@ -177,7 +177,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { #ifdef HAVE_IRQBUTTONS diff --git a/boards/arm/samv7/samv71-xult/src/sam_composite.c b/boards/arm/samv7/samv71-xult/src/sam_composite.c index 42aba3cd3e..fb4cae96a1 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_composite.c +++ b/boards/arm/samv7/samv71-xult/src/sam_composite.c @@ -41,7 +41,7 @@ ****************************************************************************/ #ifdef CONFIG_USBMSC_COMPOSITE -static FAR void *g_mschandle; +static void *g_mschandle; #endif /**************************************************************************** @@ -73,8 +73,8 @@ static FAR void *g_mschandle; #ifdef CONFIG_USBMSC_COMPOSITE static int board_mscclassobject(int minor, - FAR struct usbdev_devinfo_s *devinfo, - FAR struct usbdevclass_driver_s **classdev) + struct usbdev_devinfo_s *devinfo, + struct usbdevclass_driver_s **classdev) { int ret; @@ -137,7 +137,7 @@ static int board_mscclassobject(int minor, ****************************************************************************/ #ifdef CONFIG_USBMSC_COMPOSITE -static void board_mscuninitialize(FAR struct usbdevclass_driver_s *classdev) +static void board_mscuninitialize(struct usbdevclass_driver_s *classdev) { DEBUGASSERT(g_mschandle != NULL); usbmsc_uninitialize(g_mschandle); @@ -180,7 +180,7 @@ int board_composite_initialize(int port) * ****************************************************************************/ -FAR void *board_composite_connect(int port, int configid) +void *board_composite_connect(int port, int configid) { /* Here we are composing the configuration of the usb composite device. * diff --git a/boards/arm/samv7/samv71-xult/src/sam_ethernet.c b/boards/arm/samv7/samv71-xult/src/sam_ethernet.c index d03459145b..67300a402c 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_ethernet.c +++ b/boards/arm/samv7/samv71-xult/src/sam_ethernet.c @@ -282,7 +282,7 @@ int sam_emac0_setmac(void) ****************************************************************************/ #ifdef CONFIG_SAMV7_GPIOA_IRQ -int arch_phy_irq(FAR const char *intf, xcpt_t handler, void *arg, +int arch_phy_irq(const char *intf, xcpt_t handler, void *arg, phy_enable_t *enable) { irqstate_t flags; diff --git a/boards/arm/samv7/samv71-xult/src/sam_ili9488.c b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c index ba16093327..bf98c7c303 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_ili9488.c +++ b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c @@ -332,29 +332,29 @@ struct sam_dev_s /* Low Level LCD access */ -static int sam_sendcmd(FAR struct sam_dev_s *priv, uint16_t cmd); -static int sam_lcd_put(FAR struct sam_dev_s *priv, uint16_t cmd, - FAR const uint16_t *buffer, unsigned int buflen); -static int sam_lcd_get(FAR struct sam_dev_s *priv, uint8_t cmd, - FAR uint16_t *buffer, unsigned int buflen); -static int sam_lcd_getreg(FAR struct sam_dev_s *priv, uint8_t cmd, - FAR uint8_t *buffer, unsigned int nbytes); -static int sam_setwindow(FAR struct sam_dev_s *priv, sam_color_t row, +static int sam_sendcmd(struct sam_dev_s *priv, uint16_t cmd); +static int sam_lcd_put(struct sam_dev_s *priv, uint16_t cmd, + const uint16_t *buffer, unsigned int buflen); +static int sam_lcd_get(struct sam_dev_s *priv, uint8_t cmd, + uint16_t *buffer, unsigned int buflen); +static int sam_lcd_getreg(struct sam_dev_s *priv, uint8_t cmd, + uint8_t *buffer, unsigned int nbytes); +static int sam_setwindow(struct sam_dev_s *priv, sam_color_t row, sam_color_t col, sam_color_t width, sam_color_t height); /* Backlight/power controls */ static void sam_disable_backlight(void); static int sam_set_backlight(unsigned int power); -static int sam_poweroff(FAR struct sam_dev_s *priv); +static int sam_poweroff(struct sam_dev_s *priv); /* DMA Helpers */ #ifdef CONFIG_DMA_DEBUG -static void sam_lcd_sample(FAR struct sam_dev_s *priv, int index); -static void sam_lcd_sampleinit(FAR struct sam_dev_s *priv); -static void sam_lcd_dumpone(FAR struct sam_dev_s *priv, int index, - FAR const char *msg); +static void sam_lcd_sample(struct sam_dev_s *priv, int index); +static void sam_lcd_sampleinit(struct sam_dev_s *priv); +static void sam_lcd_dumpone(struct sam_dev_s *priv, int index, + const char *msg); static void sam_lcd_dump(struct sam_dev_s *priv); #else # define sam_lcd_sample(priv, index) @@ -364,27 +364,27 @@ static void sam_lcd_dump(struct sam_dev_s *priv); static void sam_lcd_endwait(struct sam_dev_s *priv, int result); static void sam_lcd_dmatimeout(wdparm_t arg); -static int sam_lcd_dmawait(FAR struct sam_dev_s *priv, uint32_t timeout); +static int sam_lcd_dmawait(struct sam_dev_s *priv, uint32_t timeout); static void sam_lcd_dmacallback(DMA_HANDLE handle, void *arg, int result); -static int sam_lcd_txtransfer(FAR struct sam_dev_s *priv, - FAR const uint16_t *buffer, unsigned int buflen); -static int sam_lcd_rxtransfer(FAR struct sam_dev_s *priv, - FAR const uint16_t *buffer, unsigned int buflen); +static int sam_lcd_txtransfer(struct sam_dev_s *priv, + const uint16_t *buffer, unsigned int buflen); +static int sam_lcd_rxtransfer(struct sam_dev_s *priv, + const uint16_t *buffer, unsigned int buflen); /* LCD Data Transfer Methods */ static int sam_putrun(fb_coord_t row, fb_coord_t col, - FAR const uint8_t *buffer, + const uint8_t *buffer, size_t npixels); -static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, +static int sam_getrun(fb_coord_t row, fb_coord_t col, uint8_t *buffer, size_t npixels); /* LCD Configuration */ -static int sam_getvideoinfo(FAR struct lcd_dev_s *dev, - FAR struct fb_videoinfo_s *vinfo); -static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, - FAR struct lcd_planeinfo_s *pinfo); +static int sam_getvideoinfo(struct lcd_dev_s *dev, + struct fb_videoinfo_s *vinfo); +static int sam_getplaneinfo(struct lcd_dev_s *dev, unsigned int planeno, + struct lcd_planeinfo_s *pinfo); /* LCD RGB Mapping */ @@ -400,10 +400,10 @@ static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, /* LCD Specific Controls */ -static int sam_getpower(FAR struct lcd_dev_s *dev); -static int sam_setpower(FAR struct lcd_dev_s *dev, int power); -static int sam_getcontrast(FAR struct lcd_dev_s *dev); -static int sam_setcontrast(FAR struct lcd_dev_s *dev, +static int sam_getpower(struct lcd_dev_s *dev); +static int sam_setpower(struct lcd_dev_s *dev, int power); +static int sam_getcontrast(struct lcd_dev_s *dev); +static int sam_setcontrast(struct lcd_dev_s *dev, unsigned int contrast); /* Initialization */ @@ -457,10 +457,10 @@ static const struct fb_videoinfo_s g_videoinfo = static const struct lcd_planeinfo_s g_planeinfo = { - .putrun = sam_putrun, /* Put a run into LCD memory */ - .getrun = sam_getrun, /* Get a run from LCD memory */ - .buffer = (FAR uint8_t *)g_runbuffer, /* Run scratch buffer */ - .bpp = SAM_BPP, /* Bits-per-pixel */ + .putrun = sam_putrun, /* Put a run into LCD memory */ + .getrun = sam_getrun, /* Get a run from LCD memory */ + .buffer = (uint8_t *)g_runbuffer, /* Run scratch buffer */ + .bpp = SAM_BPP, /* Bits-per-pixel */ }; /* This is the ILI9488 LCD driver object */ @@ -501,7 +501,7 @@ static struct sam_dev_s g_lcddev = * ****************************************************************************/ -static int sam_sendcmd(FAR struct sam_dev_s *priv, uint16_t cmd) +static int sam_sendcmd(struct sam_dev_s *priv, uint16_t cmd) { volatile int i; int ret; @@ -540,8 +540,8 @@ static int sam_sendcmd(FAR struct sam_dev_s *priv, uint16_t cmd) * ****************************************************************************/ -static int sam_lcd_put(FAR struct sam_dev_s *priv, uint16_t cmd, - FAR const uint16_t *buffer, unsigned int buflen) +static int sam_lcd_put(struct sam_dev_s *priv, uint16_t cmd, + const uint16_t *buffer, unsigned int buflen) { int ret; @@ -575,8 +575,8 @@ static int sam_lcd_put(FAR struct sam_dev_s *priv, uint16_t cmd, * ****************************************************************************/ -static int sam_lcd_get(FAR struct sam_dev_s *priv, uint8_t cmd, - FAR uint16_t *buffer, unsigned int buflen) +static int sam_lcd_get(struct sam_dev_s *priv, uint8_t cmd, + uint16_t *buffer, unsigned int buflen) { int ret; @@ -604,8 +604,8 @@ static int sam_lcd_get(FAR struct sam_dev_s *priv, uint8_t cmd, * ****************************************************************************/ -static int sam_lcd_getreg(FAR struct sam_dev_s *priv, uint8_t cmd, - FAR uint8_t *buffer, unsigned int nbytes) +static int sam_lcd_getreg(struct sam_dev_s *priv, uint8_t cmd, + uint8_t *buffer, unsigned int nbytes) { uint32_t tmp[4]; int ret; @@ -617,7 +617,7 @@ static int sam_lcd_getreg(FAR struct sam_dev_s *priv, uint8_t cmd, * dummy read. */ - ret = sam_lcd_get(priv, cmd, (FAR uint16_t *)tmp, nbytes << 2); + ret = sam_lcd_get(priv, cmd, (uint16_t *)tmp, nbytes << 2); if (ret == OK) { for (i = 0; i < nbytes; i++) @@ -637,7 +637,7 @@ static int sam_lcd_getreg(FAR struct sam_dev_s *priv, uint8_t cmd, * ****************************************************************************/ -static int sam_setwindow(FAR struct sam_dev_s *priv, sam_color_t row, +static int sam_setwindow(struct sam_dev_s *priv, sam_color_t row, sam_color_t col, sam_color_t width, sam_color_t height) { @@ -697,7 +697,7 @@ static int sam_setwindow(FAR struct sam_dev_s *priv, sam_color_t row, ****************************************************************************/ #if 0 /* Sometimes useful */ -static void sam_dumprun(FAR const char *msg, FAR uint16_t *run, +static void sam_dumprun(const char *msg, uint16_t *run, size_t npixels) { int i; @@ -776,7 +776,7 @@ static int sam_set_backlight(unsigned int power) * ****************************************************************************/ -static int sam_poweroff(FAR struct sam_dev_s *priv) +static int sam_poweroff(struct sam_dev_s *priv) { int ret; @@ -961,7 +961,7 @@ static void sam_lcd_dmatimeout(wdparm_t arg) * ****************************************************************************/ -static int sam_lcd_dmawait(FAR struct sam_dev_s *priv, uint32_t timeout) +static int sam_lcd_dmawait(struct sam_dev_s *priv, uint32_t timeout) { int ret; @@ -1033,8 +1033,8 @@ static void sam_lcd_dmacallback(DMA_HANDLE handle, void *arg, int result) * ****************************************************************************/ -static int sam_lcd_txtransfer(FAR struct sam_dev_s *priv, - FAR const uint16_t *buffer, +static int sam_lcd_txtransfer(struct sam_dev_s *priv, + const uint16_t *buffer, unsigned int buflen) { irqstate_t flags; @@ -1076,8 +1076,8 @@ static int sam_lcd_txtransfer(FAR struct sam_dev_s *priv, * ****************************************************************************/ -static int sam_lcd_rxtransfer(FAR struct sam_dev_s *priv, - FAR const uint16_t *buffer, +static int sam_lcd_rxtransfer(struct sam_dev_s *priv, + const uint16_t *buffer, unsigned int buflen) { irqstate_t flags; @@ -1126,9 +1126,9 @@ static int sam_lcd_rxtransfer(FAR struct sam_dev_s *priv, ****************************************************************************/ static int sam_putrun(fb_coord_t row, fb_coord_t col, - FAR const uint8_t *buffer, size_t npixels) + const uint8_t *buffer, size_t npixels) { - FAR struct sam_dev_s *priv = &g_lcddev; + struct sam_dev_s *priv = &g_lcddev; int ret; /* Buffer must be provided and aligned to a 16-bit address boundary */ @@ -1148,7 +1148,7 @@ static int sam_putrun(fb_coord_t row, fb_coord_t col, /* Write the run into the LCD */ return sam_lcd_put(priv, ILI9488_CMD_MEMORY_WRITE, - (FAR const uint16_t *)buffer, + (const uint16_t *)buffer, npixels * sizeof(uint16_t)); } @@ -1166,10 +1166,10 @@ static int sam_putrun(fb_coord_t row, fb_coord_t col, * ****************************************************************************/ -static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, +static int sam_getrun(fb_coord_t row, fb_coord_t col, uint8_t *buffer, size_t npixels) { - FAR struct sam_dev_s *priv = &g_lcddev; + struct sam_dev_s *priv = &g_lcddev; int ret; /* Buffer must be provided and aligned to a 16-bit address boundary */ @@ -1188,7 +1188,7 @@ static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, /* Write the run into the LCD */ - return sam_lcd_get(priv, ILI9488_CMD_MEMORY_READ, (FAR uint16_t *)buffer, + return sam_lcd_get(priv, ILI9488_CMD_MEMORY_READ, (uint16_t *)buffer, npixels * sizeof(uint16_t)); } @@ -1200,8 +1200,8 @@ static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, * ****************************************************************************/ -static int sam_getvideoinfo(FAR struct lcd_dev_s *dev, - FAR struct fb_videoinfo_s *vinfo) +static int sam_getvideoinfo(struct lcd_dev_s *dev, + struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); lcdinfo("fmt: %d xres: %d yres: %d nplanes: %d\n", @@ -1220,8 +1220,8 @@ static int sam_getvideoinfo(FAR struct lcd_dev_s *dev, * ****************************************************************************/ -static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, - FAR struct lcd_planeinfo_s *pinfo) +static int sam_getplaneinfo(struct lcd_dev_s *dev, unsigned int planeno, + struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(dev && pinfo && planeno == 0); lcdinfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); @@ -1241,7 +1241,7 @@ static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, static int sam_getpower(struct lcd_dev_s *dev) { - FAR struct sam_dev_s *priv = (FAR struct sam_dev_s *)dev; + struct sam_dev_s *priv = (struct sam_dev_s *)dev; lcdinfo("power: %d\n", 0); return priv->power; @@ -1259,7 +1259,7 @@ static int sam_getpower(struct lcd_dev_s *dev) static int sam_setpower(struct lcd_dev_s *dev, int power) { - FAR struct sam_dev_s *priv = (FAR struct sam_dev_s *)dev; + struct sam_dev_s *priv = (struct sam_dev_s *)dev; int ret; lcdinfo("power: %d\n", power); @@ -1409,7 +1409,7 @@ static inline void sam_smc_initialize(void) static inline int sam_lcd_initialize(void) { - FAR struct sam_dev_s *priv = &g_lcddev; + struct sam_dev_s *priv = &g_lcddev; uint8_t buffer[4] = { 0, 0, 0, 0 @@ -1539,7 +1539,7 @@ static inline int sam_lcd_initialize(void) int board_lcd_initialize(void) { - FAR struct sam_dev_s *priv = &g_lcddev; + struct sam_dev_s *priv = &g_lcddev; int ret; lcdinfo("Initializing\n"); @@ -1609,7 +1609,7 @@ errout_with_waitsem: * ****************************************************************************/ -FAR struct lcd_dev_s *board_lcd_getdev(int lcddev) +struct lcd_dev_s *board_lcd_getdev(int lcddev) { DEBUGASSERT(lcddev == 0); return &g_lcddev.dev; @@ -1625,7 +1625,7 @@ FAR struct lcd_dev_s *board_lcd_getdev(int lcddev) void board_lcd_uninitialize(void) { - FAR struct sam_dev_s *priv = &g_lcddev; + struct sam_dev_s *priv = &g_lcddev; /* Free the DMA channel */ @@ -1658,7 +1658,7 @@ void board_lcd_uninitialize(void) void sam_lcdclear(uint16_t color) { - FAR struct sam_dev_s *priv = &g_lcddev; + struct sam_dev_s *priv = &g_lcddev; unsigned int row; unsigned int col; int ret; @@ -1681,7 +1681,7 @@ void sam_lcdclear(uint16_t color) for (row = 0; row < SAM_YRES; row++) { - ret = sam_putrun(row, 0, (FAR const uint8_t *)g_runbuffer, SAM_XRES); + ret = sam_putrun(row, 0, (const uint8_t *)g_runbuffer, SAM_XRES); if (ret < 0) { lcderr("ERROR: sam_putrun failed on row %d: %d\n", row, ret); diff --git a/boards/arm/samv7/samv71-xult/src/sam_maxtouch.c b/boards/arm/samv7/samv71-xult/src/sam_maxtouch.c index c5ae2a5ff2..70c811b422 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_maxtouch.c +++ b/boards/arm/samv7/samv71-xult/src/sam_maxtouch.c @@ -71,7 +71,7 @@ struct sama5d4ek_tscinfo_s /* Extensions for the sama5d4ek board */ mxt_handler_t handler; - FAR void *arg; + void *arg; }; /**************************************************************************** @@ -89,11 +89,11 @@ struct sama5d4ek_tscinfo_s * clear - Acknowledge/clear any pending GPIO interrupt */ -static int mxt_attach(FAR const struct mxt_lower_s *lower, +static int mxt_attach(const struct mxt_lower_s *lower, mxt_handler_t isr, - FAR void *arg); -static void mxt_enable(FAR const struct mxt_lower_s *lower, bool enable); -static void mxt_clear(FAR const struct mxt_lower_s *lower); + void *arg); +static void mxt_enable(const struct mxt_lower_s *lower, bool enable); +static void mxt_clear(const struct mxt_lower_s *lower); /**************************************************************************** * Private Data @@ -140,8 +140,8 @@ static struct sama5d4ek_tscinfo_s g_mxtinfo = * ****************************************************************************/ -static int mxt_attach(FAR const struct mxt_lower_s *lower, mxt_handler_t isr, - FAR void *arg) +static int mxt_attach(const struct mxt_lower_s *lower, mxt_handler_t isr, + void *arg) { if (isr) { @@ -165,7 +165,7 @@ static int mxt_attach(FAR const struct mxt_lower_s *lower, mxt_handler_t isr, return OK; } -static void mxt_enable(FAR const struct mxt_lower_s *lower, bool enable) +static void mxt_enable(const struct mxt_lower_s *lower, bool enable) { /* Enable or disable interrupts */ @@ -179,12 +179,12 @@ static void mxt_enable(FAR const struct mxt_lower_s *lower, bool enable) } } -static void mxt_clear(FAR const struct mxt_lower_s *lower) +static void mxt_clear(const struct mxt_lower_s *lower) { /* Does nothing */ } -static int mxt_interrupt(int irq, FAR void *context, FAR void *arg) +static int mxt_interrupt(int irq, void *context, void *arg) { /* Just forward the interrupt to the maXTouch driver */ @@ -224,7 +224,7 @@ static int mxt_interrupt(int irq, FAR void *context, FAR void *arg) int sam_tsc_setup(int minor) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; iinfo("minor %d\n", minor); diff --git a/boards/arm/samv7/samv71-xult/src/sam_mrf24j40.c b/boards/arm/samv7/samv71-xult/src/sam_mrf24j40.c index 5ae0c2573e..6545caa55e 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_mrf24j40.c +++ b/boards/arm/samv7/samv71-xult/src/sam_mrf24j40.c @@ -76,11 +76,11 @@ struct sam_priv_s * irq_enable - Enable or disable the GPIO interrupt */ -static int sam_attach_irq(FAR const struct mrf24j40_lower_s *lower, - xcpt_t handler, FAR void *arg); -static void sam_enable_irq(FAR const struct mrf24j40_lower_s *lower, +static int sam_attach_irq(const struct mrf24j40_lower_s *lower, + xcpt_t handler, void *arg); +static void sam_enable_irq(const struct mrf24j40_lower_s *lower, bool state); -static int sam_mrf24j40_devsetup(FAR struct sam_priv_s *priv); +static int sam_mrf24j40_devsetup(struct sam_priv_s *priv); /**************************************************************************** * Private Data @@ -139,10 +139,10 @@ static struct sam_priv_s g_mrf24j40_mb2_priv = * irq_enable - Enable or disable the GPIO interrupt */ -static int sam_attach_irq(FAR const struct mrf24j40_lower_s *lower, - xcpt_t handler, FAR void *arg) +static int sam_attach_irq(const struct mrf24j40_lower_s *lower, + xcpt_t handler, void *arg) { - FAR struct sam_priv_s *priv = (FAR struct sam_priv_s *)lower; + struct sam_priv_s *priv = (struct sam_priv_s *)lower; int ret; DEBUGASSERT(priv != NULL); @@ -156,10 +156,10 @@ static int sam_attach_irq(FAR const struct mrf24j40_lower_s *lower, return ret; } -static void sam_enable_irq(FAR const struct mrf24j40_lower_s *lower, - bool state) +static void sam_enable_irq(const struct mrf24j40_lower_s *lower, + bool state) { - FAR struct sam_priv_s *priv = (FAR struct sam_priv_s *)lower; + struct sam_priv_s *priv = (struct sam_priv_s *)lower; static bool enabled; irqstate_t flags; @@ -206,11 +206,11 @@ static void sam_enable_irq(FAR const struct mrf24j40_lower_s *lower, * ****************************************************************************/ -static int sam_mrf24j40_devsetup(FAR struct sam_priv_s *priv) +static int sam_mrf24j40_devsetup(struct sam_priv_s *priv) { - FAR struct ieee802154_radio_s *radio; + struct ieee802154_radio_s *radio; MACHANDLE mac; - FAR struct spi_dev_s *spi; + struct spi_dev_s *spi; int ret; #ifdef BEE_RESET diff --git a/boards/arm/samv7/samv71-xult/src/sam_spi.c b/boards/arm/samv7/samv71-xult/src/sam_spi.c index 859c2f292b..2ec4f76787 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_spi.c +++ b/boards/arm/samv7/samv71-xult/src/sam_spi.c @@ -211,14 +211,14 @@ void sam_spi1select(uint32_t devid, bool selected) ****************************************************************************/ #ifdef CONFIG_SAMV7_SPI0_MASTER -uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi0status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_SAMV7_SPI1_MASTER -uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t sam_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } @@ -250,7 +250,7 @@ uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_SAMV7_SPI0_MASTER -int sam_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int sam_spi0cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { if (devid == SPIDEV_DISPLAY(0)) { diff --git a/boards/arm/samv7/samv71-xult/src/sam_st7789.c b/boards/arm/samv7/samv71-xult/src/sam_st7789.c index f1430a840c..a3f7284d26 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_st7789.c +++ b/boards/arm/samv7/samv71-xult/src/sam_st7789.c @@ -94,7 +94,7 @@ int board_lcd_initialize(void) * ****************************************************************************/ -FAR struct lcd_dev_s *board_lcd_getdev(int devno) +struct lcd_dev_s *board_lcd_getdev(int devno) { g_lcd = st7789_lcdinitialize(g_spidev); if (!g_lcd) diff --git a/boards/arm/samv7/samv71-xult/src/sam_usbdev.c b/boards/arm/samv7/samv71-xult/src/sam_usbdev.c index 83bbf9d80a..bbbd499663 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_usbdev.c +++ b/boards/arm/samv7/samv71-xult/src/sam_usbdev.c @@ -78,7 +78,7 @@ void sam_usbinitialize(void) * ****************************************************************************/ -void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume) +void sam_usbsuspend(struct usbdev_s *dev, bool resume) { uinfo("resume: %d\n", resume); } diff --git a/boards/arm/samv7/samv71-xult/src/sam_wm8904.c b/boards/arm/samv7/samv71-xult/src/sam_wm8904.c index 07e9326de8..ae7560b223 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_wm8904.c +++ b/boards/arm/samv7/samv71-xult/src/sam_wm8904.c @@ -65,7 +65,7 @@ struct samv71xult_mwinfo_s /* Extensions for the samv71xult board */ wm8904_handler_t handler; - FAR void *arg; + void *arg; }; /**************************************************************************** @@ -82,9 +82,9 @@ struct samv71xult_mwinfo_s * enable - Enable or disable the GPIO interrupt */ -static int wm8904_attach(FAR const struct wm8904_lower_s *lower, - wm8904_handler_t isr, FAR void *arg); -static bool wm8904_enable(FAR const struct wm8904_lower_s *lower, +static int wm8904_attach(const struct wm8904_lower_s *lower, + wm8904_handler_t isr, void *arg); +static bool wm8904_enable(const struct wm8904_lower_s *lower, bool enable); /**************************************************************************** @@ -133,8 +133,8 @@ static struct samv71xult_mwinfo_s g_wm8904info = * ****************************************************************************/ -static int wm8904_attach(FAR const struct wm8904_lower_s *lower, - wm8904_handler_t isr, FAR void *arg) +static int wm8904_attach(const struct wm8904_lower_s *lower, + wm8904_handler_t isr, void *arg) { if (isr) { @@ -158,7 +158,7 @@ static int wm8904_attach(FAR const struct wm8904_lower_s *lower, return OK; } -static bool wm8904_enable(FAR const struct wm8904_lower_s *lower, +static bool wm8904_enable(const struct wm8904_lower_s *lower, bool enable) { static bool enabled; @@ -191,7 +191,7 @@ static bool wm8904_enable(FAR const struct wm8904_lower_s *lower, return ret; } -static int wm8904_interrupt(int irq, FAR void *context, FAR void *arg) +static int wm8904_interrupt(int irq, void *context, void *arg) { /* Just forward the interrupt to the WM8904 driver */ @@ -232,10 +232,10 @@ static int wm8904_interrupt(int irq, FAR void *context, FAR void *arg) int sam_wm8904_initialize(int minor) { - FAR struct audio_lowerhalf_s *wm8904; - FAR struct audio_lowerhalf_s *pcm; - FAR struct i2c_master_s *i2c; - FAR struct i2s_dev_s *i2s; + struct audio_lowerhalf_s *wm8904; + struct audio_lowerhalf_s *pcm; + struct i2c_master_s *i2c; + struct i2s_dev_s *i2s; static bool initialized = false; char devname[12]; int ret; diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_adc.c b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_adc.c index d3b79739f2..30260869ff 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_adc.c +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_adc.c @@ -88,7 +88,7 @@ static const uint32_t g_pinlist1[2] = int stm32_adc_setup(void) { static bool initialized = false; - FAR struct adc_dev_s *adc; + struct adc_dev_s *adc; int ret; int i; diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_bringup.c index 75fc1d9740..a46f74fcfd 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_bringup.c +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_bringup.c @@ -63,7 +63,7 @@ #if defined(CONFIG_I2C) && defined(CONFIG_SYSTEM_I2CTOOL) static void stm32_i2c_register(int bus) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; i2c = stm32_i2cbus_initialize(bus); diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_spi.c b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_spi.c index 6088033fdc..8403d8bfee 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_spi.c +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_spi.c @@ -116,7 +116,7 @@ void stm32_spidev_initialize(void) ****************************************************************************/ #ifdef CONFIG_STM32F0L0G0_SPI1 -void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, +void stm32_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", @@ -144,7 +144,7 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, } } -uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi1status(struct spi_dev_s *dev, uint32_t devid) { uint8_t status = 0; @@ -169,14 +169,14 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) #endif /* CONFIG_STM32F0L0G0_SPI1 */ #ifdef CONFIG_STM32F0L0G0_SPI2 -void stm32_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, +void stm32_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_ssd1306.c b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_ssd1306.c index 89d6425cb7..6aa73c210d 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_ssd1306.c +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_ssd1306.c @@ -48,8 +48,8 @@ * Private Data ****************************************************************************/ -FAR struct i2c_master_s *g_i2c; -FAR struct lcd_dev_s *g_lcddev; +struct i2c_master_s *g_i2c; +struct lcd_dev_s *g_lcddev; /**************************************************************************** * Public Functions @@ -77,7 +77,7 @@ int board_lcd_initialize(void) * Name: board_lcd_getdev ****************************************************************************/ -FAR struct lcd_dev_s *board_lcd_getdev(int devno) +struct lcd_dev_s *board_lcd_getdev(int devno) { /* Bind the I2C port to the OLED */ diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_sx127x.c b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_sx127x.c index 377eeee401..a3279ae51d 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_sx127x.c +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_sx127x.c @@ -57,7 +57,7 @@ static void sx127x_chip_reset(void); static int sx127x_opmode_change(int opmode); static int sx127x_freq_select(uint32_t freq); static int sx127x_pa_select(bool enable); -static int sx127x_irq0_attach(xcpt_t isr, FAR void *arg); +static int sx127x_irq0_attach(xcpt_t isr, void *arg); /**************************************************************************** * Private Data @@ -83,7 +83,7 @@ static bool g_high_power_output = false; * Name: sx127x_irq0_attach ****************************************************************************/ -static int sx127x_irq0_attach(xcpt_t isr, FAR void *arg) +static int sx127x_irq0_attach(xcpt_t isr, void *arg) { wlinfo("Attach DIO0 IRQ\n"); @@ -242,7 +242,7 @@ static int sx127x_pa_select(bool enable) int stm32_lpwaninitialize(void) { - FAR struct spi_dev_s *spidev; + struct spi_dev_s *spidev; int ret = OK; wlinfo("Register the sx127x module\n"); diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_bringup.c index ab32f3c678..8306774080 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_bringup.c +++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_bringup.c @@ -63,7 +63,7 @@ int stm32_bringup(void) { #ifdef HAVE_I2C_DRIVER - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; #endif int ret; diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_buttons.c b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_buttons.c index 7f8c956801..bb6f48aa34 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_buttons.c +++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_buttons.c @@ -99,7 +99,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_buttons.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_buttons.c index b5b80322c8..ba0830c406 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_buttons.c +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_buttons.c @@ -99,7 +99,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_spi.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_spi.c index 2f4cfa37b6..77ad652f51 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_spi.c +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_spi.c @@ -118,7 +118,7 @@ void stm32_spidev_initialize(void) ****************************************************************************/ #ifdef CONFIG_STM32F0L0G0_SPI1 -void stm32_spi1select(FAR struct spi_dev_s *dev, +void stm32_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", @@ -146,7 +146,7 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, } } -uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi1status(struct spi_dev_s *dev, uint32_t devid) { uint8_t status = 0; @@ -171,14 +171,14 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) #endif /* CONFIG_STM32F0L0G0_SPI1 */ #ifdef CONFIG_STM32F0L0G0_SPI2 -void stm32_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, +void stm32_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_sx127x.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_sx127x.c index 6cb0920b2a..2e2e415e9b 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_sx127x.c +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_sx127x.c @@ -57,7 +57,7 @@ static void sx127x_chip_reset(void); static int sx127x_opmode_change(int opmode); static int sx127x_freq_select(uint32_t freq); static int sx127x_pa_select(bool enable); -static int sx127x_irq0_attach(xcpt_t isr, FAR void *arg); +static int sx127x_irq0_attach(xcpt_t isr, void *arg); /**************************************************************************** * Private Data @@ -81,7 +81,7 @@ struct sx127x_lower_s lower = * Name: sx127x_irq0_attach ****************************************************************************/ -static int sx127x_irq0_attach(xcpt_t isr, FAR void *arg) +static int sx127x_irq0_attach(xcpt_t isr, void *arg) { wlinfo("Attach DIO0 IRQ\n"); @@ -177,7 +177,7 @@ static int sx127x_pa_select(bool enable) int stm32_lpwaninitialize(void) { - FAR struct spi_dev_s *spidev; + struct spi_dev_s *spidev; int ret = OK; wlinfo("Register the sx127x module\n"); diff --git a/boards/arm/stm32f0l0g0/nucleo-g070rb/src/nucleo-g070rb.h b/boards/arm/stm32f0l0g0/nucleo-g070rb/src/nucleo-g070rb.h index 2f96dfd78b..604edfa5c9 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g070rb/src/nucleo-g070rb.h +++ b/boards/arm/stm32f0l0g0/nucleo-g070rb/src/nucleo-g070rb.h @@ -142,7 +142,7 @@ int stm32_pwm_setup(void); ****************************************************************************/ #ifdef CONFIG_TIMER -int stm32_timer_driver_setup(FAR const char *devpath, int timer); +int stm32_timer_driver_setup(const char *devpath, int timer); #endif /**************************************************************************** diff --git a/boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_buttons.c b/boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_buttons.c index 226a540300..ce56c9f7ee 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_buttons.c +++ b/boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_buttons.c @@ -100,7 +100,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_gpio.c b/boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_gpio.c index 75e1915bb5..2cef4864b7 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_gpio.c +++ b/boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_gpio.c @@ -80,13 +80,13 @@ struct stm32gpint_dev_s * Private Function Prototypes ****************************************************************************/ -static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value); -static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value); -static int gpout_write(FAR struct gpio_dev_s *dev, bool value); -static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value); -static int gpint_attach(FAR struct gpio_dev_s *dev, +static int gpin_read(struct gpio_dev_s *dev, bool *value); +static int gpout_read(struct gpio_dev_s *dev, bool *value); +static int gpout_write(struct gpio_dev_s *dev, bool value); +static int gpint_read(struct gpio_dev_s *dev, bool *value); +static int gpint_attach(struct gpio_dev_s *dev, pin_interrupt_t callback); -static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable); +static int gpint_enable(struct gpio_dev_s *dev, bool enable); /**************************************************************************** * Private Data @@ -155,8 +155,8 @@ static struct stm32gpint_dev_s g_gpint[BOARD_NGPIOINT]; static int stm32gpio_interrupt(int irq, void *context, void *arg) { - FAR struct stm32gpint_dev_s *stm32gpint = - (FAR struct stm32gpint_dev_s *)arg; + struct stm32gpint_dev_s *stm32gpint = + (struct stm32gpint_dev_s *)arg; DEBUGASSERT(stm32gpint != NULL && stm32gpint->callback != NULL); gpioinfo("Interrupt! callback=%p\n", stm32gpint->callback); @@ -166,11 +166,11 @@ static int stm32gpio_interrupt(int irq, void *context, void *arg) return OK; } -static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpin_read(struct gpio_dev_s *dev, bool *value) { #if BOARD_NGPIOIN > 0 - FAR struct stm32gpio_dev_s *stm32gpio = - (FAR struct stm32gpio_dev_s *)dev; + struct stm32gpio_dev_s *stm32gpio = + (struct stm32gpio_dev_s *)dev; DEBUGASSERT(stm32gpio != NULL && value != NULL); DEBUGASSERT(stm32gpio->id < BOARD_NGPIOIN); @@ -183,11 +183,11 @@ static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value) #endif } -static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpout_read(struct gpio_dev_s *dev, bool *value) { #if BOARD_NGPIOOUT > 0 - FAR struct stm32gpio_dev_s *stm32gpio = - (FAR struct stm32gpio_dev_s *)dev; + struct stm32gpio_dev_s *stm32gpio = + (struct stm32gpio_dev_s *)dev; DEBUGASSERT(stm32gpio != NULL && value != NULL); DEBUGASSERT(stm32gpio->id < BOARD_NGPIOOUT); @@ -200,11 +200,11 @@ static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value) #endif } -static int gpout_write(FAR struct gpio_dev_s *dev, bool value) +static int gpout_write(struct gpio_dev_s *dev, bool value) { #if BOARD_NGPIOOUT > 0 - FAR struct stm32gpio_dev_s *stm32gpio = - (FAR struct stm32gpio_dev_s *)dev; + struct stm32gpio_dev_s *stm32gpio = + (struct stm32gpio_dev_s *)dev; DEBUGASSERT(stm32gpio != NULL); DEBUGASSERT(stm32gpio->id < BOARD_NGPIOOUT); @@ -217,11 +217,11 @@ static int gpout_write(FAR struct gpio_dev_s *dev, bool value) #endif } -static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpint_read(struct gpio_dev_s *dev, bool *value) { #if BOARD_NGPIOINT > 0 - FAR struct stm32gpint_dev_s *stm32gpint = - (FAR struct stm32gpint_dev_s *)dev; + struct stm32gpint_dev_s *stm32gpint = + (struct stm32gpint_dev_s *)dev; DEBUGASSERT(stm32gpint != NULL && value != NULL); DEBUGASSERT(stm32gpint->stm32gpio.id < BOARD_NGPIOINT); @@ -234,12 +234,12 @@ static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value) #endif } -static int gpint_attach(FAR struct gpio_dev_s *dev, +static int gpint_attach(struct gpio_dev_s *dev, pin_interrupt_t callback) { #if BOARD_NGPIOINT > 0 - FAR struct stm32gpint_dev_s *stm32gpint = - (FAR struct stm32gpint_dev_s *)dev; + struct stm32gpint_dev_s *stm32gpint = + (struct stm32gpint_dev_s *)dev; gpioinfo("Attaching the callback\n"); @@ -256,11 +256,11 @@ static int gpint_attach(FAR struct gpio_dev_s *dev, #endif } -static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable) +static int gpint_enable(struct gpio_dev_s *dev, bool enable) { #if BOARD_NGPIOINT > 0 - FAR struct stm32gpint_dev_s *stm32gpint = - (FAR struct stm32gpint_dev_s *)dev; + struct stm32gpint_dev_s *stm32gpint = + (struct stm32gpint_dev_s *)dev; if (enable) { diff --git a/boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_timer.c b/boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_timer.c index 8ce4513af4..907657ac50 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_timer.c +++ b/boards/arm/stm32f0l0g0/nucleo-g070rb/src/stm32_timer.c @@ -72,7 +72,7 @@ * ****************************************************************************/ -int stm32_timer_driver_setup(FAR const char *devpath, int timer) +int stm32_timer_driver_setup(const char *devpath, int timer) { return stm32_timer_initialize(devpath, timer); } diff --git a/boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_buttons.c b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_buttons.c index 965c333db7..9b0207e33f 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_buttons.c +++ b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_buttons.c @@ -100,7 +100,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/nucleo-l073rz.h b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/nucleo-l073rz.h index fbe3a16190..881db95cd8 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/nucleo-l073rz.h +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/nucleo-l073rz.h @@ -178,7 +178,7 @@ int stm32_lpwaninitialize(void); ****************************************************************************/ #ifdef CONFIG_CL_MFRC522 -int stm32_mfrc522initialize(FAR const char *devpath); +int stm32_mfrc522initialize(const char *devpath); #endif #endif /* __BOARDS_ARM_STM32F0L0G0_NUCLEO_L073RZ_SRC_NUCLEO_L073RZ_H */ diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_buttons.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_buttons.c index 0a2d871530..b1d4aa6686 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_buttons.c +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_buttons.c @@ -100,7 +100,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_mfrc522.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_mfrc522.c index c2841aff7e..5a5a9ba4fd 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_mfrc522.c +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_mfrc522.c @@ -60,9 +60,9 @@ * ****************************************************************************/ -int stm32_mfrc522initialize(FAR const char *devpath) +int stm32_mfrc522initialize(const char *devpath) { - FAR struct spi_dev_s *spi; + struct spi_dev_s *spi; int ret; /* Configure MFRC522 reset */ diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_nrf24l01.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_nrf24l01.c index d2bd00ae28..42a2891c6b 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_nrf24l01.c +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_nrf24l01.c @@ -48,7 +48,7 @@ * Private Function Prototypes ****************************************************************************/ -static int nrf24l01_irq_attach(xcpt_t isr, FAR void *arg); +static int nrf24l01_irq_attach(xcpt_t isr, void *arg); static void nrf24l01_chip_enable(bool enable); /**************************************************************************** @@ -62,13 +62,13 @@ static struct nrf24l01_config_s nrf_cfg = }; static xcpt_t g_isr; -static FAR void *g_arg; +static void *g_arg; /**************************************************************************** * Private Functions ****************************************************************************/ -static int nrf24l01_irq_attach(xcpt_t isr, FAR void *arg) +static int nrf24l01_irq_attach(xcpt_t isr, void *arg) { wlinfo("Attach IRQ\n"); g_isr = isr; @@ -89,7 +89,7 @@ static void nrf24l01_chip_enable(bool enable) int stm32_wlinitialize(void) { - FAR struct spi_dev_s *spidev; + struct spi_dev_s *spidev; int ret = OK; syslog(LOG_INFO, "Register the nRF24L01 module\n"); diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_spi.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_spi.c index 1fcf9f1f0e..48ca1220a5 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_spi.c +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_spi.c @@ -136,7 +136,7 @@ void stm32_spidev_initialize(void) ****************************************************************************/ #ifdef CONFIG_STM32F0L0G0_SPI1 -void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, +void stm32_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", @@ -177,7 +177,7 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, } } -uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi1status(struct spi_dev_s *dev, uint32_t devid) { uint8_t status = 0; @@ -210,7 +210,7 @@ uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) #endif /* CONFIG_STM32F0L0G0_SPI1 */ #ifdef CONFIG_STM32F0L0G0_SPI2 -void stm32_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, +void stm32_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", @@ -232,7 +232,7 @@ void stm32_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, } } -uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi2status(struct spi_dev_s *dev, uint32_t devid) { uint8_t status = 0; diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_sx127x.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_sx127x.c index 468ebd94fb..2ff82891d1 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_sx127x.c +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_sx127x.c @@ -57,7 +57,7 @@ static void sx127x_chip_reset(void); static int sx127x_opmode_change(int opmode); static int sx127x_freq_select(uint32_t freq); static int sx127x_pa_select(bool enable); -static int sx127x_irq0_attach(xcpt_t isr, FAR void *arg); +static int sx127x_irq0_attach(xcpt_t isr, void *arg); /**************************************************************************** * Private Data @@ -81,7 +81,7 @@ struct sx127x_lower_s lower = * Name: sx127x_irq0_attach ****************************************************************************/ -static int sx127x_irq0_attach(xcpt_t isr, FAR void *arg) +static int sx127x_irq0_attach(xcpt_t isr, void *arg) { wlinfo("Attach DIO0 IRQ\n"); @@ -177,7 +177,7 @@ static int sx127x_pa_select(bool enable) int stm32_lpwaninitialize(void) { - FAR struct spi_dev_s *spidev; + struct spi_dev_s *spidev; int ret = OK; wlinfo("Register the sx127x module\n"); diff --git a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_buttons.c b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_buttons.c index b625aaea8a..1aa02c5493 100644 --- a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_buttons.c +++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_buttons.c @@ -130,7 +130,7 @@ uint8_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_buttons.c b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_buttons.c index f8d177fa2d..523847717e 100644 --- a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_buttons.c +++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_buttons.c @@ -130,7 +130,7 @@ uint8_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/stm32f7/nucleo-144/src/nucleo-144.h b/boards/arm/stm32f7/nucleo-144/src/nucleo-144.h index 3fcd4e6d88..e7362de3a8 100644 --- a/boards/arm/stm32f7/nucleo-144/src/nucleo-144.h +++ b/boards/arm/stm32f7/nucleo-144/src/nucleo-144.h @@ -285,7 +285,7 @@ int stm32_bbsram_int(void); ****************************************************************************/ #ifdef CONFIG_SENSORS_QENCODER -int stm32f7_qencoder_initialize(FAR const char *devpath, int timer); +int stm32f7_qencoder_initialize(const char *devpath, int timer); #endif #endif /* __ASSEMBLY__ */ diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c b/boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c index 632c75e95e..881014fcf0 100644 --- a/boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c +++ b/boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c @@ -47,7 +47,7 @@ int stm32_gpio_initialize(void); #endif #ifdef CONFIG_SENSORS_QENCODER -int stm32f7_qencoder_initialize(FAR const char *devpath, int timer); +int stm32f7_qencoder_initialize(const char *devpath, int timer); #endif #ifdef CONFIG_STM32F7_CAN @@ -88,9 +88,9 @@ int board_app_initialize(uintptr_t arg) int ret; #ifdef CONFIG_I2C int i2c_bus; - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; #ifdef CONFIG_MPU60X0_I2C - FAR struct mpu_config_s *mpu_config; + struct mpu_config_s *mpu_config; #endif #endif diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c b/boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c index a7d9d56c80..4a7ca10af4 100644 --- a/boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c +++ b/boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c @@ -277,7 +277,7 @@ static uint8_t g_sdata[STM32F7_BBSRAM_SIZE]; static int hardfault_get_desc(struct bbsramd_s *desc) { - FAR struct file filestruct; + struct file filestruct; int ret; ret = file_open(&filestruct, HARDFAULT_PATH, O_RDONLY); @@ -379,16 +379,16 @@ int stm32_bbsram_int(void) ****************************************************************************/ #if defined(CONFIG_STM32F7_SAVE_CRASHDUMP) -void board_crashdump(uintptr_t currentsp, FAR void *tcb, - FAR const char *filename, int lineno) +void board_crashdump(uintptr_t currentsp, void *tcb, + const char *filename, int lineno) { fullcontext_t *pdump = (fullcontext_t *)&g_sdata; - FAR struct tcb_s *rtcb; + struct tcb_s *rtcb; int rv; enter_critical_section(); - rtcb = (FAR struct tcb_s *)tcb; + rtcb = (struct tcb_s *)tcb; /* Zero out everything */ diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c b/boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c index 0f94550847..73e23bd54a 100644 --- a/boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c +++ b/boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c @@ -90,7 +90,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c b/boards/arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c index 1f1eee6115..30121eb39c 100644 --- a/boards/arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c +++ b/boards/arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c @@ -111,7 +111,7 @@ void *fat_dma_alloc(size_t size) return gran_alloc(dma_allocator, size); } -void fat_dma_free(FAR void *memory, size_t size) +void fat_dma_free(void *memory, size_t size) { gran_free(dma_allocator, memory, size); } diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_gpio.c b/boards/arm/stm32f7/nucleo-144/src/stm32_gpio.c index d4b2516ef6..32847ea858 100644 --- a/boards/arm/stm32f7/nucleo-144/src/stm32_gpio.c +++ b/boards/arm/stm32f7/nucleo-144/src/stm32_gpio.c @@ -60,13 +60,13 @@ struct stm32gpint_dev_s * Private Function Prototypes ****************************************************************************/ -static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value); -static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value); -static int gpout_write(FAR struct gpio_dev_s *dev, bool value); -static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value); -static int gpint_attach(FAR struct gpio_dev_s *dev, +static int gpin_read(struct gpio_dev_s *dev, bool *value); +static int gpout_read(struct gpio_dev_s *dev, bool *value); +static int gpout_write(struct gpio_dev_s *dev, bool value); +static int gpint_read(struct gpio_dev_s *dev, bool *value); +static int gpint_attach(struct gpio_dev_s *dev, pin_interrupt_t callback); -static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable); +static int gpint_enable(struct gpio_dev_s *dev, bool enable); /**************************************************************************** * Private Data @@ -141,8 +141,8 @@ static struct stm32gpint_dev_s g_gpint[BOARD_NGPIOINT]; static int stm32gpio_interrupt(int irq, void *context, void *arg) { - FAR struct stm32gpint_dev_s *stm32gpint = - (FAR struct stm32gpint_dev_s *)arg; + struct stm32gpint_dev_s *stm32gpint = + (struct stm32gpint_dev_s *)arg; DEBUGASSERT(stm32gpint != NULL && stm32gpint->callback != NULL); gpioinfo("Interrupt! callback=%p\n", stm32gpint->callback); @@ -152,10 +152,10 @@ static int stm32gpio_interrupt(int irq, void *context, void *arg) return OK; } -static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpin_read(struct gpio_dev_s *dev, bool *value) { - FAR struct stm32gpio_dev_s *stm32gpio = - (FAR struct stm32gpio_dev_s *)dev; + struct stm32gpio_dev_s *stm32gpio = + (struct stm32gpio_dev_s *)dev; DEBUGASSERT(stm32gpio != NULL && value != NULL); DEBUGASSERT(stm32gpio->id < BOARD_NGPIOIN); @@ -165,10 +165,10 @@ static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value) return OK; } -static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpout_read(struct gpio_dev_s *dev, bool *value) { - FAR struct stm32gpio_dev_s *stm32gpio = - (FAR struct stm32gpio_dev_s *)dev; + struct stm32gpio_dev_s *stm32gpio = + (struct stm32gpio_dev_s *)dev; DEBUGASSERT(stm32gpio != NULL && value != NULL); DEBUGASSERT(stm32gpio->id < BOARD_NGPIOOUT); @@ -178,10 +178,10 @@ static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value) return OK; } -static int gpout_write(FAR struct gpio_dev_s *dev, bool value) +static int gpout_write(struct gpio_dev_s *dev, bool value) { - FAR struct stm32gpio_dev_s *stm32gpio = - (FAR struct stm32gpio_dev_s *)dev; + struct stm32gpio_dev_s *stm32gpio = + (struct stm32gpio_dev_s *)dev; DEBUGASSERT(stm32gpio != NULL); DEBUGASSERT(stm32gpio->id < BOARD_NGPIOOUT); @@ -191,10 +191,10 @@ static int gpout_write(FAR struct gpio_dev_s *dev, bool value) return OK; } -static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpint_read(struct gpio_dev_s *dev, bool *value) { - FAR struct stm32gpint_dev_s *stm32gpint = - (FAR struct stm32gpint_dev_s *)dev; + struct stm32gpint_dev_s *stm32gpint = + (struct stm32gpint_dev_s *)dev; DEBUGASSERT(stm32gpint != NULL && value != NULL); DEBUGASSERT(stm32gpint->stm32gpio.id < BOARD_NGPIOINT); @@ -204,11 +204,11 @@ static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value) return OK; } -static int gpint_attach(FAR struct gpio_dev_s *dev, +static int gpint_attach(struct gpio_dev_s *dev, pin_interrupt_t callback) { - FAR struct stm32gpint_dev_s *stm32gpint = - (FAR struct stm32gpint_dev_s *)dev; + struct stm32gpint_dev_s *stm32gpint = + (struct stm32gpint_dev_s *)dev; gpioinfo("Attaching the callback\n"); @@ -222,10 +222,10 @@ static int gpint_attach(FAR struct gpio_dev_s *dev, return OK; } -static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable) +static int gpint_enable(struct gpio_dev_s *dev, bool enable) { - FAR struct stm32gpint_dev_s *stm32gpint = - (FAR struct stm32gpint_dev_s *)dev; + struct stm32gpint_dev_s *stm32gpint = + (struct stm32gpint_dev_s *)dev; if (enable) { diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c b/boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c index 6d82a0bf7e..acef32049e 100644 --- a/boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c +++ b/boards/arm/stm32f7/nucleo-144/src/stm32_qencoder.c @@ -48,7 +48,7 @@ * ****************************************************************************/ -int stm32f7_qencoder_initialize(FAR const char *devpath, int timer) +int stm32f7_qencoder_initialize(const char *devpath, int timer) { int ret = 0; diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_sdio.c b/boards/arm/stm32f7/nucleo-144/src/stm32_sdio.c index 3526cba067..f8c7ff43f3 100644 --- a/boards/arm/stm32f7/nucleo-144/src/stm32_sdio.c +++ b/boards/arm/stm32f7/nucleo-144/src/stm32_sdio.c @@ -56,7 +56,7 @@ * Private Data ****************************************************************************/ -static FAR struct sdio_dev_s *g_sdio_dev; +static struct sdio_dev_s *g_sdio_dev; #ifdef HAVE_NCD static bool g_sd_inserted = 0xff; /* Impossible value */ #endif @@ -74,7 +74,7 @@ static bool g_sd_inserted = 0xff; /* Impossible value */ ****************************************************************************/ #ifdef HAVE_NCD -static int stm32_ncd_interrupt(int irq, FAR void *context) +static int stm32_ncd_interrupt(int irq, void *context) { bool present; diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_spi.c b/boards/arm/stm32f7/nucleo-144/src/stm32_spi.c index e113dd18a1..dce4c65ee0 100644 --- a/boards/arm/stm32f7/nucleo-144/src/stm32_spi.c +++ b/boards/arm/stm32f7/nucleo-144/src/stm32_spi.c @@ -258,7 +258,7 @@ void weak_function stm32_spidev_initialize(void) ****************************************************************************/ #ifdef CONFIG_STM32F7_SPI1 -void stm32_spi1select(FAR struct spi_dev_s *dev, +void stm32_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { uint32_t index = SPIDEVID_INDEX(devid); @@ -272,14 +272,14 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, } } -uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32F7_SPI2 -void stm32_spi2select(FAR struct spi_dev_s *dev, +void stm32_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { uint32_t index = SPIDEVID_INDEX(devid); @@ -293,14 +293,14 @@ void stm32_spi2select(FAR struct spi_dev_s *dev, } } -uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32F7_SPI3 -void stm32_spi3select(FAR struct spi_dev_s *dev, +void stm32_spi3select(struct spi_dev_s *dev, uint32_t devid, bool selected) { uint32_t index = SPIDEVID_INDEX(devid); @@ -314,49 +314,49 @@ void stm32_spi3select(FAR struct spi_dev_s *dev, } } -uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi3status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32F7_SPI4 -void stm32_spi4select(FAR struct spi_dev_s *dev, +void stm32_spi4select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi4status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32F7_SPI5 -void stm32_spi5select(FAR struct spi_dev_s *dev, +void stm32_spi5select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi5status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32F7_SPI6 -void stm32_spi6select(FAR struct spi_dev_s *dev, +void stm32_spi6select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi6status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi6status(struct spi_dev_s *dev, uint32_t devid) { return 0; } @@ -387,42 +387,42 @@ uint8_t stm32_spi6status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_STM32F7_SPI1 -int stm32_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32F7_SPI2 -int stm32_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32F7_SPI3 -int stm32_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32F7_SPI4 -int stm32_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi4cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32F7_SPI5 -int stm32_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi5cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32F7_SPI6 -int stm32_spi6cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi6cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_usb.c b/boards/arm/stm32f7/nucleo-144/src/stm32_usb.c index 0060192b4a..949692fc68 100644 --- a/boards/arm/stm32f7/nucleo-144/src/stm32_usb.c +++ b/boards/arm/stm32f7/nucleo-144/src/stm32_usb.c @@ -227,7 +227,7 @@ int stm32_usbhost_initialize(void) ret = kthread_create("usbhost", CONFIG_STM32F4DISCO_USBHOST_PRIO, CONFIG_STM32F4DISCO_USBHOST_STACKSIZE, - (main_t)usbhost_waiter, (FAR char * const *)NULL); + (main_t)usbhost_waiter, (char * const *)NULL); return ret < 0 ? -ENOEXEC : OK; } @@ -311,7 +311,7 @@ int stm32_setup_overcurrent(xcpt_t handler, void *arg) ****************************************************************************/ #ifdef CONFIG_USBDEV -void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) +void stm32_usbsuspend(struct usbdev_s *dev, bool resume) { uinfo("resume: %d\n", resume); } diff --git a/boards/arm/stm32f7/stm32f746-ws/src/stm32_appinitialize.c b/boards/arm/stm32f7/stm32f746-ws/src/stm32_appinitialize.c index d9c13e95f0..bf391648f1 100644 --- a/boards/arm/stm32f7/stm32f746-ws/src/stm32_appinitialize.c +++ b/boards/arm/stm32f7/stm32f746-ws/src/stm32_appinitialize.c @@ -33,7 +33,7 @@ static void stm32_i2c_register(int bus) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; i2c = stm32_i2cbus_initialize(bus); diff --git a/boards/arm/stm32f7/stm32f746-ws/src/stm32_dma_alloc.c b/boards/arm/stm32f7/stm32f746-ws/src/stm32_dma_alloc.c index b2146b11b5..d9955de197 100644 --- a/boards/arm/stm32f7/stm32f746-ws/src/stm32_dma_alloc.c +++ b/boards/arm/stm32f7/stm32f746-ws/src/stm32_dma_alloc.c @@ -111,7 +111,7 @@ void *fat_dma_alloc(size_t size) return gran_alloc(dma_allocator, size); } -void fat_dma_free(FAR void *memory, size_t size) +void fat_dma_free(void *memory, size_t size) { gran_free(dma_allocator, memory, size); } diff --git a/boards/arm/stm32f7/stm32f746-ws/src/stm32_sdmmc.c b/boards/arm/stm32f7/stm32f746-ws/src/stm32_sdmmc.c index 166b845be3..8e0ef27255 100644 --- a/boards/arm/stm32f7/stm32f746-ws/src/stm32_sdmmc.c +++ b/boards/arm/stm32f7/stm32f746-ws/src/stm32_sdmmc.c @@ -52,7 +52,7 @@ * Private Data ****************************************************************************/ -static FAR struct sdio_dev_s *g_sdio_dev; +static struct sdio_dev_s *g_sdio_dev; #ifdef HAVE_NCD static bool g_sd_inserted = 0xff; /* Impossible value */ #endif @@ -70,7 +70,7 @@ static bool g_sd_inserted = 0xff; /* Impossible value */ ****************************************************************************/ #ifdef HAVE_NCD -static int stm32_ncd_interrupt(int irq, FAR void *context) +static int stm32_ncd_interrupt(int irq, void *context) { bool present; diff --git a/boards/arm/stm32f7/stm32f746-ws/src/stm32_spi.c b/boards/arm/stm32f7/stm32f746-ws/src/stm32_spi.c index 8499472e8e..daa56e12bc 100644 --- a/boards/arm/stm32f7/stm32f746-ws/src/stm32_spi.c +++ b/boards/arm/stm32f7/stm32f746-ws/src/stm32_spi.c @@ -86,84 +86,84 @@ void weak_function stm32_spidev_initialize(void) ****************************************************************************/ #ifdef CONFIG_STM32F7_SPI1 -void stm32_spi1select(FAR struct spi_dev_s *dev, +void stm32_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32F7_SPI2 -void stm32_spi2select(FAR struct spi_dev_s *dev, +void stm32_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32F7_SPI3 -void stm32_spi3select(FAR struct spi_dev_s *dev, +void stm32_spi3select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi3status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32F7_SPI4 -void stm32_spi4select(FAR struct spi_dev_s *dev, +void stm32_spi4select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi4status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32F7_SPI5 -void stm32_spi5select(FAR struct spi_dev_s *dev, +void stm32_spi5select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi5status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32F7_SPI6 -void stm32_spi6select(FAR struct spi_dev_s *dev, +void stm32_spi6select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi6status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi6status(struct spi_dev_s *dev, uint32_t devid) { return 0; } @@ -194,42 +194,42 @@ uint8_t stm32_spi6status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_STM32F7_SPI1 -int stm32_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32F7_SPI2 -int stm32_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32F7_SPI3 -int stm32_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32F7_SPI4 -int stm32_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi4cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32F7_SPI5 -int stm32_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi5cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32F7_SPI6 -int stm32_spi6cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi6cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } diff --git a/boards/arm/stm32f7/stm32f746-ws/src/stm32_usb.c b/boards/arm/stm32f7/stm32f746-ws/src/stm32_usb.c index 673917f482..07ff019781 100644 --- a/boards/arm/stm32f7/stm32f746-ws/src/stm32_usb.c +++ b/boards/arm/stm32f7/stm32f746-ws/src/stm32_usb.c @@ -229,7 +229,7 @@ int stm32_usbhost_initialize(void) ret = kthread_create("usbhost", CONFIG_STM32F7F4DISCO_USBHOST_PRIO, CONFIG_STM32F7F4DISCO_USBHOST_STACKSIZE, - (main_t)usbhost_waiter, (FAR char * const *)NULL); + (main_t)usbhost_waiter, (char * const *)NULL); return ret < 0 ? -ENOEXEC : OK; } @@ -322,7 +322,7 @@ int stm32_setup_overcurrent(xcpt_t handler, void *arg) ****************************************************************************/ #ifdef CONFIG_USBDEV -void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) +void stm32_usbsuspend(struct usbdev_s *dev, bool resume) { uinfo("resume: %d\n", resume); } diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_buttons.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_buttons.c index f53b27fecc..08fc283ccb 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_buttons.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_buttons.c @@ -89,7 +89,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_lcd.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_lcd.c index 43c0378726..ba000d2560 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_lcd.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_lcd.c @@ -91,7 +91,7 @@ int up_fbinitialize(int display) * ****************************************************************************/ -FAR struct fb_vtable_s *up_fbgetvplane(int display, int vplane) +struct fb_vtable_s *up_fbgetvplane(int display, int vplane) { return stm32_ltdcgetvplane(vplane); } diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_n25q.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_n25q.c index 00ebc3ffaf..8dd8296d2d 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_n25q.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_n25q.c @@ -75,8 +75,8 @@ int stm32_n25qxxx_setup(void) { - FAR struct qspi_dev_s *qspi_dev ; - FAR struct mtd_dev_s *mtd_dev; + struct qspi_dev_s *qspi_dev; + struct mtd_dev_s *mtd_dev; int ret = -1; qspi_dev = stm32f7_qspi_initialize(0); diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_sdmmc.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_sdmmc.c index 39a282b0b9..f042b37ed4 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_sdmmc.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_sdmmc.c @@ -53,7 +53,7 @@ * Private Data ****************************************************************************/ -static FAR struct sdio_dev_s *g_sdio_dev; +static struct sdio_dev_s *g_sdio_dev; #ifdef HAVE_NCD static bool g_sd_inserted = 0xff; /* Impossible value */ #endif @@ -71,7 +71,7 @@ static bool g_sd_inserted = 0xff; /* Impossible value */ ****************************************************************************/ #ifdef HAVE_NCD -static int stm32_ncd_interrupt(int irq, FAR void *context, FAR void *param) +static int stm32_ncd_interrupt(int irq, void *context, void *param) { bool present; diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_spi.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_spi.c index 55b62805bd..7083b1aefd 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_spi.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_spi.c @@ -86,70 +86,70 @@ void weak_function stm32_spidev_initialize(void) ****************************************************************************/ #ifdef CONFIG_STM32F7_SPI1 -void stm32_spi1select(FAR struct spi_dev_s *dev, +void stm32_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32F7_SPI2 -void stm32_spi2select(FAR struct spi_dev_s *dev, +void stm32_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32F7_SPI3 -void stm32_spi3select(FAR struct spi_dev_s *dev, +void stm32_spi3select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi3status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32F7_SPI4 -void stm32_spi4select(FAR struct spi_dev_s *dev, +void stm32_spi4select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi4status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32F7_SPI5 -void stm32_spi5select(FAR struct spi_dev_s *dev, +void stm32_spi5select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi5status(struct spi_dev_s *dev, uint32_t devid) { return 0; } @@ -180,35 +180,35 @@ uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_STM32F7_SPI1 -int stm32_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32F7_SPI2 -int stm32_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32F7_SPI3 -int stm32_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32F7_SPI4 -int stm32_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi4cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32F7_SPI5 -int stm32_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi5cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_sporadic.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_sporadic.c index 3b64fadd3b..159a149fd6 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_sporadic.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_sporadic.c @@ -55,22 +55,22 @@ void arch_sporadic_initialize(void) stm32_configgpio(GPIO_SCHED_RUNNING); } -void arch_sporadic_start(FAR struct tcb_s *tcb) +void arch_sporadic_start(struct tcb_s *tcb) { stm32_gpiowrite(GPIO_SCHED_HIGHPRI, true); } -void arch_sporadic_lowpriority(FAR struct tcb_s *tcb) +void arch_sporadic_lowpriority(struct tcb_s *tcb) { stm32_gpiowrite(GPIO_SCHED_HIGHPRI, false); } -void arch_sporadic_suspend(FAR struct tcb_s *tcb) +void arch_sporadic_suspend(struct tcb_s *tcb) { stm32_gpiowrite(GPIO_SCHED_RUNNING, false); } -void arch_sporadic_resume(FAR struct tcb_s *tcb) +void arch_sporadic_resume(struct tcb_s *tcb) { stm32_gpiowrite(GPIO_SCHED_RUNNING, true); } diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_touchscreen.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_touchscreen.c index ef22bf2a83..9d12da6b6f 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_touchscreen.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_touchscreen.c @@ -68,8 +68,8 @@ struct stm32_ft5x06_config_s { - xcpt_t handler; /* The FT5x06 interrupt handler */ - FAR void *arg; /* Interrupt handler argument */ + xcpt_t handler; /* The FT5x06 interrupt handler */ + void *arg; /* Interrupt handler argument */ }; /**************************************************************************** @@ -77,14 +77,14 @@ struct stm32_ft5x06_config_s ****************************************************************************/ #ifndef CONFIG_FT5X06_POLLMODE -static int stm32_ft5x06_attach(FAR const struct ft5x06_config_s *config, - xcpt_t isr, FAR void *arg); -static void stm32_ft5x06_enable(FAR const struct ft5x06_config_s *config, +static int stm32_ft5x06_attach(const struct ft5x06_config_s *config, + xcpt_t isr, void *arg); +static void stm32_ft5x06_enable(const struct ft5x06_config_s *config, bool enable); -static void stm32_ft5x06_clear(FAR const struct ft5x06_config_s *config); +static void stm32_ft5x06_clear(const struct ft5x06_config_s *config); #endif -static void stm32_ft5x06_wakeup(FAR const struct ft5x06_config_s *config); -static void stm32_ft5x06_nreset(FAR const struct ft5x06_config_s *config, +static void stm32_ft5x06_wakeup(const struct ft5x06_config_s *config); +static void stm32_ft5x06_nreset(const struct ft5x06_config_s *config, bool state); /**************************************************************************** @@ -123,8 +123,8 @@ static struct stm32_ft5x06_config_s g_priv_config = ****************************************************************************/ #ifndef CONFIG_FT5X06_POLLMODE -static int stm32_ft5x06_attach(FAR const struct ft5x06_config_s *config, - xcpt_t isr, FAR void *arg) +static int stm32_ft5x06_attach(const struct ft5x06_config_s *config, + xcpt_t isr, void *arg) { iinfo("Saving handler %p\n", isr); @@ -161,7 +161,7 @@ static int stm32_ft5x06_attach(FAR const struct ft5x06_config_s *config, ****************************************************************************/ #ifndef CONFIG_FT5X06_POLLMODE -static void stm32_ft5x06_enable(FAR const struct ft5x06_config_s *config, +static void stm32_ft5x06_enable(const struct ft5x06_config_s *config, bool enable) { irqstate_t flags; @@ -200,7 +200,7 @@ static void stm32_ft5x06_enable(FAR const struct ft5x06_config_s *config, ****************************************************************************/ #ifndef CONFIG_FT5X06_POLLMODE -static void stm32_ft5x06_clear(FAR const struct ft5x06_config_s *config) +static void stm32_ft5x06_clear(const struct ft5x06_config_s *config) { /* Does nothing */ } @@ -215,7 +215,7 @@ static void stm32_ft5x06_clear(FAR const struct ft5x06_config_s *config) * ****************************************************************************/ -static void stm32_ft5x06_wakeup(FAR const struct ft5x06_config_s *config) +static void stm32_ft5x06_wakeup(const struct ft5x06_config_s *config) { /* We do not have access to the WAKE pin in the implementation */ } @@ -228,7 +228,7 @@ static void stm32_ft5x06_wakeup(FAR const struct ft5x06_config_s *config) * ****************************************************************************/ -static void stm32_ft5x06_nreset(FAR const struct ft5x06_config_s *config, +static void stm32_ft5x06_nreset(const struct ft5x06_config_s *config, bool nstate) { /* We do not have access to the RESET pin in the implementation */ @@ -257,7 +257,7 @@ static void stm32_ft5x06_nreset(FAR const struct ft5x06_config_s *config, int stm32_tsc_setup(int minor) { - FAR struct i2c_master_s *dev; + struct i2c_master_s *dev; int ret; iinfo("minor %d\n", minor); diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_wm8994.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_wm8994.c index 3fd994d297..25337149e4 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_wm8994.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_wm8994.c @@ -63,22 +63,22 @@ struct stm32_mwinfo_s * Private Functions ****************************************************************************/ -static int wm8994_attach(FAR const struct wm8994_lower_s *lower, - wm8994_handler_t isr, FAR void *arg) +static int wm8994_attach(const struct wm8994_lower_s *lower, + wm8994_handler_t isr, void *arg) { audinfo("TODO\n"); return 0; } -static bool wm8994_enable(FAR const struct wm8994_lower_s *lower, - bool enable) +static bool wm8994_enable(const struct wm8994_lower_s *lower, + bool enable) { audinfo("TODO\n"); return 0; } #if 0 -static void wm8994_hw_reset(FAR const struct wm8994_lower_s *lower) +static void wm8994_hw_reset(const struct wm8994_lower_s *lower) { audinfo("TODO\n"); } @@ -131,9 +131,9 @@ static struct stm32_mwinfo_s g_wm8994 = int stm32_wm8994_initialize(int minor) { - FAR struct audio_lowerhalf_s *wm8994; - FAR struct i2c_master_s *i2c; - FAR struct i2s_dev_s *i2s; + struct audio_lowerhalf_s *wm8994; + struct i2c_master_s *i2c; + struct i2s_dev_s *i2s; static bool initialized = false; char devname[12]; int ret; diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_buttons.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_buttons.c index 4f90f8701f..43cd8b767e 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_buttons.c +++ b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_buttons.c @@ -87,7 +87,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { #warning Missing logic return -ENOSYS; diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_spi.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_spi.c index 57d00318d4..161dafd16e 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_spi.c +++ b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_spi.c @@ -86,70 +86,70 @@ void weak_function stm32_spidev_initialize(void) ****************************************************************************/ #ifdef CONFIG_STM32F7_SPI1 -void stm32_spi1select(FAR struct spi_dev_s *dev, +void stm32_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32F7_SPI2 -void stm32_spi2select(FAR struct spi_dev_s *dev, +void stm32_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32F7_SPI3 -void stm32_spi3select(FAR struct spi_dev_s *dev, +void stm32_spi3select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi3status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32F7_SPI4 -void stm32_spi4select(FAR struct spi_dev_s *dev, +void stm32_spi4select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi4status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32F7_SPI5 -void stm32_spi5select(FAR struct spi_dev_s *dev, +void stm32_spi5select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi5status(struct spi_dev_s *dev, uint32_t devid) { return 0; } @@ -180,35 +180,35 @@ uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_STM32F7_SPI1 -int stm32_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32F7_SPI2 -int stm32_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32F7_SPI3 -int stm32_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32F7_SPI4 -int stm32_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi4cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32F7_SPI5 -int stm32_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi5cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_sporadic.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_sporadic.c index c4ca1b89ad..d110e27398 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_sporadic.c +++ b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_sporadic.c @@ -55,22 +55,22 @@ void arch_sporadic_initialize(void) stm32_configgpio(GPIO_SCHED_RUNNING); } -void arch_sporadic_start(FAR struct tcb_s *tcb) +void arch_sporadic_start(struct tcb_s *tcb) { stm32_gpiowrite(GPIO_SCHED_HIGHPRI, true); } -void arch_sporadic_lowpriority(FAR struct tcb_s *tcb) +void arch_sporadic_lowpriority(struct tcb_s *tcb) { stm32_gpiowrite(GPIO_SCHED_HIGHPRI, false); } -void arch_sporadic_suspend(FAR struct tcb_s *tcb) +void arch_sporadic_suspend(struct tcb_s *tcb) { stm32_gpiowrite(GPIO_SCHED_RUNNING, false); } -void arch_sporadic_resume(FAR struct tcb_s *tcb) +void arch_sporadic_resume(struct tcb_s *tcb) { stm32_gpiowrite(GPIO_SCHED_RUNNING, true); } diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_buttons.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_buttons.c index 6a0ea8197a..0bfa05aae7 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_buttons.c +++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_buttons.c @@ -89,7 +89,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_gpio.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_gpio.c index 43753d90cc..78fc98d551 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_gpio.c +++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_gpio.c @@ -60,13 +60,13 @@ struct stm32gpint_dev_s * Private Function Prototypes ****************************************************************************/ -static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value); -static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value); -static int gpout_write(FAR struct gpio_dev_s *dev, bool value); -static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value); -static int gpint_attach(FAR struct gpio_dev_s *dev, +static int gpin_read(struct gpio_dev_s *dev, bool *value); +static int gpout_read(struct gpio_dev_s *dev, bool *value); +static int gpout_write(struct gpio_dev_s *dev, bool value); +static int gpint_read(struct gpio_dev_s *dev, bool *value); +static int gpint_attach(struct gpio_dev_s *dev, pin_interrupt_t callback); -static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable); +static int gpint_enable(struct gpio_dev_s *dev, bool enable); /**************************************************************************** * Private Data @@ -135,8 +135,8 @@ static struct stm32gpint_dev_s g_gpint[BOARD_NGPIOINT]; static int stm32gpio_interrupt(int irq, void *context, void *arg) { - FAR struct stm32gpint_dev_s *stm32gpint = - (FAR struct stm32gpint_dev_s *)arg; + struct stm32gpint_dev_s *stm32gpint = + (struct stm32gpint_dev_s *)arg; DEBUGASSERT(stm32gpint != NULL && stm32gpint->callback != NULL); gpioinfo("Interrupt! callback=%p\n", stm32gpint->callback); @@ -146,10 +146,10 @@ static int stm32gpio_interrupt(int irq, void *context, void *arg) return OK; } -static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpin_read(struct gpio_dev_s *dev, bool *value) { - FAR struct stm32gpio_dev_s *stm32gpio = - (FAR struct stm32gpio_dev_s *)dev; + struct stm32gpio_dev_s *stm32gpio = + (struct stm32gpio_dev_s *)dev; DEBUGASSERT(stm32gpio != NULL && value != NULL); DEBUGASSERT(stm32gpio->id < BOARD_NGPIOIN); @@ -159,10 +159,10 @@ static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value) return OK; } -static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpout_read(struct gpio_dev_s *dev, bool *value) { - FAR struct stm32gpio_dev_s *stm32gpio = - (FAR struct stm32gpio_dev_s *)dev; + struct stm32gpio_dev_s *stm32gpio = + (struct stm32gpio_dev_s *)dev; DEBUGASSERT(stm32gpio != NULL && value != NULL); DEBUGASSERT(stm32gpio->id < BOARD_NGPIOOUT); @@ -172,10 +172,10 @@ static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value) return OK; } -static int gpout_write(FAR struct gpio_dev_s *dev, bool value) +static int gpout_write(struct gpio_dev_s *dev, bool value) { - FAR struct stm32gpio_dev_s *stm32gpio = - (FAR struct stm32gpio_dev_s *)dev; + struct stm32gpio_dev_s *stm32gpio = + (struct stm32gpio_dev_s *)dev; DEBUGASSERT(stm32gpio != NULL); DEBUGASSERT(stm32gpio->id < BOARD_NGPIOOUT); @@ -185,10 +185,10 @@ static int gpout_write(FAR struct gpio_dev_s *dev, bool value) return OK; } -static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpint_read(struct gpio_dev_s *dev, bool *value) { - FAR struct stm32gpint_dev_s *stm32gpint = - (FAR struct stm32gpint_dev_s *)dev; + struct stm32gpint_dev_s *stm32gpint = + (struct stm32gpint_dev_s *)dev; DEBUGASSERT(stm32gpint != NULL && value != NULL); DEBUGASSERT(stm32gpint->stm32gpio.id < BOARD_NGPIOINT); @@ -198,11 +198,11 @@ static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value) return OK; } -static int gpint_attach(FAR struct gpio_dev_s *dev, +static int gpint_attach(struct gpio_dev_s *dev, pin_interrupt_t callback) { - FAR struct stm32gpint_dev_s *stm32gpint = - (FAR struct stm32gpint_dev_s *)dev; + struct stm32gpint_dev_s *stm32gpint = + (struct stm32gpint_dev_s *)dev; gpioinfo("Attaching the callback\n"); @@ -216,10 +216,10 @@ static int gpint_attach(FAR struct gpio_dev_s *dev, return OK; } -static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable) +static int gpint_enable(struct gpio_dev_s *dev, bool enable) { - FAR struct stm32gpint_dev_s *stm32gpint = - (FAR struct stm32gpint_dev_s *)dev; + struct stm32gpint_dev_s *stm32gpint = + (struct stm32gpint_dev_s *)dev; if (enable) { diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_lsm303agr.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_lsm303agr.c index 67a95ec5ad..fd13a31538 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_lsm303agr.c +++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_lsm303agr.c @@ -55,7 +55,7 @@ int stm32_lsm303agr_initialize(char *devpath) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret = OK; sninfo("INFO: Initializing LMS303AGR sensor over I2C\n"); diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_lsm6dsl.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_lsm6dsl.c index 3fbe2f531a..4be8be6a30 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_lsm6dsl.c +++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_lsm6dsl.c @@ -55,7 +55,7 @@ int stm32_lsm6dsl_initialize(char *devpath) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret = OK; sninfo("Initializing LMS6DSL!\n"); diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_lsm9ds1.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_lsm9ds1.c index e92b739928..2c1c76eb40 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_lsm9ds1.c +++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_lsm9ds1.c @@ -59,7 +59,7 @@ int stm32_lsm9ds1_initialize(void) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret = OK; sninfo("Initializing LMS9DS1!\n"); diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_nrf24l01.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_nrf24l01.c index f3ae490599..74508dde0a 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_nrf24l01.c +++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_nrf24l01.c @@ -48,7 +48,7 @@ * Private Function Prototypes ****************************************************************************/ -static int nrf24l01_irq_attach(xcpt_t isr, FAR void *arg); +static int nrf24l01_irq_attach(xcpt_t isr, void *arg); static void nrf24l01_chip_enable(bool enable); /**************************************************************************** @@ -62,13 +62,13 @@ static struct nrf24l01_config_s nrf_cfg = }; static xcpt_t g_isr; -static FAR void *g_arg; +static void *g_arg; /**************************************************************************** * Private Functions ****************************************************************************/ -static int nrf24l01_irq_attach(xcpt_t isr, FAR void *arg) +static int nrf24l01_irq_attach(xcpt_t isr, void *arg) { wlinfo("Attach IRQ\n"); g_isr = isr; @@ -89,7 +89,7 @@ static void nrf24l01_chip_enable(bool enable) int stm32_wlinitialize(void) { - FAR struct spi_dev_s *spidev; + struct spi_dev_s *spidev; int ret = OK; syslog(LOG_INFO, "Register the nRF24L01 module\n"); diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_pca9635.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_pca9635.c index 9e900a556b..46c7bac27f 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_pca9635.c +++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_pca9635.c @@ -59,7 +59,7 @@ int stm32_pca9635_initialize(void) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; /* Get the I2C driver that interfaces with the pca9635 */ diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_spi.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_spi.c index aac9345fe7..18f0b0970a 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_spi.c +++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_spi.c @@ -100,35 +100,35 @@ void stm32_spidev_initialize(void) ****************************************************************************/ #ifdef CONFIG_STM32H7_SPI1 -void stm32_spi1select(FAR struct spi_dev_s *dev, +void stm32_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %08lx CS: %s\n", (unsigned long)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32H7_SPI2 -void stm32_spi2select(FAR struct spi_dev_s *dev, +void stm32_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %08lx CS: %s\n", (unsigned long)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32H7_SPI3 -void stm32_spi3select(FAR struct spi_dev_s *dev, +void stm32_spi3select(struct spi_dev_s *dev, uint32_t devid, bool selected) { switch (devid) @@ -148,7 +148,7 @@ void stm32_spi3select(FAR struct spi_dev_s *dev, } } -uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi3status(struct spi_dev_s *dev, uint32_t devid) { uint8_t status = 0; switch (devid) @@ -167,42 +167,42 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) #endif #ifdef CONFIG_STM32H7_SPI4 -void stm32_spi4select(FAR struct spi_dev_s *dev, +void stm32_spi4select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %08lx CS: %s\n", (unsigned long)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi4status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32H7_SPI5 -void stm32_spi5select(FAR struct spi_dev_s *dev, +void stm32_spi5select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %08lx CS: %s\n", (unsigned long)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi5status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32H7_SPI6 -void stm32_spi6select(FAR struct spi_dev_s *dev, +void stm32_spi6select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %08lx CS: %s\n", (unsigned long)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi6status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi6status(struct spi_dev_s *dev, uint32_t devid) { return 0; } @@ -233,42 +233,42 @@ uint8_t stm32_spi6status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_STM32H7_SPI1 -int stm32_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32H7_SPI2 -int stm32_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32H7_SPI3 -int stm32_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32H7_SPI4 -int stm32_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi4cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32H7_SPI5 -int stm32_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi5cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32H7_SPI6 -int stm32_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi5cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_ssd1306.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_ssd1306.c index e5c0b9e122..868c0d8dde 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_ssd1306.c +++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_ssd1306.c @@ -48,8 +48,8 @@ * Private Data ****************************************************************************/ -FAR struct i2c_master_s *g_i2c; -FAR struct lcd_dev_s *g_lcddev; +struct i2c_master_s *g_i2c; +struct lcd_dev_s *g_lcddev; /**************************************************************************** * Public Functions @@ -77,7 +77,7 @@ int board_lcd_initialize(void) * Name: board_lcd_getdev ****************************************************************************/ -FAR struct lcd_dev_s *board_lcd_getdev(int devno) +struct lcd_dev_s *board_lcd_getdev(int devno) { /* Bind the I2C port to the OLED */ diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_usb.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_usb.c index b9ed68043a..70b1b4a5f2 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_usb.c +++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_usb.c @@ -227,7 +227,7 @@ int stm32_usbhost_initialize(void) ret = kthread_create("usbhost", CONFIG_NUCLEOH743ZI_USBHOST_PRIO, CONFIG_NUCLEOH743ZI_USBHOST_STACKSIZE, - (main_t)usbhost_waiter, (FAR char * const *)NULL); + (main_t)usbhost_waiter, (char * const *)NULL); return ret < 0 ? -ENOEXEC : OK; } @@ -311,7 +311,7 @@ int stm32_setup_overcurrent(xcpt_t handler, void *arg) ****************************************************************************/ #ifdef CONFIG_USBDEV -void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) +void stm32_usbsuspend(struct usbdev_s *dev, bool resume) { uinfo("resume: %d\n", resume); } diff --git a/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_boot.c b/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_boot.c index 31b642fa78..65d8f00ee9 100644 --- a/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_boot.c +++ b/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_boot.c @@ -51,7 +51,7 @@ void stm32_boardinitialize(void) { #ifdef CONFIG_SCHED_IRQMONITOR - up_perf_init((FAR void *)STM32_SYSCLK_FREQUENCY); + up_perf_init((void *)STM32_SYSCLK_FREQUENCY); #endif #ifdef CONFIG_ARCH_LEDS diff --git a/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_bringup.c b/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_bringup.c index 7a59423a5a..edcf02b752 100644 --- a/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_bringup.c +++ b/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_bringup.c @@ -66,7 +66,7 @@ int stm32_bringup(void) { int ret; #ifdef CONFIG_RAMMTD - FAR uint8_t *ramstart; + uint8_t *ramstart; #endif UNUSED(ret); @@ -95,7 +95,7 @@ int stm32_bringup(void) #ifdef CONFIG_RAMMTD /* Create a RAM MTD device if configured */ - ramstart = (FAR uint8_t *)kmm_malloc(128 * 1024); + ramstart = (uint8_t *)kmm_malloc(128 * 1024); if (ramstart == NULL) { syslog(LOG_ERR, "ERROR: Allocation for RAM MTD failed\n"); @@ -104,7 +104,7 @@ int stm32_bringup(void) { /* Initialized the RAM MTD */ - FAR struct mtd_dev_s *mtd = rammtd_initialize(ramstart, 128 * 1024); + struct mtd_dev_s *mtd = rammtd_initialize(ramstart, 128 * 1024); if (mtd == NULL) { syslog(LOG_ERR, "ERROR: rammtd_initialize failed\n"); diff --git a/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_usb.c b/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_usb.c index a786898300..a6acd582e2 100644 --- a/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_usb.c +++ b/boards/arm/stm32h7/nucleo-h743zi2/src/stm32_usb.c @@ -227,7 +227,7 @@ int stm32_usbhost_initialize(void) ret = kthread_create("usbhost", CONFIG_USBHOST_DEFPRIO, CONFIG_USBHOST_STACKSIZE, - (main_t)usbhost_waiter, (FAR char * const *)NULL); + (main_t)usbhost_waiter, (char * const *)NULL); return ret < 0 ? -ENOEXEC : OK; } @@ -311,7 +311,7 @@ int stm32_setup_overcurrent(xcpt_t handler, void *arg) ****************************************************************************/ #ifdef CONFIG_USBDEV -void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) +void stm32_usbsuspend(struct usbdev_s *dev, bool resume) { uinfo("resume: %d\n", resume); } diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_bringup.c b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_bringup.c index f33e03ef08..c7e733aac0 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_bringup.c +++ b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_bringup.c @@ -56,7 +56,7 @@ #if defined(CONFIG_I2C) && defined(CONFIG_SYSTEM_I2CTOOL) static void stm32_i2c_register(int bus) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; i2c = stm32_i2cbus_initialize(bus); @@ -126,7 +126,7 @@ int stm32_bringup(void) { int ret = OK; #ifdef HAVE_RTC_DRIVER - FAR struct rtc_lowerhalf_s *lower; + struct rtc_lowerhalf_s *lower; #endif UNUSED(ret); diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_buttons.c b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_buttons.c index 65380eb108..b6cfb473e1 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_buttons.c +++ b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_buttons.c @@ -89,7 +89,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_dma_alloc.c b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_dma_alloc.c index ecb8ea9fdf..700c00f94d 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_dma_alloc.c +++ b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_dma_alloc.c @@ -97,7 +97,7 @@ void *fat_dma_alloc(size_t size) return gran_alloc(dma_allocator, size); } -void fat_dma_free(FAR void *memory, size_t size) +void fat_dma_free(void *memory, size_t size) { gran_free(dma_allocator, memory, size); } diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_sdmmc.c b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_sdmmc.c index 58d1d9b795..f897baf384 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_sdmmc.c +++ b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_sdmmc.c @@ -53,7 +53,7 @@ * Private Data ****************************************************************************/ -static FAR struct sdio_dev_s *g_sdio_dev; +static struct sdio_dev_s *g_sdio_dev; #ifdef HAVE_NCD static bool g_sd_inserted = 0xff; /* Impossible value */ #endif @@ -71,7 +71,7 @@ static bool g_sd_inserted = 0xff; /* Impossible value */ ****************************************************************************/ #ifdef HAVE_NCD -static int stm32_ncd_interrupt(int irq, FAR void *context, FAR void *param) +static int stm32_ncd_interrupt(int irq, void *context, void *param) { bool present; diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_spi.c b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_spi.c index 9066228770..eafc3f7cc5 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_spi.c +++ b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_spi.c @@ -90,35 +90,35 @@ void stm32_spidev_initialize(void) ****************************************************************************/ #ifdef CONFIG_STM32H7_SPI1 -void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, +void stm32_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %08lx CS: %s\n", (unsigned long)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32H7_SPI2 -void stm32_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, +void stm32_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %08lx CS: %s\n", (unsigned long)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32H7_SPI3 -void stm32_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, +void stm32_spi3select(struct spi_dev_s *dev, uint32_t devid, bool selected) { switch (devid) @@ -128,7 +128,7 @@ void stm32_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, } } -uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi3status(struct spi_dev_s *dev, uint32_t devid) { uint8_t status = 0; switch (devid) @@ -142,42 +142,42 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) #endif #ifdef CONFIG_STM32H7_SPI4 -void stm32_spi4select(FAR struct spi_dev_s *dev, uint32_t devid, +void stm32_spi4select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %08lx CS: %s\n", (unsigned long)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi4status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi4status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32H7_SPI5 -void stm32_spi5select(FAR struct spi_dev_s *dev, uint32_t devid, +void stm32_spi5select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %08lx CS: %s\n", (unsigned long)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi5status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi5status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32H7_SPI6 -void stm32_spi6select(FAR struct spi_dev_s *dev, uint32_t devid, +void stm32_spi6select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %08lx CS: %s\n", (unsigned long)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi6status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi6status(struct spi_dev_s *dev, uint32_t devid) { return 0; } @@ -208,42 +208,42 @@ uint8_t stm32_spi6status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_STM32H7_SPI1 -int stm32_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32H7_SPI2 -int stm32_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32H7_SPI3 -int stm32_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32H7_SPI4 -int stm32_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi4cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32H7_SPI5 -int stm32_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi5cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32H7_SPI6 -int stm32_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi5cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_usb.c b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_usb.c index 460870ed29..384f6c3d8e 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_usb.c +++ b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_usb.c @@ -218,7 +218,7 @@ int stm32_usbhost_initialize(void) ret = kthread_create("usbhost", CONFIG_STM32H747XI_DISCO_USBHOST_PRIO, CONFIG_STM32H747XI_DISCO_USBHOST_STACKSIZE, - (main_t)usbhost_waiter, (FAR char * const *)NULL); + (main_t)usbhost_waiter, (char * const *)NULL); return ret < 0 ? -ENOEXEC : OK; } @@ -298,7 +298,7 @@ int stm32_setup_overcurrent(xcpt_t handler, void *arg) ****************************************************************************/ #ifdef CONFIG_USBDEV -void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) +void stm32_usbsuspend(struct usbdev_s *dev, bool resume) { uinfo("resume: %d\n", resume); } diff --git a/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_bringup.c b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_bringup.c index d8cfc9a0de..a193c73993 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_bringup.c +++ b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_bringup.c @@ -92,8 +92,8 @@ int stm32l4_bringup(void) { /* Create an instance of the STM32L4 QSPI device driver */ - FAR struct qspi_dev_s *g_qspi; - FAR struct mtd_dev_s *g_mtd_fs; + struct qspi_dev_s *g_qspi; + struct mtd_dev_s *g_mtd_fs; g_qspi = stm32l4_qspi_initialize(0); if (g_qspi == NULL) @@ -122,9 +122,9 @@ int stm32l4_bringup(void) int partoffset; int partszbytes; int erasesize; - FAR struct mtd_geometry_s geo; + struct mtd_geometry_s geo; const char *ptr = CONFIG_B_L475E_IOT01A_MTD_PART_LIST; - FAR struct mtd_dev_s *mtd_part; + struct mtd_dev_s *mtd_part; char partref[16]; /* Now create a partition on the FLASH device */ diff --git a/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_spi.c b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_spi.c index ee064f7c5e..28ed5b5693 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_spi.c +++ b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_spi.c @@ -147,35 +147,35 @@ void weak_function stm32l4_spidev_initialize(void) ****************************************************************************/ #ifdef CONFIG_STM32L4_SPI1 -void stm32l4_spi1select(FAR struct spi_dev_s *dev, +void stm32l4_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32l4_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32l4_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32L4_SPI2 -void stm32l4_spi2select(FAR struct spi_dev_s *dev, +void stm32l4_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32l4_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32l4_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32L4_SPI3 -void stm32l4_spi3select(FAR struct spi_dev_s *dev, +void stm32l4_spi3select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", @@ -189,7 +189,7 @@ void stm32l4_spi3select(FAR struct spi_dev_s *dev, #endif } -uint8_t stm32l4_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32l4_spi3status(struct spi_dev_s *dev, uint32_t devid) { return 0; } @@ -220,21 +220,21 @@ uint8_t stm32l4_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_STM32L4_SPI1 -int stm32l4_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32l4_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef CONFIG_STM32L4_SPI2 -int stm32l4_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32l4_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef CONFIG_STM32L4_SPI3 -int stm32l4_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32l4_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } diff --git a/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_spirit.c b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_spirit.c index d39d4422f0..a606a28070 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_spirit.c +++ b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_spirit.c @@ -61,7 +61,7 @@ struct stm32l4_priv_s { struct spirit_lower_s dev; xcpt_t handler; - FAR void *arg; + void *arg; uint32_t intcfg; uint32_t sdncfg; uint8_t spidev; @@ -81,12 +81,12 @@ struct stm32l4_priv_s * stm32l4_enable_irq - Enable or disable the GPIO interrupt */ -static int stm32l4_reset(FAR const struct spirit_lower_s *lower); -static int stm32l4_attach_irq(FAR const struct spirit_lower_s *lower, - xcpt_t handler, FAR void *arg); -static void stm32l4_enable_irq(FAR const struct spirit_lower_s *lower, - bool state); -static int stm32l4_spirit_devsetup(FAR struct stm32l4_priv_s *priv); +static int stm32l4_reset(const struct spirit_lower_s *lower); +static int stm32l4_attach_irq(const struct spirit_lower_s *lower, + xcpt_t handler, void *arg); +static void stm32l4_enable_irq(const struct spirit_lower_s *lower, + bool state); +static int stm32l4_spirit_devsetup(struct stm32l4_priv_s *priv); /**************************************************************************** * Private Data @@ -120,9 +120,9 @@ static struct stm32l4_priv_s g_spirit = /* Reset the Spirit 1 part */ -static int stm32l4_reset(FAR const struct spirit_lower_s *lower) +static int stm32l4_reset(const struct spirit_lower_s *lower) { - FAR struct stm32l4_priv_s *priv = (FAR struct stm32l4_priv_s *)lower; + struct stm32l4_priv_s *priv = (struct stm32l4_priv_s *)lower; DEBUGASSERT(priv != NULL); @@ -148,10 +148,10 @@ static int stm32l4_reset(FAR const struct spirit_lower_s *lower) * stm32l4_enable_irq - Enable or disable the GPIO interrupt */ -static int stm32l4_attach_irq(FAR const struct spirit_lower_s *lower, - xcpt_t handler, FAR void *arg) +static int stm32l4_attach_irq(const struct spirit_lower_s *lower, + xcpt_t handler, void *arg) { - FAR struct stm32l4_priv_s *priv = (FAR struct stm32l4_priv_s *)lower; + struct stm32l4_priv_s *priv = (struct stm32l4_priv_s *)lower; DEBUGASSERT(priv != NULL); @@ -162,10 +162,10 @@ static int stm32l4_attach_irq(FAR const struct spirit_lower_s *lower, return OK; } -static void stm32l4_enable_irq(FAR const struct spirit_lower_s *lower, +static void stm32l4_enable_irq(const struct spirit_lower_s *lower, bool state) { - FAR struct stm32l4_priv_s *priv = (FAR struct stm32l4_priv_s *)lower; + struct stm32l4_priv_s *priv = (struct stm32l4_priv_s *)lower; /* The caller should not attempt to enable interrupts if the handler * has not yet been 'attached' @@ -205,9 +205,9 @@ static void stm32l4_enable_irq(FAR const struct spirit_lower_s *lower, * ****************************************************************************/ -static int stm32l4_spirit_devsetup(FAR struct stm32l4_priv_s *priv) +static int stm32l4_spirit_devsetup(struct stm32l4_priv_s *priv) { - FAR struct spi_dev_s *spi; + struct spi_dev_s *spi; int ret; /* Configure the interrupt pin and SDN pins. Innitializing the SDN to '1' diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h b/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h index e209ff6581..9baac271ad 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h +++ b/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h @@ -182,7 +182,7 @@ int stm32l4_adc_setup(void); ****************************************************************************/ #ifdef CONFIG_DAC7571 -int stm32_dac7571initialize(FAR const char *devpath); +int stm32_dac7571initialize(const char *devpath); #endif /**************************************************************************** @@ -206,7 +206,7 @@ int stm32_at45dbinitialize(int minor); ****************************************************************************/ #ifdef CONFIG_SENSORS_INA226 -int stm32_ina226initialize(FAR const char *devpath); +int stm32_ina226initialize(const char *devpath); #endif /**************************************************************************** @@ -218,7 +218,7 @@ int stm32_ina226initialize(FAR const char *devpath); ****************************************************************************/ #ifdef CONFIG_SENSORS_INA219 -int stm32_ina219initialize(FAR const char *devpath); +int stm32_ina219initialize(const char *devpath); #endif /**************************************************************************** @@ -242,7 +242,7 @@ int stm32_zerocross_initialize(void); ****************************************************************************/ #ifdef CONFIG_TIMER -int board_timer_driver_initialize(FAR const char *devpath, int timer); +int board_timer_driver_initialize(const char *devpath, int timer); #endif /**************************************************************************** @@ -254,7 +254,7 @@ int board_timer_driver_initialize(FAR const char *devpath, int timer); ****************************************************************************/ #ifdef CONFIG_SENSORS_QENCODER -int stm32l4_qencoder_initialize(FAR const char *devpath, int timer); +int stm32l4_qencoder_initialize(const char *devpath, int timer); #endif #endif /* __BOARDS_ARM_STM32L4_NUCLEO_L432KC_SRC_NUCLEO_L432KC_H */ diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c index 922c3d2b4a..de243113bb 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c @@ -106,13 +106,13 @@ void arm_netinitialize(void) int board_app_initialize(uintptr_t arg) { #ifdef HAVE_RTC_DRIVER - FAR struct rtc_lowerhalf_s *rtclower; + struct rtc_lowerhalf_s *rtclower; #endif #ifdef CONFIG_STM32L4_I2C1 - FAR struct i2c_master_s *i2c1; + struct i2c_master_s *i2c1; #endif #ifdef CONFIG_STM32L4_I2C3 - FAR struct i2c_master_s *i2c3; + struct i2c_master_s *i2c3; #endif #ifdef CONFIG_SENSORS_QENCODER int index; diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_at45db.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_at45db.c index 1be119f8aa..fa7e33178e 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_at45db.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_at45db.c @@ -64,8 +64,8 @@ static const int AT45DB_SPI_PORT = 1; /* AT45DB is connected to SPI1 port */ int stm32_at45dbinitialize(int minor) { - FAR struct spi_dev_s *spi; - FAR struct mtd_dev_s *mtd; + struct spi_dev_s *spi; + struct mtd_dev_s *mtd; static bool initialized = false; int ret; diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_buttons.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_buttons.c index a6419c0d0f..4b8c9be537 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_buttons.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_buttons.c @@ -97,7 +97,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_dac7571.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_dac7571.c index 95d93c2de7..2e697a7505 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_dac7571.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_dac7571.c @@ -71,9 +71,9 @@ static struct dac_dev_s *g_dac; * ****************************************************************************/ -int stm32_dac7571initialize(FAR const char *devpath) +int stm32_dac7571initialize(const char *devpath) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; /* Configure D4(PA5) and D5(PA6) as input floating */ diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_gpio.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_gpio.c index e70a30971b..161d2756d3 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_gpio.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_gpio.c @@ -60,19 +60,19 @@ struct stm32gpint_dev_s ****************************************************************************/ #if BOARD_NGPIOIN > 0 -static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value); +static int gpin_read(struct gpio_dev_s *dev, bool *value); #endif #if BOARD_NGPIOOUT > 0 -static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value); -static int gpout_write(FAR struct gpio_dev_s *dev, bool value); +static int gpout_read(struct gpio_dev_s *dev, bool *value); +static int gpout_write(struct gpio_dev_s *dev, bool value); #endif #if BOARD_NGPIOINT > 0 -static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value); -static int gpint_attach(FAR struct gpio_dev_s *dev, +static int gpint_read(struct gpio_dev_s *dev, bool *value); +static int gpint_attach(struct gpio_dev_s *dev, pin_interrupt_t callback); -static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable); +static int gpint_enable(struct gpio_dev_s *dev, bool enable); #endif /**************************************************************************** @@ -141,9 +141,9 @@ static struct stm32gpint_dev_s g_gpint[BOARD_NGPIOINT]; ****************************************************************************/ #if BOARD_NGPIOIN > 0 -static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpin_read(struct gpio_dev_s *dev, bool *value) { - FAR struct stm32gpio_dev_s *stm32gpio = (FAR struct stm32gpio_dev_s *)dev; + struct stm32gpio_dev_s *stm32gpio = (struct stm32gpio_dev_s *)dev; DEBUGASSERT(stm32gpio != NULL && value != NULL); DEBUGASSERT(stm32gpio->id < BOARD_NGPIOIN); @@ -155,9 +155,9 @@ static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value) #endif #if BOARD_NGPIOOUT > 0 -static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpout_read(struct gpio_dev_s *dev, bool *value) { - FAR struct stm32gpio_dev_s *stm32gpio = (FAR struct stm32gpio_dev_s *)dev; + struct stm32gpio_dev_s *stm32gpio = (struct stm32gpio_dev_s *)dev; DEBUGASSERT(stm32gpio != NULL && value != NULL); DEBUGASSERT(stm32gpio->id < BOARD_NGPIOOUT); @@ -167,9 +167,9 @@ static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value) return OK; } -static int gpout_write(FAR struct gpio_dev_s *dev, bool value) +static int gpout_write(struct gpio_dev_s *dev, bool value) { - FAR struct stm32gpio_dev_s *stm32gpio = (FAR struct stm32gpio_dev_s *)dev; + struct stm32gpio_dev_s *stm32gpio = (struct stm32gpio_dev_s *)dev; DEBUGASSERT(stm32gpio != NULL); DEBUGASSERT(stm32gpio->id < BOARD_NGPIOOUT); @@ -183,8 +183,8 @@ static int gpout_write(FAR struct gpio_dev_s *dev, bool value) #if BOARD_NGPIOINT > 0 static int stm32gpio_interrupt(int irq, void *context, void *arg) { - FAR struct stm32gpint_dev_s *stm32gpint = - (FAR struct stm32gpint_dev_s *)arg; + struct stm32gpint_dev_s *stm32gpint = + (struct stm32gpint_dev_s *)arg; DEBUGASSERT(stm32gpint != NULL && stm32gpint->callback != NULL); gpioinfo("Interrupt! callback=%p\n", stm32gpint->callback); @@ -194,10 +194,10 @@ static int stm32gpio_interrupt(int irq, void *context, void *arg) return OK; } -static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpint_read(struct gpio_dev_s *dev, bool *value) { - FAR struct stm32gpint_dev_s *stm32gpint = - (FAR struct stm32gpint_dev_s *)dev; + struct stm32gpint_dev_s *stm32gpint = + (struct stm32gpint_dev_s *)dev; DEBUGASSERT(stm32gpint != NULL && value != NULL); DEBUGASSERT(stm32gpint->stm32gpio.id < BOARD_NGPIOINT); @@ -207,11 +207,11 @@ static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value) return OK; } -static int gpint_attach(FAR struct gpio_dev_s *dev, +static int gpint_attach(struct gpio_dev_s *dev, pin_interrupt_t callback) { - FAR struct stm32gpint_dev_s *stm32gpint = - (FAR struct stm32gpint_dev_s *)dev; + struct stm32gpint_dev_s *stm32gpint = + (struct stm32gpint_dev_s *)dev; gpioinfo("Attaching the callback\n"); @@ -225,10 +225,10 @@ static int gpint_attach(FAR struct gpio_dev_s *dev, return OK; } -static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable) +static int gpint_enable(struct gpio_dev_s *dev, bool enable) { - FAR struct stm32gpint_dev_s *stm32gpint = - (FAR struct stm32gpint_dev_s *)dev; + struct stm32gpint_dev_s *stm32gpint = + (struct stm32gpint_dev_s *)dev; if (enable) { diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_ina219.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_ina219.c index c475ae1a22..54902a41da 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_ina219.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_ina219.c @@ -73,9 +73,9 @@ * ****************************************************************************/ -int stm32_ina219initialize(FAR const char *devpath) +int stm32_ina219initialize(const char *devpath) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; sninfo("Initializing INA219\n"); diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_ina226.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_ina226.c index 68c7becd48..ef95b4ca88 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_ina226.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_ina226.c @@ -73,9 +73,9 @@ * ****************************************************************************/ -int stm32_ina226initialize(FAR const char *devpath) +int stm32_ina226initialize(const char *devpath) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; sninfo("Initializing INA226\n"); diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_qencoder.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_qencoder.c index 0bfb326768..05d94513f7 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_qencoder.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_qencoder.c @@ -48,7 +48,7 @@ * ****************************************************************************/ -int stm32l4_qencoder_initialize(FAR const char *devpath, int timer) +int stm32l4_qencoder_initialize(const char *devpath, int timer) { int ret; diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spi.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spi.c index 9882910250..6c71751829 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spi.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spi.c @@ -131,7 +131,7 @@ void stm32l4_spiinitialize(void) ****************************************************************************/ #ifdef CONFIG_STM32L4_SPI1 -void stm32l4_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, +void stm32l4_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %08X CS: %s\n", (int)devid, @@ -145,21 +145,21 @@ void stm32l4_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, #endif } -uint8_t stm32l4_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32l4_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32L4_SPI2 -void stm32l4_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, +void stm32l4_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32l4_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32l4_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } @@ -190,14 +190,14 @@ uint8_t stm32l4_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_STM32L4_SPI1 -int stm32l4_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32l4_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef CONFIG_STM32L4_SPI2 -int stm32l4_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32l4_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spwm.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spwm.c index b7115db8d4..2ea502823d 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spwm.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spwm.c @@ -136,9 +136,9 @@ struct spwm_s { - FAR struct stm32l4_pwm_dev_s *pwm; + struct stm32l4_pwm_dev_s *pwm; #ifdef CONFIG_NUCLEOL432KC_SPWM_USE_TIM1 - FAR struct stm32l4_tim_dev_s *tim; + struct stm32l4_tim_dev_s *tim; #endif float waveform[SAMPLES_NUM]; /* Waveform samples */ float phase_step; /* Waveform phase step */ @@ -168,19 +168,19 @@ static struct spwm_s g_spwm = ****************************************************************************/ static float waveform_func(float x); -static int waveform_init(FAR struct spwm_s *spwm, float (*f)(float)); -static int spwm_start(FAR struct spwm_s *spwm); -static int spwm_start(FAR struct spwm_s *spwm); -static int spwm_stop(FAR struct spwm_s *spwm); +static int waveform_init(struct spwm_s *spwm, float (*f)(float)); +static int spwm_start(struct spwm_s *spwm); +static int spwm_start(struct spwm_s *spwm); +static int spwm_stop(struct spwm_s *spwm); #ifdef CONFIG_NUCLEOL432KC_SPWM_USE_TIM1 -static int spwm_tim1_setup(FAR struct spwm_s *spwm); -static int spwm_tim6_setup(FAR struct spwm_s *spwm); -static int spwm_tim1_start(FAR struct spwm_s *spwm); -static int spwm_tim6_start(FAR struct spwm_s *spwm); -static int spwm_tim1_stop(FAR struct spwm_s *spwm); -static int spwm_tim6_stop(FAR struct spwm_s *spwm); +static int spwm_tim1_setup(struct spwm_s *spwm); +static int spwm_tim6_setup(struct spwm_s *spwm); +static int spwm_tim1_start(struct spwm_s *spwm); +static int spwm_tim6_start(struct spwm_s *spwm); +static int spwm_tim1_stop(struct spwm_s *spwm); +static int spwm_tim6_stop(struct spwm_s *spwm); #endif /* CONFIG_NUCLEOL432KC_SPWM_USE_TIM1 */ -static int spwm_setup(FAR struct spwm_s *spwm); +static int spwm_setup(struct spwm_s *spwm); /**************************************************************************** * Private Functions @@ -211,7 +211,7 @@ static float waveform_func(float x) * ****************************************************************************/ -static int waveform_init(FAR struct spwm_s *spwm, float (*f)(float)) +static int waveform_init(struct spwm_s *spwm, float (*f)(float)) { uint16_t i = 0; int ret = 0; @@ -269,7 +269,7 @@ static int waveform_init(FAR struct spwm_s *spwm, float (*f)(float)) * ****************************************************************************/ -static int spwm_start(FAR struct spwm_s *spwm) +static int spwm_start(struct spwm_s *spwm) { /* Start TIM1 */ @@ -290,7 +290,7 @@ static int spwm_start(FAR struct spwm_s *spwm) * ****************************************************************************/ -static int spwm_stop(FAR struct spwm_s *spwm) +static int spwm_stop(struct spwm_s *spwm) { /* Stop TIM1 */ @@ -311,9 +311,9 @@ static int spwm_stop(FAR struct spwm_s *spwm) static void tim6_handler(void) { - FAR struct spwm_s *spwm = &g_spwm; - FAR struct stm32l4_pwm_dev_s *pwm = spwm->pwm; - FAR struct stm32l4_tim_dev_s *tim = spwm->tim; + struct spwm_s *spwm = &g_spwm; + struct stm32l4_pwm_dev_s *pwm = spwm->pwm; + struct stm32l4_tim_dev_s *tim = spwm->tim; uint8_t i = 0; for (i = 0; i < spwm->phases; i += 1) @@ -341,9 +341,9 @@ static void tim6_handler(void) * Name: spwm_tim6_setup ****************************************************************************/ -static int spwm_tim6_setup(FAR struct spwm_s *spwm) +static int spwm_tim6_setup(struct spwm_s *spwm) { - FAR struct stm32l4_tim_dev_s *tim = NULL; + struct stm32l4_tim_dev_s *tim = NULL; uint64_t freq = 0; int ret = OK; @@ -399,9 +399,9 @@ errout: * Name: spwm_tim6_start ****************************************************************************/ -static int spwm_tim6_start(FAR struct spwm_s *spwm) +static int spwm_tim6_start(struct spwm_s *spwm) { - FAR struct stm32l4_tim_dev_s *tim = spwm->tim; + struct stm32l4_tim_dev_s *tim = spwm->tim; /* Enable the timer interrupt at the NVIC and at TIM6 */ @@ -415,9 +415,9 @@ static int spwm_tim6_start(FAR struct spwm_s *spwm) * Name: spwm_tim6_stop ****************************************************************************/ -static int spwm_tim6_stop(FAR struct spwm_s *spwm) +static int spwm_tim6_stop(struct spwm_s *spwm) { - FAR struct stm32l4_tim_dev_s *tim = spwm->tim; + struct stm32l4_tim_dev_s *tim = spwm->tim; /* Disable the timer interrupt at the NVIC and at TIM6 */ @@ -431,14 +431,14 @@ static int spwm_tim6_stop(FAR struct spwm_s *spwm) * Name: spwm_tim1_setup ****************************************************************************/ -static int spwm_tim1_setup(FAR struct spwm_s *spwm) +static int spwm_tim1_setup(struct spwm_s *spwm) { - FAR struct stm32l4_pwm_dev_s *pwm = NULL; + struct stm32l4_pwm_dev_s *pwm = NULL; int ret = OK; /* Get TIM1 PWM interface */ - pwm = (FAR struct stm32l4_pwm_dev_s *)stm32l4_pwminitialize(1); + pwm = (struct stm32l4_pwm_dev_s *)stm32l4_pwminitialize(1); if (pwm == NULL) { printf("ERROR: Failed to get TIM1 PWM interface\n"); @@ -482,9 +482,9 @@ errout: * Name: spwm_tim1_start ****************************************************************************/ -static int spwm_tim1_start(FAR struct spwm_s *spwm) +static int spwm_tim1_start(struct spwm_s *spwm) { - FAR struct stm32l4_pwm_dev_s *pwm = spwm->pwm; + struct stm32l4_pwm_dev_s *pwm = spwm->pwm; uint16_t outputs = 0; int i = 0; @@ -510,9 +510,9 @@ static int spwm_tim1_start(FAR struct spwm_s *spwm) * Name: spwm_tim1_stop ****************************************************************************/ -static int spwm_tim1_stop(FAR struct spwm_s *spwm) +static int spwm_tim1_stop(struct spwm_s *spwm) { - FAR struct stm32l4_pwm_dev_s *pwm = spwm->pwm; + struct stm32l4_pwm_dev_s *pwm = spwm->pwm; uint16_t outputs = 0; int i = 0; @@ -540,7 +540,7 @@ static int spwm_tim1_stop(FAR struct spwm_s *spwm) * Name: spwm_setup ****************************************************************************/ -static int spwm_setup(FAR struct spwm_s *spwm) +static int spwm_setup(struct spwm_s *spwm) { int ret = OK; @@ -579,7 +579,7 @@ errout: int spwm_main(int argc, char *argv[]) { - FAR struct spwm_s *spwm = NULL; + struct spwm_s *spwm = NULL; int ret = OK; int i = 0; diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_timer.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_timer.c index 1b2a36eb5f..91e1a45038 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_timer.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_timer.c @@ -57,7 +57,7 @@ * ****************************************************************************/ -int board_timer_driver_initialize(FAR const char *devpath, int timer) +int board_timer_driver_initialize(const char *devpath, int timer) { return stm32l4_timer_initialize(devpath, timer); } diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_zerocross.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_zerocross.c index 8652db1057..96a3e31e94 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_zerocross.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_zerocross.c @@ -41,11 +41,11 @@ * Private Function Prototypes ****************************************************************************/ -static void zcross_enable(FAR const struct zc_lowerhalf_s *lower, - zc_interrupt_t handler, FAR void *arg); +static void zcross_enable(const struct zc_lowerhalf_s *lower, + zc_interrupt_t handler, void *arg); static void zcross_disable(void); -static int zcross_interrupt(int irq, FAR void *context, FAR void *arg); +static int zcross_interrupt(int irq, void *context, void *arg); /**************************************************************************** * Private Data @@ -54,7 +54,7 @@ static int zcross_interrupt(int irq, FAR void *context, FAR void *arg); /* Current interrupt handler and argument */ static zc_interrupt_t g_zcrosshandler; -static FAR void *g_zcrossarg; +static void *g_zcrossarg; /* This is the zero cross lower half driver interface */ @@ -76,8 +76,8 @@ static struct zc_lowerhalf_s g_zcrosslower = * ****************************************************************************/ -static void zcross_enable(FAR const struct zc_lowerhalf_s *lower, - zc_interrupt_t handler, FAR void *arg) +static void zcross_enable(const struct zc_lowerhalf_s *lower, + zc_interrupt_t handler, void *arg) { irqstate_t flags; bool rising = false; @@ -136,7 +136,7 @@ static void zcross_disable(void) * ****************************************************************************/ -static int zcross_interrupt(int irq, FAR void *context, FAR void *arg) +static int zcross_interrupt(int irq, void *context, void *arg) { DEBUGASSERT(g_zcrosshandler != NULL); if (g_zcrosshandler) diff --git a/boards/arm/stm32l4/nucleo-l452re/src/stm32_adc.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_adc.c index cbbb48ad4e..82b6983b1f 100644 --- a/boards/arm/stm32l4/nucleo-l452re/src/stm32_adc.c +++ b/boards/arm/stm32l4/nucleo-l452re/src/stm32_adc.c @@ -155,7 +155,7 @@ static const uint32_t g_pinlist[ADC1_NCHANNELS] = int stm32l4_adc_measure_voltages(uint32_t *vrefint, uint32_t *vbat, uint32_t *vext) { - FAR struct file filestruct; + struct file filestruct; ssize_t nbytes; struct adc_msg_s sample[ADC1_NCHANNELS] = { diff --git a/boards/arm/stm32l4/nucleo-l452re/src/stm32_bringup.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_bringup.c index 2541ac8d66..5ce7cc638c 100644 --- a/boards/arm/stm32l4/nucleo-l452re/src/stm32_bringup.c +++ b/boards/arm/stm32l4/nucleo-l452re/src/stm32_bringup.c @@ -68,7 +68,7 @@ int stm32_bringup(void) { #ifdef HAVE_I2C_DRIVER - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; #endif int ret; diff --git a/boards/arm/stm32l4/nucleo-l452re/src/stm32_buttons.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_buttons.c index 2bcb50b07b..bcde414ced 100644 --- a/boards/arm/stm32l4/nucleo-l452re/src/stm32_buttons.c +++ b/boards/arm/stm32l4/nucleo-l452re/src/stm32_buttons.c @@ -100,7 +100,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/stm32l4/nucleo-l452re/src/stm32_spi.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_spi.c index 2096f2c8ae..b5b277d51f 100644 --- a/boards/arm/stm32l4/nucleo-l452re/src/stm32_spi.c +++ b/boards/arm/stm32l4/nucleo-l452re/src/stm32_spi.c @@ -119,7 +119,7 @@ void weak_function stm32l4_spiinitialize(void) ****************************************************************************/ #ifdef CONFIG_STM32L4_SPI1 -void stm32l4_spi1select(FAR struct spi_dev_s *dev, +void stm32l4_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", @@ -133,35 +133,35 @@ void stm32l4_spi1select(FAR struct spi_dev_s *dev, #endif } -uint8_t stm32l4_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32l4_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32L4_SPI2 -void stm32l4_spi2select(FAR struct spi_dev_s *dev, +void stm32l4_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32l4_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32l4_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32L4_SPI3 -void stm32l4_spi3select(FAR struct spi_dev_s *dev, +void stm32l4_spi3select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32l4_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32l4_spi3status(struct spi_dev_s *dev, uint32_t devid) { return 0; } @@ -192,21 +192,21 @@ uint8_t stm32l4_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_STM32L4_SPI1 -int stm32l4_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32l4_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef CONFIG_STM32L4_SPI2 -int stm32l4_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32l4_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef CONFIG_STM32L4_SPI3 -int stm32l4_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32l4_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/nucleo-l476rg.h b/boards/arm/stm32l4/nucleo-l476rg/src/nucleo-l476rg.h index b790224cc8..32d1f127ab 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/nucleo-l476rg.h +++ b/boards/arm/stm32l4/nucleo-l476rg/src/nucleo-l476rg.h @@ -380,7 +380,7 @@ int stm32l4_mmcsd_initialize(int minor); ****************************************************************************/ #ifdef CONFIG_TIMER -int board_timer_driver_initialize(FAR const char *devpath, int timer); +int board_timer_driver_initialize(const char *devpath, int timer); #endif /**************************************************************************** @@ -392,7 +392,7 @@ int board_timer_driver_initialize(FAR const char *devpath, int timer); ****************************************************************************/ #ifdef CONFIG_SENSORS_QENCODER -int stm32l4_qencoder_initialize(FAR const char *devpath, int timer); +int stm32l4_qencoder_initialize(const char *devpath, int timer); #endif /**************************************************************************** @@ -416,7 +416,7 @@ int stm32l4_cc1101_initialize(void); ****************************************************************************/ #ifdef CONFIG_SENSORS_AS726X -int stm32_as726xinitialize(FAR const char *devpath); +int stm32_as726xinitialize(const char *devpath); #endif /**************************************************************************** @@ -428,7 +428,7 @@ int stm32_as726xinitialize(FAR const char *devpath); ****************************************************************************/ #ifdef CONFIG_SENSORS_BMP180 -int stm32_bmp180initialize(FAR const char *devpath); +int stm32_bmp180initialize(const char *devpath); #endif #endif /* __BOARDS_ARM_STM32L4_NUCLEO_L476RG_SRC_NUCLEO_L476RG_H */ diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_ajoystick.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_ajoystick.c index 7f222d4ab0..0d179bdd7c 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_ajoystick.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_ajoystick.c @@ -100,17 +100,17 @@ ****************************************************************************/ static ajoy_buttonset_t -ajoy_supported(FAR const struct ajoy_lowerhalf_s *lower); -static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, - FAR struct ajoy_sample_s *sample); +ajoy_supported(const struct ajoy_lowerhalf_s *lower); +static int ajoy_sample(const struct ajoy_lowerhalf_s *lower, + struct ajoy_sample_s *sample); static ajoy_buttonset_t -ajoy_buttons(FAR const struct ajoy_lowerhalf_s *lower); -static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower, - ajoy_buttonset_t press, ajoy_buttonset_t release, - ajoy_handler_t handler, FAR void *arg); +ajoy_buttons(const struct ajoy_lowerhalf_s *lower); +static void ajoy_enable(const struct ajoy_lowerhalf_s *lower, + ajoy_buttonset_t press, ajoy_buttonset_t release, + ajoy_handler_t handler, void *arg); static void ajoy_disable(void); -static int ajoy_interrupt(int irq, FAR void *context, FAR void *arg); +static int ajoy_interrupt(int irq, void *context, void *arg); /**************************************************************************** * Private Data @@ -152,7 +152,7 @@ static struct file g_adcfile; /* Current interrupt handler and argument */ static ajoy_handler_t g_ajoyhandler; -static FAR void *g_ajoyarg; +static void *g_ajoyarg; /**************************************************************************** * Private Functions @@ -167,7 +167,7 @@ static FAR void *g_ajoyarg; ****************************************************************************/ static ajoy_buttonset_t -ajoy_supported(FAR const struct ajoy_lowerhalf_s *lower) +ajoy_supported(const struct ajoy_lowerhalf_s *lower) { iinfo("Supported: %02x\n", AJOY_SUPPORTED); return (ajoy_buttonset_t)AJOY_SUPPORTED; @@ -181,12 +181,12 @@ ajoy_supported(FAR const struct ajoy_lowerhalf_s *lower) * ****************************************************************************/ -static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, - FAR struct ajoy_sample_s *sample) +static int ajoy_sample(const struct ajoy_lowerhalf_s *lower, + struct ajoy_sample_s *sample) { #ifndef NO_JOYSTICK_ADC struct adc_msg_s adcmsg[MAX_ADC_CHANNELS]; - FAR struct adc_msg_s *ptr; + struct adc_msg_s *ptr; ssize_t nread; ssize_t offset; int have; @@ -283,7 +283,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, ****************************************************************************/ static ajoy_buttonset_t -ajoy_buttons(FAR const struct ajoy_lowerhalf_s *lower) +ajoy_buttons(const struct ajoy_lowerhalf_s *lower) { ajoy_buttonset_t ret = 0; int i; @@ -315,9 +315,9 @@ ajoy_buttons(FAR const struct ajoy_lowerhalf_s *lower) * ****************************************************************************/ -static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower, - ajoy_buttonset_t press, ajoy_buttonset_t release, - ajoy_handler_t handler, FAR void *arg) +static void ajoy_enable(const struct ajoy_lowerhalf_s *lower, + ajoy_buttonset_t press, ajoy_buttonset_t release, + ajoy_handler_t handler, void *arg) { irqstate_t flags; ajoy_buttonset_t either = press | release; @@ -412,7 +412,7 @@ static void ajoy_disable(void) * ****************************************************************************/ -static int ajoy_interrupt(int irq, FAR void *context, FAR void *arg) +static int ajoy_interrupt(int irq, void *context, void *arg) { DEBUGASSERT(g_ajoyhandler); diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_appinit.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_appinit.c index a3cade9f66..e6ed2b423d 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_appinit.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_appinit.c @@ -78,7 +78,7 @@ #if defined(CONFIG_I2C) && defined(CONFIG_SYSTEM_I2CTOOL) static void stm32_i2c_register(int bus) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; i2c = stm32l4_i2cbus_initialize(bus); @@ -148,7 +148,7 @@ static void stm32_i2ctool(void) int board_app_initialize(uintptr_t arg) { #ifdef HAVE_RTC_DRIVER - FAR struct rtc_lowerhalf_s *rtclower; + struct rtc_lowerhalf_s *rtclower; #endif #if defined(CONFIG_I2C) && defined(CONFIG_SYSTEM_I2CTOOL) diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_as726x.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_as726x.c index fc0373f083..282969a976 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_as726x.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_as726x.c @@ -73,9 +73,9 @@ * ****************************************************************************/ -int stm32_as726xinitialize(FAR const char *devpath) +int stm32_as726xinitialize(const char *devpath) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; sninfo("Initializing AS726X!\n"); diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_bmp180.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_bmp180.c index ba4b20ae2f..391695c75b 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_bmp180.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_bmp180.c @@ -54,9 +54,9 @@ * ****************************************************************************/ -int stm32_bmp180initialize(FAR const char *devpath) +int stm32_bmp180initialize(const char *devpath) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; sninfo("Initializing BMP180!\n"); diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_buttons.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_buttons.c index 6dec4ea2c6..76f9ab16ea 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_buttons.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_buttons.c @@ -97,7 +97,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_cc1101.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_cc1101.c index ff70624b1f..4ef725fb0f 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_cc1101.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_cc1101.c @@ -65,7 +65,7 @@ static void cc1101_wait(struct cc1101_dev_s *dev, uint32_t pin) * ****************************************************************************/ -static void cc1101_irq(FAR struct cc1101_dev_s *dev, bool enable) +static void cc1101_irq(struct cc1101_dev_s *dev, bool enable) { if (enable) { @@ -84,7 +84,7 @@ static void cc1101_irq(FAR struct cc1101_dev_s *dev, bool enable) * ****************************************************************************/ -static void cc1101_pwr(FAR struct cc1101_dev_s *dev, bool enable) +static void cc1101_pwr(struct cc1101_dev_s *dev, bool enable) { } @@ -102,8 +102,8 @@ static void cc1101_pwr(FAR struct cc1101_dev_s *dev, bool enable) int stm32l4_cc1101_initialize(void) { - FAR struct spi_dev_s *spi = NULL; - FAR struct cc1101_dev_s *dev = NULL; + struct spi_dev_s *spi = NULL; + struct cc1101_dev_s *dev = NULL; spi = stm32l4_spibus_initialize(CONFIG_CC1101_SPIDEV); if (spi == NULL) diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_gpio.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_gpio.c index a08d1e8651..d1022d158a 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_gpio.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_gpio.c @@ -63,13 +63,13 @@ struct stm32gpint_dev_s * Private Function Prototypes ****************************************************************************/ -static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value); -static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value); -static int gpout_write(FAR struct gpio_dev_s *dev, bool value); -static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value); -static int gpint_attach(FAR struct gpio_dev_s *dev, +static int gpin_read(struct gpio_dev_s *dev, bool *value); +static int gpout_read(struct gpio_dev_s *dev, bool *value); +static int gpout_write(struct gpio_dev_s *dev, bool value); +static int gpint_read(struct gpio_dev_s *dev, bool *value); +static int gpint_attach(struct gpio_dev_s *dev, pin_interrupt_t callback); -static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable); +static int gpint_enable(struct gpio_dev_s *dev, bool enable); /**************************************************************************** * Private Data @@ -138,8 +138,8 @@ static struct stm32gpint_dev_s g_gpint[BOARD_NGPIOINT]; static int stm32gpio_interrupt(int irq, void *context, void *arg) { - FAR struct stm32gpint_dev_s *stm32gpint = - (FAR struct stm32gpint_dev_s *)arg; + struct stm32gpint_dev_s *stm32gpint = + (struct stm32gpint_dev_s *)arg; DEBUGASSERT(stm32gpint != NULL && stm32gpint->callback != NULL); gpioinfo("Interrupt! callback=%p\n", stm32gpint->callback); @@ -149,10 +149,10 @@ static int stm32gpio_interrupt(int irq, void *context, void *arg) return OK; } -static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpin_read(struct gpio_dev_s *dev, bool *value) { - FAR struct stm32gpio_dev_s *stm32gpio = - (FAR struct stm32gpio_dev_s *)dev; + struct stm32gpio_dev_s *stm32gpio = + (struct stm32gpio_dev_s *)dev; DEBUGASSERT(stm32gpio != NULL && value != NULL); DEBUGASSERT(stm32gpio->id < BOARD_NGPIOIN); @@ -162,10 +162,10 @@ static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value) return OK; } -static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpout_read(struct gpio_dev_s *dev, bool *value) { - FAR struct stm32gpio_dev_s *stm32gpio = - (FAR struct stm32gpio_dev_s *)dev; + struct stm32gpio_dev_s *stm32gpio = + (struct stm32gpio_dev_s *)dev; DEBUGASSERT(stm32gpio != NULL && value != NULL); DEBUGASSERT(stm32gpio->id < BOARD_NGPIOOUT); @@ -175,10 +175,10 @@ static int gpout_read(FAR struct gpio_dev_s *dev, FAR bool *value) return OK; } -static int gpout_write(FAR struct gpio_dev_s *dev, bool value) +static int gpout_write(struct gpio_dev_s *dev, bool value) { - FAR struct stm32gpio_dev_s *stm32gpio = - (FAR struct stm32gpio_dev_s *)dev; + struct stm32gpio_dev_s *stm32gpio = + (struct stm32gpio_dev_s *)dev; DEBUGASSERT(stm32gpio != NULL); DEBUGASSERT(stm32gpio->id < BOARD_NGPIOOUT); @@ -188,10 +188,10 @@ static int gpout_write(FAR struct gpio_dev_s *dev, bool value) return OK; } -static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpint_read(struct gpio_dev_s *dev, bool *value) { - FAR struct stm32gpint_dev_s *stm32gpint = - (FAR struct stm32gpint_dev_s *)dev; + struct stm32gpint_dev_s *stm32gpint = + (struct stm32gpint_dev_s *)dev; DEBUGASSERT(stm32gpint != NULL && value != NULL); DEBUGASSERT(stm32gpint->stm32gpio.id < BOARD_NGPIOINT); @@ -201,11 +201,11 @@ static int gpint_read(FAR struct gpio_dev_s *dev, FAR bool *value) return OK; } -static int gpint_attach(FAR struct gpio_dev_s *dev, +static int gpint_attach(struct gpio_dev_s *dev, pin_interrupt_t callback) { - FAR struct stm32gpint_dev_s *stm32gpint = - (FAR struct stm32gpint_dev_s *)dev; + struct stm32gpint_dev_s *stm32gpint = + (struct stm32gpint_dev_s *)dev; gpioinfo("Attaching the callback\n"); @@ -219,10 +219,10 @@ static int gpint_attach(FAR struct gpio_dev_s *dev, return OK; } -static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable) +static int gpint_enable(struct gpio_dev_s *dev, bool enable) { - FAR struct stm32gpint_dev_s *stm32gpint = - (FAR struct stm32gpint_dev_s *)dev; + struct stm32gpint_dev_s *stm32gpint = + (struct stm32gpint_dev_s *)dev; if (enable) { diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_lsm303agr.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_lsm303agr.c index dadbd2a062..b6c9b91d0b 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_lsm303agr.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_lsm303agr.c @@ -54,7 +54,7 @@ int stm32l4_lsm303agr_initialize(char *devpath) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret = OK; sninfo("INFO: Initializing LMS303AGR sensor over I2C\n"); diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_lsm6dsl.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_lsm6dsl.c index d45598dd05..63a7ca139b 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_lsm6dsl.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_lsm6dsl.c @@ -54,7 +54,7 @@ int stm32l4_lsm6dsl_initialize(char *devpath) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret = OK; sninfo("Initializing LMS6DSL!\n"); diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_pcd8544.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_pcd8544.c index 0467631e17..f7af394962 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_pcd8544.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_pcd8544.c @@ -55,8 +55,8 @@ * Private Data ****************************************************************************/ -FAR struct spi_dev_s *g_spidev; -FAR struct lcd_dev_s *g_lcddev; +struct spi_dev_s *g_spidev; +struct lcd_dev_s *g_lcddev; /**************************************************************************** * Public Functions @@ -93,7 +93,7 @@ int board_lcd_initialize(void) * Name: board_lcd_getdev ****************************************************************************/ -FAR struct lcd_dev_s *board_lcd_getdev(int lcddev) +struct lcd_dev_s *board_lcd_getdev(int lcddev) { g_lcddev = pcd8544_initialize(g_spidev, lcddev); if (!g_lcddev) diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_qencoder.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_qencoder.c index 3dd71546be..9300874464 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_qencoder.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_qencoder.c @@ -48,7 +48,7 @@ * ****************************************************************************/ -int stm32l4_qencoder_initialize(FAR const char *devpath, int timer) +int stm32l4_qencoder_initialize(const char *devpath, int timer) { int ret; diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_spi.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_spi.c index 364ab07ca8..c8d76abdd9 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_spi.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_spi.c @@ -130,7 +130,7 @@ void weak_function stm32l4_spiinitialize(void) ****************************************************************************/ #ifdef CONFIG_STM32L4_SPI1 -void stm32l4_spi1select(FAR struct spi_dev_s *dev, +void stm32l4_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", @@ -151,7 +151,7 @@ void stm32l4_spi1select(FAR struct spi_dev_s *dev, #endif } -uint8_t stm32l4_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32l4_spi1status(struct spi_dev_s *dev, uint32_t devid) { uint8_t status = 0; @@ -167,7 +167,7 @@ uint8_t stm32l4_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) #endif #ifdef CONFIG_STM32L4_SPI2 -void stm32l4_spi2select(FAR struct spi_dev_s *dev, +void stm32l4_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", @@ -181,21 +181,21 @@ void stm32l4_spi2select(FAR struct spi_dev_s *dev, #endif } -uint8_t stm32l4_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32l4_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32L4_SPI3 -void stm32l4_spi3select(FAR struct spi_dev_s *dev, +void stm32l4_spi3select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32l4_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32l4_spi3status(struct spi_dev_s *dev, uint32_t devid) { return 0; } @@ -226,7 +226,7 @@ uint8_t stm32l4_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_STM32L4_SPI1 -int stm32l4_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32l4_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { #ifdef CONFIG_LCD_PCD8544 if (devid == SPIDEV_DISPLAY(0)) @@ -246,14 +246,14 @@ int stm32l4_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) #endif #ifdef CONFIG_STM32L4_SPI2 -int stm32l4_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32l4_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef CONFIG_STM32L4_SPI3 -int stm32l4_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32l4_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_timer.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_timer.c index cc6ed372f7..add2872b0b 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_timer.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_timer.c @@ -57,7 +57,7 @@ * ****************************************************************************/ -int board_timer_driver_initialize(FAR const char *devpath, int timer) +int board_timer_driver_initialize(const char *devpath, int timer) { return stm32l4_timer_initialize(devpath, timer); } diff --git a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_buttons.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_buttons.c index e1b43d4a87..f9530e69be 100644 --- a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_buttons.c +++ b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_buttons.c @@ -90,7 +90,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_dma_alloc.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_dma_alloc.c index 1f726e9a60..bebafdaa73 100644 --- a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_dma_alloc.c +++ b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_dma_alloc.c @@ -111,7 +111,7 @@ void *fat_dma_alloc(size_t size) return gran_alloc(dma_allocator, size); } -void fat_dma_free(FAR void *memory, size_t size) +void fat_dma_free(void *memory, size_t size) { gran_free(dma_allocator, memory, size); } diff --git a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_sdio.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_sdio.c index b8aa41f57f..6c160f1649 100644 --- a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_sdio.c +++ b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_sdio.c @@ -56,7 +56,7 @@ * Private Data ****************************************************************************/ -static FAR struct sdio_dev_s *g_sdio_dev; +static struct sdio_dev_s *g_sdio_dev; #ifdef HAVE_NCD static bool g_sd_inserted = 0xff; /* Impossible value */ #endif @@ -74,7 +74,7 @@ static bool g_sd_inserted = 0xff; /* Impossible value */ ****************************************************************************/ #ifdef HAVE_NCD -static int stm32l4_ncd_interrupt(int irq, FAR void *context) +static int stm32l4_ncd_interrupt(int irq, void *context) { bool present; diff --git a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_spi.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_spi.c index 5279301054..f56e110e36 100644 --- a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_spi.c +++ b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_spi.c @@ -257,7 +257,7 @@ void weak_function stm32_spidev_initialize(void) ****************************************************************************/ #ifdef CONFIG_STM32L4_SPI1 -void stm32_spi1select(FAR struct spi_dev_s *dev, +void stm32_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { uint32_t index = SPIDEVID_INDEX(devid); @@ -271,14 +271,14 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, } } -uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32L4_SPI2 -void stm32_spi2select(FAR struct spi_dev_s *dev, +void stm32_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { uint32_t index = SPIDEVID_INDEX(devid); @@ -292,14 +292,14 @@ void stm32_spi2select(FAR struct spi_dev_s *dev, } } -uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32L4_SPI3 -void stm32_spi3select(FAR struct spi_dev_s *dev, +void stm32_spi3select(struct spi_dev_s *dev, uint32_t devid, bool selected) { uint32_t index = SPIDEVID_INDEX(devid); @@ -313,7 +313,7 @@ void stm32_spi3select(FAR struct spi_dev_s *dev, } } -uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi3status(struct spi_dev_s *dev, uint32_t devid) { return 0; } @@ -344,21 +344,21 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_STM32L4_SPI1 -int stm32_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32L4_SPI2 -int stm32_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32L4_SPI3 -int stm32_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } diff --git a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_usb.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_usb.c index 5a8c77bd3d..ce416b05a5 100644 --- a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_usb.c +++ b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_usb.c @@ -227,7 +227,7 @@ int stm32_usbhost_initialize(void) ret = kthread_create("usbhost", CONFIG_STM32F4DISCO_USBHOST_PRIO, CONFIG_STM32F4DISCO_USBHOST_STACKSIZE, - (main_t)usbhost_waiter, (FAR char * const *)NULL); + (main_t)usbhost_waiter, (char * const *)NULL); return ret < 0 ? -ENOEXEC : OK; } @@ -312,7 +312,7 @@ int stm32_setup_overcurrent(xcpt_t handler, void *arg) ****************************************************************************/ #ifdef CONFIG_USBDEV -void stm32l4_usbsuspend(FAR struct usbdev_s *dev, bool resume) +void stm32l4_usbsuspend(struct usbdev_s *dev, bool resume) { uinfo("resume: %d\n", resume); } diff --git a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_bringup.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_bringup.c index dc8d8b5801..e35db3def9 100644 --- a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_bringup.c +++ b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_bringup.c @@ -90,7 +90,7 @@ int board_app_initialize(uintptr_t arg) { #ifdef HAVE_RTC_DRIVER - FAR struct rtc_lowerhalf_s *rtclower; + struct rtc_lowerhalf_s *rtclower; #endif int ret; diff --git a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_buttons.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_buttons.c index 42b1d77a01..667045da57 100644 --- a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_buttons.c +++ b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_buttons.c @@ -131,7 +131,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_spi.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_spi.c index 5092fab790..e8751446b8 100644 --- a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_spi.c +++ b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_spi.c @@ -112,42 +112,42 @@ void weak_function stm32_spiinitialize(void) ****************************************************************************/ #ifdef CONFIG_STM32_SPI1 -void stm32_spi1select(FAR struct spi_dev_s *dev, +void stm32_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32_SPI2 -void stm32_spi2select(FAR struct spi_dev_s *dev, +void stm32_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32_SPI3 -void stm32_spi3select(FAR struct spi_dev_s *dev, +void stm32_spi3select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi3status(struct spi_dev_s *dev, uint32_t devid) { return 0; } @@ -178,21 +178,21 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_STM32_SPI1 -int stm32_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef CONFIG_STM32_SPI2 -int stm32_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef CONFIG_STM32_SPI3 -int stm32_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_appinit.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_appinit.c index 92bf86c68c..654d46ea45 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_appinit.c +++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_appinit.c @@ -73,8 +73,8 @@ ****************************************************************************/ #ifdef HAVE_N25QXXX -FAR struct qspi_dev_s *g_qspi; -FAR struct mtd_dev_s *g_mtd_fs; +struct qspi_dev_s *g_qspi; +struct mtd_dev_s *g_mtd_fs; #endif /**************************************************************************** @@ -110,10 +110,10 @@ FAR struct mtd_dev_s *g_mtd_fs; int board_app_initialize(uintptr_t arg) { #ifdef HAVE_RTC_DRIVER - FAR struct rtc_lowerhalf_s *rtclower; + struct rtc_lowerhalf_s *rtclower; #endif #if defined(HAVE_N25QXXX) - FAR struct mtd_dev_s *mtd_temp; + struct mtd_dev_s *mtd_temp; #endif #if defined(HAVE_N25QXXX_CHARDEV) #if defined(CONFIG_BCH) @@ -187,7 +187,7 @@ int board_app_initialize(uintptr_t arg) #ifdef CONFIG_MTD_PARTITION { - FAR struct mtd_geometry_s geo; + struct mtd_geometry_s geo; off_t nblocks; /* Setup a partition of 256KiB for our file system. */ diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_buttons.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_buttons.c index ceb06dfb9a..e736d99096 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_buttons.c +++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_buttons.c @@ -163,7 +163,7 @@ static void button_pm_notify(struct pm_callback_s *cb, int domain, #if 0 #ifdef CONFIG_ARCH_IRQBUTTONS -static int button_handler(int irq, FAR void *context, FAR void *arg) +static int button_handler(int irq, void *context, void *arg) { #ifdef CONFIG_PM /* At this point the MCU should have already awakened. The state @@ -307,7 +307,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_spi.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_spi.c index 4216bfb6cb..44621e059e 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_spi.c +++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_spi.c @@ -135,7 +135,7 @@ void weak_function stm32_spiinitialize(void) ****************************************************************************/ #ifdef CONFIG_STM32_SPI1 -void stm32_spi1select(FAR struct spi_dev_s *dev, +void stm32_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", @@ -149,35 +149,35 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, #endif } -uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32_SPI2 -void stm32_spi2select(FAR struct spi_dev_s *dev, +void stm32_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32_SPI3 -void stm32_spi3select(FAR struct spi_dev_s *dev, +void stm32_spi3select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi3status(struct spi_dev_s *dev, uint32_t devid) { return 0; } @@ -208,21 +208,21 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_STM32_SPI1 -int stm32_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef CONFIG_STM32_SPI2 -int stm32_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef CONFIG_STM32_SPI3 -int stm32_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_usb.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_usb.c index 5f4c185bfe..e01217601a 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_usb.c +++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_usb.c @@ -226,7 +226,7 @@ int stm32l4_usbhost_initialize(void) ret = kthread_create("usbhost", CONFIG_STM32L4DISCO_USBHOST_PRIO, CONFIG_STM32L4DISCO_USBHOST_STACKSIZE, - (main_t)usbhost_waiter, (FAR char * const *)NULL); + (main_t)usbhost_waiter, (char * const *)NULL); return ret < 0 ? -ENOEXEC : OK; } @@ -317,7 +317,7 @@ xcpt_t stm32l4_setup_overcurrent(xcpt_t handler) ****************************************************************************/ #ifdef CONFIG_USBDEV -void stm32l4_usbsuspend(FAR struct usbdev_s *dev, bool resume) +void stm32l4_usbsuspend(struct usbdev_s *dev, bool resume) { uinfo("resume: %d\n", resume); } diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_adc.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_adc.c index 32a50a897c..1778ef5569 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_adc.c +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_adc.c @@ -153,7 +153,7 @@ int stm32l4_adc_measure_voltages(uint32_t *vrefint, uint32_t *vbat, uint32_t *vext) { struct adc_msg_s sample[ADC1_NCHANNELS]; - FAR struct file filestruct; + struct file filestruct; ssize_t nbytes; int nsamples; int ret; diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_appinit.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_appinit.c index 4559727e61..c2a75eb48c 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_appinit.c +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_appinit.c @@ -104,7 +104,7 @@ static struct i2c_master_s *g_i2c3; int board_app_initialize(uintptr_t arg) { #ifdef HAVE_RTC_DRIVER - FAR struct rtc_lowerhalf_s *rtclower; + struct rtc_lowerhalf_s *rtclower; #endif int ret = OK; diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_buttons.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_buttons.c index de0d582537..c063b786a8 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_buttons.c +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_buttons.c @@ -163,7 +163,7 @@ static void button_pm_notify(struct pm_callback_s *cb, int domain, #if 0 #ifdef CONFIG_ARCH_IRQBUTTONS -static int button_handler(int irq, FAR void *context, FAR void *arg) +static int button_handler(int irq, void *context, void *arg) { #ifdef CONFIG_PM /* At this point the MCU should have already awakened. The state @@ -307,7 +307,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_spi.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_spi.c index 261747d3f9..35c664d3ef 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_spi.c +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_spi.c @@ -148,7 +148,7 @@ void weak_function stm32_spiinitialize(void) ****************************************************************************/ #ifdef CONFIG_STM32L4_SPI1 -void stm32l4_spi1select(FAR struct spi_dev_s *dev, +void stm32l4_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", @@ -162,35 +162,35 @@ void stm32l4_spi1select(FAR struct spi_dev_s *dev, #endif } -uint8_t stm32l4_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32l4_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32L4_SPI2 -void stm32l4_spi2select(FAR struct spi_dev_s *dev, +void stm32l4_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32l4_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32l4_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32L4_SPI3 -void stm32l4_spi3select(FAR struct spi_dev_s *dev, +void stm32l4_spi3select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32l4_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32l4_spi3status(struct spi_dev_s *dev, uint32_t devid) { return 0; } @@ -221,21 +221,21 @@ uint8_t stm32l4_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_STM32L4_SPI1 -int stm32l4_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32l4_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef CONFIG_STM32L4_SPI2 -int stm32l4_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32l4_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } #endif #ifdef CONFIG_STM32L4_SPI3 -int stm32l4_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32l4_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return OK; } diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_usb.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_usb.c index b8e404d4e2..0dd8d272a6 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_usb.c +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_usb.c @@ -226,7 +226,7 @@ int stm32l4_usbhost_initialize(void) ret = kthread_create("usbhost", CONFIG_STM32L4DISCO_USBHOST_PRIO, CONFIG_STM32L4DISCO_USBHOST_STACKSIZE, - (main_t)usbhost_waiter, (FAR char * const *)NULL); + (main_t)usbhost_waiter, (char * const *)NULL); return ret < 0 ? -ENOEXEC : OK; } @@ -318,7 +318,7 @@ xcpt_t stm32l4_setup_overcurrent(xcpt_t handler) ****************************************************************************/ #ifdef CONFIG_USBDEV -void stm32l4_usbsuspend(FAR struct usbdev_s *dev, bool resume) +void stm32l4_usbsuspend(struct usbdev_s *dev, bool resume) { uinfo("resume: %d\n", resume); } diff --git a/boards/arm/stm32l5/nucleo-l552ze/src/stm32_buttons.c b/boards/arm/stm32l5/nucleo-l552ze/src/stm32_buttons.c index b8b6df2bf6..9aaaf722e6 100644 --- a/boards/arm/stm32l5/nucleo-l552ze/src/stm32_buttons.c +++ b/boards/arm/stm32l5/nucleo-l552ze/src/stm32_buttons.c @@ -97,7 +97,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/stm32l5/stm32l562e-dk/src/stm32_buttons.c b/boards/arm/stm32l5/stm32l562e-dk/src/stm32_buttons.c index e9bb170dc7..51709d12b8 100644 --- a/boards/arm/stm32l5/stm32l562e-dk/src/stm32_buttons.c +++ b/boards/arm/stm32l5/stm32l562e-dk/src/stm32_buttons.c @@ -97,7 +97,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/arm/stm32u5/b-u585i-iot02a/src/stm32_spi.c b/boards/arm/stm32u5/b-u585i-iot02a/src/stm32_spi.c index 6de222688b..569334b98a 100644 --- a/boards/arm/stm32u5/b-u585i-iot02a/src/stm32_spi.c +++ b/boards/arm/stm32u5/b-u585i-iot02a/src/stm32_spi.c @@ -94,7 +94,7 @@ void stm32_spidev_initialize(void) ****************************************************************************/ #ifdef CONFIG_STM32U5_SPI1 -void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, +void stm32_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %08lx CS: %s\n", @@ -103,35 +103,35 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, stm32_gpiowrite(GPIO_SPI1_NSS, !selected); } -uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32U5_SPI2 -void stm32_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, +void stm32_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %08lx CS: %s\n", (unsigned long)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_STM32U5_SPI3 -void stm32_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, +void stm32_spi3select(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %08lx CS: %s\n", (unsigned long)devid, selected ? "assert" : "de-assert"); } -uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t stm32_spi3status(struct spi_dev_s *dev, uint32_t devid) { return 0; } @@ -161,21 +161,21 @@ uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_STM32U5_SPI1 -int stm32_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32U5_SPI2 -int stm32_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } #endif #ifdef CONFIG_STM32U5_SPI3 -int stm32_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int stm32_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return -ENODEV; } diff --git a/boards/arm/str71x/olimex-strp711/src/str71_appinit.c b/boards/arm/str71x/olimex-strp711/src/str71_appinit.c index 2ab4952b03..a7fee878c0 100644 --- a/boards/arm/str71x/olimex-strp711/src/str71_appinit.c +++ b/boards/arm/str71x/olimex-strp711/src/str71_appinit.c @@ -114,7 +114,7 @@ int board_app_initialize(uintptr_t arg) { #ifdef NSH_HAVEMMCSD - FAR struct spi_dev_s *spi; + struct spi_dev_s *spi; int ret; /* Get the SPI port */ diff --git a/boards/arm/str71x/olimex-strp711/src/str71_enc28j60.c b/boards/arm/str71x/olimex-strp711/src/str71_enc28j60.c index 6de7295437..faf1dcc498 100644 --- a/boards/arm/str71x/olimex-strp711/src/str71_enc28j60.c +++ b/boards/arm/str71x/olimex-strp711/src/str71_enc28j60.c @@ -138,10 +138,10 @@ * Private Function Prototypes ****************************************************************************/ -static int up_attach(FAR const struct enc_lower_s *lower, xcpt_t handler, - FAR void *arg); -static void up_enable(FAR const struct enc_lower_s *lower); -static void up_disable(FAR const struct enc_lower_s *lower); +static int up_attach(const struct enc_lower_s *lower, xcpt_t handler, + void *arg); +static void up_enable(const struct enc_lower_s *lower); +static void up_disable(const struct enc_lower_s *lower); /**************************************************************************** * Private Data @@ -167,18 +167,18 @@ static const struct enc_lower_s g_enclower = * Name: struct enc_lower_s methods ****************************************************************************/ -static int up_attach(FAR const struct enc_lower_s *lower, xcpt_t handler, - FAR void *arg) +static int up_attach(const struct enc_lower_s *lower, xcpt_t handler, + void *arg) { return irq_attach(ENC28J60_IRQ, handler, arg); } -static void up_enable(FAR const struct enc_lower_s *lower) +static void up_enable(const struct enc_lower_s *lower) { up_enable_irq(ENC28J60_IRQ); } -static void up_disable(FAR const struct enc_lower_s *lower) +static void up_disable(const struct enc_lower_s *lower) { up_disable_irq(ENC28J60_IRQ); } @@ -193,7 +193,7 @@ static void up_disable(FAR const struct enc_lower_s *lower) void arm_netinitialize(void) { - FAR struct spi_dev_s *spi; + struct spi_dev_s *spi; uint16_t reg16; int ret; diff --git a/boards/arm/str71x/olimex-strp711/src/str71_spi.c b/boards/arm/str71x/olimex-strp711/src/str71_spi.c index 058e84d308..5b09af72fb 100644 --- a/boards/arm/str71x/olimex-strp711/src/str71_spi.c +++ b/boards/arm/str71x/olimex-strp711/src/str71_spi.c @@ -377,29 +377,29 @@ struct str71x_spidev_s /* Helpers */ -static inline uint16_t spi_getreg(FAR struct str71x_spidev_s *priv, +static inline uint16_t spi_getreg(struct str71x_spidev_s *priv, uint8_t offset); -static inline void spi_putreg(FAR struct str71x_spidev_s *priv, +static inline void spi_putreg(struct str71x_spidev_s *priv, uint8_t offset, uint16_t value); -static inline void spi_drain(FAR struct str71x_spidev_s *priv); +static inline void spi_drain(struct str71x_spidev_s *priv); /* SPI methods */ -static int spi_lock(FAR struct spi_dev_s *dev, bool lock); -static void spi_select(FAR struct spi_dev_s *dev, uint32_t devid, +static int spi_lock(struct spi_dev_s *dev, bool lock); +static void spi_select(struct spi_dev_s *dev, uint32_t devid, bool selected); -static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, - uint32_t frequency); -static uint8_t spi_status(FAR struct spi_dev_s *dev, uint32_t devid); +static uint32_t spi_setfrequency(struct spi_dev_s *dev, + uint32_t frequency); +static uint8_t spi_status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -static int spi_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, +static int spi_cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif -static uint32_t spi_send(FAR struct spi_dev_s *dev, uint32_t wd); -static void spi_sndblock(FAR struct spi_dev_s *dev, - FAR const void *buffer, size_t buflen); -static void spi_recvblock(FAR struct spi_dev_s *dev, - FAR void *buffer, size_t buflen); +static uint32_t spi_send(struct spi_dev_s *dev, uint32_t wd); +static void spi_sndblock(struct spi_dev_s *dev, + const void *buffer, size_t buflen); +static void spi_recvblock(struct spi_dev_s *dev, + void *buffer, size_t buflen); /**************************************************************************** * Private Data @@ -469,7 +469,7 @@ static struct str71x_spidev_s g_spidev1 = * ****************************************************************************/ -static inline uint16_t spi_getreg(FAR struct str71x_spidev_s *priv, +static inline uint16_t spi_getreg(struct str71x_spidev_s *priv, uint8_t offset) { return getreg16(priv->spibase + offset); @@ -491,7 +491,7 @@ static inline uint16_t spi_getreg(FAR struct str71x_spidev_s *priv, * ****************************************************************************/ -static inline void spi_putreg(FAR struct str71x_spidev_s *priv, +static inline void spi_putreg(struct str71x_spidev_s *priv, uint8_t offset, uint16_t value) { putreg16(value, priv->spibase + offset); @@ -511,7 +511,7 @@ static inline void spi_putreg(FAR struct str71x_spidev_s *priv, * ****************************************************************************/ -static inline void spi_drain(FAR struct str71x_spidev_s *priv) +static inline void spi_drain(struct str71x_spidev_s *priv) { #if CONFIG_STR714X_BSPI0_TXFIFO_DEPTH > 1 /* Wait while the TX FIFO is full */ @@ -573,9 +573,9 @@ static inline void spi_drain(FAR struct str71x_spidev_s *priv) * ****************************************************************************/ -static int spi_lock(FAR struct spi_dev_s *dev, bool lock) +static int spi_lock(struct spi_dev_s *dev, bool lock) { - FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev; + struct str71x_spidev_s *priv = (struct str71x_spidev_s *)dev; int ret; if (lock) @@ -608,10 +608,10 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock) * ****************************************************************************/ -static void spi_select(FAR struct spi_dev_s *dev, uint32_t devid, +static void spi_select(struct spi_dev_s *dev, uint32_t devid, bool selected) { - FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev; + struct str71x_spidev_s *priv = (struct str71x_spidev_s *)dev; uint16_t reg16; DEBUGASSERT(priv && priv->spibase); @@ -652,10 +652,10 @@ static void spi_select(FAR struct spi_dev_s *dev, uint32_t devid, * ****************************************************************************/ -static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, +static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency) { - FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev; + struct str71x_spidev_s *priv = (struct str71x_spidev_s *)dev; uint32_t divisor; uint32_t cr1; @@ -715,7 +715,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static uint8_t spi_status(FAR struct spi_dev_s *dev, uint32_t devid) +static uint8_t spi_status(struct spi_dev_s *dev, uint32_t devid) { uint8_t ret = 0; uint16_t reg16 = getreg16(STR71X_GPIO1_PD); @@ -758,7 +758,7 @@ static uint8_t spi_status(FAR struct spi_dev_s *dev, uint32_t devid) ****************************************************************************/ #ifdef CONFIG_SPI_CMDDATA -static int spi_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +static int spi_cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { # error "spi_cmddata not implemented" return -ENOSYS; @@ -781,9 +781,9 @@ static int spi_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) * ****************************************************************************/ -static uint32_t spi_send(FAR struct spi_dev_s *dev, uint32_t wd) +static uint32_t spi_send(struct spi_dev_s *dev, uint32_t wd) { - FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev; + struct str71x_spidev_s *priv = (struct str71x_spidev_s *)dev; DEBUGASSERT(priv && priv->spibase); @@ -836,11 +836,11 @@ static uint32_t spi_send(FAR struct spi_dev_s *dev, uint32_t wd) * ****************************************************************************/ -static void spi_sndblock(FAR struct spi_dev_s *dev, - FAR const void *buffer, size_t buflen) +static void spi_sndblock(struct spi_dev_s *dev, + const void *buffer, size_t buflen) { - FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev; - FAR const uint8_t *ptr = (FAR const uint8_t *)buffer; + struct str71x_spidev_s *priv = (struct str71x_spidev_s *)dev; + const uint8_t *ptr = (const uint8_t *)buffer; uint16_t csr2; DEBUGASSERT(priv && priv->spibase); @@ -912,11 +912,11 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, +static void spi_recvblock(struct spi_dev_s *dev, void *buffer, size_t buflen) { - FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev; - FAR uint8_t *ptr = (FAR uint8_t *)buffer; + struct str71x_spidev_s *priv = (struct str71x_spidev_s *)dev; + uint8_t *ptr = (uint8_t *)buffer; uint32_t fifobytes = 0; DEBUGASSERT(priv && priv->spibase); @@ -971,9 +971,9 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, * ****************************************************************************/ -FAR struct spi_dev_s *str71_spibus_initialize(int port) +struct spi_dev_s *str71_spibus_initialize(int port) { - FAR struct spi_dev_s *ret; + struct spi_dev_s *ret; #if defined(CONFIG_STR71X_BSPI0) || defined(CONFIG_STR71X_BSPI1) uint16_t reg16; #endif diff --git a/boards/arm/tiva/dk-tm4c129x/include/board.h b/boards/arm/tiva/dk-tm4c129x/include/board.h index 052a8a382c..7bb4be48f1 100644 --- a/boards/arm/tiva/dk-tm4c129x/include/board.h +++ b/boards/arm/tiva/dk-tm4c129x/include/board.h @@ -265,7 +265,7 @@ ****************************************************************************/ #if defined(CONFIG_I2C) && defined(CONFIG_LM75_I2C) && defined(CONFIG_TIVA_I2C6) -int tiva_tmp100_initialize(FAR const char *devpath); +int tiva_tmp100_initialize(const char *devpath); #endif #endif /* __ASSEMBLY__ */ diff --git a/boards/arm/tiva/dk-tm4c129x/src/tm4c_bringup.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_bringup.c index f9d9024f23..2db85ecda6 100644 --- a/boards/arm/tiva/dk-tm4c129x/src/tm4c_bringup.c +++ b/boards/arm/tiva/dk-tm4c129x/src/tm4c_bringup.c @@ -65,7 +65,7 @@ #ifdef HAVE_I2CTOOL static void tm4c_i2c_register(int bus) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; i2c = tiva_i2cbus_initialize(bus); diff --git a/boards/arm/tiva/dk-tm4c129x/src/tm4c_buttons.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_buttons.c index 6133504434..36f9fb45f3 100644 --- a/boards/arm/tiva/dk-tm4c129x/src/tm4c_buttons.c +++ b/boards/arm/tiva/dk-tm4c129x/src/tm4c_buttons.c @@ -140,7 +140,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_TIVA_GPIOP_IRQS) -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { irqstate_t flags; int ret = -EINVAL; diff --git a/boards/arm/tiva/dk-tm4c129x/src/tm4c_ssi.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_ssi.c index e8fd32477a..00ce8bc41b 100644 --- a/boards/arm/tiva/dk-tm4c129x/src/tm4c_ssi.c +++ b/boards/arm/tiva/dk-tm4c129x/src/tm4c_ssi.c @@ -89,7 +89,7 @@ void weak_function tm4c_ssidev_initialize(void) * ****************************************************************************/ -void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) +void tiva_ssiselect(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); @@ -97,7 +97,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) ssi_dumpgpio("tiva_ssiselect() Exit"); } -uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t tiva_ssistatus(struct spi_dev_s *dev, uint32_t devid) { spiinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; diff --git a/boards/arm/tiva/dk-tm4c129x/src/tm4c_tmp100.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_tmp100.c index 36aa58a4c7..a9975aa4a9 100644 --- a/boards/arm/tiva/dk-tm4c129x/src/tm4c_tmp100.c +++ b/boards/arm/tiva/dk-tm4c129x/src/tm4c_tmp100.c @@ -61,9 +61,9 @@ * ****************************************************************************/ -int tiva_tmp100_initialize(FAR const char *devpath) +int tiva_tmp100_initialize(const char *devpath) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; /* Get an instance of the I2C6 interface */ diff --git a/boards/arm/tiva/eagle100/src/lm_appinit.c b/boards/arm/tiva/eagle100/src/lm_appinit.c index a28766c6d6..d50336616c 100644 --- a/boards/arm/tiva/eagle100/src/lm_appinit.c +++ b/boards/arm/tiva/eagle100/src/lm_appinit.c @@ -107,7 +107,7 @@ int board_app_initialize(uintptr_t arg) { - FAR struct spi_dev_s *spi; + struct spi_dev_s *spi; #if defined (CONFIG_MMCSD) && defined (CONFIG_MMCSD_SPI) int ret; #endif diff --git a/boards/arm/tiva/eagle100/src/lm_ssi.c b/boards/arm/tiva/eagle100/src/lm_ssi.c index 4acfb63e76..9452934ada 100644 --- a/boards/arm/tiva/eagle100/src/lm_ssi.c +++ b/boards/arm/tiva/eagle100/src/lm_ssi.c @@ -94,7 +94,7 @@ void weak_function lm_ssidev_initialize(void) * ****************************************************************************/ -void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) +void tiva_ssiselect(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); @@ -108,7 +108,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) } } -uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t tiva_ssistatus(struct spi_dev_s *dev, uint32_t devid) { spiinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; diff --git a/boards/arm/tiva/ekk-lm3s9b96/src/lm_ssi.c b/boards/arm/tiva/ekk-lm3s9b96/src/lm_ssi.c index a49b0a97d8..adf7e21890 100644 --- a/boards/arm/tiva/ekk-lm3s9b96/src/lm_ssi.c +++ b/boards/arm/tiva/ekk-lm3s9b96/src/lm_ssi.c @@ -93,7 +93,7 @@ void weak_function lm_ssidev_initialize(void) * ****************************************************************************/ -void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) +void tiva_ssiselect(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); @@ -116,7 +116,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) ssi_dumpgpio("tiva_ssiselect() Exit"); } -uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t tiva_ssistatus(struct spi_dev_s *dev, uint32_t devid) { spiinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; diff --git a/boards/arm/tiva/launchxl-cc1310/src/cc1310_buttons.c b/boards/arm/tiva/launchxl-cc1310/src/cc1310_buttons.c index bd1144075a..fb60b97ad2 100644 --- a/boards/arm/tiva/launchxl-cc1310/src/cc1310_buttons.c +++ b/boards/arm/tiva/launchxl-cc1310/src/cc1310_buttons.c @@ -108,7 +108,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_TIVA_GPIOIRQS) -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { irqstate_t flags; int irq; diff --git a/boards/arm/tiva/launchxl-cc1310/src/cc1310_ssi.c b/boards/arm/tiva/launchxl-cc1310/src/cc1310_ssi.c index 50852dec8a..a3a46208f1 100644 --- a/boards/arm/tiva/launchxl-cc1310/src/cc1310_ssi.c +++ b/boards/arm/tiva/launchxl-cc1310/src/cc1310_ssi.c @@ -87,7 +87,7 @@ void cc1310_ssidev_initialize(void) * ****************************************************************************/ -void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) +void tiva_ssiselect(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); @@ -95,7 +95,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) ssi_dumpgpio("tiva_ssiselect() Exit"); } -uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t tiva_ssistatus(struct spi_dev_s *dev, uint32_t devid) { spiinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; diff --git a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_buttons.c b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_buttons.c index d79b7ca8c6..a62478af14 100644 --- a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_buttons.c +++ b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_buttons.c @@ -108,7 +108,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_TIVA_GPIOIRQS) -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { irqstate_t flags; int irq; diff --git a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_ssi.c b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_ssi.c index 1b84d12ee7..f9c930d5d6 100644 --- a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_ssi.c +++ b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_ssi.c @@ -87,7 +87,7 @@ void cc1312_ssidev_initialize(void) * ****************************************************************************/ -void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) +void tiva_ssiselect(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); @@ -95,7 +95,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) ssi_dumpgpio("tiva_ssiselect() Exit"); } -uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t tiva_ssistatus(struct spi_dev_s *dev, uint32_t devid) { spiinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; diff --git a/boards/arm/tiva/lm3s6432-s2e/src/lm_ssi.c b/boards/arm/tiva/lm3s6432-s2e/src/lm_ssi.c index 0ad17ef4bb..32140643ab 100644 --- a/boards/arm/tiva/lm3s6432-s2e/src/lm_ssi.c +++ b/boards/arm/tiva/lm3s6432-s2e/src/lm_ssi.c @@ -92,7 +92,7 @@ void weak_function lm_ssidev_initialize(void) * ****************************************************************************/ -void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) +void tiva_ssiselect(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); @@ -108,7 +108,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) ssi_dumpgpio("tiva_ssiselect() Exit"); } -uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t tiva_ssistatus(struct spi_dev_s *dev, uint32_t devid) { spiinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; diff --git a/boards/arm/tiva/lm3s6965-ek/src/lm_bringup.c b/boards/arm/tiva/lm3s6965-ek/src/lm_bringup.c index b762cdd02d..85952f8ba7 100644 --- a/boards/arm/tiva/lm3s6965-ek/src/lm_bringup.c +++ b/boards/arm/tiva/lm3s6965-ek/src/lm_bringup.c @@ -94,7 +94,7 @@ int lm_bringup(void) int ret = 0; #ifdef NSH_HAVEMMCSD - FAR struct spi_dev_s *spi; + struct spi_dev_s *spi; /* Get the SPI port */ diff --git a/boards/arm/tiva/lm3s6965-ek/src/lm_oled.c b/boards/arm/tiva/lm3s6965-ek/src/lm_oled.c index b1028479e4..ac61f13ad8 100644 --- a/boards/arm/tiva/lm3s6965-ek/src/lm_oled.c +++ b/boards/arm/tiva/lm3s6965-ek/src/lm_oled.c @@ -74,10 +74,10 @@ * ****************************************************************************/ -FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) +struct lcd_dev_s *board_graphics_setup(unsigned int devno) { - FAR struct spi_dev_s *spi; - FAR struct lcd_dev_s *dev; + struct spi_dev_s *spi; + struct lcd_dev_s *dev; /* Configure the OLED GPIOs */ @@ -142,7 +142,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) * ****************************************************************************/ -int tiva_ssicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int tiva_ssicmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { if (devid == SPIDEV_DISPLAY(0)) { diff --git a/boards/arm/tiva/lm3s6965-ek/src/lm_ssi.c b/boards/arm/tiva/lm3s6965-ek/src/lm_ssi.c index 8047921bf0..34fbe21c44 100644 --- a/boards/arm/tiva/lm3s6965-ek/src/lm_ssi.c +++ b/boards/arm/tiva/lm3s6965-ek/src/lm_ssi.c @@ -96,7 +96,7 @@ void weak_function lm_ssidev_initialize(void) * ****************************************************************************/ -void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) +void tiva_ssiselect(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); @@ -120,7 +120,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) ssi_dumpgpio("tiva_ssiselect() Exit"); } -uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t tiva_ssistatus(struct spi_dev_s *dev, uint32_t devid) { spiinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; diff --git a/boards/arm/tiva/lm3s8962-ek/src/lm_appinit.c b/boards/arm/tiva/lm3s8962-ek/src/lm_appinit.c index 1dbce5ed2f..4712a022ae 100644 --- a/boards/arm/tiva/lm3s8962-ek/src/lm_appinit.c +++ b/boards/arm/tiva/lm3s8962-ek/src/lm_appinit.c @@ -114,7 +114,7 @@ int board_app_initialize(uintptr_t arg) { #ifdef NSH_HAVEMMCSD - FAR struct spi_dev_s *spi; + struct spi_dev_s *spi; int ret; /* Get the SPI port */ diff --git a/boards/arm/tiva/lm3s8962-ek/src/lm_oled.c b/boards/arm/tiva/lm3s8962-ek/src/lm_oled.c index a8314295ef..f217901fe8 100644 --- a/boards/arm/tiva/lm3s8962-ek/src/lm_oled.c +++ b/boards/arm/tiva/lm3s8962-ek/src/lm_oled.c @@ -78,10 +78,10 @@ * ****************************************************************************/ -FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) +struct lcd_dev_s *board_graphics_setup(unsigned int devno) { - FAR struct spi_dev_s *spi; - FAR struct lcd_dev_s *dev; + struct spi_dev_s *spi; + struct lcd_dev_s *dev; /* Configure the OLED GPIOs */ @@ -146,7 +146,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno) * ****************************************************************************/ -int tiva_ssicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int tiva_ssicmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { if (devid == SPIDEV_DISPLAY(0)) { diff --git a/boards/arm/tiva/lm3s8962-ek/src/lm_ssi.c b/boards/arm/tiva/lm3s8962-ek/src/lm_ssi.c index 0a7c1efe83..ccfc423c5a 100644 --- a/boards/arm/tiva/lm3s8962-ek/src/lm_ssi.c +++ b/boards/arm/tiva/lm3s8962-ek/src/lm_ssi.c @@ -97,7 +97,7 @@ void weak_function lm_ssidev_initialize(void) * ****************************************************************************/ -void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) +void tiva_ssiselect(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); @@ -121,7 +121,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) ssi_dumpgpio("tiva_ssiselect() Exit"); } -uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t tiva_ssistatus(struct spi_dev_s *dev, uint32_t devid) { spiinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; diff --git a/boards/arm/tiva/lm4f120-launchpad/src/lm4f_ssi.c b/boards/arm/tiva/lm4f120-launchpad/src/lm4f_ssi.c index 96a779eae6..8a126b95e3 100644 --- a/boards/arm/tiva/lm4f120-launchpad/src/lm4f_ssi.c +++ b/boards/arm/tiva/lm4f120-launchpad/src/lm4f_ssi.c @@ -89,7 +89,7 @@ void weak_function lm4f_spidev_initialize(void) * ****************************************************************************/ -void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) +void tiva_ssiselect(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); @@ -97,7 +97,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) ssi_dumpgpio("tiva_ssiselect() Exit"); } -uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t tiva_ssistatus(struct spi_dev_s *dev, uint32_t devid) { spiinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; diff --git a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c123g-launchpad.h b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c123g-launchpad.h index b29e1ec52b..a0cf0f28f4 100644 --- a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c123g-launchpad.h +++ b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c123g-launchpad.h @@ -278,7 +278,7 @@ int tiva_timer_configure(void); ****************************************************************************/ #ifdef CONFIG_CAN_MCP2515 -int tiva_mcp2515initialize(FAR const char *devpath); +int tiva_mcp2515initialize(const char *devpath); #endif #endif /* __ASSEMBLY__ */ diff --git a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_at24.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_at24.c index 95852bb3ba..c30ec7eec1 100644 --- a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_at24.c +++ b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_at24.c @@ -72,8 +72,8 @@ int tm4c_at24_automount(int minor) { - FAR struct i2c_master_s *i2c; - FAR struct mtd_dev_s *mtd; + struct i2c_master_s *i2c; + struct mtd_dev_s *mtd; static bool initialized = false; int ret; diff --git a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_buttons.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_buttons.c index 2599973684..f9021f5b78 100644 --- a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_buttons.c +++ b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_buttons.c @@ -136,7 +136,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { uint32_t pinset = 0; int ret; diff --git a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_mcp2515.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_mcp2515.c index 7b8e05dac2..1d22a81e05 100644 --- a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_mcp2515.c +++ b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_mcp2515.c @@ -56,9 +56,9 @@ struct tiva_mcp2515config_s /* Additional private definitions only known to this driver */ - FAR struct mcp2515_can_s *handle; /* The MCP2515 driver handle */ - mcp2515_handler_t handler; /* The MCP2515 interrupt handler */ - FAR void *arg; /* Argument to pass to the interrupt handler */ + struct mcp2515_can_s *handle; /* The MCP2515 driver handle */ + mcp2515_handler_t handler; /* The MCP2515 interrupt handler */ + void *arg; /* Argument to pass to the interrupt handler */ }; /**************************************************************************** @@ -72,8 +72,8 @@ struct tiva_mcp2515config_s * attach - Attach the MCP2515 interrupt handler to the GPIO interrupt */ -static int mcp2515_attach(FAR struct mcp2515_config_s *state, - mcp2515_handler_t handler, FAR void *arg); +static int mcp2515_attach(struct mcp2515_config_s *state, + mcp2515_handler_t handler, void *arg); /**************************************************************************** * Private Data @@ -112,10 +112,10 @@ static struct tiva_mcp2515config_s g_mcp2515config = /* This is the MCP2515 Interrupt handler */ -int mcp2515_interrupt(int irq, FAR void *context, FAR void *arg) +int mcp2515_interrupt(int irq, void *context, void *arg) { - FAR struct tiva_mcp2515config_s *priv = - (FAR struct tiva_mcp2515config_s *)arg; + struct tiva_mcp2515config_s *priv = + (struct tiva_mcp2515config_s *)arg; DEBUGASSERT(priv != NULL); @@ -131,11 +131,11 @@ int mcp2515_interrupt(int irq, FAR void *context, FAR void *arg) return OK; } -static int mcp2515_attach(FAR struct mcp2515_config_s *state, - mcp2515_handler_t handler, FAR void *arg) +static int mcp2515_attach(struct mcp2515_config_s *state, + mcp2515_handler_t handler, void *arg) { - FAR struct tiva_mcp2515config_s *priv = - (FAR struct tiva_mcp2515config_s *)state; + struct tiva_mcp2515config_s *priv = + (struct tiva_mcp2515config_s *)state; irqstate_t flags; caninfo("Saving handler %p\n", handler); @@ -172,11 +172,11 @@ static int mcp2515_attach(FAR struct mcp2515_config_s *state, * ****************************************************************************/ -int tiva_mcp2515initialize(FAR const char *devpath) +int tiva_mcp2515initialize(const char *devpath) { - FAR struct spi_dev_s *spi; - FAR struct can_dev_s *can; - FAR struct mcp2515_can_s *mcp2515; + struct spi_dev_s *spi; + struct can_dev_s *can; + struct mcp2515_can_s *mcp2515; int ret; /* Check if we are already initialized */ diff --git a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c index 391fda5363..effa55f924 100644 --- a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c +++ b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c @@ -91,7 +91,7 @@ void weak_function tm4c_ssidev_initialize(void) * ****************************************************************************/ -void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) +void tiva_ssiselect(struct spi_dev_s *dev, uint32_t devid, bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); @@ -104,7 +104,7 @@ void tiva_ssiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected) #endif } -uint8_t tiva_ssistatus(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t tiva_ssistatus(struct spi_dev_s *dev, uint32_t devid) { spiinfo("Returning SPI_STATUS_PRESENT\n"); return SPI_STATUS_PRESENT; diff --git a/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_bringup.c b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_bringup.c index 5835238ca3..1288ea5ad0 100644 --- a/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_bringup.c +++ b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_bringup.c @@ -84,7 +84,7 @@ #ifdef HAVE_I2CTOOL static void tm4c_i2c_register(int bus) { - FAR struct i2c_master_s *i2c; + struct i2c_master_s *i2c; int ret; i2c = tiva_i2cbus_initialize(bus); @@ -167,7 +167,7 @@ static void tm4c_i2ctool(void) #ifdef HAVE_PWM static void tm4c_pwm_register(int channel) { - FAR struct pwm_lowerhalf_s *dev; + struct pwm_lowerhalf_s *dev; char pwm_path[PWM_PATH_FMTLEN]; int ret; @@ -244,7 +244,7 @@ static void tm4c_pwm(void) #ifdef HAVE_QEI static void tm4c_qei_register(int id) { - FAR struct qe_lowerhalf_s *dev; + struct qe_lowerhalf_s *dev; int ret; char qe_path[QEI_PATH_FMTLEN]; diff --git a/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_buttons.c b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_buttons.c index 0aaa728d4d..a5665d37a0 100644 --- a/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_buttons.c +++ b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_buttons.c @@ -129,7 +129,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret; diff --git a/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c b/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c index 1610ad0917..e2e35e4f23 100644 --- a/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c +++ b/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c @@ -167,7 +167,7 @@ uint32_t board_buttons(void) * ****************************************************************************/ -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { #ifdef HAVE_IRQBUTTONS if (id == BUTTON_GIOA7) diff --git a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c index 4f686431cf..5d8faac377 100644 --- a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c +++ b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c @@ -167,7 +167,7 @@ uint32_t board_buttons(void) * ****************************************************************************/ -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { #ifdef HAVE_IRQBUTTONS if (id == BUTTON_GIOA7) diff --git a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_spi.c b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_spi.c index 0dd6733f58..35b847d21a 100644 --- a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_spi.c +++ b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_spi.c @@ -91,8 +91,8 @@ void tms570_spidev_initialize(void) ****************************************************************************/ #ifdef CONFIG_TMS570_SPI1 -void tms570_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, - bool selected) +void tms570_spi1select(struct spi_dev_s *dev, uint32_t devid, + bool selected) { #ifdef CONFIG_MMCSD_SPI if (devid == SPIDEV_MMCSD(0)) @@ -102,7 +102,7 @@ void tms570_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, #endif } -uint8_t tms570_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t tms570_spi1status(struct spi_dev_s *dev, uint32_t devid) { uint8_t status = 0; @@ -118,8 +118,8 @@ uint8_t tms570_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) #endif #ifdef CONFIG_TMS570_SPI4 -void tms570_spi4select(FAR struct spi_dev_s *dev, uint32_t devid, - bool selected) +void tms570_spi4select(struct spi_dev_s *dev, uint32_t devid, + bool selected) { #ifdef CONFIG_MMCSD_SPI if (devid == SPIDEV_MMCSD(0)) @@ -129,7 +129,7 @@ void tms570_spi4select(FAR struct spi_dev_s *dev, uint32_t devid, #endif } -uint8_t tms570_spi4status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t tms570_spi4status(struct spi_dev_s *dev, uint32_t devid) { uint8_t status = 0; diff --git a/boards/arm/xmc4/xmc4500-relax/src/xmc4_buttons.c b/boards/arm/xmc4/xmc4500-relax/src/xmc4_buttons.c index e974d092d1..77d711dff4 100644 --- a/boards/arm/xmc4/xmc4500-relax/src/xmc4_buttons.c +++ b/boards/arm/xmc4/xmc4500-relax/src/xmc4_buttons.c @@ -56,7 +56,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { #warning Missing logic return -ENOSYS; diff --git a/boards/arm/xmc4/xmc4500-relax/src/xmc4_max6675.c b/boards/arm/xmc4/xmc4500-relax/src/xmc4_max6675.c index 5cd66bf7eb..6bf38efa27 100644 --- a/boards/arm/xmc4/xmc4500-relax/src/xmc4_max6675.c +++ b/boards/arm/xmc4/xmc4500-relax/src/xmc4_max6675.c @@ -59,9 +59,9 @@ * ****************************************************************************/ -int xmc4_max6675initialize(FAR const char *devpath) +int xmc4_max6675initialize(const char *devpath) { - FAR struct spi_dev_s *spi; + struct spi_dev_s *spi; int ret; spi = xmc4_spibus_initialize(MAX6675_SPI_PORTNO); diff --git a/boards/arm/xmc4/xmc4500-relax/src/xmc4_spi.c b/boards/arm/xmc4/xmc4500-relax/src/xmc4_spi.c index c4a55eb816..a160c8c998 100644 --- a/boards/arm/xmc4/xmc4500-relax/src/xmc4_spi.c +++ b/boards/arm/xmc4/xmc4500-relax/src/xmc4_spi.c @@ -125,8 +125,8 @@ void weak_function xmc4_spidev_initialize(void) ****************************************************************************/ #ifdef CONFIG_XMC4_SPI0 -void xmc4_spi0select(FAR struct spi_dev_s *dev, uint32_t devid, - bool selected) +void xmc4_spi0select(struct spi_dev_s *dev, uint32_t devid, + bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); @@ -134,8 +134,8 @@ void xmc4_spi0select(FAR struct spi_dev_s *dev, uint32_t devid, #endif #ifdef CONFIG_XMC4_SPI1 -void xmc4_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, - bool selected) +void xmc4_spi1select(struct spi_dev_s *dev, uint32_t devid, + bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); @@ -143,8 +143,8 @@ void xmc4_spi1select(FAR struct spi_dev_s *dev, uint32_t devid, #endif #ifdef CONFIG_XMC4_SPI2 -void xmc4_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, - bool selected) +void xmc4_spi2select(struct spi_dev_s *dev, uint32_t devid, + bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); @@ -159,8 +159,8 @@ void xmc4_spi2select(FAR struct spi_dev_s *dev, uint32_t devid, #endif #ifdef CONFIG_XMC4_SPI3 -void xmc4_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, - bool selected) +void xmc4_spi3select(struct spi_dev_s *dev, uint32_t devid, + bool selected) { spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); @@ -182,28 +182,28 @@ void xmc4_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, ****************************************************************************/ #ifdef CONFIG_XMC4_SPI0 -uint8_t xmc4_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t xmc4_spi0status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_XMC4_SPI1 -uint8_t xmc4_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t xmc4_spi1status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_XMC4_SPI2 -uint8_t xmc4_spi2status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t xmc4_spi2status(struct spi_dev_s *dev, uint32_t devid) { return 0; } #endif #ifdef CONFIG_XMC4_SPI3 -uint8_t xmc4_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) +uint8_t xmc4_spi3status(struct spi_dev_s *dev, uint32_t devid) { return 0; } @@ -228,28 +228,28 @@ uint8_t xmc4_spi3status(FAR struct spi_dev_s *dev, uint32_t devid) #ifdef CONFIG_SPI_CMDDATA #ifdef CONFIG_XMC4_SPI0 -int xmc4_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int xmc4_spi0cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return 0; } #endif #ifdef CONFIG_XMC4_SPI1 -int xmc4_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int xmc4_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return 0; } #endif #ifdef CONFIG_XMC4_SPI2 -int xmc4_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int xmc4_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return 0; } #endif #ifdef CONFIG_XMC4_SPI3 -int xmc4_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd) +int xmc4_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { return 0; } diff --git a/boards/arm/xmc4/xmc4700-relax/src/xmc4_buttons.c b/boards/arm/xmc4/xmc4700-relax/src/xmc4_buttons.c index 95d251ca56..8f1ed96ff5 100644 --- a/boards/arm/xmc4/xmc4700-relax/src/xmc4_buttons.c +++ b/boards/arm/xmc4/xmc4700-relax/src/xmc4_buttons.c @@ -56,7 +56,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { #warning Missing logic return -ENOSYS;