diff --git a/arch/arm/include/cxd56xx/audio.h b/arch/arm/include/cxd56xx/audio.h index e5f93e51fe..a6c80dfc85 100644 --- a/arch/arm/include/cxd56xx/audio.h +++ b/arch/arm/include/cxd56xx/audio.h @@ -555,7 +555,7 @@ CXD56_AUDIO_ECODE cxd56_audio_poweroff_dnc(void); */ CXD56_AUDIO_ECODE cxd56_audio_en_dnc(cxd56_audio_dnc_id_t id, - FAR cxd56_audio_dnc_bin_t *bin); + cxd56_audio_dnc_bin_t *bin); /* Disable DNC * @@ -573,7 +573,7 @@ CXD56_AUDIO_ECODE cxd56_audio_dis_dnc(cxd56_audio_dnc_id_t id); * CXD56_AUDIO_ECODE return code */ -CXD56_AUDIO_ECODE cxd56_audio_en_deq(FAR cxd56_audio_deq_coef_t *coef); +CXD56_AUDIO_ECODE cxd56_audio_en_deq(cxd56_audio_deq_coef_t *coef); /* Disable DEQ * @@ -708,7 +708,7 @@ CXD56_AUDIO_ECODE cxd56_audio_stop_beep(void); * CXD56_AUDIO_ECODE return code */ -CXD56_AUDIO_ECODE cxd56_audio_set_micgain(FAR cxd56_audio_mic_gain_t *gain); +CXD56_AUDIO_ECODE cxd56_audio_set_micgain(cxd56_audio_mic_gain_t *gain); /* Set DEQ table * @@ -719,7 +719,7 @@ CXD56_AUDIO_ECODE cxd56_audio_set_micgain(FAR cxd56_audio_mic_gain_t *gain); */ CXD56_AUDIO_ECODE cxd56_audio_set_deq(bool en, - FAR cxd56_audio_deq_coef_t *deq); + cxd56_audio_deq_coef_t *deq); /* Get dma handle * @@ -730,7 +730,7 @@ CXD56_AUDIO_ECODE cxd56_audio_set_deq(bool en, */ CXD56_AUDIO_ECODE cxd56_audio_get_dmahandle(cxd56_audio_dma_path_t path, - FAR cxd56_audio_dma_t *handle); + cxd56_audio_dma_t *handle); /* Free dma handle * @@ -739,7 +739,7 @@ CXD56_AUDIO_ECODE cxd56_audio_get_dmahandle(cxd56_audio_dma_path_t path, * CXD56_AUDIO_ECODE return code */ -CXD56_AUDIO_ECODE cxd56_audio_free_dmahandle(FAR cxd56_audio_dma_t handle); +CXD56_AUDIO_ECODE cxd56_audio_free_dmahandle(cxd56_audio_dma_t handle); /* Set internal data path * @@ -763,7 +763,7 @@ CXD56_AUDIO_ECODE cxd56_audio_set_datapath(cxd56_audio_signal_t sig, CXD56_AUDIO_ECODE cxd56_audio_init_dma(cxd56_audio_dma_t handle, cxd56_audio_samp_fmt_t fmt, - FAR uint8_t *ch_num); + uint8_t *ch_num); /* Initialize dma transfer function * @@ -774,7 +774,7 @@ CXD56_AUDIO_ECODE cxd56_audio_init_dma(cxd56_audio_dma_t handle, */ CXD56_AUDIO_ECODE cxd56_audio_set_dmacb(cxd56_audio_dma_t handle, - FAR cxd56_audio_dma_cb_t cb); + cxd56_audio_dma_cb_t cb); /* Enable dma interrupt * diff --git a/arch/arm/include/cxd56xx/battery_ioctl.h b/arch/arm/include/cxd56xx/battery_ioctl.h index 6e3f5f14ce..a26bf32d77 100644 --- a/arch/arm/include/cxd56xx/battery_ioctl.h +++ b/arch/arm/include/cxd56xx/battery_ioctl.h @@ -96,7 +96,7 @@ struct bat_monitor_rec_s struct bat_monitor_log_s { - FAR struct bat_monitor_rec_s *rec; + struct bat_monitor_rec_s *rec; int index; int size; }; diff --git a/arch/arm/include/cxd56xx/ge2d.h b/arch/arm/include/cxd56xx/ge2d.h index bc8cd2bd5f..291a22c144 100644 --- a/arch/arm/include/cxd56xx/ge2d.h +++ b/arch/arm/include/cxd56xx/ge2d.h @@ -40,8 +40,8 @@ extern "C" * Public Function Prototypes ****************************************************************************/ -int cxd56_ge2dinitialize(FAR const char *devname); -void cxd56_ge2duninitialize(FAR const char *devname); +int cxd56_ge2dinitialize(const char *devname); +void cxd56_ge2duninitialize(const char *devname); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/include/cxd56xx/gnss.h b/arch/arm/include/cxd56xx/gnss.h index 841fd55751..93ed1969a9 100644 --- a/arch/arm/include/cxd56xx/gnss.h +++ b/arch/arm/include/cxd56xx/gnss.h @@ -699,11 +699,11 @@ struct cxd56_gnss_ope_mode_param_s struct cxd56_gnss_orbital_param_s { - uint32_t type; /* One of #CXD56_GNSS_DATA_GPS, - * #CXD56_GNSS_DATA_GLONASS or - * #CXD56_GNSS_DATA_QZSSL1CA. - */ - FAR uint32_t *data; /* Address pointing to almanac or ephemeris data buffer */ + uint32_t type; /* One of #CXD56_GNSS_DATA_GPS, + * #CXD56_GNSS_DATA_GLONASS or + * #CXD56_GNSS_DATA_QZSSL1CA. + */ + uint32_t *data; /* Address pointing to almanac or ephemeris data buffer */ }; /* date and time */ @@ -736,9 +736,9 @@ struct cxd56_gnss_orthogonal_position_s struct cxd56_gnss_cep_data_s { - FAR uint32_t *data; - uint32_t size; - uint32_t counter; + uint32_t *data; + uint32_t size; + uint32_t counter; }; /* CEP age info */ @@ -753,24 +753,24 @@ struct cxd56_gnss_cep_age_s struct cxd56_gnss_agps_acquist_s { - FAR uint8_t *data; /* Address pointing to aquist data buffer */ - uint16_t size; /* Aquist data size */ + uint8_t *data; /* Address pointing to aquist data buffer */ + uint16_t size; /* Aquist data size */ }; /* tow assist data and size for AGPS */ struct cxd56_gnss_agps_tow_assist_s { - FAR uint8_t *data; /* Address pointing to tow assist data buffer */ - uint16_t size; /* assist data size */ + uint8_t *data; /* Address pointing to tow assist data buffer */ + uint16_t size; /* assist data size */ }; /* utc model data and size for AGPS */ struct cxd56_gnss_agps_utc_model_s { - FAR uint8_t *data; /* Address pointing to utc model data buffer */ - uint16_t size; /* utc model data size */ + uint8_t *data; /* Address pointing to utc model data buffer */ + uint16_t size; /* utc model data size */ }; /* Time from frame start[sec]. */ @@ -833,21 +833,21 @@ struct cxd56_gnss_test_result_s struct cxd56_gnss_signal_setting_s { - int fd; /* The descriptor for signal handler */ - uint8_t enable; /* 1 when set this setting, 0 is clear */ - uint8_t gnsssig; /* GNSS signal as CXD56_GNSS_SIG_GNSS, _AGPS, etc. */ - int signo; /* system signal number to notify read completion */ - FAR void *data; /* user data */ + int fd; /* The descriptor for signal handler */ + uint8_t enable; /* 1 when set this setting, 0 is clear */ + uint8_t gnsssig; /* GNSS signal as CXD56_GNSS_SIG_GNSS, _AGPS, etc. */ + int signo; /* system signal number to notify read completion */ + void *data; /* user data */ }; /* Information for use after being signaled to read data asynchronously */ struct cxd56_gnss_signal_info_s { - int fd; /* The file descriptor to use in signal handler */ - uint8_t gnsssig; /* GNSS signal as CXD56_GNSS_SIG_GNSS, _AGPS, etc. */ - int signo; /* system signal number to notify read completion */ - FAR void *data; /* user data */ + int fd; /* The file descriptor to use in signal handler */ + uint8_t gnsssig; /* GNSS signal as CXD56_GNSS_SIG_GNSS, _AGPS, etc. */ + int signo; /* system signal number to notify read completion */ + void *data; /* user data */ }; /* PVTLOG setting Parameter. diff --git a/arch/arm/include/cxd56xx/hostif.h b/arch/arm/include/cxd56xx/hostif.h index 3c58bd70a3..7cb9b0403a 100644 --- a/arch/arm/include/cxd56xx/hostif.h +++ b/arch/arm/include/cxd56xx/hostif.h @@ -101,7 +101,7 @@ extern "C" * ****************************************************************************/ -int hostif_i2cinitialize(FAR struct hostif_i2cconf_s *config); +int hostif_i2cinitialize(struct hostif_i2cconf_s *config); /**************************************************************************** * Name: hostif_spiinitialize @@ -117,7 +117,7 @@ int hostif_i2cinitialize(FAR struct hostif_i2cconf_s *config); * ****************************************************************************/ -int hostif_spiinitialize(FAR struct hostif_spiconf_s *config); +int hostif_spiinitialize(struct hostif_spiconf_s *config); /**************************************************************************** * Name: hostif_uninitialize diff --git a/arch/arm/include/cxd56xx/scu.h b/arch/arm/include/cxd56xx/scu.h index 04d6d3d0fa..6cc502f021 100644 --- a/arch/arm/include/cxd56xx/scu.h +++ b/arch/arm/include/cxd56xx/scu.h @@ -327,7 +327,7 @@ struct scuev_notify_s uint32_t ctrl; /* Event control */ - FAR struct scuev_arg_s *arg; /* Arguments for event raised */ + struct scuev_arg_s *arg; /* Arguments for event raised */ }; /* Offset/gain adjustment parameter */ @@ -364,7 +364,7 @@ struct scufifo_wm_s /* Pointer to memory to be timestamp stored */ - FAR struct scutimestamp_s *ts; + struct scutimestamp_s *ts; /* Watermark value. SCU notifies when * stored samples over watermark in FIFO. @@ -389,14 +389,14 @@ struct seq_s; /* The sequencer object */ * return: struct seq_s pointer is success. NULL is failure. */ -FAR struct seq_s *seq_open(int type, int bustype); +struct seq_s *seq_open(int type, int bustype); /* Close sequencer device * * param [in] seq : Sequencer instance */ -void seq_close(FAR struct seq_s *seq); +void seq_close(struct seq_s *seq); /* Read sequencer FIFO data * @@ -408,7 +408,7 @@ void seq_close(FAR struct seq_s *seq); * return : OK(0) is success. negative value is failure. */ -int seq_read(FAR struct seq_s *seq, int fifoid, char *buffer, int length); +int seq_read(struct seq_s *seq, int fifoid, char *buffer, int length); /* Sequencer specific ioctl * @@ -424,7 +424,7 @@ int seq_read(FAR struct seq_s *seq, int fifoid, char *buffer, int length); * return: OK(0) is success. negative value is failure. */ -int seq_ioctl(FAR struct seq_s *seq, int fifoid, int cmd, unsigned long arg); +int seq_ioctl(struct seq_s *seq, int fifoid, int cmd, unsigned long arg); /* Set cyclic sequencer instruction * @@ -435,7 +435,7 @@ int seq_ioctl(FAR struct seq_s *seq, int fifoid, int cmd, unsigned long arg); * return OK(0) is success. negative value is failure. */ -int seq_setinstruction(FAR struct seq_s *seq, const uint16_t *inst, +int seq_setinstruction(struct seq_s *seq, const uint16_t *inst, uint16_t nr_insts); /* Set sample data format @@ -449,7 +449,7 @@ int seq_setinstruction(FAR struct seq_s *seq, const uint16_t *inst, * return OK(0) is success. negative value is failure. */ -void seq_setsample(FAR struct seq_s *seq, uint8_t sample, uint8_t offset, +void seq_setsample(struct seq_s *seq, uint8_t sample, uint8_t offset, uint8_t elemsize, bool swapbyte); /* Set slave ID or address @@ -458,7 +458,7 @@ void seq_setsample(FAR struct seq_s *seq, uint8_t sample, uint8_t offset, * param [in] slave_addr : In SPI, slave select ID. In I2C, bus address. */ -void seq_setaddress(FAR struct seq_s *seq, uint32_t slave_addr); +void seq_setaddress(struct seq_s *seq, uint32_t slave_addr); /* SPI data transfer via sequencer. * diff --git a/arch/arm/include/cxd56xx/timer.h b/arch/arm/include/cxd56xx/timer.h index 83391cba31..c3309290e3 100644 --- a/arch/arm/include/cxd56xx/timer.h +++ b/arch/arm/include/cxd56xx/timer.h @@ -47,8 +47,8 @@ struct timer_sethandler_s { - FAR void *arg; /* An argument */ - CODE tccb_t handler; /* The timer interrupt handler */ + void *arg; /* An argument */ + tccb_t handler; /* The timer interrupt handler */ }; #endif /* __ARCH_ARM_INCLUDE_CXD56XX_TIMER_H */ diff --git a/arch/arm/include/cxd56xx/uart0.h b/arch/arm/include/cxd56xx/uart0.h index 04fc37f548..6778b5b827 100644 --- a/arch/arm/include/cxd56xx/uart0.h +++ b/arch/arm/include/cxd56xx/uart0.h @@ -40,8 +40,8 @@ extern "C" * Public Function Prototypes ****************************************************************************/ -int cxd56_uart0initialize(FAR const char *devname); -void cxd56_uart0uninitialize(FAR const char *devname); +int cxd56_uart0initialize(const char *devname); +void cxd56_uart0uninitialize(const char *devname); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/am335x/am335x_can.c b/arch/arm/src/am335x/am335x_can.c index 906968b025..5767dd868d 100644 --- a/arch/arm/src/am335x/am335x_can.c +++ b/arch/arm/src/am335x/am335x_can.c @@ -126,20 +126,20 @@ static void can_putreg(struct up_dev_s *priv, int offset, uint32_t value); /* CAN methods */ -static void can_reset(FAR struct can_dev_s *dev); -static int can_setup(FAR struct can_dev_s *dev); -static void can_shutdown(FAR struct can_dev_s *dev); -static void can_rxint(FAR struct can_dev_s *dev, bool enable); -static void can_txint(FAR struct can_dev_s *dev, bool enable); -static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg); -static int can_remoterequest(FAR struct can_dev_s *dev, uint16_t id); -static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg); -static bool candev_txready(FAR struct can_dev_s *dev); -static bool candev_txempty(FAR struct can_dev_s *dev); +static void can_reset(struct can_dev_s *dev); +static int can_setup(struct can_dev_s *dev); +static void can_shutdown(struct can_dev_s *dev); +static void can_rxint(struct can_dev_s *dev, bool enable); +static void can_txint(struct can_dev_s *dev, bool enable); +static int can_ioctl(struct can_dev_s *dev, int cmd, unsigned long arg); +static int can_remoterequest(struct can_dev_s *dev, uint16_t id); +static int can_send(struct can_dev_s *dev, struct can_msg_s *msg); +static bool candev_txready(struct can_dev_s *dev); +static bool candev_txempty(struct can_dev_s *dev); /* CAN interrupts */ -static int can_interrupt(int irq, FAR void *context, FAR void *arg); +static int can_interrupt(int irq, void *context, void *arg); /* Message Processing */ @@ -357,9 +357,9 @@ static void can_putreg(struct up_dev_s *priv, int offset, uint32_t value) * ****************************************************************************/ -static void can_reset(FAR struct can_dev_s *dev) +static void can_reset(struct can_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; caninfo("CAN%d reset\n", priv->port); @@ -387,9 +387,9 @@ static void can_reset(FAR struct can_dev_s *dev) * ****************************************************************************/ -static int can_setup(FAR struct can_dev_s *dev) +static int can_setup(struct can_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *) dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; uint32_t regval; uint8_t i; int ret = ERROR; @@ -415,7 +415,7 @@ static int can_setup(FAR struct can_dev_s *dev) { } - ret = irq_attach(priv->irq, can_interrupt, (FAR void *)dev); + ret = irq_attach(priv->irq, can_interrupt, (void *)dev); if (ret == OK) { up_enable_irq(priv->irq); @@ -445,9 +445,9 @@ static int can_setup(FAR struct can_dev_s *dev) * ****************************************************************************/ -static void can_shutdown(FAR struct can_dev_s *dev) +static void can_shutdown(struct can_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *) dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; uint32_t regval; caninfo("CAN%d\n", priv->port); @@ -488,9 +488,9 @@ static void can_shutdown(FAR struct can_dev_s *dev) * ****************************************************************************/ -static void can_rxint(FAR struct can_dev_s *dev, bool enable) +static void can_rxint(struct can_dev_s *dev, bool enable) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *) dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; if (enable == true) { @@ -520,7 +520,7 @@ static void can_rxint(FAR struct can_dev_s *dev, bool enable) * ****************************************************************************/ -static void can_txint(FAR struct can_dev_s *dev, bool enable) +static void can_txint(struct can_dev_s *dev, bool enable) { /* The TX interrupt is automatically enabled in can_send within a * message object. @@ -541,7 +541,7 @@ static void can_txint(FAR struct can_dev_s *dev, bool enable) * ****************************************************************************/ -static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg) +static int can_ioctl(struct can_dev_s *dev, int cmd, unsigned long arg) { caninfo("Fix me:Not Implemented\n"); return 0; @@ -561,7 +561,7 @@ static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg) * ****************************************************************************/ -static int can_remoterequest(FAR struct can_dev_s *dev, uint16_t id) +static int can_remoterequest(struct can_dev_s *dev, uint16_t id) { caninfo("Fix me:Not Implemented\n"); return 0; @@ -590,9 +590,9 @@ static int can_remoterequest(FAR struct can_dev_s *dev, uint16_t id) * ****************************************************************************/ -static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg) +static int can_send(struct can_dev_s *dev, struct can_msg_s *msg) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *) dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; uint32_t regval; uint32_t num; uint32_t id; @@ -686,9 +686,9 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg) * ****************************************************************************/ -static bool candev_txready(FAR struct can_dev_s *dev) +static bool candev_txready(struct can_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *) dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; if (can_getreg(priv, AM335X_DCAN_TXRQ34_OFFSET) != 0xffffffff) { @@ -721,9 +721,9 @@ static bool candev_txready(FAR struct can_dev_s *dev) * ****************************************************************************/ -static bool candev_txempty(FAR struct can_dev_s *dev) +static bool candev_txempty(struct can_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *) dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; return (!((can_getreg(priv, AM335X_DCAN_TXRQ_X_OFFSET)) & 0xffff)); } @@ -744,10 +744,10 @@ static bool candev_txempty(FAR struct can_dev_s *dev) * ****************************************************************************/ -static int can_interrupt(int irq, FAR void *context, FAR void *arg) +static int can_interrupt(int irq, void *context, void *arg) { - struct can_dev_s *dev = (FAR struct can_dev_s *)arg; - FAR struct up_dev_s *priv; + struct can_dev_s *dev = (struct can_dev_s *)arg; + struct up_dev_s *priv; uint32_t regval = 0; DEBUGASSERT(dev != NULL && dev->cd_priv != NULL); @@ -1070,9 +1070,9 @@ static int can_bittiming(struct up_dev_s *priv) * ****************************************************************************/ -FAR struct can_dev_s *am335x_can_initialize(int port) +struct can_dev_s *am335x_can_initialize(int port) { - FAR struct can_dev_s *candev; + struct can_dev_s *candev; irqstate_t flags; syslog(LOG_DEBUG, "CAN%d\n", port); @@ -1116,7 +1116,7 @@ FAR struct can_dev_s *am335x_can_initialize(int port) return candev; } -void am335x_can_uninitialize(FAR struct can_dev_s *dev) +void am335x_can_uninitialize(struct can_dev_s *dev) { irqstate_t flags; diff --git a/arch/arm/src/am335x/am335x_can.h b/arch/arm/src/am335x/am335x_can.h index a4ae460450..a4a668fad2 100644 --- a/arch/arm/src/am335x/am335x_can.h +++ b/arch/arm/src/am335x/am335x_can.h @@ -49,7 +49,7 @@ * ****************************************************************************/ -FAR struct can_dev_s *am335x_can_initialize(int port); +struct can_dev_s *am335x_can_initialize(int port); /**************************************************************************** * Name: am335x_can_uninitialize @@ -66,6 +66,6 @@ FAR struct can_dev_s *am335x_can_initialize(int port); * ****************************************************************************/ -void am335x_can_uninitialize(FAR struct can_dev_s *dev); +void am335x_can_uninitialize(struct can_dev_s *dev); #endif /* __ARCH_ARM_SRC_AM335X_AM335X_CAN_H */ diff --git a/arch/arm/src/am335x/am335x_edid.c b/arch/arm/src/am335x/am335x_edid.c index 5c253b5ca7..9aefcf04a9 100644 --- a/arch/arm/src/am335x/am335x_edid.c +++ b/arch/arm/src/am335x/am335x_edid.c @@ -83,7 +83,7 @@ ****************************************************************************/ static uint32_t - am335x_videomode_vrefresh(FAR const struct videomode_s *videomode) +am335x_videomode_vrefresh(const struct videomode_s *videomode) { uint32_t refresh; @@ -114,7 +114,7 @@ static uint32_t ****************************************************************************/ static bool - am335x_videomode_valid(FAR const struct videomode_s *videomode) +am335x_videomode_valid(const struct videomode_s *videomode) { size_t fbstride; size_t fbsize; @@ -218,9 +218,9 @@ static bool ****************************************************************************/ static const struct videomode_s * - am335x_lcd_pickmode(FAR struct edid_info_s *ei) +am335x_lcd_pickmode(struct edid_info_s *ei) { - FAR const struct videomode_s *videomode; + const struct videomode_s *videomode; int n; /* Get standard VGA as default */ @@ -281,8 +281,8 @@ static const struct videomode_s * * ****************************************************************************/ -void am335x_lcd_videomode(FAR const struct videomode_s *videomode, - FAR struct am335x_panel_info_s *panel) +void am335x_lcd_videomode(const struct videomode_s *videomode, + struct am335x_panel_info_s *panel) { lcdinfo("Detected videomode: %dx%d @ %" PRId32 "KHz\n", videomode->hdisplay, videomode->vdisplay, @@ -354,11 +354,11 @@ void am335x_lcd_videomode(FAR const struct videomode_s *videomode, * ****************************************************************************/ -void am335x_lcd_edid(FAR const uint8_t *edid, size_t edid_len, - FAR struct am335x_panel_info_s *panel, - FAR const struct videomode_s **selected) +void am335x_lcd_edid(const uint8_t *edid, size_t edid_len, + struct am335x_panel_info_s *panel, + const struct videomode_s **selected) { - FAR const struct videomode_s *videomode = NULL; + const struct videomode_s *videomode = NULL; struct edid_info_s ei; /* Do we have EDID data? */ diff --git a/arch/arm/src/am335x/am335x_gpioirq.c b/arch/arm/src/am335x/am335x_gpioirq.c index ea05319fc6..8969072e45 100644 --- a/arch/arm/src/am335x/am335x_gpioirq.c +++ b/arch/arm/src/am335x/am335x_gpioirq.c @@ -180,7 +180,7 @@ static int am335x_gpio_interrupt(uint32_t base, int irq0, void *context) } #ifdef CONFIG_AM335X_GPIO0_IRQ -static int am335x_gpio0_interrupt(int irq, FAR void *context, FAR void *arg) +static int am335x_gpio0_interrupt(int irq, void *context, void *arg) { return am335x_gpio_interrupt(AM335X_GPIO0_VADDR, AM335X_IRQ_GPIO0P0, context); @@ -188,7 +188,7 @@ static int am335x_gpio0_interrupt(int irq, FAR void *context, FAR void *arg) #endif #ifdef CONFIG_AM335X_GPIO1_IRQ -static int am335x_gpio1_interrupt(int irq, FAR void *context, FAR void *arg) +static int am335x_gpio1_interrupt(int irq, void *context, void *arg) { return am335x_gpio_interrupt(AM335X_GPIO1_VADDR, AM335X_IRQ_GPIO1P0, context); @@ -196,7 +196,7 @@ static int am335x_gpio1_interrupt(int irq, FAR void *context, FAR void *arg) #endif #ifdef CONFIG_AM335X_GPIO2_IRQ -static int am335x_gpio2_interrupt(int irq, FAR void *context, FAR void *arg) +static int am335x_gpio2_interrupt(int irq, void *context, void *arg) { return am335x_gpio_interrupt(AM335X_GPIO2_VADDR, AM335X_IRQ_GPIO2P0, context); @@ -204,7 +204,7 @@ static int am335x_gpio2_interrupt(int irq, FAR void *context, FAR void *arg) #endif #ifdef CONFIG_AM335X_GPIO3_IRQ -static int am335x_gpio3_interrupt(int irq, FAR void *context, FAR void *arg) +static int am335x_gpio3_interrupt(int irq, void *context, void *arg) { return am335x_gpio_interrupt(AM335X_GPIO3_VADDR, AM335X_IRQ_GPIO3P0, context); diff --git a/arch/arm/src/am335x/am335x_i2c.c b/arch/arm/src/am335x/am335x_i2c.c index 6aed9159e5..e8831a55c1 100644 --- a/arch/arm/src/am335x/am335x_i2c.c +++ b/arch/arm/src/am335x/am335x_i2c.c @@ -212,59 +212,59 @@ struct am335x_i2c_priv_s * Private Function Prototypes ****************************************************************************/ -static inline uint32_t am335x_i2c_getreg(FAR struct am335x_i2c_priv_s *priv, +static inline uint32_t am335x_i2c_getreg(struct am335x_i2c_priv_s *priv, uint16_t offset); -static inline void am335x_i2c_putreg(FAR struct am335x_i2c_priv_s *priv, +static inline void am335x_i2c_putreg(struct am335x_i2c_priv_s *priv, uint16_t offset, uint32_t value); -static inline void am335x_i2c_modifyreg(FAR struct am335x_i2c_priv_s *priv, +static inline void am335x_i2c_modifyreg(struct am335x_i2c_priv_s *priv, uint16_t offset, uint32_t clearbits, uint32_t setbits); -static inline int am335x_i2c_sem_wait(FAR struct am335x_i2c_priv_s *priv); +static inline int am335x_i2c_sem_wait(struct am335x_i2c_priv_s *priv); static int - am335x_i2c_sem_wait_noncancelable(FAR struct am335x_i2c_priv_s *priv); +am335x_i2c_sem_wait_noncancelable(struct am335x_i2c_priv_s *priv); #ifdef CONFIG_AM335X_I2C_DYNTIMEO -static useconds_t am335x_i2c_tousecs(int msgc, FAR struct i2c_msg_s *msgs); +static useconds_t am335x_i2c_tousecs(int msgc, struct i2c_msg_s *msgs); #endif /* CONFIG_AM335X_I2C_DYNTIMEO */ static inline int - am335x_i2c_sem_waitdone(FAR struct am335x_i2c_priv_s *priv); +am335x_i2c_sem_waitdone(struct am335x_i2c_priv_s *priv); static inline bool - am335x_i2c_sem_waitstop(FAR struct am335x_i2c_priv_s *priv); -static inline void am335x_i2c_sem_post(FAR struct am335x_i2c_priv_s *priv); -static inline void am335x_i2c_sem_init(FAR struct am335x_i2c_priv_s *priv); +am335x_i2c_sem_waitstop(struct am335x_i2c_priv_s *priv); +static inline void am335x_i2c_sem_post(struct am335x_i2c_priv_s *priv); +static inline void am335x_i2c_sem_init(struct am335x_i2c_priv_s *priv); static inline void - am335x_i2c_sem_destroy(FAR struct am335x_i2c_priv_s *priv); +am335x_i2c_sem_destroy(struct am335x_i2c_priv_s *priv); #ifdef CONFIG_I2C_TRACE -static void am335x_i2c_tracereset(FAR struct am335x_i2c_priv_s *priv); -static void am335x_i2c_tracenew(FAR struct am335x_i2c_priv_s *priv, +static void am335x_i2c_tracereset(struct am335x_i2c_priv_s *priv); +static void am335x_i2c_tracenew(struct am335x_i2c_priv_s *priv, uint32_t status); -static void am335x_i2c_traceevent(FAR struct am335x_i2c_priv_s *priv, +static void am335x_i2c_traceevent(struct am335x_i2c_priv_s *priv, enum am335x_trace_e event, uint32_t parm); -static void am335x_i2c_tracedump(FAR struct am335x_i2c_priv_s *priv); +static void am335x_i2c_tracedump(struct am335x_i2c_priv_s *priv); #endif /* CONFIG_I2C_TRACE */ -static void am335x_i2c_setclock(FAR struct am335x_i2c_priv_s *priv, +static void am335x_i2c_setclock(struct am335x_i2c_priv_s *priv, uint32_t frequency); -static inline void am335x_i2c_sendstart(FAR struct am335x_i2c_priv_s *priv, +static inline void am335x_i2c_sendstart(struct am335x_i2c_priv_s *priv, uint16_t address); -static inline void am335x_i2c_sendstop(FAR struct am335x_i2c_priv_s *priv); +static inline void am335x_i2c_sendstop(struct am335x_i2c_priv_s *priv); static inline uint32_t - am335x_i2c_getstatus(FAR struct am335x_i2c_priv_s *priv); +am335x_i2c_getstatus(struct am335x_i2c_priv_s *priv); static int am335x_i2c_isr_process(struct am335x_i2c_priv_s * priv); #ifndef CONFIG_I2C_POLLED -static int am335x_i2c_isr(int irq, void *context, FAR void *arg); +static int am335x_i2c_isr(int irq, void *context, void *arg); #endif /* !CONFIG_I2C_POLLED */ -static int am335x_i2c_init(FAR struct am335x_i2c_priv_s *priv); -static int am335x_i2c_deinit(FAR struct am335x_i2c_priv_s *priv); -static int am335x_i2c_transfer(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count); +static int am335x_i2c_init(struct am335x_i2c_priv_s *priv); +static int am335x_i2c_deinit(struct am335x_i2c_priv_s *priv); +static int am335x_i2c_transfer(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count); #ifdef CONFIG_I2C_RESET -static int am335x_i2c_reset(FAR struct i2c_master_s *dev); +static int am335x_i2c_reset(struct i2c_master_s *dev); #endif /**************************************************************************** @@ -404,7 +404,7 @@ static struct am335x_i2c_priv_s am335x_i2c2_priv = * ****************************************************************************/ -static inline uint32_t am335x_i2c_getreg(FAR struct am335x_i2c_priv_s *priv, +static inline uint32_t am335x_i2c_getreg(struct am335x_i2c_priv_s *priv, uint16_t offset) { return getreg32(priv->config->base + offset); @@ -418,7 +418,7 @@ static inline uint32_t am335x_i2c_getreg(FAR struct am335x_i2c_priv_s *priv, * ****************************************************************************/ -static inline void am335x_i2c_putreg(FAR struct am335x_i2c_priv_s *priv, +static inline void am335x_i2c_putreg(struct am335x_i2c_priv_s *priv, uint16_t offset, uint32_t value) { putreg32(value, priv->config->base + offset); @@ -432,7 +432,7 @@ static inline void am335x_i2c_putreg(FAR struct am335x_i2c_priv_s *priv, * ****************************************************************************/ -static inline void am335x_i2c_modifyreg(FAR struct am335x_i2c_priv_s *priv, +static inline void am335x_i2c_modifyreg(struct am335x_i2c_priv_s *priv, uint16_t offset, uint32_t clearbits, uint32_t setbits) { @@ -448,7 +448,7 @@ static inline void am335x_i2c_modifyreg(FAR struct am335x_i2c_priv_s *priv, * ****************************************************************************/ -static inline int am335x_i2c_sem_wait(FAR struct am335x_i2c_priv_s *priv) +static inline int am335x_i2c_sem_wait(struct am335x_i2c_priv_s *priv) { return nxsem_wait(&priv->sem_excl); } @@ -462,7 +462,7 @@ static inline int am335x_i2c_sem_wait(FAR struct am335x_i2c_priv_s *priv) ****************************************************************************/ static int - am335x_i2c_sem_wait_noncancelable(FAR struct am335x_i2c_priv_s *priv) +am335x_i2c_sem_wait_noncancelable(struct am335x_i2c_priv_s *priv) { return nxsem_wait_uninterruptible(&priv->sem_excl); } @@ -477,7 +477,7 @@ static int ****************************************************************************/ #ifdef CONFIG_AM335X_I2C_DYNTIMEO -static useconds_t am335x_i2c_tousecs(int msgc, FAR struct i2c_msg_s *msgs) +static useconds_t am335x_i2c_tousecs(int msgc, struct i2c_msg_s *msgs) { size_t bytecount = 0; int i; @@ -506,7 +506,7 @@ static useconds_t am335x_i2c_tousecs(int msgc, FAR struct i2c_msg_s *msgs) ****************************************************************************/ #ifndef CONFIG_I2C_POLLED -static inline int am335x_i2c_sem_waitdone(FAR struct am335x_i2c_priv_s *priv) +static inline int am335x_i2c_sem_waitdone(struct am335x_i2c_priv_s *priv) { struct timespec abstime; irqstate_t flags; @@ -611,7 +611,7 @@ static inline int am335x_i2c_sem_waitdone(FAR struct am335x_i2c_priv_s *priv) return ret; } #else -static inline int am335x_i2c_sem_waitdone(FAR struct am335x_i2c_priv_s *priv) +static inline int am335x_i2c_sem_waitdone(struct am335x_i2c_priv_s *priv) { clock_t timeout; clock_t start; @@ -666,7 +666,7 @@ static inline int am335x_i2c_sem_waitdone(FAR struct am335x_i2c_priv_s *priv) ****************************************************************************/ static inline bool - am335x_i2c_sem_waitstop(FAR struct am335x_i2c_priv_s *priv) +am335x_i2c_sem_waitstop(struct am335x_i2c_priv_s *priv) { clock_t start; clock_t elapsed; @@ -736,7 +736,7 @@ static inline void am335x_i2c_sem_post(struct am335x_i2c_priv_s *priv) * ****************************************************************************/ -static inline void am335x_i2c_sem_init(FAR struct am335x_i2c_priv_s *priv) +static inline void am335x_i2c_sem_init(struct am335x_i2c_priv_s *priv) { nxsem_init(&priv->sem_excl, 0, 1); @@ -758,7 +758,7 @@ static inline void am335x_i2c_sem_init(FAR struct am335x_i2c_priv_s *priv) * ****************************************************************************/ -static inline void am335x_i2c_sem_destroy(FAR struct am335x_i2c_priv_s *priv) +static inline void am335x_i2c_sem_destroy(struct am335x_i2c_priv_s *priv) { nxsem_destroy(&priv->sem_excl); #ifndef CONFIG_I2C_POLLED @@ -775,7 +775,7 @@ static inline void am335x_i2c_sem_destroy(FAR struct am335x_i2c_priv_s *priv) ****************************************************************************/ #ifdef CONFIG_I2C_TRACE -static void am335x_i2c_traceclear(FAR struct am335x_i2c_priv_s *priv) +static void am335x_i2c_traceclear(struct am335x_i2c_priv_s *priv) { struct am335x_trace_s *trace = &priv->trace[priv->tndx]; @@ -786,7 +786,7 @@ static void am335x_i2c_traceclear(FAR struct am335x_i2c_priv_s *priv) trace->time = 0; /* Time of first status or event */ } -static void am335x_i2c_tracereset(FAR struct am335x_i2c_priv_s *priv) +static void am335x_i2c_tracereset(struct am335x_i2c_priv_s *priv) { /* Reset the trace info for a new data collection */ @@ -795,7 +795,7 @@ static void am335x_i2c_tracereset(FAR struct am335x_i2c_priv_s *priv) am335x_i2c_traceclear(priv); } -static void am335x_i2c_tracenew(FAR struct am335x_i2c_priv_s *priv, +static void am335x_i2c_tracenew(struct am335x_i2c_priv_s *priv, uint32_t status) { struct am335x_trace_s *trace = &priv->trace[priv->tndx]; @@ -835,7 +835,7 @@ static void am335x_i2c_tracenew(FAR struct am335x_i2c_priv_s *priv, } } -static void am335x_i2c_traceevent(FAR struct am335x_i2c_priv_s *priv, +static void am335x_i2c_traceevent(struct am335x_i2c_priv_s *priv, enum am335x_trace_e event, uint32_t parm) { struct am335x_trace_s *trace; @@ -862,7 +862,7 @@ static void am335x_i2c_traceevent(FAR struct am335x_i2c_priv_s *priv, } } -static void am335x_i2c_tracedump(FAR struct am335x_i2c_priv_s *priv) +static void am335x_i2c_tracedump(struct am335x_i2c_priv_s *priv) { struct am335x_trace_s *trace; int i; @@ -891,7 +891,7 @@ static void am335x_i2c_tracedump(FAR struct am335x_i2c_priv_s *priv) * ****************************************************************************/ -static void am335x_i2c_setclock(FAR struct am335x_i2c_priv_s *priv, +static void am335x_i2c_setclock(struct am335x_i2c_priv_s *priv, uint32_t frequency) { uint32_t src_freq = AM335X_I2C_SCLK; @@ -992,7 +992,7 @@ static void am335x_i2c_setclock(FAR struct am335x_i2c_priv_s *priv, * ****************************************************************************/ -static inline void am335x_i2c_sendstart(FAR struct am335x_i2c_priv_s *priv, +static inline void am335x_i2c_sendstart(struct am335x_i2c_priv_s *priv, uint16_t address) { uint32_t regval; @@ -1033,7 +1033,7 @@ static inline void am335x_i2c_sendstart(FAR struct am335x_i2c_priv_s *priv, * ****************************************************************************/ -static inline void am335x_i2c_sendstop(FAR struct am335x_i2c_priv_s *priv) +static inline void am335x_i2c_sendstop(struct am335x_i2c_priv_s *priv) { am335x_i2c_modifyreg(priv, AM335X_I2C_CON_OFFSET, 0, I2C_CON_STP); } @@ -1047,7 +1047,7 @@ static inline void am335x_i2c_sendstop(FAR struct am335x_i2c_priv_s *priv) ****************************************************************************/ static inline uint32_t - am335x_i2c_getstatus(FAR struct am335x_i2c_priv_s *priv) +am335x_i2c_getstatus(struct am335x_i2c_priv_s *priv) { #ifndef CONFIG_I2C_POLLED return am335x_i2c_getreg(priv, AM335X_I2C_IRQ_STAT_OFFSET); @@ -1288,7 +1288,7 @@ static int am335x_i2c_isr_process(struct am335x_i2c_priv_s *priv) ****************************************************************************/ #ifndef CONFIG_I2C_POLLED -static int am335x_i2c_isr(int irq, void *context, FAR void *arg) +static int am335x_i2c_isr(int irq, void *context, void *arg) { struct am335x_i2c_priv_s *priv = (struct am335x_i2c_priv_s *)arg; @@ -1305,7 +1305,7 @@ static int am335x_i2c_isr(int irq, void *context, FAR void *arg) * ****************************************************************************/ -static int am335x_i2c_init(FAR struct am335x_i2c_priv_s *priv) +static int am335x_i2c_init(struct am335x_i2c_priv_s *priv) { /* Power-up and configure GPIOs */ @@ -1364,7 +1364,7 @@ static int am335x_i2c_init(FAR struct am335x_i2c_priv_s *priv) * ****************************************************************************/ -static int am335x_i2c_deinit(FAR struct am335x_i2c_priv_s *priv) +static int am335x_i2c_deinit(struct am335x_i2c_priv_s *priv) { /* Disable I2C module */ @@ -1396,10 +1396,10 @@ static int am335x_i2c_deinit(FAR struct am335x_i2c_priv_s *priv) * ****************************************************************************/ -static int am335x_i2c_transfer(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count) +static int am335x_i2c_transfer(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count) { - FAR struct am335x_i2c_priv_s *priv = (struct am335x_i2c_priv_s *)dev; + struct am335x_i2c_priv_s *priv = (struct am335x_i2c_priv_s *)dev; int ret; DEBUGASSERT(count > 0); @@ -1541,9 +1541,9 @@ static int am335x_i2c_transfer(FAR struct i2c_master_s *dev, ****************************************************************************/ #ifdef CONFIG_I2C_RESET -static int am335x_i2c_reset(FAR struct i2c_master_s *dev) +static int am335x_i2c_reset(struct i2c_master_s *dev) { - FAR struct am335x_i2c_priv_s *priv = (FAR struct am335x_i2c_priv_s *)dev; + struct am335x_i2c_priv_s *priv = (struct am335x_i2c_priv_s *)dev; unsigned int clock_count; unsigned int stretch_count; gpio_pinset_t scl_gpio; @@ -1671,7 +1671,7 @@ out: * ****************************************************************************/ -FAR struct i2c_master_s *am335x_i2cbus_initialize(int port) +struct i2c_master_s *am335x_i2cbus_initialize(int port) { struct am335x_i2c_priv_s * priv = NULL; irqstate_t flags; @@ -1724,9 +1724,9 @@ FAR struct i2c_master_s *am335x_i2cbus_initialize(int port) * ****************************************************************************/ -int am335x_i2cbus_uninitialize(FAR struct i2c_master_s *dev) +int am335x_i2cbus_uninitialize(struct i2c_master_s *dev) { - FAR struct am335x_i2c_priv_s *priv = (struct am335x_i2c_priv_s *)dev; + struct am335x_i2c_priv_s *priv = (struct am335x_i2c_priv_s *)dev; irqstate_t flags; DEBUGASSERT(dev); diff --git a/arch/arm/src/am335x/am335x_i2c.h b/arch/arm/src/am335x/am335x_i2c.h index 9c2d4b6f52..7bda8bb8b5 100644 --- a/arch/arm/src/am335x/am335x_i2c.h +++ b/arch/arm/src/am335x/am335x_i2c.h @@ -49,7 +49,7 @@ * ****************************************************************************/ -FAR struct i2c_master_s *am335x_i2cbus_initialize(int port); +struct i2c_master_s *am335x_i2cbus_initialize(int port); /**************************************************************************** * Name: am335x_i2cbus_uninitialize @@ -66,6 +66,6 @@ FAR struct i2c_master_s *am335x_i2cbus_initialize(int port); * ****************************************************************************/ -int am335x_i2cbus_uninitialize(FAR struct i2c_master_s *dev); +int am335x_i2cbus_uninitialize(struct i2c_master_s *dev); #endif /* __ARCH_ARM_SRC_AM335X_AM335X_I2C_H */ diff --git a/arch/arm/src/am335x/am335x_lcdc.c b/arch/arm/src/am335x/am335x_lcdc.c index 1d8f8b41f8..75ffe59509 100644 --- a/arch/arm/src/am335x/am335x_lcdc.c +++ b/arch/arm/src/am335x/am335x_lcdc.c @@ -81,20 +81,20 @@ * configuration of each color plane. */ -static int am335x_getvideoinfo(FAR struct fb_vtable_s *vtable, - FAR struct fb_videoinfo_s *vinfo); -static int am335x_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno, - FAR struct fb_planeinfo_s *pinfo); +static int am335x_getvideoinfo(struct fb_vtable_s *vtable, + struct fb_videoinfo_s *vinfo); +static int am335x_getplaneinfo(struct fb_vtable_s *vtable, int planeno, + struct fb_planeinfo_s *pinfo); /* The following is provided only if the video hardware supports RGB color * mapping */ #ifdef CONFIG_FB_CMAP -static int am335x_getcmap(FAR struct fb_vtable_s *vtable, - FAR struct fb_cmap_s *cmap); -static int am335x_putcmap(FAR struct fb_vtable_s *vtable, - FAR const struct fb_cmap_s *cmap); +static int am335x_getcmap(struct fb_vtable_s *vtable, + struct fb_cmap_s *cmap); +static int am335x_putcmap(struct fb_vtable_s *vtable, + const struct fb_cmap_s *cmap); #endif /* The following is provided only if the video hardware supports a hardware @@ -102,18 +102,18 @@ static int am335x_putcmap(FAR struct fb_vtable_s *vtable, */ #ifdef CONFIG_FB_HWCURSOR -static int am335x_getcursor(FAR struct fb_vtable_s *vtable, - FAR struct fb_cursorattrib_s *attrib); -static int am335x_setcursor(FAR struct fb_vtable_s *vtable, - FAR struct fb_setcursor_s *settings); +static int am335x_getcursor(struct fb_vtable_s *vtable, + struct fb_cursorattrib_s *attrib); +static int am335x_setcursor(struct fb_vtable_s *vtable, + struct fb_setcursor_s *settings); #endif /* Miscellaneous internal functions */ -static int am335x_lcd_interrupt(int irq, void *context, void *arg); +static int am335x_lcd_interrupt(int irq, void *context, void *arg); static uint32_t am335x_lcd_divisor(uint32_t reference, uint32_t frequency); -static int am335x_set_refclk(uint32_t frequency); -static int am335x_get_refclk(uint32_t *frequency); +static int am335x_set_refclk(uint32_t frequency); +static int am335x_get_refclk(uint32_t *frequency); /**************************************************************************** * Private Data @@ -166,8 +166,8 @@ static struct am335x_lcd_dev_s g_lcddev; * Name: am335x_getvideoinfo ****************************************************************************/ -static int am335x_getvideoinfo(FAR struct fb_vtable_s *vtable, - FAR struct fb_videoinfo_s *vinfo) +static int am335x_getvideoinfo(struct fb_vtable_s *vtable, + struct fb_videoinfo_s *vinfo) { struct am335x_lcd_dev_s *priv = &g_lcddev; @@ -192,8 +192,8 @@ static int am335x_getvideoinfo(FAR struct fb_vtable_s *vtable, * Name: am335x_getplaneinfo ****************************************************************************/ -static int am335x_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno, - FAR struct fb_planeinfo_s *pinfo) +static int am335x_getplaneinfo(struct fb_vtable_s *vtable, int planeno, + struct fb_planeinfo_s *pinfo) { struct am335x_lcd_dev_s *priv = &g_lcddev; @@ -202,9 +202,9 @@ static int am335x_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno, if (vtable != NULL && planeno == 0 && pinfo != NULL) { #ifdef CONFIG_BUILD_KERNEL - pinfo->fbmem = (FAR void *)CONFIG_AM335X_LCDC_FB_PBASE; + pinfo->fbmem = (void *)CONFIG_AM335X_LCDC_FB_PBASE; #else - pinfo->fbmem = (FAR void *)CONFIG_AM335X_LCDC_FB_VBASE; + pinfo->fbmem = (void *)CONFIG_AM335X_LCDC_FB_VBASE; #endif pinfo->fblen = priv->fbsize; pinfo->stride = priv->stride; @@ -222,8 +222,8 @@ static int am335x_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno, ****************************************************************************/ #ifdef CONFIG_FB_CMAP -static int am335x_getcmap(FAR struct fb_vtable_s *vtable, - FAR struct fb_cmap_s *cmap) +static int am335x_getcmap(struct fb_vtable_s *vtable, + struct fb_cmap_s *cmap) { return -ENOSYS; } @@ -234,8 +234,8 @@ static int am335x_getcmap(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifdef CONFIG_FB_CMAP -static int am335x_putcmap(FAR struct fb_vtable_s *vtable, - FAR const struct fb_cmap_s *cmap) +static int am335x_putcmap(struct fb_vtable_s *vtable, + const struct fb_cmap_s *cmap) { return -ENOSYS; } @@ -246,8 +246,8 @@ static int am335x_putcmap(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifdef CONFIG_FB_HWCURSOR -static int am335x_getcursor(FAR struct fb_vtable_s *vtable, - FAR struct fb_cursorattrib_s *attrib) +static int am335x_getcursor(struct fb_vtable_s *vtable, + struct fb_cursorattrib_s *attrib) { lcdinfo("vtable=%p attrib=%p\n", vtable, attrib); return -ENOSYS; @@ -259,8 +259,8 @@ static int am335x_getcursor(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifdef CONFIG_FB_HWCURSOR -static int am335x_setcursor(FAR struct fb_vtable_s *vtable, - FAR struct fb_setcursor_s *settings) +static int am335x_setcursor(struct fb_vtable_s *vtable, + struct fb_setcursor_s *settings) { lcdinfo("vtable=%p settings=%p\n", vtable, settings); return -ENOSYS; @@ -507,7 +507,7 @@ static int am335x_get_refclk(uint32_t *frequency) * ****************************************************************************/ -int am335x_lcd_initialize(FAR const struct am335x_panel_info_s *panel) +int am335x_lcd_initialize(const struct am335x_panel_info_s *panel) { struct am335x_lcd_dev_s *priv = &g_lcddev; uint32_t regval; @@ -832,7 +832,7 @@ int am335x_lcd_initialize(FAR const struct am335x_panel_info_s *panel) * ****************************************************************************/ -FAR struct fb_vtable_s *up_fbgetvplane(int display, int vplane) +struct fb_vtable_s *up_fbgetvplane(int display, int vplane) { lcdinfo("vplane: %d\n", vplane); if (vplane == 0) diff --git a/arch/arm/src/am335x/am335x_lcdc.h b/arch/arm/src/am335x/am335x_lcdc.h index 22e1c1763d..b780132e8f 100644 --- a/arch/arm/src/am335x/am335x_lcdc.h +++ b/arch/arm/src/am335x/am335x_lcdc.h @@ -220,7 +220,7 @@ struct am335x_panel_info_s * ****************************************************************************/ -int am335x_lcd_initialize(FAR const struct am335x_panel_info_s *panel); +int am335x_lcd_initialize(const struct am335x_panel_info_s *panel); /**************************************************************************** * Name: am335x_lcdclear @@ -255,8 +255,8 @@ void am335x_lcdclear(nxgl_mxpixel_t color); struct videomode_s; /* Forward reference */ -void am335x_lcd_videomode(FAR const struct videomode_s *videomode, - FAR struct am335x_panel_info_s *panel); +void am335x_lcd_videomode(const struct videomode_s *videomode, + struct am335x_panel_info_s *panel); /**************************************************************************** * Name: am335x_lcd_edid @@ -281,9 +281,9 @@ void am335x_lcd_videomode(FAR const struct videomode_s *videomode, * ****************************************************************************/ -void am335x_lcd_edid(FAR const uint8_t *edid, size_t edid_len, - FAR struct am335x_panel_info_s *panel, - FAR const struct videomode_s **selected); +void am335x_lcd_edid(const uint8_t *edid, size_t edid_len, + struct am335x_panel_info_s *panel, + const struct videomode_s **selected); /**************************************************************************** * Name: am335x_backlight diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c index 4ef77e3911..39beed00e0 100644 --- a/arch/arm/src/c5471/c5471_ethernet.c +++ b/arch/arm/src/c5471/c5471_ethernet.c @@ -280,7 +280,7 @@ /* This is a helper pointer for accessing the contents of Ethernet header */ -#define BUF ((FAR struct eth_hdr_s *)priv->c_dev.d_buf) +#define BUF ((struct eth_hdr_s *)priv->c_dev.d_buf) /**************************************************************************** * Private Types @@ -389,15 +389,15 @@ static void c5471_txstatus(struct c5471_driver_s *priv); #endif static void c5471_txdone(struct c5471_driver_s *priv); -static void c5471_interrupt_work(FAR void *arg); -static int c5471_interrupt(int irq, FAR void *context, FAR void *arg); +static void c5471_interrupt_work(void *arg); +static int c5471_interrupt(int irq, void *context, void *arg); /* Watchdog timer expirations */ -static void c5471_txtimeout_work(FAR void *arg); +static void c5471_txtimeout_work(void *arg); static void c5471_txtimeout_expiry(wdparm_t arg); -static void c5471_poll_work(FAR void *arg); +static void c5471_poll_work(void *arg); static void c5471_poll_expiry(wdparm_t arg); /* NuttX callback functions */ @@ -405,12 +405,12 @@ static void c5471_poll_expiry(wdparm_t arg); static int c5471_ifup(struct net_driver_s *dev); static int c5471_ifdown(struct net_driver_s *dev); -static void c5471_txavail_work(FAR void *arg); +static void c5471_txavail_work(void *arg); static int c5471_txavail(struct net_driver_s *dev); #ifdef CONFIG_NET_MCASTGROUP -static int c5471_addmac(struct net_driver_s *dev, FAR const uint8_t *mac); -static int c5471_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac); +static int c5471_addmac(struct net_driver_s *dev, const uint8_t *mac); +static int c5471_rmmac(struct net_driver_s *dev, const uint8_t *mac); #endif /* Initialization functions */ @@ -1580,9 +1580,9 @@ static void c5471_txdone(struct c5471_driver_s *priv) * ****************************************************************************/ -static void c5471_interrupt_work(FAR void *arg) +static void c5471_interrupt_work(void *arg) { - FAR struct c5471_driver_s *priv = (FAR struct c5471_driver_s *)arg; + struct c5471_driver_s *priv = (struct c5471_driver_s *)arg; /* Process pending Ethernet interrupts */ @@ -1663,7 +1663,7 @@ static void c5471_interrupt_work(FAR void *arg) * ****************************************************************************/ -static int c5471_interrupt(int irq, FAR void *context, FAR void *arg) +static int c5471_interrupt(int irq, void *context, void *arg) { #if CONFIG_C5471_NET_NINTERFACES == 1 register struct c5471_driver_s *priv = &g_c5471[0]; @@ -1712,9 +1712,9 @@ static int c5471_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static void c5471_txtimeout_work(FAR void *arg) +static void c5471_txtimeout_work(void *arg) { - FAR struct c5471_driver_s *priv = (FAR struct c5471_driver_s *)arg; + struct c5471_driver_s *priv = (struct c5471_driver_s *)arg; /* Increment statistics */ @@ -1788,9 +1788,9 @@ static void c5471_txtimeout_expiry(wdparm_t arg) * ****************************************************************************/ -static void c5471_poll_work(FAR void *arg) +static void c5471_poll_work(void *arg) { - FAR struct c5471_driver_s *priv = (FAR struct c5471_driver_s *)arg; + struct c5471_driver_s *priv = (struct c5471_driver_s *)arg; /* Check if the ESM has let go of the RX descriptor giving us access rights * to submit another Ethernet frame. @@ -1976,9 +1976,9 @@ static int c5471_ifdown(struct net_driver_s *dev) * ****************************************************************************/ -static void c5471_txavail_work(FAR void *arg) +static void c5471_txavail_work(void *arg) { - FAR struct c5471_driver_s *priv = (FAR struct c5471_driver_s *)arg; + struct c5471_driver_s *priv = (struct c5471_driver_s *)arg; ninfo("Polling\n"); @@ -2021,7 +2021,7 @@ static void c5471_txavail_work(FAR void *arg) * ****************************************************************************/ -static int c5471_txavail(FAR struct net_driver_s *dev) +static int c5471_txavail(struct net_driver_s *dev) { struct c5471_driver_s *priv = (struct c5471_driver_s *)dev->d_private; @@ -2059,10 +2059,10 @@ static int c5471_txavail(FAR struct net_driver_s *dev) ****************************************************************************/ #ifdef CONFIG_NET_MCASTGROUP -static int c5471_addmac(struct net_driver_s *dev, FAR const uint8_t *mac) +static int c5471_addmac(struct net_driver_s *dev, const uint8_t *mac) { - FAR struct c5471_driver_s *priv = - (FAR struct c5471_driver_s *)dev->d_private; + struct c5471_driver_s *priv = + (struct c5471_driver_s *)dev->d_private; /* Add the MAC address to the hardware multicast routing table */ @@ -2090,10 +2090,10 @@ static int c5471_addmac(struct net_driver_s *dev, FAR const uint8_t *mac) ****************************************************************************/ #ifdef CONFIG_NET_MCASTGROUP -static int c5471_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac) +static int c5471_rmmac(struct net_driver_s *dev, const uint8_t *mac) { - FAR struct c5471_driver_s *priv = - (FAR struct c5471_driver_s *)dev->d_private; + struct c5471_driver_s *priv = + (struct c5471_driver_s *)dev->d_private; /* Add the MAC address to the hardware multicast routing table */ diff --git a/arch/arm/src/c5471/c5471_timerisr.c b/arch/arm/src/c5471/c5471_timerisr.c index 6e22ba618c..8c7284fee1 100644 --- a/arch/arm/src/c5471/c5471_timerisr.c +++ b/arch/arm/src/c5471/c5471_timerisr.c @@ -66,7 +66,7 @@ * ****************************************************************************/ -static int c5471_timerisr(int irq, uint32_t *regs, FAR void *arg) +static int c5471_timerisr(int irq, uint32_t *regs, void *arg) { /* Process timer interrupt */ diff --git a/arch/arm/src/c5471/c5471_watchdog.c b/arch/arm/src/c5471/c5471_watchdog.c index b3006aba7b..a27f9e4537 100644 --- a/arch/arm/src/c5471/c5471_watchdog.c +++ b/arch/arm/src/c5471/c5471_watchdog.c @@ -80,14 +80,14 @@ static inline unsigned int wdt_prescaletoptv(unsigned int prescale); static int wdt_setusec(uint32_t usec); -static int wdt_interrupt(int irq, void *context, FAR void *arg); +static int wdt_interrupt(int irq, void *context, void *arg); static int wdt_open(struct file *filep); static int wdt_close(struct file *filep); static ssize_t wdt_read(struct file *filep, char *buffer, size_t buflen); static ssize_t wdt_write(struct file *filep, const char *buffer, size_t buflen); -static int wdt_ioctl(FAR struct file *filep, int cmd, unsigned long arg); +static int wdt_ioctl(struct file *filep, int cmd, unsigned long arg); /**************************************************************************** * Private Data @@ -220,7 +220,7 @@ static int wdt_setusec(uint32_t usec) * Name: wdt_interrupt ****************************************************************************/ -static int wdt_interrupt(int irq, void *context, FAR void *arg) +static int wdt_interrupt(int irq, void *context, void *arg) { wdinfo("expired\n"); @@ -281,7 +281,7 @@ static ssize_t wdt_write(struct file *filep, const char *buffer, * Name: wdt_ioctl ****************************************************************************/ -static int wdt_ioctl(FAR struct file *filep, int cmd, unsigned long arg) +static int wdt_ioctl(struct file *filep, int cmd, unsigned long arg) { wdinfo("ioctl Call: cmd=0x%x arg=0x%lx", cmd, arg); diff --git a/arch/arm/src/cxd56xx/cxd56_adc.c b/arch/arm/src/cxd56xx/cxd56_adc.c index be483fbcca..c1df7dee00 100644 --- a/arch/arm/src/cxd56xx/cxd56_adc.c +++ b/arch/arm/src/cxd56xx/cxd56_adc.c @@ -165,7 +165,7 @@ typedef enum adc_ch struct cxd56adc_dev_s { adc_ch_t ch; /* adc channel number */ - FAR struct seq_s *seq; /* sequencer */ + struct seq_s *seq; /* sequencer */ uint8_t freq; /* coefficient of adc sampling frequency */ uint16_t fsize; /* SCU FIFO size */ uint16_t ofst; /* offset */ @@ -184,11 +184,11 @@ struct cxd56adc_dev_s /* Character driver methods */ -static int cxd56_adc_open(FAR struct file *filep); -static int cxd56_adc_close(FAR struct file *filep); -static ssize_t cxd56_adc_read(FAR struct file *filep, FAR char *buffer, +static int cxd56_adc_open(struct file *filep); +static int cxd56_adc_close(struct file *filep); +static ssize_t cxd56_adc_read(struct file *filep, char *buffer, size_t len); -static int cxd56_adc_ioctl(FAR struct file *filep, int cmd, +static int cxd56_adc_ioctl(struct file *filep, int cmd, unsigned long arg); /**************************************************************************** @@ -324,7 +324,7 @@ static bool adc_active[CH_MAX] = * ****************************************************************************/ -static int set_ofstgain(FAR struct cxd56adc_dev_s *priv) +static int set_ofstgain(struct cxd56adc_dev_s *priv) { int ret = OK; uint32_t addr; @@ -370,7 +370,7 @@ static int set_ofstgain(FAR struct cxd56adc_dev_s *priv) * ****************************************************************************/ -static int adc_start(adc_ch_t ch, uint8_t freq, FAR struct seq_s *seq, +static int adc_start(adc_ch_t ch, uint8_t freq, struct seq_s *seq, int fsize, int fifomode, struct scufifo_wm_s *wm, struct math_filter_s *filter, @@ -619,7 +619,7 @@ static int adc_start(adc_ch_t ch, uint8_t freq, FAR struct seq_s *seq, * ****************************************************************************/ -static int adc_stop(adc_ch_t ch, FAR struct seq_s *seq) +static int adc_stop(adc_ch_t ch, struct seq_s *seq) { uint32_t *addr; uint32_t val; @@ -706,10 +706,10 @@ static bool adc_validcheck(int cmd) * ****************************************************************************/ -static int cxd56_adc_open(FAR struct file *filep) +static int cxd56_adc_open(struct file *filep) { - FAR struct inode *inode = filep->f_inode; - FAR struct cxd56adc_dev_s *priv = inode->i_private; + struct inode *inode = filep->f_inode; + struct cxd56adc_dev_s *priv = inode->i_private; int ret = OK; int type; @@ -770,10 +770,10 @@ static int cxd56_adc_open(FAR struct file *filep) * ****************************************************************************/ -static int cxd56_adc_close(FAR struct file *filep) +static int cxd56_adc_close(struct file *filep) { - FAR struct inode *inode = filep->f_inode; - FAR struct cxd56adc_dev_s *priv = inode->i_private; + struct inode *inode = filep->f_inode; + struct cxd56adc_dev_s *priv = inode->i_private; DEBUGASSERT(priv != NULL); DEBUGASSERT(priv->seq != NULL); @@ -828,11 +828,11 @@ static int cxd56_adc_close(FAR struct file *filep) * ****************************************************************************/ -static ssize_t cxd56_adc_read(FAR struct file *filep, FAR char *buffer, +static ssize_t cxd56_adc_read(struct file *filep, char *buffer, size_t len) { - FAR struct inode *inode = filep->f_inode; - FAR struct cxd56adc_dev_s *priv = inode->i_private; + struct inode *inode = filep->f_inode; + struct cxd56adc_dev_s *priv = inode->i_private; int ret = OK; DEBUGASSERT(priv != NULL); @@ -853,11 +853,11 @@ static ssize_t cxd56_adc_read(FAR struct file *filep, FAR char *buffer, * ****************************************************************************/ -static int cxd56_adc_ioctl(FAR struct file *filep, int cmd, +static int cxd56_adc_ioctl(struct file *filep, int cmd, unsigned long arg) { - FAR struct inode *inode = filep->f_inode; - FAR struct cxd56adc_dev_s *priv = inode->i_private; + struct inode *inode = filep->f_inode; + struct cxd56adc_dev_s *priv = inode->i_private; int ret = OK; DEBUGASSERT(priv != NULL); DEBUGASSERT(priv->seq != NULL); diff --git a/arch/arm/src/cxd56xx/cxd56_allocateheap.c b/arch/arm/src/cxd56xx/cxd56_allocateheap.c index 8117856e02..31e7eb02cb 100644 --- a/arch/arm/src/cxd56xx/cxd56_allocateheap.c +++ b/arch/arm/src/cxd56xx/cxd56_allocateheap.c @@ -82,7 +82,7 @@ extern char __stack[]; ****************************************************************************/ #ifdef CONFIG_HEAP_COLORATION -static inline void up_heap_color(FAR void *start, size_t size) +static inline void up_heap_color(void *start, size_t size) { memset(start, HEAP_COLOR, size); } @@ -109,12 +109,12 @@ static inline void up_heap_color(FAR void *start, size_t size) * ****************************************************************************/ -void up_allocate_heap(FAR void **heap_start, size_t *heap_size) +void up_allocate_heap(void **heap_start, size_t *heap_size) { /* Start with the first SRAM region */ board_autoled_on(LED_HEAPALLOCATE); - *heap_start = (FAR void *)g_idle_topstack; + *heap_start = (void *)g_idle_topstack; *heap_size = (uint32_t)&__stack - g_idle_topstack; /* Colorize the heap for debug */ diff --git a/arch/arm/src/cxd56xx/cxd56_charger.c b/arch/arm/src/cxd56xx/cxd56_charger.c index 7b30ae4bb6..562f869809 100644 --- a/arch/arm/src/cxd56xx/cxd56_charger.c +++ b/arch/arm/src/cxd56xx/cxd56_charger.c @@ -71,17 +71,17 @@ struct charger_dev_s * Private Function Prototypes ****************************************************************************/ -static int charger_get_status(FAR enum battery_status_e *status); -static int charger_get_health(FAR enum battery_health_e *health); -static int charger_online(FAR bool *online); -static int charger_get_temptable(FAR struct battery_temp_table_s *table); -static int charger_set_temptable(FAR struct battery_temp_table_s *table); +static int charger_get_status(enum battery_status_e *status); +static int charger_get_health(enum battery_health_e *health); +static int charger_online(bool *online); +static int charger_get_temptable(struct battery_temp_table_s *table); +static int charger_set_temptable(struct battery_temp_table_s *table); -static ssize_t charger_read(FAR struct file *filep, FAR char *buffer, +static ssize_t charger_read(struct file *filep, char *buffer, size_t buflen); -static ssize_t charger_write(FAR struct file *filep, - FAR const char *buffer, size_t buflen); -static int charger_ioctl(FAR struct file *filep, int cmd, +static ssize_t charger_write(struct file *filep, + const char *buffer, size_t buflen); +static int charger_ioctl(struct file *filep, int cmd, unsigned long arg); /**************************************************************************** @@ -198,7 +198,7 @@ static int charger_therm2temp(int val) * Name: charger_get_status ****************************************************************************/ -static int charger_get_status(FAR enum battery_status_e *status) +static int charger_get_status(enum battery_status_e *status) { uint8_t state; int ret; @@ -257,9 +257,9 @@ static int charger_get_status(FAR enum battery_status_e *status) * Name: charger_get_health ****************************************************************************/ -static int charger_get_health(FAR enum battery_health_e *health) +static int charger_get_health(enum battery_health_e *health) { - FAR struct pmic_gauge_s gauge; + struct pmic_gauge_s gauge; uint8_t state; int temp; int ret; @@ -307,7 +307,7 @@ static int charger_get_health(FAR enum battery_health_e *health) * Name: charger_online ****************************************************************************/ -static int charger_online(FAR bool *online) +static int charger_online(bool *online) { if (online == NULL) { @@ -322,9 +322,9 @@ static int charger_online(FAR bool *online) * Name: charger_get_current ****************************************************************************/ -static int charger_get_current(FAR int *current) +static int charger_get_current(int *current) { - FAR struct pmic_gauge_s gauge; + struct pmic_gauge_s gauge; int ret; ASSERT(current); @@ -354,9 +354,9 @@ static int charger_get_current(FAR int *current) * Name: charger_get_voltage ****************************************************************************/ -static int charger_get_voltage(FAR int *voltage) +static int charger_get_voltage(int *voltage) { - FAR struct pmic_gauge_s gauge; + struct pmic_gauge_s gauge; int ret; ASSERT(voltage); @@ -382,7 +382,7 @@ static int charger_get_voltage(FAR int *voltage) * Name: charger_get_temptable ****************************************************************************/ -static int charger_get_temptable(FAR struct battery_temp_table_s *table) +static int charger_get_temptable(struct battery_temp_table_s *table) { struct pmic_temp_table_s buf; int ret; @@ -405,7 +405,7 @@ static int charger_get_temptable(FAR struct battery_temp_table_s *table) * Name: charger_set_temptable ****************************************************************************/ -static int charger_set_temptable(FAR struct battery_temp_table_s *table) +static int charger_set_temptable(struct battery_temp_table_s *table) { struct pmic_temp_table_s buf; @@ -421,7 +421,7 @@ static int charger_set_temptable(FAR struct battery_temp_table_s *table) * Name: charger_read ****************************************************************************/ -static ssize_t charger_read(FAR struct file *filep, FAR char *buffer, +static ssize_t charger_read(struct file *filep, char *buffer, size_t buflen) { /* Return nothing read */ @@ -433,8 +433,8 @@ static ssize_t charger_read(FAR struct file *filep, FAR char *buffer, * Name: charger_write ****************************************************************************/ -static ssize_t charger_write(FAR struct file *filep, - FAR const char *buffer, size_t buflen) +static ssize_t charger_write(struct file *filep, + const char *buffer, size_t buflen) { /* Return nothing written */ @@ -445,10 +445,10 @@ static ssize_t charger_write(FAR struct file *filep, * Name: charger_ioctl ****************************************************************************/ -static int charger_ioctl(FAR struct file *filep, int cmd, unsigned long arg) +static int charger_ioctl(struct file *filep, int cmd, unsigned long arg) { - FAR struct inode *inode = filep->f_inode; - FAR struct charger_dev_s *priv = inode->i_private; + struct inode *inode = filep->f_inode; + struct charger_dev_s *priv = inode->i_private; int ret = -ENOTTY; nxsem_wait_uninterruptible(&priv->batsem); @@ -457,30 +457,30 @@ static int charger_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { case BATIOC_STATE: { - FAR enum battery_status_e *status = - (FAR enum battery_status_e *)(uintptr_t)arg; + enum battery_status_e *status = + (enum battery_status_e *)(uintptr_t)arg; ret = charger_get_status(status); } break; case BATIOC_HEALTH: { - FAR enum battery_health_e *health = - (FAR enum battery_health_e *)(uintptr_t)arg; + enum battery_health_e *health = + (enum battery_health_e *)(uintptr_t)arg; ret = charger_get_health(health); } break; case BATIOC_ONLINE: { - FAR bool *online = (FAR bool *)(uintptr_t)arg; + bool *online = (bool *)(uintptr_t)arg; ret = charger_online(online); } break; case BATIOC_VOLTAGE: { - FAR int *voltage = (FAR int *)(uintptr_t)arg; + int *voltage = (int *)(uintptr_t)arg; ret = cxd56_pmic_setchargevol(*voltage); } break; @@ -495,72 +495,72 @@ static int charger_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case BATIOC_INPUT_CURRENT: { - FAR int *current = (FAR int *)(uintptr_t)arg; + int *current = (int *)(uintptr_t)arg; ret = cxd56_pmic_setchargecurrent(*current); } break; case BATIOC_GET_CHGVOLTAGE: { - FAR int *voltage = (FAR int *)(uintptr_t)arg; + int *voltage = (int *)(uintptr_t)arg; ret = cxd56_pmic_getchargevol(voltage); } break; case BATIOC_GET_CHGCURRENT: { - FAR int *current = (FAR int *)(uintptr_t)arg; + int *current = (int *)(uintptr_t)arg; ret = cxd56_pmic_getchargecurrent(current); } break; case BATIOC_GET_RECHARGEVOL: { - FAR int *voltage = (FAR int *)(uintptr_t)arg; + int *voltage = (int *)(uintptr_t)arg; ret = cxd56_pmic_getrechargevol(voltage); } break; case BATIOC_SET_RECHARGEVOL: { - FAR int *voltage = (FAR int *)(uintptr_t)arg; + int *voltage = (int *)(uintptr_t)arg; ret = cxd56_pmic_setrechargevol(*voltage); } break; case BATIOC_GET_COMPCURRENT: { - FAR int *current = (FAR int *)(uintptr_t)arg; + int *current = (int *)(uintptr_t)arg; ret = cxd56_pmic_getchargecompcurrent(current); } break; case BATIOC_GET_TEMPTABLE: { - FAR struct battery_temp_table_s *table = - (FAR struct battery_temp_table_s *)(uintptr_t)arg; + struct battery_temp_table_s *table = + (struct battery_temp_table_s *)(uintptr_t)arg; ret = charger_get_temptable(table); } break; case BATIOC_SET_TEMPTABLE: { - FAR struct battery_temp_table_s *table = - (FAR struct battery_temp_table_s *)(uintptr_t)arg; + struct battery_temp_table_s *table = + (struct battery_temp_table_s *)(uintptr_t)arg; ret = charger_set_temptable(table); } break; case BATIOC_SET_COMPCURRENT: { - FAR int *current = (FAR int *)(uintptr_t)arg; + int *current = (int *)(uintptr_t)arg; ret = cxd56_pmic_setchargecompcurrent(*current); } break; case BATIOC_GET_CURRENT: { - FAR int *curr = (FAR int *)(uintptr_t)arg; + int *curr = (int *)(uintptr_t)arg; if (curr) { @@ -575,7 +575,7 @@ static int charger_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case BATIOC_GET_VOLTAGE: { - FAR int *vol = (FAR int *)(uintptr_t)arg; + int *vol = (int *)(uintptr_t)arg; if (vol) { @@ -616,9 +616,9 @@ static int charger_ioctl(FAR struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -int cxd56_charger_initialize(FAR const char *devpath) +int cxd56_charger_initialize(const char *devpath) { - FAR struct charger_dev_s *priv = &g_chargerdev; + struct charger_dev_s *priv = &g_chargerdev; int ret; /* Initialize the CXD5247 device structure */ @@ -651,7 +651,7 @@ int cxd56_charger_initialize(FAR const char *devpath) * ****************************************************************************/ -int cxd56_charger_uninitialize(FAR const char *devpath) +int cxd56_charger_uninitialize(const char *devpath) { unregister_driver(devpath); return OK; diff --git a/arch/arm/src/cxd56xx/cxd56_charger.h b/arch/arm/src/cxd56xx/cxd56_charger.h index 282bf386d5..cc6b33582b 100644 --- a/arch/arm/src/cxd56xx/cxd56_charger.h +++ b/arch/arm/src/cxd56xx/cxd56_charger.h @@ -23,7 +23,7 @@ /* initialize function */ -int cxd56_charger_initialize(FAR const char *devpath); -int cxd56_charger_uninitialize(FAR const char *devpath); +int cxd56_charger_initialize(const char *devpath); +int cxd56_charger_uninitialize(const char *devpath); #endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_CHARGER_H */ diff --git a/arch/arm/src/cxd56xx/cxd56_cisif.c b/arch/arm/src/cxd56xx/cxd56_cisif.c index 62888ef067..d863369a3b 100644 --- a/arch/arm/src/cxd56xx/cxd56_cisif.c +++ b/arch/arm/src/cxd56xx/cxd56_cisif.c @@ -198,7 +198,7 @@ static int cisif_set_jpg_sarea(uint8_t *addr, uint32_t size); static int cisif_set_intlev_sarea(uint8_t *addr, uint32_t total_size, uint32_t yuv_size); -static int cisif_intc_handler(int irq, FAR void *context, FAR void *arg); +static int cisif_intc_handler(int irq, void *context, void *arg); /* video image data operations */ @@ -206,12 +206,12 @@ static int cxd56_cisif_init(void); static int cxd56_cisif_uninit(void); static int cxd56_cisif_validate_frame_setting (uint8_t nr_datafmt, - FAR imgdata_format_t *datafmt, - FAR imgdata_interval_t *interval); + imgdata_format_t *datafmt, + imgdata_interval_t *interval); static int cxd56_cisif_start_capture (uint8_t nr_datafmt, - FAR imgdata_format_t *datafmt, - FAR imgdata_interval_t *interval, + imgdata_format_t *datafmt, + imgdata_interval_t *interval, imgdata_capture_t callback); static int cxd56_cisif_stop_capture(void); static int cxd56_cisif_validate_buf(uint8_t *addr, uint32_t size); @@ -514,7 +514,7 @@ static void cisif_jpg_err_int(uint8_t code) * cisif_intc_handler ****************************************************************************/ -static int cisif_intc_handler(int irq, FAR void *context, FAR void *arg) +static int cisif_intc_handler(int irq, void *context, void *arg) { uint32_t value; uint32_t enable; @@ -835,8 +835,8 @@ static int cxd56_cisif_uninit(void) static int cxd56_cisif_start_capture (uint8_t nr_fmt, - FAR imgdata_format_t *fmt, - FAR imgdata_interval_t *interval, + imgdata_format_t *fmt, + imgdata_interval_t *interval, imgdata_capture_t callback) { cisif_param_t param = @@ -1007,8 +1007,8 @@ static int cxd56_cisif_set_buf(uint8_t *addr, uint32_t size) static int cxd56_cisif_validate_frame_setting (uint8_t nr_datafmt, - FAR imgdata_format_t *datafmt, - FAR imgdata_interval_t *interval) + imgdata_format_t *datafmt, + imgdata_interval_t *interval) { int ret = OK; diff --git a/arch/arm/src/cxd56xx/cxd56_clock.c b/arch/arm/src/cxd56xx/cxd56_clock.c index e3a124d146..313f047407 100644 --- a/arch/arm/src/cxd56xx/cxd56_clock.c +++ b/arch/arm/src/cxd56xx/cxd56_clock.c @@ -127,11 +127,11 @@ struct power_domain static void cxd56_img_clock_enable(void); static void cxd56_img_clock_disable(void); static void cxd56_scu_clock_ctrl(uint32_t block, uint32_t intr, int on); -static void cxd56_scu_peri_clock_enable(FAR const struct scu_peripheral *p) +static void cxd56_scu_peri_clock_enable(const struct scu_peripheral *p) unused_code; -static void cxd56_scu_peri_clock_disable(FAR const struct scu_peripheral *p) +static void cxd56_scu_peri_clock_disable(const struct scu_peripheral *p) unused_code; -static void cxd56_scu_peri_clock_gating(FAR const struct scu_peripheral *p, +static void cxd56_scu_peri_clock_gating(const struct scu_peripheral *p, int enable) unused_code; /**************************************************************************** @@ -1965,7 +1965,7 @@ void cxd56_scuseq_clock_disable(void) disable_pwd(PDID_SCU); } -static void cxd56_scu_peri_clock_enable(FAR const struct scu_peripheral *p) +static void cxd56_scu_peri_clock_enable(const struct scu_peripheral *p) { uint32_t val; uint32_t rst; @@ -1994,7 +1994,7 @@ static void cxd56_scu_peri_clock_enable(FAR const struct scu_peripheral *p) cxd56_scu_clock_ctrl(cken, crgintmask, 1); } -static void cxd56_scu_peri_clock_disable(FAR const struct scu_peripheral *p) +static void cxd56_scu_peri_clock_disable(const struct scu_peripheral *p) { uint32_t val; uint32_t rst; @@ -2019,7 +2019,7 @@ static void cxd56_scu_peri_clock_disable(FAR const struct scu_peripheral *p) } static void cxd56_scu_peri_clock_gating( - FAR const struct scu_peripheral *p, int enable) + const struct scu_peripheral *p, int enable) { uint32_t cken = 1u << p->cken; diff --git a/arch/arm/src/cxd56xx/cxd56_cpu1signal.c b/arch/arm/src/cxd56xx/cxd56_cpu1signal.c index d7b70a09c9..9ad1fd2f95 100644 --- a/arch/arm/src/cxd56xx/cxd56_cpu1signal.c +++ b/arch/arm/src/cxd56xx/cxd56_cpu1signal.c @@ -55,7 +55,7 @@ struct cxd56_sigtype_s { int use; cxd56_cpu1sighandler_t handler; - FAR void * data; + void *data; }; struct cxd56cpu1_info_s @@ -82,7 +82,7 @@ static struct cxd56cpu1_info_s g_cpu1_info = * Private Functions ****************************************************************************/ -static int cxd56cpu1_worker(int argc, FAR char *argv[]) +static int cxd56cpu1_worker(int argc, char *argv[]) { struct cxd56cpu1_info_s *priv = &g_cpu1_info; iccmsg_t msg; @@ -156,7 +156,7 @@ void cxd56_cpu1sigunregisterhandler(uint8_t sigtype) priv->sigtype[sigtype].handler = NULL; } -int cxd56_cpu1siginit(uint8_t sigtype, FAR void *data) +int cxd56_cpu1siginit(uint8_t sigtype, void *data) { struct cxd56cpu1_info_s *priv = &g_cpu1_info; int pid; @@ -200,7 +200,7 @@ int cxd56_cpu1siginit(uint8_t sigtype, FAR void *data) pid = kthread_create("gnss_receiver", CONFIG_CXD56CPU1_WORKER_THREAD_PRIORITY, CONFIG_CXD56CPU1_WORKER_STACKSIZE, cxd56cpu1_worker, - (FAR char * const *) NULL); + NULL); if (pid < 0) { diff --git a/arch/arm/src/cxd56xx/cxd56_cpu1signal.h b/arch/arm/src/cxd56xx/cxd56_cpu1signal.h index 24b0e8e237..3742d80902 100644 --- a/arch/arm/src/cxd56xx/cxd56_cpu1signal.h +++ b/arch/arm/src/cxd56xx/cxd56_cpu1signal.h @@ -55,9 +55,9 @@ #error "CXD56_CPU1_DEV must be smaller than 0xf" #endif -typedef void (*cxd56_cpu1sighandler_t)(uint32_t data, FAR void *userdata); +typedef void (*cxd56_cpu1sighandler_t)(uint32_t data, void *userdata); -extern int cxd56_cpu1siginit(uint8_t cpu1dev, FAR void *data); +extern int cxd56_cpu1siginit(uint8_t cpu1dev, void *data); extern int cxd56_cpu1siguninit(uint8_t cpu1dev); extern void cxd56_cpu1sigregisterhandler(uint8_t cpu1dev, cxd56_cpu1sighandler_t handler); diff --git a/arch/arm/src/cxd56xx/cxd56_cpufifo.c b/arch/arm/src/cxd56xx/cxd56_cpufifo.c index 1a1230af21..4a8a4c36d5 100644 --- a/arch/arm/src/cxd56xx/cxd56_cpufifo.c +++ b/arch/arm/src/cxd56xx/cxd56_cpufifo.c @@ -53,7 +53,7 @@ struct cfpushdata_s { - FAR sq_entry_t entry; + sq_entry_t entry; uint32_t data[2]; }; @@ -61,8 +61,8 @@ struct cfpushdata_s * Private Function Prototypes ****************************************************************************/ -static int cpufifo_txhandler(int irq, FAR void *context, FAR void *arg); -static int cpufifo_rxhandler(int irq, FAR void *context, FAR void *arg); +static int cpufifo_txhandler(int irq, void *context, void *arg); +static int cpufifo_rxhandler(int irq, void *context, void *arg); static int cpufifo_trypush(uint32_t data[2]); static int cpufifo_reserve(uint32_t data[2]); @@ -81,11 +81,11 @@ static cpufifo_handler_t g_cfrxhandler; * Private Functions ****************************************************************************/ -static int cpufifo_txhandler(int irq, FAR void *context, FAR void *arg) +static int cpufifo_txhandler(int irq, void *context, void *arg) { - FAR struct cfpushdata_s *pd; + struct cfpushdata_s *pd; - pd = (FAR struct cfpushdata_s *)sq_remfirst(&g_pushqueue); + pd = (struct cfpushdata_s *)sq_remfirst(&g_pushqueue); if (pd) { /* Ignore error because always FIFO is not full at here */ @@ -102,7 +102,7 @@ static int cpufifo_txhandler(int irq, FAR void *context, FAR void *arg) return OK; } -static int cpufifo_rxhandler(int irq, FAR void *context, FAR void *arg) +static int cpufifo_rxhandler(int irq, void *context, void *arg) { uint32_t word[2] = { @@ -144,9 +144,9 @@ static int cpufifo_trypush(uint32_t data[2]) static int cpufifo_reserve(uint32_t data[2]) { - FAR struct cfpushdata_s *pd; + struct cfpushdata_s *pd; - pd = (FAR struct cfpushdata_s *)sq_remfirst(&g_emptyqueue); + pd = (struct cfpushdata_s *)sq_remfirst(&g_emptyqueue); /* This error indicates that need more sending buffer, it can be * configured by CONFIG_CXD56_CPUFIFO_ENTRIES. @@ -252,7 +252,7 @@ int cxd56_cfinitialize(void) for (i = 0; i < NR_PUSHBUFENTRIES; i++) { - sq_addlast((FAR sq_entry_t *)&g_pushbuffer[i], &g_emptyqueue); + sq_addlast((sq_entry_t *)&g_pushbuffer[i], &g_emptyqueue); } /* Clear user defined receive handler. */ diff --git a/arch/arm/src/cxd56xx/cxd56_cpuidlestack.c b/arch/arm/src/cxd56xx/cxd56_cpuidlestack.c index 0bf1f6ab01..c6d1493344 100644 --- a/arch/arm/src/cxd56xx/cxd56_cpuidlestack.c +++ b/arch/arm/src/cxd56xx/cxd56_cpuidlestack.c @@ -80,7 +80,7 @@ * ****************************************************************************/ -int up_cpu_idlestack(int cpu, FAR struct tcb_s *tcb, size_t stack_size) +int up_cpu_idlestack(int cpu, struct tcb_s *tcb, size_t stack_size) { #if CONFIG_SMP_NCPUS > 1 up_create_stack(tcb, stack_size, TCB_FLAG_TTYPE_KERNEL); diff --git a/arch/arm/src/cxd56xx/cxd56_cpupause.c b/arch/arm/src/cxd56xx/cxd56_cpupause.c index 30337bec53..158b2c445b 100644 --- a/arch/arm/src/cxd56xx/cxd56_cpupause.c +++ b/arch/arm/src/cxd56xx/cxd56_cpupause.c @@ -201,7 +201,7 @@ int up_cpu_paused(int cpu) return OK; } - FAR struct tcb_s *tcb = this_task(); + struct tcb_s *tcb = this_task(); /* Update scheduler parameters */ @@ -264,7 +264,7 @@ int up_cpu_paused(int cpu) * ****************************************************************************/ -int arm_pause_handler(int irq, void *c, FAR void *arg) +int arm_pause_handler(int irq, void *c, void *arg) { int cpu = up_cpu_index(); int ret = OK; diff --git a/arch/arm/src/cxd56xx/cxd56_cpustart.c b/arch/arm/src/cxd56xx/cxd56_cpustart.c index 649ba67caa..7e170710ed 100644 --- a/arch/arm/src/cxd56xx/cxd56_cpustart.c +++ b/arch/arm/src/cxd56xx/cxd56_cpustart.c @@ -72,7 +72,7 @@ volatile static spinlock_t g_appdsp_boot; -extern int arm_pause_handler(int irq, void *c, FAR void *arg); +extern int arm_pause_handler(int irq, void *c, void *arg); /**************************************************************************** * Private Functions diff --git a/arch/arm/src/cxd56xx/cxd56_dmac.c b/arch/arm/src/cxd56xx/cxd56_dmac.c index a47cef1ea7..434ba055a2 100644 --- a/arch/arm/src/cxd56xx/cxd56_dmac.c +++ b/arch/arm/src/cxd56xx/cxd56_dmac.c @@ -235,11 +235,11 @@ typedef struct static int open_channels = 0; -static int intr_handler_admac0(int irq, FAR void *context, FAR void *arg); -static int intr_handler_admac1(int irq, FAR void *context, FAR void *arg); -static int intr_handler_idmac(int irq, FAR void *context, FAR void *arg); -static int intr_handler_skdmac0(int irq, FAR void *context, FAR void *arg); -static int intr_handler_skdmac1(int irq, FAR void *context, FAR void *arg); +static int intr_handler_admac0(int irq, void *context, void *arg); +static int intr_handler_admac1(int irq, void *context, void *arg); +static int intr_handler_idmac(int irq, void *context, void *arg); +static int intr_handler_skdmac0(int irq, void *context, void *arg); +static int intr_handler_skdmac1(int irq, void *context, void *arg); static uint32_t irq_map[] = { CXD56_IRQ_APP_DMAC0, @@ -253,7 +253,7 @@ static uint32_t irq_map[] = CXD56_IRQ_SKDMAC_1, }; -static int (*intc_handler[])(int irq, FAR void *context, FAR void *arg) = +static int (*intc_handler[])(int irq, void *context, void *arg) = { intr_handler_admac0, intr_handler_admac1, @@ -420,19 +420,19 @@ static void _dmac_intc_handler(int ch) } } -static int intr_handler_admac0(int irq, FAR void *context, FAR void *arg) +static int intr_handler_admac0(int irq, void *context, void *arg) { _dmac_intc_handler(0); return OK; } -static int intr_handler_admac1(int irq, FAR void *context, FAR void *arg) +static int intr_handler_admac1(int irq, void *context, void *arg) { _dmac_intc_handler(1); return OK; } -static int intr_handler_idmac(int irq, FAR void *context, FAR void *arg) +static int intr_handler_idmac(int irq, void *context, void *arg) { struct dmac_register_map *dev = get_device(2); /* XXX */ uint32_t stat = dev->intstatus & 0x1f; @@ -449,13 +449,13 @@ static int intr_handler_idmac(int irq, FAR void *context, FAR void *arg) return OK; } -static int intr_handler_skdmac0(int irq, FAR void *context, FAR void *arg) +static int intr_handler_skdmac0(int irq, void *context, void *arg) { _dmac_intc_handler(7); return OK; } -static int intr_handler_skdmac1(int irq, FAR void *context, FAR void *arg) +static int intr_handler_skdmac1(int irq, void *context, void *arg) { _dmac_intc_handler(8); return OK; diff --git a/arch/arm/src/cxd56xx/cxd56_dmac_common.h b/arch/arm/src/cxd56xx/cxd56_dmac_common.h index ddd715254c..54fad96f17 100644 --- a/arch/arm/src/cxd56xx/cxd56_dmac_common.h +++ b/arch/arm/src/cxd56xx/cxd56_dmac_common.h @@ -35,7 +35,7 @@ * DMA channel. */ -typedef FAR void *DMA_HANDLE; +typedef void *DMA_HANDLE; /* Description: * This is the type of the callback that is used to inform the user of the diff --git a/arch/arm/src/cxd56xx/cxd56_emmc.c b/arch/arm/src/cxd56xx/cxd56_emmc.c index 8d3bb18c6f..3955578118 100644 --- a/arch/arm/src/cxd56xx/cxd56_emmc.c +++ b/arch/arm/src/cxd56xx/cxd56_emmc.c @@ -102,21 +102,21 @@ struct cxd56_emmc_state_s /* Block driver interfaces **************************************************/ -static int cxd56_emmc_open(FAR struct inode *inode); -static int cxd56_emmc_close(FAR struct inode *inode); -static ssize_t cxd56_emmc_read(FAR struct inode *inode, +static int cxd56_emmc_open(struct inode *inode); +static int cxd56_emmc_close(struct inode *inode); +static ssize_t cxd56_emmc_read(struct inode *inode, unsigned char *buffer, blkcnt_t start_sector, unsigned int nsectors); #if !defined(CONFIG_MMCSD_READONLY) -static ssize_t cxd56_emmc_write(FAR struct inode *inode, +static ssize_t cxd56_emmc_write(struct inode *inode, const unsigned char *buffer, blkcnt_t start_sector, unsigned int nsectors); #endif -static int cxd56_emmc_geometry(FAR struct inode *inode, +static int cxd56_emmc_geometry(struct inode *inode, struct geometry *geometry); -static int emmc_interrupt(int irq, FAR void *context, FAR void *arg); +static int emmc_interrupt(int irq, void *context, void *arg); /**************************************************************************** * Private Data @@ -143,12 +143,12 @@ struct cxd56_emmc_state_s g_emmcdev; * Private Functions ****************************************************************************/ -static int emmc_takesem(FAR sem_t *sem) +static int emmc_takesem(sem_t *sem) { return nxsem_wait_uninterruptible(sem); } -static void emmc_givesem(FAR sem_t *sem) +static void emmc_givesem(sem_t *sem) { nxsem_post(sem); } @@ -508,7 +508,7 @@ static int emmc_switchcmd(uint8_t index, uint8_t val) * ****************************************************************************/ -static int emmc_interrupt(int irq, FAR void *context, FAR void *arg) +static int emmc_interrupt(int irq, void *context, void *arg) { uint32_t intr; @@ -689,7 +689,7 @@ errout: return ret; } -static int cxd56_emmc_readsectors(FAR struct cxd56_emmc_state_s *priv, +static int cxd56_emmc_readsectors(struct cxd56_emmc_state_s *priv, void *buf, size_t start_sector, unsigned int nsectors) @@ -753,7 +753,7 @@ finish: } #if !defined(CONFIG_MMCSD_READONLY) -static int cxd56_emmc_writesectors(FAR struct cxd56_emmc_state_s *priv, +static int cxd56_emmc_writesectors(struct cxd56_emmc_state_s *priv, const void *buf, blkcnt_t start_sector, unsigned int nsectors) { @@ -829,13 +829,13 @@ finish: } #endif -static int cxd56_emmc_open(FAR struct inode *inode) +static int cxd56_emmc_open(struct inode *inode) { - FAR struct cxd56_emmc_state_s *priv; + struct cxd56_emmc_state_s *priv; int ret; DEBUGASSERT(inode && inode->i_private); - priv = (FAR struct cxd56_emmc_state_s *)inode->i_private; + priv = (struct cxd56_emmc_state_s *)inode->i_private; /* Just increment the reference count on the driver */ @@ -850,13 +850,13 @@ static int cxd56_emmc_open(FAR struct inode *inode) return OK; } -static int cxd56_emmc_close(FAR struct inode *inode) +static int cxd56_emmc_close(struct inode *inode) { - FAR struct cxd56_emmc_state_s *priv; + struct cxd56_emmc_state_s *priv; int ret; DEBUGASSERT(inode && inode->i_private); - priv = (FAR struct cxd56_emmc_state_s *)inode->i_private; + priv = (struct cxd56_emmc_state_s *)inode->i_private; /* Decrement the reference count on the block driver */ @@ -872,15 +872,15 @@ static int cxd56_emmc_close(FAR struct inode *inode) return OK; } -static ssize_t cxd56_emmc_read(FAR struct inode *inode, +static ssize_t cxd56_emmc_read(struct inode *inode, unsigned char *buffer, blkcnt_t start_sector, unsigned int nsectors) { - FAR struct cxd56_emmc_state_s *priv; + struct cxd56_emmc_state_s *priv; int ret; DEBUGASSERT(inode && inode->i_private); - priv = (FAR struct cxd56_emmc_state_s *)inode->i_private; + priv = (struct cxd56_emmc_state_s *)inode->i_private; finfo("Read sector %" PRIu32 " (%u sectors) to %p\n", start_sector, nsectors, buffer); @@ -896,16 +896,16 @@ static ssize_t cxd56_emmc_read(FAR struct inode *inode, } #if !defined(CONFIG_MMCSD_READONLY) -static ssize_t cxd56_emmc_write(FAR struct inode *inode, +static ssize_t cxd56_emmc_write(struct inode *inode, const unsigned char *buffer, blkcnt_t start_sector, unsigned int nsectors) { - FAR struct cxd56_emmc_state_s *priv; + struct cxd56_emmc_state_s *priv; int ret; DEBUGASSERT(inode && inode->i_private); - priv = (FAR struct cxd56_emmc_state_s *)inode->i_private; + priv = (struct cxd56_emmc_state_s *)inode->i_private; finfo("Write %p to sector %" PRIu32 " (%u sectors)\n", buffer, start_sector, nsectors); @@ -921,13 +921,13 @@ static ssize_t cxd56_emmc_write(FAR struct inode *inode, } #endif -static int cxd56_emmc_geometry(FAR struct inode *inode, +static int cxd56_emmc_geometry(struct inode *inode, struct geometry *geometry) { - FAR struct cxd56_emmc_state_s *priv; + struct cxd56_emmc_state_s *priv; DEBUGASSERT(inode && inode->i_private); - priv = (FAR struct cxd56_emmc_state_s *)inode->i_private; + priv = (struct cxd56_emmc_state_s *)inode->i_private; geometry->geo_available = true; geometry->geo_mediachanged = false; @@ -944,9 +944,9 @@ static int cxd56_emmc_geometry(FAR struct inode *inode, int cxd56_emmcinitialize(void) { - FAR struct cxd56_emmc_state_s *priv; - FAR uint8_t *buf; - FAR struct emmc_dma_desc_s *descs; + struct cxd56_emmc_state_s *priv; + uint8_t *buf; + struct emmc_dma_desc_s *descs; int ret; priv = &g_emmcdev; @@ -962,7 +962,7 @@ int cxd56_emmcinitialize(void) return -EIO; } - buf = (FAR uint8_t *)kmm_malloc(SECTOR_SIZE); + buf = (uint8_t *)kmm_malloc(SECTOR_SIZE); if (buf) { putreg32(SECTOR_SIZE, EMMC_BYTCNT); @@ -976,7 +976,7 @@ int cxd56_emmcinitialize(void) return -EIO; } - priv->total_sectors = *(FAR uint32_t *)&buf[EXTCSD_SEC_COUNT]; + priv->total_sectors = *(uint32_t *)&buf[EXTCSD_SEC_COUNT]; kmm_free(descs); } diff --git a/arch/arm/src/cxd56xx/cxd56_farapi.c b/arch/arm/src/cxd56xx/cxd56_farapi.c index 08662f51bd..1eacd35e8b 100644 --- a/arch/arm/src/cxd56xx/cxd56_farapi.c +++ b/arch/arm/src/cxd56xx/cxd56_farapi.c @@ -160,7 +160,7 @@ static int cxd56_sendmsg(int cpuid, int protoid, int msgtype, uint16_t pdata, static int cxd56_farapidonehandler(int cpuid, int protoid, uint32_t pdata, uint32_t data, - FAR void *userdata) + void *userdata) { /* Receive event flag message as Far API done. * We need only far API done event. diff --git a/arch/arm/src/cxd56xx/cxd56_gauge.c b/arch/arm/src/cxd56xx/cxd56_gauge.c index e65ebdd47e..b26ed62088 100644 --- a/arch/arm/src/cxd56xx/cxd56_gauge.c +++ b/arch/arm/src/cxd56xx/cxd56_gauge.c @@ -62,11 +62,11 @@ struct bat_gauge_dev_s * Private Function Prototypes ****************************************************************************/ -static ssize_t gauge_read(FAR struct file *filep, FAR char *buffer, +static ssize_t gauge_read(struct file *filep, char *buffer, size_t buflen); -static ssize_t gauge_write(FAR struct file *filep, - FAR const char *buffer, size_t buflen); -static int gauge_ioctl(FAR struct file *filep, int cmd, +static ssize_t gauge_write(struct file *filep, + const char *buffer, size_t buflen); +static int gauge_ioctl(struct file *filep, int cmd, unsigned long arg); /**************************************************************************** @@ -97,7 +97,7 @@ static struct bat_gauge_dev_s g_gaugedev; * Name: gauge_get_status ****************************************************************************/ -static int gauge_get_status(FAR enum battery_status_e *status) +static int gauge_get_status(enum battery_status_e *status) { uint8_t state; int ret; @@ -150,7 +150,7 @@ static int gauge_get_status(FAR enum battery_status_e *status) * Name: gauge_get_vol ****************************************************************************/ -static int gauge_get_vol(FAR b16_t *voltage) +static int gauge_get_vol(b16_t *voltage) { struct pmic_gauge_s gauge; int ret; @@ -176,7 +176,7 @@ static int gauge_get_vol(FAR b16_t *voltage) * Name: gauge_get_capacity ****************************************************************************/ -static int gauge_get_capacity(FAR b16_t *capacity) +static int gauge_get_capacity(b16_t *capacity) { b16_t vol; int lower; @@ -234,7 +234,7 @@ static int gauge_get_capacity(FAR b16_t *capacity) * Name: gauge_online ****************************************************************************/ -static int gauge_online(FAR bool *online) +static int gauge_online(bool *online) { if (online == NULL) { @@ -249,7 +249,7 @@ static int gauge_online(FAR bool *online) * Name: gauge_read ****************************************************************************/ -static ssize_t gauge_read(FAR struct file *filep, FAR char *buffer, +static ssize_t gauge_read(struct file *filep, char *buffer, size_t buflen) { /* Return nothing read */ @@ -261,8 +261,8 @@ static ssize_t gauge_read(FAR struct file *filep, FAR char *buffer, * Name: gauge_write ****************************************************************************/ -static ssize_t gauge_write(FAR struct file *filep, - FAR const char *buffer, size_t buflen) +static ssize_t gauge_write(struct file *filep, + const char *buffer, size_t buflen) { /* Return nothing written */ @@ -273,10 +273,10 @@ static ssize_t gauge_write(FAR struct file *filep, * Name: gauge_ioctl ****************************************************************************/ -static int gauge_ioctl(FAR struct file *filep, int cmd, unsigned long arg) +static int gauge_ioctl(struct file *filep, int cmd, unsigned long arg) { - FAR struct inode *inode = filep->f_inode; - FAR struct bat_gauge_dev_s *priv = inode->i_private; + struct inode *inode = filep->f_inode; + struct bat_gauge_dev_s *priv = inode->i_private; int ret = -ENOTTY; nxsem_wait_uninterruptible(&priv->batsem); @@ -285,29 +285,29 @@ static int gauge_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { case BATIOC_STATE: { - FAR enum battery_status_e *status = - (FAR enum battery_status_e *)(uintptr_t)arg; + enum battery_status_e *status = + (enum battery_status_e *)(uintptr_t)arg; ret = gauge_get_status(status); } break; case BATIOC_VOLTAGE: { - FAR b16_t *voltage = (FAR b16_t *)(uintptr_t)arg; + b16_t *voltage = (b16_t *)(uintptr_t)arg; ret = gauge_get_vol(voltage); } break; case BATIOC_CAPACITY: { - FAR b16_t *capacity = (FAR b16_t *)(uintptr_t)arg; + b16_t *capacity = (b16_t *)(uintptr_t)arg; ret = gauge_get_capacity(capacity); } break; case BATIOC_ONLINE: { - FAR bool *online = (FAR bool *)(uintptr_t)arg; + bool *online = (bool *)(uintptr_t)arg; ret = gauge_online(online); } break; @@ -340,9 +340,9 @@ static int gauge_ioctl(FAR struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -int cxd56_gauge_initialize(FAR const char *devpath) +int cxd56_gauge_initialize(const char *devpath) { - FAR struct bat_gauge_dev_s *priv = &g_gaugedev; + struct bat_gauge_dev_s *priv = &g_gaugedev; int ret; /* Initialize the CXD5247 device structure */ @@ -375,7 +375,7 @@ int cxd56_gauge_initialize(FAR const char *devpath) * ****************************************************************************/ -int cxd56_gauge_uninitialize(FAR const char *devpath) +int cxd56_gauge_uninitialize(const char *devpath) { unregister_driver(devpath); return OK; diff --git a/arch/arm/src/cxd56xx/cxd56_gauge.h b/arch/arm/src/cxd56xx/cxd56_gauge.h index 72dce6d60c..ab07f19510 100644 --- a/arch/arm/src/cxd56xx/cxd56_gauge.h +++ b/arch/arm/src/cxd56xx/cxd56_gauge.h @@ -23,7 +23,7 @@ /* initialize function */ -int cxd56_gauge_initialize(FAR const char *devpath); -int cxd56_gauge_uninitialize(FAR const char *devpath); +int cxd56_gauge_initialize(const char *devpath); +int cxd56_gauge_uninitialize(const char *devpath); #endif /* __ARCH_ARM_SRC_CXD56XX_CXD56_GAUGE_H */ diff --git a/arch/arm/src/cxd56xx/cxd56_ge2d.c b/arch/arm/src/cxd56xx/cxd56_ge2d.c index 5bc240e93b..a05953c533 100644 --- a/arch/arm/src/cxd56xx/cxd56_ge2d.c +++ b/arch/arm/src/cxd56xx/cxd56_ge2d.c @@ -46,14 +46,14 @@ * Private Function Prototypes ****************************************************************************/ -static ssize_t ge2d_read(FAR struct file *filep, FAR char *buffer, +static ssize_t ge2d_read(struct file *filep, char *buffer, size_t len); -static ssize_t ge2d_write(FAR struct file *filep, FAR const char *buffer, +static ssize_t ge2d_write(struct file *filep, const char *buffer, size_t len); -static int ge2d_ioctl(FAR struct file *filep, int cmd, unsigned long arg); +static int ge2d_ioctl(struct file *filep, int cmd, unsigned long arg); static int ge2d_semtake(sem_t *id); static void ge2d_semgive(sem_t *id); -static int ge2d_irqhandler(int irq, FAR void *context, FAR void *arg); +static int ge2d_irqhandler(int irq, void *context, void *arg); /**************************************************************************** * Private Data @@ -95,8 +95,8 @@ static void ge2d_semgive(sem_t *id) * Name: ge2d_read ****************************************************************************/ -static ssize_t ge2d_read(FAR struct file *filep, - FAR char *buffer, +static ssize_t ge2d_read(struct file *filep, + char *buffer, size_t len) { return 0; @@ -106,7 +106,7 @@ static ssize_t ge2d_read(FAR struct file *filep, * Name: ge2d_write ****************************************************************************/ -static ssize_t ge2d_write(FAR struct file *filep, FAR const char *buffer, +static ssize_t ge2d_write(struct file *filep, const char *buffer, size_t len) { uint32_t bits; @@ -157,7 +157,7 @@ static ssize_t ge2d_write(FAR struct file *filep, FAR const char *buffer, * Name: ge2d_ioctl ****************************************************************************/ -static int ge2d_ioctl(FAR struct file *filep, int cmd, unsigned long arg) +static int ge2d_ioctl(struct file *filep, int cmd, unsigned long arg) { int ret = -ENOTTY; @@ -180,7 +180,7 @@ static int ge2d_ioctl(FAR struct file *filep, int cmd, unsigned long arg) * Name: ge2d_irqhandler ****************************************************************************/ -static int ge2d_irqhandler(int irq, FAR void *context, FAR void *arg) +static int ge2d_irqhandler(int irq, void *context, void *arg) { uint32_t stat; @@ -202,7 +202,7 @@ static int ge2d_irqhandler(int irq, FAR void *context, FAR void *arg) * Name: cxd56_ge2dinitialize ****************************************************************************/ -int cxd56_ge2dinitialize(FAR const char *devname) +int cxd56_ge2dinitialize(const char *devname) { int ret; @@ -232,7 +232,7 @@ int cxd56_ge2dinitialize(FAR const char *devname) * Name: cxd56_ge2duninitialize ****************************************************************************/ -void cxd56_ge2duninitialize(FAR const char *devname) +void cxd56_ge2duninitialize(const char *devname) { up_disable_irq(CXD56_IRQ_GE2D); irq_detach(CXD56_IRQ_GE2D); diff --git a/arch/arm/src/cxd56xx/cxd56_geofence.c b/arch/arm/src/cxd56xx/cxd56_geofence.c index ae51ec5bf0..813dc33b41 100644 --- a/arch/arm/src/cxd56xx/cxd56_geofence.c +++ b/arch/arm/src/cxd56xx/cxd56_geofence.c @@ -58,8 +58,8 @@ struct cxd56_geofence_dev_s { - sem_t devsem; - FAR struct pollfd *fds[CONFIG_GEOFENCE_NPOLLWAITERS]; + sem_t devsem; + struct pollfd *fds[CONFIG_GEOFENCE_NPOLLWAITERS]; }; /**************************************************************************** @@ -68,14 +68,14 @@ struct cxd56_geofence_dev_s /* file operation functions */ -static ssize_t cxd56_geofence_read(FAR struct file *filep, - FAR char *buffer, +static ssize_t cxd56_geofence_read(struct file *filep, + char *buffer, size_t len); -static int cxd56_geofence_ioctl(FAR struct file *filep, +static int cxd56_geofence_ioctl(struct file *filep, int cmd, unsigned long arg); -static int cxd56_geofence_poll(FAR struct file *filep, - FAR struct pollfd *fds, +static int cxd56_geofence_poll(struct file *filep, + struct pollfd *fds, bool setup); /* ioctl command functions */ @@ -113,7 +113,7 @@ static const struct file_operations g_geofencefops = /* ioctl command list */ -FAR static int (*g_cmdlist[CXD56_GEOFENCE_IOCTL_MAX])(unsigned long) = +static int (*g_cmdlist[CXD56_GEOFENCE_IOCTL_MAX])(unsigned long) = { NULL, /* CXD56_GEOFENCE_IOCTL_INVAL = 0 */ cxd56_geofence_start, @@ -191,15 +191,15 @@ static int cxd56_geofence_stop(unsigned long arg) static int cxd56_geofence_add_region(unsigned long arg) { - int ret; - FAR struct cxd56_geofence_region_s *reg_data; + int ret; + struct cxd56_geofence_region_s *reg_data; if (!arg) { return -EINVAL; } - reg_data = (FAR struct cxd56_geofence_region_s *)arg; + reg_data = (struct cxd56_geofence_region_s *)arg; ret = fw_gd_geoaddregion(reg_data->id, reg_data->latitude, @@ -226,15 +226,15 @@ static int cxd56_geofence_add_region(unsigned long arg) static int cxd56_geofence_modify_region(unsigned long arg) { - int ret; - FAR struct cxd56_geofence_region_s *reg_data; + int ret; + struct cxd56_geofence_region_s *reg_data; if (!arg) { return -EINVAL; } - reg_data = (FAR struct cxd56_geofence_region_s *)arg; + reg_data = (struct cxd56_geofence_region_s *)arg; ret = fw_gd_geomodifyregion(reg_data->id, reg_data->latitude, reg_data->longitude, reg_data->radius); @@ -259,8 +259,8 @@ static int cxd56_geofence_modify_region(unsigned long arg) static int cxd56_geofence_delete_region(unsigned long arg) { - int ret; - FAR uint8_t id; + int ret; + uint8_t id; if (UINT8_MAX < arg) { @@ -314,15 +314,15 @@ static int cxd56_geofence_delete_all_region(unsigned long arg) static int cxd56_geofence_get_region_data(unsigned long arg) { - int ret; - FAR struct cxd56_geofence_region_s *reg_data; + int ret; + struct cxd56_geofence_region_s *reg_data; if (!arg) { return -EINVAL; } - reg_data = (FAR struct cxd56_geofence_region_s *)arg; + reg_data = (struct cxd56_geofence_region_s *)arg; ret = fw_gd_geogetregiondata(reg_data->id, ®_data->latitude, ®_data->longitude, ®_data->radius); @@ -399,14 +399,14 @@ static int cxd56_geofence_get_all_status(unsigned long arg) static int cxd56_geofence_set_mode(unsigned long arg) { int ret; - FAR struct cxd56_geofence_mode_s *mode; + struct cxd56_geofence_mode_s *mode; if (!arg) { return -EINVAL; } - mode = (FAR struct cxd56_geofence_mode_s *)arg; + mode = (struct cxd56_geofence_mode_s *)arg; ret = fw_gd_geosetopmode(mode->deadzone, mode->dwell_detecttime); @@ -429,10 +429,10 @@ static int cxd56_geofence_set_mode(unsigned long arg) * ****************************************************************************/ -static void cxd56_geofence_sighandler(uint32_t data, FAR void *userdata) +static void cxd56_geofence_sighandler(uint32_t data, void *userdata) { - FAR struct cxd56_geofence_dev_s *priv = - (FAR struct cxd56_geofence_dev_s *)userdata; + struct cxd56_geofence_dev_s *priv = + (struct cxd56_geofence_dev_s *)userdata; int i; int ret; @@ -469,7 +469,7 @@ static void cxd56_geofence_sighandler(uint32_t data, FAR void *userdata) * ****************************************************************************/ -static int cxd56_geofence_initialize(FAR struct cxd56_geofence_dev_s *dev) +static int cxd56_geofence_initialize(struct cxd56_geofence_dev_s *dev) { int32_t ret = 0; @@ -492,7 +492,7 @@ static int cxd56_geofence_initialize(FAR struct cxd56_geofence_dev_s *dev) * ****************************************************************************/ -static ssize_t cxd56_geofence_read(FAR struct file *filep, FAR char *buffer, +static ssize_t cxd56_geofence_read(struct file *filep, char *buffer, size_t len) { int32_t ret = 0; @@ -535,7 +535,7 @@ static ssize_t cxd56_geofence_read(FAR struct file *filep, FAR char *buffer, * ****************************************************************************/ -static int cxd56_geofence_ioctl(FAR struct file *filep, int cmd, +static int cxd56_geofence_ioctl(struct file *filep, int cmd, unsigned long arg) { if (cmd <= CXD56_GEOFENCE_IOCTL_INVAL || cmd >= CXD56_GEOFENCE_IOCTL_MAX) @@ -562,17 +562,17 @@ static int cxd56_geofence_ioctl(FAR struct file *filep, int cmd, * ****************************************************************************/ -static int cxd56_geofence_poll(FAR struct file *filep, - FAR struct pollfd *fds, +static int cxd56_geofence_poll(struct file *filep, + struct pollfd *fds, bool setup) { - FAR struct inode * inode; - FAR struct cxd56_geofence_dev_s *priv; - int ret = OK; - int i; + struct inode * inode; + struct cxd56_geofence_dev_s *priv; + int ret = OK; + int i; inode = filep->f_inode; - priv = (FAR struct cxd56_geofence_dev_s *)inode->i_private; + priv = (struct cxd56_geofence_dev_s *)inode->i_private; ret = nxsem_wait(&priv->devsem); if (ret < 0) @@ -643,12 +643,12 @@ errout: * ****************************************************************************/ -static int cxd56_geofence_register(FAR const char *devpath) +static int cxd56_geofence_register(const char *devpath) { - FAR struct cxd56_geofence_dev_s *priv; - int ret; + struct cxd56_geofence_dev_s *priv; + int ret; - priv = (FAR struct cxd56_geofence_dev_s *)kmm_malloc( + priv = (struct cxd56_geofence_dev_s *)kmm_malloc( sizeof(struct cxd56_geofence_dev_s)); if (!priv) { @@ -708,7 +708,7 @@ static int cxd56_geofence_register(FAR const char *devpath) * ****************************************************************************/ -int cxd56_geofenceinitialize(FAR const char *devpath) +int cxd56_geofenceinitialize(const char *devpath) { int ret; diff --git a/arch/arm/src/cxd56xx/cxd56_geofence.h b/arch/arm/src/cxd56xx/cxd56_geofence.h index 0c31006644..ecf6310461 100644 --- a/arch/arm/src/cxd56xx/cxd56_geofence.h +++ b/arch/arm/src/cxd56xx/cxd56_geofence.h @@ -60,7 +60,7 @@ extern "C" * ****************************************************************************/ -int cxd56_geofenceinitialize(FAR const char *devpath); +int cxd56_geofenceinitialize(const char *devpath); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/cxd56xx/cxd56_gnss.c b/arch/arm/src/cxd56xx/cxd56_gnss.c index a5dc074074..65c0887945 100644 --- a/arch/arm/src/cxd56xx/cxd56_gnss.c +++ b/arch/arm/src/cxd56xx/cxd56_gnss.c @@ -134,9 +134,9 @@ extern int fw_pm_sleepcpu(int cpuid, int mode); struct cxd56_gnss_sig_s { - uint8_t enable; - pid_t pid; - FAR struct cxd56_gnss_signal_info_s info; + uint8_t enable; + pid_t pid; + struct cxd56_gnss_signal_info_s info; }; struct cxd56_gnss_shared_info_s @@ -159,8 +159,8 @@ struct cxd56_gnss_dev_s uint8_t num_open; uint8_t notify_data; struct file cepfp; - FAR void * cepbuf; - FAR struct pollfd *fds[CONFIG_CXD56_GNSS_NPOLLWAITERS]; + void * cepbuf; + struct pollfd *fds[CONFIG_CXD56_GNSS_NPOLLWAITERS]; #if CONFIG_CXD56_GNSS_NSIGNALRECEIVERS != 0 struct cxd56_gnss_sig_s sigs[CONFIG_CXD56_GNSS_NSIGNALRECEIVERS]; #endif @@ -176,128 +176,128 @@ struct cxd56_gnss_dev_s /* ioctl command functions */ -static int cxd56_gnss_start(FAR struct file *filep, unsigned long arg); -static int cxd56_gnss_stop(FAR struct file *filep, unsigned long arg); -static int cxd56_gnss_select_satellite_system(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_get_satellite_system(FAR struct file *filep, - unsigned long arg); +static int cxd56_gnss_start(struct file *filep, unsigned long arg); +static int cxd56_gnss_stop(struct file *filep, unsigned long arg); +static int cxd56_gnss_select_satellite_system(struct file *filep, + unsigned long arg); +static int cxd56_gnss_get_satellite_system(struct file *filep, + unsigned long arg); static int -cxd56_gnss_set_receiver_position_ellipsoidal(FAR struct file *filep, - unsigned long arg); +cxd56_gnss_set_receiver_position_ellipsoidal(struct file *filep, + unsigned long arg); static int cxd56_gnss_set_receiver_position_orthogonal( - FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_set_ope_mode(FAR struct file *filep, + struct file *filep, unsigned long arg); -static int cxd56_gnss_get_ope_mode(FAR struct file *filep, +static int cxd56_gnss_set_ope_mode(struct file *filep, unsigned long arg); -static int cxd56_gnss_set_tcxo_offset(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_get_tcxo_offset(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_set_time(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_get_almanac(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_set_almanac(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_get_ephemeris(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_set_ephemeris(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_save_backup_data(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_erase_backup_data(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_open_cep_data(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_close_cep_data(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_check_cep_data(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_get_cep_age(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_reset_cep_flag(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_set_acquist_data(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_set_frametime(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_set_tau_gps(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_set_time_gps(FAR struct file *filep, +static int cxd56_gnss_get_ope_mode(struct file *filep, unsigned long arg); -static int cxd56_gnss_clear_receiver_info(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_set_tow_assist(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_set_utc_model(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_control_spectrum(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_start_test(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_stop_test(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_get_test_result(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_set_signal(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_start_pvtlog(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_stop_pvtlog(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_delete_pvtlog(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_get_pvtlog_status(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_start_rtk_output(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_stop_rtk_output(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_set_rtk_interval(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_get_rtk_interval(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_select_rtk_satellite(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_get_rtk_satellite(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_set_rtk_ephemeris_enable(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_get_rtk_ephemeris_enable(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_start_navmsg_output(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_get_var_ephemeris(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_set_var_ephemeris(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_set_usecase(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_get_usecase(FAR struct file *filep, - unsigned long arg); -static int cxd56_gnss_set_1pps_output(FAR struct file *filep, +static int cxd56_gnss_set_tcxo_offset(struct file *filep, unsigned long arg); -static int cxd56_gnss_get_1pps_output(FAR struct file *filep, +static int cxd56_gnss_get_tcxo_offset(struct file *filep, + unsigned long arg); +static int cxd56_gnss_set_time(struct file *filep, + unsigned long arg); +static int cxd56_gnss_get_almanac(struct file *filep, + unsigned long arg); +static int cxd56_gnss_set_almanac(struct file *filep, + unsigned long arg); +static int cxd56_gnss_get_ephemeris(struct file *filep, + unsigned long arg); +static int cxd56_gnss_set_ephemeris(struct file *filep, + unsigned long arg); +static int cxd56_gnss_save_backup_data(struct file *filep, + unsigned long arg); +static int cxd56_gnss_erase_backup_data(struct file *filep, + unsigned long arg); +static int cxd56_gnss_open_cep_data(struct file *filep, + unsigned long arg); +static int cxd56_gnss_close_cep_data(struct file *filep, + unsigned long arg); +static int cxd56_gnss_check_cep_data(struct file *filep, + unsigned long arg); +static int cxd56_gnss_get_cep_age(struct file *filep, + unsigned long arg); +static int cxd56_gnss_reset_cep_flag(struct file *filep, + unsigned long arg); +static int cxd56_gnss_set_acquist_data(struct file *filep, + unsigned long arg); +static int cxd56_gnss_set_frametime(struct file *filep, + unsigned long arg); +static int cxd56_gnss_set_tau_gps(struct file *filep, + unsigned long arg); +static int cxd56_gnss_set_time_gps(struct file *filep, + unsigned long arg); +static int cxd56_gnss_clear_receiver_info(struct file *filep, + unsigned long arg); +static int cxd56_gnss_set_tow_assist(struct file *filep, + unsigned long arg); +static int cxd56_gnss_set_utc_model(struct file *filep, + unsigned long arg); +static int cxd56_gnss_control_spectrum(struct file *filep, + unsigned long arg); +static int cxd56_gnss_start_test(struct file *filep, + unsigned long arg); +static int cxd56_gnss_stop_test(struct file *filep, + unsigned long arg); +static int cxd56_gnss_get_test_result(struct file *filep, + unsigned long arg); +static int cxd56_gnss_set_signal(struct file *filep, + unsigned long arg); +static int cxd56_gnss_start_pvtlog(struct file *filep, + unsigned long arg); +static int cxd56_gnss_stop_pvtlog(struct file *filep, + unsigned long arg); +static int cxd56_gnss_delete_pvtlog(struct file *filep, + unsigned long arg); +static int cxd56_gnss_get_pvtlog_status(struct file *filep, + unsigned long arg); +static int cxd56_gnss_start_rtk_output(struct file *filep, + unsigned long arg); +static int cxd56_gnss_stop_rtk_output(struct file *filep, + unsigned long arg); +static int cxd56_gnss_set_rtk_interval(struct file *filep, + unsigned long arg); +static int cxd56_gnss_get_rtk_interval(struct file *filep, + unsigned long arg); +static int cxd56_gnss_select_rtk_satellite(struct file *filep, + unsigned long arg); +static int cxd56_gnss_get_rtk_satellite(struct file *filep, + unsigned long arg); +static int cxd56_gnss_set_rtk_ephemeris_enable(struct file *filep, + unsigned long arg); +static int cxd56_gnss_get_rtk_ephemeris_enable(struct file *filep, + unsigned long arg); +static int cxd56_gnss_start_navmsg_output(struct file *filep, + unsigned long arg); +static int cxd56_gnss_get_var_ephemeris(struct file *filep, + unsigned long arg); +static int cxd56_gnss_set_var_ephemeris(struct file *filep, + unsigned long arg); +static int cxd56_gnss_set_usecase(struct file *filep, + unsigned long arg); +static int cxd56_gnss_get_usecase(struct file *filep, + unsigned long arg); +static int cxd56_gnss_set_1pps_output(struct file *filep, + unsigned long arg); +static int cxd56_gnss_get_1pps_output(struct file *filep, unsigned long arg); /* file operation functions */ -static int cxd56_gnss_open(FAR struct file *filep); -static int cxd56_gnss_close(FAR struct file *filep); -static ssize_t cxd56_gnss_read(FAR struct file *filep, FAR char *buffer, +static int cxd56_gnss_open(struct file *filep); +static int cxd56_gnss_close(struct file *filep); +static ssize_t cxd56_gnss_read(struct file *filep, char *buffer, size_t len); -static ssize_t cxd56_gnss_write(FAR struct file *filep, - FAR const char *buffer, size_t buflen); -static int cxd56_gnss_ioctl(FAR struct file *filep, int cmd, +static ssize_t cxd56_gnss_write(struct file *filep, + const char *buffer, size_t buflen); +static int cxd56_gnss_ioctl(struct file *filep, int cmd, unsigned long arg); -static int cxd56_gnss_poll(FAR struct file *filep, FAR struct pollfd *fds, +static int cxd56_gnss_poll(struct file *filep, struct pollfd *fds, bool setup); static int8_t cxd56_gnss_select_notifytype(off_t fpos, uint32_t *offset); -static int cxd56_gnss_cpufifo_api(FAR struct file *filep, +static int cxd56_gnss_cpufifo_api(struct file *filep, unsigned int api, unsigned int data); @@ -323,8 +323,8 @@ static const struct file_operations g_gnssfops = /* GNSS ioctl command list */ -static int (*g_cmdlist[CXD56_GNSS_IOCTL_MAX])(FAR struct file *filep, - unsigned long arg) = +static int (*g_cmdlist[CXD56_GNSS_IOCTL_MAX])(struct file *filep, + unsigned long arg) = { NULL, /* CXD56_GNSS_IOCTL_INVAL = 0 */ cxd56_gnss_start, @@ -416,7 +416,7 @@ static struct pm_cpu_freqlock_s g_hold_lock = * ****************************************************************************/ -static int cxd56_gnss_start(FAR struct file *filep, unsigned long arg) +static int cxd56_gnss_start(struct file *filep, unsigned long arg) { int ret; int retry = 50; @@ -461,7 +461,7 @@ static int cxd56_gnss_start(FAR struct file *filep, unsigned long arg) * ****************************************************************************/ -static int cxd56_gnss_stop(FAR struct file *filep, unsigned long arg) +static int cxd56_gnss_stop(struct file *filep, unsigned long arg) { int ret; @@ -488,8 +488,8 @@ static int cxd56_gnss_stop(FAR struct file *filep, unsigned long arg) * ****************************************************************************/ -static int cxd56_gnss_select_satellite_system(FAR struct file *filep, - unsigned long arg) +static int cxd56_gnss_select_satellite_system(struct file *filep, + unsigned long arg) { uint32_t system = (uint32_t)arg; @@ -514,8 +514,8 @@ static int cxd56_gnss_select_satellite_system(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_get_satellite_system(FAR struct file *filep, - unsigned long arg) +static int cxd56_gnss_get_satellite_system(struct file *filep, + unsigned long arg) { int ret; uint32_t system = 0; @@ -549,17 +549,17 @@ static int cxd56_gnss_get_satellite_system(FAR struct file *filep, ****************************************************************************/ static int -cxd56_gnss_set_receiver_position_ellipsoidal(FAR struct file *filep, - unsigned long arg) +cxd56_gnss_set_receiver_position_ellipsoidal(struct file *filep, + unsigned long arg) { - FAR struct cxd56_gnss_ellipsoidal_position_s *pos; + struct cxd56_gnss_ellipsoidal_position_s *pos; if (!arg) { return -EINVAL; } - pos = (FAR struct cxd56_gnss_ellipsoidal_position_s *)arg; + pos = (struct cxd56_gnss_ellipsoidal_position_s *)arg; return fw_gd_setreceiverpositionellipsoidal(&pos->latitude, &pos->longitude, @@ -584,17 +584,17 @@ cxd56_gnss_set_receiver_position_ellipsoidal(FAR struct file *filep, ****************************************************************************/ static int cxd56_gnss_set_receiver_position_orthogonal( - FAR struct file *filep, - unsigned long arg) + struct file *filep, + unsigned long arg) { - FAR struct cxd56_gnss_orthogonal_position_s *pos; + struct cxd56_gnss_orthogonal_position_s *pos; if (!arg) { return -EINVAL; } - pos = (FAR struct cxd56_gnss_orthogonal_position_s *)arg; + pos = (struct cxd56_gnss_orthogonal_position_s *)arg; return fw_gd_setreceiverpositionorthogonal(pos->x, pos->y, pos->z); } @@ -614,15 +614,15 @@ static int cxd56_gnss_set_receiver_position_orthogonal( * ****************************************************************************/ -static int cxd56_gnss_set_ope_mode(FAR struct file *filep, unsigned long arg) +static int cxd56_gnss_set_ope_mode(struct file *filep, unsigned long arg) { - FAR struct cxd56_gnss_ope_mode_param_s *ope_mode; + struct cxd56_gnss_ope_mode_param_s *ope_mode; if (!arg) { return -EINVAL; } - ope_mode = (FAR struct cxd56_gnss_ope_mode_param_s *)arg; + ope_mode = (struct cxd56_gnss_ope_mode_param_s *)arg; return fw_gd_setoperationmode(ope_mode->mode, ope_mode->cycle); } @@ -643,15 +643,15 @@ static int cxd56_gnss_set_ope_mode(FAR struct file *filep, unsigned long arg) * ****************************************************************************/ -static int cxd56_gnss_get_ope_mode(FAR struct file *filep, unsigned long arg) +static int cxd56_gnss_get_ope_mode(struct file *filep, unsigned long arg) { - FAR struct cxd56_gnss_ope_mode_param_s *ope_mode; + struct cxd56_gnss_ope_mode_param_s *ope_mode; if (!arg) { return -EINVAL; } - ope_mode = (FAR struct cxd56_gnss_ope_mode_param_s *)arg; + ope_mode = (struct cxd56_gnss_ope_mode_param_s *)arg; return fw_gd_getoperationmode(&ope_mode->mode, &ope_mode->cycle); } @@ -672,8 +672,8 @@ static int cxd56_gnss_get_ope_mode(FAR struct file *filep, unsigned long arg) * ****************************************************************************/ -static int cxd56_gnss_set_tcxo_offset(FAR struct file *filep, - unsigned long arg) +static int cxd56_gnss_set_tcxo_offset(struct file *filep, + unsigned long arg) { int32_t offset = (int32_t)arg; @@ -696,8 +696,8 @@ static int cxd56_gnss_set_tcxo_offset(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_get_tcxo_offset(FAR struct file *filep, - unsigned long arg) +static int cxd56_gnss_get_tcxo_offset(struct file *filep, + unsigned long arg) { int ret; int32_t offset = 0; @@ -730,9 +730,9 @@ static int cxd56_gnss_get_tcxo_offset(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_set_time(FAR struct file *filep, unsigned long arg) +static int cxd56_gnss_set_time(struct file *filep, unsigned long arg) { - FAR struct cxd56_gnss_datetime_s *date_time; + struct cxd56_gnss_datetime_s *date_time; int ret; if (!arg) @@ -740,7 +740,7 @@ static int cxd56_gnss_set_time(FAR struct file *filep, unsigned long arg) return -EINVAL; } - date_time = (FAR struct cxd56_gnss_datetime_s *)arg; + date_time = (struct cxd56_gnss_datetime_s *)arg; up_pm_acquire_freqlock(&g_lv_lock); ret = fw_gd_settime(&date_time->date, &date_time->time); @@ -765,17 +765,17 @@ static int cxd56_gnss_set_time(FAR struct file *filep, unsigned long arg) * ****************************************************************************/ -static int cxd56_gnss_get_almanac(FAR struct file *filep, unsigned long arg) +static int cxd56_gnss_get_almanac(struct file *filep, unsigned long arg) { - FAR struct cxd56_gnss_orbital_param_s *param; - uint32_t almanac_size; + struct cxd56_gnss_orbital_param_s *param; + uint32_t almanac_size; if (!arg) { return -EINVAL; } - param = (FAR struct cxd56_gnss_orbital_param_s *)arg; + param = (struct cxd56_gnss_orbital_param_s *)arg; return fw_gd_getalmanac(param->type, param->data, &almanac_size); } @@ -796,16 +796,16 @@ static int cxd56_gnss_get_almanac(FAR struct file *filep, unsigned long arg) * ****************************************************************************/ -static int cxd56_gnss_set_almanac(FAR struct file *filep, unsigned long arg) +static int cxd56_gnss_set_almanac(struct file *filep, unsigned long arg) { - FAR struct cxd56_gnss_orbital_param_s *param; + struct cxd56_gnss_orbital_param_s *param; if (!arg) { return -EINVAL; } - param = (FAR struct cxd56_gnss_orbital_param_s *)arg; + param = (struct cxd56_gnss_orbital_param_s *)arg; return fw_gd_setalmanac(param->type, param->data); } @@ -826,18 +826,18 @@ static int cxd56_gnss_set_almanac(FAR struct file *filep, unsigned long arg) * ****************************************************************************/ -static int cxd56_gnss_get_ephemeris(FAR struct file *filep, +static int cxd56_gnss_get_ephemeris(struct file *filep, unsigned long arg) { - FAR struct cxd56_gnss_orbital_param_s *param; - uint32_t ephemeris_size; + struct cxd56_gnss_orbital_param_s *param; + uint32_t ephemeris_size; if (!arg) { return -EINVAL; } - param = (FAR struct cxd56_gnss_orbital_param_s *)arg; + param = (struct cxd56_gnss_orbital_param_s *)arg; return fw_gd_getephemeris(param->type, param->data, &ephemeris_size); } @@ -858,17 +858,17 @@ static int cxd56_gnss_get_ephemeris(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_set_ephemeris(FAR struct file *filep, +static int cxd56_gnss_set_ephemeris(struct file *filep, unsigned long arg) { - FAR struct cxd56_gnss_orbital_param_s *param; + struct cxd56_gnss_orbital_param_s *param; if (!arg) { return -EINVAL; } - param = (FAR struct cxd56_gnss_orbital_param_s *)arg; + param = (struct cxd56_gnss_orbital_param_s *)arg; return fw_gd_setephemeris(param->type, param->data); } @@ -889,10 +889,10 @@ static int cxd56_gnss_set_ephemeris(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_save_backup_data(FAR struct file *filep, - unsigned long arg) +static int cxd56_gnss_save_backup_data(struct file *filep, + unsigned long arg) { - FAR char *buf; + char *buf; struct file file; int n = 0; int32_t offset = 0; @@ -947,8 +947,8 @@ static int cxd56_gnss_save_backup_data(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_erase_backup_data(FAR struct file *filep, - unsigned long arg) +static int cxd56_gnss_erase_backup_data(struct file *filep, + unsigned long arg) { return nx_unlink(CONFIG_CXD56_GNSS_BACKUP_FILENAME); } @@ -969,7 +969,7 @@ static int cxd56_gnss_erase_backup_data(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_open_cep_data(FAR struct file *filep, +static int cxd56_gnss_open_cep_data(struct file *filep, unsigned long arg) { return cxd56_cpu1sigsend(CXD56_CPU1_DATA_TYPE_CEPFILE, TRUE); @@ -991,8 +991,8 @@ static int cxd56_gnss_open_cep_data(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_close_cep_data(FAR struct file *filep, - unsigned long arg) +static int cxd56_gnss_close_cep_data(struct file *filep, + unsigned long arg) { return cxd56_cpu1sigsend(CXD56_CPU1_DATA_TYPE_CEPFILE, FALSE); } @@ -1013,8 +1013,8 @@ static int cxd56_gnss_close_cep_data(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_check_cep_data(FAR struct file *filep, - unsigned long arg) +static int cxd56_gnss_check_cep_data(struct file *filep, + unsigned long arg) { return fw_gd_cepcheckassistdata(); } @@ -1035,16 +1035,16 @@ static int cxd56_gnss_check_cep_data(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_get_cep_age(FAR struct file *filep, unsigned long arg) +static int cxd56_gnss_get_cep_age(struct file *filep, unsigned long arg) { - FAR struct cxd56_gnss_cep_age_s *age; + struct cxd56_gnss_cep_age_s *age; if (!arg) { return -EINVAL; } - age = (FAR struct cxd56_gnss_cep_age_s *)arg; + age = (struct cxd56_gnss_cep_age_s *)arg; return fw_gd_cepgetagedata(&age->age, &age->cepi); } @@ -1065,7 +1065,7 @@ static int cxd56_gnss_get_cep_age(FAR struct file *filep, unsigned long arg) * ****************************************************************************/ -static int cxd56_gnss_reset_cep_flag(FAR struct file *filep, +static int cxd56_gnss_reset_cep_flag(struct file *filep, unsigned long arg) { return cxd56_gnss_cpufifo_api(filep, @@ -1088,17 +1088,17 @@ static int cxd56_gnss_reset_cep_flag(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_set_acquist_data(FAR struct file *filep, +static int cxd56_gnss_set_acquist_data(struct file *filep, unsigned long arg) { - FAR struct cxd56_gnss_agps_acquist_s *acquist; + struct cxd56_gnss_agps_acquist_s *acquist; if (!arg) { return -EINVAL; } - acquist = (FAR struct cxd56_gnss_agps_acquist_s *)arg; + acquist = (struct cxd56_gnss_agps_acquist_s *)arg; return fw_gd_setacquist(acquist->data, acquist->size); } @@ -1119,17 +1119,17 @@ static int cxd56_gnss_set_acquist_data(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_set_frametime(FAR struct file *filep, +static int cxd56_gnss_set_frametime(struct file *filep, unsigned long arg) { - FAR struct cxd56_gnss_agps_frametime_s *frametime; + struct cxd56_gnss_agps_frametime_s *frametime; if (!arg) { return -EINVAL; } - frametime = (FAR struct cxd56_gnss_agps_frametime_s *)arg; + frametime = (struct cxd56_gnss_agps_frametime_s *)arg; return fw_gd_setframetime(frametime->sec, frametime->frac); } @@ -1150,16 +1150,16 @@ static int cxd56_gnss_set_frametime(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_set_tau_gps(FAR struct file *filep, unsigned long arg) +static int cxd56_gnss_set_tau_gps(struct file *filep, unsigned long arg) { - FAR struct cxd56_gnss_agps_tau_gps_s *taugpstime; + struct cxd56_gnss_agps_tau_gps_s *taugpstime; if (!arg) { return -EINVAL; } - taugpstime = (FAR struct cxd56_gnss_agps_tau_gps_s *)arg; + taugpstime = (struct cxd56_gnss_agps_tau_gps_s *)arg; return fw_gd_settaugps(&taugpstime->taugps); } @@ -1180,16 +1180,16 @@ static int cxd56_gnss_set_tau_gps(FAR struct file *filep, unsigned long arg) * ****************************************************************************/ -static int cxd56_gnss_set_time_gps(FAR struct file *filep, unsigned long arg) +static int cxd56_gnss_set_time_gps(struct file *filep, unsigned long arg) { - FAR struct cxd56_gnss_agps_time_gps_s *time_gps; + struct cxd56_gnss_agps_time_gps_s *time_gps; if (!arg) { return -EINVAL; } - time_gps = (FAR struct cxd56_gnss_agps_time_gps_s *)arg; + time_gps = (struct cxd56_gnss_agps_time_gps_s *)arg; return fw_gd_settimegps(&time_gps->date, &time_gps->time); } @@ -1210,7 +1210,7 @@ static int cxd56_gnss_set_time_gps(FAR struct file *filep, unsigned long arg) * ****************************************************************************/ -static int cxd56_gnss_clear_receiver_info(FAR struct file *filep, +static int cxd56_gnss_clear_receiver_info(struct file *filep, unsigned long arg) { uint32_t clear_type = arg; @@ -1234,17 +1234,17 @@ static int cxd56_gnss_clear_receiver_info(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_set_tow_assist(FAR struct file *filep, +static int cxd56_gnss_set_tow_assist(struct file *filep, unsigned long arg) { - FAR struct cxd56_gnss_agps_tow_assist_s *assist; + struct cxd56_gnss_agps_tow_assist_s *assist; if (!arg) { return -EINVAL; } - assist = (FAR struct cxd56_gnss_agps_tow_assist_s *)arg; + assist = (struct cxd56_gnss_agps_tow_assist_s *)arg; return fw_gd_settowassist(assist->data, assist->size); } @@ -1265,17 +1265,17 @@ static int cxd56_gnss_set_tow_assist(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_set_utc_model(FAR struct file *filep, +static int cxd56_gnss_set_utc_model(struct file *filep, unsigned long arg) { - FAR struct cxd56_gnss_agps_utc_model_s *model; + struct cxd56_gnss_agps_utc_model_s *model; if (!arg) { return -EINVAL; } - model = (FAR struct cxd56_gnss_agps_utc_model_s *)arg; + model = (struct cxd56_gnss_agps_utc_model_s *)arg; return fw_gd_setutcmodel(model->data, model->size); } @@ -1296,17 +1296,17 @@ static int cxd56_gnss_set_utc_model(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_control_spectrum(FAR struct file *filep, +static int cxd56_gnss_control_spectrum(struct file *filep, unsigned long arg) { - FAR struct cxd56_gnss_spectrum_control_s *control; + struct cxd56_gnss_spectrum_control_s *control; if (!arg) { return -EINVAL; } - control = (FAR struct cxd56_gnss_spectrum_control_s *)arg; + control = (struct cxd56_gnss_spectrum_control_s *)arg; return fw_gd_spectrumcontrol(control->time, control->enable, control->point1, control->step1, @@ -1329,11 +1329,11 @@ static int cxd56_gnss_control_spectrum(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_start_test(FAR struct file *filep, unsigned long arg) +static int cxd56_gnss_start_test(struct file *filep, unsigned long arg) { int ret; int retry = 50; - FAR struct cxd56_gnss_test_info_s *info; + struct cxd56_gnss_test_info_s *info; /* check argument */ @@ -1360,7 +1360,7 @@ static int cxd56_gnss_start_test(FAR struct file *filep, unsigned long arg) /* set parameter */ - info = (FAR struct cxd56_gnss_test_info_s *)arg; + info = (struct cxd56_gnss_test_info_s *)arg; fw_gd_startgpstest(info->satellite, info->reserve1, info->reserve2, info->reserve3); @@ -1388,7 +1388,7 @@ static int cxd56_gnss_start_test(FAR struct file *filep, unsigned long arg) * ****************************************************************************/ -static int cxd56_gnss_stop_test(FAR struct file *filep, unsigned long arg) +static int cxd56_gnss_stop_test(struct file *filep, unsigned long arg) { int ret; @@ -1425,17 +1425,17 @@ static int cxd56_gnss_stop_test(FAR struct file *filep, unsigned long arg) * ****************************************************************************/ -static int cxd56_gnss_get_test_result(FAR struct file *filep, +static int cxd56_gnss_get_test_result(struct file *filep, unsigned long arg) { - FAR struct cxd56_gnss_test_result_s *result; + struct cxd56_gnss_test_result_s *result; if (!arg) { return -EINVAL; } - result = (FAR struct cxd56_gnss_test_result_s *)arg; + result = (struct cxd56_gnss_test_result_s *)arg; return fw_gd_getgpstestresult(&result->cn, &result->doppler); } @@ -1456,32 +1456,32 @@ static int cxd56_gnss_get_test_result(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_set_signal(FAR struct file *filep, unsigned long arg) +static int cxd56_gnss_set_signal(struct file *filep, unsigned long arg) { int ret = 0; #if CONFIG_CXD56_GNSS_NSIGNALRECEIVERS != 0 - FAR struct inode *inode; - FAR struct cxd56_gnss_dev_s *priv; - FAR struct cxd56_gnss_signal_setting_s *setting; - FAR struct cxd56_gnss_sig_s *sig; - FAR struct cxd56_gnss_sig_s *checksig; - pid_t pid; - int i; + struct inode *inode; + struct cxd56_gnss_dev_s *priv; + struct cxd56_gnss_signal_setting_s *setting; + struct cxd56_gnss_sig_s *sig; + struct cxd56_gnss_sig_s *checksig; + pid_t pid; + int i; if (!arg) { return -EINVAL; } - setting = (FAR struct cxd56_gnss_signal_setting_s *)arg; + setting = (struct cxd56_gnss_signal_setting_s *)arg; if (setting->gnsssig >= CXD56_CPU1_DATA_TYPE_MAX) { return -EPROTOTYPE; } inode = filep->f_inode; - priv = (FAR struct cxd56_gnss_dev_s *)inode->i_private; + priv = (struct cxd56_gnss_dev_s *)inode->i_private; ret = nxsem_wait(&priv->devsem); if (ret < 0) @@ -1554,16 +1554,16 @@ static int cxd56_gnss_set_signal(FAR struct file *filep, unsigned long arg) * ****************************************************************************/ -static int cxd56_gnss_start_pvtlog(FAR struct file *filep, unsigned long arg) +static int cxd56_gnss_start_pvtlog(struct file *filep, unsigned long arg) { - FAR struct cxd56_pvtlog_setting_s *setting; + struct cxd56_pvtlog_setting_s *setting; if (!arg) { return -EINVAL; } - setting = (FAR struct cxd56_pvtlog_setting_s *)arg; + setting = (struct cxd56_pvtlog_setting_s *)arg; return fw_gd_registerpvtlog(setting->cycle, setting->threshold); } @@ -1584,7 +1584,7 @@ static int cxd56_gnss_start_pvtlog(FAR struct file *filep, unsigned long arg) * ****************************************************************************/ -static int cxd56_gnss_stop_pvtlog(FAR struct file *filep, unsigned long arg) +static int cxd56_gnss_stop_pvtlog(struct file *filep, unsigned long arg) { return fw_gd_releasepvtlog(); } @@ -1605,7 +1605,7 @@ static int cxd56_gnss_stop_pvtlog(FAR struct file *filep, unsigned long arg) * ****************************************************************************/ -static int cxd56_gnss_delete_pvtlog(FAR struct file *filep, +static int cxd56_gnss_delete_pvtlog(struct file *filep, unsigned long arg) { return fw_gd_pvtlogdeletelog(); @@ -1627,17 +1627,17 @@ static int cxd56_gnss_delete_pvtlog(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_get_pvtlog_status(FAR struct file *filep, - unsigned long arg) +static int cxd56_gnss_get_pvtlog_status(struct file *filep, + unsigned long arg) { - FAR struct cxd56_pvtlog_status_s *status; + struct cxd56_pvtlog_status_s *status; if (!arg) { return -EINVAL; } - status = (FAR struct cxd56_pvtlog_status_s *)arg; + status = (struct cxd56_pvtlog_status_s *)arg; return fw_gd_pvtloggetlogstatus(&status->status); } @@ -1658,17 +1658,17 @@ static int cxd56_gnss_get_pvtlog_status(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_start_rtk_output(FAR struct file *filep, - unsigned long arg) +static int cxd56_gnss_start_rtk_output(struct file *filep, + unsigned long arg) { - FAR struct cxd56_rtk_setting_s *setting; + struct cxd56_rtk_setting_s *setting; if (!arg) { return -EINVAL; } - setting = (FAR struct cxd56_rtk_setting_s *)arg; + setting = (struct cxd56_rtk_setting_s *)arg; setting->sbasout = 0; return fw_gd_rtkstart(setting); @@ -1690,8 +1690,8 @@ static int cxd56_gnss_start_rtk_output(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_stop_rtk_output(FAR struct file *filep, - unsigned long arg) +static int cxd56_gnss_stop_rtk_output(struct file *filep, + unsigned long arg) { return fw_gd_rtkstop(); } @@ -1712,8 +1712,8 @@ static int cxd56_gnss_stop_rtk_output(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_set_rtk_interval(FAR struct file *filep, - unsigned long arg) +static int cxd56_gnss_set_rtk_interval(struct file *filep, + unsigned long arg) { int interval = (int)arg; @@ -1736,8 +1736,8 @@ static int cxd56_gnss_set_rtk_interval(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_get_rtk_interval(FAR struct file *filep, - unsigned long arg) +static int cxd56_gnss_get_rtk_interval(struct file *filep, + unsigned long arg) { int ret; int interval = 0; @@ -1769,8 +1769,8 @@ static int cxd56_gnss_get_rtk_interval(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_select_rtk_satellite(FAR struct file *filep, - unsigned long arg) +static int cxd56_gnss_select_rtk_satellite(struct file *filep, + unsigned long arg) { uint32_t gnss = (uint32_t)arg; @@ -1793,8 +1793,8 @@ static int cxd56_gnss_select_rtk_satellite(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_get_rtk_satellite(FAR struct file *filep, - unsigned long arg) +static int cxd56_gnss_get_rtk_satellite(struct file *filep, + unsigned long arg) { int ret; uint32_t gnss = 0; @@ -1826,8 +1826,8 @@ static int cxd56_gnss_get_rtk_satellite(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_set_rtk_ephemeris_enable(FAR struct file *filep, - unsigned long arg) +static int cxd56_gnss_set_rtk_ephemeris_enable(struct file *filep, + unsigned long arg) { int enable = (int)arg; @@ -1850,8 +1850,8 @@ static int cxd56_gnss_set_rtk_ephemeris_enable(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_get_rtk_ephemeris_enable(FAR struct file *filep, - unsigned long arg) +static int cxd56_gnss_get_rtk_ephemeris_enable(struct file *filep, + unsigned long arg) { int ret; int enable = 0; @@ -1883,17 +1883,17 @@ static int cxd56_gnss_get_rtk_ephemeris_enable(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_start_navmsg_output(FAR struct file *filep, - unsigned long arg) +static int cxd56_gnss_start_navmsg_output(struct file *filep, + unsigned long arg) { - FAR struct cxd56_rtk_setting_s *setting; + struct cxd56_rtk_setting_s *setting; if (!arg) { return -EINVAL; } - setting = (FAR struct cxd56_rtk_setting_s *)arg; + setting = (struct cxd56_rtk_setting_s *)arg; return fw_gd_rtkstart(setting); } @@ -1914,17 +1914,17 @@ static int cxd56_gnss_start_navmsg_output(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_set_var_ephemeris(FAR struct file *filep, +static int cxd56_gnss_set_var_ephemeris(struct file *filep, unsigned long arg) { - FAR struct cxd56_gnss_set_var_ephemeris_s *param; + struct cxd56_gnss_set_var_ephemeris_s *param; if (!arg) { return -EINVAL; } - param = (FAR struct cxd56_gnss_set_var_ephemeris_s *)arg; + param = (struct cxd56_gnss_set_var_ephemeris_s *)arg; return fw_gd_setvarephemeris(param->data, param->size); } @@ -1945,17 +1945,17 @@ static int cxd56_gnss_set_var_ephemeris(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_get_var_ephemeris(FAR struct file *filep, +static int cxd56_gnss_get_var_ephemeris(struct file *filep, unsigned long arg) { - FAR struct cxd56_gnss_get_var_ephemeris_s *param; + struct cxd56_gnss_get_var_ephemeris_s *param; if (!arg) { return -EINVAL; } - param = (FAR struct cxd56_gnss_get_var_ephemeris_s *)arg; + param = (struct cxd56_gnss_get_var_ephemeris_s *)arg; return fw_gd_getvarephemeris(param->type, param->data, param->size); } @@ -1975,7 +1975,7 @@ static int cxd56_gnss_get_var_ephemeris(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_set_usecase(FAR struct file *filep, +static int cxd56_gnss_set_usecase(struct file *filep, unsigned long arg) { return fw_gd_setusecase(arg); @@ -1996,7 +1996,7 @@ static int cxd56_gnss_set_usecase(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_get_usecase(FAR struct file *filep, +static int cxd56_gnss_get_usecase(struct file *filep, unsigned long arg) { int ret; @@ -2028,7 +2028,7 @@ static int cxd56_gnss_get_usecase(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_set_1pps_output(FAR struct file *filep, +static int cxd56_gnss_set_1pps_output(struct file *filep, unsigned long arg) { if (arg) @@ -2070,7 +2070,7 @@ static int cxd56_gnss_set_1pps_output(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_get_1pps_output(FAR struct file *filep, +static int cxd56_gnss_get_1pps_output(struct file *filep, unsigned long arg) { int ret; @@ -2106,7 +2106,7 @@ static int cxd56_gnss_get_1pps_output(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_wait_notify(FAR sem_t *sem, time_t waitsec) +static int cxd56_gnss_wait_notify(sem_t *sem, time_t waitsec) { int ret; struct timespec timeout; @@ -2139,12 +2139,12 @@ static int cxd56_gnss_wait_notify(FAR sem_t *sem, time_t waitsec) * ****************************************************************************/ -static FAR char * -cxd56_gnss_read_cep_file(FAR struct file *fp, int32_t offset, - size_t len, FAR int *retval) +static char * +cxd56_gnss_read_cep_file(struct file *fp, int32_t offset, + size_t len, int *retval) { - FAR char *buf; - int ret; + char *buf; + int ret; if (fp == NULL) { @@ -2203,9 +2203,9 @@ cxd56_gnss_read_cep_file(FAR struct file *fp, int32_t offset, * ****************************************************************************/ -static void cxd56_gnss_read_backup_file(FAR int *retval) +static void cxd56_gnss_read_backup_file(int *retval) { - FAR char *buf; + char *buf; struct file file; int32_t offset = 0; size_t n; @@ -2272,14 +2272,14 @@ static void cxd56_gnss_read_backup_file(FAR int *retval) #if CONFIG_CXD56_GNSS_NSIGNALRECEIVERS != 0 static void cxd56_gnss_common_signalhandler(uint32_t data, - FAR void *userdata) + void *userdata) { - FAR struct cxd56_gnss_dev_s *priv = - (FAR struct cxd56_gnss_dev_s *)userdata; - uint8_t sigtype = CXD56_CPU1_GET_DEV(data); - int issetmask = 0; - int i; - int ret; + struct cxd56_gnss_dev_s *priv = + (struct cxd56_gnss_dev_s *)userdata; + uint8_t sigtype = CXD56_CPU1_GET_DEV(data); + int issetmask = 0; + int i; + int ret; ret = nxsem_wait(&priv->devsem); if (ret < 0) @@ -2325,13 +2325,13 @@ static void cxd56_gnss_common_signalhandler(uint32_t data, * ****************************************************************************/ -static void cxd56_gnss_default_sighandler(uint32_t data, FAR void *userdata) +static void cxd56_gnss_default_sighandler(uint32_t data, void *userdata) { - FAR struct cxd56_gnss_dev_s *priv = - (FAR struct cxd56_gnss_dev_s *)userdata; - int i; - int ret; - int dtype = CXD56_CPU1_GET_DATA(data); + struct cxd56_gnss_dev_s *priv = + (struct cxd56_gnss_dev_s *)userdata; + int i; + int ret; + int dtype = CXD56_CPU1_GET_DATA(data); switch (dtype) { @@ -2431,10 +2431,10 @@ static void cxd56_gnss_default_sighandler(uint32_t data, FAR void *userdata) ****************************************************************************/ static void cxd56_gnss_cpufifoapi_signalhandler(uint32_t data, - FAR void *userdata) + void *userdata) { - FAR struct cxd56_gnss_dev_s *priv = - (FAR struct cxd56_gnss_dev_s *)userdata; + struct cxd56_gnss_dev_s *priv = + (struct cxd56_gnss_dev_s *)userdata; priv->apiret = CXD56_CPU1_GET_DATA((int)data); nxsem_post(&priv->apiwait); @@ -2456,16 +2456,16 @@ static void cxd56_gnss_cpufifoapi_signalhandler(uint32_t data, * ****************************************************************************/ -static int cxd56_gnss_cpufifo_api(FAR struct file *filep, unsigned int api, +static int cxd56_gnss_cpufifo_api(struct file *filep, unsigned int api, unsigned int data) { - FAR struct inode *inode; - FAR struct cxd56_gnss_dev_s *priv; - unsigned int type; - int ret = OK; + struct inode *inode; + struct cxd56_gnss_dev_s *priv; + unsigned int type; + int ret = OK; inode = filep->f_inode; - priv = (FAR struct cxd56_gnss_dev_s *)inode->i_private; + priv = (struct cxd56_gnss_dev_s *)inode->i_private; type = CXD56_GNSS_CPUFIFOAPI_SET_DATA(api, data); cxd56_cpu1sigsend(CXD56_CPU1_DATA_TYPE_CPUFIFOAPI, type); @@ -2503,7 +2503,7 @@ static int cxd56_gnss_cpufifo_api(FAR struct file *filep, unsigned int api, * ****************************************************************************/ -static int8_t cxd56_gnss_select_notifytype(off_t fpos, FAR uint32_t *offset) +static int8_t cxd56_gnss_select_notifytype(off_t fpos, uint32_t *offset) { int8_t type; @@ -2580,7 +2580,7 @@ static int8_t cxd56_gnss_select_notifytype(off_t fpos, FAR uint32_t *offset) * ****************************************************************************/ -static int cxd56_gnss_initialize(FAR struct cxd56_gnss_dev_s *dev) +static int cxd56_gnss_initialize(struct cxd56_gnss_dev_s *dev) { int32_t ret = 0; @@ -2601,15 +2601,15 @@ static int cxd56_gnss_initialize(FAR struct cxd56_gnss_dev_s *dev) * ****************************************************************************/ -static int cxd56_gnss_open(FAR struct file *filep) +static int cxd56_gnss_open(struct file *filep) { - FAR struct inode * inode; - FAR struct cxd56_gnss_dev_s *priv; - int ret = OK; - int retry = 50; + struct inode * inode; + struct cxd56_gnss_dev_s *priv; + int ret = OK; + int retry = 50; inode = filep->f_inode; - priv = (FAR struct cxd56_gnss_dev_s *)inode->i_private; + priv = (struct cxd56_gnss_dev_s *)inode->i_private; while (!g_rtc_enabled && 0 < retry--) { @@ -2710,14 +2710,14 @@ static int cxd56_gnss_open(FAR struct file *filep) * ****************************************************************************/ -static int cxd56_gnss_close(FAR struct file *filep) +static int cxd56_gnss_close(struct file *filep) { - FAR struct inode * inode; - FAR struct cxd56_gnss_dev_s *priv; - int ret = OK; + struct inode * inode; + struct cxd56_gnss_dev_s *priv; + int ret = OK; inode = filep->f_inode; - priv = (FAR struct cxd56_gnss_dev_s *)inode->i_private; + priv = (struct cxd56_gnss_dev_s *)inode->i_private; ret = nxsem_wait(&priv->devsem); if (ret < 0) @@ -2760,7 +2760,7 @@ static int cxd56_gnss_close(FAR struct file *filep) * ****************************************************************************/ -static ssize_t cxd56_gnss_read(FAR struct file *filep, FAR char *buffer, +static ssize_t cxd56_gnss_read(struct file *filep, char *buffer, size_t len) { int32_t ret = 0; @@ -2830,8 +2830,8 @@ static ssize_t cxd56_gnss_read(FAR struct file *filep, FAR char *buffer, * ****************************************************************************/ -static ssize_t cxd56_gnss_write(FAR struct file *filep, - FAR const char *buffer, size_t buflen) +static ssize_t cxd56_gnss_write(struct file *filep, + const char *buffer, size_t buflen) { return -ENOENT; } @@ -2852,15 +2852,15 @@ static ssize_t cxd56_gnss_write(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_gnss_ioctl(FAR struct file *filep, int cmd, +static int cxd56_gnss_ioctl(struct file *filep, int cmd, unsigned long arg) { - FAR struct inode * inode; - FAR struct cxd56_gnss_dev_s *priv; + struct inode * inode; + struct cxd56_gnss_dev_s *priv; int ret; inode = filep->f_inode; - priv = (FAR struct cxd56_gnss_dev_s *)inode->i_private; + priv = (struct cxd56_gnss_dev_s *)inode->i_private; if (cmd <= CXD56_GNSS_IOCTL_INVAL || cmd >= CXD56_GNSS_IOCTL_MAX) { @@ -2896,16 +2896,16 @@ static int cxd56_gnss_ioctl(FAR struct file *filep, int cmd, * ****************************************************************************/ -static int cxd56_gnss_poll(FAR struct file *filep, FAR struct pollfd *fds, +static int cxd56_gnss_poll(struct file *filep, struct pollfd *fds, bool setup) { - FAR struct inode *inode; - FAR struct cxd56_gnss_dev_s *priv; - int ret = OK; - int i; + struct inode *inode; + struct cxd56_gnss_dev_s *priv; + int ret = OK; + int i; inode = filep->f_inode; - priv = (FAR struct cxd56_gnss_dev_s *)inode->i_private; + priv = (struct cxd56_gnss_dev_s *)inode->i_private; ret = nxsem_wait(&priv->devsem); if (ret < 0) @@ -2976,11 +2976,11 @@ errout: * ****************************************************************************/ -static int cxd56_gnss_register(FAR const char *devpath) +static int cxd56_gnss_register(const char *devpath) { - FAR struct cxd56_gnss_dev_s *priv; - int i; - int ret; + struct cxd56_gnss_dev_s *priv; + int i; + int ret; static struct cxd56_devsig_table_s devsig_table[] = { @@ -3030,7 +3030,7 @@ static int cxd56_gnss_register(FAR const char *devpath) } }; - priv = (FAR struct cxd56_gnss_dev_s *)kmm_malloc( + priv = (struct cxd56_gnss_dev_s *)kmm_malloc( sizeof(struct cxd56_gnss_dev_s)); if (!priv) { @@ -3117,7 +3117,7 @@ static int cxd56_gnss_register(FAR const char *devpath) * ****************************************************************************/ -int cxd56_gnssinitialize(FAR const char *devpath) +int cxd56_gnssinitialize(const char *devpath) { int ret; diff --git a/arch/arm/src/cxd56xx/cxd56_gnss.h b/arch/arm/src/cxd56xx/cxd56_gnss.h index e66e7f3d35..4ba7e77d17 100644 --- a/arch/arm/src/cxd56xx/cxd56_gnss.h +++ b/arch/arm/src/cxd56xx/cxd56_gnss.h @@ -82,7 +82,7 @@ extern "C" * ****************************************************************************/ -int cxd56_gnssinitialize(FAR const char *devpath); +int cxd56_gnssinitialize(const char *devpath); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/cxd56xx/cxd56_gnss_api.h b/arch/arm/src/cxd56xx/cxd56_gnss_api.h index be8d7f409f..1b5297a219 100644 --- a/arch/arm/src/cxd56xx/cxd56_gnss_api.h +++ b/arch/arm/src/cxd56xx/cxd56_gnss_api.h @@ -78,12 +78,12 @@ int fw_gd_selectsatellitesystem(uint32_t system); * by CXD56_GNSS_B_SAT_XXX. */ -int fw_gd_getsatellitesystem(FAR uint32_t *system); +int fw_gd_getsatellitesystem(uint32_t *system); /* Set the rough receiver position */ -int fw_gd_setreceiverpositionellipsoidal(FAR double *dlat, FAR double *dlon, - FAR double *dheight); +int fw_gd_setreceiverpositionellipsoidal(double *dlat, double *dlon, + double *dheight); /* Set the rough receiver position as orgothonal */ @@ -95,7 +95,7 @@ int fw_gd_set1ppsoutput(uint32_t enable); /* Get the current 1PPS output setting. */ -int fw_gd_get1ppsoutput(FAR uint32_t *enable); +int fw_gd_get1ppsoutput(uint32_t *enable); /* Set the receiver operation mode * 1st argument 'mode' is a operation mode defined by CXD56_GNSS_OPMOD_XXX. @@ -106,7 +106,7 @@ int fw_gd_setoperationmode(uint32_t mode, uint32_t cycle); /* Get the receiver operation mode */ -int fw_gd_getoperationmode(FAR uint32_t *mode, FAR uint32_t *cycle); +int fw_gd_getoperationmode(uint32_t *mode, uint32_t *cycle); /* Set the TCXO offset */ @@ -114,14 +114,14 @@ int fw_gd_settcxooffset(int32_t offset); /* Get the TCXO offset */ -int fw_gd_gettcxooffset(FAR int32_t *offset); +int fw_gd_gettcxooffset(int32_t *offset); /* Set the estimated current time of the receiver. * 1st argument date & time are in UTC. */ -int fw_gd_settime(FAR struct cxd56_gnss_date_s *date, - FAR struct cxd56_gnss_time_s *time); +int fw_gd_settime(struct cxd56_gnss_date_s *date, + struct cxd56_gnss_time_s *time); /* Set the network time */ @@ -129,21 +129,21 @@ int fw_gd_setframetime(uint16_t sec, uint32_t fracsec); /* Get the almanac data */ -int fw_gd_getalmanac(uint32_t satellite, FAR uint32_t *almanac, - FAR uint32_t *almanacsize); +int fw_gd_getalmanac(uint32_t satellite, uint32_t *almanac, + uint32_t *almanacsize); /* Set the almanac data */ -int fw_gd_setalmanac(uint32_t satellite, FAR uint32_t *almanac); +int fw_gd_setalmanac(uint32_t satellite, uint32_t *almanac); /* Get the Ephemeris data */ -int fw_gd_getephemeris(uint32_t satellite, FAR uint32_t *ephemeris, - FAR uint32_t *ephemerissize); +int fw_gd_getephemeris(uint32_t satellite, uint32_t *ephemeris, + uint32_t *ephemerissize); /* Set the Ephemeris data */ -int fw_gd_setephemeris(uint32_t satellite, FAR uint32_t *ephemeris); +int fw_gd_setephemeris(uint32_t satellite, uint32_t *ephemeris); /* Select to use or not use the initial position calculation supporting * information of the QZSS L1-SAIF. @@ -155,7 +155,7 @@ int fw_gd_setqzssposassist(uint32_t enable); * information of the QZSS L1-SAIF. */ -int fw_gd_getqzssposassist(FAR uint32_t *enable); +int fw_gd_getqzssposassist(uint32_t *enable); /* Set IMES bitrates. */ @@ -163,7 +163,7 @@ int fw_gd_setimesbitrate(uint32_t bitrate); /* Get IMES bitrates. */ -int fw_gd_getimesbitrate(FAR uint32_t *bitrate); +int fw_gd_getimesbitrate(uint32_t *bitrate); /* Set IMES center frequency offset. */ @@ -176,7 +176,7 @@ int fw_gd_setimespreamble(uint32_t preamble); /* Start GPS test */ void fw_gd_startgpstest(uint32_t satellite, uint32_t reserve1, - uint32_t reserve2, uint32_t reserve3); + uint32_t reserve2, uint32_t reserve3); /* Stop GPS test */ @@ -184,13 +184,13 @@ int fw_gd_stopgpstest(void); /* Get GPS test result */ -int fw_gd_getgpstestresult(FAR float *cn, FAR float *doppler); +int fw_gd_getgpstestresult(float *cn, float *doppler); /* Control Spectrum output */ int fw_gd_spectrumcontrol(unsigned long time, unsigned int enable, - unsigned char monipoint1, unsigned char step1, - unsigned char monipoint2, unsigned char step2); + unsigned char monipoint1, unsigned char step1, + unsigned char monipoint2, unsigned char step2); /* Save the backup data to a Flash memory. */ @@ -202,7 +202,7 @@ int fw_gd_cepcheckassistdata(void); /* CEP Get Age Data */ -int fw_gd_cepgetagedata(FAR float *age, FAR float *cepi); +int fw_gd_cepgetagedata(float *age, float *cepi); /* CEP Reset Assist Data init flag & valid flag */ @@ -210,18 +210,18 @@ int fw_gd_cepinitassistdata(void); /* AGPS Set tau */ -int fw_gd_settaugps(FAR double *tau); +int fw_gd_settaugps(double *tau); /* AGPS Set Acquist */ -int fw_gd_setacquist(FAR uint8_t *pacquistdata, uint16_t acquistsize); +int fw_gd_setacquist(uint8_t *pacquistdata, uint16_t acquistsize); /* Set the estimated current time of the receiver. * 1st argument date & time are in GPS time. */ -int fw_gd_settimegps(FAR struct cxd56_gnss_date_s *date, - FAR struct cxd56_gnss_time_s *time); +int fw_gd_settimegps(struct cxd56_gnss_date_s *date, + struct cxd56_gnss_time_s *time); /* Clear Receiver Information */ @@ -229,21 +229,21 @@ int fw_gd_clearreceiverinfo(uint32_t type); /* AGPS Set Tow Assist */ -int fw_gd_settowassist(FAR uint8_t *passistdata, uint16_t datasize); +int fw_gd_settowassist(uint8_t *passistdata, uint16_t datasize); /* AGPS Set UTC Model */ -int fw_gd_setutcmodel(FAR uint8_t *pmodeldata, uint16_t datasize); +int fw_gd_setutcmodel(uint8_t *pmodeldata, uint16_t datasize); /* Read GNSS data to specified buffer */ -int fw_gd_readbuffer(uint8_t type, int32_t offset, FAR void *buf, - uint32_t length); +int fw_gd_readbuffer(uint8_t type, int32_t offset, void *buf, + uint32_t length); /* Write GNSS data from specified buffer */ -int fw_gd_writebuffer(uint8_t type, int32_t offset, FAR void *buf, - uint32_t length); +int fw_gd_writebuffer(uint8_t type, int32_t offset, void *buf, + uint32_t length); /* Set notify mask, this mask flag is cleared when notified(poll/signal) */ @@ -267,8 +267,8 @@ int fw_gd_geodeleteallregion(void); /* Geofence Region check */ -int fw_gd_geogetregiondata(uint8_t id, FAR long *lat, FAR long *lon, - FAR uint16_t *rad); +int fw_gd_geogetregiondata(uint8_t id, long *lat, long *lon, + uint16_t *rad); /* Geofence Get Used Region ID */ @@ -304,11 +304,11 @@ int fw_gd_pvtlogdeletelog(void); /* Pvtlog Get Log status */ -int fw_gd_pvtloggetlogstatus(FAR struct cxd56_gnss_status_s *plogstatus); +int fw_gd_pvtloggetlogstatus(struct cxd56_gnss_status_s *plogstatus); /* Start outputting carrier phase info. */ -int fw_gd_rtkstart(FAR struct cxd56_rtk_setting_s *pparam); +int fw_gd_rtkstart(struct cxd56_rtk_setting_s *pparam); /* Stop outputting carrier phase info. */ @@ -323,7 +323,7 @@ int fw_gd_rtksetoutputinterval(int interval); /* Get output interval of carrier phase info. [ms] */ -int fw_gd_rtkgetoutputinterval(FAR int *interval); +int fw_gd_rtkgetoutputinterval(int *interval); /* Set GNSS of outputting carrier phase info. */ @@ -331,7 +331,7 @@ int fw_gd_rtksetgnss(uint32_t gnss); /* Get GNSS of outputting carrier phase info. */ -int fw_gd_rtkgetgnss(FAR uint32_t *pgnss); +int fw_gd_rtkgetgnss(uint32_t *pgnss); /* Set enable/disable GD to notify updating ephemeris */ @@ -339,7 +339,7 @@ int fw_gd_rtksetephnotify(int enable); /* Get enable/disable GD to notify updating ephemeris */ -int fw_gd_rtkgetephnotify(FAR int *enable); +int fw_gd_rtkgetephnotify(int *enable); /* Set the Ephemeris data Ephemeris data size is variable. */ @@ -348,7 +348,7 @@ int fw_gd_setvarephemeris(uint32_t *ephemeris, uint32_t ephemerissize); /* Get the Ephemeris data Ephemeris data size is variable. */ int fw_gd_getvarephemeris(uint32_t satellite, uint32_t *ephemeris, - uint32_t ephemerissize); + uint32_t ephemerissize); /* Set usecase mode */ diff --git a/arch/arm/src/cxd56xx/cxd56_gpioint.c b/arch/arm/src/cxd56xx/cxd56_gpioint.c index efbe8f876e..7f9e5959b9 100644 --- a/arch/arm/src/cxd56xx/cxd56_gpioint.c +++ b/arch/arm/src/cxd56xx/cxd56_gpioint.c @@ -332,7 +332,7 @@ static bool enabled_irq(int irq) return ((val & (1 << (irq - CXD56_IRQ_EXTINT))) != 0); } -static int gpioint_handler(int irq, FAR void *context, FAR void *arg) +static int gpioint_handler(int irq, void *context, void *arg) { uint32_t val; uint32_t shift; @@ -404,7 +404,7 @@ static int gpioint_handler(int irq, FAR void *context, FAR void *arg) ****************************************************************************/ int cxd56_gpioint_config(uint32_t pin, uint32_t gpiocfg, xcpt_t isr, - FAR void *arg) + void *arg) { int slot; int irq; diff --git a/arch/arm/src/cxd56xx/cxd56_gpioint.h b/arch/arm/src/cxd56xx/cxd56_gpioint.h index 56c1affe7e..38917370d2 100644 --- a/arch/arm/src/cxd56xx/cxd56_gpioint.h +++ b/arch/arm/src/cxd56xx/cxd56_gpioint.h @@ -129,7 +129,7 @@ extern "C" ****************************************************************************/ int cxd56_gpioint_config(uint32_t pin, uint32_t gpiocfg, xcpt_t isr, - FAR void *arg); + void *arg); /**************************************************************************** * Name: cxd56_gpioint_irq diff --git a/arch/arm/src/cxd56xx/cxd56_hostif.c b/arch/arm/src/cxd56xx/cxd56_hostif.c index 7fce69d979..a86db14fb7 100644 --- a/arch/arm/src/cxd56xx/cxd56_hostif.c +++ b/arch/arm/src/cxd56xx/cxd56_hostif.c @@ -109,19 +109,19 @@ struct cxd56_hifdrv_s /* Character driver methods */ -static int hif_open(FAR struct file *filep); -static int hif_close(FAR struct file *filep); -static off_t hif_seek(FAR struct file *filep, off_t offset, +static int hif_open(struct file *filep); +static int hif_close(struct file *filep); +static off_t hif_seek(struct file *filep, off_t offset, int whence); -static ssize_t hif_read(FAR struct file *filep, FAR char *buffer, +static ssize_t hif_read(struct file *filep, char *buffer, size_t len); -static ssize_t hif_write(FAR struct file *filep, - FAR const char *buffer, size_t len); -static int hif_ioctl(FAR struct file *filep, int cmd, +static ssize_t hif_write(struct file *filep, + const char *buffer, size_t len); +static int hif_ioctl(struct file *filep, int cmd, unsigned long arg); -static int hif_poll(FAR struct file *filep, FAR struct pollfd *fds, +static int hif_poll(struct file *filep, struct pollfd *fds, bool setup); -static int hif_unlink(FAR struct inode *inode); +static int hif_unlink(struct inode *inode); /**************************************************************************** * Private Data @@ -187,15 +187,15 @@ static int hif_sendmsg(uint8_t id, void *arg) return ret; } -static int hif_open(FAR struct file *filep) +static int hif_open(struct file *filep) { - FAR struct inode *inode; - FAR struct cxd56_hifdev_s *priv; + struct inode *inode; + struct cxd56_hifdev_s *priv; DEBUGASSERT(filep && filep->f_inode); inode = filep->f_inode; - priv = (FAR struct cxd56_hifdev_s *)inode->i_private; + priv = (struct cxd56_hifdev_s *)inode->i_private; DEBUGASSERT(priv); /* Check parameters */ @@ -243,15 +243,15 @@ static int hif_open(FAR struct file *filep) return OK; } -static int hif_close(FAR struct file *filep) +static int hif_close(struct file *filep) { - FAR struct inode *inode; - FAR struct cxd56_hifdev_s *priv; + struct inode *inode; + struct cxd56_hifdev_s *priv; DEBUGASSERT(filep && filep->f_inode); inode = filep->f_inode; - priv = (FAR struct cxd56_hifdev_s *)inode->i_private; + priv = (struct cxd56_hifdev_s *)inode->i_private; DEBUGASSERT(priv); /* Decrement reference counter */ @@ -266,21 +266,21 @@ static int hif_close(FAR struct file *filep) return OK; } -static off_t hif_seek(FAR struct file *filep, off_t offset, int whence) +static off_t hif_seek(struct file *filep, off_t offset, int whence) { return OK; } -static ssize_t hif_read(FAR struct file *filep, FAR char *buffer, size_t len) +static ssize_t hif_read(struct file *filep, char *buffer, size_t len) { - FAR struct inode *inode; - FAR struct cxd56_hifdev_s *priv; + struct inode *inode; + struct cxd56_hifdev_s *priv; int ret; DEBUGASSERT(filep && filep->f_inode); inode = filep->f_inode; - priv = (FAR struct cxd56_hifdev_s *)inode->i_private; + priv = (struct cxd56_hifdev_s *)inode->i_private; DEBUGASSERT(priv); /* Check parameters */ @@ -302,17 +302,17 @@ static ssize_t hif_read(FAR struct file *filep, FAR char *buffer, size_t len) return ret; } -static ssize_t hif_write(FAR struct file *filep, - FAR const char *buffer, size_t len) +static ssize_t hif_write(struct file *filep, + const char *buffer, size_t len) { - FAR struct inode *inode; - FAR struct cxd56_hifdev_s *priv; + struct inode *inode; + struct cxd56_hifdev_s *priv; int ret; DEBUGASSERT(filep && filep->f_inode); inode = filep->f_inode; - priv = (FAR struct cxd56_hifdev_s *)inode->i_private; + priv = (struct cxd56_hifdev_s *)inode->i_private; DEBUGASSERT(priv); /* Check parameters */ @@ -334,19 +334,19 @@ static ssize_t hif_write(FAR struct file *filep, return ret; } -static int hif_ioctl(FAR struct file *filep, int cmd, unsigned long arg) +static int hif_ioctl(struct file *filep, int cmd, unsigned long arg) { return OK; } -static int hif_poll(FAR struct file *filep, - FAR struct pollfd *fds, bool setup) +static int hif_poll(struct file *filep, + struct pollfd *fds, bool setup) { return OK; } #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS -static int hif_unlink(FAR struct inode *inode) +static int hif_unlink(struct inode *inode) { return OK; } @@ -354,7 +354,7 @@ static int hif_unlink(FAR struct inode *inode) static int hif_rxhandler(int cpuid, int protoid, uint32_t pdata, uint32_t data, - FAR void *userdata) + void *userdata) { struct cxd56_hifdrv_s *drv = &g_hifdrv; diff --git a/arch/arm/src/cxd56xx/cxd56_i2c.c b/arch/arm/src/cxd56xx/cxd56_i2c.c index 105b629a35..165a16c3c1 100644 --- a/arch/arm/src/cxd56xx/cxd56_i2c.c +++ b/arch/arm/src/cxd56xx/cxd56_i2c.c @@ -129,8 +129,8 @@ static struct cxd56_i2cdev_s g_i2c2dev = * Private Functions ****************************************************************************/ -static inline int i2c_takesem(FAR sem_t *sem); -static inline int i2c_givesem(FAR sem_t *sem); +static inline int i2c_takesem(sem_t *sem); +static inline int i2c_givesem(sem_t *sem); static inline uint32_t i2c_reg_read(struct cxd56_i2cdev_s *priv, uint32_t offset); @@ -144,25 +144,25 @@ static inline void i2c_reg_rmw(struct cxd56_i2cdev_s *dev, static int cxd56_i2c_disable(struct cxd56_i2cdev_s *priv); static void cxd56_i2c_enable(struct cxd56_i2cdev_s *priv); -static int cxd56_i2c_interrupt(int irq, FAR void *context, FAR void *arg); +static int cxd56_i2c_interrupt(int irq, void *context, void *arg); static void cxd56_i2c_timeout(wdparm_t arg); static void cxd56_i2c_setfrequency(struct cxd56_i2cdev_s *priv, uint32_t frequency); -static int cxd56_i2c_transfer(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count); +static int cxd56_i2c_transfer(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count); #ifdef CONFIG_I2C_RESET -static int cxd56_i2c_reset(FAR struct i2c_master_s *dev); +static int cxd56_i2c_reset(struct i2c_master_s *dev); #endif #if defined(CONFIG_CXD56_I2C0_SCUSEQ) || defined(CONFIG_CXD56_I2C1_SCUSEQ) -static int cxd56_i2c_transfer_scu(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count); +static int cxd56_i2c_transfer_scu(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count); #endif /**************************************************************************** * Name: i2c_takesem ****************************************************************************/ -static inline int i2c_takesem(FAR sem_t *sem) +static inline int i2c_takesem(sem_t *sem) { return nxsem_wait_uninterruptible(sem); } @@ -171,7 +171,7 @@ static inline int i2c_takesem(FAR sem_t *sem) * Name: i2c_givesem ****************************************************************************/ -static inline int i2c_givesem(FAR sem_t *sem) +static inline int i2c_givesem(sem_t *sem) { return nxsem_post(sem); } @@ -413,9 +413,9 @@ static void cxd56_i2c_drainrxfifo(struct cxd56_i2cdev_s *priv) * ****************************************************************************/ -static int cxd56_i2c_interrupt(int irq, FAR void *context, FAR void *arg) +static int cxd56_i2c_interrupt(int irq, void *context, void *arg) { - FAR struct cxd56_i2cdev_s *priv = (FAR struct cxd56_i2cdev_s *)arg; + struct cxd56_i2cdev_s *priv = (struct cxd56_i2cdev_s *)arg; uint32_t state; int ret; @@ -604,8 +604,8 @@ static int cxd56_i2c_send(struct cxd56_i2cdev_s *priv, int last) * currently guaranteed. ****************************************************************************/ -static int cxd56_i2c_transfer(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count) +static int cxd56_i2c_transfer(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count) { struct cxd56_i2cdev_s *priv = (struct cxd56_i2cdev_s *)dev; int i; @@ -716,7 +716,7 @@ static int cxd56_i2c_transfer(FAR struct i2c_master_s *dev, ****************************************************************************/ #ifdef CONFIG_I2C_RESET -static int cxd56_i2c_reset(FAR struct i2c_master_s *dev) +static int cxd56_i2c_reset(struct i2c_master_s *dev) { return OK; } @@ -821,10 +821,10 @@ static int cxd56_i2c_scusend(int port, int addr, return ret; } -static int cxd56_i2c_transfer_scu(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count) +static int cxd56_i2c_transfer_scu(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count) { - FAR struct cxd56_i2cdev_s *priv = (FAR struct cxd56_i2cdev_s *)dev; + struct cxd56_i2cdev_s *priv = (struct cxd56_i2cdev_s *)dev; ssize_t len = 0; uint8_t *buf = NULL; uint8_t addr = msgs->addr; @@ -1069,7 +1069,7 @@ struct i2c_master_s *cxd56_i2cbus_initialize(int port) * ****************************************************************************/ -int cxd56_i2cbus_uninitialize(FAR struct i2c_master_s *dev) +int cxd56_i2cbus_uninitialize(struct i2c_master_s *dev) { struct cxd56_i2cdev_s *priv = (struct cxd56_i2cdev_s *)dev; diff --git a/arch/arm/src/cxd56xx/cxd56_i2c.h b/arch/arm/src/cxd56xx/cxd56_i2c.h index 773e26704d..d95501e866 100644 --- a/arch/arm/src/cxd56xx/cxd56_i2c.h +++ b/arch/arm/src/cxd56xx/cxd56_i2c.h @@ -59,7 +59,7 @@ extern "C" * ****************************************************************************/ -FAR struct i2c_master_s *cxd56_i2cbus_initialize(int port); +struct i2c_master_s *cxd56_i2cbus_initialize(int port); /**************************************************************************** * Name: cxd56_i2cbus_uninitialize @@ -76,7 +76,7 @@ FAR struct i2c_master_s *cxd56_i2cbus_initialize(int port); * ****************************************************************************/ -int cxd56_i2cbus_uninitialize(FAR struct i2c_master_s *dev); +int cxd56_i2cbus_uninitialize(struct i2c_master_s *dev); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/cxd56xx/cxd56_i2c_bitbang.c b/arch/arm/src/cxd56xx/cxd56_i2c_bitbang.c index c0f3b8af1d..8326a26bcf 100644 --- a/arch/arm/src/cxd56xx/cxd56_i2c_bitbang.c +++ b/arch/arm/src/cxd56xx/cxd56_i2c_bitbang.c @@ -47,15 +47,15 @@ struct cxd56_i2c_bitbang_dev_s * Private Function Prototypes ****************************************************************************/ -static void i2c_bb_initialize(FAR struct i2c_bitbang_lower_dev_s *lower); +static void i2c_bb_initialize(struct i2c_bitbang_lower_dev_s *lower); -static void i2c_bb_set_scl(FAR struct i2c_bitbang_lower_dev_s *lower, +static void i2c_bb_set_scl(struct i2c_bitbang_lower_dev_s *lower, bool high); -static void i2c_bb_set_sda(FAR struct i2c_bitbang_lower_dev_s *lower, +static void i2c_bb_set_sda(struct i2c_bitbang_lower_dev_s *lower, bool high); -static bool i2c_bb_get_scl(FAR struct i2c_bitbang_lower_dev_s *lower); -static bool i2c_bb_get_sda(FAR struct i2c_bitbang_lower_dev_s *lower); +static bool i2c_bb_get_scl(struct i2c_bitbang_lower_dev_s *lower); +static bool i2c_bb_get_sda(struct i2c_bitbang_lower_dev_s *lower); /**************************************************************************** * Private Data @@ -74,7 +74,7 @@ const static struct i2c_bitbang_lower_ops_s g_ops = * Private Functions ****************************************************************************/ -static void i2c_bb_initialize(FAR struct i2c_bitbang_lower_dev_s *lower) +static void i2c_bb_initialize(struct i2c_bitbang_lower_dev_s *lower) { struct cxd56_i2c_bitbang_dev_s *dev = lower->priv; @@ -84,7 +84,7 @@ static void i2c_bb_initialize(FAR struct i2c_bitbang_lower_dev_s *lower) board_gpio_config(dev->sda_pin, 0, true, true, PIN_PULLUP); } -static void i2c_bb_set_scl(FAR struct i2c_bitbang_lower_dev_s *lower, +static void i2c_bb_set_scl(struct i2c_bitbang_lower_dev_s *lower, bool high) { struct cxd56_i2c_bitbang_dev_s *dev = lower->priv; @@ -96,7 +96,7 @@ static void i2c_bb_set_scl(FAR struct i2c_bitbang_lower_dev_s *lower, board_gpio_write(dev->scl_pin, value); } -static void i2c_bb_set_sda(FAR struct i2c_bitbang_lower_dev_s *lower, +static void i2c_bb_set_sda(struct i2c_bitbang_lower_dev_s *lower, bool high) { struct cxd56_i2c_bitbang_dev_s *dev = lower->priv; @@ -108,14 +108,14 @@ static void i2c_bb_set_sda(FAR struct i2c_bitbang_lower_dev_s *lower, board_gpio_write(dev->sda_pin, value); } -static bool i2c_bb_get_scl(FAR struct i2c_bitbang_lower_dev_s *lower) +static bool i2c_bb_get_scl(struct i2c_bitbang_lower_dev_s *lower) { struct cxd56_i2c_bitbang_dev_s *dev = lower->priv; return board_gpio_read(dev->scl_pin); } -static bool i2c_bb_get_sda(FAR struct i2c_bitbang_lower_dev_s *lower) +static bool i2c_bb_get_sda(struct i2c_bitbang_lower_dev_s *lower) { struct cxd56_i2c_bitbang_dev_s *dev = lower->priv; diff --git a/arch/arm/src/cxd56xx/cxd56_icc.c b/arch/arm/src/cxd56xx/cxd56_icc.c index b2c2c5ed0f..fe72812f0e 100644 --- a/arch/arm/src/cxd56xx/cxd56_icc.c +++ b/arch/arm/src/cxd56xx/cxd56_icc.c @@ -107,7 +107,7 @@ struct iccdev_s cxd56_iccsighandler_t sighandler; } u; - FAR void *userdata; + void *userdata; sem_t rxwait; struct wdog_s rxtimeout; @@ -117,7 +117,7 @@ struct iccdev_s int signo; pid_t pid; - FAR void *sigdata; + void *sigdata; struct sq_queue_s recvq; struct sq_queue_s freelist; @@ -129,9 +129,9 @@ struct iccdev_s ****************************************************************************/ static int icc_sighandler(int cpuid, int protoid, uint32_t pdata, - uint32_t data, FAR void *userdata); + uint32_t data, void *userdata); static int icc_msghandler(int cpuid, int protoid, uint32_t pdata, - uint32_t data, FAR void *userdata); + uint32_t data, void *userdata); static int icc_irqhandler(int cpuid, uint32_t word[2]); /**************************************************************************** @@ -160,7 +160,7 @@ static void icc_semgive(sem_t *semid) nxsem_post(semid); } -static FAR struct iccdev_s *icc_getprotocol(int protoid) +static struct iccdev_s *icc_getprotocol(int protoid) { if (protoid < 0 || protoid >= NPROTOCOLS) { @@ -170,7 +170,7 @@ static FAR struct iccdev_s *icc_getprotocol(int protoid) return g_protocol[protoid]; } -static FAR struct iccdev_s *icc_getcpu(int cpuid) +static struct iccdev_s *icc_getcpu(int cpuid) { if (cpuid < 0 || cpuid >= NCPUS) { @@ -182,8 +182,8 @@ static FAR struct iccdev_s *icc_getcpu(int cpuid) static int icc_irqhandler(int cpuid, uint32_t word[2]) { - FAR struct iccdev_s *priv; - FAR struct iccreq_s *req; + struct iccdev_s *priv; + struct iccreq_s *req; int protoid; protoid = GET_PROTOCOLID(word); @@ -222,7 +222,7 @@ static int icc_irqhandler(int cpuid, uint32_t word[2]) } } - req = (FAR struct iccreq_s *)sq_remfirst(&priv->freelist); + req = (struct iccreq_s *)sq_remfirst(&priv->freelist); if (!req) { iccerr("Receive buffer is full.\n"); @@ -232,7 +232,7 @@ static int icc_irqhandler(int cpuid, uint32_t word[2]) req->word[0] = word[0]; req->word[1] = word[1]; - sq_addlast((FAR sq_entry_t *)req, &priv->recvq); + sq_addlast((sq_entry_t *)req, &priv->recvq); icc_semgive(&priv->rxwait); @@ -252,9 +252,9 @@ static int icc_irqhandler(int cpuid, uint32_t word[2]) } static int icc_sighandler(int cpuid, int protoid, uint32_t pdata, - uint32_t data, FAR void *userdata) + uint32_t data, void *userdata) { - FAR struct iccdev_s *priv = icc_getcpu(cpuid); + struct iccdev_s *priv = icc_getcpu(cpuid); if (!priv) { @@ -282,7 +282,7 @@ static int icc_sighandler(int cpuid, int protoid, uint32_t pdata, } static int icc_msghandler(int cpuid, int protoid, uint32_t pdata, - uint32_t data, FAR void *userdata) + uint32_t data, void *userdata) { /* Do nothing. This handler used for reserve MSG protocol handler. * This handler returns -1 to indicate not consumed the passed @@ -294,13 +294,13 @@ static int icc_msghandler(int cpuid, int protoid, uint32_t pdata, static void icc_rxtimeout(wdparm_t arg) { - FAR struct iccdev_s *priv = (FAR struct iccdev_s *)arg; + struct iccdev_s *priv = (struct iccdev_s *)arg; icc_semgive(&priv->rxwait); } -static int icc_recv(FAR struct iccdev_s *priv, FAR iccmsg_t *msg, int32_t ms) +static int icc_recv(struct iccdev_s *priv, iccmsg_t *msg, int32_t ms) { - FAR struct iccreq_s *req; + struct iccreq_s *req; irqstate_t flags; int ret = OK; @@ -330,7 +330,7 @@ static int icc_recv(FAR struct iccdev_s *priv, FAR iccmsg_t *msg, int32_t ms) } flags = enter_critical_section(); - req = (FAR struct iccreq_s *)sq_remfirst(&priv->recvq); + req = (struct iccreq_s *)sq_remfirst(&priv->recvq); if (req) { @@ -338,7 +338,7 @@ static int icc_recv(FAR struct iccdev_s *priv, FAR iccmsg_t *msg, int32_t ms) msg->data = req->msg.data; msg->cpuid = req->msg.cpuid; msg->protodata = req->msg.pdata; - sq_addlast((FAR sq_entry_t *)req, &priv->freelist); + sq_addlast((sq_entry_t *)req, &priv->freelist); } else { @@ -350,9 +350,9 @@ static int icc_recv(FAR struct iccdev_s *priv, FAR iccmsg_t *msg, int32_t ms) return ret; } -static FAR struct iccdev_s *icc_devnew(void) +static struct iccdev_s *icc_devnew(void) { - FAR struct iccdev_s *priv; + struct iccdev_s *priv; int i; priv = (struct iccdev_s *)kmm_malloc(sizeof(struct iccdev_s)); @@ -373,7 +373,7 @@ static FAR struct iccdev_s *icc_devnew(void) for (i = 0; i < NBUFFERS; i++) { - sq_addlast((FAR sq_entry_t *)&priv->pool[i], &priv->freelist); + sq_addlast((sq_entry_t *)&priv->pool[i], &priv->freelist); } priv->pid = INVALID_PROCESS_ID; @@ -381,7 +381,7 @@ static FAR struct iccdev_s *icc_devnew(void) return priv; } -static void icc_devfree(FAR struct iccdev_s *priv) +static void icc_devfree(struct iccdev_s *priv) { wd_cancel(&priv->rxtimeout); kmm_free(priv); @@ -392,9 +392,9 @@ static void icc_devfree(FAR struct iccdev_s *priv) ****************************************************************************/ int cxd56_iccregisterhandler(int protoid, cxd56_icchandler_t handler, - FAR void *data) + void *data) { - FAR struct iccdev_s *priv; + struct iccdev_s *priv; irqstate_t flags; int ret = OK; @@ -416,9 +416,9 @@ int cxd56_iccregisterhandler(int protoid, cxd56_icchandler_t handler, } int cxd56_iccregistersighandler(int cpuid, cxd56_iccsighandler_t handler, - FAR void *data) + void *data) { - FAR struct iccdev_s *priv; + struct iccdev_s *priv; irqstate_t flags; int ret = OK; @@ -439,9 +439,9 @@ int cxd56_iccregistersighandler(int cpuid, cxd56_iccsighandler_t handler, return ret; } -int cxd56_iccsend(int protoid, FAR iccmsg_t *msg, int32_t ms) +int cxd56_iccsend(int protoid, iccmsg_t *msg, int32_t ms) { - FAR struct iccdev_s *priv; + struct iccdev_s *priv; struct iccreq_s req; if (!msg) @@ -466,14 +466,14 @@ int cxd56_iccsend(int protoid, FAR iccmsg_t *msg, int32_t ms) return cxd56_cfpush(req.word); } -int cxd56_iccsendmsg(FAR iccmsg_t *msg, int32_t ms) +int cxd56_iccsendmsg(iccmsg_t *msg, int32_t ms) { return cxd56_iccsend(CXD56_PROTO_MSG, msg, ms); } -int cxd56_iccrecv(int protoid, FAR iccmsg_t *msg, int32_t ms) +int cxd56_iccrecv(int protoid, iccmsg_t *msg, int32_t ms) { - FAR struct iccdev_s *priv; + struct iccdev_s *priv; if (!msg) { @@ -489,9 +489,9 @@ int cxd56_iccrecv(int protoid, FAR iccmsg_t *msg, int32_t ms) return icc_recv(priv, msg, ms); } -int cxd56_iccrecvmsg(FAR iccmsg_t *msg, int32_t ms) +int cxd56_iccrecvmsg(iccmsg_t *msg, int32_t ms) { - FAR struct iccdev_s *priv; + struct iccdev_s *priv; if (!msg) { @@ -526,9 +526,9 @@ int cxd56_iccsignal(int8_t cpuid, int8_t signo, int16_t sigdata, return cxd56_cfpush(req.word); } -int cxd56_iccnotify(int cpuid, int signo, FAR void *sigdata) +int cxd56_iccnotify(int cpuid, int signo, void *sigdata) { - FAR struct iccdev_s *priv; + struct iccdev_s *priv; priv = icc_getcpu(cpuid); if (!priv) @@ -545,7 +545,7 @@ int cxd56_iccnotify(int cpuid, int signo, FAR void *sigdata) int cxd56_iccinit(int protoid) { - FAR struct iccdev_s *priv; + struct iccdev_s *priv; if (protoid < 0 || protoid >= NPROTOCOLS) { @@ -570,7 +570,7 @@ int cxd56_iccinit(int protoid) int cxd56_iccinitmsg(int cpuid) { - FAR struct iccdev_s *priv; + struct iccdev_s *priv; if (cpuid < 0 || cpuid >= NCPUS) { @@ -595,7 +595,7 @@ int cxd56_iccinitmsg(int cpuid) void cxd56_iccuninit(int protoid) { - FAR struct iccdev_s *priv; + struct iccdev_s *priv; irqstate_t flags; if (protoid < 0 || protoid >= NPROTOCOLS) @@ -616,7 +616,7 @@ void cxd56_iccuninit(int protoid) void cxd56_iccuninitmsg(int cpuid) { - FAR struct iccdev_s *priv; + struct iccdev_s *priv; irqstate_t flags; if (cpuid < 0 || cpuid >= NCPUS) diff --git a/arch/arm/src/cxd56xx/cxd56_icc.h b/arch/arm/src/cxd56xx/cxd56_icc.h index 59d9ed0737..b4cc6d413b 100644 --- a/arch/arm/src/cxd56xx/cxd56_icc.h +++ b/arch/arm/src/cxd56xx/cxd56_icc.h @@ -38,9 +38,9 @@ #define CXD56_PROTO_SIG 15 /* Inter-CPU Comm signal */ typedef int (*cxd56_icchandler_t)(int cpuid, int protoid, uint32_t pdata, - uint32_t data, FAR void *userdata); + uint32_t data, void *userdata); typedef int (*cxd56_iccsighandler_t)(int8_t signo, uint16_t sigdata, - uint32_t data, FAR void *userdata); + uint32_t data, void *userdata); struct cxd56_iccmsg_s { @@ -65,16 +65,16 @@ int cxd56_iccinitmsg(int cpuid); void cxd56_iccuninit(int protoid); void cxd56_iccuninitmsg(int cpuid); int cxd56_iccregisterhandler(int protoid, cxd56_icchandler_t handler, - FAR void *data); + void *data); int cxd56_iccregistersighandler(int cpuid, cxd56_iccsighandler_t handler, - FAR void *data); -int cxd56_iccsend(int protoid, FAR iccmsg_t *msg, int32_t ms); -int cxd56_iccrecv(int protoid, FAR iccmsg_t *msg, int32_t ms); -int cxd56_iccsendmsg(FAR iccmsg_t *msg, int32_t ms); -int cxd56_iccrecvmsg(FAR iccmsg_t *msg, int32_t ms); + void *data); +int cxd56_iccsend(int protoid, iccmsg_t *msg, int32_t ms); +int cxd56_iccrecv(int protoid, iccmsg_t *msg, int32_t ms); +int cxd56_iccsendmsg(iccmsg_t *msg, int32_t ms); +int cxd56_iccrecvmsg(iccmsg_t *msg, int32_t ms); int cxd56_iccsignal(int8_t cpuid, int8_t signo, int16_t sigdata, uint32_t data); -int cxd56_iccnotify(int cpuid, int signo, FAR void *sigdata); +int cxd56_iccnotify(int cpuid, int signo, void *sigdata); void cxd56_iccinitialize(void); diff --git a/arch/arm/src/cxd56xx/cxd56_irq.c b/arch/arm/src/cxd56xx/cxd56_irq.c index 093fe092c3..236d1c9a3c 100644 --- a/arch/arm/src/cxd56xx/cxd56_irq.c +++ b/arch/arm/src/cxd56xx/cxd56_irq.c @@ -184,7 +184,7 @@ static void cxd56_dumpnvic(const char *msg, int irq) ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -static int cxd56_nmi(int irq, FAR void *context, FAR void *arg) +static int cxd56_nmi(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! NMI received\n"); @@ -192,7 +192,7 @@ static int cxd56_nmi(int irq, FAR void *context, FAR void *arg) return 0; } -static int cxd56_busfault(int irq, FAR void *context, FAR void *arg) +static int cxd56_busfault(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Bus fault received\n"); @@ -200,7 +200,7 @@ static int cxd56_busfault(int irq, FAR void *context, FAR void *arg) return 0; } -static int cxd56_usagefault(int irq, FAR void *context, FAR void *arg) +static int cxd56_usagefault(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Usage fault received\n"); @@ -208,7 +208,7 @@ static int cxd56_usagefault(int irq, FAR void *context, FAR void *arg) return 0; } -static int cxd56_pendsv(int irq, FAR void *context, FAR void *arg) +static int cxd56_pendsv(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! PendSV received\n"); @@ -216,7 +216,7 @@ static int cxd56_pendsv(int irq, FAR void *context, FAR void *arg) return 0; } -static int cxd56_dbgmonitor(int irq, FAR void *context, FAR void *arg) +static int cxd56_dbgmonitor(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Debug Monitor received\n"); @@ -224,7 +224,7 @@ static int cxd56_dbgmonitor(int irq, FAR void *context, FAR void *arg) return 0; } -static int cxd56_reserved(int irq, FAR void *context, FAR void *arg) +static int cxd56_reserved(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Reserved interrupt\n"); diff --git a/arch/arm/src/cxd56xx/cxd56_pmic.c b/arch/arm/src/cxd56xx/cxd56_pmic.c index d6d1d833c4..5ff43da93a 100644 --- a/arch/arm/src/cxd56xx/cxd56_pmic.c +++ b/arch/arm/src/cxd56xx/cxd56_pmic.c @@ -768,7 +768,7 @@ error: * ****************************************************************************/ -int cxd56_pmic_get_gauge(FAR struct pmic_gauge_s *gauge) +int cxd56_pmic_get_gauge(struct pmic_gauge_s *gauge) { return fw_pm_pmiccontrol(PMIC_CMD_AFE, gauge); } @@ -787,7 +787,7 @@ int cxd56_pmic_get_gauge(FAR struct pmic_gauge_s *gauge) * ****************************************************************************/ -int cxd56_pmic_getlowervol(FAR int *voltage) +int cxd56_pmic_getlowervol(int *voltage) { return fw_pm_pmiccontrol(PMIC_CMD_GETVSYS, voltage); } @@ -825,7 +825,7 @@ int cxd56_pmic_setlowervol(int voltage) * ****************************************************************************/ -int cxd56_pmic_getnotifyvol(FAR int *voltage) +int cxd56_pmic_getnotifyvol(int *voltage) { return fw_pm_pmiccontrol(PMIC_CMD_GETPREVSYS, voltage); } @@ -863,7 +863,7 @@ int cxd56_pmic_setnotifyvol(int voltage) * ****************************************************************************/ -int cxd56_pmic_getchargevol(FAR int *voltage) +int cxd56_pmic_getchargevol(int *voltage) { int val; int ret; @@ -942,7 +942,7 @@ int cxd56_pmic_setchargevol(int voltage) * ****************************************************************************/ -int cxd56_pmic_getchargecurrent(FAR int *current) +int cxd56_pmic_getchargecurrent(int *current) { int val; int ret; @@ -1032,7 +1032,7 @@ int cxd56_pmic_setchargecurrent(int current) * ****************************************************************************/ -int cxd56_pmic_getporttype(FAR int *porttype) +int cxd56_pmic_getporttype(int *porttype) { return fw_pm_pmiccontrol(PMIC_CMD_GET_USB_PORT_TYPE, porttype); } @@ -1134,7 +1134,7 @@ int cxd56_pmic_setrechargevol(int mv) * ****************************************************************************/ -int cxd56_pmic_getrechargevol(FAR int *mv) +int cxd56_pmic_getrechargevol(int *mv) { int val; int ret; @@ -1236,7 +1236,7 @@ int cxd56_pmic_setchargecompcurrent(int current) * ****************************************************************************/ -int cxd56_pmic_getchargecompcurrent(FAR int *current) +int cxd56_pmic_getchargecompcurrent(int *current) { int val; int ret; @@ -1295,7 +1295,7 @@ int cxd56_pmic_getchargecompcurrent(FAR int *current) * ****************************************************************************/ -int cxd56_pmic_gettemptable(FAR struct pmic_temp_table_s *table) +int cxd56_pmic_gettemptable(struct pmic_temp_table_s *table) { /* SET_T60 (70h) - SET_T0_2 (78h) */ @@ -1317,7 +1317,7 @@ int cxd56_pmic_gettemptable(FAR struct pmic_temp_table_s *table) * ****************************************************************************/ -int cxd56_pmic_settemptable(FAR struct pmic_temp_table_s *table) +int cxd56_pmic_settemptable(struct pmic_temp_table_s *table) { return fw_pm_pmiccontrol(PMIC_CMD_SET_CHG_TEMPERATURE_TABLE, table); } @@ -1394,7 +1394,7 @@ int cxd56_pmic_setchargemode(int low, int high) * ****************************************************************************/ -int cxd56_pmic_getchargemode(FAR int *low, FAR int *high) +int cxd56_pmic_getchargemode(int *low, int *high) { struct pmic_temp_mode_s arg; int ret; @@ -1416,22 +1416,22 @@ int cxd56_pmic_getchargemode(FAR int *low, FAR int *high) * Battery monitor for debug ****************************************************************************/ -int cxd56_pmic_monitor_enable(FAR struct pmic_mon_s *ptr) +int cxd56_pmic_monitor_enable(struct pmic_mon_s *ptr) { return fw_pm_pmiccontrol(PMIC_CMD_POWER_MONITOR_ENABLE, ptr); } -int cxd56_pmic_monitor_status(FAR struct pmic_mon_status_s *ptr) +int cxd56_pmic_monitor_status(struct pmic_mon_status_s *ptr) { return fw_pm_pmiccontrol(PMIC_CMD_POWER_MONITOR_STATUS, ptr); } -int cxd56_pmic_monitor_set(FAR struct pmic_mon_set_s *ptr) +int cxd56_pmic_monitor_set(struct pmic_mon_set_s *ptr) { return fw_pm_pmiccontrol(PMIC_CMD_POWER_MONITOR_SET, ptr); } -int cxd56_pmic_monitor_get(FAR struct pmic_mon_log_s *ptr) +int cxd56_pmic_monitor_get(struct pmic_mon_log_s *ptr) { return fw_pm_pmiccontrol(PMIC_CMD_POWER_MONITOR_GET, ptr); } diff --git a/arch/arm/src/cxd56xx/cxd56_pmic.h b/arch/arm/src/cxd56xx/cxd56_pmic.h index dd036dd356..5349ba81ad 100644 --- a/arch/arm/src/cxd56xx/cxd56_pmic.h +++ b/arch/arm/src/cxd56xx/cxd56_pmic.h @@ -171,7 +171,7 @@ struct pmic_mon_rec_s struct pmic_mon_log_s { - FAR struct pmic_monitor_rec_s *rec; + struct pmic_monitor_rec_s *rec; int index; int size; }; @@ -214,7 +214,7 @@ extern "C" * ****************************************************************************/ -int cxd56_pmic_get_interrupt_status(FAR uint8_t *status); +int cxd56_pmic_get_interrupt_status(uint8_t *status); /**************************************************************************** * Name: cxd56_pmic_set_gpo_reg @@ -242,8 +242,8 @@ int cxd56_pmic_get_interrupt_status(FAR uint8_t *status); * ****************************************************************************/ -int cxd56_pmic_set_gpo_reg(FAR uint8_t *setbit0, FAR uint8_t *clrbit0, - FAR uint8_t *setbit1, FAR uint8_t *clrbit1); +int cxd56_pmic_set_gpo_reg(uint8_t *setbit0, uint8_t *clrbit0, + uint8_t *setbit1, uint8_t *clrbit1); /**************************************************************************** * Name: cxd56_pmic_set_gpo @@ -333,7 +333,7 @@ int cxd56_pmic_get_gpo_hiz(uint8_t chset); * ****************************************************************************/ -int cxd56_pmic_set_loadswitch_reg(FAR uint8_t *setbit, FAR uint8_t *clrbit); +int cxd56_pmic_set_loadswitch_reg(uint8_t *setbit, uint8_t *clrbit); /**************************************************************************** * Name: cxd56_pmic_set_loadswitch @@ -393,7 +393,7 @@ bool cxd56_pmic_get_loadswitch(uint8_t chset); * ****************************************************************************/ -int cxd56_pmic_set_ddc_ldo_reg(FAR uint8_t *setbit, FAR uint8_t *clrbit); +int cxd56_pmic_set_ddc_ldo_reg(uint8_t *setbit, uint8_t *clrbit); /**************************************************************************** * Name: cxd56_pmic_set_ddc_ldo @@ -444,7 +444,7 @@ bool cxd56_pmic_get_ddc_ldo(uint8_t chset); * ****************************************************************************/ -int cxd56_pmic_get_gauge(FAR struct pmic_gauge_s *gauge); +int cxd56_pmic_get_gauge(struct pmic_gauge_s *gauge); /**************************************************************************** * Name: cxd56_pmic_getlowervol @@ -460,7 +460,7 @@ int cxd56_pmic_get_gauge(FAR struct pmic_gauge_s *gauge); * ****************************************************************************/ -int cxd56_pmic_getlowervol(FAR int *voltage); +int cxd56_pmic_getlowervol(int *voltage); /**************************************************************************** * Name: cxd56_pmic_setlowervol @@ -492,7 +492,7 @@ int cxd56_pmic_setlowervol(int voltage); * ****************************************************************************/ -int cxd56_pmic_getnotifyvol(FAR int *voltage); +int cxd56_pmic_getnotifyvol(int *voltage); /**************************************************************************** * Name: cxd56_pmic_setnotifyvol @@ -524,7 +524,7 @@ int cxd56_pmic_setnotifyvol(int voltage); * ****************************************************************************/ -int cxd56_pmic_getchargevol(FAR int *voltage); +int cxd56_pmic_getchargevol(int *voltage); /**************************************************************************** * Name: cxd56_pmic_setchargevol @@ -557,7 +557,7 @@ int cxd56_pmic_setchargevol(int voltage); * ****************************************************************************/ -int cxd56_pmic_getchargecurrent(FAR int *current); +int cxd56_pmic_getchargecurrent(int *current); /**************************************************************************** * Name: cxd56_pmic_setchargecurrent @@ -590,7 +590,7 @@ int cxd56_pmic_setchargecurrent(int current); * ****************************************************************************/ -int cxd56_pmic_getporttype(FAR int *porttype); +int cxd56_pmic_getporttype(int *porttype); /**************************************************************************** * Name: cxd56_pmic_getchargestate @@ -606,7 +606,7 @@ int cxd56_pmic_getporttype(FAR int *porttype); * ****************************************************************************/ -int cxd56_pmic_getchargestate(FAR uint8_t *state); +int cxd56_pmic_getchargestate(uint8_t *state); /**************************************************************************** * Name: cxd56_pmic_setrechargevol @@ -640,7 +640,7 @@ int cxd56_pmic_setrechargevol(int mv); * ****************************************************************************/ -int cxd56_pmic_getrechargevol(FAR int *mv); +int cxd56_pmic_getrechargevol(int *mv); /**************************************************************************** * Name: cxd56_pmic_setchargecompcurrent @@ -672,7 +672,7 @@ int cxd56_pmic_setchargecompcurrent(int current); * ****************************************************************************/ -int cxd56_pmic_getchargecompcurrent(FAR int *current); +int cxd56_pmic_getchargecompcurrent(int *current); /**************************************************************************** * Name: cxd56_pmic_gettemptable @@ -689,7 +689,7 @@ int cxd56_pmic_getchargecompcurrent(FAR int *current); * ****************************************************************************/ -int cxd56_pmic_gettemptable(FAR struct pmic_temp_table_s *table); +int cxd56_pmic_gettemptable(struct pmic_temp_table_s *table); /**************************************************************************** * Name: cxd56_pmic_settemptable @@ -706,7 +706,7 @@ int cxd56_pmic_gettemptable(FAR struct pmic_temp_table_s *table); * ****************************************************************************/ -int cxd56_pmic_settemptable(FAR struct pmic_temp_table_s *table); +int cxd56_pmic_settemptable(struct pmic_temp_table_s *table); /**************************************************************************** * Name: cxd56_pmic_setchargemode @@ -748,7 +748,7 @@ int cxd56_pmic_setchargemode(int low, int high); * ****************************************************************************/ -int cxd56_pmic_getchargemode(FAR int *low, FAR int *high); +int cxd56_pmic_getchargemode(int *low, int *high); /**************************************************************************** * Name: cxd56_pmic_read @@ -766,7 +766,7 @@ int cxd56_pmic_getchargemode(FAR int *low, FAR int *high); * ****************************************************************************/ -int cxd56_pmic_read(uint8_t addr, FAR void *buf, uint32_t size); +int cxd56_pmic_read(uint8_t addr, void *buf, uint32_t size); /**************************************************************************** * Name: cxd56_pmic_write @@ -784,17 +784,17 @@ int cxd56_pmic_read(uint8_t addr, FAR void *buf, uint32_t size); * ****************************************************************************/ -int cxd56_pmic_write(uint8_t addr, FAR void *buf, uint32_t size); +int cxd56_pmic_write(uint8_t addr, void *buf, uint32_t size); /**************************************************************************** * Battery monitor for debug ****************************************************************************/ #ifdef CONFIG_CXD56_PMIC_BATMONITOR -int cxd56_pmic_monitor_enable(FAR struct pmic_mon_s *ptr); -int cxd56_pmic_monitor_status(FAR struct pmic_mon_status_s *ptr); -int cxd56_pmic_monitor_set(FAR struct pmic_mon_set_s *ptr); -int cxd56_pmic_monitor_get(FAR struct pmic_mon_log_s *ptr); +int cxd56_pmic_monitor_enable(struct pmic_mon_s *ptr); +int cxd56_pmic_monitor_status(struct pmic_mon_status_s *ptr); +int cxd56_pmic_monitor_set(struct pmic_mon_set_s *ptr); +int cxd56_pmic_monitor_get(struct pmic_mon_log_s *ptr); #else #define cxd56_pmic_monitor_enable(ptr) #define cxd56_pmic_monitor_status(ptr) diff --git a/arch/arm/src/cxd56xx/cxd56_powermgr.c b/arch/arm/src/cxd56xx/cxd56_powermgr.c index 1a9e2a4718..38fa33a818 100644 --- a/arch/arm/src/cxd56xx/cxd56_powermgr.c +++ b/arch/arm/src/cxd56xx/cxd56_powermgr.c @@ -145,20 +145,20 @@ struct pm_cbentry_s ****************************************************************************/ static int cxd56_pm_do_callback(uint8_t id, - FAR struct cxd56_pm_target_id_s *table); + struct cxd56_pm_target_id_s *table); static int cxd56_pm_needcallback(uint32_t target, - FAR struct cxd56_pm_target_id_s *table); + struct cxd56_pm_target_id_s *table); static void cxd56_pm_clkchange(struct cxd56_pm_message_s *message); -static int cxd56_pm_semtake(FAR sem_t *id); +static int cxd56_pm_semtake(sem_t *id); static void cxd56_pm_checkfreqlock(void); -static int cxd56_pm_maintask(int argc, FAR char *argv[]); +static int cxd56_pm_maintask(int argc, char *argv[]); #if defined(CONFIG_CXD56_HOT_SLEEP) static void cxd56_pm_do_hotsleep(uint32_t idletime); static void cxd56_pm_intc_suspend(void); static void cxd56_pm_intc_resume(void); #endif static int cxd56_pmmsghandler(int cpuid, int protoid, uint32_t pdata, - uint32_t data, FAR void *userdata); + uint32_t data, void *userdata); /**************************************************************************** * Private Data @@ -179,7 +179,7 @@ static int g_freqlock_flag; static struct pm_cpu_wakelock_s g_wlock = PM_CPUWAKELOCK_INIT(PM_CPUWAKELOCK_TAG('P', 'M', 0)); -static int cxd56_pm_semtake(FAR sem_t *id) +static int cxd56_pm_semtake(sem_t *id) { return nxsem_wait_uninterruptible(id); } @@ -189,7 +189,7 @@ static int cxd56_pm_semtake(FAR sem_t *id) ****************************************************************************/ static int cxd56_pm_needcallback(uint32_t target, - FAR struct cxd56_pm_target_id_s *table) + struct cxd56_pm_target_id_s *table) { uint32_t mask; @@ -234,14 +234,14 @@ static int cxd56_pmsendmsg(int mid, uint32_t data) static int cxd56_pm_do_callback(uint8_t id, struct cxd56_pm_target_id_s *targets) { - FAR struct pm_cbentry_s *entry; - FAR dq_entry_t *cur; - FAR dq_entry_t *last; + struct pm_cbentry_s *entry; + dq_entry_t *cur; + dq_entry_t *last; int ret = 0; for (cur = dq_peek(&g_cbqueue); cur; cur = dq_next(cur)) { - entry = (FAR struct pm_cbentry_s *)cur; + entry = (struct pm_cbentry_s *)cur; last = cur; if (cxd56_pm_needcallback(entry->target, targets)) { @@ -273,7 +273,7 @@ static int cxd56_pm_do_callback(uint8_t id, for (cur = dq_peek(&g_cbqueue); cur != last; cur = dq_next(cur)) { - entry = (FAR struct pm_cbentry_s *)cur; + entry = (struct pm_cbentry_s *)cur; if (cxd56_pm_needcallback(entry->target, targets)) { entry->callback(id); @@ -322,13 +322,13 @@ static void cxd56_pm_clkchange(struct cxd56_pm_message_s *message) static void cxd56_pm_checkfreqlock(void) { - FAR sq_entry_t *entry; - FAR struct pm_cpu_freqlock_s *lock; + sq_entry_t *entry; + struct pm_cpu_freqlock_s *lock; int flag = PM_CPUFREQLOCK_FLAG_INITIALIZED; for (entry = sq_peek(&g_freqlockqueue); entry; entry = sq_next(entry)) { - lock = (FAR struct pm_cpu_freqlock_s *)entry; + lock = (struct pm_cpu_freqlock_s *)entry; flag |= lock->flag & PM_CPUFREQLOCK_FLAG_LV; flag |= lock->flag & PM_CPUFREQLOCK_FLAG_HV; } @@ -424,7 +424,7 @@ static void cxd56_pm_do_hotsleep(uint32_t idletime) } #endif -static int cxd56_pm_maintask(int argc, FAR char *argv[]) +static int cxd56_pm_maintask(int argc, char *argv[]) { struct cxd56_pm_message_s message; struct mq_attr attr; @@ -457,7 +457,7 @@ static int cxd56_pm_maintask(int argc, FAR char *argv[]) while (1) { - size = file_mq_receive(&g_queuedesc, (FAR char *)&message, + size = file_mq_receive(&g_queuedesc, (char *)&message, sizeof(message), NULL); if (size == sizeof(message)) { @@ -481,7 +481,7 @@ static int cxd56_pm_maintask(int argc, FAR char *argv[]) return EXIT_SUCCESS; } -FAR void *cxd56_pm_register_callback(uint32_t target, +void *cxd56_pm_register_callback(uint32_t target, cxd56_pm_callback callback) { struct pm_cbentry_s *entry = NULL; @@ -498,24 +498,24 @@ FAR void *cxd56_pm_register_callback(uint32_t target, entry->target = target; entry->callback = callback; - dq_addlast((FAR dq_entry_t *)entry, &g_cbqueue); + dq_addlast((dq_entry_t *)entry, &g_cbqueue); nxsem_post(&g_regcblock); return (void *)entry; } -void cxd56_pm_unregister_callback(FAR void *handle) +void cxd56_pm_unregister_callback(void *handle) { cxd56_pm_semtake(&g_regcblock); - dq_rem((FAR dq_entry_t *)handle, &g_cbqueue); + dq_rem((dq_entry_t *)handle, &g_cbqueue); kmm_free(handle); nxsem_post(&g_regcblock); } static int cxd56_pmmsghandler(int cpuid, int protoid, uint32_t pdata, - uint32_t data, FAR void *userdata) + uint32_t data, void *userdata) { uint32_t msgid; struct cxd56_pm_message_s message; @@ -526,7 +526,7 @@ static int cxd56_pmmsghandler(int cpuid, int protoid, uint32_t pdata, if (msgid == MSGID_CLK_CHG_START) { message.mid = MQMSG_CLK_CHG_START; - ret = file_mq_send(&g_queuedesc, (FAR const char *)&message, + ret = file_mq_send(&g_queuedesc, (const char *)&message, sizeof(message), CXD56_PM_MESSAGE_PRIO); if (ret < 0) { @@ -536,7 +536,7 @@ static int cxd56_pmmsghandler(int cpuid, int protoid, uint32_t pdata, else if (msgid == MSGID_CLK_CHG_END) { message.mid = MQMSG_CLK_CHG_END; - ret = file_mq_send(&g_queuedesc, (FAR const char *)&message, + ret = file_mq_send(&g_queuedesc, (const char *)&message, sizeof(message), CXD56_PM_MESSAGE_PRIO); if (ret < 0) { @@ -577,7 +577,7 @@ int cxd56_pm_bootup(void) void up_pm_acquire_freqlock(struct pm_cpu_freqlock_s *lock) { - FAR sq_entry_t *entry; + sq_entry_t *entry; DEBUGASSERT(lock); @@ -602,7 +602,7 @@ void up_pm_acquire_freqlock(struct pm_cpu_freqlock_s *lock) if (!entry) { - sq_addlast((FAR sq_entry_t *)lock, &g_freqlockqueue); + sq_addlast((sq_entry_t *)lock, &g_freqlockqueue); cxd56_pm_checkfreqlock(); } @@ -627,7 +627,7 @@ void up_pm_acquire_freqlock(struct pm_cpu_freqlock_s *lock) void up_pm_release_freqlock(struct pm_cpu_freqlock_s *lock) { - FAR sq_entry_t *entry; + sq_entry_t *entry; DEBUGASSERT(lock); @@ -678,7 +678,7 @@ exit: int up_pm_get_freqlock_count(struct pm_cpu_freqlock_s *lock) { - FAR sq_entry_t *entry; + sq_entry_t *entry; int count = 0; DEBUGASSERT(lock); @@ -713,7 +713,7 @@ int up_pm_get_freqlock_count(struct pm_cpu_freqlock_s *lock) void up_pm_acquire_wakelock(struct pm_cpu_wakelock_s *lock) { irqstate_t flags; - FAR sq_entry_t *entry; + sq_entry_t *entry; DEBUGASSERT(lock); @@ -729,7 +729,7 @@ void up_pm_acquire_wakelock(struct pm_cpu_wakelock_s *lock) if (!entry) { - sq_addlast((FAR sq_entry_t *)lock, &g_wakelockqueue); + sq_addlast((sq_entry_t *)lock, &g_wakelockqueue); } lock->count++; @@ -752,7 +752,7 @@ void up_pm_acquire_wakelock(struct pm_cpu_wakelock_s *lock) void up_pm_release_wakelock(struct pm_cpu_wakelock_s *lock) { irqstate_t flags; - FAR sq_entry_t *entry; + sq_entry_t *entry; DEBUGASSERT(lock); @@ -811,7 +811,7 @@ int cxd56_pm_hotsleep(int idletime) message.mid = MQMSG_HOT_SLEEP; message.data = (uint32_t)idletime; - ret = file_mq_send(&g_queuedesc, (FAR const char *)&message, + ret = file_mq_send(&g_queuedesc, (const char *)&message, sizeof(message), CXD56_PM_MESSAGE_PRIO); if (ret < 0) { @@ -859,7 +859,7 @@ int cxd56_pm_initialize(void) taskid = task_create("cxd56_pm_task", CXD56_PM_TASK_PRIO, CXD56_PM_TASK_STACKSIZE, cxd56_pm_maintask, - (FAR char * const *)NULL); + NULL); if (taskid < 0) { return -EPERM; diff --git a/arch/arm/src/cxd56xx/cxd56_powermgr.h b/arch/arm/src/cxd56xx/cxd56_powermgr.h index 90a03dccd1..07fee64084 100644 --- a/arch/arm/src/cxd56xx/cxd56_powermgr.h +++ b/arch/arm/src/cxd56xx/cxd56_powermgr.h @@ -323,7 +323,7 @@ void *cxd56_pm_register_callback(uint32_t target, cxd56_pm_callback callback); void cxd56_pm_unregister_callback(void *handle); int cxd56_pm_fifo_handlear(int cpuid, uint32_t data[2]); -int cxd56_pm_main_task(int argc, FAR char *argv[]); +int cxd56_pm_main_task(int argc, char *argv[]); int cxd56_pm_initialize(void); int cxd56_pm_bootup(void); uint32_t cxd56_pm_getclock(uint32_t target); diff --git a/arch/arm/src/cxd56xx/cxd56_powermgr_procfs.c b/arch/arm/src/cxd56xx/cxd56_powermgr_procfs.c index 4abcee5887..9168a2633b 100644 --- a/arch/arm/src/cxd56xx/cxd56_powermgr_procfs.c +++ b/arch/arm/src/cxd56xx/cxd56_powermgr_procfs.c @@ -88,21 +88,21 @@ struct cxd56_powermgr_procfs_dir_s * Private Function Prototypes ****************************************************************************/ -static int cxd56_powermgr_procfs_open(FAR struct file *filep, - FAR const char *relpath, +static int cxd56_powermgr_procfs_open(struct file *filep, + const char *relpath, int oflags, mode_t mode); -static int cxd56_powermgr_procfs_close(FAR struct file *filep); -static ssize_t cxd56_powermgr_procfs_read(FAR struct file *filep, - FAR char *buffer, size_t buflen); -static int cxd56_powermgr_procfs_dup(FAR const struct file *oldp, - FAR struct file *newp); -static int cxd56_powermgr_procfs_opendir(FAR const char *relpath, - FAR struct fs_dirent_s *dir); -static int cxd56_powermgr_procfs_closedir(FAR struct fs_dirent_s *dir); +static int cxd56_powermgr_procfs_close(struct file *filep); +static ssize_t cxd56_powermgr_procfs_read(struct file *filep, + char *buffer, size_t buflen); +static int cxd56_powermgr_procfs_dup(const struct file *oldp, + struct file *newp); +static int cxd56_powermgr_procfs_opendir(const char *relpath, + struct fs_dirent_s *dir); +static int cxd56_powermgr_procfs_closedir(struct fs_dirent_s *dir); static int cxd56_powermgr_procfs_readdir(struct fs_dirent_s *dir); static int cxd56_powermgr_procfs_rewinddir(struct fs_dirent_s *dir); -static int cxd56_powermgr_procfs_stat(FAR const char *relpath, - FAR struct stat *buf); +static int cxd56_powermgr_procfs_stat(const char *relpath, + struct stat *buf); /**************************************************************************** * Private Data @@ -132,7 +132,7 @@ static const struct procfs_entry_s g_powermgr_procfs2 = "pm/" , &cxd56_powermgr_procfs_operations }; -static FAR char *g_powermg_procfs_buffer; +static char *g_powermg_procfs_buffer; static size_t g_powermg_procfs_size; static size_t g_powermg_procfs_len; @@ -465,12 +465,12 @@ static int cxd56_powermgr_procfs_check_dir(char *relpath, * ****************************************************************************/ -static int cxd56_powermgr_procfs_open(FAR struct file *filep, - FAR const char *relpath, +static int cxd56_powermgr_procfs_open(struct file *filep, + const char *relpath, int oflags, mode_t mode) { - FAR struct cxd56_powermgr_procfs_file_s *priv; + struct cxd56_powermgr_procfs_file_s *priv; int ret; mode_t getmode; int level; @@ -502,7 +502,7 @@ static int cxd56_powermgr_procfs_open(FAR struct file *filep, /* Allocate the open file structure */ - priv = (FAR struct cxd56_powermgr_procfs_file_s *) + priv = (struct cxd56_powermgr_procfs_file_s *) kmm_zalloc(sizeof(struct cxd56_powermgr_procfs_file_s)); if (!priv) { @@ -525,7 +525,7 @@ static int cxd56_powermgr_procfs_open(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_powermgr_procfs_close(FAR struct file *filep) +static int cxd56_powermgr_procfs_close(struct file *filep) { pminfo("Close\n"); @@ -544,18 +544,18 @@ static int cxd56_powermgr_procfs_close(FAR struct file *filep) * ****************************************************************************/ -static ssize_t cxd56_powermgr_procfs_read(FAR struct file *filep, - FAR char *buffer, size_t buflen) +static ssize_t cxd56_powermgr_procfs_read(struct file *filep, + char *buffer, size_t buflen) { size_t len; - FAR struct cxd56_powermgr_procfs_file_s *priv; + struct cxd56_powermgr_procfs_file_s *priv; pminfo("READ buffer=%p buflen=%lu len=%lu\n", buffer, (unsigned long)buflen, g_powermg_procfs_len); DEBUGASSERT(filep && filep->f_priv); - priv = (FAR struct cxd56_powermgr_procfs_file_s *)filep->f_priv; + priv = (struct cxd56_powermgr_procfs_file_s *)filep->f_priv; if (priv->fileno == 0) { @@ -604,8 +604,8 @@ static ssize_t cxd56_powermgr_procfs_read(FAR struct file *filep, * ****************************************************************************/ -static int cxd56_powermgr_procfs_dup(FAR const struct file *oldp, - FAR struct file *newp) +static int cxd56_powermgr_procfs_dup(const struct file *oldp, + struct file *newp) { void *oldpriv; void *newpriv; @@ -645,8 +645,8 @@ static int cxd56_powermgr_procfs_dup(FAR const struct file *oldp, * ****************************************************************************/ -static int cxd56_powermgr_procfs_stat(FAR const char *relpath, - FAR struct stat *buf) +static int cxd56_powermgr_procfs_stat(const char *relpath, + struct stat *buf) { int ret; mode_t mode; @@ -676,10 +676,10 @@ static int cxd56_powermgr_procfs_stat(FAR const char *relpath, * ****************************************************************************/ -static int cxd56_powermgr_procfs_opendir(FAR const char *relpath, - FAR struct fs_dirent_s *dir) +static int cxd56_powermgr_procfs_opendir(const char *relpath, + struct fs_dirent_s *dir) { - FAR struct cxd56_powermgr_procfs_dir_s *procfs; + struct cxd56_powermgr_procfs_dir_s *procfs; int ret; mode_t mode; int level; @@ -701,7 +701,7 @@ static int cxd56_powermgr_procfs_opendir(FAR const char *relpath, return -ENOENT; } - procfs = (FAR struct cxd56_powermgr_procfs_dir_s *) + procfs = (struct cxd56_powermgr_procfs_dir_s *) kmm_malloc(sizeof(struct cxd56_powermgr_procfs_dir_s)); if (!procfs) { @@ -710,7 +710,7 @@ static int cxd56_powermgr_procfs_opendir(FAR const char *relpath, } procfs->index = 0; - dir->u.procfs = (FAR void *)procfs; + dir->u.procfs = (void *)procfs; return OK; } @@ -723,9 +723,9 @@ static int cxd56_powermgr_procfs_opendir(FAR const char *relpath, * ****************************************************************************/ -static int cxd56_powermgr_procfs_closedir(FAR struct fs_dirent_s *dir) +static int cxd56_powermgr_procfs_closedir(struct fs_dirent_s *dir) { - FAR struct smartfs_level1_s *priv; + struct smartfs_level1_s *priv; pminfo("Closedir\n"); @@ -751,11 +751,11 @@ static int cxd56_powermgr_procfs_closedir(FAR struct fs_dirent_s *dir) static int cxd56_powermgr_procfs_readdir(struct fs_dirent_s *dir) { - FAR struct cxd56_powermgr_procfs_dir_s *procfs; + struct cxd56_powermgr_procfs_dir_s *procfs; DEBUGASSERT(dir && dir->u.procfs); - procfs = (FAR struct cxd56_powermgr_procfs_dir_s *)dir->u.procfs; + procfs = (struct cxd56_powermgr_procfs_dir_s *)dir->u.procfs; pminfo("Readdir %d\n", procfs->index); @@ -783,11 +783,11 @@ static int cxd56_powermgr_procfs_readdir(struct fs_dirent_s *dir) static int cxd56_powermgr_procfs_rewinddir(struct fs_dirent_s *dir) { - FAR struct cxd56_powermgr_procfs_dir_s *procfs; + struct cxd56_powermgr_procfs_dir_s *procfs; DEBUGASSERT(dir && dir->u.procfs); - procfs = (FAR struct cxd56_powermgr_procfs_dir_s *)dir->u.procfs; + procfs = (struct cxd56_powermgr_procfs_dir_s *)dir->u.procfs; pminfo("Rewind %d\n", procfs->index); procfs->index = 0; diff --git a/arch/arm/src/cxd56xx/cxd56_pwm.c b/arch/arm/src/cxd56xx/cxd56_pwm.c index 60dde8a18d..41e8e9b361 100644 --- a/arch/arm/src/cxd56xx/cxd56_pwm.c +++ b/arch/arm/src/cxd56xx/cxd56_pwm.c @@ -95,12 +95,12 @@ typedef struct /* PWM driver methods */ -static int pwm_setup(FAR struct pwm_lowerhalf_s *dev); -static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev); -static int pwm_start(FAR struct pwm_lowerhalf_s *dev, - FAR const struct pwm_info_s *info); -static int pwm_stop(FAR struct pwm_lowerhalf_s *dev); -static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, +static int pwm_setup(struct pwm_lowerhalf_s *dev); +static int pwm_shutdown(struct pwm_lowerhalf_s *dev); +static int pwm_start(struct pwm_lowerhalf_s *dev, + const struct pwm_info_s *info); +static int pwm_stop(struct pwm_lowerhalf_s *dev); +static int pwm_ioctl(struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg); /**************************************************************************** @@ -330,9 +330,9 @@ static int convert_freq2period(uint32_t freq, ub16_t duty, uint32_t *param, * ****************************************************************************/ -static int pwm_setup(FAR struct pwm_lowerhalf_s *dev) +static int pwm_setup(struct pwm_lowerhalf_s *dev) { - FAR struct cxd56_pwm_chan_s *priv = (FAR struct cxd56_pwm_chan_s *)dev; + struct cxd56_pwm_chan_s *priv = (struct cxd56_pwm_chan_s *)dev; int ret; ret = pwm_pin_config(priv->ch); @@ -361,7 +361,7 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) +static int pwm_shutdown(struct pwm_lowerhalf_s *dev) { return OK; } @@ -381,10 +381,10 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int pwm_start(FAR struct pwm_lowerhalf_s *dev, - FAR const struct pwm_info_s *info) +static int pwm_start(struct pwm_lowerhalf_s *dev, + const struct pwm_info_s *info) { - FAR struct cxd56_pwm_chan_s *priv = (FAR struct cxd56_pwm_chan_s *)dev; + struct cxd56_pwm_chan_s *priv = (struct cxd56_pwm_chan_s *)dev; uint32_t param; uint32_t phase; int ret; @@ -442,9 +442,9 @@ static int pwm_start(FAR struct pwm_lowerhalf_s *dev, * ****************************************************************************/ -static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) +static int pwm_stop(struct pwm_lowerhalf_s *dev) { - FAR struct cxd56_pwm_chan_s *priv = (FAR struct cxd56_pwm_chan_s *)dev; + struct cxd56_pwm_chan_s *priv = (struct cxd56_pwm_chan_s *)dev; PWM_REG(priv->ch)->EN = 0x0; @@ -467,7 +467,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, +static int pwm_ioctl(struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg) { return -ENOTTY; @@ -492,9 +492,9 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, * ****************************************************************************/ -FAR struct pwm_lowerhalf_s *cxd56_pwminitialize(uint32_t channel) +struct pwm_lowerhalf_s *cxd56_pwminitialize(uint32_t channel) { - FAR struct cxd56_pwm_chan_s *pwmch; + struct cxd56_pwm_chan_s *pwmch; switch (channel) { @@ -523,5 +523,5 @@ FAR struct pwm_lowerhalf_s *cxd56_pwminitialize(uint32_t channel) return NULL; } - return (FAR struct pwm_lowerhalf_s *)pwmch; + return (struct pwm_lowerhalf_s *)pwmch; } diff --git a/arch/arm/src/cxd56xx/cxd56_pwm.h b/arch/arm/src/cxd56xx/cxd56_pwm.h index 7273517faf..4aa33af9bd 100644 --- a/arch/arm/src/cxd56xx/cxd56_pwm.h +++ b/arch/arm/src/cxd56xx/cxd56_pwm.h @@ -77,7 +77,7 @@ extern "C" * ****************************************************************************/ -FAR struct pwm_lowerhalf_s *cxd56_pwminitialize(uint32_t channel); +struct pwm_lowerhalf_s *cxd56_pwminitialize(uint32_t channel); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/cxd56xx/cxd56_rtc.c b/arch/arm/src/cxd56xx/cxd56_rtc.c index 03d74c8e97..710a058c29 100644 --- a/arch/arm/src/cxd56xx/cxd56_rtc.c +++ b/arch/arm/src/cxd56xx/cxd56_rtc.c @@ -95,7 +95,7 @@ struct alm_cbinfo_s { volatile alm_callback_t ac_cb; /* Client callback function */ - volatile FAR void *ac_arg; /* Argument to pass with the callback function */ + volatile void *ac_arg; /* Argument to pass with the callback function */ }; #endif @@ -146,9 +146,9 @@ volatile bool g_rtc_enabled = false; ****************************************************************************/ #ifdef CONFIG_DEBUG_RTC -static void rtc_dumptime(FAR const struct timespec *tp, FAR const char *msg) +static void rtc_dumptime(const struct timespec *tp, const char *msg) { - FAR struct tm tm; + struct tm tm; gmtime_r(&tp->tv_sec, &tm); @@ -178,11 +178,11 @@ static void rtc_dumptime(FAR const struct timespec *tp, FAR const char *msg) ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -static int cxd56_rtc_interrupt(int irq, FAR void *context, FAR void *arg) +static int cxd56_rtc_interrupt(int irq, void *context, void *arg) { - FAR struct alm_cbinfo_s *cbinfo; + struct alm_cbinfo_s *cbinfo; alm_callback_t cb; - FAR void *cb_arg; + void *cb_arg; uint32_t source; uint32_t clear; int id; @@ -213,7 +213,7 @@ static int cxd56_rtc_interrupt(int irq, FAR void *context, FAR void *arg) /* Alarm callback */ cb = cbinfo->ac_cb; - cb_arg = (FAR void *)cbinfo->ac_arg; + cb_arg = (void *)cbinfo->ac_arg; cbinfo->ac_cb = NULL; cbinfo->ac_arg = NULL; @@ -395,7 +395,7 @@ time_t up_rtc_time(void) ****************************************************************************/ #ifdef CONFIG_RTC_HIRES -int up_rtc_gettime(FAR struct timespec *tp) +int up_rtc_gettime(struct timespec *tp) { uint64_t count; @@ -429,7 +429,7 @@ int up_rtc_gettime(FAR struct timespec *tp) * ****************************************************************************/ -int up_rtc_settime(FAR const struct timespec *tp) +int up_rtc_settime(const struct timespec *tp) { irqstate_t flags; uint64_t count; @@ -538,9 +538,9 @@ uint64_t cxd56_rtc_almcount(void) ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -int cxd56_rtc_setalarm(FAR struct alm_setalarm_s *alminfo) +int cxd56_rtc_setalarm(struct alm_setalarm_s *alminfo) { - FAR struct alm_cbinfo_s *cbinfo; + struct alm_cbinfo_s *cbinfo; irqstate_t flags; int ret = -EBUSY; int id; @@ -617,7 +617,7 @@ int cxd56_rtc_setalarm(FAR struct alm_setalarm_s *alminfo) #ifdef CONFIG_RTC_ALARM int cxd56_rtc_cancelalarm(enum alm_id_e alarmid) { - FAR struct alm_cbinfo_s *cbinfo; + struct alm_cbinfo_s *cbinfo; irqstate_t flags; int ret = -ENODATA; uint32_t mask; diff --git a/arch/arm/src/cxd56xx/cxd56_rtc.h b/arch/arm/src/cxd56xx/cxd56_rtc.h index 9fc31b22d3..899415a402 100644 --- a/arch/arm/src/cxd56xx/cxd56_rtc.h +++ b/arch/arm/src/cxd56xx/cxd56_rtc.h @@ -39,7 +39,7 @@ /* The form of an alarm callback */ -typedef CODE void (*alm_callback_t)(FAR void *arg, unsigned int alarmid); +typedef void (*alm_callback_t)(void *arg, unsigned int alarmid); enum alm_id_e { @@ -56,7 +56,7 @@ struct alm_setalarm_s int as_id; /* enum alm_id_e */ struct timespec as_time; /* Alarm expiration time */ alm_callback_t as_cb; /* Callback (if non-NULL) */ - FAR void *as_arg; /* Argument for callback */ + void *as_arg; /* Argument for callback */ }; #endif /* CONFIG_RTC_ALARM */ @@ -121,7 +121,7 @@ uint64_t cxd56_rtc_almcount(void); ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -int cxd56_rtc_setalarm(FAR struct alm_setalarm_s *alminfo); +int cxd56_rtc_setalarm(struct alm_setalarm_s *alminfo); #endif /* CONFIG_RTC_ALARM */ /**************************************************************************** @@ -165,7 +165,7 @@ int cxd56_rtc_cancelalarm(enum alm_id_e alarmid); ****************************************************************************/ #ifdef CONFIG_RTC_DRIVER -FAR struct rtc_lowerhalf_s *cxd56_rtc_lowerhalf(void); +struct rtc_lowerhalf_s *cxd56_rtc_lowerhalf(void); #endif /* CONFIG_RTC_DRIVER */ #undef EXTERN diff --git a/arch/arm/src/cxd56xx/cxd56_rtc_lowerhalf.c b/arch/arm/src/cxd56xx/cxd56_rtc_lowerhalf.c index 20df0d7a7b..a93293915f 100644 --- a/arch/arm/src/cxd56xx/cxd56_rtc_lowerhalf.c +++ b/arch/arm/src/cxd56xx/cxd56_rtc_lowerhalf.c @@ -51,8 +51,8 @@ #ifdef CONFIG_RTC_ALARM struct cxd56_cbinfo_s { - volatile rtc_alarm_callback_t cb; /* Callback when the alarm expires */ - volatile FAR void *priv; /* Private argurment to accompany callback */ + volatile rtc_alarm_callback_t cb; /* Callback when the alarm expires */ + volatile void *priv; /* Private argurment to accompany callback */ }; #endif @@ -66,7 +66,7 @@ struct cxd56_lowerhalf_s * operations vtable (which may lie in FLASH or ROM) */ - FAR const struct rtc_ops_s *ops; + const struct rtc_ops_s *ops; /* Data following is private to this driver and not visible outside of * this file. @@ -85,17 +85,17 @@ struct cxd56_lowerhalf_s /* Prototypes for static methods in struct rtc_ops_s */ -static int cxd56_rdtime(FAR struct rtc_lowerhalf_s *lower, - FAR struct rtc_time *rtctime); -static int cxd56_settime(FAR struct rtc_lowerhalf_s *lower, - FAR const struct rtc_time *rtctime); +static int cxd56_rdtime(struct rtc_lowerhalf_s *lower, + struct rtc_time *rtctime); +static int cxd56_settime(struct rtc_lowerhalf_s *lower, + const struct rtc_time *rtctime); #ifdef CONFIG_RTC_ALARM -static int cxd56_setalarm(FAR struct rtc_lowerhalf_s *lower, - FAR const struct lower_setalarm_s *alarminfo); -static int cxd56_setrelative(FAR struct rtc_lowerhalf_s *lower, - FAR const struct lower_setrelative_s *alarminfo); -static int cxd56_cancelalarm(FAR struct rtc_lowerhalf_s *lower, +static int cxd56_setalarm(struct rtc_lowerhalf_s *lower, + const struct lower_setalarm_s *alarminfo); +static int cxd56_setrelative(struct rtc_lowerhalf_s *lower, + const struct lower_setrelative_s *alarminfo); +static int cxd56_cancelalarm(struct rtc_lowerhalf_s *lower, int alarmid); #endif @@ -146,12 +146,12 @@ static struct cxd56_lowerhalf_s g_rtc_lowerhalf = ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -static void cxd56_alarm_callback(FAR void *arg, unsigned int alarmid) +static void cxd56_alarm_callback(void *arg, unsigned int alarmid) { - FAR struct cxd56_lowerhalf_s *lower; - FAR struct cxd56_cbinfo_s *cbinfo; + struct cxd56_lowerhalf_s *lower; + struct cxd56_cbinfo_s *cbinfo; rtc_alarm_callback_t cb; - FAR void *priv; + void *priv; DEBUGASSERT((RTC_ALARM0 <= alarmid) && (alarmid < RTC_ALARM_LAST)); @@ -163,7 +163,7 @@ static void cxd56_alarm_callback(FAR void *arg, unsigned int alarmid) */ cb = (rtc_alarm_callback_t)cbinfo->cb; - priv = (FAR void *)cbinfo->priv; + priv = (void *)cbinfo->priv; cbinfo->cb = NULL; cbinfo->priv = NULL; @@ -193,11 +193,11 @@ static void cxd56_alarm_callback(FAR void *arg, unsigned int alarmid) * ****************************************************************************/ -static int cxd56_rdtime(FAR struct rtc_lowerhalf_s *lower, - FAR struct rtc_time *rtctime) +static int cxd56_rdtime(struct rtc_lowerhalf_s *lower, + struct rtc_time *rtctime) { #if defined(CONFIG_RTC_HIRES) - FAR struct timespec ts; + struct timespec ts; int ret; /* Get the higher resolution time */ @@ -213,7 +213,7 @@ static int cxd56_rdtime(FAR struct rtc_lowerhalf_s *lower, * compatible. */ - if (!gmtime_r(&ts.tv_sec, (FAR struct tm *)rtctime)) + if (!gmtime_r(&ts.tv_sec, (struct tm *)rtctime)) { ret = -get_errno(); goto errout; @@ -234,7 +234,7 @@ errout: /* Convert the one second epoch time to a struct tm */ - if (!gmtime_r(&timer, (FAR struct tm *)rtctime)) + if (!gmtime_r(&timer, (struct tm *)rtctime)) { int errcode = get_errno(); DEBUGASSERT(errcode > 0); @@ -261,8 +261,8 @@ errout: * ****************************************************************************/ -static int cxd56_settime(FAR struct rtc_lowerhalf_s *lower, - FAR const struct rtc_time *rtctime) +static int cxd56_settime(struct rtc_lowerhalf_s *lower, + const struct rtc_time *rtctime) { struct timespec ts; @@ -270,7 +270,7 @@ static int cxd56_settime(FAR struct rtc_lowerhalf_s *lower, * rtc_time is cast compatible with struct tm. */ - ts.tv_sec = timegm((FAR struct tm *)rtctime); + ts.tv_sec = timegm((struct tm *)rtctime); ts.tv_nsec = 0; /* Now set the time (to one second accuracy) */ @@ -296,18 +296,18 @@ static int cxd56_settime(FAR struct rtc_lowerhalf_s *lower, ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -static int cxd56_setalarm(FAR struct rtc_lowerhalf_s *lower, - FAR const struct lower_setalarm_s *alarminfo) +static int cxd56_setalarm(struct rtc_lowerhalf_s *lower, + const struct lower_setalarm_s *alarminfo) { - FAR struct cxd56_lowerhalf_s *priv; - FAR struct cxd56_cbinfo_s *cbinfo; + struct cxd56_lowerhalf_s *priv; + struct cxd56_cbinfo_s *cbinfo; struct alm_setalarm_s lowerinfo; int ret = -EINVAL; DEBUGASSERT(lower != NULL && alarminfo != NULL); DEBUGASSERT(RTC_ALARM0 == alarminfo->id); - priv = (FAR struct cxd56_lowerhalf_s *)lower; + priv = (struct cxd56_lowerhalf_s *)lower; if (RTC_ALARM0 == alarminfo->id) { @@ -325,7 +325,7 @@ static int cxd56_setalarm(FAR struct rtc_lowerhalf_s *lower, /* Convert the RTC time to a timespec (1 second accuracy) */ - lowerinfo.as_time.tv_sec = timegm((FAR struct tm *)&alarminfo->time); + lowerinfo.as_time.tv_sec = timegm((struct tm *)&alarminfo->time); lowerinfo.as_time.tv_nsec = 0; /* And set the alarm */ @@ -360,11 +360,11 @@ static int cxd56_setalarm(FAR struct rtc_lowerhalf_s *lower, ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -static int cxd56_setrelative(FAR struct rtc_lowerhalf_s *lower, - FAR const struct lower_setrelative_s *alarminfo) +static int cxd56_setrelative(struct rtc_lowerhalf_s *lower, + const struct lower_setrelative_s *alarminfo) { struct lower_setalarm_s setalarm; - FAR struct timespec ts; + struct timespec ts; time_t seconds; int ret = -EINVAL; @@ -402,7 +402,7 @@ static int cxd56_setrelative(FAR struct rtc_lowerhalf_s *lower, seconds = ts.tv_sec + (alarminfo->reltime + 1); - gmtime_r(&seconds, (FAR struct tm *)&setalarm.time); + gmtime_r(&seconds, (struct tm *)&setalarm.time); /* The set the alarm using this absolute time */ @@ -437,16 +437,16 @@ static int cxd56_setrelative(FAR struct rtc_lowerhalf_s *lower, ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -static int cxd56_cancelalarm(FAR struct rtc_lowerhalf_s *lower, int alarmid) +static int cxd56_cancelalarm(struct rtc_lowerhalf_s *lower, int alarmid) { - FAR struct cxd56_lowerhalf_s *priv; - FAR struct cxd56_cbinfo_s *cbinfo; + struct cxd56_lowerhalf_s *priv; + struct cxd56_cbinfo_s *cbinfo; int ret = -EINVAL; DEBUGASSERT(lower != NULL); DEBUGASSERT((RTC_ALARM0 <= alarmid) && (alarmid < RTC_ALARM_LAST)); - priv = (FAR struct cxd56_lowerhalf_s *)lower; + priv = (struct cxd56_lowerhalf_s *)lower; if ((RTC_ALARM0 <= alarmid) && (alarmid < RTC_ALARM_LAST)) { @@ -491,9 +491,9 @@ static int cxd56_cancelalarm(FAR struct rtc_lowerhalf_s *lower, int alarmid) * ****************************************************************************/ -FAR struct rtc_lowerhalf_s *cxd56_rtc_lowerhalf(void) +struct rtc_lowerhalf_s *cxd56_rtc_lowerhalf(void) { - return (FAR struct rtc_lowerhalf_s *)&g_rtc_lowerhalf; + return (struct rtc_lowerhalf_s *)&g_rtc_lowerhalf; } #endif /* CONFIG_RTC_DRIVER */ diff --git a/arch/arm/src/cxd56xx/cxd56_scu.c b/arch/arm/src/cxd56xx/cxd56_scu.c index dd605b2ae3..31e9812890 100644 --- a/arch/arm/src/cxd56xx/cxd56_scu.c +++ b/arch/arm/src/cxd56xx/cxd56_scu.c @@ -220,8 +220,8 @@ struct coeff_addr_s /* SCU hardware resource management *****************************************/ -static int findzeroandset(FAR uint8_t *bitmap, int nbits); -static void bitmapclear(FAR uint8_t *bitmap, int bit); +static int findzeroandset(uint8_t *bitmap, int nbits); +static void bitmapclear(uint8_t *bitmap, int bit); static inline int8_t deci_alloc(void); static inline void deci_free(int8_t sid); static inline int8_t mathf_alloc(void); @@ -232,18 +232,18 @@ static inline int8_t oneshot_alloc(void); static inline void oneshot_free(int8_t tid); static int seq_semtake(sem_t *id); static void seq_semgive(sem_t *id); -static void seq_fifosetactive(FAR struct seq_s *seq, int fifoid); -static void seq_fifosetinactive(FAR struct seq_s *seq, int fifoid); -static int seq_fifoisactive(FAR struct seq_s *seq, int fifoid); -static int seq_isactive(FAR struct seq_s *seq); +static void seq_fifosetactive(struct seq_s *seq, int fifoid); +static void seq_fifosetinactive(struct seq_s *seq, int fifoid); +static int seq_fifoisactive(struct seq_s *seq, int fifoid); +static int seq_isactive(struct seq_s *seq); /* Sequencer control ********************************************************/ -static FAR struct seq_s *seq_new(void); -static FAR struct seq_s *deci_new(void); +static struct seq_s *seq_new(void); +static struct seq_s *deci_new(void); static void seq_inhibitrequest(int req, bool set); -static void seq_sync(FAR struct seq_s *seq, int req); +static void seq_sync(struct seq_s *seq, int req); static void seq_setproperty(int sid, int slave, int dest, int offset, int len); static void seq_setinst(int sid, int offset, int len); @@ -257,24 +257,24 @@ static void seq_setstartinterval(int sid, int interval); static void seq_setstartphase(int sid, int phase); static void seq_startseq(int sid); static void seq_stopseq(int sid); -static int seq_setadjustment(FAR struct seq_s *seq, +static int seq_setadjustment(struct seq_s *seq, struct adjust_xyz_s *adj); -static int seq_setfilter(FAR struct scufifo_s *fifo, int pos, +static int seq_setfilter(struct scufifo_s *fifo, int pos, struct iir_filter_s iir[2]); -static int seq_seteventnotifier(FAR struct scufifo_s *fifo, +static int seq_seteventnotifier(struct scufifo_s *fifo, struct scuev_notify_s *ev); static void seq_offsetgainenable(int sid, bool enable); -static int seq_start(FAR struct seq_s *seq, int fifoid); -static int seq_stop(FAR struct seq_s *seq, int fifoid); -static int seq_setsamplingrate(FAR struct seq_s *seq, uint8_t samplingrate); -static int seq_fifoinit(FAR struct seq_s *seq, int fifoid, uint16_t fsize); -static void seq_fifofree(FAR struct scufifo_s *fifo); -static inline struct scufifo_s *seq_getfifo(FAR struct seq_s *seq, +static int seq_start(struct seq_s *seq, int fifoid); +static int seq_stop(struct seq_s *seq, int fifoid); +static int seq_setsamplingrate(struct seq_s *seq, uint8_t samplingrate); +static int seq_fifoinit(struct seq_s *seq, int fifoid, uint16_t fsize); +static void seq_fifofree(struct scufifo_s *fifo); +static inline struct scufifo_s *seq_getfifo(struct seq_s *seq, int fifoid); static void seq_setdecimation(int wid, uint8_t ratio, uint8_t leveladj, uint8_t forcethrough); -static int seq_setwatermark(FAR struct seq_s *seq, int fifoid, - FAR struct scufifo_wm_s *wm); +static int seq_setwatermark(struct seq_s *seq, int fifoid, + struct scufifo_wm_s *wm); static void convert_firsttimestamp(struct scutimestamp_s *tm, uint16_t interval, uint16_t sample, uint16_t adjust); @@ -283,9 +283,9 @@ static void latest_timestamp(struct scufifo_s *fifo, uint32_t interval, static void seq_gettimestamp(struct scufifo_s *fifo, struct scutimestamp_s *tm); -static int seq_oneshot(int bustype, int slave, FAR uint16_t *inst, - uint32_t nr_insts, FAR uint8_t *buffer, int len); -static void seq_setfifomode(FAR struct seq_s *seq, int fifoid, int enable); +static int seq_oneshot(int bustype, int slave, uint16_t *inst, + uint32_t nr_insts, uint8_t *buffer, int len); +static void seq_setfifomode(struct seq_s *seq, int fifoid, int enable); #ifdef CONFIG_CXD56_UDMAC static void seq_fifodmadone(DMA_HANDLE handle, uint8_t status, void *arg); #endif @@ -296,20 +296,20 @@ static uint16_t seq_remakeinstruction(int bustype, uint16_t inst); static void mathf_enable(int8_t mid, uint8_t wid); static void mathf_disable(int8_t mid); static inline void mathf_set_coeff(uint32_t caddr, - FAR struct iir_coeff_s *c); + struct iir_coeff_s *c); static void mathf_setiirfilter(int mid, int n, - FAR struct iir_filter_s *filter); + struct iir_filter_s *filter); /* Interrupt handlers *******************************************************/ -static int seq_scuirqhandler(int irq, FAR void *context, FAR void *arg); -static void seq_handlefifointr(FAR struct cxd56_scudev_s *priv, +static int seq_scuirqhandler(int irq, void *context, void *arg); +static void seq_handlefifointr(struct cxd56_scudev_s *priv, uint32_t intr); -static void seq_handlemathfintr(FAR struct cxd56_scudev_s *priv, +static void seq_handlemathfintr(struct cxd56_scudev_s *priv, uint32_t intr); -static void seq_handleoneshot(FAR struct cxd56_scudev_s *priv, +static void seq_handleoneshot(struct cxd56_scudev_s *priv, uint32_t intr); -static void seq_handleisopdoneintr(FAR struct cxd56_scudev_s *priv, +static void seq_handleisopdoneintr(struct cxd56_scudev_s *priv, uint32_t intr); /**************************************************************************** @@ -381,7 +381,7 @@ static void seq_semgive(sem_t *id) * Name: seq_fifosetactive ****************************************************************************/ -static void seq_fifosetactive(FAR struct seq_s *seq, int fifoid) +static void seq_fifosetactive(struct seq_s *seq, int fifoid) { irqstate_t flags = enter_critical_section(); seq->active |= 1 << fifoid; @@ -392,7 +392,7 @@ static void seq_fifosetactive(FAR struct seq_s *seq, int fifoid) * Name: seq_fifosetinactive ****************************************************************************/ -static void seq_fifosetinactive(FAR struct seq_s *seq, int fifoid) +static void seq_fifosetinactive(struct seq_s *seq, int fifoid) { irqstate_t flags = enter_critical_section(); seq->active &= ~(1 << fifoid); @@ -403,7 +403,7 @@ static void seq_fifosetinactive(FAR struct seq_s *seq, int fifoid) * Name: seq_fifoisactive ****************************************************************************/ -static int seq_fifoisactive(FAR struct seq_s *seq, int fifoid) +static int seq_fifoisactive(struct seq_s *seq, int fifoid) { irqstate_t flags = enter_critical_section(); int8_t active = seq->active; @@ -415,7 +415,7 @@ static int seq_fifoisactive(FAR struct seq_s *seq, int fifoid) * Name: seq_isactive ****************************************************************************/ -static int seq_isactive(FAR struct seq_s *seq) +static int seq_isactive(struct seq_s *seq) { irqstate_t flags = enter_critical_section(); int8_t active = seq->active; @@ -438,7 +438,7 @@ static int seq_isactive(FAR struct seq_s *seq) * ****************************************************************************/ -static int findzeroandset(FAR uint8_t *bitmap, int nbits) +static int findzeroandset(uint8_t *bitmap, int nbits) { int i; irqstate_t flags; @@ -466,7 +466,7 @@ static int findzeroandset(FAR uint8_t *bitmap, int nbits) * ****************************************************************************/ -static void bitmapclear(FAR uint8_t *bitmap, int bit) +static void bitmapclear(uint8_t *bitmap, int bit) { irqstate_t flags = enter_critical_section(); *bitmap &= ~(1 << bit); @@ -991,8 +991,8 @@ static void seq_stopseq(int sid) * ****************************************************************************/ -static int seq_oneshot(int bustype, int slave, FAR uint16_t *inst, - uint32_t nr_insts, FAR uint8_t *buffer, int len) +static int seq_oneshot(int bustype, int slave, uint16_t *inst, + uint32_t nr_insts, uint8_t *buffer, int len) { struct cxd56_scudev_s *priv = &g_scudev; irqstate_t flags; @@ -1160,7 +1160,7 @@ static void seq_offsetgainenable(int sid, bool enable) * ****************************************************************************/ -static int seq_start(FAR struct seq_s *seq, int fifoid) +static int seq_start(struct seq_s *seq, int fifoid) { struct scufifo_s *fifo; uint32_t interval; @@ -1253,7 +1253,7 @@ static int seq_start(FAR struct seq_s *seq, int fifoid) * ****************************************************************************/ -static int seq_stop(FAR struct seq_s *seq, int fifoid) +static int seq_stop(struct seq_s *seq, int fifoid) { struct scufifo_s *fifo; uint32_t val; @@ -1368,7 +1368,7 @@ static void mathf_disable(int8_t mid) * ****************************************************************************/ -static inline void mathf_set_coeff(uint32_t caddr, FAR struct iir_coeff_s *c) +static inline void mathf_set_coeff(uint32_t caddr, struct iir_coeff_s *c) { putreg32(c->h, caddr); putreg32((c->l & 0x3) << 30, caddr + 4); @@ -1388,7 +1388,7 @@ static inline void mathf_set_coeff(uint32_t caddr, FAR struct iir_coeff_s *c) ****************************************************************************/ static void mathf_setiirfilter(int mid, int n, - FAR struct iir_filter_s *filter) + struct iir_filter_s *filter) { const struct coeff_addr_s *caddr; @@ -1421,7 +1421,7 @@ static void mathf_setiirfilter(int mid, int n, * ****************************************************************************/ -static int seq_setsamplingrate(FAR struct seq_s *seq, uint8_t samplingrate) +static int seq_setsamplingrate(struct seq_s *seq, uint8_t samplingrate) { DEBUGASSERT(seq); @@ -1447,9 +1447,9 @@ static int seq_setsamplingrate(FAR struct seq_s *seq, uint8_t samplingrate) * ****************************************************************************/ -static void seq_sync(FAR struct seq_s *seq, int req) +static void seq_sync(struct seq_s *seq, int req) { - FAR struct cxd56_scudev_s *priv = &g_scudev; + struct cxd56_scudev_s *priv = &g_scudev; seq_semtake(&priv->syncexc); @@ -1483,7 +1483,7 @@ static void seq_sync(FAR struct seq_s *seq, int req) * ****************************************************************************/ -static void seq_handlefifointr(FAR struct cxd56_scudev_s *priv, +static void seq_handlefifointr(struct cxd56_scudev_s *priv, uint32_t intr) { uint32_t bit; @@ -1529,7 +1529,7 @@ static void seq_handlefifointr(FAR struct cxd56_scudev_s *priv, * ****************************************************************************/ -static void seq_handlemathfintr(FAR struct cxd56_scudev_s *priv, +static void seq_handlemathfintr(struct cxd56_scudev_s *priv, uint32_t intr) { int i; @@ -1612,7 +1612,7 @@ static void seq_handlemathfintr(FAR struct cxd56_scudev_s *priv, * ****************************************************************************/ -static void seq_handleoneshot(FAR struct cxd56_scudev_s *priv, uint32_t intr) +static void seq_handleoneshot(struct cxd56_scudev_s *priv, uint32_t intr) { uint32_t bit; int i; @@ -1641,7 +1641,7 @@ static void seq_handleoneshot(FAR struct cxd56_scudev_s *priv, uint32_t intr) * ****************************************************************************/ -static void seq_handleisopdoneintr(FAR struct cxd56_scudev_s *priv, +static void seq_handleisopdoneintr(struct cxd56_scudev_s *priv, uint32_t intr) { /* Detect ISOP3 as done or stop. */ @@ -1667,9 +1667,9 @@ static void seq_handleisopdoneintr(FAR struct cxd56_scudev_s *priv, * ****************************************************************************/ -static int seq_scuirqhandler(int irq, FAR void *context, FAR void *arg) +static int seq_scuirqhandler(int irq, void *context, void *arg) { - FAR struct cxd56_scudev_s *priv = arg; + struct cxd56_scudev_s *priv = arg; uint32_t intr; uint32_t ierr0; uint32_t ierr1; @@ -1776,9 +1776,9 @@ static int seq_scuirqhandler(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static FAR struct seq_s *seq_new(void) +static struct seq_s *seq_new(void) { - FAR struct seq_s *seq; + struct seq_s *seq; int sid; irqstate_t flags; @@ -1794,7 +1794,7 @@ static FAR struct seq_s *seq_new(void) leave_critical_section(flags); - seq = (FAR struct seq_s *)kmm_malloc(sizeof(struct seq_s)); + seq = (struct seq_s *)kmm_malloc(sizeof(struct seq_s)); if (!seq) { seq_free(sid); @@ -1819,9 +1819,9 @@ static FAR struct seq_s *seq_new(void) * ****************************************************************************/ -static FAR struct seq_s *deci_new(void) +static struct seq_s *deci_new(void) { - FAR struct decimator_s *deci; + struct decimator_s *deci; int sid; irqstate_t flags; @@ -1837,7 +1837,7 @@ static FAR struct seq_s *deci_new(void) leave_critical_section(flags); - deci = (FAR struct decimator_s *)kmm_malloc(sizeof(struct decimator_s)); + deci = (struct decimator_s *)kmm_malloc(sizeof(struct decimator_s)); if (!deci) { deci_free(sid); @@ -1864,10 +1864,10 @@ static FAR struct seq_s *deci_new(void) * ****************************************************************************/ -static int seq_fifoinit(FAR struct seq_s *seq, int fifoid, uint16_t fsize) +static int seq_fifoinit(struct seq_s *seq, int fifoid, uint16_t fsize) { - FAR struct scufifo_s *fifo; - FAR struct decimator_s *deci = (FAR struct decimator_s *)seq; + struct scufifo_s *fifo; + struct decimator_s *deci = (struct decimator_s *)seq; int wid; int rid; uint32_t val; @@ -1895,7 +1895,7 @@ static int seq_fifoinit(FAR struct seq_s *seq, int fifoid, uint16_t fsize) } } - fifo = (FAR struct scufifo_s *)kmm_malloc(sizeof(struct scufifo_s)); + fifo = (struct scufifo_s *)kmm_malloc(sizeof(struct scufifo_s)); if (!fifo) { return -ENOMEM; @@ -2016,7 +2016,7 @@ static int seq_fifoinit(FAR struct seq_s *seq, int fifoid, uint16_t fsize) if (seq->type & SEQ_TYPE_DECI) { - FAR struct decimation_fifo_s *dec = &deci->dfifo[fifoid]; + struct decimation_fifo_s *dec = &deci->dfifo[fifoid]; dec->fifo = fifo; dec->ratio = 0; dec->leveladj = 0; @@ -2051,7 +2051,7 @@ static int seq_fifoinit(FAR struct seq_s *seq, int fifoid, uint16_t fsize) * ****************************************************************************/ -static void seq_fifofree(FAR struct scufifo_s *fifo) +static void seq_fifofree(struct scufifo_s *fifo) { int wid; int rid; @@ -2114,7 +2114,7 @@ static void seq_fifofree(FAR struct scufifo_s *fifo) * ****************************************************************************/ -static inline struct scufifo_s *seq_getfifo(FAR struct seq_s *seq, +static inline struct scufifo_s *seq_getfifo(struct seq_s *seq, int fifoid) { DEBUGASSERT(fifoid >= 0 && fifoid < 3); @@ -2142,8 +2142,8 @@ static inline struct scufifo_s *seq_getfifo(FAR struct seq_s *seq, * ****************************************************************************/ -static int seq_setadjustment(FAR struct seq_s *seq, - FAR struct adjust_xyz_s *adj) +static int seq_setadjustment(struct seq_s *seq, + struct adjust_xyz_s *adj) { int sid; uint32_t val; @@ -2186,8 +2186,8 @@ static int seq_setadjustment(FAR struct seq_s *seq, * ****************************************************************************/ -static int seq_setfilter(FAR struct scufifo_s *fifo, int pos, - FAR struct iir_filter_s iir[2]) +static int seq_setfilter(struct scufifo_s *fifo, int pos, + struct iir_filter_s iir[2]) { int mid; @@ -2233,8 +2233,8 @@ static int seq_setfilter(FAR struct scufifo_s *fifo, int pos, * ****************************************************************************/ -static int seq_seteventnotifier(FAR struct scufifo_s *fifo, - FAR struct scuev_notify_s *ev) +static int seq_seteventnotifier(struct scufifo_s *fifo, + struct scuev_notify_s *ev) { struct cxd56_scudev_s *priv = &g_scudev; uint32_t val; @@ -2323,10 +2323,10 @@ static int seq_seteventnotifier(FAR struct scufifo_s *fifo, * ****************************************************************************/ -static int seq_setwatermark(FAR struct seq_s *seq, int fifoid, - FAR struct scufifo_wm_s *wm) +static int seq_setwatermark(struct seq_s *seq, int fifoid, + struct scufifo_wm_s *wm) { - FAR struct cxd56_scudev_s *priv = &g_scudev; + struct cxd56_scudev_s *priv = &g_scudev; struct scufifo_s *fifo = seq_getfifo(seq, fifoid); struct wm_notify_s *notify; int rid; @@ -2497,13 +2497,13 @@ static void seq_gettimestamp(struct scufifo_s *fifo, * ****************************************************************************/ -static void seq_setfifomode(FAR struct seq_s *seq, int fifoid, int enable) +static void seq_setfifomode(struct seq_s *seq, int fifoid, int enable) { - FAR struct scufifo_s *fifo = seq_getfifo(seq, fifoid); + struct scufifo_s *fifo = seq_getfifo(seq, fifoid); uint32_t val; irqstate_t flags; - FAR struct cxd56_scudev_s *priv = &g_scudev; - FAR struct wm_notify_s *notify = &priv->wm[fifo->rid]; + struct cxd56_scudev_s *priv = &g_scudev; + struct wm_notify_s *notify = &priv->wm[fifo->rid]; bool iswtmk = false; scuinfo("FIFO mode %d wid %d\n", enable, fifo->wid); @@ -2683,8 +2683,8 @@ static void scu_hwinit(void) * Name: scu_spitransfer ****************************************************************************/ -int scu_spitransfer(int slavesel, FAR uint16_t *inst, uint32_t nr_insts, - FAR uint8_t *buffer, int len) +int scu_spitransfer(int slavesel, uint16_t *inst, uint32_t nr_insts, + uint8_t *buffer, int len) { return seq_oneshot(SCU_BUS_SPI, slavesel, inst, nr_insts, buffer, len); } @@ -2693,8 +2693,8 @@ int scu_spitransfer(int slavesel, FAR uint16_t *inst, uint32_t nr_insts, * Name: scu_i2ctransfer ****************************************************************************/ -int scu_i2ctransfer(int port, int slave, FAR uint16_t *inst, - uint32_t nr_insts, FAR uint8_t *buffer, int len) +int scu_i2ctransfer(int port, int slave, uint16_t *inst, + uint32_t nr_insts, uint8_t *buffer, int len) { int bustype; @@ -2728,9 +2728,9 @@ int scu_i2ctransfer(int port, int slave, FAR uint16_t *inst, * ****************************************************************************/ -FAR struct seq_s *seq_open(int type, int bustype) +struct seq_s *seq_open(int type, int bustype) { - FAR struct seq_s *seq; + struct seq_s *seq; /* Check bustype is valid */ @@ -2798,7 +2798,7 @@ FAR struct seq_s *seq_open(int type, int bustype) * ****************************************************************************/ -int seq_setinstruction(FAR struct seq_s *seq, const uint16_t *inst, +int seq_setinstruction(struct seq_s *seq, const uint16_t *inst, uint16_t nr_insts) { int istart; @@ -2846,7 +2846,7 @@ int seq_setinstruction(FAR struct seq_s *seq, const uint16_t *inst, * ****************************************************************************/ -void seq_setsample(FAR struct seq_s *seq, uint8_t sample, uint8_t offset, +void seq_setsample(struct seq_s *seq, uint8_t sample, uint8_t offset, uint8_t elemsize, bool swapbyte) { DEBUGASSERT(seq); @@ -2868,7 +2868,7 @@ void seq_setsample(FAR struct seq_s *seq, uint8_t sample, uint8_t offset, * ****************************************************************************/ -void seq_setaddress(FAR struct seq_s *seq, uint32_t slave_addr) +void seq_setaddress(struct seq_s *seq, uint32_t slave_addr) { seq_setproperty(seq->id, slave_addr, 0, 0, 0); } @@ -2893,7 +2893,7 @@ static void seq_fifodmadone(DMA_HANDLE handle, uint8_t status, void *arg) * Name: seq_read8 ****************************************************************************/ -static inline void seq_read8(uint32_t addr, FAR uint8_t *buffer, int length) +static inline void seq_read8(uint32_t addr, uint8_t *buffer, int length) { int i; @@ -2908,7 +2908,7 @@ static inline void seq_read8(uint32_t addr, FAR uint8_t *buffer, int length) ****************************************************************************/ static inline void seq_read16(uint32_t addr, - FAR uint16_t *buffer, + uint16_t *buffer, int length) { int i; @@ -2924,7 +2924,7 @@ static inline void seq_read16(uint32_t addr, ****************************************************************************/ static inline void seq_read32(uint32_t addr, - FAR uint32_t *buffer, + uint32_t *buffer, int length) { int i; @@ -2953,7 +2953,7 @@ static inline void seq_read32(uint32_t addr, * ****************************************************************************/ -int seq_read(FAR struct seq_s *seq, int fifoid, FAR char *buffer, int length) +int seq_read(struct seq_s *seq, int fifoid, char *buffer, int length) { struct scufifo_s *fifo; uint32_t outlet; @@ -3069,7 +3069,7 @@ int seq_read(FAR struct seq_s *seq, int fifoid, FAR char *buffer, int length) { if (buffer != NULL) { - seq_read8(outlet, (FAR uint8_t *)buffer, length); + seq_read8(outlet, (uint8_t *)buffer, length); } else { @@ -3083,7 +3083,7 @@ int seq_read(FAR struct seq_s *seq, int fifoid, FAR char *buffer, int length) { if (buffer != NULL) { - seq_read16(outlet, (FAR uint16_t *)buffer, length); + seq_read16(outlet, (uint16_t *)buffer, length); } else { @@ -3097,7 +3097,7 @@ int seq_read(FAR struct seq_s *seq, int fifoid, FAR char *buffer, int length) { if (buffer != NULL) { - seq_read32(outlet, (FAR uint32_t *)buffer, length); + seq_read32(outlet, (uint32_t *)buffer, length); } else { @@ -3131,7 +3131,7 @@ int seq_read(FAR struct seq_s *seq, int fifoid, FAR char *buffer, int length) * ****************************************************************************/ -int seq_ioctl(FAR struct seq_s *seq, int fifoid, int cmd, unsigned long arg) +int seq_ioctl(struct seq_s *seq, int fifoid, int cmd, unsigned long arg) { int ret = OK; @@ -3157,7 +3157,7 @@ int seq_ioctl(FAR struct seq_s *seq, int fifoid, int cmd, unsigned long arg) case SCUIOC_FREEFIFO: { struct decimator_s *deci = (struct decimator_s *)seq; - FAR struct scufifo_s *fifo; + struct scufifo_s *fifo; /* Check sequencer already stopped. */ @@ -3211,8 +3211,8 @@ int seq_ioctl(FAR struct seq_s *seq, int fifoid, int cmd, unsigned long arg) { if (arg) { - FAR struct adjust_xyz_s *p = - (FAR struct adjust_xyz_s *)(uintptr_t)arg; + struct adjust_xyz_s *p = + (struct adjust_xyz_s *)(uintptr_t)arg; ret = seq_setadjustment(seq, p); if (!ret) { @@ -3244,9 +3244,9 @@ int seq_ioctl(FAR struct seq_s *seq, int fifoid, int cmd, unsigned long arg) case SCUIOC_SETFILTER: { - FAR struct math_filter_s *f = - (FAR struct math_filter_s *)(uintptr_t)arg; - FAR struct scufifo_s *fifo = seq_getfifo(seq, fifoid); + struct math_filter_s *f = + (struct math_filter_s *)(uintptr_t)arg; + struct scufifo_s *fifo = seq_getfifo(seq, fifoid); if (seq_fifoisactive(seq, fifoid)) { @@ -3256,7 +3256,7 @@ int seq_ioctl(FAR struct seq_s *seq, int fifoid, int cmd, unsigned long arg) if (seq->type & SEQ_TYPE_DECI) { - FAR struct decimator_s *dec = (struct decimator_s *)seq; + struct decimator_s *dec = (struct decimator_s *)seq; fifo = dec->dfifo[fifoid].fifo; } @@ -3271,9 +3271,9 @@ int seq_ioctl(FAR struct seq_s *seq, int fifoid, int cmd, unsigned long arg) case SCUIOC_SETNOTIFY: { - FAR struct scuev_notify_s *en = - (FAR struct scuev_notify_s *)(uintptr_t)arg; - FAR struct scufifo_s *fifo = seq_getfifo(seq, fifoid); + struct scuev_notify_s *en = + (struct scuev_notify_s *)(uintptr_t)arg; + struct scufifo_s *fifo = seq_getfifo(seq, fifoid); if (seq_fifoisactive(seq, fifoid)) { @@ -3283,7 +3283,7 @@ int seq_ioctl(FAR struct seq_s *seq, int fifoid, int cmd, unsigned long arg) if (seq->type & SEQ_TYPE_DECI) { - FAR struct decimator_s *dec = (struct decimator_s *)seq; + struct decimator_s *dec = (struct decimator_s *)seq; fifo = dec->dfifo[fifoid].fifo; } @@ -3309,10 +3309,10 @@ int seq_ioctl(FAR struct seq_s *seq, int fifoid, int cmd, unsigned long arg) case SCUIOC_SETDECIMATION: { - FAR struct decimation_s *d = - (FAR struct decimation_s *)(uintptr_t)arg; - FAR struct decimator_s *deci = (FAR struct decimator_s *)seq; - FAR struct decimation_fifo_s *dfifo = &deci->dfifo[fifoid]; + struct decimation_s *d = + (struct decimation_s *)(uintptr_t)arg; + struct decimator_s *deci = (struct decimator_s *)seq; + struct decimation_fifo_s *dfifo = &deci->dfifo[fifoid]; if (!(seq->type & SEQ_TYPE_DECI)) { @@ -3338,8 +3338,8 @@ int seq_ioctl(FAR struct seq_s *seq, int fifoid, int cmd, unsigned long arg) case SCUIOC_SETWATERMARK: { - FAR struct scufifo_wm_s *wm = - (FAR struct scufifo_wm_s *)(uintptr_t)arg; + struct scufifo_wm_s *wm = + (struct scufifo_wm_s *)(uintptr_t)arg; ret = seq_setwatermark(seq, fifoid, wm); } @@ -3397,7 +3397,7 @@ int seq_ioctl(FAR struct seq_s *seq, int fifoid, int cmd, unsigned long arg) * ****************************************************************************/ -void seq_close(FAR struct seq_s *seq) +void seq_close(struct seq_s *seq) { irqstate_t flags; @@ -3405,7 +3405,7 @@ void seq_close(FAR struct seq_s *seq) if (seq->type & SEQ_TYPE_DECI) { - FAR struct decimator_s *deci = (FAR struct decimator_s *)seq; + struct decimator_s *deci = (struct decimator_s *)seq; int i; flags = enter_critical_section(); diff --git a/arch/arm/src/cxd56xx/cxd56_sdhci.c b/arch/arm/src/cxd56xx/cxd56_sdhci.c index 423f51bd18..66e786174a 100644 --- a/arch/arm/src/cxd56xx/cxd56_sdhci.c +++ b/arch/arm/src/cxd56xx/cxd56_sdhci.c @@ -351,68 +351,68 @@ static void cxd56_endtransfer(struct cxd56_sdiodev_s *priv, /* Interrupt Handling *******************************************************/ -static int cxd56_interrupt(int irq, FAR void *context, FAR void *arg); +static int cxd56_interrupt(int irq, void *context, void *arg); /* SDIO interface methods ***************************************************/ /* Mutual exclusion */ #ifdef CONFIG_SDIO_MUXBUS -static int cxd56_sdio_lock(FAR struct sdio_dev_s *dev, bool lock); +static int cxd56_sdio_lock(struct sdio_dev_s *dev, bool lock); #endif /* Initialization/setup */ -static void cxd56_sdio_sdhci_reset(FAR struct sdio_dev_s *dev); -static sdio_capset_t cxd56_sdio_capabilities(FAR struct sdio_dev_s *dev); -static sdio_statset_t cxd56_sdio_status(FAR struct sdio_dev_s *dev); -static void cxd56_sdio_widebus(FAR struct sdio_dev_s *dev, bool enable); +static void cxd56_sdio_sdhci_reset(struct sdio_dev_s *dev); +static sdio_capset_t cxd56_sdio_capabilities(struct sdio_dev_s *dev); +static sdio_statset_t cxd56_sdio_status(struct sdio_dev_s *dev); +static void cxd56_sdio_widebus(struct sdio_dev_s *dev, bool enable); static void cxd56_sdio_frequency(uint32_t frequency); -static void cxd56_sdio_clock(FAR struct sdio_dev_s *dev, +static void cxd56_sdio_clock(struct sdio_dev_s *dev, enum sdio_clock_e rate); -static int cxd56_sdio_attach(FAR struct sdio_dev_s *dev); +static int cxd56_sdio_attach(struct sdio_dev_s *dev); /* Command/Status/Data Transfer */ -static int cxd56_sdio_sendcmd(FAR struct sdio_dev_s *dev, +static int cxd56_sdio_sendcmd(struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg); -static void cxd56_blocksetup(FAR struct sdio_dev_s *dev, +static void cxd56_blocksetup(struct sdio_dev_s *dev, unsigned int blocklen, unsigned int nblocks); #ifndef CONFIG_SDIO_DMA -static int cxd56_sdio_recvsetup(FAR struct sdio_dev_s *dev, - FAR uint8_t *buffer, size_t nbytes); -static int cxd56_sdio_sendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, uint32_t nbytes); +static int cxd56_sdio_recvsetup(struct sdio_dev_s *dev, + uint8_t *buffer, size_t nbytes); +static int cxd56_sdio_sendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, uint32_t nbytes); #endif -static int cxd56_sdio_cancel(FAR struct sdio_dev_s *dev); +static int cxd56_sdio_cancel(struct sdio_dev_s *dev); -static int cxd56_sdio_waitresponse(FAR struct sdio_dev_s *dev, +static int cxd56_sdio_waitresponse(struct sdio_dev_s *dev, uint32_t cmd); -static int cxd56_sdio_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int cxd56_sdio_recvshortcrc(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort); -static int cxd56_sdio_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int cxd56_sdio_recvlong(struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong[4]); -static int cxd56_sdio_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int cxd56_sdio_recvshort(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort); /* EVENT handler */ -static void cxd56_sdio_waitenable(FAR struct sdio_dev_s *dev, +static void cxd56_sdio_waitenable(struct sdio_dev_s *dev, sdio_eventset_t eventset, uint32_t timeout); -static sdio_eventset_t cxd56_sdio_eventwait(FAR struct sdio_dev_s *dev); -static void cxd56_sdio_callbackenable(FAR struct sdio_dev_s *dev, +static sdio_eventset_t cxd56_sdio_eventwait(struct sdio_dev_s *dev); +static void cxd56_sdio_callbackenable(struct sdio_dev_s *dev, sdio_eventset_t eventset); -static int cxd56_sdio_registercallback(FAR struct sdio_dev_s *dev, +static int cxd56_sdio_registercallback(struct sdio_dev_s *dev, worker_t callback, void *arg); /* DMA */ #ifdef CONFIG_SDIO_DMA -static int cxd56_sdio_admasetup(FAR const uint8_t *buffer, size_t buflen); -static int cxd56_sdio_dmarecvsetup(FAR struct sdio_dev_s *dev, - FAR uint8_t *buffer, size_t buflen); -static int cxd56_sdio_dmasendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, size_t buflen); +static int cxd56_sdio_admasetup(const uint8_t *buffer, size_t buflen); +static int cxd56_sdio_dmarecvsetup(struct sdio_dev_s *dev, + uint8_t *buffer, size_t buflen); +static int cxd56_sdio_dmasendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t buflen); #endif /* Initialization/uninitialization/reset ************************************/ @@ -477,7 +477,7 @@ static struct cxd56_sdhcregs_s g_sampleregs[DEBUG_NSAMPLES]; /* DMA */ #ifdef CONFIG_SDIO_DMA -static FAR uint32_t cxd56_sdhci_adma_dscr[CXD56_SDIO_MAX_LEN_ADMA_DSCR * 2]; +static uint32_t cxd56_sdhci_adma_dscr[CXD56_SDIO_MAX_LEN_ADMA_DSCR * 2]; #endif /**************************************************************************** @@ -1105,7 +1105,7 @@ static void cxd56_endtransfer(struct cxd56_sdiodev_s *priv, * ****************************************************************************/ -static int cxd56_interrupt(int irq, FAR void *context, FAR void *arg) +static int cxd56_interrupt(int irq, void *context, void *arg) { struct cxd56_sdiodev_s *priv = &g_sdhcdev; uint32_t enabled; @@ -1257,7 +1257,7 @@ static int cxd56_interrupt(int irq, FAR void *context, FAR void *arg) ****************************************************************************/ #ifdef CONFIG_SDIO_MUXBUS -static int cxd56_sdio_lock(FAR struct sdio_dev_s *dev, bool lock) +static int cxd56_sdio_lock(struct sdio_dev_s *dev, bool lock) { /* Enable SD clock only while accessing to the SDIO. */ @@ -1288,9 +1288,9 @@ static int cxd56_sdio_lock(FAR struct sdio_dev_s *dev, bool lock) * ****************************************************************************/ -static void cxd56_sdio_sdhci_reset(FAR struct sdio_dev_s *dev) +static void cxd56_sdio_sdhci_reset(struct sdio_dev_s *dev) { - FAR struct cxd56_sdiodev_s *priv = (FAR struct cxd56_sdiodev_s *)dev; + struct cxd56_sdiodev_s *priv = (struct cxd56_sdiodev_s *)dev; uint32_t regval; int32_t timeout = 100; @@ -1387,7 +1387,7 @@ static void cxd56_sdio_sdhci_reset(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static sdio_capset_t cxd56_sdio_capabilities(FAR struct sdio_dev_s *dev) +static sdio_capset_t cxd56_sdio_capabilities(struct sdio_dev_s *dev) { sdio_capset_t caps = 0; @@ -1422,7 +1422,7 @@ static sdio_capset_t cxd56_sdio_capabilities(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static sdio_statset_t cxd56_sdio_status(FAR struct sdio_dev_s *dev) +static sdio_statset_t cxd56_sdio_status(struct sdio_dev_s *dev) { struct cxd56_sdiodev_s *priv = (struct cxd56_sdiodev_s *)dev; return priv->cdstatus; @@ -1445,7 +1445,7 @@ static sdio_statset_t cxd56_sdio_status(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static void cxd56_sdio_widebus(FAR struct sdio_dev_s *dev, bool wide) +static void cxd56_sdio_widebus(struct sdio_dev_s *dev, bool wide) { uint32_t regval; @@ -1515,7 +1515,7 @@ static void cxd56_sdio_frequency(uint32_t frequency) putreg32(regval, CXD56_SDHCI_SYSCTL); } -static void cxd56_sdio_clock(FAR struct sdio_dev_s *dev, +static void cxd56_sdio_clock(struct sdio_dev_s *dev, enum sdio_clock_e rate) { uint32_t regval; @@ -1637,7 +1637,7 @@ static void cxd56_sdio_clock(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static int cxd56_sdio_attach(FAR struct sdio_dev_s *dev) +static int cxd56_sdio_attach(struct sdio_dev_s *dev) { int ret; @@ -1685,7 +1685,7 @@ static int cxd56_sdio_attach(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static int cxd56_sdio_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int cxd56_sdio_sendcmd(struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg) { #ifdef CONFIG_SDIO_DMA @@ -1884,7 +1884,7 @@ static int cxd56_sdio_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, * ****************************************************************************/ -static void cxd56_blocksetup(FAR struct sdio_dev_s *dev, +static void cxd56_blocksetup(struct sdio_dev_s *dev, unsigned int blocklen, unsigned int nblocks) { struct cxd56_sdiodev_s *priv = (struct cxd56_sdiodev_s *)dev; @@ -1925,8 +1925,8 @@ static void cxd56_blocksetup(FAR struct sdio_dev_s *dev, ****************************************************************************/ #ifndef CONFIG_SDIO_DMA -static int cxd56_sdio_recvsetup(FAR struct sdio_dev_s *dev, - FAR uint8_t *buffer, size_t nbytes) +static int cxd56_sdio_recvsetup(struct sdio_dev_s *dev, + uint8_t *buffer, size_t nbytes) { struct cxd56_sdiodev_s *priv = (struct cxd56_sdiodev_s *)dev; @@ -1983,8 +1983,8 @@ static int cxd56_sdio_recvsetup(FAR struct sdio_dev_s *dev, ****************************************************************************/ #ifndef CONFIG_SDIO_DMA -static int cxd56_sdio_sendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, size_t nbytes) +static int cxd56_sdio_sendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t nbytes) { struct cxd56_sdiodev_s *priv = (struct cxd56_sdiodev_s *)dev; @@ -2035,7 +2035,7 @@ static int cxd56_sdio_sendsetup(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static int cxd56_sdio_cancel(FAR struct sdio_dev_s *dev) +static int cxd56_sdio_cancel(struct sdio_dev_s *dev) { struct cxd56_sdiodev_s *priv = (struct cxd56_sdiodev_s *)dev; uint32_t regval; @@ -2120,7 +2120,7 @@ static int cxd56_sdio_cancel(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static int cxd56_sdio_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd) +static int cxd56_sdio_waitresponse(struct sdio_dev_s *dev, uint32_t cmd) { uint32_t errors; int32_t timeout = SDHCI_CMDTIMEOUT; @@ -2227,7 +2227,7 @@ static int cxd56_sdio_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd) * ****************************************************************************/ -static int cxd56_sdio_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int cxd56_sdio_recvshortcrc(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort) { uint32_t regval; @@ -2314,7 +2314,7 @@ static int cxd56_sdio_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, return ret; } -static int cxd56_sdio_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int cxd56_sdio_recvlong(struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong[4]) { uint32_t regval; @@ -2387,7 +2387,7 @@ static int cxd56_sdio_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, return ret; } -static int cxd56_sdio_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int cxd56_sdio_recvshort(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort) { uint32_t regval; @@ -2492,7 +2492,7 @@ static int cxd56_sdio_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, * ****************************************************************************/ -static void cxd56_sdio_waitenable(FAR struct sdio_dev_s *dev, +static void cxd56_sdio_waitenable(struct sdio_dev_s *dev, sdio_eventset_t eventset, uint32_t timeout) { struct cxd56_sdiodev_s *priv = (struct cxd56_sdiodev_s *)dev; @@ -2571,7 +2571,7 @@ static void cxd56_sdio_waitenable(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static sdio_eventset_t cxd56_sdio_eventwait(FAR struct sdio_dev_s *dev) +static sdio_eventset_t cxd56_sdio_eventwait(struct sdio_dev_s *dev) { struct cxd56_sdiodev_s *priv = (struct cxd56_sdiodev_s *)dev; sdio_eventset_t wkupevent = 0; @@ -2686,7 +2686,7 @@ static sdio_eventset_t cxd56_sdio_eventwait(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static void cxd56_sdio_callbackenable(FAR struct sdio_dev_s *dev, +static void cxd56_sdio_callbackenable(struct sdio_dev_s *dev, sdio_eventset_t eventset) { struct cxd56_sdiodev_s *priv = (struct cxd56_sdiodev_s *)dev; @@ -2720,7 +2720,7 @@ static void cxd56_sdio_callbackenable(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static int cxd56_sdio_registercallback(FAR struct sdio_dev_s *dev, +static int cxd56_sdio_registercallback(struct sdio_dev_s *dev, worker_t callback, void *arg) { struct cxd56_sdiodev_s *priv = (struct cxd56_sdiodev_s *)dev; @@ -2754,7 +2754,7 @@ static int cxd56_sdio_registercallback(FAR struct sdio_dev_s *dev, ****************************************************************************/ #ifdef CONFIG_SDIO_DMA -static int cxd56_sdio_admasetup(FAR const uint8_t *buffer, size_t buflen) +static int cxd56_sdio_admasetup(const uint8_t *buffer, size_t buflen) { uint32_t dscr_top = CXD56_PHYSADDR(cxd56_sdhci_adma_dscr); uint32_t dscr_l; @@ -2823,12 +2823,12 @@ static int cxd56_sdio_admasetup(FAR const uint8_t *buffer, size_t buflen) ****************************************************************************/ #ifdef CONFIG_SDIO_DMA -static int cxd56_sdio_dmarecvsetup(FAR struct sdio_dev_s *dev, - FAR uint8_t *buffer, size_t buflen) +static int cxd56_sdio_dmarecvsetup(struct sdio_dev_s *dev, + uint8_t *buffer, size_t buflen) { struct cxd56_sdiodev_s *priv = (struct cxd56_sdiodev_s *)dev; unsigned int blocksize; - int ret = OK; + int ret = OK; DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0); DEBUGASSERT(((uint32_t)buffer & 3) == 0); @@ -2940,8 +2940,8 @@ error: ****************************************************************************/ #ifdef CONFIG_SDIO_DMA -static int cxd56_sdio_dmasendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, size_t buflen) +static int cxd56_sdio_dmasendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t buflen) { uint32_t r1; int ret = OK; @@ -3198,7 +3198,7 @@ static void cxd56_sdio_callback(void *arg) * ****************************************************************************/ -FAR struct sdio_dev_s *cxd56_sdhci_initialize(int slotno) +struct sdio_dev_s *cxd56_sdhci_initialize(int slotno) { uint32_t regval; #ifdef CONFIG_SDIO_DMA @@ -3293,7 +3293,7 @@ FAR struct sdio_dev_s *cxd56_sdhci_initialize(int slotno) * ****************************************************************************/ -FAR struct sdio_dev_s *cxd56_sdhci_finalize(int slotno) +struct sdio_dev_s *cxd56_sdhci_finalize(int slotno) { uint32_t regval; @@ -3349,7 +3349,7 @@ FAR struct sdio_dev_s *cxd56_sdhci_finalize(int slotno) * ****************************************************************************/ -void cxd56_sdhci_mediachange(FAR struct sdio_dev_s *dev) +void cxd56_sdhci_mediachange(struct sdio_dev_s *dev) { struct cxd56_sdiodev_s *priv = (struct cxd56_sdiodev_s *)dev; sdio_statset_t cdstatus; @@ -3422,7 +3422,7 @@ void cxd56_sdhci_mediachange(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -void cxd56_sdhci_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect) +void cxd56_sdhci_wrprotect(struct sdio_dev_s *dev, bool wrprotect) { struct cxd56_sdiodev_s *priv = (struct cxd56_sdiodev_s *)dev; irqstate_t flags; @@ -3454,7 +3454,7 @@ void cxd56_sdhci_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect) * ****************************************************************************/ -void cxd56_sdio_resetstatus(FAR struct sdio_dev_s *dev) +void cxd56_sdio_resetstatus(struct sdio_dev_s *dev) { struct cxd56_sdiodev_s *priv = (struct cxd56_sdiodev_s *)dev; priv->cdstatus = 0; diff --git a/arch/arm/src/cxd56xx/cxd56_sdhci.h b/arch/arm/src/cxd56xx/cxd56_sdhci.h index 327ccb09b5..8e377e592c 100644 --- a/arch/arm/src/cxd56xx/cxd56_sdhci.h +++ b/arch/arm/src/cxd56xx/cxd56_sdhci.h @@ -424,7 +424,7 @@ struct sdio_dev_s; * ****************************************************************************/ -FAR struct sdio_dev_s *cxd56_sdhci_initialize(int slotno); +struct sdio_dev_s *cxd56_sdhci_initialize(int slotno); /**************************************************************************** * Name: cxd56_sdhci_finalize @@ -441,7 +441,7 @@ FAR struct sdio_dev_s *cxd56_sdhci_initialize(int slotno); * ****************************************************************************/ -FAR struct sdio_dev_s *cxd56_sdhci_finalize(int slotno); +struct sdio_dev_s *cxd56_sdhci_finalize(int slotno); /**************************************************************************** * Name: cxd56_sdhci_mediachange @@ -459,7 +459,7 @@ FAR struct sdio_dev_s *cxd56_sdhci_finalize(int slotno); * ****************************************************************************/ -void cxd56_sdhci_mediachange(FAR struct sdio_dev_s *dev); +void cxd56_sdhci_mediachange(struct sdio_dev_s *dev); /**************************************************************************** * Name: sdio_wrprotect @@ -477,7 +477,7 @@ void cxd56_sdhci_mediachange(FAR struct sdio_dev_s *dev); * ****************************************************************************/ -void cxd56_sdhci_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect); +void cxd56_sdhci_wrprotect(struct sdio_dev_s *dev, bool wrprotect); /**************************************************************************** * Name: cxd56_sdio_resetstatus @@ -490,7 +490,7 @@ void cxd56_sdhci_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect); * ****************************************************************************/ -void cxd56_sdio_resetstatus(FAR struct sdio_dev_s *dev); +void cxd56_sdio_resetstatus(struct sdio_dev_s *dev); #undef EXTERN #ifdef __cplusplus diff --git a/arch/arm/src/cxd56xx/cxd56_serial.c b/arch/arm/src/cxd56xx/cxd56_serial.c index fd1fa7d51b..d28b6f0158 100644 --- a/arch/arm/src/cxd56xx/cxd56_serial.c +++ b/arch/arm/src/cxd56xx/cxd56_serial.c @@ -94,23 +94,23 @@ struct up_dev_s #ifndef CONFIG_SUPPRESS_UART_CONFIG static void up_set_format(struct uart_dev_s *dev); #endif -static int up_setup(FAR struct uart_dev_s *dev); -static void up_shutdown(FAR struct uart_dev_s *dev); -static int up_attach(FAR struct uart_dev_s *dev); -static void up_detach(FAR struct uart_dev_s *dev); -static int up_interrupt(int irq, FAR void *context, FAR void *arg); -static int up_ioctl(FAR struct file *filep, int cmd, unsigned long arg); +static int up_setup(struct uart_dev_s *dev); +static void up_shutdown(struct uart_dev_s *dev); +static int up_attach(struct uart_dev_s *dev); +static void up_detach(struct uart_dev_s *dev); +static int up_interrupt(int irq, void *context, void *arg); +static int up_ioctl(struct file *filep, int cmd, unsigned long arg); #ifdef CONFIG_UART2_IFLOWCONTROL -static bool up_rxflowcontrol(FAR struct uart_dev_s *dev, +static bool up_rxflowcontrol(struct uart_dev_s *dev, unsigned int nbuffered, bool upper); #endif -static int up_receive(FAR struct uart_dev_s *dev, FAR unsigned int *status); -static void up_rxint(FAR struct uart_dev_s *dev, bool enable); -static bool up_rxavailable(FAR struct uart_dev_s *dev); -static void up_send(FAR struct uart_dev_s *dev, int ch); -static void up_txint(FAR struct uart_dev_s *dev, bool enable); -static bool up_txready(FAR struct uart_dev_s *dev); -static bool up_txempty(FAR struct uart_dev_s *dev); +static int up_receive(struct uart_dev_s *dev, unsigned int *status); +static void up_rxint(struct uart_dev_s *dev, bool enable); +static bool up_rxavailable(struct uart_dev_s *dev); +static void up_send(struct uart_dev_s *dev, int ch); +static void up_txint(struct uart_dev_s *dev, bool enable); +static bool up_txready(struct uart_dev_s *dev); +static bool up_txempty(struct uart_dev_s *dev); /**************************************************************************** * Private Data @@ -264,7 +264,7 @@ static uart_dev_t g_uart2port = * Name: up_serialin ****************************************************************************/ -static inline uint32_t up_serialin(FAR struct up_dev_s *priv, int offset) +static inline uint32_t up_serialin(struct up_dev_s *priv, int offset) { return getreg32(priv->uartbase + offset); } @@ -273,7 +273,7 @@ static inline uint32_t up_serialin(FAR struct up_dev_s *priv, int offset) * Name: up_serialout ****************************************************************************/ -static inline void up_serialout(FAR struct up_dev_s *priv, int offset, +static inline void up_serialout(struct up_dev_s *priv, int offset, uint32_t value) { putreg32(value, priv->uartbase + offset); @@ -283,8 +283,8 @@ static inline void up_serialout(FAR struct up_dev_s *priv, int offset, * Name: up_disableuartint ****************************************************************************/ -static inline void up_disableuartint(FAR struct up_dev_s *priv, - FAR uint32_t *ier) +static inline void up_disableuartint(struct up_dev_s *priv, + uint32_t *ier) { irqstate_t flags; @@ -303,7 +303,7 @@ static inline void up_disableuartint(FAR struct up_dev_s *priv, * Name: up_restoreuartint ****************************************************************************/ -static inline void up_restoreuartint(FAR struct up_dev_s *priv, uint32_t ier) +static inline void up_restoreuartint(struct up_dev_s *priv, uint32_t ier) { irqstate_t flags; @@ -317,7 +317,7 @@ static inline void up_restoreuartint(FAR struct up_dev_s *priv, uint32_t ier) * Name: up_enablebreaks ****************************************************************************/ -static inline void up_enablebreaks(FAR struct up_dev_s *priv, bool enable) +static inline void up_enablebreaks(struct up_dev_s *priv, bool enable) { uint32_t lcr = up_serialin(priv, CXD56_UART_LCR_H); if (enable) @@ -339,7 +339,7 @@ static inline void up_enablebreaks(FAR struct up_dev_s *priv, bool enable) #ifdef CONFIG_CXD56_UART2 static int cxd56_serial2_pm_event(uint8_t id) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)&g_uart2priv; + struct up_dev_s *priv = (struct up_dev_s *)&g_uart2priv; switch (id) { @@ -366,7 +366,7 @@ static int cxd56_serial2_pm_event(uint8_t id) #ifndef CONFIG_SUPPRESS_UART_CONFIG static void up_set_format(struct uart_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint32_t lcr; uint32_t cr; uint32_t cr_en; @@ -451,10 +451,10 @@ static void up_set_format(struct uart_dev_s *dev) * ****************************************************************************/ -static int up_setup(FAR struct uart_dev_s *dev) +static int up_setup(struct uart_dev_s *dev) { #ifndef CONFIG_SUPPRESS_UART_CONFIG - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint32_t lcr; uint32_t cr; @@ -524,9 +524,9 @@ static int up_setup(FAR struct uart_dev_s *dev) * ****************************************************************************/ -static void up_shutdown(FAR struct uart_dev_s *dev) +static void up_shutdown(struct uart_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->priv; /* Disable further interrupts from the UART */ @@ -572,9 +572,9 @@ static void up_shutdown(FAR struct uart_dev_s *dev) * ****************************************************************************/ -static int up_attach(FAR struct uart_dev_s *dev) +static int up_attach(struct uart_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->priv; int ret; /* Attach and enable the IRQ */ @@ -602,9 +602,9 @@ static int up_attach(FAR struct uart_dev_s *dev) * ****************************************************************************/ -static void up_detach(FAR struct uart_dev_s *dev) +static void up_detach(struct uart_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->priv; up_disable_irq(priv->irq); irq_detach(priv->irq); } @@ -633,7 +633,7 @@ static void up_detach(FAR struct uart_dev_s *dev) ****************************************************************************/ #ifdef CONFIG_SERIAL_IFLOWCONTROL -static bool up_rxflowcontrol(FAR struct uart_dev_s *dev, +static bool up_rxflowcontrol(struct uart_dev_s *dev, unsigned int nbuffered, bool upper) { up_rxint(dev, !upper); @@ -653,14 +653,14 @@ static bool up_rxflowcontrol(FAR struct uart_dev_s *dev, * ****************************************************************************/ -static int up_interrupt(int irq, FAR void *context, FAR void *arg) +static int up_interrupt(int irq, void *context, void *arg) { - FAR struct uart_dev_s *dev = (FAR struct uart_dev_s *)arg; - FAR struct up_dev_s *priv; + struct uart_dev_s *dev = (struct uart_dev_s *)arg; + struct up_dev_s *priv; uint32_t status; int passes; - priv = (FAR struct up_dev_s *)dev->priv; + priv = (struct up_dev_s *)dev->priv; /* Loop until there are no characters to be transferred or, * until we have been looping for a long time. @@ -733,19 +733,19 @@ static int up_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static int up_ioctl(FAR struct file *filep, int cmd, unsigned long arg) +static int up_ioctl(struct file *filep, int cmd, unsigned long arg) { - FAR struct inode *inode = filep->f_inode; - FAR struct uart_dev_s *dev = inode->i_private; - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->priv; - int ret = OK; + struct inode *inode = filep->f_inode; + struct uart_dev_s *dev = inode->i_private; + struct up_dev_s *priv = (struct up_dev_s *)dev->priv; + int ret = OK; switch (cmd) { #ifdef CONFIG_SERIAL_TIOCSERGSTRUCT case TIOCSERGSTRUCT: { - FAR struct up_dev_s *user = (FAR struct up_dev_s *)arg; + struct up_dev_s *user = (struct up_dev_s *)arg; if (!user) { ret = -EINVAL; @@ -761,7 +761,7 @@ static int up_ioctl(FAR struct file *filep, int cmd, unsigned long arg) #ifdef CONFIG_SERIAL_TERMIOS case TCGETS: { - FAR struct termios *termiosp = (FAR struct termios *)arg; + struct termios *termiosp = (struct termios *)arg; irqstate_t flags; if (!termiosp) @@ -810,7 +810,7 @@ static int up_ioctl(FAR struct file *filep, int cmd, unsigned long arg) case TCSETS: { - FAR struct termios *termiosp = (FAR struct termios *)arg; + struct termios *termiosp = (struct termios *)arg; irqstate_t flags; if (!termiosp) @@ -910,9 +910,9 @@ static int up_ioctl(FAR struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(FAR struct uart_dev_s *dev, FAR unsigned int *status) +static int up_receive(struct uart_dev_s *dev, unsigned int *status) { - FAR struct up_dev_s *priv = (struct up_dev_s *)dev->priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint32_t rbr; rbr = up_serialin(priv, CXD56_UART_DR); @@ -928,9 +928,9 @@ static int up_receive(FAR struct uart_dev_s *dev, FAR unsigned int *status) * ****************************************************************************/ -static void up_rxint(FAR struct uart_dev_s *dev, bool enable) +static void up_rxint(struct uart_dev_s *dev, bool enable) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->priv; irqstate_t flags; flags = spin_lock_irqsave(&priv->lock); @@ -957,9 +957,9 @@ static void up_rxint(FAR struct uart_dev_s *dev, bool enable) * ****************************************************************************/ -static bool up_rxavailable(FAR struct uart_dev_s *dev) +static bool up_rxavailable(struct uart_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->priv; return ((up_serialin(priv, CXD56_UART_FR) & UART_FLAG_RXFE) == 0); } @@ -971,9 +971,9 @@ static bool up_rxavailable(FAR struct uart_dev_s *dev) * ****************************************************************************/ -static void up_send(FAR struct uart_dev_s *dev, int ch) +static void up_send(struct uart_dev_s *dev, int ch) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->priv; up_serialout(priv, CXD56_UART_DR, (uint32_t)ch); } @@ -985,9 +985,9 @@ static void up_send(FAR struct uart_dev_s *dev, int ch) * ****************************************************************************/ -static void up_txint(FAR struct uart_dev_s *dev, bool enable) +static void up_txint(struct uart_dev_s *dev, bool enable) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->priv; irqstate_t flags; flags = spin_lock_irqsave(&priv->lock); @@ -1027,9 +1027,9 @@ static void up_txint(FAR struct uart_dev_s *dev, bool enable) * ****************************************************************************/ -static bool up_txready(FAR struct uart_dev_s *dev) +static bool up_txready(struct uart_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->priv; return ((up_serialin(priv, CXD56_UART_FR) & UART_FLAG_TXFF) == 0); } @@ -1041,9 +1041,9 @@ static bool up_txready(FAR struct uart_dev_s *dev) * ****************************************************************************/ -static bool up_txempty(FAR struct uart_dev_s *dev) +static bool up_txempty(struct uart_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->priv; uint32_t rbr = 0; rbr = up_serialin(priv, CXD56_UART_FR); return (((rbr & UART_FLAG_TXFE) != 0) && ((rbr & UART_FLAG_BUSY) == 0)); diff --git a/arch/arm/src/cxd56xx/cxd56_sfc.c b/arch/arm/src/cxd56xx/cxd56_sfc.c index 3ed01c8b77..1c5f4a1860 100644 --- a/arch/arm/src/cxd56xx/cxd56_sfc.c +++ b/arch/arm/src/cxd56xx/cxd56_sfc.c @@ -76,7 +76,7 @@ static struct flash_controller_s g_sfc; * Name: cxd56_erase ****************************************************************************/ -static int cxd56_erase(FAR struct mtd_dev_s *dev, off_t startblock, +static int cxd56_erase(struct mtd_dev_s *dev, off_t startblock, size_t nblocks) { int ret; @@ -97,8 +97,8 @@ static int cxd56_erase(FAR struct mtd_dev_s *dev, off_t startblock, return OK; } -static ssize_t cxd56_bread(FAR struct mtd_dev_s *dev, off_t startblock, - size_t nblocks, FAR uint8_t *buffer) +static ssize_t cxd56_bread(struct mtd_dev_s *dev, off_t startblock, + size_t nblocks, uint8_t *buffer) { int ret; @@ -115,8 +115,8 @@ static ssize_t cxd56_bread(FAR struct mtd_dev_s *dev, off_t startblock, return nblocks; } -static ssize_t cxd56_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, - size_t nblocks, FAR const uint8_t *buffer) +static ssize_t cxd56_bwrite(struct mtd_dev_s *dev, off_t startblock, + size_t nblocks, const uint8_t *buffer) { int ret; @@ -138,8 +138,8 @@ static ssize_t cxd56_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, return nblocks; } -static ssize_t cxd56_read(FAR struct mtd_dev_s *dev, off_t offset, - size_t nbytes, FAR uint8_t *buffer) +static ssize_t cxd56_read(struct mtd_dev_s *dev, off_t offset, + size_t nbytes, uint8_t *buffer) { int ret; @@ -155,8 +155,8 @@ static ssize_t cxd56_read(FAR struct mtd_dev_s *dev, off_t offset, } #ifdef CONFIG_MTD_BYTE_WRITE -static ssize_t cxd56_write(FAR struct mtd_dev_s *dev, off_t offset, - size_t nbytes, FAR const uint8_t *buffer) +static ssize_t cxd56_write(struct mtd_dev_s *dev, off_t offset, + size_t nbytes, const uint8_t *buffer) { int ret; @@ -176,7 +176,7 @@ static ssize_t cxd56_write(FAR struct mtd_dev_s *dev, off_t offset, } #endif -static int cxd56_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) +static int cxd56_ioctl(struct mtd_dev_s *dev, int cmd, unsigned long arg) { struct flash_controller_s *priv = (struct flash_controller_s *)dev; int ret = OK; @@ -185,8 +185,8 @@ static int cxd56_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) { case MTDIOC_GEOMETRY: { - FAR struct mtd_geometry_s *geo = - (FAR struct mtd_geometry_s *)((uintptr_t)arg); + struct mtd_geometry_s *geo = + (struct mtd_geometry_s *)((uintptr_t)arg); finfo("cmd: GEOM\n"); if (geo) { @@ -214,8 +214,8 @@ static int cxd56_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) case BIOC_PARTINFO: { - FAR struct partition_info_s *info = - (FAR struct partition_info_s *)arg; + struct partition_info_s *info = + (struct partition_info_s *)arg; if (info != NULL) { info->numsectors = priv->density / PAGE_SIZE; @@ -251,7 +251,7 @@ static int cxd56_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) return ret; } -FAR struct mtd_dev_s *cxd56_sfc_initialize(void) +struct mtd_dev_s *cxd56_sfc_initialize(void) { struct flash_controller_s *priv = &g_sfc; @@ -272,7 +272,7 @@ FAR struct mtd_dev_s *cxd56_sfc_initialize(void) /* Allocate a buffer for the erase block cache */ - priv->cache = (FAR uint8_t *)kmm_malloc(SPIFI_BLKSIZE); + priv->cache = (uint8_t *)kmm_malloc(SPIFI_BLKSIZE); if (!priv->cache) { /* Allocation failed! */ diff --git a/arch/arm/src/cxd56xx/cxd56_sfc.h b/arch/arm/src/cxd56xx/cxd56_sfc.h index a331b664c1..49e6e783b6 100644 --- a/arch/arm/src/cxd56xx/cxd56_sfc.h +++ b/arch/arm/src/cxd56xx/cxd56_sfc.h @@ -43,7 +43,7 @@ extern "C" * Public Functions Prototypes ****************************************************************************/ -FAR struct mtd_dev_s *cxd56_sfc_initialize(void); +struct mtd_dev_s *cxd56_sfc_initialize(void); #undef EXTERN #ifdef __cplusplus diff --git a/arch/arm/src/cxd56xx/cxd56_sph.c b/arch/arm/src/cxd56xx/cxd56_sph.c index c5cb6e324c..13a13cf9a6 100644 --- a/arch/arm/src/cxd56xx/cxd56_sph.c +++ b/arch/arm/src/cxd56xx/cxd56_sph.c @@ -76,14 +76,14 @@ struct sph_dev_s * Private Function Prototypes ****************************************************************************/ -static int sph_open(FAR struct file *filep); -static int sph_ioctl(FAR struct file *filep, int cmd, unsigned long arg); +static int sph_open(struct file *filep); +static int sph_ioctl(struct file *filep, int cmd, unsigned long arg); static int sph_semtake(sem_t *id); static void sph_semgive(sem_t *id); -static int sph_lock(FAR struct sph_dev_s *priv); -static int sph_trylock(FAR struct sph_dev_s *priv); -static inline int sph_unlock(FAR struct sph_dev_s *priv); -static int cxd56_sphirqhandler(int irq, FAR void *context, FAR void *arg); +static int sph_lock(struct sph_dev_s *priv); +static int sph_trylock(struct sph_dev_s *priv); +static inline int sph_unlock(struct sph_dev_s *priv); +static int cxd56_sphirqhandler(int irq, void *context, void *arg); /**************************************************************************** * Private Data @@ -102,7 +102,7 @@ static int g_cpuid; * Private Functions ****************************************************************************/ -static int sph_open(FAR struct file *filep) +static int sph_open(struct file *filep) { /* Exclusive access */ @@ -114,10 +114,10 @@ static int sph_open(FAR struct file *filep) return OK; } -static int sph_ioctl(FAR struct file *filep, int cmd, unsigned long arg) +static int sph_ioctl(struct file *filep, int cmd, unsigned long arg) { - FAR struct sph_dev_s *priv = - (FAR struct sph_dev_s *)filep->f_inode->i_private; + struct sph_dev_s *priv = + (struct sph_dev_s *)filep->f_inode->i_private; int ret = -ENOTTY; hsinfo("cmd = %x\n", cmd); @@ -158,7 +158,7 @@ static void sph_semgive(sem_t *id) nxsem_post(id); } -static int sph_lock(FAR struct sph_dev_s *priv) +static int sph_lock(struct sph_dev_s *priv) { uint32_t sts; int ret; @@ -201,7 +201,7 @@ static int sph_lock(FAR struct sph_dev_s *priv) return OK; } -static int sph_trylock(FAR struct sph_dev_s *priv) +static int sph_trylock(struct sph_dev_s *priv) { uint32_t sts; @@ -221,22 +221,22 @@ static int sph_trylock(FAR struct sph_dev_s *priv) return -EBUSY; } -static inline int sph_unlock(FAR struct sph_dev_s *priv) +static inline int sph_unlock(struct sph_dev_s *priv) { putreg32(REQ_UNLOCK, CXD56_SPH_REQ(priv->id)); hsinfo("hsem%d is unlocked.\n", priv->id); return OK; } -static inline int cxd56_sphdevinit(FAR const char *devname, int num) +static inline int cxd56_sphdevinit(const char *devname, int num) { - FAR struct sph_dev_s *priv = &g_sphdev[num]; + struct sph_dev_s *priv = &g_sphdev[num]; char fullpath[64]; int ret; snprintf(fullpath, sizeof(fullpath), "/dev/%s%d", devname, num); - ret = register_driver(fullpath, &sph_fops, 0666, (FAR void *)priv); + ret = register_driver(fullpath, &sph_fops, 0666, (void *)priv); if (ret != 0) { return ERROR; @@ -252,7 +252,7 @@ static inline int cxd56_sphdevinit(FAR const char *devname, int num) return OK; } -static int cxd56_sphirqhandler(int irq, FAR void *context, FAR void *arg) +static int cxd56_sphirqhandler(int irq, void *context, void *arg) { int id; @@ -277,7 +277,7 @@ static int cxd56_sphirqhandler(int irq, FAR void *context, FAR void *arg) * Public Functions ****************************************************************************/ -int cxd56_sphinitialize(FAR const char *devname) +int cxd56_sphinitialize(const char *devname) { int ret; int i; diff --git a/arch/arm/src/cxd56xx/cxd56_sph.h b/arch/arm/src/cxd56xx/cxd56_sph.h index 1eb82fcd60..e99e58a7b6 100644 --- a/arch/arm/src/cxd56xx/cxd56_sph.h +++ b/arch/arm/src/cxd56xx/cxd56_sph.h @@ -51,7 +51,7 @@ extern "C" * Public Function Prototypes ****************************************************************************/ -int cxd56_sphinitialize(FAR const char *devname); +int cxd56_sphinitialize(const char *devname); #undef EXTERN #ifdef __cplusplus diff --git a/arch/arm/src/cxd56xx/cxd56_spi.c b/arch/arm/src/cxd56xx/cxd56_spi.c index 802b1b74c6..587a8db229 100644 --- a/arch/arm/src/cxd56xx/cxd56_spi.c +++ b/arch/arm/src/cxd56xx/cxd56_spi.c @@ -92,46 +92,46 @@ struct cxd56_spidev_s /* Helpers */ -static inline uint32_t spi_getreg(FAR struct cxd56_spidev_s *priv, +static inline uint32_t spi_getreg(struct cxd56_spidev_s *priv, uint8_t offset); -static inline void spi_putreg(FAR struct cxd56_spidev_s *priv, +static inline void spi_putreg(struct cxd56_spidev_s *priv, uint8_t offset, uint32_t value); /* DMA support */ #ifdef CONFIG_CXD56_DMAC -static void unused_code spi_dmaexchange(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, - FAR void *rxbuffer, size_t nwords); -static void spi_dmatrxwait(FAR struct cxd56_spidev_s *priv); +static void unused_code spi_dmaexchange(struct spi_dev_s *dev, + const void *txbuffer, + void *rxbuffer, size_t nwords); +static void spi_dmatrxwait(struct cxd56_spidev_s *priv); static void spi_dmatxcallback(DMA_HANDLE handle, uint8_t status, void *data); static void spi_dmarxcallback(DMA_HANDLE handle, uint8_t status, void *data); -static void spi_dmatxsetup(FAR struct cxd56_spidev_s *priv, - FAR const void *txbuffer, size_t nwords); -static void spi_dmarxsetup(FAR struct cxd56_spidev_s *priv, - FAR const void *rxbuffer, size_t nwords); +static void spi_dmatxsetup(struct cxd56_spidev_s *priv, + const void *txbuffer, size_t nwords); +static void spi_dmarxsetup(struct cxd56_spidev_s *priv, + const void *rxbuffer, size_t nwords); #ifndef CONFIG_SPI_EXCHANGE -static void spi_dmasndblock(FAR struct spi_dev_s *dev, - FAR const void *buffer, size_t nwords); +static void spi_dmasndblock(struct spi_dev_s *dev, + const void *buffer, size_t nwords); #endif #endif /* SPI methods */ -static int spi_lock(FAR struct spi_dev_s *dev, bool lock); -static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, +static int spi_lock(struct spi_dev_s *dev, bool lock); +static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency); -static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode); -static void spi_setbits(FAR struct spi_dev_s *dev, int nbits); -static uint32_t spi_send(FAR struct spi_dev_s *dev, uint32_t wd); -static void unused_code spi_exchange(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, - FAR void *rxbuffer, +static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode); +static void spi_setbits(struct spi_dev_s *dev, int nbits); +static uint32_t spi_send(struct spi_dev_s *dev, uint32_t wd); +static void unused_code spi_exchange(struct spi_dev_s *dev, + const void *txbuffer, + void *rxbuffer, size_t nwords); #ifndef CONFIG_SPI_EXCHANGE -static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, +static void spi_sndblock(struct spi_dev_s *dev, const void *buffer, size_t nwords); -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 nwords); #endif @@ -347,7 +347,7 @@ static struct pm_cpu_freqlock_s g_hold_lock = * ****************************************************************************/ -static inline uint32_t spi_getreg(FAR struct cxd56_spidev_s *priv, +static inline uint32_t spi_getreg(struct cxd56_spidev_s *priv, uint8_t offset) { return getreg32(priv->spibase + (uint32_t)offset); @@ -369,7 +369,7 @@ static inline uint32_t spi_getreg(FAR struct cxd56_spidev_s *priv, * ****************************************************************************/ -static inline void spi_putreg(FAR struct cxd56_spidev_s *priv, +static inline void spi_putreg(struct cxd56_spidev_s *priv, uint8_t offset, uint32_t value) { putreg32(value, priv->spibase + (uint32_t)offset); @@ -396,9 +396,9 @@ static inline void spi_putreg(FAR struct cxd56_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 cxd56_spidev_s *priv = (FAR struct cxd56_spidev_s *)dev; + struct cxd56_spidev_s *priv = (struct cxd56_spidev_s *)dev; if (lock) { @@ -427,10 +427,10 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock) * ****************************************************************************/ -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 cxd56_spidev_s *priv = (FAR struct cxd56_spidev_s *)dev; + struct cxd56_spidev_s *priv = (struct cxd56_spidev_s *)dev; uint32_t divisor; uint32_t actual; @@ -496,9 +496,9 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) +static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) { - FAR struct cxd56_spidev_s *priv = (FAR struct cxd56_spidev_s *)dev; + struct cxd56_spidev_s *priv = (struct cxd56_spidev_s *)dev; uint32_t regval; uint32_t cr1val; @@ -581,9 +581,9 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) * ****************************************************************************/ -static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) +static void spi_setbits(struct spi_dev_s *dev, int nbits) { - FAR struct cxd56_spidev_s *priv = (FAR struct cxd56_spidev_s *)dev; + struct cxd56_spidev_s *priv = (struct cxd56_spidev_s *)dev; uint32_t regval; /* Has the number of bits changed? */ @@ -646,9 +646,9 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) * ****************************************************************************/ -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 cxd56_spidev_s *priv = (FAR struct cxd56_spidev_s *)dev; + struct cxd56_spidev_s *priv = (struct cxd56_spidev_s *)dev; register uint32_t regval; register uint32_t cr1val = 0; @@ -724,25 +724,25 @@ static uint32_t spi_send(FAR struct spi_dev_s *dev, uint32_t wd) * ****************************************************************************/ -static void spi_do_exchange(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, FAR void *rxbuffer, +static void spi_do_exchange(struct spi_dev_s *dev, + const void *txbuffer, void *rxbuffer, size_t nwords) { - FAR struct cxd56_spidev_s *priv = (FAR struct cxd56_spidev_s *)dev; + struct cxd56_spidev_s *priv = (struct cxd56_spidev_s *)dev; uint32_t regval = 0; union { - FAR const uint8_t *p8; - FAR const uint16_t *p16; - FAR const void *pv; + const uint8_t *p8; + const uint16_t *p16; + const void *pv; } tx; union { - FAR uint8_t *p8; - FAR uint16_t *p16; - FAR void *pv; + uint8_t *p8; + uint16_t *p16; + void *pv; } rx; uint32_t data; @@ -859,11 +859,11 @@ static void spi_do_exchange(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, - FAR void *rxbuffer, size_t nwords) +static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, + void *rxbuffer, size_t nwords) { #ifdef CONFIG_CXD56_DMAC - FAR struct cxd56_spidev_s *priv = (FAR struct cxd56_spidev_s *)dev; + struct cxd56_spidev_s *priv = (struct cxd56_spidev_s *)dev; #ifdef CONFIG_CXD56_SPI_DMATHRESHOLD size_t dmath = CONFIG_CXD56_SPI_DMATHRESHOLD; @@ -903,7 +903,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, ****************************************************************************/ #ifndef CONFIG_SPI_EXCHANGE -static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, +static void spi_sndblock(struct spi_dev_s *dev, const void *buffer, size_t nwords) { return spi_exchange(dev, buffer, NULL, nwords); @@ -929,7 +929,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, * ****************************************************************************/ -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 nwords) { return spi_exchange(dev, NULL, buffer, nwords); @@ -1081,7 +1081,7 @@ static void cxd56_spi_pincontrol(int ch, bool on) static int spi4_colockchange(uint8_t id) { - FAR struct cxd56_spidev_s *priv = &g_spi4dev; + struct cxd56_spidev_s *priv = &g_spi4dev; switch (id) { @@ -1112,7 +1112,7 @@ static int spi4_colockchange(uint8_t id) static int spi5_colockchange(uint8_t id) { - FAR struct cxd56_spidev_s *priv = &g_spi5dev; + struct cxd56_spidev_s *priv = &g_spi5dev; switch (id) { @@ -1146,9 +1146,9 @@ static int spi5_colockchange(uint8_t id) * ****************************************************************************/ -FAR struct spi_dev_s *cxd56_spibus_initialize(int port) +struct spi_dev_s *cxd56_spibus_initialize(int port) { - FAR struct cxd56_spidev_s *priv; + struct cxd56_spidev_s *priv; uint32_t regval; int i; @@ -1242,7 +1242,7 @@ FAR struct spi_dev_s *cxd56_spibus_initialize(int port) /* Select a default frequency of approx. 400KHz */ - spi_setfrequency((FAR struct spi_dev_s *)priv, 400000); + spi_setfrequency((struct spi_dev_s *)priv, 400000); /* Initialize the SPI semaphore that enforces mutually exclusive access */ @@ -1298,9 +1298,9 @@ FAR struct spi_dev_s *cxd56_spibus_initialize(int port) ****************************************************************************/ void cxd56_spi_dmaconfig(int port, int chtype, DMA_HANDLE handle, - FAR dma_config_t *conf) + dma_config_t *conf) { - FAR struct cxd56_spidev_s *priv = NULL; + struct cxd56_spidev_s *priv = NULL; switch (port) { @@ -1370,9 +1370,9 @@ void cxd56_spi_dmaconfig(int port, int chtype, DMA_HANDLE handle, * ****************************************************************************/ -void spi_flush(FAR struct spi_dev_s *dev) +void spi_flush(struct spi_dev_s *dev) { - FAR struct cxd56_spidev_s *priv = (FAR struct cxd56_spidev_s *)dev; + struct cxd56_spidev_s *priv = (struct cxd56_spidev_s *)dev; uint32_t regval = 0; /* Prohibit the clock change during SPI transfer */ @@ -1438,11 +1438,11 @@ void spi_flush(FAR struct spi_dev_s *dev) * ****************************************************************************/ -static void spi_dmaexchange(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, - FAR void *rxbuffer, size_t nwords) +static void spi_dmaexchange(struct spi_dev_s *dev, + const void *txbuffer, + void *rxbuffer, size_t nwords) { - FAR struct cxd56_spidev_s *priv = (FAR struct cxd56_spidev_s *)dev; + struct cxd56_spidev_s *priv = (struct cxd56_spidev_s *)dev; uint32_t regval = 0; DEBUGASSERT(priv && priv->spibase); @@ -1503,8 +1503,8 @@ static void spi_dmaexchange(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void spi_dmasndblock(FAR struct spi_dev_s *dev, - FAR const void *buffer, size_t nwords) +static void spi_dmasndblock(struct spi_dev_s *dev, + const void *buffer, size_t nwords) { spi_dmaexchange(dev, buffer, NULL, nwords); } @@ -1517,8 +1517,8 @@ static void spi_dmasndblock(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void spi_dmarecvblock(FAR struct spi_dev_s *dev, - FAR const void *buffer, size_t nwords) +static void spi_dmarecvblock(struct spi_dev_s *dev, + const void *buffer, size_t nwords) { spi_dmaexchange(dev, NULL, buffer, nwords); } @@ -1534,7 +1534,7 @@ static void spi_dmarecvblock(FAR struct spi_dev_s *dev, static void spi_dmatxcallback(DMA_HANDLE handle, uint8_t status, void *data) { - FAR struct cxd56_spidev_s *priv = (FAR struct cxd56_spidev_s *)data; + struct cxd56_spidev_s *priv = (struct cxd56_spidev_s *)data; /* Wake-up the SPI driver */ @@ -1556,7 +1556,7 @@ static void spi_dmatxcallback(DMA_HANDLE handle, uint8_t status, void *data) static void spi_dmarxcallback(DMA_HANDLE handle, uint8_t status, void *data) { - FAR struct cxd56_spidev_s *priv = (FAR struct cxd56_spidev_s *)data; + struct cxd56_spidev_s *priv = (struct cxd56_spidev_s *)data; /* Wake-up the SPI driver */ @@ -1576,8 +1576,8 @@ static void spi_dmarxcallback(DMA_HANDLE handle, uint8_t status, void *data) * ****************************************************************************/ -static void spi_dmatxsetup(FAR struct cxd56_spidev_s *priv, - FAR const void *txbuffer, size_t nwords) +static void spi_dmatxsetup(struct cxd56_spidev_s *priv, + const void *txbuffer, size_t nwords) { uint32_t dst; uint32_t val; @@ -1599,8 +1599,8 @@ static void spi_dmatxsetup(FAR struct cxd56_spidev_s *priv, * ****************************************************************************/ -static void spi_dmarxsetup(FAR struct cxd56_spidev_s *priv, - FAR const void *rxbuffer, size_t nwords) +static void spi_dmarxsetup(struct cxd56_spidev_s *priv, + const void *rxbuffer, size_t nwords) { uint32_t src; uint32_t val; @@ -1622,7 +1622,7 @@ static void spi_dmarxsetup(FAR struct cxd56_spidev_s *priv, * ****************************************************************************/ -static void spi_dmatrxwait(FAR struct cxd56_spidev_s *priv) +static void spi_dmatrxwait(struct cxd56_spidev_s *priv) { uint32_t val; diff --git a/arch/arm/src/cxd56xx/cxd56_spi.h b/arch/arm/src/cxd56xx/cxd56_spi.h index 4e8340567f..07229fea6d 100644 --- a/arch/arm/src/cxd56xx/cxd56_spi.h +++ b/arch/arm/src/cxd56xx/cxd56_spi.h @@ -99,7 +99,7 @@ extern "C" * ****************************************************************************/ -FAR struct spi_dev_s *cxd56_spibus_initialize(int port); +struct spi_dev_s *cxd56_spibus_initialize(int port); /**************************************************************************** * Name: cxd56_spi_dmaconfig @@ -120,7 +120,7 @@ FAR struct spi_dev_s *cxd56_spibus_initialize(int port); #ifdef CONFIG_CXD56_DMAC void cxd56_spi_dmaconfig(int port, int chtype, DMA_HANDLE handle, - FAR dma_config_t *conf); + dma_config_t *conf); #endif /**************************************************************************** @@ -140,52 +140,52 @@ void cxd56_spi_dmaconfig(int port, int chtype, DMA_HANDLE handle, ****************************************************************************/ #ifdef CONFIG_CXD56_SPI0 -void cxd56_spi0select(FAR struct spi_dev_s *dev, +void cxd56_spi0select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t cxd56_spi0status(FAR struct spi_dev_s *dev, +uint8_t cxd56_spi0status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int cxd56_spi0cmddata(FAR struct spi_dev_s *dev, +int cxd56_spi0cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_CXD56_SPI3 -void cxd56_spi3select(FAR struct spi_dev_s *dev, +void cxd56_spi3select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t cxd56_spi3status(FAR struct spi_dev_s *dev, +uint8_t cxd56_spi3status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int cxd56_spi3cmddata(FAR struct spi_dev_s *dev, +int cxd56_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_CXD56_SPI4 -void cxd56_spi4select(FAR struct spi_dev_s *dev, +void cxd56_spi4select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t cxd56_spi4status(FAR struct spi_dev_s *dev, +uint8_t cxd56_spi4status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int cxd56_spi4cmddata(FAR struct spi_dev_s *dev, +int cxd56_spi4cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_CXD56_SPI5 -void cxd56_spi5select(FAR struct spi_dev_s *dev, +void cxd56_spi5select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t cxd56_spi5status(FAR struct spi_dev_s *dev, +uint8_t cxd56_spi5status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int cxd56_spi5cmddata(FAR struct spi_dev_s *dev, +int cxd56_spi5cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif @@ -207,7 +207,7 @@ int cxd56_spi5cmddata(FAR struct spi_dev_s *dev, * ****************************************************************************/ -void spi_flush(FAR struct spi_dev_s *dev); +void spi_flush(struct spi_dev_s *dev); /**************************************************************************** * Name: cxd56_spiXregister @@ -231,23 +231,23 @@ void spi_flush(FAR struct spi_dev_s *dev); #ifdef CONFIG_SPI_CALLBACK #ifdef CONFIG_CXD56_SPI0 -int cxd56_spi0register(FAR struct spi_dev_s *dev, spi_mediachange_t callback, - FAR void *arg); +int cxd56_spi0register(struct spi_dev_s *dev, spi_mediachange_t callback, + void *arg); #endif #ifdef CONFIG_CXD56_SPI3 -int cxd56_spi3register(FAR struct spi_dev_s *dev, spi_mediachange_t callback, - FAR void *arg); +int cxd56_spi3register(struct spi_dev_s *dev, spi_mediachange_t callback, + void *arg); #endif #ifdef CONFIG_CXD56_SPI4 -int cxd56_spi4register(FAR struct spi_dev_s *dev, spi_mediachange_t callback, - FAR void *arg); +int cxd56_spi4register(struct spi_dev_s *dev, spi_mediachange_t callback, + void *arg); #endif #ifdef CONFIG_CXD56_SPI5 -int cxd56_spi5register(FAR struct spi_dev_s *dev, spi_mediachange_t callback, - FAR void *arg); +int cxd56_spi5register(struct spi_dev_s *dev, spi_mediachange_t callback, + void *arg); #endif #endif diff --git a/arch/arm/src/cxd56xx/cxd56_sysctl.c b/arch/arm/src/cxd56xx/cxd56_sysctl.c index 94aab38d00..06781693f3 100644 --- a/arch/arm/src/cxd56xx/cxd56_sysctl.c +++ b/arch/arm/src/cxd56xx/cxd56_sysctl.c @@ -56,12 +56,12 @@ * Private Function Prototypes ****************************************************************************/ -static int sysctl_ioctl(FAR struct file *filep, int cmd, unsigned long arg); +static int sysctl_ioctl(struct file *filep, int cmd, unsigned long arg); static int sysctl_semtake(sem_t *semid); static void sysctl_semgive(sem_t *semid); static int sysctl_rxhandler(int cpuid, int protoid, uint32_t pdata, uint32_t data, - FAR void *userdata); + void *userdata); /**************************************************************************** * Private Data @@ -80,7 +80,7 @@ static const struct file_operations g_sysctlfops = * Private Functions ****************************************************************************/ -static int sysctl_ioctl(FAR struct file *filep, int cmd, unsigned long arg) +static int sysctl_ioctl(struct file *filep, int cmd, unsigned long arg) { int ret = OK; @@ -108,7 +108,7 @@ static void sysctl_semgive(sem_t *semid) static int sysctl_rxhandler(int cpuid, int protoid, uint32_t pdata, uint32_t data, - FAR void *userdata) + void *userdata) { DEBUGASSERT(cpuid == 0); DEBUGASSERT(protoid == CXD56_PROTO_SYSCTL); diff --git a/arch/arm/src/cxd56xx/cxd56_testset.c b/arch/arm/src/cxd56xx/cxd56_testset.c index aee69159d8..9f1bb57bce 100644 --- a/arch/arm/src/cxd56xx/cxd56_testset.c +++ b/arch/arm/src/cxd56xx/cxd56_testset.c @@ -45,7 +45,7 @@ * Name: up_testset2 ****************************************************************************/ -spinlock_t up_testset2(volatile FAR spinlock_t *lock) +spinlock_t up_testset2(volatile spinlock_t *lock) { register uintptr_t ret asm("r0") = (uintptr_t)(lock); @@ -90,7 +90,7 @@ spinlock_t up_testset2(volatile FAR spinlock_t *lock) * ****************************************************************************/ -spinlock_t up_testset(volatile FAR spinlock_t *lock) +spinlock_t up_testset(volatile spinlock_t *lock) { #ifdef CONFIG_CXD56_TESTSET_WITH_HWSEM spinlock_t ret; diff --git a/arch/arm/src/cxd56xx/cxd56_textheap.c b/arch/arm/src/cxd56xx/cxd56_textheap.c index 0599e666ae..b8a4ee05a8 100644 --- a/arch/arm/src/cxd56xx/cxd56_textheap.c +++ b/arch/arm/src/cxd56xx/cxd56_textheap.c @@ -47,10 +47,10 @@ * Name: up_textheap_memalign() ****************************************************************************/ -FAR void *up_textheap_memalign(size_t align, size_t size) +void *up_textheap_memalign(size_t align, size_t size) { - FAR void *ret; - ret = (FAR void *)kmm_malloc(size); + void *ret; + ret = (void *)kmm_malloc(size); #ifdef CONFIG_CXD56_USE_SYSBUS if (ret) @@ -75,7 +75,7 @@ FAR void *up_textheap_memalign(size_t align, size_t size) * Name: up_textheap_free() ****************************************************************************/ -void up_textheap_free(FAR void *p) +void up_textheap_free(void *p) { #ifdef CONFIG_CXD56_USE_SYSBUS if (p) diff --git a/arch/arm/src/cxd56xx/cxd56_timer.c b/arch/arm/src/cxd56xx/cxd56_timer.c index 493dcb364a..4369b5d2d5 100644 --- a/arch/arm/src/cxd56xx/cxd56_timer.c +++ b/arch/arm/src/cxd56xx/cxd56_timer.c @@ -85,16 +85,16 @@ struct cxd56_lowerhalf_s { - FAR const struct timer_ops_s *ops; /* Lower half operations */ + const struct timer_ops_s *ops; /* Lower half operations */ /* Private data */ - uint32_t base; /* Base address of the timer */ - tccb_t callback; /* Current user interrupt callback */ - FAR void *arg; /* Argument passed to upper half callback */ - uint32_t timeout; /* The current timeout value (us) */ - uint32_t clkticks; /* actual clock ticks for current interval */ - bool started; /* The timer has been started */ + uint32_t base; /* Base address of the timer */ + tccb_t callback; /* Current user interrupt callback */ + void *arg; /* Argument passed to upper half callback */ + uint32_t timeout; /* The current timeout value (us) */ + uint32_t clkticks; /* actual clock ticks for current interval */ + bool started; /* The timer has been started */ }; /**************************************************************************** @@ -103,20 +103,20 @@ struct cxd56_lowerhalf_s /* Interrupt handling *******************************************************/ -static int cxd56_timer_interrupt(int irq, FAR void *context, - FAR void *arg); +static int cxd56_timer_interrupt(int irq, void *context, + void *arg); /* "Lower half" driver methods **********************************************/ -static int cxd56_start(FAR struct timer_lowerhalf_s *lower); -static int cxd56_stop(FAR struct timer_lowerhalf_s *lower); -static int cxd56_getstatus(FAR struct timer_lowerhalf_s *lower, - FAR struct timer_status_s *status); -static int cxd56_settimeout(FAR struct timer_lowerhalf_s *lower, +static int cxd56_start(struct timer_lowerhalf_s *lower); +static int cxd56_stop(struct timer_lowerhalf_s *lower); +static int cxd56_getstatus(struct timer_lowerhalf_s *lower, + struct timer_status_s *status); +static int cxd56_settimeout(struct timer_lowerhalf_s *lower, uint32_t timeout); static void cxd56_setcallback(struct timer_lowerhalf_s *lower, - tccb_t callback, FAR void *arg); -static int cxd56_ioctl(FAR struct timer_lowerhalf_s *lower, int cmd, + tccb_t callback, void *arg); +static int cxd56_ioctl(struct timer_lowerhalf_s *lower, int cmd, unsigned long arg); /**************************************************************************** @@ -157,9 +157,9 @@ static struct cxd56_lowerhalf_s g_tmrdevs[2]; * ****************************************************************************/ -static int cxd56_timer_interrupt(int irq, FAR void *context, FAR void *arg) +static int cxd56_timer_interrupt(int irq, void *context, void *arg) { - FAR struct cxd56_lowerhalf_s *priv = (FAR struct cxd56_lowerhalf_s *)arg; + struct cxd56_lowerhalf_s *priv = (struct cxd56_lowerhalf_s *)arg; uint32_t timeout; uint32_t load; @@ -187,7 +187,7 @@ static int cxd56_timer_interrupt(int irq, FAR void *context, FAR void *arg) { /* No callback or the callback returned false.. stop the timer */ - cxd56_stop((FAR struct timer_lowerhalf_s *)priv); + cxd56_stop((struct timer_lowerhalf_s *)priv); tmrinfo("Stopped\n"); } @@ -213,9 +213,9 @@ static int cxd56_timer_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static int cxd56_start(FAR struct timer_lowerhalf_s *lower) +static int cxd56_start(struct timer_lowerhalf_s *lower) { - FAR struct cxd56_lowerhalf_s *priv = (FAR struct cxd56_lowerhalf_s *)lower; + struct cxd56_lowerhalf_s *priv = (struct cxd56_lowerhalf_s *)lower; tmrinfo("Entry: started %d\n", priv->started); @@ -263,9 +263,9 @@ static int cxd56_start(FAR struct timer_lowerhalf_s *lower) * ****************************************************************************/ -static int cxd56_stop(FAR struct timer_lowerhalf_s *lower) +static int cxd56_stop(struct timer_lowerhalf_s *lower) { - FAR struct cxd56_lowerhalf_s *priv = (FAR struct cxd56_lowerhalf_s *)lower; + struct cxd56_lowerhalf_s *priv = (struct cxd56_lowerhalf_s *)lower; tmrinfo("Entry: started %d\n", priv->started); @@ -306,10 +306,10 @@ static int cxd56_stop(FAR struct timer_lowerhalf_s *lower) * ****************************************************************************/ -static int cxd56_getstatus(FAR struct timer_lowerhalf_s *lower, - FAR struct timer_status_s *status) +static int cxd56_getstatus(struct timer_lowerhalf_s *lower, + struct timer_status_s *status) { - FAR struct cxd56_lowerhalf_s *priv = (FAR struct cxd56_lowerhalf_s *)lower; + struct cxd56_lowerhalf_s *priv = (struct cxd56_lowerhalf_s *)lower; uint64_t remaining; tmrinfo("Entry\n"); @@ -360,10 +360,10 @@ static int cxd56_getstatus(FAR struct timer_lowerhalf_s *lower, * ****************************************************************************/ -static int cxd56_settimeout(FAR struct timer_lowerhalf_s *lower, +static int cxd56_settimeout(struct timer_lowerhalf_s *lower, uint32_t timeout) { - FAR struct cxd56_lowerhalf_s *priv = (FAR struct cxd56_lowerhalf_s *)lower; + struct cxd56_lowerhalf_s *priv = (struct cxd56_lowerhalf_s *)lower; uint32_t load; DEBUGASSERT(priv); @@ -423,9 +423,9 @@ static int cxd56_settimeout(FAR struct timer_lowerhalf_s *lower, ****************************************************************************/ static void cxd56_setcallback(struct timer_lowerhalf_s *lower, - tccb_t callback, FAR void *arg) + tccb_t callback, void *arg) { - FAR struct cxd56_lowerhalf_s *priv = (struct cxd56_lowerhalf_s *)lower; + struct cxd56_lowerhalf_s *priv = (struct cxd56_lowerhalf_s *)lower; irqstate_t flags; flags = enter_critical_section(); @@ -461,7 +461,7 @@ static void cxd56_setcallback(struct timer_lowerhalf_s *lower, * ****************************************************************************/ -static int cxd56_ioctl(FAR struct timer_lowerhalf_s *lower, int cmd, +static int cxd56_ioctl(struct timer_lowerhalf_s *lower, int cmd, unsigned long arg) { int ret = -ENOTTY; @@ -479,11 +479,11 @@ static int cxd56_ioctl(FAR struct timer_lowerhalf_s *lower, int cmd, case TCIOC_SETHANDLER: { - FAR struct timer_sethandler_s *param; + struct timer_sethandler_s *param; /* Set user provided timeout callback function */ - param = (FAR struct timer_sethandler_s *)((uintptr_t)arg); + param = (struct timer_sethandler_s *)((uintptr_t)arg); if (param != NULL) { @@ -524,9 +524,9 @@ static int cxd56_ioctl(FAR struct timer_lowerhalf_s *lower, int cmd, * ****************************************************************************/ -void cxd56_timer_initialize(FAR const char *devpath, int timer) +void cxd56_timer_initialize(const char *devpath, int timer) { - FAR struct cxd56_lowerhalf_s *priv = &g_tmrdevs[timer]; + struct cxd56_lowerhalf_s *priv = &g_tmrdevs[timer]; int irq; tmrinfo("Entry: devpath=%s\n", devpath); @@ -565,7 +565,7 @@ void cxd56_timer_initialize(FAR const char *devpath, int timer) /* Register the timer driver as /dev/timerX */ - timer_register(devpath, (FAR struct timer_lowerhalf_s *)priv); + timer_register(devpath, (struct timer_lowerhalf_s *)priv); } #endif /* CONFIG_TIMER */ diff --git a/arch/arm/src/cxd56xx/cxd56_timer.h b/arch/arm/src/cxd56xx/cxd56_timer.h index d00e0e2d30..357add3dbd 100644 --- a/arch/arm/src/cxd56xx/cxd56_timer.h +++ b/arch/arm/src/cxd56xx/cxd56_timer.h @@ -70,7 +70,7 @@ extern "C" * ****************************************************************************/ -void cxd56_timer_initialize(FAR const char *devpath, int timer); +void cxd56_timer_initialize(const char *devpath, int timer); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/cxd56xx/cxd56_timerisr.c b/arch/arm/src/cxd56xx/cxd56_timerisr.c index ca5e74e6ab..e53f40b864 100644 --- a/arch/arm/src/cxd56xx/cxd56_timerisr.c +++ b/arch/arm/src/cxd56xx/cxd56_timerisr.c @@ -65,7 +65,7 @@ static uint32_t g_systrvr; ****************************************************************************/ static int cxd56_changeclock(uint8_t id); -static int cxd56_timerisr(int irq, uint32_t *regs, FAR void *arg); +static int cxd56_timerisr(int irq, uint32_t *regs, void *arg); /**************************************************************************** * Private Functions @@ -129,7 +129,7 @@ static int cxd56_changeclock(uint8_t id) * ****************************************************************************/ -static int cxd56_timerisr(int irq, uint32_t *regs, FAR void *arg) +static int cxd56_timerisr(int irq, uint32_t *regs, void *arg) { /* Process timer interrupt */ diff --git a/arch/arm/src/cxd56xx/cxd56_uart0.c b/arch/arm/src/cxd56xx/cxd56_uart0.c index 77e9cd6418..c0a2316be4 100644 --- a/arch/arm/src/cxd56xx/cxd56_uart0.c +++ b/arch/arm/src/cxd56xx/cxd56_uart0.c @@ -66,12 +66,12 @@ * Private Function Prototypes ****************************************************************************/ -static int uart0_open(FAR struct file *filep); -static int uart0_close(FAR struct file *filep); -static ssize_t uart0_read(FAR struct file *filep, - FAR char *buffer, size_t len); -static ssize_t uart0_write(FAR struct file *filep, - FAR const char *buffer, size_t len); +static int uart0_open(struct file *filep); +static int uart0_close(struct file *filep); +static ssize_t uart0_read(struct file *filep, + char *buffer, size_t len); +static ssize_t uart0_write(struct file *filep, + const char *buffer, size_t len); static int uart0_semtake(sem_t *id); static void uart0_semgive(sem_t *id); @@ -128,9 +128,9 @@ static void uart0_semgive(sem_t *id) * Name: uart0_open ****************************************************************************/ -static int uart0_open(FAR struct file *filep) +static int uart0_open(struct file *filep) { - FAR struct inode *inode = filep->f_inode; + struct inode *inode = filep->f_inode; int flowctl; int bits; int stop; @@ -189,9 +189,9 @@ static int uart0_open(FAR struct file *filep) * Name: uart0_close ****************************************************************************/ -static int uart0_close(FAR struct file *filep) +static int uart0_close(struct file *filep) { - FAR struct inode *inode = filep->f_inode; + struct inode *inode = filep->f_inode; if (inode->i_crefs == 1) { @@ -214,8 +214,8 @@ static int uart0_close(FAR struct file *filep) * Name: uart0_read ****************************************************************************/ -static ssize_t uart0_read(FAR struct file *filep, - FAR char *buffer, size_t len) +static ssize_t uart0_read(struct file *filep, + char *buffer, size_t len) { int ret; @@ -233,14 +233,14 @@ static ssize_t uart0_read(FAR struct file *filep, * Name: uart0_write ****************************************************************************/ -static ssize_t uart0_write(FAR struct file *filep, - FAR const char *buffer, size_t len) +static ssize_t uart0_write(struct file *filep, + const char *buffer, size_t len) { int ret; uart0_semtake(&g_lock); - ret = fw_pd_uartsend(0, (FAR void *)buffer, len, + ret = fw_pd_uartsend(0, (void *)buffer, len, ((filep->f_oflags & O_NONBLOCK) != 0)); uart0_semgive(&g_lock); @@ -252,7 +252,7 @@ static ssize_t uart0_write(FAR struct file *filep, * Name: cxd56_uart0initialize ****************************************************************************/ -int cxd56_uart0initialize(FAR const char *devname) +int cxd56_uart0initialize(const char *devname) { int ret; @@ -271,7 +271,7 @@ int cxd56_uart0initialize(FAR const char *devname) * Name: cxd56_uart0uninitialize ****************************************************************************/ -void cxd56_uart0uninitialize(FAR const char *devname) +void cxd56_uart0uninitialize(const char *devname) { unregister_driver(devname); nxsem_destroy(&g_lock); diff --git a/arch/arm/src/cxd56xx/cxd56_udmac.c b/arch/arm/src/cxd56xx/cxd56_udmac.c index 6e17ea0497..d8b93f45bf 100644 --- a/arch/arm/src/cxd56xx/cxd56_udmac.c +++ b/arch/arm/src/cxd56xx/cxd56_udmac.c @@ -169,7 +169,7 @@ static inline struct dma_descriptor_s *cxd56_get_descriptor( * ****************************************************************************/ -static int cxd56_dmac_interrupt(int irq, void *context, FAR void *arg) +static int cxd56_dmac_interrupt(int irq, void *context, void *arg) { struct dma_channel_s *dmach; unsigned int chndx; diff --git a/arch/arm/src/cxd56xx/cxd56_usbdev.c b/arch/arm/src/cxd56xx/cxd56_usbdev.c index 9ca79ad752..3cfc664a27 100644 --- a/arch/arm/src/cxd56xx/cxd56_usbdev.c +++ b/arch/arm/src/cxd56xx/cxd56_usbdev.c @@ -420,41 +420,41 @@ static struct pm_cpu_wakelock_s g_wake_lock = /* Request queue operations *************************************************/ -static FAR struct cxd56_req_s *cxd56_rqdequeue( - FAR struct cxd56_ep_s *privep); -static void cxd56_rqenqueue(FAR struct cxd56_ep_s *privep, - FAR struct cxd56_req_s *req); +static struct cxd56_req_s *cxd56_rqdequeue( + struct cxd56_ep_s *privep); +static void cxd56_rqenqueue(struct cxd56_ep_s *privep, + struct cxd56_req_s *req); /* Low level data transfers and request operations */ -static int cxd56_epwrite(FAR struct cxd56_ep_s *privep, FAR uint8_t *buf, +static int cxd56_epwrite(struct cxd56_ep_s *privep, uint8_t *buf, uint16_t nbytes); -static inline void cxd56_abortrequest(FAR struct cxd56_ep_s *privep, - FAR struct cxd56_req_s *privreq, +static inline void cxd56_abortrequest(struct cxd56_ep_s *privep, + struct cxd56_req_s *privreq, int16_t result); -static void cxd56_reqcomplete(FAR struct cxd56_ep_s *privep, int16_t result); -static int cxd56_wrrequest(FAR struct cxd56_ep_s *privep); -static int cxd56_rdrequest(FAR struct cxd56_ep_s *privep); -static void cxd56_cancelrequests(FAR struct cxd56_ep_s *privep); -static void cxd56_usbdevreset(FAR struct cxd56_usbdev_s *priv); -static void cxd56_usbreset(FAR struct cxd56_usbdev_s *priv); +static void cxd56_reqcomplete(struct cxd56_ep_s *privep, int16_t result); +static int cxd56_wrrequest(struct cxd56_ep_s *privep); +static int cxd56_rdrequest(struct cxd56_ep_s *privep); +static void cxd56_cancelrequests(struct cxd56_ep_s *privep); +static void cxd56_usbdevreset(struct cxd56_usbdev_s *priv); +static void cxd56_usbreset(struct cxd56_usbdev_s *priv); /* Interrupt handling */ -static FAR struct cxd56_ep_s * - cxd56_epfindbyaddr(FAR struct cxd56_usbdev_s *priv, uint16_t eplog); -static void cxd56_dispatchrequest(FAR struct cxd56_usbdev_s *priv); -static inline void cxd56_ep0setup(FAR struct cxd56_usbdev_s *priv); -static int cxd56_usbinterrupt(int irq, FAR void *context, FAR void *arg); -static int cxd56_sysinterrupt(int irq, FAR void *context, FAR void *arg); -static int cxd56_vbusinterrupt(int irq, FAR void *context, FAR void *arg); -static int cxd56_vbusninterrupt(int irq, FAR void *context, FAR void *arg); +static struct cxd56_ep_s * + cxd56_epfindbyaddr(struct cxd56_usbdev_s *priv, uint16_t eplog); +static void cxd56_dispatchrequest(struct cxd56_usbdev_s *priv); +static inline void cxd56_ep0setup(struct cxd56_usbdev_s *priv); +static int cxd56_usbinterrupt(int irq, void *context, void *arg); +static int cxd56_sysinterrupt(int irq, void *context, void *arg); +static int cxd56_vbusinterrupt(int irq, void *context, void *arg); +static int cxd56_vbusninterrupt(int irq, void *context, void *arg); /* Initialization operations */ -static inline void cxd56_ep0hwinitialize(FAR struct cxd56_usbdev_s *priv); -static void cxd56_ctrlinitialize(FAR struct cxd56_usbdev_s *priv); -static void cxd56_epinitialize(FAR struct cxd56_usbdev_s *priv); +static inline void cxd56_ep0hwinitialize(struct cxd56_usbdev_s *priv); +static void cxd56_ctrlinitialize(struct cxd56_usbdev_s *priv); +static void cxd56_epinitialize(struct cxd56_usbdev_s *priv); /* Un-initialization operations */ @@ -462,34 +462,34 @@ static void cxd56_usbhwuninit(void); /* Endpoint methods */ -static int cxd56_epconfigure(FAR struct usbdev_ep_s *ep, - FAR const struct usb_epdesc_s *desc, bool last); -static int cxd56_epdisable(FAR struct usbdev_ep_s *ep); -static FAR struct usbdev_req_s *cxd56_epallocreq(FAR struct usbdev_ep_s *ep); -static void cxd56_epfreereq(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req); +static int cxd56_epconfigure(struct usbdev_ep_s *ep, + const struct usb_epdesc_s *desc, bool last); +static int cxd56_epdisable(struct usbdev_ep_s *ep); +static struct usbdev_req_s *cxd56_epallocreq(struct usbdev_ep_s *ep); +static void cxd56_epfreereq(struct usbdev_ep_s *ep, + struct usbdev_req_s *req); #ifdef CONFIG_USBDEV_DMA -static FAR void *cxd56_epallocbuffer(FAR struct usbdev_ep_s *ep, +static void *cxd56_epallocbuffer(struct usbdev_ep_s *ep, uint16_t nbytes); -static void cxd56_epfreebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf); +static void cxd56_epfreebuffer(struct usbdev_ep_s *ep, void *buf); #endif -static int cxd56_epsubmit(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *privreq); -static int cxd56_epcancel(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *privreq); -static int cxd56_epstall(FAR struct usbdev_ep_s *ep, bool resume); +static int cxd56_epsubmit(struct usbdev_ep_s *ep, + struct usbdev_req_s *privreq); +static int cxd56_epcancel(struct usbdev_ep_s *ep, + struct usbdev_req_s *privreq); +static int cxd56_epstall(struct usbdev_ep_s *ep, bool resume); /* USB device controller methods */ -static FAR struct usbdev_ep_s *cxd56_allocep(FAR struct usbdev_s *dev, +static struct usbdev_ep_s *cxd56_allocep(struct usbdev_s *dev, uint8_t epno, bool in, uint8_t eptype); -static void cxd56_freeep(FAR struct usbdev_s *dev, - FAR struct usbdev_ep_s *ep); -static int cxd56_getframe(FAR struct usbdev_s *dev); -static int cxd56_wakeup(FAR struct usbdev_s *dev); -static int cxd56_selfpowered(FAR struct usbdev_s *dev, bool selfpowered); -static int cxd56_pullup(FAR struct usbdev_s *dev, bool enable); +static void cxd56_freeep(struct usbdev_s *dev, + struct usbdev_ep_s *ep); +static int cxd56_getframe(struct usbdev_s *dev); +static int cxd56_wakeup(struct usbdev_s *dev); +static int cxd56_selfpowered(struct usbdev_s *dev, bool selfpowered); +static int cxd56_pullup(struct usbdev_s *dev, bool enable); /* Notify USB device attach/detach signal */ @@ -499,14 +499,14 @@ static void cxd56_notify_signal(uint16_t state, uint16_t power); /* procfs methods */ -static int cxd56_usbdev_open(FAR struct file *filep, FAR const char *relpath, +static int cxd56_usbdev_open(struct file *filep, const char *relpath, int oflags, mode_t mode); -static int cxd56_usbdev_close(FAR struct file *filep); -static ssize_t cxd56_usbdev_read(FAR struct file *filep, FAR char *buffer, +static int cxd56_usbdev_close(struct file *filep); +static ssize_t cxd56_usbdev_read(struct file *filep, char *buffer, size_t buflen); -static int cxd56_usbdev_dup(FAR const struct file *oldp, - FAR struct file *newp); -static int cxd56_usbdev_stat(FAR const char *relpath, FAR struct stat *buf); +static int cxd56_usbdev_dup(const struct file *oldp, + struct file *newp); +static int cxd56_usbdev_stat(const char *relpath, struct stat *buf); #endif @@ -685,9 +685,9 @@ static inline bool cxd56_iscableconnected(void) * ****************************************************************************/ -static FAR struct cxd56_req_s *cxd56_rqdequeue(FAR struct cxd56_ep_s *privep) +static struct cxd56_req_s *cxd56_rqdequeue(struct cxd56_ep_s *privep) { - FAR struct cxd56_req_s *ret = privep->head; + struct cxd56_req_s *ret = privep->head; if (ret) { @@ -711,8 +711,8 @@ static FAR struct cxd56_req_s *cxd56_rqdequeue(FAR struct cxd56_ep_s *privep) * ****************************************************************************/ -static void cxd56_rqenqueue(FAR struct cxd56_ep_s *privep, - FAR struct cxd56_req_s *req) +static void cxd56_rqenqueue(struct cxd56_ep_s *privep, + struct cxd56_req_s *req) { req->flink = NULL; if (!privep->head) @@ -735,10 +735,10 @@ static void cxd56_rqenqueue(FAR struct cxd56_ep_s *privep, * ****************************************************************************/ -static int cxd56_epwrite(FAR struct cxd56_ep_s *privep, FAR uint8_t *buf, +static int cxd56_epwrite(struct cxd56_ep_s *privep, uint8_t *buf, uint16_t nbytes) { - FAR struct cxd56_data_desc_s *desc; + struct cxd56_data_desc_s *desc; uint32_t ctrl; uint8_t epphy = privep->epphy; @@ -778,8 +778,8 @@ static int cxd56_epwrite(FAR struct cxd56_ep_s *privep, FAR uint8_t *buf, * ****************************************************************************/ -static inline void cxd56_abortrequest(FAR struct cxd56_ep_s *privep, - FAR struct cxd56_req_s *privreq, +static inline void cxd56_abortrequest(struct cxd56_ep_s *privep, + struct cxd56_req_s *privreq, int16_t result) { usbtrace(TRACE_DEVERROR(CXD56_TRACEERR_REQABORTED), @@ -802,9 +802,9 @@ static inline void cxd56_abortrequest(FAR struct cxd56_ep_s *privep, * ****************************************************************************/ -static void cxd56_reqcomplete(FAR struct cxd56_ep_s *privep, int16_t result) +static void cxd56_reqcomplete(struct cxd56_ep_s *privep, int16_t result) { - FAR struct cxd56_req_s *privreq; + struct cxd56_req_s *privreq; int stalled = privep->stalled; irqstate_t flags; @@ -849,10 +849,10 @@ static void cxd56_reqcomplete(FAR struct cxd56_ep_s *privep, int16_t result) * ****************************************************************************/ -static void cxd56_txdmacomplete(FAR struct cxd56_ep_s *privep) +static void cxd56_txdmacomplete(struct cxd56_ep_s *privep) { - FAR struct cxd56_data_desc_s *desc; - FAR struct cxd56_req_s *privreq; + struct cxd56_data_desc_s *desc; + struct cxd56_req_s *privreq; desc = privep->epphy == CXD56_EP0 ? &g_ep0in : privep->desc; @@ -891,10 +891,10 @@ static void cxd56_txdmacomplete(FAR struct cxd56_ep_s *privep) * ****************************************************************************/ -static int cxd56_wrrequest(FAR struct cxd56_ep_s *privep) +static int cxd56_wrrequest(struct cxd56_ep_s *privep) { - FAR struct cxd56_req_s *privreq; - FAR uint8_t *buf; + struct cxd56_req_s *privreq; + uint8_t *buf; int nbytes; int bytesleft; @@ -969,10 +969,10 @@ static int cxd56_wrrequest(FAR struct cxd56_ep_s *privep) * ****************************************************************************/ -static void cxd56_rxdmacomplete(FAR struct cxd56_ep_s *privep) +static void cxd56_rxdmacomplete(struct cxd56_ep_s *privep) { - FAR struct cxd56_data_desc_s *desc = privep->desc; - FAR struct cxd56_req_s *privreq; + struct cxd56_data_desc_s *desc = privep->desc; + struct cxd56_req_s *privreq; uint32_t status = desc->status; uint16_t nrxbytes; @@ -1014,10 +1014,10 @@ static void cxd56_rxdmacomplete(FAR struct cxd56_ep_s *privep) * ****************************************************************************/ -static int cxd56_rdrequest(FAR struct cxd56_ep_s *privep) +static int cxd56_rdrequest(struct cxd56_ep_s *privep) { - FAR struct cxd56_data_desc_s *desc = privep->desc; - FAR struct cxd56_req_s *privreq; + struct cxd56_data_desc_s *desc = privep->desc; + struct cxd56_req_s *privreq; uint32_t ctrl; /* Check the request from the head of the endpoint request queue */ @@ -1058,7 +1058,7 @@ static int cxd56_rdrequest(FAR struct cxd56_ep_s *privep) * ****************************************************************************/ -static void cxd56_stopinep(FAR struct cxd56_ep_s *privep) +static void cxd56_stopinep(struct cxd56_ep_s *privep) { uint32_t ctrl; @@ -1077,7 +1077,7 @@ static void cxd56_stopinep(FAR struct cxd56_ep_s *privep) * ****************************************************************************/ -static void cxd56_stopoutep(FAR struct cxd56_ep_s *privep) +static void cxd56_stopoutep(struct cxd56_ep_s *privep) { uint32_t ctrl; uint32_t stat; @@ -1103,7 +1103,7 @@ static void cxd56_stopoutep(FAR struct cxd56_ep_s *privep) * ****************************************************************************/ -static void cxd56_cancelrequests(FAR struct cxd56_ep_s *privep) +static void cxd56_cancelrequests(struct cxd56_ep_s *privep) { if (privep->epphy > 0) { @@ -1146,10 +1146,10 @@ static void cxd56_cancelrequests(FAR struct cxd56_ep_s *privep) * ****************************************************************************/ -static FAR struct cxd56_ep_s * -cxd56_epfindbyaddr(FAR struct cxd56_usbdev_s *priv, uint16_t eplog) +static struct cxd56_ep_s * +cxd56_epfindbyaddr(struct cxd56_usbdev_s *priv, uint16_t eplog) { - FAR struct cxd56_ep_s *privep; + struct cxd56_ep_s *privep; int i; /* Endpoint zero is a special case */ @@ -1188,7 +1188,7 @@ cxd56_epfindbyaddr(FAR struct cxd56_usbdev_s *priv, uint16_t eplog) * ****************************************************************************/ -static void cxd56_dispatchrequest(FAR struct cxd56_usbdev_s *priv) +static void cxd56_dispatchrequest(struct cxd56_usbdev_s *priv) { int ret; @@ -1216,11 +1216,11 @@ static void cxd56_dispatchrequest(FAR struct cxd56_usbdev_s *priv) * ****************************************************************************/ -static inline void cxd56_ep0setup(FAR struct cxd56_usbdev_s *priv) +static inline void cxd56_ep0setup(struct cxd56_usbdev_s *priv) { - FAR struct cxd56_ep_s *ep0 = &priv->eplist[0]; - FAR struct cxd56_req_s *privreq = cxd56_rqpeek(ep0); - FAR struct cxd56_ep_s *privep; + struct cxd56_ep_s *ep0 = &priv->eplist[0]; + struct cxd56_req_s *privreq = cxd56_rqpeek(ep0); + struct cxd56_ep_s *privep; uint16_t index; uint16_t value; uint16_t len; @@ -1526,10 +1526,10 @@ static inline void cxd56_ep0setup(FAR struct cxd56_usbdev_s *priv) * ****************************************************************************/ -static int cxd56_epinterrupt(int irq, FAR void *context) +static int cxd56_epinterrupt(int irq, void *context) { - FAR struct cxd56_usbdev_s *priv = &g_usbdev; - FAR struct cxd56_ep_s *privep; + struct cxd56_usbdev_s *priv = &g_usbdev; + struct cxd56_ep_s *privep; uint32_t eps; uint32_t stat; uint32_t ctrl; @@ -1820,7 +1820,7 @@ static int cxd56_epinterrupt(int irq, FAR void *context) * ****************************************************************************/ -static int cxd56_usbinterrupt(int irq, FAR void *context, FAR void *arg) +static int cxd56_usbinterrupt(int irq, void *context, void *arg) { struct usb_ctrlreq_s ctrl; uint32_t intr; @@ -1843,7 +1843,7 @@ static int cxd56_usbinterrupt(int irq, FAR void *context, FAR void *arg) if (intr & USB_INT_ENUM) { - FAR struct cxd56_usbdev_s *priv = &g_usbdev; + struct cxd56_usbdev_s *priv = &g_usbdev; uint32_t speed; uint32_t config; @@ -1895,8 +1895,8 @@ static int cxd56_usbinterrupt(int irq, FAR void *context, FAR void *arg) for (i = 1; i < CXD56_NENDPOINTS; i++) { - FAR struct cxd56_ep_s *privep = - (FAR struct cxd56_ep_s *)&g_usbdev.eplist[i]; + struct cxd56_ep_s *privep = + (struct cxd56_ep_s *)&g_usbdev.eplist[i]; cxd56_cancelrequests(privep); } @@ -1977,9 +1977,9 @@ static int cxd56_usbinterrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static int cxd56_sysinterrupt(int irq, FAR void *context, FAR void *arg) +static int cxd56_sysinterrupt(int irq, void *context, void *arg) { - FAR struct cxd56_usbdev_s *priv = (FAR struct cxd56_usbdev_s *)arg; + struct cxd56_usbdev_s *priv = (struct cxd56_usbdev_s *)arg; uint32_t status; UNUSED(priv); @@ -2007,7 +2007,7 @@ static int cxd56_sysinterrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static void cxd56_ep0hwinitialize(FAR struct cxd56_usbdev_s *priv) +static void cxd56_ep0hwinitialize(struct cxd56_usbdev_s *priv) { uint32_t maxp = g_epinfo[0].maxpacket; uint32_t bufsz = g_epinfo[0].bufsize / 4; @@ -2051,7 +2051,7 @@ static void cxd56_ep0hwinitialize(FAR struct cxd56_usbdev_s *priv) * ****************************************************************************/ -static void cxd56_ctrlinitialize(FAR struct cxd56_usbdev_s *priv) +static void cxd56_ctrlinitialize(struct cxd56_usbdev_s *priv) { uint32_t ctrl; uint32_t config; @@ -2080,7 +2080,7 @@ static void cxd56_ctrlinitialize(FAR struct cxd56_usbdev_s *priv) * ****************************************************************************/ -static void cxd56_usbdevreset(FAR struct cxd56_usbdev_s *priv) +static void cxd56_usbdevreset(struct cxd56_usbdev_s *priv) { uint32_t mask; int i; @@ -2190,10 +2190,10 @@ static void cxd56_usbdevreset(FAR struct cxd56_usbdev_s *priv) * ****************************************************************************/ -static int cxd56_epconfigure(FAR struct usbdev_ep_s *ep, - FAR const struct usb_epdesc_s *desc, bool last) +static int cxd56_epconfigure(struct usbdev_ep_s *ep, + const struct usb_epdesc_s *desc, bool last) { - FAR struct cxd56_ep_s *privep = (FAR struct cxd56_ep_s *)ep; + struct cxd56_ep_s *privep = (struct cxd56_ep_s *)ep; int n; int eptype; uint16_t maxpacket; @@ -2269,9 +2269,9 @@ static int cxd56_epconfigure(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int cxd56_epdisable(FAR struct usbdev_ep_s *ep) +static int cxd56_epdisable(struct usbdev_ep_s *ep) { - FAR struct cxd56_ep_s *privep = (FAR struct cxd56_ep_s *)ep; + struct cxd56_ep_s *privep = (struct cxd56_ep_s *)ep; irqstate_t flags; #ifdef CONFIG_DEBUG_FEATURES @@ -2283,7 +2283,7 @@ static int cxd56_epdisable(FAR struct usbdev_ep_s *ep) #endif usbtrace(TRACE_EPDISABLE, privep->epphy); - uinfo("EP%d\n", ((FAR struct cxd56_ep_s *)ep)->epphy); + uinfo("EP%d\n", ((struct cxd56_ep_s *)ep)->epphy); /* Cancel any ongoing activity and reset the endpoint */ @@ -2302,9 +2302,9 @@ static int cxd56_epdisable(FAR struct usbdev_ep_s *ep) * ****************************************************************************/ -static FAR struct usbdev_req_s *cxd56_epallocreq(FAR struct usbdev_ep_s *ep) +static struct usbdev_req_s *cxd56_epallocreq(struct usbdev_ep_s *ep) { - FAR struct cxd56_req_s *privreq; + struct cxd56_req_s *privreq; #ifdef CONFIG_DEBUG_FEATURES if (!ep) @@ -2313,9 +2313,9 @@ static FAR struct usbdev_req_s *cxd56_epallocreq(FAR struct usbdev_ep_s *ep) } #endif - usbtrace(TRACE_EPALLOCREQ, ((FAR struct cxd56_ep_s *)ep)->epphy); + usbtrace(TRACE_EPALLOCREQ, ((struct cxd56_ep_s *)ep)->epphy); - privreq = (FAR struct cxd56_req_s *)kmm_malloc(sizeof(struct cxd56_req_s)); + privreq = (struct cxd56_req_s *)kmm_malloc(sizeof(struct cxd56_req_s)); if (!privreq) { usbtrace(TRACE_DEVERROR(CXD56_TRACEERR_ALLOCFAIL), 0); @@ -2334,10 +2334,10 @@ static FAR struct usbdev_req_s *cxd56_epallocreq(FAR struct usbdev_ep_s *ep) * ****************************************************************************/ -static void cxd56_epfreereq(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static void cxd56_epfreereq(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct cxd56_req_s *privreq = (FAR struct cxd56_req_s *)req; + struct cxd56_req_s *privreq = (struct cxd56_req_s *)req; #ifdef CONFIG_DEBUG_FEATURES if (!ep || !req) @@ -2347,7 +2347,7 @@ static void cxd56_epfreereq(FAR struct usbdev_ep_s *ep, } #endif - usbtrace(TRACE_EPFREEREQ, ((FAR struct cxd56_ep_s *)ep)->epphy); + usbtrace(TRACE_EPFREEREQ, ((struct cxd56_ep_s *)ep)->epphy); kmm_free(privreq); } @@ -2360,10 +2360,10 @@ static void cxd56_epfreereq(FAR struct usbdev_ep_s *ep, ****************************************************************************/ #ifdef CONFIG_USBDEV_DMA -static FAR void *cxd56_epallocbuffer(FAR struct usbdev_ep_s *ep, +static void *cxd56_epallocbuffer(struct usbdev_ep_s *ep, uint16_t bytes) { - FAR struct cxd56_ep_s *privep = (FAR struct cxd56_ep_s *)ep; + struct cxd56_ep_s *privep = (struct cxd56_ep_s *)ep; UNUSED(privep); usbtrace(TRACE_EPALLOCBUFFER, privep->epphy); @@ -2381,9 +2381,9 @@ static FAR void *cxd56_epallocbuffer(FAR struct usbdev_ep_s *ep, ****************************************************************************/ #ifdef CONFIG_USBDEV_DMA -static void cxd56_epfreebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf) +static void cxd56_epfreebuffer(struct usbdev_ep_s *ep, void *buf) { - FAR struct cxd56_ep_s *privep = (FAR struct cxd56_ep_s *)ep; + struct cxd56_ep_s *privep = (struct cxd56_ep_s *)ep; UNUSED(privep); usbtrace(TRACE_EPFREEBUFFER, privep->epphy); @@ -2400,12 +2400,12 @@ static void cxd56_epfreebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf) * ****************************************************************************/ -static int cxd56_epsubmit(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static int cxd56_epsubmit(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct cxd56_req_s *privreq = (FAR struct cxd56_req_s *)req; - FAR struct cxd56_ep_s *privep = (FAR struct cxd56_ep_s *)ep; - FAR struct cxd56_usbdev_s *priv; + struct cxd56_req_s *privreq = (struct cxd56_req_s *)req; + struct cxd56_ep_s *privep = (struct cxd56_ep_s *)ep; + struct cxd56_usbdev_s *priv; uint32_t ctrl; irqstate_t flags; int ret = OK; @@ -2481,9 +2481,9 @@ static int cxd56_epsubmit(FAR struct usbdev_ep_s *ep, if (priv->ctrl.req == USB_REQ_GETDESCRIPTOR && priv->ctrl.value[1] == USB_DESC_TYPE_CONFIG) { - FAR struct usb_cfgdesc_s *cfgdesc; + struct usb_cfgdesc_s *cfgdesc; - cfgdesc = (FAR struct usb_cfgdesc_s *)req->buf; + cfgdesc = (struct usb_cfgdesc_s *)req->buf; priv->power = cfgdesc->mxpower * 2; } @@ -2545,10 +2545,10 @@ static int cxd56_epsubmit(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int cxd56_epcancel(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static int cxd56_epcancel(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct cxd56_ep_s *privep = (FAR struct cxd56_ep_s *)ep; + struct cxd56_ep_s *privep = (struct cxd56_ep_s *)ep; irqstate_t flags; #ifdef CONFIG_DEBUG_FEATURES @@ -2575,9 +2575,9 @@ static int cxd56_epcancel(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int cxd56_epstall(FAR struct usbdev_ep_s *ep, bool resume) +static int cxd56_epstall(struct usbdev_ep_s *ep, bool resume) { - FAR struct cxd56_ep_s *privep = (FAR struct cxd56_ep_s *)ep; + struct cxd56_ep_s *privep = (struct cxd56_ep_s *)ep; uint32_t ctrl; uint32_t addr; @@ -2606,7 +2606,7 @@ static int cxd56_epstall(FAR struct usbdev_ep_s *ep, bool resume) * Device Methods ****************************************************************************/ -static int cxd56_allocepbuffer(FAR struct cxd56_ep_s *privep) +static int cxd56_allocepbuffer(struct cxd56_ep_s *privep) { DEBUGASSERT(!privep->desc && !privep->buffer); DEBUGASSERT(privep->epphy); /* Do not use for EP0 */ @@ -2637,7 +2637,7 @@ static int cxd56_allocepbuffer(FAR struct cxd56_ep_s *privep) return 0; } -static void cxd56_freeepbuffer(FAR struct cxd56_ep_s *privep) +static void cxd56_freeepbuffer(struct cxd56_ep_s *privep) { DEBUGASSERT(privep->epphy); /* Do not use for EP0 */ @@ -2682,11 +2682,11 @@ static void cxd56_freeepbuffer(FAR struct cxd56_ep_s *privep) * ****************************************************************************/ -static FAR struct usbdev_ep_s *cxd56_allocep(FAR struct usbdev_s *dev, +static struct usbdev_ep_s *cxd56_allocep(struct usbdev_s *dev, uint8_t eplog, bool in, uint8_t eptype) { - FAR struct cxd56_usbdev_s *priv = (FAR struct cxd56_usbdev_s *)dev; + struct cxd56_usbdev_s *priv = (struct cxd56_usbdev_s *)dev; int ndx; usbtrace(TRACE_DEVALLOCEP, eplog); @@ -2766,11 +2766,11 @@ static FAR struct usbdev_ep_s *cxd56_allocep(FAR struct usbdev_s *dev, * ****************************************************************************/ -static void cxd56_freeep(FAR struct usbdev_s *dev, - FAR struct usbdev_ep_s *ep) +static void cxd56_freeep(struct usbdev_s *dev, + struct usbdev_ep_s *ep) { - FAR struct cxd56_ep_s *privep = (FAR struct cxd56_ep_s *)ep; - FAR struct cxd56_usbdev_s *pdev = privep->dev; + struct cxd56_ep_s *privep = (struct cxd56_ep_s *)ep; + struct cxd56_usbdev_s *pdev = privep->dev; irqstate_t flags; usbtrace(TRACE_DEVFREEEP, (uint16_t)privep->epphy); @@ -2790,7 +2790,7 @@ static void cxd56_freeep(FAR struct usbdev_s *dev, * ****************************************************************************/ -static int cxd56_getframe(FAR struct usbdev_s *dev) +static int cxd56_getframe(struct usbdev_s *dev) { irqstate_t flags; int ret = 0; @@ -2823,7 +2823,7 @@ static int cxd56_getframe(FAR struct usbdev_s *dev) * ****************************************************************************/ -static int cxd56_wakeup(FAR struct usbdev_s *dev) +static int cxd56_wakeup(struct usbdev_s *dev) { irqstate_t flags; @@ -2843,9 +2843,9 @@ static int cxd56_wakeup(FAR struct usbdev_s *dev) * ****************************************************************************/ -static int cxd56_selfpowered(FAR struct usbdev_s *dev, bool selfpowered) +static int cxd56_selfpowered(struct usbdev_s *dev, bool selfpowered) { - FAR struct cxd56_usbdev_s *priv = &g_usbdev; + struct cxd56_usbdev_s *priv = &g_usbdev; usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered); @@ -2869,7 +2869,7 @@ static int cxd56_selfpowered(FAR struct usbdev_s *dev, bool selfpowered) * ****************************************************************************/ -static int cxd56_pullup(FAR struct usbdev_s *dev, bool enable) +static int cxd56_pullup(struct usbdev_s *dev, bool enable) { uint32_t ctrl; uint32_t ep; @@ -2904,7 +2904,7 @@ static int cxd56_pullup(FAR struct usbdev_s *dev, bool enable) * ****************************************************************************/ -static void cxd56_epinitialize(FAR struct cxd56_usbdev_s *priv) +static void cxd56_epinitialize(struct cxd56_usbdev_s *priv) { int i; @@ -2937,8 +2937,8 @@ static void cxd56_epinitialize(FAR struct cxd56_usbdev_s *priv) for (i = 1; i < CXD56_NENDPOINTS; i++) { - FAR const struct cxd56_epinfo_s *info = &g_epinfo[i]; - FAR struct cxd56_ep_s *privep; + const struct cxd56_epinfo_s *info = &g_epinfo[i]; + struct cxd56_ep_s *privep; /* Set up the standard stuff */ @@ -2988,9 +2988,9 @@ static void cxd56_usbhwuninit(void) * Name: cxd56_vbusinterrupt ****************************************************************************/ -static int cxd56_vbusinterrupt(int irq, FAR void *context, FAR void *arg) +static int cxd56_vbusinterrupt(int irq, void *context, void *arg) { - FAR struct cxd56_usbdev_s *priv = (FAR struct cxd56_usbdev_s *)arg; + struct cxd56_usbdev_s *priv = (struct cxd56_usbdev_s *)arg; cxd56_cableconnected(true); @@ -3030,10 +3030,10 @@ static int cxd56_vbusinterrupt(int irq, FAR void *context, FAR void *arg) * Name: cxd56_vbusninterrupt ****************************************************************************/ -static int cxd56_vbusninterrupt(int irq, FAR void *context, FAR void *arg) +static int cxd56_vbusninterrupt(int irq, void *context, void *arg) { - FAR struct cxd56_usbdev_s *priv = (FAR struct cxd56_usbdev_s *)arg; - FAR struct cxd56_ep_s *privep; + struct cxd56_usbdev_s *priv = (struct cxd56_usbdev_s *)arg; + struct cxd56_ep_s *privep; int i; cxd56_cableconnected(false); @@ -3051,7 +3051,7 @@ static int cxd56_vbusninterrupt(int irq, FAR void *context, FAR void *arg) for (i = 1; i < CXD56_NENDPOINTS; i++) { - privep = (FAR struct cxd56_ep_s *)&priv->eplist[i]; + privep = (struct cxd56_ep_s *)&priv->eplist[i]; cxd56_epstall(&privep->ep, false); cxd56_cancelrequests(privep); @@ -3144,7 +3144,7 @@ errout: void arm_usbuninitialize(void) { - FAR struct cxd56_usbdev_s *priv = &g_usbdev; + struct cxd56_usbdev_s *priv = &g_usbdev; irqstate_t flags; usbtrace(TRACE_DEVUNINIT, 0); @@ -3188,7 +3188,7 @@ void arm_usbuninitialize(void) * ****************************************************************************/ -int usbdev_register(FAR struct usbdevclass_driver_s *driver) +int usbdev_register(struct usbdevclass_driver_s *driver) { int ret; @@ -3246,9 +3246,9 @@ int usbdev_register(FAR struct usbdevclass_driver_s *driver) * ****************************************************************************/ -int usbdev_unregister(FAR struct usbdevclass_driver_s *driver) +int usbdev_unregister(struct usbdevclass_driver_s *driver) { - FAR struct cxd56_usbdev_s *priv = &g_usbdev; + struct cxd56_usbdev_s *priv = &g_usbdev; irqstate_t flags; usbtrace(TRACE_DEVUNREGISTER, 0); @@ -3302,7 +3302,7 @@ int usbdev_unregister(FAR struct usbdevclass_driver_s *driver) * ****************************************************************************/ -static void cxd56_usbreset(FAR struct cxd56_usbdev_s *priv) +static void cxd56_usbreset(struct cxd56_usbdev_s *priv) { uint32_t mask; int i; @@ -3358,7 +3358,7 @@ static void cxd56_usbreset(FAR struct cxd56_usbdev_s *priv) int cxd56_usbdev_setsigno(int signo) { - FAR struct cxd56_usbdev_s *priv = &g_usbdev; + struct cxd56_usbdev_s *priv = &g_usbdev; uinfo("signo = %d\n", signo); @@ -3378,7 +3378,7 @@ int cxd56_usbdev_setsigno(int signo) static void cxd56_notify_signal(uint16_t state, uint16_t power) { - FAR struct cxd56_usbdev_s *priv = &g_usbdev; + struct cxd56_usbdev_s *priv = &g_usbdev; if (priv->signo > 0) { @@ -3394,10 +3394,10 @@ static void cxd56_notify_signal(uint16_t state, uint16_t power) * Name: cxd56_usbdev_open ****************************************************************************/ -static int cxd56_usbdev_open(FAR struct file *filep, FAR const char *relpath, +static int cxd56_usbdev_open(struct file *filep, const char *relpath, int oflags, mode_t mode) { - FAR struct cxd56_usbdev_file_s *priv; + struct cxd56_usbdev_file_s *priv; uinfo("Open '%s'\n", relpath); @@ -3415,7 +3415,7 @@ static int cxd56_usbdev_open(FAR struct file *filep, FAR const char *relpath, /* Allocate the open file structure */ - priv = (FAR struct cxd56_usbdev_file_s *)kmm_zalloc( + priv = (struct cxd56_usbdev_file_s *)kmm_zalloc( sizeof(struct cxd56_usbdev_file_s)); if (!priv) { @@ -3427,7 +3427,7 @@ static int cxd56_usbdev_open(FAR struct file *filep, FAR const char *relpath, * filep->f_priv. */ - filep->f_priv = (FAR void *)priv; + filep->f_priv = (void *)priv; return OK; } @@ -3435,13 +3435,13 @@ static int cxd56_usbdev_open(FAR struct file *filep, FAR const char *relpath, * Name: modprocfs_close ****************************************************************************/ -static int cxd56_usbdev_close(FAR struct file *filep) +static int cxd56_usbdev_close(struct file *filep) { - FAR struct cxd56_usbdev_file_s *priv; + struct cxd56_usbdev_file_s *priv; /* Recover our private data from the struct file instance */ - priv = (FAR struct cxd56_usbdev_file_s *)filep->f_priv; + priv = (struct cxd56_usbdev_file_s *)filep->f_priv; DEBUGASSERT(priv); /* Release the file attributes structure */ @@ -3455,11 +3455,11 @@ static int cxd56_usbdev_close(FAR struct file *filep) * Name: cxd56_usbdev_read ****************************************************************************/ -static ssize_t cxd56_usbdev_read(FAR struct file *filep, FAR char *buffer, +static ssize_t cxd56_usbdev_read(struct file *filep, char *buffer, size_t buflen) { - FAR struct cxd56_usbdev_file_s *attr; - FAR struct cxd56_usbdev_s *priv = &g_usbdev; + struct cxd56_usbdev_file_s *attr; + struct cxd56_usbdev_s *priv = &g_usbdev; off_t offset; int ret; @@ -3467,7 +3467,7 @@ static ssize_t cxd56_usbdev_read(FAR struct file *filep, FAR char *buffer, /* Recover our private data from the struct file instance */ - attr = (FAR struct cxd56_usbdev_file_s *)filep->f_priv; + attr = (struct cxd56_usbdev_file_s *)filep->f_priv; DEBUGASSERT(attr); /* Traverse all installed modules */ @@ -3495,22 +3495,22 @@ static ssize_t cxd56_usbdev_read(FAR struct file *filep, FAR char *buffer, * Name: cxd56_usbdev_dup ****************************************************************************/ -static int cxd56_usbdev_dup(FAR const struct file *oldp, - FAR struct file *newp) +static int cxd56_usbdev_dup(const struct file *oldp, + struct file *newp) { - FAR struct cxd56_usbdev_file_s *oldattr; - FAR struct cxd56_usbdev_file_s *newattr; + struct cxd56_usbdev_file_s *oldattr; + struct cxd56_usbdev_file_s *newattr; uinfo("Dup %p->%p\n", oldp, newp); /* Recover our private data from the old struct file instance */ - oldattr = (FAR struct cxd56_usbdev_file_s *)oldp->f_priv; + oldattr = (struct cxd56_usbdev_file_s *)oldp->f_priv; DEBUGASSERT(oldattr); /* Allocate a new container to hold the task and attribute selection */ - newattr = (FAR struct cxd56_usbdev_file_s *)kmm_malloc( + newattr = (struct cxd56_usbdev_file_s *)kmm_malloc( sizeof(struct cxd56_usbdev_file_s)); if (!newattr) { @@ -3524,7 +3524,7 @@ static int cxd56_usbdev_dup(FAR const struct file *oldp, /* Save the new attributes in the new file structure */ - newp->f_priv = (FAR void *)newattr; + newp->f_priv = (void *)newattr; return OK; } @@ -3532,7 +3532,7 @@ static int cxd56_usbdev_dup(FAR const struct file *oldp, * Name: cxd56_usbdev_stat ****************************************************************************/ -static int cxd56_usbdev_stat(FAR const char *relpath, FAR struct stat *buf) +static int cxd56_usbdev_stat(const char *relpath, struct stat *buf) { buf->st_mode = S_IFREG | S_IROTH | S_IRGRP | S_IRUSR; buf->st_size = 0; diff --git a/arch/arm/src/cxd56xx/cxd56_wdt.c b/arch/arm/src/cxd56xx/cxd56_wdt.c index 3113b2a265..a9a076ced5 100644 --- a/arch/arm/src/cxd56xx/cxd56_wdt.c +++ b/arch/arm/src/cxd56xx/cxd56_wdt.c @@ -69,7 +69,7 @@ struct cxd56_lowerhalf_s { - FAR const struct watchdog_ops_s *ops; /* Lower half operations */ + const struct watchdog_ops_s *ops; /* Lower half operations */ #ifdef CONFIG_CXD56_WDT_INTERRUPT xcpt_t handler; /* Current WDT interrupt handler */ #endif @@ -95,21 +95,21 @@ static void cxd56_putreg(uint32_t regval, uintptr_t regaddr); /* Interrupt handling *******************************************************/ #ifdef CONFIG_CXD56_WDT_INTERRUPT -static int cxd56_wdtinterrupt(int irq, FAR void *context, FAR void *arg); +static int cxd56_wdtinterrupt(int irq, void *context, void *arg); #endif /* "Lower half" driver methods **********************************************/ -static int cxd56_start(FAR struct watchdog_lowerhalf_s *lower); -static int cxd56_stop(FAR struct watchdog_lowerhalf_s *lower); -static int cxd56_keepalive(FAR struct watchdog_lowerhalf_s *lower); -static int cxd56_getstatus(FAR struct watchdog_lowerhalf_s *lower, - FAR struct watchdog_status_s *status); -static int cxd56_settimeout(FAR struct watchdog_lowerhalf_s *lower, +static int cxd56_start(struct watchdog_lowerhalf_s *lower); +static int cxd56_stop(struct watchdog_lowerhalf_s *lower); +static int cxd56_keepalive(struct watchdog_lowerhalf_s *lower); +static int cxd56_getstatus(struct watchdog_lowerhalf_s *lower, + struct watchdog_status_s *status); +static int cxd56_settimeout(struct watchdog_lowerhalf_s *lower, uint32_t timeout); -static xcpt_t cxd56_capture(FAR struct watchdog_lowerhalf_s *lower, +static xcpt_t cxd56_capture(struct watchdog_lowerhalf_s *lower, xcpt_t handler); -static int cxd56_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd, +static int cxd56_ioctl(struct watchdog_lowerhalf_s *lower, int cmd, unsigned long arg); static int cxd56_pm_event(uint8_t id); @@ -241,9 +241,9 @@ static void cxd56_putreg(uint32_t regval, uintptr_t regaddr) ****************************************************************************/ #ifdef CONFIG_CXD56_WDT_INTERRUPT -static int cxd56_wdtinterrupt(int irq, FAR void *context, FAR void *arg) +static int cxd56_wdtinterrupt(int irq, void *context, void *arg) { - FAR struct cxd56_lowerhalf_s *priv = arg; + struct cxd56_lowerhalf_s *priv = arg; /* Is there a registered handler? */ @@ -276,9 +276,9 @@ static int cxd56_wdtinterrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static int cxd56_start(FAR struct watchdog_lowerhalf_s *lower) +static int cxd56_start(struct watchdog_lowerhalf_s *lower) { - FAR struct cxd56_lowerhalf_s *priv = (FAR struct cxd56_lowerhalf_s *)lower; + struct cxd56_lowerhalf_s *priv = (struct cxd56_lowerhalf_s *)lower; wdinfo("Entry\n"); @@ -305,9 +305,9 @@ static int cxd56_start(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int cxd56_stop(FAR struct watchdog_lowerhalf_s *lower) +static int cxd56_stop(struct watchdog_lowerhalf_s *lower) { - FAR struct cxd56_lowerhalf_s *priv = (FAR struct cxd56_lowerhalf_s *)lower; + struct cxd56_lowerhalf_s *priv = (struct cxd56_lowerhalf_s *)lower; wdinfo("Entry\n"); cxd56_putreg(WDOGLOCK_UNLOCK_KEY, CXD56_WDT_WDOGLOCK); @@ -333,7 +333,7 @@ static int cxd56_stop(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int cxd56_keepalive(FAR struct watchdog_lowerhalf_s *lower) +static int cxd56_keepalive(struct watchdog_lowerhalf_s *lower) { wdinfo("Entry\n"); cxd56_putreg(WDOGLOCK_UNLOCK_KEY, CXD56_WDT_WDOGLOCK); @@ -358,10 +358,10 @@ static int cxd56_keepalive(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int cxd56_getstatus(FAR struct watchdog_lowerhalf_s *lower, - FAR struct watchdog_status_s *status) +static int cxd56_getstatus(struct watchdog_lowerhalf_s *lower, + struct watchdog_status_s *status) { - FAR struct cxd56_lowerhalf_s *priv = (FAR struct cxd56_lowerhalf_s *)lower; + struct cxd56_lowerhalf_s *priv = (struct cxd56_lowerhalf_s *)lower; uint64_t remain; wdinfo("Entry\n"); @@ -418,10 +418,10 @@ static int cxd56_getstatus(FAR struct watchdog_lowerhalf_s *lower, * ****************************************************************************/ -static int cxd56_settimeout(FAR struct watchdog_lowerhalf_s *lower, +static int cxd56_settimeout(struct watchdog_lowerhalf_s *lower, uint32_t timeout) { - FAR struct cxd56_lowerhalf_s *priv = (FAR struct cxd56_lowerhalf_s *)lower; + struct cxd56_lowerhalf_s *priv = (struct cxd56_lowerhalf_s *)lower; uint32_t reload; uint32_t freq; uint64_t llreload; @@ -504,14 +504,14 @@ static int cxd56_settimeout(FAR struct watchdog_lowerhalf_s *lower, * ****************************************************************************/ -static xcpt_t cxd56_capture(FAR struct watchdog_lowerhalf_s *lower, +static xcpt_t cxd56_capture(struct watchdog_lowerhalf_s *lower, xcpt_t handler) { #ifndef CONFIG_CXD56_WDT_INTERRUPT wderr("ERROR: Not configured for this mode\n"); return NULL; #else - FAR struct cxd56_lowerhalf_s *priv = (FAR struct cxd56_lowerhalf_s *)lower; + struct cxd56_lowerhalf_s *priv = (struct cxd56_lowerhalf_s *)lower; irqstate_t flags; xcpt_t oldhandler; @@ -567,7 +567,7 @@ static xcpt_t cxd56_capture(FAR struct watchdog_lowerhalf_s *lower, * ****************************************************************************/ -static int cxd56_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd, +static int cxd56_ioctl(struct watchdog_lowerhalf_s *lower, int cmd, unsigned long arg) { wdinfo("cmd=%d arg=%ld\n", cmd, arg); @@ -593,7 +593,7 @@ static int cxd56_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd, static int cxd56_pm_event(uint8_t id) { - FAR struct cxd56_lowerhalf_s *priv = &g_wdtdev; + struct cxd56_lowerhalf_s *priv = &g_wdtdev; switch (id) { @@ -647,7 +647,7 @@ static int cxd56_pm_event(uint8_t id) int cxd56_wdt_initialize(void) { - FAR struct cxd56_lowerhalf_s *priv = &g_wdtdev; + struct cxd56_lowerhalf_s *priv = &g_wdtdev; /* set load value to max and lock */ @@ -666,7 +666,7 @@ int cxd56_wdt_initialize(void) /* Register the watchdog driver as /dev/watchdog0 */ - watchdog_register(DEVPATH, (FAR struct watchdog_lowerhalf_s *)priv); + watchdog_register(DEVPATH, (struct watchdog_lowerhalf_s *)priv); /* Register pm event callback */ diff --git a/arch/arm/src/dm320/dm320_allocateheap.c b/arch/arm/src/dm320/dm320_allocateheap.c index d58a3d5502..c3dbd28205 100644 --- a/arch/arm/src/dm320/dm320_allocateheap.c +++ b/arch/arm/src/dm320/dm320_allocateheap.c @@ -67,9 +67,9 @@ * ****************************************************************************/ -void up_allocate_heap(FAR void **heap_start, size_t *heap_size) +void up_allocate_heap(void **heap_start, size_t *heap_size) { board_autoled_on(LED_HEAPALLOCATE); - *heap_start = (FAR void *)g_idle_topstack; + *heap_start = (void *)g_idle_topstack; *heap_size = (DM320_SDRAM_VADDR + CONFIG_RAM_SIZE) - g_idle_topstack; } diff --git a/arch/arm/src/dm320/dm320_framebuffer.c b/arch/arm/src/dm320/dm320_framebuffer.c index a7dfaffd8c..a0fef8f0a0 100644 --- a/arch/arm/src/dm320/dm320_framebuffer.c +++ b/arch/arm/src/dm320/dm320_framebuffer.c @@ -478,44 +478,44 @@ static void dm320_hwinitialize(void); /* Framebuffer interface methods */ #ifndef CONFIG_DM320_VID0_DISABLE -static int dm320_getvid0videoinfo(FAR struct fb_vtable_s *vtable, - FAR struct fb_videoinfo_s *vinfo); -static int dm320_getvid0planeinfo(FAR struct fb_vtable_s *vtable, +static int dm320_getvid0videoinfo(struct fb_vtable_s *vtable, + struct fb_videoinfo_s *vinfo); +static int dm320_getvid0planeinfo(struct fb_vtable_s *vtable, int planeno, - FAR struct fb_planeinfo_s *pinfo); + struct fb_planeinfo_s *pinfo); #endif #ifndef CONFIG_DM320_VID1_DISABLE -static int dm320_getvid1videoinfo(FAR struct fb_vtable_s *vtable, - FAR struct fb_videoinfo_s *vinfo); -static int dm320_getvid1planeinfo(FAR struct fb_vtable_s *vtable, +static int dm320_getvid1videoinfo(struct fb_vtable_s *vtable, + struct fb_videoinfo_s *vinfo); +static int dm320_getvid1planeinfo(struct fb_vtable_s *vtable, int planeno, - FAR struct fb_planeinfo_s *pinfo); + struct fb_planeinfo_s *pinfo); #endif #ifndef CONFIG_DM320_OSD0_DISABLE -static int dm320_getosd0videoinfo(FAR struct fb_vtable_s *vtable, - FAR struct fb_videoinfo_s *vinfo); -static int dm320_getosd0planeinfo(FAR struct fb_vtable_s *vtable, +static int dm320_getosd0videoinfo(struct fb_vtable_s *vtable, + struct fb_videoinfo_s *vinfo); +static int dm320_getosd0planeinfo(struct fb_vtable_s *vtable, int planeno, - FAR struct fb_planeinfo_s *pinfo); + struct fb_planeinfo_s *pinfo); #endif #ifndef CONFIG_DM320_OSD1_DISABLE -static int dm320_getosd1videoinfo(FAR struct fb_vtable_s *vtable, - FAR struct fb_videoinfo_s *vinfo); -static int dm320_getosd1planeinfo(FAR struct fb_vtable_s *vtable, +static int dm320_getosd1videoinfo(struct fb_vtable_s *vtable, + struct fb_videoinfo_s *vinfo); +static int dm320_getosd1planeinfo(struct fb_vtable_s *vtable, int planeno, - FAR struct fb_planeinfo_s *pinfo); + struct fb_planeinfo_s *pinfo); #endif #if defined(CONFIG_FB_CMAP) && (!defined(CONFIG_DM320_OSD0_DISABLE) && !defined(CONFIG_DM320_OSD1_DISABLE)) -static int dm320_getcmap(FAR struct fb_vtable_s *vtable, - FAR struct fb_cmap_s *cmap); -static int dm320_putcmap(FAR struct fb_vtable_s *vtable, - FAR const struct fb_cmap_s *cmap); +static int dm320_getcmap(struct fb_vtable_s *vtable, + struct fb_cmap_s *cmap); +static int dm320_putcmap(struct fb_vtable_s *vtable, + const struct fb_cmap_s *cmap); #endif #ifdef CONFIG_FB_HWCURSOR -static int dm320_getcursor(FAR struct fb_vtable_s *vtable, - FAR struct fb_cursorattrib_s *attrib); -static int dm320_setcursor(FAR struct fb_vtable_s *vtable, - FAR struct fb_setcursor_s *settings); +static int dm320_getcursor(struct fb_vtable_s *vtable, + struct fb_cursorattrib_s *attrib); +static int dm320_setcursor(struct fb_vtable_s *vtable, + struct fb_setcursor_s *settings); #endif /**************************************************************************** @@ -525,9 +525,9 @@ static int dm320_setcursor(FAR struct fb_vtable_s *vtable, /* These are the addresses of allocated framebuffer memory regions */ #ifndef CONFIG_DM320_VID0_DISABLE -static FAR void *g_vid0base = 0; +static void *g_vid0base = 0; #ifndef CONFIG_DM320_DISABLE_PINGPONG -static FAR void *g_vid0ppbase = 0; +static void *g_vid0ppbase = 0; #endif static struct fb_vtable_s g_vid0vtable = @@ -543,7 +543,7 @@ static struct fb_vtable_s g_vid0vtable = #endif #ifndef CONFIG_DM320_VID1_DISABLE -static FAR void *g_vid1base = 0; +static void *g_vid1base = 0; static struct fb_vtable_s g_vid1vtable = { @@ -557,7 +557,7 @@ static struct fb_vtable_s g_vid1vtable = #endif #ifndef CONFIG_DM320_OSD0_DISABLE -static FAR void *g_osd0base = 0; +static void *g_osd0base = 0; static struct fb_vtable_s g_osd0vtable = { .getvideoinfo = dm320_getosd0videoinfo, @@ -575,7 +575,7 @@ static struct fb_vtable_s g_osd0vtable = #endif #ifndef CONFIG_DM320_OSD1_DISABLE -static FAR void *g_osd1base = 0; +static void *g_osd1base = 0; static struct fb_vtable_s g_osd1vtable = { .getvideoinfo = dm320_getosd1videoinfo, @@ -600,7 +600,7 @@ static inline void dm320_blankscreen(uint8_t *buffer, int len) memset(buffer, 0xff, len); } -static inline uint32_t dm320_physaddr(FAR void *fb_vaddr) +static inline uint32_t dm320_physaddr(void *fb_vaddr) { return (uint32_t)fb_vaddr - DM320_SDRAM_VADDR; } @@ -677,10 +677,10 @@ static int dm320_allocvideomemory(void) { #ifndef CONFIG_DM320_VID0_DISABLE #ifndef CONFIG_DM320_DISABLE_PINGPONG - g_vid0base = (FAR void *)kmm_malloc(2 * DM320_VID0_FBLEN); - g_vid0ppbase = (FAR char *)g_vid0base + DM320_VID0_FBLEN; + g_vid0base = (void *)kmm_malloc(2 * DM320_VID0_FBLEN); + g_vid0ppbase = (char *)g_vid0base + DM320_VID0_FBLEN; #else - g_vid0base = (FAR void *)kmm_malloc(DM320_VID0_FBLEN); + g_vid0base = (void *)kmm_malloc(DM320_VID0_FBLEN); #endif if (!g_vid0base) { @@ -689,7 +689,7 @@ static int dm320_allocvideomemory(void) #endif #ifndef CONFIG_DM320_VID1_DISABLE - g_vid1base = (FAR void *)kmm_malloc(DM320_VID1_FBLEN); + g_vid1base = (void *)kmm_malloc(DM320_VID1_FBLEN); if (!g_vid1base) { goto errout; @@ -697,7 +697,7 @@ static int dm320_allocvideomemory(void) #endif #ifndef CONFIG_DM320_OSD0_DISABLE - g_osd0base = (FAR void *)kmm_malloc(DM320_OSD0_FBLEN); + g_osd0base = (void *)kmm_malloc(DM320_OSD0_FBLEN); if (!g_osd0base) { goto errout; @@ -705,7 +705,7 @@ static int dm320_allocvideomemory(void) #endif #ifndef CONFIG_DM320_OSD1_DISABLE - g_osd1base = (FAR void *)kmm_malloc(DM320_OSD1_FBLEN); + g_osd1base = (void *)kmm_malloc(DM320_OSD1_FBLEN); if (!g_osd1base) { goto errout; @@ -981,8 +981,8 @@ static void dm320_hwinitialize(void) ****************************************************************************/ #ifndef CONFIG_DM320_VID0_DISABLE -static int dm320_getvid0videoinfo(FAR struct fb_vtable_s *vtable, - FAR struct fb_videoinfo_s *vinfo) +static int dm320_getvid0videoinfo(struct fb_vtable_s *vtable, + struct fb_videoinfo_s *vinfo) { #ifdef CONFIG_DEBUG_FEATURES if (!vtable || !vinfo) @@ -1004,9 +1004,9 @@ static int dm320_getvid0videoinfo(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifndef CONFIG_DM320_VID0_DISABLE -static int dm320_getvid0planeinfo(FAR struct fb_vtable_s *vtable, +static int dm320_getvid0planeinfo(struct fb_vtable_s *vtable, int planeno, - FAR struct fb_planeinfo_s *pinfo) + struct fb_planeinfo_s *pinfo) { #ifdef CONFIG_DEBUG_FEATURES if (!vtable || !pinfo) @@ -1029,8 +1029,8 @@ static int dm320_getvid0planeinfo(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifndef CONFIG_DM320_VID1_DISABLE -static int dm320_getvid1videoinfo(FAR struct fb_vtable_s *vtable, - FAR struct fb_videoinfo_s *vinfo) +static int dm320_getvid1videoinfo(struct fb_vtable_s *vtable, + struct fb_videoinfo_s *vinfo) { #ifdef CONFIG_DEBUG_FEATURES if (!vtable || !vinfo) @@ -1052,9 +1052,9 @@ static int dm320_getvid1videoinfo(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifndef CONFIG_DM320_VID1_DISABLE -static int dm320_getvid1planeinfo(FAR struct fb_vtable_s *vtable, +static int dm320_getvid1planeinfo(struct fb_vtable_s *vtable, int planeno, - FAR struct fb_planeinfo_s *pinfo) + struct fb_planeinfo_s *pinfo) { #ifdef CONFIG_DEBUG_FEATURES if (!vtable || !pinfo) @@ -1077,8 +1077,8 @@ static int dm320_getvid1planeinfo(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifndef CONFIG_DM320_OSD0_DISABLE -static int dm320_getosd0videoinfo(FAR struct fb_vtable_s *vtable, - FAR struct fb_videoinfo_s *vinfo) +static int dm320_getosd0videoinfo(struct fb_vtable_s *vtable, + struct fb_videoinfo_s *vinfo) { #ifdef CONFIG_DEBUG_FEATURES if (!vtable || !vinfo) @@ -1104,9 +1104,9 @@ static int dm320_getosd0videoinfo(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifndef CONFIG_DM320_OSD0_DISABLE -static int dm320_getosd0planeinfo(FAR struct fb_vtable_s *vtable, +static int dm320_getosd0planeinfo(struct fb_vtable_s *vtable, int planeno, - FAR struct fb_planeinfo_s *pinfo) + struct fb_planeinfo_s *pinfo) { #ifdef CONFIG_DEBUG_FEATURES if (!vtable || !pinfo) @@ -1129,8 +1129,8 @@ static int dm320_getosd0planeinfo(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifndef CONFIG_DM320_OSD1_DISABLE -static int dm320_getosd1videoinfo(FAR struct fb_vtable_s *vtable, - FAR struct fb_videoinfo_s *vinfo) +static int dm320_getosd1videoinfo(struct fb_vtable_s *vtable, + struct fb_videoinfo_s *vinfo) { #ifdef CONFIG_DEBUG_FEATURES if (!vtable || !vinfo) @@ -1156,9 +1156,9 @@ static int dm320_getosd1videoinfo(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifndef CONFIG_DM320_OSD1_DISABLE -static int dm320_getosd1planeinfo(FAR struct fb_vtable_s *vtable, +static int dm320_getosd1planeinfo(struct fb_vtable_s *vtable, int planeno, - FAR struct fb_planeinfo_s *pinfo) + struct fb_planeinfo_s *pinfo) { #ifdef CONFIG_DEBUG_FEATURES if (!vtable || !pinfo) @@ -1181,8 +1181,8 @@ static int dm320_getosd1planeinfo(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #if defined(CONFIG_FB_CMAP) && (!defined(CONFIG_DM320_OSD0_DISABLE) && !defined(CONFIG_DM320_OSD1_DISABLE)) -static int dm320_getcmap(FAR struct fb_vtable_s *vtable, - FAR struct fb_cmap_s *cmap) +static int dm320_getcmap(struct fb_vtable_s *vtable, + struct fb_cmap_s *cmap) { /* I don't think the RAM clut is readable */ @@ -1195,8 +1195,8 @@ static int dm320_getcmap(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #if defined(CONFIG_FB_CMAP) && (!defined(CONFIG_DM320_OSD0_DISABLE) && !defined(CONFIG_DM320_OSD1_DISABLE)) -static int dm320_putcmap(FAR struct fb_vtable_s *vtable, - FAR struct fb_cmap_s *cmap) +static int dm320_putcmap(struct fb_vtable_s *vtable, + struct fb_cmap_s *cmap) { irqstate_t flags; uint16_t regval; @@ -1251,8 +1251,8 @@ static int dm320_putcmap(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifdef CONFIG_FB_HWCURSOR -static int dm320_getcursor(FAR struct fb_vtable_s *vtable, - FAR struct fb_cursorattrib_s *attrib) +static int dm320_getcursor(struct fb_vtable_s *vtable, + struct fb_cursorattrib_s *attrib) { irqstate_t flags; @@ -1294,8 +1294,8 @@ static int dm320_getcursor(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifdef CONFIG_FB_HWCURSOR -static int dm320_setcursor(FAR struct fb_vtable_s *vtable, - FAR struct fb_setcursor_s *settings) +static int dm320_setcursor(struct fb_vtable_s *vtable, + struct fb_setcursor_s *settings) { irqstate_t flags; uint16_t regval; @@ -1427,7 +1427,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) { switch (vplane) { diff --git a/arch/arm/src/dm320/dm320_timerisr.c b/arch/arm/src/dm320/dm320_timerisr.c index 4638359068..0197b7d08d 100644 --- a/arch/arm/src/dm320/dm320_timerisr.c +++ b/arch/arm/src/dm320/dm320_timerisr.c @@ -92,7 +92,7 @@ * ****************************************************************************/ -static int dm320_timerisr(int irq, uint32_t *regs, FAR void *arg) +static int dm320_timerisr(int irq, uint32_t *regs, void *arg) { /* Process timer interrupt */ diff --git a/arch/arm/src/dm320/dm320_usbdev.c b/arch/arm/src/dm320/dm320_usbdev.c index 3f08814e5f..4dd5682629 100644 --- a/arch/arm/src/dm320/dm320_usbdev.c +++ b/arch/arm/src/dm320/dm320_usbdev.c @@ -271,11 +271,11 @@ static void dm320_putreg32(uint32_t val, uint32_t addr); /* Request queue operations *************************************************/ -static FAR struct -dm320_req_s *dm320_rqdequeue(FAR struct dm320_ep_s *privep); +static struct +dm320_req_s *dm320_rqdequeue(struct dm320_ep_s *privep); -static void dm320_rqenqueue(FAR struct dm320_ep_s *privep, - FAR struct dm320_req_s *req); +static void dm320_rqenqueue(struct dm320_ep_s *privep, + struct dm320_req_s *req); /* Low level data transfers and request operations */ @@ -297,8 +297,8 @@ static void dm320_dispatchrequest(struct dm320_usbdev_s *priv, const struct usb_ctrlreq_s *ctrl); static inline void dm320_ep0setup(struct dm320_usbdev_s *priv); static inline uint32_t dm320_highestpriinterrupt(int intstatus); -static int dm320_ctlrinterrupt(int irq, FAR void *context, FAR void *arg); -static int dm320_attachinterrupt(int irq, FAR void *context, FAR void *arg); +static int dm320_ctlrinterrupt(int irq, void *context, void *arg); +static int dm320_attachinterrupt(int irq, void *context, void *arg); /* Initialization operations */ @@ -308,28 +308,28 @@ static void dm320_ctrlinitialize(struct dm320_usbdev_s *priv); /* Endpoint methods */ -static int dm320_epconfigure(FAR struct usbdev_ep_s *ep, +static int dm320_epconfigure(struct usbdev_ep_s *ep, const struct usb_epdesc_s *desc, bool last); -static int dm320_epdisable(FAR struct usbdev_ep_s *ep); -static FAR struct usbdev_req_s *dm320_epallocreq(FAR struct usbdev_ep_s *ep); -static void dm320_epfreereq(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req); +static int dm320_epdisable(struct usbdev_ep_s *ep); +static struct usbdev_req_s *dm320_epallocreq(struct usbdev_ep_s *ep); +static void dm320_epfreereq(struct usbdev_ep_s *ep, + struct usbdev_req_s *req); #ifdef CONFIG_USBDEV_DMA -static FAR void *dm320_epallocbuffer(FAR struct usbdev_ep_s *ep, +static void *dm320_epallocbuffer(struct usbdev_ep_s *ep, uint16_t nbytes); -static void dm320_epfreebuffer(FAR struct usbdev_ep_s *ep, void *buf); +static void dm320_epfreebuffer(struct usbdev_ep_s *ep, void *buf); #endif -static int dm320_epsubmit(FAR struct usbdev_ep_s *ep, +static int dm320_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *privreq); -static int dm320_epcancel(FAR struct usbdev_ep_s *ep, +static int dm320_epcancel(struct usbdev_ep_s *ep, struct usbdev_req_s *privreq); /* USB device controller methods */ -static FAR struct usbdev_ep_s *dm320_allocep(FAR struct usbdev_s *dev, +static struct usbdev_ep_s *dm320_allocep(struct usbdev_s *dev, uint8_t epno, bool in, uint8_t eptype); -static void dm320_freeep(FAR struct usbdev_s *dev, - FAR struct usbdev_ep_s *ep); +static void dm320_freeep(struct usbdev_s *dev, + struct usbdev_ep_s *ep); static int dm320_getframe(struct usbdev_s *dev); static int dm320_wakeup(struct usbdev_s *dev); static int dm320_selfpowered(struct usbdev_s *dev, bool selfpowered); @@ -669,9 +669,9 @@ static void dm320_putreg32(uint32_t val, uint32_t addr) * ****************************************************************************/ -static FAR struct dm320_req_s *dm320_rqdequeue(FAR struct dm320_ep_s *privep) +static struct dm320_req_s *dm320_rqdequeue(struct dm320_ep_s *privep) { - FAR struct dm320_req_s *ret = privep->head; + struct dm320_req_s *ret = privep->head; if (ret) { @@ -695,8 +695,8 @@ static FAR struct dm320_req_s *dm320_rqdequeue(FAR struct dm320_ep_s *privep) * ****************************************************************************/ -static void dm320_rqenqueue(FAR struct dm320_ep_s *privep, - FAR struct dm320_req_s *req) +static void dm320_rqenqueue(struct dm320_ep_s *privep, + struct dm320_req_s *req) { req->flink = NULL; if (!privep->head) @@ -1537,7 +1537,7 @@ static inline uint32_t dm320_highestpriinterrupt(int intstatus) * ****************************************************************************/ -static int dm320_ctlrinterrupt(int irq, FAR void *context, FAR void *arg) +static int dm320_ctlrinterrupt(int irq, void *context, void *arg) { struct dm320_usbdev_s *priv = &g_usbdev; struct dm320_ep_s *privep ; @@ -1711,7 +1711,7 @@ static int dm320_ctlrinterrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static int dm320_attachinterrupt(int irq, FAR void *context, FAR void *arg) +static int dm320_attachinterrupt(int irq, void *context, void *arg) { struct dm320_usbdev_s *priv = &g_usbdev; uint16_t gio; @@ -1882,7 +1882,7 @@ static inline void dm320_epinitialize(struct dm320_usbdev_s *priv) * ****************************************************************************/ -static void dm320_ctrlinitialize(FAR struct dm320_usbdev_s *priv) +static void dm320_ctrlinitialize(struct dm320_usbdev_s *priv) { /* Setup the USB controller for operation as a periperhal *****************/ @@ -1957,11 +1957,11 @@ static void dm320_ctrlinitialize(FAR struct dm320_usbdev_s *priv) * ****************************************************************************/ -static int dm320_epconfigure(FAR struct usbdev_ep_s *ep, - FAR const struct usb_epdesc_s *desc, +static int dm320_epconfigure(struct usbdev_ep_s *ep, + const struct usb_epdesc_s *desc, bool last) { - FAR struct dm320_ep_s *privep = (FAR struct dm320_ep_s *)ep; + struct dm320_ep_s *privep = (struct dm320_ep_s *)ep; /* Retain what we need from the descriptor */ @@ -1979,9 +1979,9 @@ static int dm320_epconfigure(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int dm320_epdisable(FAR struct usbdev_ep_s *ep) +static int dm320_epdisable(struct usbdev_ep_s *ep) { - FAR struct dm320_ep_s *privep = (FAR struct dm320_ep_s *)ep; + struct dm320_ep_s *privep = (struct dm320_ep_s *)ep; irqstate_t flags; #ifdef CONFIG_DEBUG_FEATURES @@ -2012,9 +2012,9 @@ static int dm320_epdisable(FAR struct usbdev_ep_s *ep) * ****************************************************************************/ -static FAR struct usbdev_req_s *dm320_epallocreq(FAR struct usbdev_ep_s *ep) +static struct usbdev_req_s *dm320_epallocreq(struct usbdev_ep_s *ep) { - FAR struct dm320_req_s *privreq; + struct dm320_req_s *privreq; #ifdef CONFIG_DEBUG_FEATURES if (!ep) @@ -2023,9 +2023,9 @@ static FAR struct usbdev_req_s *dm320_epallocreq(FAR struct usbdev_ep_s *ep) } #endif - usbtrace(TRACE_EPALLOCREQ, ((FAR struct dm320_ep_s *)ep)->epphy); + usbtrace(TRACE_EPALLOCREQ, ((struct dm320_ep_s *)ep)->epphy); - privreq = (FAR struct dm320_req_s *)kmm_malloc(sizeof(struct dm320_req_s)); + privreq = (struct dm320_req_s *)kmm_malloc(sizeof(struct dm320_req_s)); if (!privreq) { usbtrace(TRACE_DEVERROR(DM320_TRACEERR_ALLOCFAIL), 0); @@ -2044,10 +2044,10 @@ static FAR struct usbdev_req_s *dm320_epallocreq(FAR struct usbdev_ep_s *ep) * ****************************************************************************/ -static void dm320_epfreereq(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static void dm320_epfreereq(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct dm320_req_s *privreq = (FAR struct dm320_req_s *)req; + struct dm320_req_s *privreq = (struct dm320_req_s *)req; #ifdef CONFIG_DEBUG_FEATURES if (!ep || !req) @@ -2057,7 +2057,7 @@ static void dm320_epfreereq(FAR struct usbdev_ep_s *ep, } #endif - usbtrace(TRACE_EPFREEREQ, ((FAR struct dm320_ep_s *)ep)->epphy); + usbtrace(TRACE_EPFREEREQ, ((struct dm320_ep_s *)ep)->epphy); kmm_free(privreq); } @@ -2070,7 +2070,7 @@ static void dm320_epfreereq(FAR struct usbdev_ep_s *ep, ****************************************************************************/ #ifdef CONFIG_USBDEV_DMA -static void *dm320_epallocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes) +static void *dm320_epallocbuffer(struct usbdev_ep_s *ep, unsigned bytes) { usbtrace(TRACE_EPALLOCBUFFER, privep->epphy); @@ -2091,7 +2091,7 @@ static void *dm320_epallocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes) ****************************************************************************/ #ifdef CONFIG_USBDEV_DMA -static void dm320_epfreebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf) +static void dm320_epfreebuffer(struct usbdev_ep_s *ep, void *buf) { usbtrace(TRACE_EPFREEBUFFER, privep->epphy); @@ -2111,12 +2111,12 @@ static void dm320_epfreebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf) * ****************************************************************************/ -static int dm320_epsubmit(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static int dm320_epsubmit(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct dm320_req_s *privreq = (FAR struct dm320_req_s *)req; - FAR struct dm320_ep_s *privep = (FAR struct dm320_ep_s *)ep; - FAR struct dm320_usbdev_s *priv; + struct dm320_req_s *privreq = (struct dm320_req_s *)req; + struct dm320_ep_s *privep = (struct dm320_ep_s *)ep; + struct dm320_usbdev_s *priv; irqstate_t flags; int ret = OK; @@ -2212,10 +2212,10 @@ static int dm320_epsubmit(FAR struct usbdev_ep_s *ep, ****************************************************************************/ static int dm320_epcancel(struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) + struct usbdev_req_s *req) { - FAR struct dm320_ep_s *privep = (FAR struct dm320_ep_s *)ep; - FAR struct dm320_usbdev_s *priv; + struct dm320_ep_s *privep = (struct dm320_ep_s *)ep; + struct dm320_usbdev_s *priv; irqstate_t flags; #ifdef CONFIG_DEBUG_FEATURES @@ -2256,11 +2256,11 @@ static int dm320_epcancel(struct usbdev_ep_s *ep, * ****************************************************************************/ -static FAR struct usbdev_ep_s *dm320_allocep(FAR struct usbdev_s *dev, +static struct usbdev_ep_s *dm320_allocep(struct usbdev_s *dev, uint8_t eplog, bool in, uint8_t eptype) { - FAR struct dm320_usbdev_s *priv = (FAR struct dm320_usbdev_s *)dev; + struct dm320_usbdev_s *priv = (struct dm320_usbdev_s *)dev; int ndx; usbtrace(TRACE_DEVALLOCEP, 0); @@ -2319,10 +2319,10 @@ static FAR struct usbdev_ep_s *dm320_allocep(FAR struct usbdev_s *dev, * ****************************************************************************/ -static void dm320_freeep(FAR struct usbdev_s *dev, - FAR struct usbdev_ep_s *ep) +static void dm320_freeep(struct usbdev_s *dev, + struct usbdev_ep_s *ep) { - FAR struct dm320_ep_s *privep = (FAR struct dm320_ep_s *)ep; + struct dm320_ep_s *privep = (struct dm320_ep_s *)ep; usbtrace(TRACE_DEVFREEEP, (uint16_t)privep->epphy); UNUSED(privep); @@ -2593,7 +2593,7 @@ void arm_usbuninitialize(void) * ****************************************************************************/ -int usbdev_register(FAR struct usbdevclass_driver_s *driver) +int usbdev_register(struct usbdevclass_driver_s *driver) { int ret; @@ -2654,7 +2654,7 @@ int usbdev_register(FAR struct usbdevclass_driver_s *driver) * ****************************************************************************/ -int usbdev_unregister(FAR struct usbdevclass_driver_s *driver) +int usbdev_unregister(struct usbdevclass_driver_s *driver) { usbtrace(TRACE_DEVUNREGISTER, 0); diff --git a/arch/arm/src/efm32/efm32_adc.c b/arch/arm/src/efm32/efm32_adc.c index 8ea6d25873..f76edac745 100644 --- a/arch/arm/src/efm32/efm32_adc.c +++ b/arch/arm/src/efm32/efm32_adc.c @@ -84,7 +84,7 @@ struct efm32_dev_s { - FAR const struct adc_callback_s *cb; + const struct adc_callback_s *cb; uint8_t irq; /* Interrupt generated by this ADC block */ uint8_t nchannels; /* Number of channels */ uint8_t current; /* Current ADC channel being converted */ @@ -107,26 +107,26 @@ static void adc_hw_reset(struct efm32_dev_s *priv, bool reset); /* ADC Interrupt Handler */ static int adc_interrupt(int irq, - FAR void *context, FAR struct adc_dev_s *dev); + void *context, struct adc_dev_s *dev); /* ADC Driver Methods */ -static int adc_bind(FAR struct adc_dev_s *dev, - FAR const struct adc_callback_s *callback); -static void adc_reset(FAR struct adc_dev_s *dev); -static int adc_setup(FAR struct adc_dev_s *dev); -static void adc_shutdown(FAR struct adc_dev_s *dev); -static void adc_rxint(FAR struct adc_dev_s *dev, bool enable); -static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg); -static void adc_enable(FAR struct efm32_dev_s *priv, bool enable); +static int adc_bind(struct adc_dev_s *dev, + const struct adc_callback_s *callback); +static void adc_reset(struct adc_dev_s *dev); +static int adc_setup(struct adc_dev_s *dev); +static void adc_shutdown(struct adc_dev_s *dev); +static void adc_rxint(struct adc_dev_s *dev, bool enable); +static int adc_ioctl(struct adc_dev_s *dev, int cmd, unsigned long arg); +static void adc_enable(struct efm32_dev_s *priv, bool enable); #ifdef ADC_HAVE_TIMER -static void adc_timstart(FAR struct efm32_dev_s *priv, bool enable); -static int adc_timinit(FAR struct efm32_dev_s *priv); +static void adc_timstart(struct efm32_dev_s *priv, bool enable); +static int adc_timinit(struct efm32_dev_s *priv); #endif #if defined(CONFIG_EFM32_EFM32GG) -static void adc_startconv(FAR struct efm32_dev_s *priv, bool enable); +static void adc_startconv(struct efm32_dev_s *priv, bool enable); #endif /**************************************************************************** @@ -720,7 +720,7 @@ endif /* defined(ADC_COUNT) && (ADC_COUNT > 0) */ ****************************************************************************/ #ifdef ADC_HAVE_TIMER -static void adc_tim_dumpregs(struct efm32_dev_s *priv, FAR const char *msg) +static void adc_tim_dumpregs(struct efm32_dev_s *priv, const char *msg) { #if defined(CONFIG_DEBUG_ANALOG) && defined(CONFIG_DEBUG_INFO) ainfo("%s:\n", msg); @@ -866,7 +866,7 @@ static void adc_hw_reset(struct efm32_dev_s *priv, bool reset) * ****************************************************************************/ -static void adc_enable(FAR struct efm32_dev_s *priv, bool enable) +static void adc_enable(struct efm32_dev_s *priv, bool enable) { uint32_t regval; @@ -894,10 +894,10 @@ static void adc_enable(FAR struct efm32_dev_s *priv, bool enable) * ****************************************************************************/ -static int adc_bind(FAR struct adc_dev_s *dev, - FAR const struct adc_callback_s *callback) +static int adc_bind(struct adc_dev_s *dev, + const struct adc_callback_s *callback) { - FAR struct efm32_dev_s *priv = (FAR struct efm32_dev_s *)dev->ad_priv; + struct efm32_dev_s *priv = (struct efm32_dev_s *)dev->ad_priv; DEBUGASSERT(priv != NULL); priv->cb = callback; @@ -917,9 +917,9 @@ static int adc_bind(FAR struct adc_dev_s *dev, * ****************************************************************************/ -static void adc_reset(FAR struct adc_dev_s *dev) +static void adc_reset(struct adc_dev_s *dev) { - FAR struct efm32_dev_s *priv = (FAR struct efm32_dev_s *)dev->ad_priv; + struct efm32_dev_s *priv = (struct efm32_dev_s *)dev->ad_priv; irqstate_t flags; uint32_t regval; int offset; @@ -1073,9 +1073,9 @@ static void adc_reset(FAR struct adc_dev_s *dev) * ****************************************************************************/ -static int adc_setup(FAR struct adc_dev_s *dev) +static int adc_setup(struct adc_dev_s *dev) { - FAR struct efm32_dev_s *priv = (FAR struct efm32_dev_s *)dev->ad_priv; + struct efm32_dev_s *priv = (struct efm32_dev_s *)dev->ad_priv; int ret; /* Attach the ADC interrupt */ @@ -1109,9 +1109,9 @@ static int adc_setup(FAR struct adc_dev_s *dev) * ****************************************************************************/ -static void adc_shutdown(FAR struct adc_dev_s *dev) +static void adc_shutdown(struct adc_dev_s *dev) { - FAR struct efm32_dev_s *priv = (FAR struct efm32_dev_s *)dev->ad_priv; + struct efm32_dev_s *priv = (struct efm32_dev_s *)dev->ad_priv; /* Disable ADC interrupts and detach the ADC interrupt handler */ @@ -1135,9 +1135,9 @@ static void adc_shutdown(FAR struct adc_dev_s *dev) * ****************************************************************************/ -static void adc_rxint(FAR struct adc_dev_s *dev, bool enable) +static void adc_rxint(struct adc_dev_s *dev, bool enable) { - FAR struct efm32_dev_s *priv = (FAR struct efm32_dev_s *)dev->ad_priv; + struct efm32_dev_s *priv = (struct efm32_dev_s *)dev->ad_priv; uint32_t regval; ainfo("intf: %d enable: %d\n", priv->intf, enable); @@ -1171,9 +1171,9 @@ static void adc_rxint(FAR struct adc_dev_s *dev, bool enable) * ****************************************************************************/ -static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg) +static int adc_ioctl(struct adc_dev_s *dev, int cmd, unsigned long arg) { - FAR struct efm32_dev_s *priv = (FAR struct efm32_dev_s *)dev->ad_priv; + struct efm32_dev_s *priv = (struct efm32_dev_s *)dev->ad_priv; int ret = -ENOTTY; switch (cmd) @@ -1210,9 +1210,9 @@ static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg) ****************************************************************************/ static int adc_interrupt(int irq, - FAR void *context, FAR struct adc_dev_s *dev) + void *context, struct adc_dev_s *dev) { - FAR struct efm32_dev_s *priv = (FAR struct efm32_dev_s *)dev->ad_priv; + struct efm32_dev_s *priv = (struct efm32_dev_s *)dev->ad_priv; uint32_t adcsr; int32_t value; @@ -1302,8 +1302,8 @@ static int adc_interrupt(int irq, struct adc_dev_s *efm32_adcinitialize(int intf, const uint8_t *chanlist, int nchannels) { - FAR struct adc_dev_s *dev; - FAR struct efm32_dev_s *priv; + struct adc_dev_s *dev; + struct efm32_dev_s *priv; ainfo("intf: %d nchannels: %d\n", intf, nchannels); diff --git a/arch/arm/src/efm32/efm32_dma.c b/arch/arm/src/efm32/efm32_dma.c index f61e823436..4ab79bceb6 100644 --- a/arch/arm/src/efm32/efm32_dma.c +++ b/arch/arm/src/efm32/efm32_dma.c @@ -195,7 +195,7 @@ efm32_get_descriptor(struct dma_channel_s *dmach, bool alt) * ****************************************************************************/ -static int efm32_dmac_interrupt(int irq, void *context, FAR void *arg) +static int efm32_dmac_interrupt(int irq, void *context, void *arg) { struct dma_channel_s *dmach; unsigned int chndx; diff --git a/arch/arm/src/efm32/efm32_dma.h b/arch/arm/src/efm32/efm32_dma.h index 14b97b3edc..a3966645d2 100644 --- a/arch/arm/src/efm32/efm32_dma.h +++ b/arch/arm/src/efm32/efm32_dma.h @@ -78,7 +78,7 @@ * DMA channel. */ -typedef FAR void *DMA_HANDLE; +typedef void *DMA_HANDLE; /* Description: * This is the type of the callback that is used to inform the user of the diff --git a/arch/arm/src/efm32/efm32_gpioirq.c b/arch/arm/src/efm32/efm32_gpioirq.c index 5169d96442..6f22fbec7a 100644 --- a/arch/arm/src/efm32/efm32_gpioirq.c +++ b/arch/arm/src/efm32/efm32_gpioirq.c @@ -118,7 +118,7 @@ static int efm32_gpio_interrupt(uint32_t mask, void *context) * ****************************************************************************/ -static int efm32_even_interrupt(int irq, void *context, FAR void *arg) +static int efm32_even_interrupt(int irq, void *context, void *arg) { return efm32_gpio_interrupt(0x00005555, context); } @@ -131,7 +131,7 @@ static int efm32_even_interrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -static int efm32_odd_interrupt(int irq, void *context, FAR void *arg) +static int efm32_odd_interrupt(int irq, void *context, void *arg) { return efm32_gpio_interrupt(0x0000aaaa, context); } diff --git a/arch/arm/src/efm32/efm32_i2c.c b/arch/arm/src/efm32/efm32_i2c.c index ebf9495f24..59a8a3d866 100644 --- a/arch/arm/src/efm32/efm32_i2c.c +++ b/arch/arm/src/efm32/efm32_i2c.c @@ -253,48 +253,48 @@ struct efm32_i2c_priv_s * Private Function Prototypes ****************************************************************************/ -static inline uint32_t efm32_i2c_getreg(FAR struct efm32_i2c_priv_s *priv, +static inline uint32_t efm32_i2c_getreg(struct efm32_i2c_priv_s *priv, uint8_t offset); -static inline void efm32_i2c_putreg(FAR struct efm32_i2c_priv_s *priv, +static inline void efm32_i2c_putreg(struct efm32_i2c_priv_s *priv, uint8_t offset, uint32_t value); -static inline void efm32_i2c_modifyreg(FAR struct efm32_i2c_priv_s *priv, +static inline void efm32_i2c_modifyreg(struct efm32_i2c_priv_s *priv, uint8_t offset, uint32_t clearbits, uint32_t setbits); -static inline int efm32_i2c_sem_wait(FAR struct efm32_i2c_priv_s *priv); +static inline int efm32_i2c_sem_wait(struct efm32_i2c_priv_s *priv); static int - efm32_i2c_sem_wait_noncancelable(FAR struct efm32_i2c_priv_s *priv); + efm32_i2c_sem_wait_noncancelable(struct efm32_i2c_priv_s *priv); #ifdef CONFIG_EFM32_I2C_DYNTIMEOUT -static useconds_t efm32_i2c_tousecs(int msgc, FAR struct i2c_msg_s *msgs); +static useconds_t efm32_i2c_tousecs(int msgc, struct i2c_msg_s *msgs); #endif /* CONFIG_EFM32_I2C_DYNTIMEOUT */ -static inline int efm32_i2c_sem_waitdone(FAR struct efm32_i2c_priv_s *priv); -static inline void efm32_i2c_sem_post(FAR struct efm32_i2c_priv_s *priv); -static inline void efm32_i2c_sem_init(FAR struct efm32_i2c_priv_s *priv); -static inline void efm32_i2c_sem_destroy(FAR struct efm32_i2c_priv_s *priv); +static inline int efm32_i2c_sem_waitdone(struct efm32_i2c_priv_s *priv); +static inline void efm32_i2c_sem_post(struct efm32_i2c_priv_s *priv); +static inline void efm32_i2c_sem_init(struct efm32_i2c_priv_s *priv); +static inline void efm32_i2c_sem_destroy(struct efm32_i2c_priv_s *priv); #ifdef CONFIG_I2C_TRACE -static void efm32_i2c_tracereset(FAR struct efm32_i2c_priv_s *priv); -static void efm32_i2c_tracenew(FAR struct efm32_i2c_priv_s *priv); -static void efm32_i2c_tracedump(FAR struct efm32_i2c_priv_s *priv); +static void efm32_i2c_tracereset(struct efm32_i2c_priv_s *priv); +static void efm32_i2c_tracenew(struct efm32_i2c_priv_s *priv); +static void efm32_i2c_tracedump(struct efm32_i2c_priv_s *priv); #endif /* CONFIG_I2C_TRACE */ -static void efm32_i2c_setclock(FAR struct efm32_i2c_priv_s *priv, +static void efm32_i2c_setclock(struct efm32_i2c_priv_s *priv, uint32_t frequency); static int efm32_i2c_isr_process(struct efm32_i2c_priv_s *priv); #ifndef CONFIG_I2C_POLLED -static int efm32_i2c_isr(int irq, void *context, FAR void *arg); +static int efm32_i2c_isr(int irq, void *context, void *arg); #endif /* !CONFIG_I2C_POLLED */ -static void efm32_i2c_hwreset(FAR struct efm32_i2c_priv_s *priv); -static int efm32_i2c_init(FAR struct efm32_i2c_priv_s *priv); -static int efm32_i2c_deinit(FAR struct efm32_i2c_priv_s *priv); -static int efm32_i2c_transfer(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count); +static void efm32_i2c_hwreset(struct efm32_i2c_priv_s *priv); +static int efm32_i2c_init(struct efm32_i2c_priv_s *priv); +static int efm32_i2c_deinit(struct efm32_i2c_priv_s *priv); +static int efm32_i2c_transfer(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count); #ifdef CONFIG_I2C_RESET -static int efm32_i2c_reset(FAR struct i2c_master_s *dev); +static int efm32_i2c_reset(struct i2c_master_s *dev); #endif #ifdef CONFIG_I2C_TRACE @@ -383,7 +383,7 @@ static struct efm32_i2c_priv_s efm32_i2c1_priv = * ****************************************************************************/ -static inline uint32_t efm32_i2c_getreg(FAR struct efm32_i2c_priv_s *priv, +static inline uint32_t efm32_i2c_getreg(struct efm32_i2c_priv_s *priv, uint8_t offset) { return getreg32(priv->config->base + offset); @@ -397,7 +397,7 @@ static inline uint32_t efm32_i2c_getreg(FAR struct efm32_i2c_priv_s *priv, * ****************************************************************************/ -static inline void efm32_i2c_putreg(FAR struct efm32_i2c_priv_s *priv, +static inline void efm32_i2c_putreg(struct efm32_i2c_priv_s *priv, uint8_t offset, uint32_t value) { putreg32(value, priv->config->base + offset); @@ -411,7 +411,7 @@ static inline void efm32_i2c_putreg(FAR struct efm32_i2c_priv_s *priv, * ****************************************************************************/ -static inline void efm32_i2c_modifyreg(FAR struct efm32_i2c_priv_s *priv, +static inline void efm32_i2c_modifyreg(struct efm32_i2c_priv_s *priv, uint8_t offset, uint32_t clearbits, uint32_t setbits) { @@ -468,7 +468,7 @@ static const char *efm32_i2c_state_str(int i2c_state) * ****************************************************************************/ -static inline int efm32_i2c_sem_wait(FAR struct efm32_i2c_priv_s *priv) +static inline int efm32_i2c_sem_wait(struct efm32_i2c_priv_s *priv) { return nxsem_wait(&priv->sem_excl); } @@ -482,7 +482,7 @@ static inline int efm32_i2c_sem_wait(FAR struct efm32_i2c_priv_s *priv) ****************************************************************************/ static int - efm32_i2c_sem_wait_noncancelable(FAR struct efm32_i2c_priv_s *priv) + efm32_i2c_sem_wait_noncancelable(struct efm32_i2c_priv_s *priv) { return nxsem_wait_uninterruptible(&priv->sem_excl); } @@ -497,7 +497,7 @@ static int ****************************************************************************/ #ifdef CONFIG_EFM32_I2C_DYNTIMEO -static useconds_t efm32_i2c_tousecs(int msgc, FAR struct i2c_msg_s *msgs) +static useconds_t efm32_i2c_tousecs(int msgc, struct i2c_msg_s *msgs) { size_t bytecount = 0; int i; @@ -526,7 +526,7 @@ static useconds_t efm32_i2c_tousecs(int msgc, FAR struct i2c_msg_s *msgs) ****************************************************************************/ #ifndef CONFIG_I2C_POLLED -static inline int efm32_i2c_sem_waitdone(FAR struct efm32_i2c_priv_s *priv) +static inline int efm32_i2c_sem_waitdone(struct efm32_i2c_priv_s *priv) { struct timespec abstime; int ret; @@ -599,7 +599,7 @@ static inline int efm32_i2c_sem_waitdone(FAR struct efm32_i2c_priv_s *priv) return ret; } #else -static inline int efm32_i2c_sem_waitdone(FAR struct efm32_i2c_priv_s *priv) +static inline int efm32_i2c_sem_waitdone(struct efm32_i2c_priv_s *priv) { clock_t timeout; clock_t start; @@ -660,7 +660,7 @@ static inline int efm32_i2c_sem_waitdone(FAR struct efm32_i2c_priv_s *priv) * ****************************************************************************/ -static inline void efm32_i2c_sem_post(FAR struct efm32_i2c_priv_s *priv) +static inline void efm32_i2c_sem_post(struct efm32_i2c_priv_s *priv) { nxsem_post(&priv->sem_excl); } @@ -673,7 +673,7 @@ static inline void efm32_i2c_sem_post(FAR struct efm32_i2c_priv_s *priv) * ****************************************************************************/ -static inline void efm32_i2c_sem_init(FAR struct efm32_i2c_priv_s *priv) +static inline void efm32_i2c_sem_init(struct efm32_i2c_priv_s *priv) { nxsem_init(&priv->sem_excl, 0, 1); @@ -695,7 +695,7 @@ static inline void efm32_i2c_sem_init(FAR struct efm32_i2c_priv_s *priv) * ****************************************************************************/ -static inline void efm32_i2c_sem_destroy(FAR struct efm32_i2c_priv_s *priv) +static inline void efm32_i2c_sem_destroy(struct efm32_i2c_priv_s *priv) { nxsem_destroy(&priv->sem_excl); #ifndef CONFIG_I2C_POLLED @@ -712,7 +712,7 @@ static inline void efm32_i2c_sem_destroy(FAR struct efm32_i2c_priv_s *priv) ****************************************************************************/ #ifdef CONFIG_I2C_TRACE -static void efm32_i2c_traceclear(FAR struct efm32_i2c_priv_s *priv) +static void efm32_i2c_traceclear(struct efm32_i2c_priv_s *priv) { struct efm32_trace_s *trace = &priv->trace[priv->tndx]; @@ -723,7 +723,7 @@ static void efm32_i2c_traceclear(FAR struct efm32_i2c_priv_s *priv) trace->time = 0; /* Time of first status or event */ } -static void efm32_i2c_tracereset(FAR struct efm32_i2c_priv_s *priv) +static void efm32_i2c_tracereset(struct efm32_i2c_priv_s *priv) { /* Reset the trace info for a new data collection */ @@ -732,7 +732,7 @@ static void efm32_i2c_tracereset(FAR struct efm32_i2c_priv_s *priv) efm32_i2c_traceclear(priv); } -static void efm32_i2c_tracenew(FAR struct efm32_i2c_priv_s *priv) +static void efm32_i2c_tracenew(struct efm32_i2c_priv_s *priv) { struct efm32_trace_s *trace = &priv->trace[priv->tndx]; @@ -778,7 +778,7 @@ static void efm32_i2c_tracenew(FAR struct efm32_i2c_priv_s *priv) } } -static void efm32_i2c_tracedump(FAR struct efm32_i2c_priv_s *priv) +static void efm32_i2c_tracedump(struct efm32_i2c_priv_s *priv) { struct efm32_trace_s *trace; int i; @@ -807,7 +807,7 @@ static void efm32_i2c_tracedump(FAR struct efm32_i2c_priv_s *priv) * ****************************************************************************/ -static void efm32_i2c_setclock(FAR struct efm32_i2c_priv_s *priv, +static void efm32_i2c_setclock(struct efm32_i2c_priv_s *priv, uint32_t frequency) { uint32_t div; @@ -1274,7 +1274,7 @@ done: ****************************************************************************/ #ifndef CONFIG_I2C_POLLED -static int efm32_i2c_isr(int irq, void *context, FAR void *arg) +static int efm32_i2c_isr(int irq, void *context, void *arg) { struct efm32_i2c_priv_s *priv = (struct efm32_i2c_priv_s *)arg; @@ -1291,7 +1291,7 @@ static int efm32_i2c_isr(int irq, void *context, FAR void *arg) * ****************************************************************************/ -static void efm32_i2c_hwreset(FAR struct efm32_i2c_priv_s *priv) +static void efm32_i2c_hwreset(struct efm32_i2c_priv_s *priv) { efm32_i2c_putreg(priv, EFM32_I2C_CTRL_OFFSET, _I2C_CTRL_RESETVALUE); @@ -1318,7 +1318,7 @@ static void efm32_i2c_hwreset(FAR struct efm32_i2c_priv_s *priv) * ****************************************************************************/ -static int efm32_i2c_init(FAR struct efm32_i2c_priv_s *priv) +static int efm32_i2c_init(struct efm32_i2c_priv_s *priv) { int regval; @@ -1388,7 +1388,7 @@ static int efm32_i2c_init(FAR struct efm32_i2c_priv_s *priv) * ****************************************************************************/ -static int efm32_i2c_deinit(FAR struct efm32_i2c_priv_s *priv) +static int efm32_i2c_deinit(struct efm32_i2c_priv_s *priv) { /* Disable I2C */ @@ -1424,10 +1424,10 @@ static int efm32_i2c_deinit(FAR struct efm32_i2c_priv_s *priv) * ****************************************************************************/ -static int efm32_i2c_transfer(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count) +static int efm32_i2c_transfer(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count) { - FAR struct efm32_i2c_priv_s *priv = (struct efm32_i2c_priv_s *)dev; + struct efm32_i2c_priv_s *priv = (struct efm32_i2c_priv_s *)dev; int ret; DEBUGASSERT(count > 0); @@ -1589,9 +1589,9 @@ static int efm32_i2c_transfer(FAR struct i2c_master_s *dev, ****************************************************************************/ #ifdef CONFIG_I2C_RESET -int efm32_i2c_reset(FAR struct i2c_master_s *dev) +int efm32_i2c_reset(struct i2c_master_s *dev) { - FAR struct efm32_i2c_priv_s *priv = (struct efm32_i2c_priv_s *)dev; + struct efm32_i2c_priv_s *priv = (struct efm32_i2c_priv_s *)dev; unsigned int clock_count; unsigned int stretch_count; uint32_t scl_gpio; @@ -1712,7 +1712,7 @@ out: * ****************************************************************************/ -FAR struct i2c_master_s *efm32_i2cbus_initialize(int port) +struct i2c_master_s *efm32_i2cbus_initialize(int port) { struct efm32_i2c_priv_s *priv = NULL; irqstate_t flags; @@ -1761,9 +1761,9 @@ FAR struct i2c_master_s *efm32_i2cbus_initialize(int port) * ****************************************************************************/ -int efm32_i2cbus_uninitialize(FAR struct i2c_master_s *dev) +int efm32_i2cbus_uninitialize(struct i2c_master_s *dev) { - FAR struct efm32_i2c_priv_s *priv = (struct efm32_i2c_priv_s *)dev; + struct efm32_i2c_priv_s *priv = (struct efm32_i2c_priv_s *)dev; irqstate_t flags; DEBUGASSERT(dev); diff --git a/arch/arm/src/efm32/efm32_i2c.h b/arch/arm/src/efm32/efm32_i2c.h index a6f556e9b5..93fd82587a 100644 --- a/arch/arm/src/efm32/efm32_i2c.h +++ b/arch/arm/src/efm32/efm32_i2c.h @@ -49,7 +49,7 @@ * ****************************************************************************/ -FAR struct i2c_master_s *efm32_i2cbus_initialize(int port); +struct i2c_master_s *efm32_i2cbus_initialize(int port); /**************************************************************************** * Name: efm32_i2cbus_uninitialize @@ -66,6 +66,6 @@ FAR struct i2c_master_s *efm32_i2cbus_initialize(int port); * ****************************************************************************/ -int efm32_i2cbus_uninitialize(FAR struct i2c_master_s *dev); +int efm32_i2cbus_uninitialize(struct i2c_master_s *dev); #endif /* __ARCH_ARM_SRC_EFM32_EFM32_I2C_H */ diff --git a/arch/arm/src/efm32/efm32_irq.c b/arch/arm/src/efm32/efm32_irq.c index 10ef7e5a45..2b70e920b8 100644 --- a/arch/arm/src/efm32/efm32_irq.c +++ b/arch/arm/src/efm32/efm32_irq.c @@ -161,7 +161,7 @@ static void efm32_dumpnvic(const char *msg, int irq) ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -static int efm32_nmi(int irq, FAR void *context, FAR void *arg) +static int efm32_nmi(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! NMI received\n"); @@ -169,7 +169,7 @@ static int efm32_nmi(int irq, FAR void *context, FAR void *arg) return 0; } -static int efm32_busfault(int irq, FAR void *context, FAR void *arg) +static int efm32_busfault(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); @@ -177,7 +177,7 @@ static int efm32_busfault(int irq, FAR void *context, FAR void *arg) return 0; } -static int efm32_usagefault(int irq, FAR void *context, FAR void *arg) +static int efm32_usagefault(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); @@ -185,7 +185,7 @@ static int efm32_usagefault(int irq, FAR void *context, FAR void *arg) return 0; } -static int efm32_pendsv(int irq, FAR void *context, FAR void *arg) +static int efm32_pendsv(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! PendSV received\n"); @@ -193,7 +193,7 @@ static int efm32_pendsv(int irq, FAR void *context, FAR void *arg) return 0; } -static int efm32_dbgmonitor(int irq, FAR void *context, FAR void *arg) +static int efm32_dbgmonitor(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Debug Monitor received\n"); @@ -201,7 +201,7 @@ static int efm32_dbgmonitor(int irq, FAR void *context, FAR void *arg) return 0; } -static int efm32_reserved(int irq, FAR void *context, FAR void *arg) +static int efm32_reserved(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Reserved interrupt\n"); diff --git a/arch/arm/src/efm32/efm32_leserial.c b/arch/arm/src/efm32/efm32_leserial.c index 1fb26caf10..f31c7ffc87 100644 --- a/arch/arm/src/efm32/efm32_leserial.c +++ b/arch/arm/src/efm32/efm32_leserial.c @@ -149,7 +149,7 @@ static int efm32_setup(struct uart_dev_s *dev); static void efm32_shutdown(struct uart_dev_s *dev); static int efm32_attach(struct uart_dev_s *dev); static void efm32_detach(struct uart_dev_s *dev); -static int efm32_interrupt(int irq, void *context, FAR void *arg); +static int efm32_interrupt(int irq, void *context, void *arg); static int efm32_ioctl(struct file *filep, int cmd, unsigned long arg); static int efm32_receive(struct uart_dev_s *dev, unsigned int *status); static void efm32_rxint(struct uart_dev_s *dev, bool enable); @@ -453,7 +453,7 @@ static void efm32_detach(struct uart_dev_s *dev) * ****************************************************************************/ -static int efm32_interrupt(int irq, void *context, FAR void *arg) +static int efm32_interrupt(int irq, void *context, void *arg) { struct uart_dev_s *dev = (struct uart_dev_s *)arg; struct efm32_leuart_s *priv; diff --git a/arch/arm/src/efm32/efm32_pwm.c b/arch/arm/src/efm32/efm32_pwm.c index 5447448e34..625397dd4b 100644 --- a/arch/arm/src/efm32/efm32_pwm.c +++ b/arch/arm/src/efm32/efm32_pwm.c @@ -75,22 +75,22 @@ struct efm32_pwmtimer_s { - FAR const struct pwm_ops_s *ops; /* PWM operations */ - uint8_t timid; /* Timer ID {1,...,14} */ - uint8_t channel; /* Timer output channel: {1,..4} */ - uint8_t pinloc; /* Timer output channel pin location */ + const struct pwm_ops_s *ops; /* PWM operations */ + uint8_t timid; /* Timer ID {1,...,14} */ + uint8_t channel; /* Timer output channel: {1,..4} */ + uint8_t pinloc; /* Timer output channel pin location */ #ifdef CONFIG_PWM_PULSECOUNT - uint8_t irq; /* Timer update IRQ */ - uint8_t prev; /* The previous value of the RCR (pre-loaded) */ - uint8_t curr; /* The current value of the RCR (pre-loaded) */ - uint32_t count; /* Remaining pulse count */ + uint8_t irq; /* Timer update IRQ */ + uint8_t prev; /* The previous value of the RCR (pre-loaded) */ + uint8_t curr; /* The current value of the RCR (pre-loaded) */ + uint32_t count; /* Remaining pulse count */ #endif - uint32_t base; /* The base address of the timer */ - uint32_t pincfg; /* Output pin configuration */ - uint32_t pclk; /* The frequency of the peripheral clock - * that drives the timer module. */ + uint32_t base; /* The base address of the timer */ + uint32_t pincfg; /* Output pin configuration */ + uint32_t pclk; /* The frequency of the peripheral clock + * that drives the timer module. */ #ifdef CONFIG_PWM_PULSECOUNT - FAR void *handle; /* Handle used for upper-half callback */ + void *handle; /* Handle used for upper-half callback */ #endif }; @@ -105,42 +105,42 @@ static void pwm_putreg(struct efm32_pwmtimer_s *priv, int offset, uint32_t value); #ifdef CONFIG_DEBUG_PWM_INFO -static void pwm_dumpregs(struct efm32_pwmtimer_s *priv, FAR const char *msg); +static void pwm_dumpregs(struct efm32_pwmtimer_s *priv, const char *msg); #else # define pwm_dumpregs(priv,msg) #endif /* Timer management */ -static int pwm_timer(FAR struct efm32_pwmtimer_s *priv, - FAR const struct pwm_info_s *info); +static int pwm_timer(struct efm32_pwmtimer_s *priv, + const struct pwm_info_s *info); #if defined(CONFIG_PWM_PULSECOUNT) && (defined(CONFIG_EFM32_TIMER0_PWM) || \ defined(CONFIG_EFM32_TIMER1_PWM) || \ defined(CONFIG_EFM32_TIMER2_PWM) || \ defined(CONFIG_EFM32_TIMER3_PWM) \ ) -static int pwm_interrupt(int irq, void *context, FAR void *arg); +static int pwm_interrupt(int irq, void *context, void *arg); static uint8_t pwm_pulsecount(uint32_t count); #endif /* PWM driver methods */ -static int pwm_setup(FAR struct pwm_lowerhalf_s *dev); -static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev); +static int pwm_setup(struct pwm_lowerhalf_s *dev); +static int pwm_shutdown(struct pwm_lowerhalf_s *dev); #ifdef CONFIG_PWM_PULSECOUNT -static int pwm_start(FAR struct pwm_lowerhalf_s *dev, - FAR const struct pwm_info_s *info, - FAR void *handle); +static int pwm_start(struct pwm_lowerhalf_s *dev, + const struct pwm_info_s *info, + void *handle); #else -static int pwm_start(FAR struct pwm_lowerhalf_s *dev, - FAR const struct pwm_info_s *info); +static int pwm_start(struct pwm_lowerhalf_s *dev, + const struct pwm_info_s *info); #endif -static int pwm_stop(FAR struct pwm_lowerhalf_s *dev); -static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, +static int pwm_stop(struct pwm_lowerhalf_s *dev); +static int pwm_ioctl(struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg); /**************************************************************************** @@ -284,7 +284,7 @@ static void pwm_putreg(struct efm32_pwmtimer_s *priv, ****************************************************************************/ #ifdef CONFIG_DEBUG_PWM_INFO -static void pwm_dumpregs(struct efm32_pwmtimer_s *priv, FAR const char *msg) +static void pwm_dumpregs(struct efm32_pwmtimer_s *priv, const char *msg) { /* TODO debug pwm_dumpregs */ @@ -345,8 +345,8 @@ static void pwm_dumpregs(struct efm32_pwmtimer_s *priv, FAR const char *msg) * ****************************************************************************/ -static int pwm_timer(FAR struct efm32_pwmtimer_s *priv, - FAR const struct pwm_info_s *info) +static int pwm_timer(struct efm32_pwmtimer_s *priv, + const struct pwm_info_s *info) { /* Register contents */ @@ -439,7 +439,7 @@ static int pwm_timer(FAR struct efm32_pwmtimer_s *priv, defined(CONFIG_EFM32_TIMER3_PWM) \ ) #warning "not yet implemented" -static int pwm_interrupt(int irq, void *context, FAR void *arg) +static int pwm_interrupt(int irq, void *context, void *arg) { /* TODO pwm_interrupt */ #if 0 @@ -473,7 +473,7 @@ static int pwm_interrupt(int irq, void *context, FAR void *arg) /* Disable first interrupts, stop and reset the timer */ - pwm_stop((FAR struct pwm_lowerhalf_s *)priv); + pwm_stop((struct pwm_lowerhalf_s *)priv); /* Then perform the callback into the upper half driver */ @@ -588,9 +588,9 @@ static uint8_t pwm_pulsecount(uint32_t count) * ****************************************************************************/ -static int pwm_setup(FAR struct pwm_lowerhalf_s *dev) +static int pwm_setup(struct pwm_lowerhalf_s *dev) { - FAR struct efm32_pwmtimer_s *priv = (FAR struct efm32_pwmtimer_s *)dev; + struct efm32_pwmtimer_s *priv = (struct efm32_pwmtimer_s *)dev; pwminfo("TIMER%d pincfg: %08x\n", priv->timid, priv->pincfg); pwm_dumpregs(priv, "Initially"); @@ -644,9 +644,9 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) +static int pwm_shutdown(struct pwm_lowerhalf_s *dev) { - FAR struct efm32_pwmtimer_s *priv = (FAR struct efm32_pwmtimer_s *)dev; + struct efm32_pwmtimer_s *priv = (struct efm32_pwmtimer_s *)dev; uint32_t pincfg; pwminfo("TIMER%d pincfg: %08x\n", priv->timid, priv->pincfg); @@ -681,11 +681,11 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) ****************************************************************************/ #ifdef CONFIG_PWM_PULSECOUNT -static int pwm_start(FAR struct pwm_lowerhalf_s *dev, - FAR const struct pwm_info_s *info, - FAR void *handle) +static int pwm_start(struct pwm_lowerhalf_s *dev, + const struct pwm_info_s *info, + void *handle) { - FAR struct efm32_pwmtimer_s *priv = (FAR struct efm32_pwmtimer_s *)dev; + struct efm32_pwmtimer_s *priv = (struct efm32_pwmtimer_s *)dev; /* Save the handle */ @@ -696,10 +696,10 @@ static int pwm_start(FAR struct pwm_lowerhalf_s *dev, return pwm_timer(priv, info); } #else -static int pwm_start(FAR struct pwm_lowerhalf_s *dev, - FAR const struct pwm_info_s *info) +static int pwm_start(struct pwm_lowerhalf_s *dev, + const struct pwm_info_s *info) { - FAR struct efm32_pwmtimer_s *priv = (FAR struct efm32_pwmtimer_s *)dev; + struct efm32_pwmtimer_s *priv = (struct efm32_pwmtimer_s *)dev; return pwm_timer(priv, info); } #endif @@ -723,9 +723,9 @@ static int pwm_start(FAR struct pwm_lowerhalf_s *dev, * ****************************************************************************/ -static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) +static int pwm_stop(struct pwm_lowerhalf_s *dev) { - FAR struct efm32_pwmtimer_s *priv = (FAR struct efm32_pwmtimer_s *)dev; + struct efm32_pwmtimer_s *priv = (struct efm32_pwmtimer_s *)dev; irqstate_t flags; pwminfo("TIMER%d\n", priv->timid); @@ -764,11 +764,11 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, +static int pwm_ioctl(struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg) { #ifdef CONFIG_DEBUG_PWM_INFO - FAR struct efm32_pwmtimer_s *priv = (FAR struct efm32_pwmtimer_s *)dev; + struct efm32_pwmtimer_s *priv = (struct efm32_pwmtimer_s *)dev; /* There are no platform-specific ioctl commands */ @@ -798,9 +798,9 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, * ****************************************************************************/ -FAR struct pwm_lowerhalf_s *efm32_pwminitialize(int timer) +struct pwm_lowerhalf_s *efm32_pwminitialize(int timer) { - FAR struct efm32_pwmtimer_s *lower; + struct efm32_pwmtimer_s *lower; pwminfo("TIMER%d\n", timer); @@ -840,7 +840,7 @@ FAR struct pwm_lowerhalf_s *efm32_pwminitialize(int timer) up_disable_irq(lower->irq); #endif - return (FAR struct pwm_lowerhalf_s *)lower; + return (struct pwm_lowerhalf_s *)lower; } #endif /* CONFIG_EFM32_TIMn_PWM, n = 0,..,3 */ diff --git a/arch/arm/src/efm32/efm32_pwm.h b/arch/arm/src/efm32/efm32_pwm.h index e4ef2d0f6b..7b92375359 100644 --- a/arch/arm/src/efm32/efm32_pwm.h +++ b/arch/arm/src/efm32/efm32_pwm.h @@ -129,7 +129,7 @@ extern "C" * ****************************************************************************/ -FAR struct pwm_lowerhalf_s *efm32_pwminitialize(int timer); +struct pwm_lowerhalf_s *efm32_pwminitialize(int timer); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/efm32/efm32_rtc.h b/arch/arm/src/efm32/efm32_rtc.h index 6cb7a65bd4..8cf39b2bd2 100644 --- a/arch/arm/src/efm32/efm32_rtc.h +++ b/arch/arm/src/efm32/efm32_rtc.h @@ -56,7 +56,7 @@ typedef void (*alarmcb_t)(void); #ifdef CONFIG_RTC_ALARM struct timespec; -int efm32_rtc_setalarm(FAR const struct timespec *tp, alarmcb_t callback); +int efm32_rtc_setalarm(const struct timespec *tp, alarmcb_t callback); #endif /**************************************************************************** diff --git a/arch/arm/src/efm32/efm32_rtc_burtc.c b/arch/arm/src/efm32/efm32_rtc_burtc.c index af6de5d14e..614b4c6bca 100644 --- a/arch/arm/src/efm32/efm32_rtc_burtc.c +++ b/arch/arm/src/efm32/efm32_rtc_burtc.c @@ -160,7 +160,7 @@ volatile bool g_rtc_enabled = false; * ****************************************************************************/ -static int efm32_rtc_burtc_interrupt(int irq, void *context, FAR void *arg) +static int efm32_rtc_burtc_interrupt(int irq, void *context, void *arg) { uint32_t source = getreg32(EFM32_BURTC_IF); @@ -417,7 +417,7 @@ time_t up_rtc_time(void) ****************************************************************************/ #ifdef CONFIG_RTC_HIRES -int up_rtc_gettime(FAR struct timespec *tp) +int up_rtc_gettime(struct timespec *tp) { uint64_t val; @@ -450,7 +450,7 @@ int up_rtc_gettime(FAR struct timespec *tp) * ****************************************************************************/ -int up_rtc_settime(FAR const struct timespec *tp) +int up_rtc_settime(const struct timespec *tp) { uint32_t cnt_carry; uint32_t cnt; @@ -506,7 +506,7 @@ int up_rtc_settime(FAR const struct timespec *tp) #ifdef CONFIG_RTC_ALARM #error "Sorry ! not yet implemented, just copied from STM32" -int efm32_rtc_setalarm(FAR const struct timespec *tp, alarmcb_t callback) +int efm32_rtc_setalarm(const struct timespec *tp, alarmcb_t callback) { struct rtc_regvals_s regvals; irqstate_t flags; diff --git a/arch/arm/src/efm32/efm32_spi.c b/arch/arm/src/efm32/efm32_spi.c index 1ad335d715..0421e48fb1 100644 --- a/arch/arm/src/efm32/efm32_spi.c +++ b/arch/arm/src/efm32/efm32_spi.c @@ -156,8 +156,8 @@ static void spi_dmarxsetup(struct efm32_spidev_s *priv, static void spi_dmatxsetup(struct efm32_spidev_s *priv, const void *txbuffer, const void *txdummy, size_t nwords); -static inline void spi_dmarxstart(FAR struct efm32_spidev_s *priv); -static inline void spi_dmatxstart(FAR struct efm32_spidev_s *priv); +static inline void spi_dmarxstart(struct efm32_spidev_s *priv); +static inline void spi_dmatxstart(struct efm32_spidev_s *priv); #endif /* SPI methods */ @@ -170,7 +170,7 @@ static uint32_t spi_setfrequency(struct spi_dev_s *dev, static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode); static void spi_setbits(struct spi_dev_s *dev, int nbits); #ifdef CONFIG_SPI_HWFEATURES -static int spi_hwfeatures(FAR struct spi_dev_s *dev, +static int spi_hwfeatures(struct spi_dev_s *dev, spi_hwfeatures_t features); #endif static uint8_t spi_status(struct spi_dev_s *dev, uint32_t devid); @@ -667,7 +667,7 @@ static void spi_dmatxsetup(struct efm32_spidev_s *priv, const void *txbuffer, ****************************************************************************/ #ifdef CONFIG_EFM32_SPI_DMA -static void spi_dmarxstart(FAR struct efm32_spidev_s *priv) +static void spi_dmarxstart(struct efm32_spidev_s *priv) { priv->rxresult = EINPROGRESS; efm32_dmastart(priv->rxdmach, spi_dmarxcallback, priv); @@ -683,7 +683,7 @@ static void spi_dmarxstart(FAR struct efm32_spidev_s *priv) ****************************************************************************/ #ifdef CONFIG_EFM32_SPI_DMA -static inline void spi_dmatxstart(FAR struct efm32_spidev_s *priv) +static inline void spi_dmatxstart(struct efm32_spidev_s *priv) { priv->txresult = EINPROGRESS; efm32_dmastart(priv->txdmach, spi_dmatxcallback, priv); @@ -1050,7 +1050,7 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits) ****************************************************************************/ #ifdef CONFIG_SPI_HWFEATURES -static int spi_hwfeatures(FAR struct spi_dev_s *dev, +static int spi_hwfeatures(struct spi_dev_s *dev, spi_hwfeatures_t features) { #ifdef CONFIG_SPI_BITORDER diff --git a/arch/arm/src/efm32/efm32_timer.c b/arch/arm/src/efm32/efm32_timer.c index 76d281229e..9526a029b7 100644 --- a/arch/arm/src/efm32/efm32_timer.c +++ b/arch/arm/src/efm32/efm32_timer.c @@ -68,7 +68,7 @@ * ****************************************************************************/ -void efm32_timer_dumpregs(uintptr_t base, FAR const char *msg) +void efm32_timer_dumpregs(uintptr_t base, const char *msg) { #ifdef CONFIG_DEBUG_TIMER_INFO int i; diff --git a/arch/arm/src/efm32/efm32_timer.h b/arch/arm/src/efm32/efm32_timer.h index b241fb0fdb..610eaa6a40 100644 --- a/arch/arm/src/efm32/efm32_timer.h +++ b/arch/arm/src/efm32/efm32_timer.h @@ -33,7 +33,7 @@ ****************************************************************************/ void efm32_timer_reset(uintptr_t base); -void efm32_timer_dumpregs(uintptr_t base, FAR const char *msg); +void efm32_timer_dumpregs(uintptr_t base, const char *msg); int efm32_timer_set_freq(uintptr_t base, uint32_t clk_freq, uint32_t freq); #endif /* __ARCH_ARM_SRC_EFM32_EFM32_TIMER_H */ diff --git a/arch/arm/src/efm32/efm32_timerisr.c b/arch/arm/src/efm32/efm32_timerisr.c index 46dbcb7ded..903b4c55e8 100644 --- a/arch/arm/src/efm32/efm32_timerisr.c +++ b/arch/arm/src/efm32/efm32_timerisr.c @@ -67,7 +67,7 @@ * ****************************************************************************/ -static int efm32_timerisr(int irq, uint32_t *regs, FAR void *arg) +static int efm32_timerisr(int irq, uint32_t *regs, void *arg) { /* Process timer interrupt */ diff --git a/arch/arm/src/efm32/efm32_usb.h b/arch/arm/src/efm32/efm32_usb.h index c85bbe0c9d..8a7dda78a8 100644 --- a/arch/arm/src/efm32/efm32_usb.h +++ b/arch/arm/src/efm32/efm32_usb.h @@ -152,7 +152,7 @@ extern "C" #ifdef CONFIG_USBHOST struct usbhost_connection_s; -FAR struct usbhost_connection_s *efm32_usbhost_initialize(int controller); +struct usbhost_connection_s *efm32_usbhost_initialize(int controller); #endif /**************************************************************************** @@ -190,7 +190,7 @@ void efm32_usbhost_vbusdrive(int iface, bool enable); #ifdef CONFIG_USBDEV struct usbdev_s; -void efm32_usbsuspend(FAR struct usbdev_s *dev, bool resume); +void efm32_usbsuspend(struct usbdev_s *dev, bool resume); #endif #undef EXTERN diff --git a/arch/arm/src/efm32/efm32_usbdev.c b/arch/arm/src/efm32/efm32_usbdev.c index c308c6caf7..f4d26a821f 100644 --- a/arch/arm/src/efm32/efm32_usbdev.c +++ b/arch/arm/src/efm32/efm32_usbdev.c @@ -480,164 +480,164 @@ static void efm32_putreg(uint32_t val, uint32_t addr); /* Request queue operations *************************************************/ -static FAR struct -efm32_req_s *efm32_req_remfirst(FAR struct efm32_ep_s *privep); -static bool efm32_req_addlast(FAR struct efm32_ep_s *privep, - FAR struct efm32_req_s *req); +static struct +efm32_req_s *efm32_req_remfirst(struct efm32_ep_s *privep); +static bool efm32_req_addlast(struct efm32_ep_s *privep, + struct efm32_req_s *req); /* Low level data transfers and request operations **************************/ /* Special endpoint 0 data transfer logic */ -static void efm32_ep0in_setupresponse(FAR struct efm32_usbdev_s *priv, - FAR uint8_t *data, uint32_t nbytes); -static inline void efm32_ep0in_transmitzlp(FAR struct efm32_usbdev_s *priv); +static void efm32_ep0in_setupresponse(struct efm32_usbdev_s *priv, + uint8_t *data, uint32_t nbytes); +static inline void efm32_ep0in_transmitzlp(struct efm32_usbdev_s *priv); static void efm32_ep0in_activate(void); -static void efm32_ep0out_ctrlsetup(FAR struct efm32_usbdev_s *priv); +static void efm32_ep0out_ctrlsetup(struct efm32_usbdev_s *priv); /* IN request and TxFIFO handling */ -static void efm32_txfifo_write(FAR struct efm32_ep_s *privep, - FAR uint8_t *buf, int nbytes); -static void efm32_epin_transfer(FAR struct efm32_ep_s *privep, - FAR uint8_t *buf, int nbytes); -static void efm32_epin_request(FAR struct efm32_usbdev_s *priv, - FAR struct efm32_ep_s *privep); +static void efm32_txfifo_write(struct efm32_ep_s *privep, + uint8_t *buf, int nbytes); +static void efm32_epin_transfer(struct efm32_ep_s *privep, + uint8_t *buf, int nbytes); +static void efm32_epin_request(struct efm32_usbdev_s *priv, + struct efm32_ep_s *privep); /* OUT request and RxFIFO handling */ -static void efm32_rxfifo_read(FAR struct efm32_ep_s *privep, - FAR uint8_t *dest, uint16_t len); -static void efm32_rxfifo_discard(FAR struct efm32_ep_s *privep, int len); -static void efm32_epout_complete(FAR struct efm32_usbdev_s *priv, - FAR struct efm32_ep_s *privep); +static void efm32_rxfifo_read(struct efm32_ep_s *privep, + uint8_t *dest, uint16_t len); +static void efm32_rxfifo_discard(struct efm32_ep_s *privep, int len); +static void efm32_epout_complete(struct efm32_usbdev_s *priv, + struct efm32_ep_s *privep); static inline void -efm32_ep0out_receive(FAR struct efm32_ep_s *privep, int bcnt); +efm32_ep0out_receive(struct efm32_ep_s *privep, int bcnt); static inline void -efm32_epout_receive(FAR struct efm32_ep_s *privep, int bcnt); -static void efm32_epout_request(FAR struct efm32_usbdev_s *priv, - FAR struct efm32_ep_s *privep); +efm32_epout_receive(struct efm32_ep_s *privep, int bcnt); +static void efm32_epout_request(struct efm32_usbdev_s *priv, + struct efm32_ep_s *privep); /* General request handling */ -static void efm32_ep_flush(FAR struct efm32_ep_s *privep); -static void efm32_req_complete(FAR struct efm32_ep_s *privep, +static void efm32_ep_flush(struct efm32_ep_s *privep); +static void efm32_req_complete(struct efm32_ep_s *privep, int16_t result); -static void efm32_req_cancel(FAR struct efm32_ep_s *privep, +static void efm32_req_cancel(struct efm32_ep_s *privep, int16_t status); /* Interrupt handling *******************************************************/ static struct efm32_ep_s *efm32_ep_findbyaddr(struct efm32_usbdev_s *priv, uint16_t eplog); -static int efm32_req_dispatch(FAR struct efm32_usbdev_s *priv, - FAR const struct usb_ctrlreq_s *ctrl); -static void efm32_usbreset(FAR struct efm32_usbdev_s *priv); +static int efm32_req_dispatch(struct efm32_usbdev_s *priv, + const struct usb_ctrlreq_s *ctrl); +static void efm32_usbreset(struct efm32_usbdev_s *priv); /* Second level OUT endpoint interrupt processing */ -static inline void efm32_ep0out_testmode(FAR struct efm32_usbdev_s *priv, +static inline void efm32_ep0out_testmode(struct efm32_usbdev_s *priv, uint16_t index); static inline void efm32_ep0out_stdrequest(struct efm32_usbdev_s *priv, - FAR struct efm32_ctrlreq_s *ctrlreq); + struct efm32_ctrlreq_s *ctrlreq); static inline void efm32_ep0out_setup(struct efm32_usbdev_s *priv); -static inline void efm32_epout(FAR struct efm32_usbdev_s *priv, +static inline void efm32_epout(struct efm32_usbdev_s *priv, uint8_t epno); -static inline void efm32_epout_interrupt(FAR struct efm32_usbdev_s *priv); +static inline void efm32_epout_interrupt(struct efm32_usbdev_s *priv); /* Second level IN endpoint interrupt processing */ -static inline void efm32_epin_runtestmode(FAR struct efm32_usbdev_s *priv); -static inline void efm32_epin(FAR struct efm32_usbdev_s *priv, uint8_t epno); -static inline void efm32_epin_txfifoempty(FAR struct efm32_usbdev_s *priv, +static inline void efm32_epin_runtestmode(struct efm32_usbdev_s *priv); +static inline void efm32_epin(struct efm32_usbdev_s *priv, uint8_t epno); +static inline void efm32_epin_txfifoempty(struct efm32_usbdev_s *priv, int epno); -static inline void efm32_epin_interrupt(FAR struct efm32_usbdev_s *priv); +static inline void efm32_epin_interrupt(struct efm32_usbdev_s *priv); /* Other second level interrupt processing */ -static inline void efm32_resumeinterrupt(FAR struct efm32_usbdev_s *priv); -static inline void efm32_suspendinterrupt(FAR struct efm32_usbdev_s *priv); -static inline void efm32_rxinterrupt(FAR struct efm32_usbdev_s *priv); -static inline void efm32_enuminterrupt(FAR struct efm32_usbdev_s *priv); +static inline void efm32_resumeinterrupt(struct efm32_usbdev_s *priv); +static inline void efm32_suspendinterrupt(struct efm32_usbdev_s *priv); +static inline void efm32_rxinterrupt(struct efm32_usbdev_s *priv); +static inline void efm32_enuminterrupt(struct efm32_usbdev_s *priv); #ifdef CONFIG_USBDEV_ISOCHRONOUS -static inline void efm32_isocininterrupt(FAR struct efm32_usbdev_s *priv); -static inline void efm32_isocoutinterrupt(FAR struct efm32_usbdev_s *priv); +static inline void efm32_isocininterrupt(struct efm32_usbdev_s *priv); +static inline void efm32_isocoutinterrupt(struct efm32_usbdev_s *priv); #endif #ifdef CONFIG_USBDEV_VBUSSENSING -static inline void efm32_sessioninterrupt(FAR struct efm32_usbdev_s *priv); -static inline void efm32_otginterrupt(FAR struct efm32_usbdev_s *priv); +static inline void efm32_sessioninterrupt(struct efm32_usbdev_s *priv); +static inline void efm32_otginterrupt(struct efm32_usbdev_s *priv); #endif /* First level interrupt processing */ static int efm32_usbinterrupt(int irq, - FAR void *context, FAR void *arg); + void *context, void *arg); /* Endpoint operations ******************************************************/ /* Global OUT NAK controls */ -static void efm32_enablegonak(FAR struct efm32_ep_s *privep); -static void efm32_disablegonak(FAR struct efm32_ep_s *privep); +static void efm32_enablegonak(struct efm32_ep_s *privep); +static void efm32_disablegonak(struct efm32_ep_s *privep); /* Endpoint configuration */ -static int efm32_epout_configure(FAR struct efm32_ep_s *privep, +static int efm32_epout_configure(struct efm32_ep_s *privep, uint8_t eptype, uint16_t maxpacket); -static int efm32_epin_configure(FAR struct efm32_ep_s *privep, +static int efm32_epin_configure(struct efm32_ep_s *privep, uint8_t eptype, uint16_t maxpacket); -static int efm32_ep_configure(FAR struct usbdev_ep_s *ep, - FAR const struct usb_epdesc_s *desc, bool last); -static void efm32_ep0_configure(FAR struct efm32_usbdev_s *priv); +static int efm32_ep_configure(struct usbdev_ep_s *ep, + const struct usb_epdesc_s *desc, bool last); +static void efm32_ep0_configure(struct efm32_usbdev_s *priv); /* Endpoint disable */ -static void efm32_epout_disable(FAR struct efm32_ep_s *privep); -static void efm32_epin_disable(FAR struct efm32_ep_s *privep); -static int efm32_ep_disable(FAR struct usbdev_ep_s *ep); +static void efm32_epout_disable(struct efm32_ep_s *privep); +static void efm32_epin_disable(struct efm32_ep_s *privep); +static int efm32_ep_disable(struct usbdev_ep_s *ep); /* Endpoint request management */ -static FAR struct -usbdev_req_s *efm32_ep_allocreq(FAR struct usbdev_ep_s *ep); -static void efm32_ep_freereq(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *); +static struct +usbdev_req_s *efm32_ep_allocreq(struct usbdev_ep_s *ep); +static void efm32_ep_freereq(struct usbdev_ep_s *ep, + struct usbdev_req_s *); /* Endpoint buffer management */ #ifdef CONFIG_USBDEV_DMA -static void *efm32_ep_allocbuffer(FAR struct usbdev_ep_s *ep, +static void *efm32_ep_allocbuffer(struct usbdev_ep_s *ep, unsigned bytes); -static void efm32_ep_freebuffer(FAR struct usbdev_ep_s *ep, - FAR void *buf); +static void efm32_ep_freebuffer(struct usbdev_ep_s *ep, + void *buf); #endif /* Endpoint request submission */ -static int efm32_ep_submit(FAR struct usbdev_ep_s *ep, +static int efm32_ep_submit(struct usbdev_ep_s *ep, struct usbdev_req_s *req); /* Endpoint request cancellation */ -static int efm32_ep_cancel(FAR struct usbdev_ep_s *ep, +static int efm32_ep_cancel(struct usbdev_ep_s *ep, struct usbdev_req_s *req); /* Stall handling */ -static int efm32_epout_setstall(FAR struct efm32_ep_s *privep); -static int efm32_epin_setstall(FAR struct efm32_ep_s *privep); -static int efm32_ep_setstall(FAR struct efm32_ep_s *privep); -static int efm32_ep_clrstall(FAR struct efm32_ep_s *privep); -static int efm32_ep_stall(FAR struct usbdev_ep_s *ep, bool resume); -static void efm32_ep0_stall(FAR struct efm32_usbdev_s *priv); +static int efm32_epout_setstall(struct efm32_ep_s *privep); +static int efm32_epin_setstall(struct efm32_ep_s *privep); +static int efm32_ep_setstall(struct efm32_ep_s *privep); +static int efm32_ep_clrstall(struct efm32_ep_s *privep); +static int efm32_ep_stall(struct usbdev_ep_s *ep, bool resume); +static void efm32_ep0_stall(struct efm32_usbdev_s *priv); /* Endpoint allocation */ -static FAR struct usbdev_ep_s *efm32_ep_alloc(FAR struct usbdev_s *dev, +static struct usbdev_ep_s *efm32_ep_alloc(struct usbdev_s *dev, uint8_t epno, bool in, uint8_t eptype); -static void efm32_ep_free(FAR struct usbdev_s *dev, - FAR struct usbdev_ep_s *ep); +static void efm32_ep_free(struct usbdev_s *dev, + struct usbdev_ep_s *ep); /* USB device controller operations *****************************************/ @@ -652,8 +652,8 @@ static int efm32_rxfifo_flush(void); /* Initialization ***********************************************************/ -static void efm32_swinitialize(FAR struct efm32_usbdev_s *priv); -static void efm32_hwinitialize(FAR struct efm32_usbdev_s *priv); +static void efm32_swinitialize(struct efm32_usbdev_s *priv); +static void efm32_hwinitialize(struct efm32_usbdev_s *priv); /**************************************************************************** * Private Data @@ -885,10 +885,10 @@ static void efm32_putreg(uint32_t val, uint32_t addr) * ****************************************************************************/ -static FAR struct -efm32_req_s *efm32_req_remfirst(FAR struct efm32_ep_s *privep) +static struct +efm32_req_s *efm32_req_remfirst(struct efm32_ep_s *privep) { - FAR struct efm32_req_s *ret = privep->head; + struct efm32_req_s *ret = privep->head; if (ret) { @@ -912,8 +912,8 @@ efm32_req_s *efm32_req_remfirst(FAR struct efm32_ep_s *privep) * ****************************************************************************/ -static bool efm32_req_addlast(FAR struct efm32_ep_s *privep, - FAR struct efm32_req_s *req) +static bool efm32_req_addlast(struct efm32_ep_s *privep, + struct efm32_req_s *req) { bool is_empty = !privep->head; @@ -940,8 +940,8 @@ static bool efm32_req_addlast(FAR struct efm32_ep_s *privep, * ****************************************************************************/ -static void efm32_ep0in_setupresponse(FAR struct efm32_usbdev_s *priv, - FAR uint8_t *buf, uint32_t nbytes) +static void efm32_ep0in_setupresponse(struct efm32_usbdev_s *priv, + uint8_t *buf, uint32_t nbytes) { efm32_epin_transfer(&priv->epin[EP0], buf, nbytes); priv->ep0state = EP0STATE_SETUPRESPONSE; @@ -956,7 +956,7 @@ static void efm32_ep0in_setupresponse(FAR struct efm32_usbdev_s *priv, * ****************************************************************************/ -static inline void efm32_ep0in_transmitzlp(FAR struct efm32_usbdev_s *priv) +static inline void efm32_ep0in_transmitzlp(struct efm32_usbdev_s *priv) { efm32_ep0in_setupresponse(priv, NULL, 0); } @@ -1007,7 +1007,7 @@ static void efm32_ep0in_activate(void) * ****************************************************************************/ -static void efm32_ep0out_ctrlsetup(FAR struct efm32_usbdev_s *priv) +static void efm32_ep0out_ctrlsetup(struct efm32_usbdev_s *priv) { uint32_t regval; @@ -1033,8 +1033,8 @@ static void efm32_ep0out_ctrlsetup(FAR struct efm32_usbdev_s *priv) * ****************************************************************************/ -static void efm32_txfifo_write(FAR struct efm32_ep_s *privep, - FAR uint8_t *buf, int nbytes) +static void efm32_txfifo_write(struct efm32_ep_s *privep, + uint8_t *buf, int nbytes) { uint32_t regaddr; uint32_t regval; @@ -1076,8 +1076,8 @@ static void efm32_txfifo_write(FAR struct efm32_ep_s *privep, * ****************************************************************************/ -static void efm32_epin_transfer(FAR struct efm32_ep_s *privep, - FAR uint8_t *buf, int nbytes) +static void efm32_epin_transfer(struct efm32_ep_s *privep, + uint8_t *buf, int nbytes) { uint32_t pktcnt; uint32_t regval; @@ -1179,8 +1179,8 @@ static void efm32_epin_transfer(FAR struct efm32_ep_s *privep, * ****************************************************************************/ -static void efm32_epin_request(FAR struct efm32_usbdev_s *priv, - FAR struct efm32_ep_s *privep) +static void efm32_epin_request(struct efm32_usbdev_s *priv, + struct efm32_ep_s *privep) { struct efm32_req_s *privreq; uint32_t regaddr; @@ -1401,8 +1401,8 @@ static void efm32_epin_request(FAR struct efm32_usbdev_s *priv, * ****************************************************************************/ -static void efm32_rxfifo_read(FAR struct efm32_ep_s *privep, - FAR uint8_t *dest, uint16_t len) +static void efm32_rxfifo_read(struct efm32_ep_s *privep, + uint8_t *dest, uint16_t len) { uint32_t regaddr; int i; @@ -1446,7 +1446,7 @@ static void efm32_rxfifo_read(FAR struct efm32_ep_s *privep, * ****************************************************************************/ -static void efm32_rxfifo_discard(FAR struct efm32_ep_s *privep, int len) +static void efm32_rxfifo_discard(struct efm32_ep_s *privep, int len) { if (len > 0) { @@ -1479,8 +1479,8 @@ static void efm32_rxfifo_discard(FAR struct efm32_ep_s *privep, int len) * ****************************************************************************/ -static void efm32_epout_complete(FAR struct efm32_usbdev_s *priv, - FAR struct efm32_ep_s *privep) +static void efm32_epout_complete(struct efm32_usbdev_s *priv, + struct efm32_ep_s *privep) { struct efm32_req_s *privreq; @@ -1528,15 +1528,15 @@ static void efm32_epout_complete(FAR struct efm32_usbdev_s *priv, * ****************************************************************************/ -static inline void efm32_ep0out_receive(FAR struct efm32_ep_s *privep, +static inline void efm32_ep0out_receive(struct efm32_ep_s *privep, int bcnt) { - FAR struct efm32_usbdev_s *priv; + struct efm32_usbdev_s *priv; /* Sanity Checking */ DEBUGASSERT(privep && privep->ep.priv); - priv = (FAR struct efm32_usbdev_s *)privep->ep.priv; + priv = (struct efm32_usbdev_s *)privep->ep.priv; uinfo("EP0: bcnt=%d\n", bcnt); usbtrace(TRACE_READ(EP0), bcnt); @@ -1587,7 +1587,7 @@ static inline void efm32_ep0out_receive(FAR struct efm32_ep_s *privep, * ****************************************************************************/ -static inline void efm32_epout_receive(FAR struct efm32_ep_s *privep, +static inline void efm32_epout_receive(struct efm32_ep_s *privep, int bcnt) { struct efm32_req_s *privreq; @@ -1673,8 +1673,8 @@ static inline void efm32_epout_receive(FAR struct efm32_ep_s *privep, * ****************************************************************************/ -static void efm32_epout_request(FAR struct efm32_usbdev_s *priv, - FAR struct efm32_ep_s *privep) +static void efm32_epout_request(struct efm32_usbdev_s *priv, + struct efm32_ep_s *privep) { struct efm32_req_s *privreq; uint32_t regaddr; @@ -1840,7 +1840,7 @@ static void efm32_ep_flush(struct efm32_ep_s *privep) static void efm32_req_complete(struct efm32_ep_s *privep, int16_t result) { - FAR struct efm32_req_s *privreq; + struct efm32_req_s *privreq; /* Remove the request at the head of the request list */ @@ -1974,7 +1974,7 @@ static int efm32_req_dispatch(struct efm32_usbdev_s *priv, static void efm32_usbreset(struct efm32_usbdev_s *priv) { - FAR struct efm32_ep_s *privep; + struct efm32_ep_s *privep; uint32_t regval; int i; @@ -2072,7 +2072,7 @@ static void efm32_usbreset(struct efm32_usbdev_s *priv) * ****************************************************************************/ -static inline void efm32_ep0out_testmode(FAR struct efm32_usbdev_s *priv, +static inline void efm32_ep0out_testmode(struct efm32_usbdev_s *priv, uint16_t index) { uint8_t testmode; @@ -2122,9 +2122,9 @@ static inline void efm32_ep0out_testmode(FAR struct efm32_usbdev_s *priv, static inline void efm32_ep0out_stdrequest(struct efm32_usbdev_s *priv, - FAR struct efm32_ctrlreq_s *ctrlreq) + struct efm32_ctrlreq_s *ctrlreq) { - FAR struct efm32_ep_s *privep; + struct efm32_ep_s *privep; /* Handle standard request */ @@ -2577,10 +2577,10 @@ static inline void efm32_ep0out_setup(struct efm32_usbdev_s *priv) * ****************************************************************************/ -static inline void efm32_epout(FAR struct efm32_usbdev_s *priv, +static inline void efm32_epout(struct efm32_usbdev_s *priv, uint8_t epno) { - FAR struct efm32_ep_s *privep; + struct efm32_ep_s *privep; /* Endpoint 0 is a special case. */ @@ -2634,7 +2634,7 @@ static inline void efm32_epout(FAR struct efm32_usbdev_s *priv, * ****************************************************************************/ -static inline void efm32_epout_interrupt(FAR struct efm32_usbdev_s *priv) +static inline void efm32_epout_interrupt(struct efm32_usbdev_s *priv) { uint32_t daint; uint32_t regval; @@ -2770,7 +2770,7 @@ static inline void efm32_epout_interrupt(FAR struct efm32_usbdev_s *priv) * ****************************************************************************/ -static inline void efm32_epin_runtestmode(FAR struct efm32_usbdev_s *priv) +static inline void efm32_epin_runtestmode(struct efm32_usbdev_s *priv) { uint32_t regval = efm32_getreg(EFM32_USB_DCTL); regval &= ~_USB_DCTL_TSTCTL_MASK; @@ -2790,9 +2790,9 @@ static inline void efm32_epin_runtestmode(FAR struct efm32_usbdev_s *priv) * ****************************************************************************/ -static inline void efm32_epin(FAR struct efm32_usbdev_s *priv, uint8_t epno) +static inline void efm32_epin(struct efm32_usbdev_s *priv, uint8_t epno) { - FAR struct efm32_ep_s *privep = &priv->epin[epno]; + struct efm32_ep_s *privep = &priv->epin[epno]; /* Endpoint 0 is a special case. */ @@ -2847,10 +2847,10 @@ static inline void efm32_epin(FAR struct efm32_usbdev_s *priv, uint8_t epno) * ****************************************************************************/ -static inline void efm32_epin_txfifoempty(FAR struct efm32_usbdev_s *priv, +static inline void efm32_epin_txfifoempty(struct efm32_usbdev_s *priv, int epno) { - FAR struct efm32_ep_s *privep = &priv->epin[epno]; + struct efm32_ep_s *privep = &priv->epin[epno]; /* Continue processing the write request queue. This may mean sending * more data from the existing request or terminating the current requests @@ -2873,7 +2873,7 @@ static inline void efm32_epin_txfifoempty(FAR struct efm32_usbdev_s *priv, * ****************************************************************************/ -static inline void efm32_epin_interrupt(FAR struct efm32_usbdev_s *priv) +static inline void efm32_epin_interrupt(struct efm32_usbdev_s *priv) { uint32_t diepint; uint32_t daint; @@ -3078,7 +3078,7 @@ static inline void efm32_epin_interrupt(FAR struct efm32_usbdev_s *priv) * ****************************************************************************/ -static inline void efm32_resumeinterrupt(FAR struct efm32_usbdev_s *priv) +static inline void efm32_resumeinterrupt(struct efm32_usbdev_s *priv) { uint32_t regval; @@ -3116,7 +3116,7 @@ static inline void efm32_resumeinterrupt(FAR struct efm32_usbdev_s *priv) * ****************************************************************************/ -static inline void efm32_suspendinterrupt(FAR struct efm32_usbdev_s *priv) +static inline void efm32_suspendinterrupt(struct efm32_usbdev_s *priv) { #ifdef CONFIG_USBDEV_LOWPOWER uint32_t regval; @@ -3160,7 +3160,7 @@ static inline void efm32_suspendinterrupt(FAR struct efm32_usbdev_s *priv) * state */ - efm32_usbsuspend((FAR struct usbdev_s *)priv, false); + efm32_usbsuspend((struct usbdev_s *)priv, false); } /**************************************************************************** @@ -3172,9 +3172,9 @@ static inline void efm32_suspendinterrupt(FAR struct efm32_usbdev_s *priv) * ****************************************************************************/ -static inline void efm32_rxinterrupt(FAR struct efm32_usbdev_s *priv) +static inline void efm32_rxinterrupt(struct efm32_usbdev_s *priv) { - FAR struct efm32_ep_s *privep; + struct efm32_ep_s *privep; uint32_t regval; int bcnt; int epphy; @@ -3280,7 +3280,7 @@ static inline void efm32_rxinterrupt(FAR struct efm32_usbdev_s *priv) * last SETUP packet will be processed. */ - efm32_rxfifo_read(&priv->epout[EP0], (FAR uint8_t *)&priv->ctrlreq, + efm32_rxfifo_read(&priv->epout[EP0], (uint8_t *)&priv->ctrlreq, USB_SIZEOF_CTRLREQ); /* Was this an IN or an OUT SETUP packet. If it is an OUT SETUP, @@ -3340,7 +3340,7 @@ static inline void efm32_rxinterrupt(FAR struct efm32_usbdev_s *priv) * ****************************************************************************/ -static inline void efm32_enuminterrupt(FAR struct efm32_usbdev_s *priv) +static inline void efm32_enuminterrupt(struct efm32_usbdev_s *priv) { uint32_t regval; @@ -3369,7 +3369,7 @@ static inline void efm32_enuminterrupt(FAR struct efm32_usbdev_s *priv) ****************************************************************************/ #ifdef CONFIG_USBDEV_ISOCHRONOUS -static inline void efm32_isocininterrupt(FAR struct efm32_usbdev_s *priv) +static inline void efm32_isocininterrupt(struct efm32_usbdev_s *priv) { int i; @@ -3441,10 +3441,10 @@ static inline void efm32_isocininterrupt(FAR struct efm32_usbdev_s *priv) ****************************************************************************/ #ifdef CONFIG_USBDEV_ISOCHRONOUS -static inline void efm32_isocoutinterrupt(FAR struct efm32_usbdev_s *priv) +static inline void efm32_isocoutinterrupt(struct efm32_usbdev_s *priv) { - FAR struct efm32_ep_s *privep; - FAR struct efm32_req_s *privreq; + struct efm32_ep_s *privep; + struct efm32_req_s *privreq; uint32_t regaddr; uint32_t doepctl; uint32_t dsts; @@ -3524,7 +3524,7 @@ static inline void efm32_isocoutinterrupt(FAR struct efm32_usbdev_s *priv) ****************************************************************************/ #ifdef CONFIG_USBDEV_VBUSSENSING -static inline void efm32_sessioninterrupt(FAR struct efm32_usbdev_s *priv) +static inline void efm32_sessioninterrupt(struct efm32_usbdev_s *priv) { #warning "Missing logic" } @@ -3539,7 +3539,7 @@ static inline void efm32_sessioninterrupt(FAR struct efm32_usbdev_s *priv) ****************************************************************************/ #ifdef CONFIG_USBDEV_VBUSSENSING -static inline void efm32_otginterrupt(FAR struct efm32_usbdev_s *priv) +static inline void efm32_otginterrupt(struct efm32_usbdev_s *priv) { uint32_t regval; @@ -3565,7 +3565,7 @@ static inline void efm32_otginterrupt(FAR struct efm32_usbdev_s *priv) * ****************************************************************************/ -static int efm32_usbinterrupt(int irq, FAR void *context, FAR void *arg) +static int efm32_usbinterrupt(int irq, void *context, void *arg) { /* At present, there is only a single OTG FS device support. Hence it is * pre-allocated as g_otgfsdev. However, in most code, the private data @@ -3574,7 +3574,7 @@ static int efm32_usbinterrupt(int irq, FAR void *context, FAR void *arg) * devices. */ - FAR struct efm32_usbdev_s *priv = &g_otgfsdev; + struct efm32_usbdev_s *priv = &g_otgfsdev; uint32_t regval; usbtrace(TRACE_INTENTRY(EFM32_TRACEINTID_USB), 0); @@ -3778,7 +3778,7 @@ static int efm32_usbinterrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static void efm32_enablegonak(FAR struct efm32_ep_s *privep) +static void efm32_enablegonak(struct efm32_ep_s *privep) { uint32_t regval; @@ -3824,7 +3824,7 @@ static void efm32_enablegonak(FAR struct efm32_ep_s *privep) * ****************************************************************************/ -static void efm32_disablegonak(FAR struct efm32_ep_s *privep) +static void efm32_disablegonak(struct efm32_ep_s *privep) { uint32_t regval; @@ -3848,7 +3848,7 @@ static void efm32_disablegonak(FAR struct efm32_ep_s *privep) * ****************************************************************************/ -static int efm32_epout_configure(FAR struct efm32_ep_s *privep, +static int efm32_epout_configure(struct efm32_ep_s *privep, uint8_t eptype, uint16_t maxpacket) { @@ -3944,7 +3944,7 @@ static int efm32_epout_configure(FAR struct efm32_ep_s *privep, * ****************************************************************************/ -static int efm32_epin_configure(FAR struct efm32_ep_s *privep, +static int efm32_epin_configure(struct efm32_ep_s *privep, uint8_t eptype, uint16_t maxpacket) { @@ -4045,11 +4045,11 @@ static int efm32_epin_configure(FAR struct efm32_ep_s *privep, * ****************************************************************************/ -static int efm32_ep_configure(FAR struct usbdev_ep_s *ep, - FAR const struct usb_epdesc_s *desc, +static int efm32_ep_configure(struct usbdev_ep_s *ep, + const struct usb_epdesc_s *desc, bool last) { - FAR struct efm32_ep_s *privep = (FAR struct efm32_ep_s *)ep; + struct efm32_ep_s *privep = (struct efm32_ep_s *)ep; uint16_t maxpacket; uint8_t eptype; int ret; @@ -4084,7 +4084,7 @@ static int efm32_ep_configure(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static void efm32_ep0_configure(FAR struct efm32_usbdev_s *priv) +static void efm32_ep0_configure(struct efm32_usbdev_s *priv) { /* Enable EP0 IN and OUT */ @@ -4102,7 +4102,7 @@ static void efm32_ep0_configure(FAR struct efm32_usbdev_s *priv) * ****************************************************************************/ -static void efm32_epout_disable(FAR struct efm32_ep_s *privep) +static void efm32_epout_disable(struct efm32_ep_s *privep) { uint32_t regaddr; uint32_t regval; @@ -4174,7 +4174,7 @@ static void efm32_epout_disable(FAR struct efm32_ep_s *privep) * ****************************************************************************/ -static void efm32_epin_disable(FAR struct efm32_ep_s *privep) +static void efm32_epin_disable(struct efm32_ep_s *privep) { uint32_t regaddr; uint32_t regval; @@ -4270,9 +4270,9 @@ static void efm32_epin_disable(FAR struct efm32_ep_s *privep) * ****************************************************************************/ -static int efm32_ep_disable(FAR struct usbdev_ep_s *ep) +static int efm32_ep_disable(struct usbdev_ep_s *ep) { - FAR struct efm32_ep_s *privep = (FAR struct efm32_ep_s *)ep; + struct efm32_ep_s *privep = (struct efm32_ep_s *)ep; #ifdef CONFIG_DEBUG_FEATURES if (!ep) @@ -4310,9 +4310,9 @@ static int efm32_ep_disable(FAR struct usbdev_ep_s *ep) * ****************************************************************************/ -static FAR struct usbdev_req_s *efm32_ep_allocreq(FAR struct usbdev_ep_s *ep) +static struct usbdev_req_s *efm32_ep_allocreq(struct usbdev_ep_s *ep) { - FAR struct efm32_req_s *privreq; + struct efm32_req_s *privreq; #ifdef CONFIG_DEBUG_FEATURES if (!ep) @@ -4322,9 +4322,9 @@ static FAR struct usbdev_req_s *efm32_ep_allocreq(FAR struct usbdev_ep_s *ep) } #endif - usbtrace(TRACE_EPALLOCREQ, ((FAR struct efm32_ep_s *)ep)->epphy); + usbtrace(TRACE_EPALLOCREQ, ((struct efm32_ep_s *)ep)->epphy); - privreq = (FAR struct efm32_req_s *)kmm_malloc(sizeof(struct efm32_req_s)); + privreq = (struct efm32_req_s *)kmm_malloc(sizeof(struct efm32_req_s)); if (!privreq) { usbtrace(TRACE_DEVERROR(EFM32_TRACEERR_ALLOCFAIL), 0); @@ -4343,10 +4343,10 @@ static FAR struct usbdev_req_s *efm32_ep_allocreq(FAR struct usbdev_ep_s *ep) * ****************************************************************************/ -static void efm32_ep_freereq(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static void efm32_ep_freereq(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct efm32_req_s *privreq = (FAR struct efm32_req_s *)req; + struct efm32_req_s *privreq = (struct efm32_req_s *)req; #ifdef CONFIG_DEBUG_FEATURES if (!ep || !req) @@ -4356,7 +4356,7 @@ static void efm32_ep_freereq(FAR struct usbdev_ep_s *ep, } #endif - usbtrace(TRACE_EPFREEREQ, ((FAR struct efm32_ep_s *)ep)->epphy); + usbtrace(TRACE_EPFREEREQ, ((struct efm32_ep_s *)ep)->epphy); kmm_free(privreq); } @@ -4369,7 +4369,7 @@ static void efm32_ep_freereq(FAR struct usbdev_ep_s *ep, ****************************************************************************/ #ifdef CONFIG_USBDEV_DMA -static void *efm32_ep_allocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes) +static void *efm32_ep_allocbuffer(struct usbdev_ep_s *ep, unsigned bytes) { usbtrace(TRACE_EPALLOCBUFFER, privep->epphy); @@ -4390,7 +4390,7 @@ static void *efm32_ep_allocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes) ****************************************************************************/ #ifdef CONFIG_USBDEV_DMA -static void efm32_ep_freebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf) +static void efm32_ep_freebuffer(struct usbdev_ep_s *ep, void *buf) { usbtrace(TRACE_EPFREEBUFFER, privep->epphy); @@ -4410,12 +4410,12 @@ static void efm32_ep_freebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf) * ****************************************************************************/ -static int efm32_ep_submit(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static int efm32_ep_submit(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct efm32_req_s *privreq = (FAR struct efm32_req_s *)req; - FAR struct efm32_ep_s *privep = (FAR struct efm32_ep_s *)ep; - FAR struct efm32_usbdev_s *priv; + struct efm32_req_s *privreq = (struct efm32_req_s *)req; + struct efm32_ep_s *privep = (struct efm32_ep_s *)ep; + struct efm32_usbdev_s *priv; irqstate_t flags; int ret = OK; @@ -4507,10 +4507,10 @@ static int efm32_ep_submit(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int efm32_ep_cancel(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static int efm32_ep_cancel(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct efm32_ep_s *privep = (FAR struct efm32_ep_s *)ep; + struct efm32_ep_s *privep = (struct efm32_ep_s *)ep; irqstate_t flags; #ifdef CONFIG_DEBUG_FEATURES @@ -4544,7 +4544,7 @@ static int efm32_ep_cancel(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int efm32_epout_setstall(FAR struct efm32_ep_s *privep) +static int efm32_epout_setstall(struct efm32_ep_s *privep) { #if 1 /* This implementation follows the requirements from the EFM32 F4 @@ -4622,7 +4622,7 @@ static int efm32_epout_setstall(FAR struct efm32_ep_s *privep) * ****************************************************************************/ -static int efm32_epin_setstall(FAR struct efm32_ep_s *privep) +static int efm32_epin_setstall(struct efm32_ep_s *privep) { uint32_t regaddr; uint32_t regval; @@ -4651,7 +4651,7 @@ static int efm32_epin_setstall(FAR struct efm32_ep_s *privep) * ****************************************************************************/ -static int efm32_ep_setstall(FAR struct efm32_ep_s *privep) +static int efm32_ep_setstall(struct efm32_ep_s *privep) { usbtrace(TRACE_EPSTALL, privep->epphy); @@ -4675,7 +4675,7 @@ static int efm32_ep_setstall(FAR struct efm32_ep_s *privep) * ****************************************************************************/ -static int efm32_ep_clrstall(FAR struct efm32_ep_s *privep) +static int efm32_ep_clrstall(struct efm32_ep_s *privep) { uint32_t regaddr; uint32_t regval; @@ -4734,9 +4734,9 @@ static int efm32_ep_clrstall(FAR struct efm32_ep_s *privep) * ****************************************************************************/ -static int efm32_ep_stall(FAR struct usbdev_ep_s *ep, bool resume) +static int efm32_ep_stall(struct usbdev_ep_s *ep, bool resume) { - FAR struct efm32_ep_s *privep = (FAR struct efm32_ep_s *)ep; + struct efm32_ep_s *privep = (struct efm32_ep_s *)ep; irqstate_t flags; int ret; @@ -4765,7 +4765,7 @@ static int efm32_ep_stall(FAR struct usbdev_ep_s *ep, bool resume) * ****************************************************************************/ -static void efm32_ep0_stall(FAR struct efm32_usbdev_s *priv) +static void efm32_ep0_stall(struct efm32_usbdev_s *priv) { efm32_epin_setstall(&priv->epin[EP0]); efm32_epout_setstall(&priv->epout[EP0]); @@ -4794,11 +4794,11 @@ static void efm32_ep0_stall(FAR struct efm32_usbdev_s *priv) * ****************************************************************************/ -static FAR struct usbdev_ep_s *efm32_ep_alloc(FAR struct usbdev_s *dev, +static struct usbdev_ep_s *efm32_ep_alloc(struct usbdev_s *dev, uint8_t eplog, bool in, uint8_t eptype) { - FAR struct efm32_usbdev_s *priv = (FAR struct efm32_usbdev_s *)dev; + struct efm32_usbdev_s *priv = (struct efm32_usbdev_s *)dev; uint8_t epavail; irqstate_t flags; int epphy; @@ -4880,11 +4880,11 @@ static FAR struct usbdev_ep_s *efm32_ep_alloc(FAR struct usbdev_s *dev, * ****************************************************************************/ -static void efm32_ep_free(FAR struct usbdev_s *dev, - FAR struct usbdev_ep_s *ep) +static void efm32_ep_free(struct usbdev_s *dev, + struct usbdev_ep_s *ep) { - FAR struct efm32_usbdev_s *priv = (FAR struct efm32_usbdev_s *)dev; - FAR struct efm32_ep_s *privep = (FAR struct efm32_ep_s *)ep; + struct efm32_usbdev_s *priv = (struct efm32_usbdev_s *)dev; + struct efm32_ep_s *privep = (struct efm32_ep_s *)ep; irqstate_t flags; usbtrace(TRACE_DEVFREEEP, (uint16_t)privep->epphy); @@ -4929,7 +4929,7 @@ static int efm32_getframe(struct usbdev_s *dev) static int efm32_wakeup(struct usbdev_s *dev) { - FAR struct efm32_usbdev_s *priv = (FAR struct efm32_usbdev_s *)dev; + struct efm32_usbdev_s *priv = (struct efm32_usbdev_s *)dev; uint32_t regval; irqstate_t flags; @@ -4977,7 +4977,7 @@ static int efm32_wakeup(struct usbdev_s *dev) static int efm32_selfpowered(struct usbdev_s *dev, bool selfpowered) { - FAR struct efm32_usbdev_s *priv = (FAR struct efm32_usbdev_s *)dev; + struct efm32_usbdev_s *priv = (struct efm32_usbdev_s *)dev; usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered); @@ -5143,9 +5143,9 @@ static int efm32_rxfifo_flush(void) * ****************************************************************************/ -static void efm32_swinitialize(FAR struct efm32_usbdev_s *priv) +static void efm32_swinitialize(struct efm32_usbdev_s *priv) { - FAR struct efm32_ep_s *privep; + struct efm32_ep_s *privep; int i; /* Initialize the device state structure */ @@ -5225,7 +5225,7 @@ static void efm32_swinitialize(FAR struct efm32_usbdev_s *priv) * ****************************************************************************/ -static void efm32_hwinitialize(FAR struct efm32_usbdev_s *priv) +static void efm32_hwinitialize(struct efm32_usbdev_s *priv) { uint32_t regval; uint32_t timeout; @@ -5543,7 +5543,7 @@ void arm_usbinitialize(void) * devices. */ - FAR struct efm32_usbdev_s *priv = &g_otgfsdev; + struct efm32_usbdev_s *priv = &g_otgfsdev; int ret; usbtrace(TRACE_DEVINIT, 0); @@ -5634,7 +5634,7 @@ void arm_usbuninitialize(void) * devices. */ - FAR struct efm32_usbdev_s *priv = &g_otgfsdev; + struct efm32_usbdev_s *priv = &g_otgfsdev; irqstate_t flags; int i; @@ -5710,7 +5710,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver) * devices. */ - FAR struct efm32_usbdev_s *priv = &g_otgfsdev; + struct efm32_usbdev_s *priv = &g_otgfsdev; int ret; usbtrace(TRACE_DEVREGISTER, 0); @@ -5783,7 +5783,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver) * devices. */ - FAR struct efm32_usbdev_s *priv = &g_otgfsdev; + struct efm32_usbdev_s *priv = &g_otgfsdev; irqstate_t flags; usbtrace(TRACE_DEVUNREGISTER, 0); diff --git a/arch/arm/src/efm32/efm32_usbhost.c b/arch/arm/src/efm32/efm32_usbhost.c index 1f24bde56e..9f73f26b37 100644 --- a/arch/arm/src/efm32/efm32_usbhost.c +++ b/arch/arm/src/efm32/efm32_usbhost.c @@ -210,10 +210,10 @@ struct efm32_chan_s uint16_t buflen; /* Buffer length (at start of transfer) */ volatile uint16_t xfrd; /* Bytes transferred (at end of transfer) */ volatile uint16_t inflight; /* Number of Tx bytes "in-flight" */ - FAR uint8_t *buffer; /* Transfer buffer pointer */ + uint8_t *buffer; /* Transfer buffer pointer */ #ifdef CONFIG_USBHOST_ASYNCH usbhost_asynch_t callback; /* Transfer complete callback */ - FAR void *arg; /* Argument that accompanies the callback */ + void *arg; /* Argument that accompanies the callback */ #endif }; @@ -274,7 +274,7 @@ struct efm32_usbhost_trace_s uint16_t id; bool fmt2; #endif - FAR const char *string; + const char *string; }; #endif @@ -314,170 +314,170 @@ static inline uint16_t efm32_getle16(const uint8_t *val); /* Channel management *******************************************************/ -static int efm32_chan_alloc(FAR struct efm32_usbhost_s *priv); -static inline void efm32_chan_free(FAR struct efm32_usbhost_s *priv, +static int efm32_chan_alloc(struct efm32_usbhost_s *priv); +static inline void efm32_chan_free(struct efm32_usbhost_s *priv, int chidx); -static inline void efm32_chan_freeall(FAR struct efm32_usbhost_s *priv); -static void efm32_chan_configure(FAR struct efm32_usbhost_s *priv, +static inline void efm32_chan_freeall(struct efm32_usbhost_s *priv); +static void efm32_chan_configure(struct efm32_usbhost_s *priv, int chidx); -static void efm32_chan_halt(FAR struct efm32_usbhost_s *priv, int chidx, +static void efm32_chan_halt(struct efm32_usbhost_s *priv, int chidx, enum efm32_chreason_e chreason); -static int efm32_chan_waitsetup(FAR struct efm32_usbhost_s *priv, - FAR struct efm32_chan_s *chan); +static int efm32_chan_waitsetup(struct efm32_usbhost_s *priv, + struct efm32_chan_s *chan); #ifdef CONFIG_USBHOST_ASYNCH -static int efm32_chan_asynchsetup(FAR struct efm32_usbhost_s *priv, - FAR struct efm32_chan_s *chan, - usbhost_asynch_t callback, FAR void *arg); +static int efm32_chan_asynchsetup(struct efm32_usbhost_s *priv, + struct efm32_chan_s *chan, + usbhost_asynch_t callback, void *arg); #endif -static int efm32_chan_wait(FAR struct efm32_usbhost_s *priv, - FAR struct efm32_chan_s *chan); -static void efm32_chan_wakeup(FAR struct efm32_usbhost_s *priv, - FAR struct efm32_chan_s *chan); -static int efm32_ctrlchan_alloc(FAR struct efm32_usbhost_s *priv, +static int efm32_chan_wait(struct efm32_usbhost_s *priv, + struct efm32_chan_s *chan); +static void efm32_chan_wakeup(struct efm32_usbhost_s *priv, + struct efm32_chan_s *chan); +static int efm32_ctrlchan_alloc(struct efm32_usbhost_s *priv, uint8_t epno, uint8_t funcaddr, uint8_t speed, - FAR struct efm32_ctrlinfo_s *ctrlep); -static int efm32_ctrlep_alloc(FAR struct efm32_usbhost_s *priv, - FAR const struct usbhost_epdesc_s *epdesc, - FAR usbhost_ep_t *ep); -static int efm32_xfrep_alloc(FAR struct efm32_usbhost_s *priv, - FAR const struct usbhost_epdesc_s *epdesc, - FAR usbhost_ep_t *ep); + struct efm32_ctrlinfo_s *ctrlep); +static int efm32_ctrlep_alloc(struct efm32_usbhost_s *priv, + const struct usbhost_epdesc_s *epdesc, + usbhost_ep_t *ep); +static int efm32_xfrep_alloc(struct efm32_usbhost_s *priv, + const struct usbhost_epdesc_s *epdesc, + usbhost_ep_t *ep); /* Control/data transfer logic **********************************************/ -static void efm32_transfer_start(FAR struct efm32_usbhost_s *priv, +static void efm32_transfer_start(struct efm32_usbhost_s *priv, int chidx); #if 0 /* Not used */ static inline uint16_t efm32_getframe(void); #endif -static int efm32_ctrl_sendsetup(FAR struct efm32_usbhost_s *priv, - FAR struct efm32_ctrlinfo_s *ep0, - FAR const struct usb_ctrlreq_s *req); -static int efm32_ctrl_senddata(FAR struct efm32_usbhost_s *priv, - FAR struct efm32_ctrlinfo_s *ep0, - FAR uint8_t *buffer, unsigned int buflen); -static int efm32_ctrl_recvdata(FAR struct efm32_usbhost_s *priv, - FAR struct efm32_ctrlinfo_s *ep0, - FAR uint8_t *buffer, unsigned int buflen); -static int efm32_in_setup(FAR struct efm32_usbhost_s *priv, int chidx); -static ssize_t efm32_in_transfer(FAR struct efm32_usbhost_s *priv, int chidx, - FAR uint8_t *buffer, size_t buflen); +static int efm32_ctrl_sendsetup(struct efm32_usbhost_s *priv, + struct efm32_ctrlinfo_s *ep0, + const struct usb_ctrlreq_s *req); +static int efm32_ctrl_senddata(struct efm32_usbhost_s *priv, + struct efm32_ctrlinfo_s *ep0, + uint8_t *buffer, unsigned int buflen); +static int efm32_ctrl_recvdata(struct efm32_usbhost_s *priv, + struct efm32_ctrlinfo_s *ep0, + uint8_t *buffer, unsigned int buflen); +static int efm32_in_setup(struct efm32_usbhost_s *priv, int chidx); +static ssize_t efm32_in_transfer(struct efm32_usbhost_s *priv, int chidx, + uint8_t *buffer, size_t buflen); #ifdef CONFIG_USBHOST_ASYNCH -static void efm32_in_next(FAR struct efm32_usbhost_s *priv, - FAR struct efm32_chan_s *chan); -static int efm32_in_asynch(FAR struct efm32_usbhost_s *priv, int chidx, - FAR uint8_t *buffer, size_t buflen, - usbhost_asynch_t callback, FAR void *arg); +static void efm32_in_next(struct efm32_usbhost_s *priv, + struct efm32_chan_s *chan); +static int efm32_in_asynch(struct efm32_usbhost_s *priv, int chidx, + uint8_t *buffer, size_t buflen, + usbhost_asynch_t callback, void *arg); #endif -static int efm32_out_setup(FAR struct efm32_usbhost_s *priv, +static int efm32_out_setup(struct efm32_usbhost_s *priv, int chidx); -static ssize_t efm32_out_transfer(FAR struct efm32_usbhost_s *priv, - int chidx, FAR uint8_t *buffer, +static ssize_t efm32_out_transfer(struct efm32_usbhost_s *priv, + int chidx, uint8_t *buffer, size_t buflen); #ifdef CONFIG_USBHOST_ASYNCH -static void efm32_out_next(FAR struct efm32_usbhost_s *priv, - FAR struct efm32_chan_s *chan); -static int efm32_out_asynch(FAR struct efm32_usbhost_s *priv, int chidx, - FAR uint8_t *buffer, size_t buflen, - usbhost_asynch_t callback, FAR void *arg); +static void efm32_out_next(struct efm32_usbhost_s *priv, + struct efm32_chan_s *chan); +static int efm32_out_asynch(struct efm32_usbhost_s *priv, int chidx, + uint8_t *buffer, size_t buflen, + usbhost_asynch_t callback, void *arg); #endif /* Interrupt handling *******************************************************/ /* Lower level interrupt handlers */ -static void efm32_gint_wrpacket(FAR struct efm32_usbhost_s *priv, - FAR uint8_t *buffer, int chidx, int buflen); -static inline void efm32_gint_hcinisr(FAR struct efm32_usbhost_s *priv, +static void efm32_gint_wrpacket(struct efm32_usbhost_s *priv, + uint8_t *buffer, int chidx, int buflen); +static inline void efm32_gint_hcinisr(struct efm32_usbhost_s *priv, int chidx); -static inline void efm32_gint_hcoutisr(FAR struct efm32_usbhost_s *priv, +static inline void efm32_gint_hcoutisr(struct efm32_usbhost_s *priv, int chidx); -static void efm32_gint_connected(FAR struct efm32_usbhost_s *priv); -static void efm32_gint_disconnected(FAR struct efm32_usbhost_s *priv); +static void efm32_gint_connected(struct efm32_usbhost_s *priv); +static void efm32_gint_disconnected(struct efm32_usbhost_s *priv); /* Second level interrupt handlers */ #ifdef CONFIG_EFM32_OTGFS_SOFINTR -static inline void efm32_gint_sofisr(FAR struct efm32_usbhost_s *priv); +static inline void efm32_gint_sofisr(struct efm32_usbhost_s *priv); #endif -static inline void efm32_gint_rxflvlisr(FAR struct efm32_usbhost_s *priv); -static inline void efm32_gint_nptxfeisr(FAR struct efm32_usbhost_s *priv); -static inline void efm32_gint_ptxfeisr(FAR struct efm32_usbhost_s *priv); -static inline void efm32_gint_hcisr(FAR struct efm32_usbhost_s *priv); -static inline void efm32_gint_hprtisr(FAR struct efm32_usbhost_s *priv); -static inline void efm32_gint_discisr(FAR struct efm32_usbhost_s *priv); -static inline void efm32_gint_ipxfrisr(FAR struct efm32_usbhost_s *priv); +static inline void efm32_gint_rxflvlisr(struct efm32_usbhost_s *priv); +static inline void efm32_gint_nptxfeisr(struct efm32_usbhost_s *priv); +static inline void efm32_gint_ptxfeisr(struct efm32_usbhost_s *priv); +static inline void efm32_gint_hcisr(struct efm32_usbhost_s *priv); +static inline void efm32_gint_hprtisr(struct efm32_usbhost_s *priv); +static inline void efm32_gint_discisr(struct efm32_usbhost_s *priv); +static inline void efm32_gint_ipxfrisr(struct efm32_usbhost_s *priv); /* First level, global interrupt handler */ -static int efm32_gint_isr(int irq, FAR void *context, FAR void *arg); +static int efm32_gint_isr(int irq, void *context, void *arg); /* Interrupt controls */ static void efm32_gint_enable(void); static void efm32_gint_disable(void); static inline void efm32_hostinit_enable(void); -static void efm32_txfe_enable(FAR struct efm32_usbhost_s *priv, int chidx); +static void efm32_txfe_enable(struct efm32_usbhost_s *priv, int chidx); /* USB host controller operations *******************************************/ -static int efm32_wait(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s **hport); -static int efm32_rh_enumerate(FAR struct efm32_usbhost_s *priv, - FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport); -static int efm32_enumerate(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport); +static int efm32_wait(struct usbhost_connection_s *conn, + struct usbhost_hubport_s **hport); +static int efm32_rh_enumerate(struct efm32_usbhost_s *priv, + struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport); +static int efm32_enumerate(struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport); -static int efm32_ep0configure(FAR struct usbhost_driver_s *drvr, +static int efm32_ep0configure(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, uint8_t funcaddr, uint8_t speed, uint16_t maxpacketsize); -static int efm32_epalloc(FAR struct usbhost_driver_s *drvr, - FAR const struct usbhost_epdesc_s *epdesc, - FAR usbhost_ep_t *ep); -static int efm32_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep); -static int efm32_alloc(FAR struct usbhost_driver_s *drvr, - FAR uint8_t **buffer, FAR size_t *maxlen); -static int efm32_free(FAR struct usbhost_driver_s *drvr, - FAR uint8_t *buffer); -static int efm32_ioalloc(FAR struct usbhost_driver_s *drvr, - FAR uint8_t **buffer, size_t buflen); -static int efm32_iofree(FAR struct usbhost_driver_s *drvr, - FAR uint8_t *buffer); -static int efm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, +static int efm32_epalloc(struct usbhost_driver_s *drvr, + const struct usbhost_epdesc_s *epdesc, + usbhost_ep_t *ep); +static int efm32_epfree(struct usbhost_driver_s *drvr, usbhost_ep_t ep); +static int efm32_alloc(struct usbhost_driver_s *drvr, + uint8_t **buffer, size_t *maxlen); +static int efm32_free(struct usbhost_driver_s *drvr, + uint8_t *buffer); +static int efm32_ioalloc(struct usbhost_driver_s *drvr, + uint8_t **buffer, size_t buflen); +static int efm32_iofree(struct usbhost_driver_s *drvr, + uint8_t *buffer); +static int efm32_ctrlin(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, const struct usb_ctrlreq_s *req, - FAR uint8_t *buffer); -static int efm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, - FAR const struct usb_ctrlreq_s *req, - FAR const uint8_t *buffer); -static ssize_t efm32_transfer(FAR struct usbhost_driver_s *drvr, - usbhost_ep_t ep, FAR uint8_t *buffer, + uint8_t *buffer); +static int efm32_ctrlout(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, + const struct usb_ctrlreq_s *req, + const uint8_t *buffer); +static ssize_t efm32_transfer(struct usbhost_driver_s *drvr, + usbhost_ep_t ep, uint8_t *buffer, size_t buflen); #ifdef CONFIG_USBHOST_ASYNCH -static int efm32_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, - FAR uint8_t *buffer, size_t buflen, - usbhost_asynch_t callback, FAR void *arg); +static int efm32_asynch(struct usbhost_driver_s *drvr, usbhost_ep_t ep, + uint8_t *buffer, size_t buflen, + usbhost_asynch_t callback, void *arg); #endif -static int efm32_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep); +static int efm32_cancel(struct usbhost_driver_s *drvr, usbhost_ep_t ep); #ifdef CONFIG_USBHOST_HUB -static int efm32_connect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport, +static int efm32_connect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport, bool connected); #endif -static void efm32_disconnect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport); +static void efm32_disconnect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport); /* Initialization ***********************************************************/ -static void efm32_portreset(FAR struct efm32_usbhost_s *priv); +static void efm32_portreset(struct efm32_usbhost_s *priv); static void efm32_flush_txfifos(uint32_t txfnum); static void efm32_flush_rxfifo(void); -static void efm32_vbusdrive(FAR struct efm32_usbhost_s *priv, bool state); -static void efm32_host_initialize(FAR struct efm32_usbhost_s *priv); +static void efm32_vbusdrive(struct efm32_usbhost_s *priv, bool state); +static void efm32_host_initialize(struct efm32_usbhost_s *priv); -static inline void efm32_sw_initialize(FAR struct efm32_usbhost_s *priv); -static inline int efm32_hw_initialize(FAR struct efm32_usbhost_s *priv); +static inline void efm32_sw_initialize(struct efm32_usbhost_s *priv); +static inline int efm32_hw_initialize(struct efm32_usbhost_s *priv); /**************************************************************************** * Private Data @@ -781,7 +781,7 @@ static inline uint16_t efm32_getle16(const uint8_t *val) * ****************************************************************************/ -static int efm32_chan_alloc(FAR struct efm32_usbhost_s *priv) +static int efm32_chan_alloc(struct efm32_usbhost_s *priv) { int chidx; @@ -813,7 +813,7 @@ static int efm32_chan_alloc(FAR struct efm32_usbhost_s *priv) * ****************************************************************************/ -static void efm32_chan_free(FAR struct efm32_usbhost_s *priv, int chidx) +static void efm32_chan_free(struct efm32_usbhost_s *priv, int chidx) { DEBUGASSERT((unsigned)chidx < EFM32_NHOST_CHANNELS); @@ -834,7 +834,7 @@ static void efm32_chan_free(FAR struct efm32_usbhost_s *priv, int chidx) * ****************************************************************************/ -static inline void efm32_chan_freeall(FAR struct efm32_usbhost_s *priv) +static inline void efm32_chan_freeall(struct efm32_usbhost_s *priv) { uint8_t chidx; @@ -856,9 +856,9 @@ static inline void efm32_chan_freeall(FAR struct efm32_usbhost_s *priv) * ****************************************************************************/ -static void efm32_chan_configure(FAR struct efm32_usbhost_s *priv, int chidx) +static void efm32_chan_configure(struct efm32_usbhost_s *priv, int chidx) { - FAR struct efm32_chan_s *chan = &priv->chan[chidx]; + struct efm32_chan_s *chan = &priv->chan[chidx]; uint32_t regval; /* Clear any old pending interrupts for this host channel. */ @@ -1016,7 +1016,7 @@ static void efm32_chan_configure(FAR struct efm32_usbhost_s *priv, int chidx) * ****************************************************************************/ -static void efm32_chan_halt(FAR struct efm32_usbhost_s *priv, int chidx, +static void efm32_chan_halt(struct efm32_usbhost_s *priv, int chidx, enum efm32_chreason_e chreason) { uint32_t hcchar; @@ -1111,8 +1111,8 @@ static void efm32_chan_halt(FAR struct efm32_usbhost_s *priv, int chidx, * ****************************************************************************/ -static int efm32_chan_waitsetup(FAR struct efm32_usbhost_s *priv, - FAR struct efm32_chan_s *chan) +static int efm32_chan_waitsetup(struct efm32_usbhost_s *priv, + struct efm32_chan_s *chan) { irqstate_t flags = enter_critical_section(); int ret = -ENODEV; @@ -1154,9 +1154,9 @@ static int efm32_chan_waitsetup(FAR struct efm32_usbhost_s *priv, ****************************************************************************/ #ifdef CONFIG_USBHOST_ASYNCH -static int efm32_chan_asynchsetup(FAR struct efm32_usbhost_s *priv, - FAR struct efm32_chan_s *chan, - usbhost_asynch_t callback, FAR void *arg) +static int efm32_chan_asynchsetup(struct efm32_usbhost_s *priv, + struct efm32_chan_s *chan, + usbhost_asynch_t callback, void *arg) { irqstate_t flags = enter_critical_section(); int ret = -ENODEV; @@ -1192,8 +1192,8 @@ static int efm32_chan_asynchsetup(FAR struct efm32_usbhost_s *priv, * ****************************************************************************/ -static int efm32_chan_wait(FAR struct efm32_usbhost_s *priv, - FAR struct efm32_chan_s *chan) +static int efm32_chan_wait(struct efm32_usbhost_s *priv, + struct efm32_chan_s *chan) { irqstate_t flags; int ret; @@ -1247,8 +1247,8 @@ static int efm32_chan_wait(FAR struct efm32_usbhost_s *priv, * ****************************************************************************/ -static void efm32_chan_wakeup(FAR struct efm32_usbhost_s *priv, - FAR struct efm32_chan_s *chan) +static void efm32_chan_wakeup(struct efm32_usbhost_s *priv, + struct efm32_chan_s *chan) { /* Is the transfer complete? */ @@ -1303,12 +1303,12 @@ static void efm32_chan_wakeup(FAR struct efm32_usbhost_s *priv, * ****************************************************************************/ -static int efm32_ctrlchan_alloc(FAR struct efm32_usbhost_s *priv, +static int efm32_ctrlchan_alloc(struct efm32_usbhost_s *priv, uint8_t epno, uint8_t funcaddr, uint8_t speed, - FAR struct efm32_ctrlinfo_s *ctrlep) + struct efm32_ctrlinfo_s *ctrlep) { - FAR struct efm32_chan_s *chan; + struct efm32_chan_s *chan; int inndx; int outndx; @@ -1380,12 +1380,12 @@ static int efm32_ctrlchan_alloc(FAR struct efm32_usbhost_s *priv, * ****************************************************************************/ -static int efm32_ctrlep_alloc(FAR struct efm32_usbhost_s *priv, - FAR const struct usbhost_epdesc_s *epdesc, - FAR usbhost_ep_t *ep) +static int efm32_ctrlep_alloc(struct efm32_usbhost_s *priv, + const struct usbhost_epdesc_s *epdesc, + usbhost_ep_t *ep) { - FAR struct usbhost_hubport_s *hport; - FAR struct efm32_ctrlinfo_s *ctrlep; + struct usbhost_hubport_s *hport; + struct efm32_ctrlinfo_s *ctrlep; int ret; /* Sanity check. NOTE that this method should only be called if a device @@ -1397,7 +1397,7 @@ static int efm32_ctrlep_alloc(FAR struct efm32_usbhost_s *priv, /* Allocate a container for the control endpoint */ - ctrlep = (FAR struct efm32_ctrlinfo_s *) + ctrlep = (struct efm32_ctrlinfo_s *) kmm_malloc(sizeof(struct efm32_ctrlinfo_s)); if (ctrlep == NULL) { @@ -1443,12 +1443,12 @@ static int efm32_ctrlep_alloc(FAR struct efm32_usbhost_s *priv, * ****************************************************************************/ -static int efm32_xfrep_alloc(FAR struct efm32_usbhost_s *priv, - FAR const struct usbhost_epdesc_s *epdesc, - FAR usbhost_ep_t *ep) +static int efm32_xfrep_alloc(struct efm32_usbhost_s *priv, + const struct usbhost_epdesc_s *epdesc, + usbhost_ep_t *ep) { struct usbhost_hubport_s *hport; - FAR struct efm32_chan_s *chan; + struct efm32_chan_s *chan; int chidx; /* Sanity check. NOTE that this method should only be called if a device @@ -1501,9 +1501,9 @@ static int efm32_xfrep_alloc(FAR struct efm32_usbhost_s *priv, * ****************************************************************************/ -static void efm32_transfer_start(FAR struct efm32_usbhost_s *priv, int chidx) +static void efm32_transfer_start(struct efm32_usbhost_s *priv, int chidx) { - FAR struct efm32_chan_s *chan; + struct efm32_chan_s *chan; uint32_t regval; unsigned int npackets; unsigned int maxpacket; @@ -1712,11 +1712,11 @@ static inline uint16_t efm32_getframe(void) * ****************************************************************************/ -static int efm32_ctrl_sendsetup(FAR struct efm32_usbhost_s *priv, - FAR struct efm32_ctrlinfo_s *ep0, - FAR const struct usb_ctrlreq_s *req) +static int efm32_ctrl_sendsetup(struct efm32_usbhost_s *priv, + struct efm32_ctrlinfo_s *ep0, + const struct usb_ctrlreq_s *req) { - FAR struct efm32_chan_s *chan; + struct efm32_chan_s *chan; clock_t start; clock_t elapsed; int ret; @@ -1731,7 +1731,7 @@ static int efm32_ctrl_sendsetup(FAR struct efm32_usbhost_s *priv, /* Send the SETUP packet */ chan->pid = EFM32_USB_PID_SETUP; - chan->buffer = (FAR uint8_t *)req; + chan->buffer = (uint8_t *)req; chan->buflen = USB_SIZEOF_CTRLREQ; chan->xfrd = 0; @@ -1789,11 +1789,11 @@ static int efm32_ctrl_sendsetup(FAR struct efm32_usbhost_s *priv, * ****************************************************************************/ -static int efm32_ctrl_senddata(FAR struct efm32_usbhost_s *priv, - FAR struct efm32_ctrlinfo_s *ep0, - FAR uint8_t *buffer, unsigned int buflen) +static int efm32_ctrl_senddata(struct efm32_usbhost_s *priv, + struct efm32_ctrlinfo_s *ep0, + uint8_t *buffer, unsigned int buflen) { - FAR struct efm32_chan_s *chan = &priv->chan[ep0->outndx]; + struct efm32_chan_s *chan = &priv->chan[ep0->outndx]; int ret; /* Save buffer information */ @@ -1842,11 +1842,11 @@ static int efm32_ctrl_senddata(FAR struct efm32_usbhost_s *priv, * ****************************************************************************/ -static int efm32_ctrl_recvdata(FAR struct efm32_usbhost_s *priv, - FAR struct efm32_ctrlinfo_s *ep0, - FAR uint8_t *buffer, unsigned int buflen) +static int efm32_ctrl_recvdata(struct efm32_usbhost_s *priv, + struct efm32_ctrlinfo_s *ep0, + uint8_t *buffer, unsigned int buflen) { - FAR struct efm32_chan_s *chan = &priv->chan[ep0->inndx]; + struct efm32_chan_s *chan = &priv->chan[ep0->inndx]; int ret; /* Save buffer information */ @@ -1882,9 +1882,9 @@ static int efm32_ctrl_recvdata(FAR struct efm32_usbhost_s *priv, * ****************************************************************************/ -static int efm32_in_setup(FAR struct efm32_usbhost_s *priv, int chidx) +static int efm32_in_setup(struct efm32_usbhost_s *priv, int chidx) { - FAR struct efm32_chan_s *chan; + struct efm32_chan_s *chan; /* Set up for the transfer based on the direction and the endpoint type */ @@ -1945,10 +1945,10 @@ static int efm32_in_setup(FAR struct efm32_usbhost_s *priv, int chidx) * ****************************************************************************/ -static ssize_t efm32_in_transfer(FAR struct efm32_usbhost_s *priv, int chidx, - FAR uint8_t *buffer, size_t buflen) +static ssize_t efm32_in_transfer(struct efm32_usbhost_s *priv, int chidx, + uint8_t *buffer, size_t buflen) { - FAR struct efm32_chan_s *chan; + struct efm32_chan_s *chan; clock_t start; clock_t elapsed; int ret; @@ -2031,11 +2031,11 @@ static ssize_t efm32_in_transfer(FAR struct efm32_usbhost_s *priv, int chidx, ****************************************************************************/ #ifdef CONFIG_USBHOST_ASYNCH -static void efm32_in_next(FAR struct efm32_usbhost_s *priv, - FAR struct efm32_chan_s *chan) +static void efm32_in_next(struct efm32_usbhost_s *priv, + struct efm32_chan_s *chan) { usbhost_asynch_t callback; - FAR void *arg; + void *arg; ssize_t nbytes; int result; int ret; @@ -2096,11 +2096,11 @@ static void efm32_in_next(FAR struct efm32_usbhost_s *priv, ****************************************************************************/ #ifdef CONFIG_USBHOST_ASYNCH -static int efm32_in_asynch(FAR struct efm32_usbhost_s *priv, int chidx, - FAR uint8_t *buffer, size_t buflen, - usbhost_asynch_t callback, FAR void *arg) +static int efm32_in_asynch(struct efm32_usbhost_s *priv, int chidx, + uint8_t *buffer, size_t buflen, + usbhost_asynch_t callback, void *arg) { - FAR struct efm32_chan_s *chan; + struct efm32_chan_s *chan; int ret; /* Set up for the transfer BEFORE starting the first transfer */ @@ -2139,9 +2139,9 @@ static int efm32_in_asynch(FAR struct efm32_usbhost_s *priv, int chidx, * ****************************************************************************/ -static int efm32_out_setup(FAR struct efm32_usbhost_s *priv, int chidx) +static int efm32_out_setup(struct efm32_usbhost_s *priv, int chidx) { - FAR struct efm32_chan_s *chan; + struct efm32_chan_s *chan; /* Set up for the transfer based on the direction and the endpoint type */ @@ -2206,11 +2206,11 @@ static int efm32_out_setup(FAR struct efm32_usbhost_s *priv, int chidx) * ****************************************************************************/ -static ssize_t efm32_out_transfer(FAR struct efm32_usbhost_s *priv, - int chidx, FAR uint8_t *buffer, +static ssize_t efm32_out_transfer(struct efm32_usbhost_s *priv, + int chidx, uint8_t *buffer, size_t buflen) { - FAR struct efm32_chan_s *chan; + struct efm32_chan_s *chan; clock_t start; clock_t elapsed; size_t xfrlen; @@ -2323,11 +2323,11 @@ static ssize_t efm32_out_transfer(FAR struct efm32_usbhost_s *priv, ****************************************************************************/ #ifdef CONFIG_USBHOST_ASYNCH -static void efm32_out_next(FAR struct efm32_usbhost_s *priv, - FAR struct efm32_chan_s *chan) +static void efm32_out_next(struct efm32_usbhost_s *priv, + struct efm32_chan_s *chan) { usbhost_asynch_t callback; - FAR void *arg; + void *arg; ssize_t nbytes; int result; int ret; @@ -2388,11 +2388,11 @@ static void efm32_out_next(FAR struct efm32_usbhost_s *priv, ****************************************************************************/ #ifdef CONFIG_USBHOST_ASYNCH -static int efm32_out_asynch(FAR struct efm32_usbhost_s *priv, int chidx, - FAR uint8_t *buffer, size_t buflen, - usbhost_asynch_t callback, FAR void *arg) +static int efm32_out_asynch(struct efm32_usbhost_s *priv, int chidx, + uint8_t *buffer, size_t buflen, + usbhost_asynch_t callback, void *arg) { - FAR struct efm32_chan_s *chan; + struct efm32_chan_s *chan; int ret; /* Set up for the transfer BEFORE starting the first transfer */ @@ -2432,10 +2432,10 @@ static int efm32_out_asynch(FAR struct efm32_usbhost_s *priv, int chidx, * ****************************************************************************/ -static void efm32_gint_wrpacket(FAR struct efm32_usbhost_s *priv, - FAR uint8_t *buffer, int chidx, int buflen) +static void efm32_gint_wrpacket(struct efm32_usbhost_s *priv, + uint8_t *buffer, int chidx, int buflen) { - FAR uint32_t *src; + uint32_t *src; uint32_t fifo; int buflen32; @@ -2451,7 +2451,7 @@ static void efm32_gint_wrpacket(FAR struct efm32_usbhost_s *priv, /* Transfer all of the data into the Tx FIFO */ - src = (FAR uint32_t *)buffer; + src = (uint32_t *)buffer; for (; buflen32 > 0; buflen32--) { uint32_t data = *src++; @@ -2482,10 +2482,10 @@ static void efm32_gint_wrpacket(FAR struct efm32_usbhost_s *priv, * ****************************************************************************/ -static inline void efm32_gint_hcinisr(FAR struct efm32_usbhost_s *priv, +static inline void efm32_gint_hcinisr(struct efm32_usbhost_s *priv, int chidx) { - FAR struct efm32_chan_s *chan = &priv->chan[chidx]; + struct efm32_chan_s *chan = &priv->chan[chidx]; uint32_t regval; uint32_t pending; @@ -2746,10 +2746,10 @@ static inline void efm32_gint_hcinisr(FAR struct efm32_usbhost_s *priv, * ****************************************************************************/ -static inline void efm32_gint_hcoutisr(FAR struct efm32_usbhost_s *priv, +static inline void efm32_gint_hcoutisr(struct efm32_usbhost_s *priv, int chidx) { - FAR struct efm32_chan_s *chan = &priv->chan[chidx]; + struct efm32_chan_s *chan = &priv->chan[chidx]; uint32_t regval; uint32_t pending; @@ -2947,7 +2947,7 @@ static inline void efm32_gint_hcoutisr(FAR struct efm32_usbhost_s *priv, * ****************************************************************************/ -static void efm32_gint_connected(FAR struct efm32_usbhost_s *priv) +static void efm32_gint_connected(struct efm32_usbhost_s *priv) { /* We we previously disconnected? */ @@ -2979,7 +2979,7 @@ static void efm32_gint_connected(FAR struct efm32_usbhost_s *priv) * ****************************************************************************/ -static void efm32_gint_disconnected(FAR struct efm32_usbhost_s *priv) +static void efm32_gint_disconnected(struct efm32_usbhost_s *priv) { /* Were we previously connected? */ @@ -3027,7 +3027,7 @@ static void efm32_gint_disconnected(FAR struct efm32_usbhost_s *priv) ****************************************************************************/ #ifdef CONFIG_EFM32_OTGFS_SOFINTR -static inline void efm32_gint_sofisr(FAR struct efm32_usbhost_s *priv) +static inline void efm32_gint_sofisr(struct efm32_usbhost_s *priv) { /* Handle SOF interrupt */ @@ -3047,9 +3047,9 @@ static inline void efm32_gint_sofisr(FAR struct efm32_usbhost_s *priv) * ****************************************************************************/ -static inline void efm32_gint_rxflvlisr(FAR struct efm32_usbhost_s *priv) +static inline void efm32_gint_rxflvlisr(struct efm32_usbhost_s *priv) { - FAR uint32_t *dest; + uint32_t *dest; uint32_t grxsts; uint32_t intmsk; uint32_t hcchar; @@ -3092,7 +3092,7 @@ static inline void efm32_gint_rxflvlisr(FAR struct efm32_usbhost_s *priv) { /* Transfer the packet from the Rx FIFO into the user buffer */ - dest = (FAR uint32_t *)priv->chan[chidx].buffer; + dest = (uint32_t *)priv->chan[chidx].buffer; fifo = EFM32_USB_FIFO_BASE(0); bcnt32 = (bcnt + 3) >> 2; @@ -3148,9 +3148,9 @@ static inline void efm32_gint_rxflvlisr(FAR struct efm32_usbhost_s *priv) * ****************************************************************************/ -static inline void efm32_gint_nptxfeisr(FAR struct efm32_usbhost_s *priv) +static inline void efm32_gint_nptxfeisr(struct efm32_usbhost_s *priv) { - FAR struct efm32_chan_s *chan; + struct efm32_chan_s *chan; uint32_t regval; unsigned int wrsize; unsigned int avail; @@ -3238,9 +3238,9 @@ static inline void efm32_gint_nptxfeisr(FAR struct efm32_usbhost_s *priv) * ****************************************************************************/ -static inline void efm32_gint_ptxfeisr(FAR struct efm32_usbhost_s *priv) +static inline void efm32_gint_ptxfeisr(struct efm32_usbhost_s *priv) { - FAR struct efm32_chan_s *chan; + struct efm32_chan_s *chan; uint32_t regval; unsigned int wrsize; unsigned int avail; @@ -3327,7 +3327,7 @@ static inline void efm32_gint_ptxfeisr(FAR struct efm32_usbhost_s *priv) * ****************************************************************************/ -static inline void efm32_gint_hcisr(FAR struct efm32_usbhost_s *priv) +static inline void efm32_gint_hcisr(struct efm32_usbhost_s *priv) { uint32_t haint; uint32_t hcchar; @@ -3375,7 +3375,7 @@ static inline void efm32_gint_hcisr(FAR struct efm32_usbhost_s *priv) * ****************************************************************************/ -static inline void efm32_gint_hprtisr(FAR struct efm32_usbhost_s *priv) +static inline void efm32_gint_hprtisr(struct efm32_usbhost_s *priv) { uint32_t hprt; uint32_t newhprt; @@ -3510,7 +3510,7 @@ static inline void efm32_gint_hprtisr(FAR struct efm32_usbhost_s *priv) * ****************************************************************************/ -static inline void efm32_gint_discisr(FAR struct efm32_usbhost_s *priv) +static inline void efm32_gint_discisr(struct efm32_usbhost_s *priv) { /* Handle the disconnection event */ @@ -3529,7 +3529,7 @@ static inline void efm32_gint_discisr(FAR struct efm32_usbhost_s *priv) * ****************************************************************************/ -static inline void efm32_gint_ipxfrisr(FAR struct efm32_usbhost_s *priv) +static inline void efm32_gint_ipxfrisr(struct efm32_usbhost_s *priv) { uint32_t regval; @@ -3554,7 +3554,7 @@ static inline void efm32_gint_ipxfrisr(FAR struct efm32_usbhost_s *priv) * ****************************************************************************/ -static int efm32_gint_isr(int irq, FAR void *context, FAR void *arg) +static int efm32_gint_isr(int irq, void *context, void *arg) { /* At present, there is only support for a single OTG FS host. Hence it is * pre-allocated as g_usbhost. However, in most code, the private data @@ -3563,7 +3563,7 @@ static int efm32_gint_isr(int irq, FAR void *context, FAR void *arg) * devices. */ - FAR struct efm32_usbhost_s *priv = &g_usbhost; + struct efm32_usbhost_s *priv = &g_usbhost; uint32_t pending; /* If OTG were supported, we would need to check if we are in host or @@ -3796,9 +3796,9 @@ static inline void efm32_hostinit_enable(void) * ****************************************************************************/ -static void efm32_txfe_enable(FAR struct efm32_usbhost_s *priv, int chidx) +static void efm32_txfe_enable(struct efm32_usbhost_s *priv, int chidx) { - FAR struct efm32_chan_s *chan = &priv->chan[chidx]; + struct efm32_chan_s *chan = &priv->chan[chidx]; irqstate_t flags; uint32_t regval; @@ -3860,10 +3860,10 @@ static void efm32_txfe_enable(FAR struct efm32_usbhost_s *priv, int chidx) * ****************************************************************************/ -static int efm32_wait(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s **hport) +static int efm32_wait(struct usbhost_connection_s *conn, + struct usbhost_hubport_s **hport) { - FAR struct efm32_usbhost_s *priv = &g_usbhost; + struct efm32_usbhost_s *priv = &g_usbhost; struct usbhost_hubport_s *connport; irqstate_t flags; int ret; @@ -3954,9 +3954,9 @@ static int efm32_wait(FAR struct usbhost_connection_s *conn, * ****************************************************************************/ -static int efm32_rh_enumerate(FAR struct efm32_usbhost_s *priv, - FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport) +static int efm32_rh_enumerate(struct efm32_usbhost_s *priv, + struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport) { uint32_t regval; int ret; @@ -4009,10 +4009,10 @@ static int efm32_rh_enumerate(FAR struct efm32_usbhost_s *priv, return ret; } -static int efm32_enumerate(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport) +static int efm32_enumerate(struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport) { - FAR struct efm32_usbhost_s *priv = &g_usbhost; + struct efm32_usbhost_s *priv = &g_usbhost; int ret; DEBUGASSERT(hport); @@ -4083,13 +4083,13 @@ static int efm32_enumerate(FAR struct usbhost_connection_s *conn, * ****************************************************************************/ -static int efm32_ep0configure(FAR struct usbhost_driver_s *drvr, +static int efm32_ep0configure(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, uint8_t funcaddr, uint8_t speed, uint16_t maxpacketsize) { - FAR struct efm32_usbhost_s *priv = (FAR struct efm32_usbhost_s *)drvr; - FAR struct efm32_ctrlinfo_s *ep0info = (FAR struct efm32_ctrlinfo_s *)ep0; - FAR struct efm32_chan_s *chan; + struct efm32_usbhost_s *priv = (struct efm32_usbhost_s *)drvr; + struct efm32_ctrlinfo_s *ep0info = (struct efm32_ctrlinfo_s *)ep0; + struct efm32_chan_s *chan; int ret; DEBUGASSERT(drvr != NULL && ep0info != NULL && funcaddr < 128 && @@ -4149,11 +4149,11 @@ static int efm32_ep0configure(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int efm32_epalloc(FAR struct usbhost_driver_s *drvr, - FAR const struct usbhost_epdesc_s *epdesc, - FAR usbhost_ep_t *ep) +static int efm32_epalloc(struct usbhost_driver_s *drvr, + const struct usbhost_epdesc_s *epdesc, + usbhost_ep_t *ep) { - FAR struct efm32_usbhost_s *priv = (FAR struct efm32_usbhost_s *)drvr; + struct efm32_usbhost_s *priv = (struct efm32_usbhost_s *)drvr; int ret; /* Sanity check. NOTE that this method should only be called if a device @@ -4211,9 +4211,9 @@ static int efm32_epalloc(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int efm32_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) +static int efm32_epfree(struct usbhost_driver_s *drvr, usbhost_ep_t ep) { - FAR struct efm32_usbhost_s *priv = (FAR struct efm32_usbhost_s *)drvr; + struct efm32_usbhost_s *priv = (struct efm32_usbhost_s *)drvr; int ret; DEBUGASSERT(priv); @@ -4241,8 +4241,8 @@ static int efm32_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) { /* Halt both control channel and mark the channels available */ - FAR struct efm32_ctrlinfo_s *ctrlep = - (FAR struct efm32_ctrlinfo_s *)ep; + struct efm32_ctrlinfo_s *ctrlep = + (struct efm32_ctrlinfo_s *)ep; efm32_chan_free(priv, ctrlep->inndx); efm32_chan_free(priv, ctrlep->outndx); @@ -4289,16 +4289,16 @@ static int efm32_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) * ****************************************************************************/ -static int efm32_alloc(FAR struct usbhost_driver_s *drvr, - FAR uint8_t **buffer, FAR size_t *maxlen) +static int efm32_alloc(struct usbhost_driver_s *drvr, + uint8_t **buffer, size_t *maxlen) { - FAR uint8_t *alloc; + uint8_t *alloc; DEBUGASSERT(drvr && buffer && maxlen); /* There is no special memory requirement for the EFM32. */ - alloc = (FAR uint8_t *)kmm_malloc(CONFIG_EFM32_OTGFS_DESCSIZE); + alloc = (uint8_t *)kmm_malloc(CONFIG_EFM32_OTGFS_DESCSIZE); if (!alloc) { return -ENOMEM; @@ -4335,7 +4335,7 @@ static int efm32_alloc(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int efm32_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer) +static int efm32_free(struct usbhost_driver_s *drvr, uint8_t *buffer) { /* There is no special memory requirement */ @@ -4373,16 +4373,16 @@ static int efm32_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer) * ****************************************************************************/ -static int efm32_ioalloc(FAR struct usbhost_driver_s *drvr, - FAR uint8_t **buffer, size_t buflen) +static int efm32_ioalloc(struct usbhost_driver_s *drvr, + uint8_t **buffer, size_t buflen) { - FAR uint8_t *alloc; + uint8_t *alloc; DEBUGASSERT(drvr && buffer && buflen > 0); /* There is no special memory requirement */ - alloc = (FAR uint8_t *)kmm_malloc(buflen); + alloc = (uint8_t *)kmm_malloc(buflen); if (!alloc) { return -ENOMEM; @@ -4417,8 +4417,8 @@ static int efm32_ioalloc(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int efm32_iofree(FAR struct usbhost_driver_s *drvr, - FAR uint8_t *buffer) +static int efm32_iofree(struct usbhost_driver_s *drvr, + uint8_t *buffer) { /* There is no special memory requirement */ @@ -4464,12 +4464,12 @@ static int efm32_iofree(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int efm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, - FAR const struct usb_ctrlreq_s *req, - FAR uint8_t *buffer) +static int efm32_ctrlin(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, + const struct usb_ctrlreq_s *req, + uint8_t *buffer) { - FAR struct efm32_usbhost_s *priv = (FAR struct efm32_usbhost_s *)drvr; - FAR struct efm32_ctrlinfo_s *ep0info = (FAR struct efm32_ctrlinfo_s *)ep0; + struct efm32_usbhost_s *priv = (struct efm32_usbhost_s *)drvr; + struct efm32_ctrlinfo_s *ep0info = (struct efm32_ctrlinfo_s *)ep0; uint16_t buflen; clock_t start; clock_t elapsed; @@ -4553,12 +4553,12 @@ static int efm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, return -ETIMEDOUT; } -static int efm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, - FAR const struct usb_ctrlreq_s *req, - FAR const uint8_t *buffer) +static int efm32_ctrlout(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, + const struct usb_ctrlreq_s *req, + const uint8_t *buffer) { - FAR struct efm32_usbhost_s *priv = (FAR struct efm32_usbhost_s *)drvr; - FAR struct efm32_ctrlinfo_s *ep0info = (FAR struct efm32_ctrlinfo_s *)ep0; + struct efm32_usbhost_s *priv = (struct efm32_usbhost_s *)drvr; + struct efm32_ctrlinfo_s *ep0info = (struct efm32_ctrlinfo_s *)ep0; uint16_t buflen; clock_t start; clock_t elapsed; @@ -4609,7 +4609,7 @@ static int efm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, priv->chan[ep0info->outndx].outdata1 = true; ret = efm32_ctrl_senddata(priv, ep0info, - (FAR uint8_t *)buffer, buflen); + (uint8_t *)buffer, buflen); if (ret < 0) { usbhost_trace1(USBHOST_TRACE1_SENDDATA, -ret); @@ -4683,11 +4683,11 @@ static int efm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, * ****************************************************************************/ -static ssize_t efm32_transfer(FAR struct usbhost_driver_s *drvr, - usbhost_ep_t ep, FAR uint8_t *buffer, +static ssize_t efm32_transfer(struct usbhost_driver_s *drvr, + usbhost_ep_t ep, uint8_t *buffer, size_t buflen) { - FAR struct efm32_usbhost_s *priv = (FAR struct efm32_usbhost_s *)drvr; + struct efm32_usbhost_s *priv = (struct efm32_usbhost_s *)drvr; unsigned int chidx = (unsigned int)ep; ssize_t nbytes; int ret; @@ -4756,11 +4756,11 @@ static ssize_t efm32_transfer(FAR struct usbhost_driver_s *drvr, ****************************************************************************/ #ifdef CONFIG_USBHOST_ASYNCH -static int efm32_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, - FAR uint8_t *buffer, size_t buflen, - usbhost_asynch_t callback, FAR void *arg) +static int efm32_asynch(struct usbhost_driver_s *drvr, usbhost_ep_t ep, + uint8_t *buffer, size_t buflen, + usbhost_asynch_t callback, void *arg) { - FAR struct efm32_usbhost_s *priv = (FAR struct efm32_usbhost_s *)drvr; + struct efm32_usbhost_s *priv = (struct efm32_usbhost_s *)drvr; unsigned int chidx = (unsigned int)ep; int ret; @@ -4811,10 +4811,10 @@ static int efm32_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, * ****************************************************************************/ -static int efm32_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) +static int efm32_cancel(struct usbhost_driver_s *drvr, usbhost_ep_t ep) { - FAR struct efm32_usbhost_s *priv = (FAR struct efm32_usbhost_s *)drvr; - FAR struct efm32_chan_s *chan; + struct efm32_usbhost_s *priv = (struct efm32_usbhost_s *)drvr; + struct efm32_chan_s *chan; unsigned int chidx = (unsigned int)ep; irqstate_t flags; @@ -4858,7 +4858,7 @@ static int efm32_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) else if (chan->callback) { usbhost_asynch_t callback; - FAR void *arg; + void *arg; /* Extract the callback information */ @@ -4901,11 +4901,11 @@ static int efm32_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) ****************************************************************************/ #ifdef CONFIG_USBHOST_HUB -static int efm32_connect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport, +static int efm32_connect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport, bool connected) { - FAR struct efm32_usbhost_s *priv = (FAR struct efm32_usbhost_s *)drvr; + struct efm32_usbhost_s *priv = (struct efm32_usbhost_s *)drvr; irqstate_t flags; DEBUGASSERT(priv != NULL && hport != NULL); @@ -4957,8 +4957,8 @@ static int efm32_connect(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static void efm32_disconnect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport) +static void efm32_disconnect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport) { DEBUGASSERT(hport != NULL); hport->devclass = NULL; @@ -4984,7 +4984,7 @@ static void efm32_disconnect(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static void efm32_portreset(FAR struct efm32_usbhost_s *priv) +static void efm32_portreset(struct efm32_usbhost_s *priv) { uint32_t regval; @@ -5096,7 +5096,7 @@ static void efm32_flush_rxfifo(void) * ****************************************************************************/ -static void efm32_vbusdrive(FAR struct efm32_usbhost_s *priv, bool state) +static void efm32_vbusdrive(struct efm32_usbhost_s *priv, bool state) { uint32_t regval; @@ -5142,7 +5142,7 @@ static void efm32_vbusdrive(FAR struct efm32_usbhost_s *priv, bool state) * ****************************************************************************/ -static void efm32_host_initialize(FAR struct efm32_usbhost_s *priv) +static void efm32_host_initialize(struct efm32_usbhost_s *priv) { uint32_t regval; uint32_t offset; @@ -5235,10 +5235,10 @@ static void efm32_host_initialize(FAR struct efm32_usbhost_s *priv) * ****************************************************************************/ -static inline void efm32_sw_initialize(FAR struct efm32_usbhost_s *priv) +static inline void efm32_sw_initialize(struct efm32_usbhost_s *priv) { - FAR struct usbhost_driver_s *drvr; - FAR struct usbhost_hubport_s *hport; + struct usbhost_driver_s *drvr; + struct usbhost_hubport_s *hport; int i; /* Initialize the device operations */ @@ -5302,7 +5302,7 @@ static inline void efm32_sw_initialize(FAR struct efm32_usbhost_s *priv) for (i = 0; i < EFM32_MAX_TX_FIFOS; i++) { - FAR struct efm32_chan_s *chan = &priv->chan[i]; + struct efm32_chan_s *chan = &priv->chan[i]; chan->chidx = i; @@ -5329,7 +5329,7 @@ static inline void efm32_sw_initialize(FAR struct efm32_usbhost_s *priv) * ****************************************************************************/ -static inline int efm32_hw_initialize(FAR struct efm32_usbhost_s *priv) +static inline int efm32_hw_initialize(struct efm32_usbhost_s *priv) { uint32_t regval; unsigned long timeout; @@ -5438,7 +5438,7 @@ static inline int efm32_hw_initialize(FAR struct efm32_usbhost_s *priv) * ****************************************************************************/ -FAR struct usbhost_connection_s *efm32_usbhost_initialize(int controller) +struct usbhost_connection_s *efm32_usbhost_initialize(int controller) { /* At present, there is only support for a single OTG FS host. Hence it is * pre-allocated as g_usbhost. However, in most code, the private data @@ -5447,7 +5447,7 @@ FAR struct usbhost_connection_s *efm32_usbhost_initialize(int controller) * devices. */ - FAR struct efm32_usbhost_s *priv = &g_usbhost; + struct efm32_usbhost_s *priv = &g_usbhost; /* Sanity checks */ diff --git a/arch/arm/src/eoss3/eoss3_irq.c b/arch/arm/src/eoss3/eoss3_irq.c index 4584781d84..513f3d3434 100644 --- a/arch/arm/src/eoss3/eoss3_irq.c +++ b/arch/arm/src/eoss3/eoss3_irq.c @@ -142,7 +142,7 @@ static void eoss3_dumpnvic(const char *msg, int irq) ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -static int eoss3_nmi(int irq, FAR void *context, FAR void *arg) +static int eoss3_nmi(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! NMI received\n"); @@ -150,7 +150,7 @@ static int eoss3_nmi(int irq, FAR void *context, FAR void *arg) return 0; } -static int eoss3_busfault(int irq, FAR void *context, FAR void *arg) +static int eoss3_busfault(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); @@ -158,7 +158,7 @@ static int eoss3_busfault(int irq, FAR void *context, FAR void *arg) return 0; } -static int eoss3_usagefault(int irq, FAR void *context, FAR void *arg) +static int eoss3_usagefault(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); @@ -166,7 +166,7 @@ static int eoss3_usagefault(int irq, FAR void *context, FAR void *arg) return 0; } -static int eoss3_pendsv(int irq, FAR void *context, FAR void *arg) +static int eoss3_pendsv(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! PendSV received\n"); @@ -174,7 +174,7 @@ static int eoss3_pendsv(int irq, FAR void *context, FAR void *arg) return 0; } -static int eoss3_dbgmonitor(int irq, FAR void *context, FAR void *arg) +static int eoss3_dbgmonitor(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Debug Monitor received\n"); @@ -182,7 +182,7 @@ static int eoss3_dbgmonitor(int irq, FAR void *context, FAR void *arg) return 0; } -static int eoss3_reserved(int irq, FAR void *context, FAR void *arg) +static int eoss3_reserved(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Reserved interrupt\n"); diff --git a/arch/arm/src/eoss3/eoss3_serial.c b/arch/arm/src/eoss3/eoss3_serial.c index b83eb70bcf..0db9ee852f 100644 --- a/arch/arm/src/eoss3/eoss3_serial.c +++ b/arch/arm/src/eoss3/eoss3_serial.c @@ -75,7 +75,7 @@ static int eoss3_setup(struct uart_dev_s *dev); static void eoss3_shutdown(struct uart_dev_s *dev); static int eoss3_attach(struct uart_dev_s *dev); static void eoss3_detach(struct uart_dev_s *dev); -static int eoss3_interrupt(int irq, void *context, FAR void *arg); +static int eoss3_interrupt(int irq, void *context, void *arg); static int eoss3_ioctl(struct file *filep, int cmd, unsigned long arg); static int eoss3_receive(struct uart_dev_s *dev, unsigned int *status); static void eoss3_rxint(struct uart_dev_s *dev, bool enable); @@ -192,7 +192,7 @@ static void eoss3_tx_work(void *arg) if (dev->xmit.head != dev->xmit.tail) { work_queue(HPWORK, &priv->work, eoss3_tx_work, - (FAR void *)arg, 0); + (void *)arg, 0); } leave_critical_section(flags); @@ -318,7 +318,7 @@ static void eoss3_detach(struct uart_dev_s *dev) * ****************************************************************************/ -static int eoss3_interrupt(int irq, void *context, FAR void *arg) +static int eoss3_interrupt(int irq, void *context, void *arg) { struct uart_dev_s *dev = (struct uart_dev_s *)arg; uint32_t status; @@ -490,7 +490,7 @@ static void eoss3_txint(struct uart_dev_s *dev, bool enable) if (work_available(&priv->work)) { work_queue(HPWORK, &priv->work, eoss3_tx_work, - (FAR void *)dev, 0); + (void *)dev, 0); } } } diff --git a/arch/arm/src/imx1/imx_allocateheap.c b/arch/arm/src/imx1/imx_allocateheap.c index 1904b2ddbc..a482f13f7e 100644 --- a/arch/arm/src/imx1/imx_allocateheap.c +++ b/arch/arm/src/imx1/imx_allocateheap.c @@ -55,10 +55,10 @@ * ****************************************************************************/ -void up_allocate_heap(FAR void **heap_start, size_t *heap_size) +void up_allocate_heap(void **heap_start, size_t *heap_size) { board_autoled_on(LED_HEAPALLOCATE); - *heap_start = (FAR void *)g_idle_topstack; + *heap_start = (void *)g_idle_topstack; *heap_size = (IMX_SDRAM_VSECTION + CONFIG_RAM_SIZE) - g_idle_topstack; } @@ -83,14 +83,14 @@ void arm_addregion(void) uint32_t start = CONFIG_RAM_VSTART + 0x1000; uint32_t end = (CONFIG_RAM_NUTTXENTRY & 0xffff0000); - kmm_addregion((FAR void *)start, end - start); + kmm_addregion((void *)start, end - start); #endif #endif /* Check for any additional memory regions */ #if defined(CONFIG_HEAP2_BASE) && defined(CONFIG_HEAP2_SIZE) - kmm_addregion((FAR void *)CONFIG_HEAP2_BASE, CONFIG_HEAP2_SIZE); + kmm_addregion((void *)CONFIG_HEAP2_BASE, CONFIG_HEAP2_SIZE); #endif } #endif diff --git a/arch/arm/src/imx1/imx_cspi.h b/arch/arm/src/imx1/imx_cspi.h index 82b5634899..dfa358f607 100644 --- a/arch/arm/src/imx1/imx_cspi.h +++ b/arch/arm/src/imx1/imx_cspi.h @@ -186,7 +186,7 @@ struct spi_dev_s; /* Forward reference */ * ****************************************************************************/ -FAR struct spi_dev_s *imx_spibus_initialize(int port); +struct spi_dev_s *imx_spibus_initialize(int port); /**************************************************************************** * The external functions, imx_spiselect, imx_spistatus, and imx_cmddaa must @@ -212,10 +212,10 @@ FAR struct spi_dev_s *imx_spibus_initialize(int port); * ****************************************************************************/ -void imx_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t imx_spistatus(FAR struct spi_dev_s *dev, uint32_t devid); +void imx_spiselect(struct spi_dev_s *dev, uint32_t devid, bool selected); +uint8_t imx_spistatus(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int imx_spicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int imx_spicmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #undef EXTERN diff --git a/arch/arm/src/imx1/imx_serial.c b/arch/arm/src/imx1/imx_serial.c index a99ffb45af..be538189b9 100644 --- a/arch/arm/src/imx1/imx_serial.c +++ b/arch/arm/src/imx1/imx_serial.c @@ -95,7 +95,7 @@ static int up_setup(struct uart_dev_s *dev); static void up_shutdown(struct uart_dev_s *dev); static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); -static int up_interrupt(int irq, void *context, FAR void *arg); +static int up_interrupt(int irq, void *context, void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); @@ -811,7 +811,7 @@ static void up_detach(struct uart_dev_s *dev) * ****************************************************************************/ -static int up_interrupt(int irq, void *context, FAR void *arg) +static int up_interrupt(int irq, void *context, void *arg) { struct uart_dev_s *dev = (struct uart_dev_s *)arg; struct up_dev_s *priv; diff --git a/arch/arm/src/imx1/imx_spi.c b/arch/arm/src/imx1/imx_spi.c index 9af6ecb75e..1521fc0b1f 100644 --- a/arch/arm/src/imx1/imx_spi.c +++ b/arch/arm/src/imx1/imx_spi.c @@ -150,24 +150,24 @@ static int spi_transfer(struct imx_spidev_s *priv, const void *txbuffer, #ifndef CONFIG_SPI_POLLWAIT static inline struct imx_spidev_s *spi_mapirq(int irq); static int spi_interrupt(int irq, void *context, - FAR void *arg, FAR void *arg); + void *arg, void *arg); #endif /* SPI methods */ -static int spi_lock(FAR struct spi_dev_s *dev, bool lock); -static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, +static int spi_lock(struct spi_dev_s *dev, bool lock); +static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency); -static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode); -static void spi_setbits(FAR struct spi_dev_s *dev, int nbits); -static uint32_t spi_send(FAR struct spi_dev_s *dev, uint32_t wd); +static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode); +static void spi_setbits(struct spi_dev_s *dev, int nbits); +static uint32_t spi_send(struct spi_dev_s *dev, uint32_t wd); #ifdef CONFIG_SPI_EXCHANGE -static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, - FAR void *rxbuffer, size_t nwords); +static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, + void *rxbuffer, size_t nwords); #else -static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, +static void spi_sndblock(struct spi_dev_s *dev, const void *buffer, size_t nwords); -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 nwords); #endif @@ -643,7 +643,7 @@ static inline struct imx_spidev_s *spi_mapirq(int irq) #ifndef CONFIG_SPI_POLLWAIT static int spi_interrupt(int irq, void *context, - FAR void *arg, FAR void *arg) + void *arg, void *arg) { struct imx_spidev_s *priv = spi_mapirq(irq); int ntxd; @@ -696,7 +696,7 @@ static int spi_interrupt(int irq, void *context, * ****************************************************************************/ -static int spi_lock(FAR struct spi_dev_s *dev, bool lock) +static int spi_lock(struct spi_dev_s *dev, bool lock) { struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; int ret; @@ -728,7 +728,7 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock) * ****************************************************************************/ -static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, +static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency) { struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; @@ -812,7 +812,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) +static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) { struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; if (priv && mode != priv->mode) @@ -868,7 +868,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) * ****************************************************************************/ -static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) +static void spi_setbits(struct spi_dev_s *dev, int nbits) { struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; if (priv && nbits != priv->nbits && nbits > 0 && nbits <= 16) @@ -897,7 +897,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) * ****************************************************************************/ -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) { struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; uint32_t response = 0; @@ -928,8 +928,8 @@ static uint32_t spi_send(FAR struct spi_dev_s *dev, uint32_t wd) ****************************************************************************/ #ifdef CONFIG_SPI_EXCHANGE -static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, - FAR void *rxbuffer, size_t nwords) +static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, + void *rxbuffer, size_t nwords) { struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; spi_transfer(priv, txbuffer, rxbuffer, nwords); @@ -957,7 +957,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, ****************************************************************************/ #ifndef CONFIG_SPI_EXCHANGE -static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, +static void spi_sndblock(struct spi_dev_s *dev, const void *buffer, size_t nwords) { struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; @@ -986,7 +986,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, ****************************************************************************/ #ifndef CONFIG_SPI_EXCHANGE -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 nwords) { struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; @@ -1020,7 +1020,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, * ****************************************************************************/ -FAR struct spi_dev_s *imx_spibus_initialize(int port) +struct spi_dev_s *imx_spibus_initialize(int port) { struct imx_spidev_s *priv; uint8_t regval; @@ -1135,7 +1135,7 @@ FAR struct spi_dev_s *imx_spibus_initialize(int port) /* Set the initial clock frequency for identification mode < 400kHz */ - spi_setfrequency((FAR struct spi_dev_s *)priv, 400000); + spi_setfrequency((struct spi_dev_s *)priv, 400000); /* Enable interrupts on data ready (and certain error conditions */ @@ -1175,7 +1175,7 @@ FAR struct spi_dev_s *imx_spibus_initialize(int port) #ifndef CONFIG_SPI_POLLWAIT up_enable_irq(priv->irq); #endif - return (FAR struct spi_dev_s *)priv; + return (struct spi_dev_s *)priv; } #endif /* NSPIS > 0 */ diff --git a/arch/arm/src/imx1/imx_timerisr.c b/arch/arm/src/imx1/imx_timerisr.c index 7e5e374651..49a5966a60 100644 --- a/arch/arm/src/imx1/imx_timerisr.c +++ b/arch/arm/src/imx1/imx_timerisr.c @@ -47,7 +47,7 @@ * ****************************************************************************/ -static int imx_timerisr(int irq, uint32_t *regs, FAR void *arg) +static int imx_timerisr(int irq, uint32_t *regs, void *arg) { uint32_t tstat; int ret = -EIO; diff --git a/arch/arm/src/imx6/imx_cpuboot.c b/arch/arm/src/imx6/imx_cpuboot.c index cec8cff8ee..21507e7131 100644 --- a/arch/arm/src/imx6/imx_cpuboot.c +++ b/arch/arm/src/imx6/imx_cpuboot.c @@ -43,7 +43,7 @@ * Private Types ****************************************************************************/ -typedef CODE void (*cpu_start_t)(void); +typedef void (*cpu_start_t)(void); /**************************************************************************** * Private Data diff --git a/arch/arm/src/imx6/imx_ecspi.c b/arch/arm/src/imx6/imx_ecspi.c index 678d796f46..cf55b92848 100644 --- a/arch/arm/src/imx6/imx_ecspi.c +++ b/arch/arm/src/imx6/imx_ecspi.c @@ -114,13 +114,12 @@ /* Per SPI callouts to board-specific logic */ -typedef CODE void (*imx_select_t)(FAR struct spi_dev_s *dev, - uint32_t devid, bool selected); -typedef CODE uint8_t (*imx_status_t)(FAR struct spi_dev_s *dev, - uint32_t devid); +typedef void (*imx_select_t)(struct spi_dev_s *dev, + uint32_t devid, bool selected); +typedef uint8_t (*imx_status_t)(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -typedef CODE int (*imx_cmddata_t)(FAR struct spi_dev_s *dev, - uint32_t devid, bool cmd); +typedef int (*imx_cmddata_t)(struct spi_dev_s *dev, + uint32_t devid, bool cmd); #endif struct imx_spidev_s @@ -201,33 +200,33 @@ static int spi_transfer(struct imx_spidev_s *priv, const void *txbuffer, /* Interrupt handling */ #ifndef CONFIG_SPI_POLLWAIT -static int spi_interrupt(int irq, void *context, FAR void *arg); +static int spi_interrupt(int irq, void *context, void *arg); #endif /* 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, +static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency); -static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode); -static void spi_setbits(FAR struct spi_dev_s *dev, int nbits); -static uint32_t spi_send(FAR struct spi_dev_s *dev, uint32_t wd); -static uint8_t spi_status(FAR struct spi_dev_s *dev, uint32_t devid); +static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode); +static void spi_setbits(struct spi_dev_s *dev, int nbits); +static uint32_t spi_send(struct spi_dev_s *dev, uint32_t wd); +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 #ifdef CONFIG_SPI_EXCHANGE -static void spi_exchange(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, - FAR void *rxbuffer, size_t nwords); +static void spi_exchange(struct spi_dev_s *dev, + const void *txbuffer, + void *rxbuffer, size_t nwords); #else -static void spi_sndblock(FAR struct spi_dev_s *dev, - FAR const void *buffer, size_t nwords); -static void spi_recvblock(FAR struct spi_dev_s *dev, - FAR void *buffer, size_t nwords); +static void spi_sndblock(struct spi_dev_s *dev, + const void *buffer, size_t nwords); +static void spi_recvblock(struct spi_dev_s *dev, + void *buffer, size_t nwords); #endif /**************************************************************************** @@ -718,7 +717,7 @@ static int spi_transfer(struct imx_spidev_s *priv, const void *txbuffer, ****************************************************************************/ #ifndef CONFIG_SPI_POLLWAIT -static int spi_interrupt(int irq, void *context, FAR void *arg) +static int spi_interrupt(int irq, void *context, void *arg) { struct imx_spidev_s *priv = (struct imx_spidev_s *)arg; int ntxd; @@ -771,7 +770,7 @@ static int spi_interrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -static int spi_lock(FAR struct spi_dev_s *dev, bool lock) +static int spi_lock(struct spi_dev_s *dev, bool lock) { struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; int ret; @@ -807,7 +806,7 @@ 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) { struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; @@ -831,7 +830,7 @@ 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) { struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; @@ -915,7 +914,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) +static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) { struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; if (priv && mode != priv->mode) @@ -971,7 +970,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) * ****************************************************************************/ -static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) +static void spi_setbits(struct spi_dev_s *dev, int nbits) { struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; if (priv && nbits != priv->nbits && nbits > 0 && nbits <= 16) @@ -1000,7 +999,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) * ****************************************************************************/ -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) { struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; uint32_t response = 0; @@ -1024,7 +1023,7 @@ static uint32_t spi_send(FAR struct spi_dev_s *dev, uint32_t wd) * ****************************************************************************/ -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) { struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; uint8_t ret = 0; @@ -1064,7 +1063,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, +static int spi_cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd) { struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; @@ -1103,8 +1102,8 @@ static int spi_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, ****************************************************************************/ #ifdef CONFIG_SPI_EXCHANGE -static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, - FAR void *rxbuffer, size_t nwords) +static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, + void *rxbuffer, size_t nwords) { struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; spi_transfer(priv, txbuffer, rxbuffer, nwords); @@ -1132,7 +1131,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, ****************************************************************************/ #ifndef CONFIG_SPI_EXCHANGE -static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, +static void spi_sndblock(struct spi_dev_s *dev, const void *buffer, size_t nwords) { struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; @@ -1161,7 +1160,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, ****************************************************************************/ #ifndef CONFIG_SPI_EXCHANGE -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 nwords) { struct imx_spidev_s *priv = (struct imx_spidev_s *)dev; @@ -1195,7 +1194,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, * ****************************************************************************/ -FAR struct spi_dev_s *imx_spibus_initialize(int port) +struct spi_dev_s *imx_spibus_initialize(int port) { struct imx_spidev_s *priv; uint8_t regval; @@ -1312,7 +1311,7 @@ FAR struct spi_dev_s *imx_spibus_initialize(int port) /* Set the initial clock frequency for identification mode < 400kHz */ - spi_setfrequency((FAR struct spi_dev_s *)priv, 400000); + spi_setfrequency((struct spi_dev_s *)priv, 400000); /* Enable interrupts on data ready (and certain error conditions */ @@ -1352,7 +1351,7 @@ FAR struct spi_dev_s *imx_spibus_initialize(int port) #ifndef CONFIG_SPI_POLLWAIT up_enable_irq(priv->irq); #endif - return (FAR struct spi_dev_s *)priv; + return (struct spi_dev_s *)priv; } #endif /* NSPIS > 0 */ diff --git a/arch/arm/src/imx6/imx_ecspi.h b/arch/arm/src/imx6/imx_ecspi.h index d781c31934..2df5037386 100644 --- a/arch/arm/src/imx6/imx_ecspi.h +++ b/arch/arm/src/imx6/imx_ecspi.h @@ -78,7 +78,7 @@ struct spi_dev_s; /* Forward reference */ * ****************************************************************************/ -FAR struct spi_dev_s *imx_spibus_initialize(int port); +struct spi_dev_s *imx_spibus_initialize(int port); /**************************************************************************** * The external functions, imx_spiselect, imx_spistatus, and imx_cmddata must @@ -105,47 +105,47 @@ FAR struct spi_dev_s *imx_spibus_initialize(int port); ****************************************************************************/ #ifdef CONFIG_IMX6_ECSPI1 -void imx_spi1select(FAR struct spi_dev_s *dev, +void imx_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t imx_spi1status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t imx_spi1status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int imx_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int imx_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_IMX6_ECSPI2 -void imx_spi2select(FAR struct spi_dev_s *dev, +void imx_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t imx_spi2status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t imx_spi2status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int imx_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int imx_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_IMX6_ECSPI3 -void imx_spi3select(FAR struct spi_dev_s *dev, +void imx_spi3select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t imx_spi3status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t imx_spi3status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int imx_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int imx_spi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_IMX6_ECSPI4 -void imx_spi4select(FAR struct spi_dev_s *dev, +void imx_spi4select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t imx_spi4status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t imx_spi4status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int imx_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int imx_spi4cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_IMX6_ECSPI5 -void imx_spi5select(FAR struct spi_dev_s *dev, +void imx_spi5select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t imx_spi5status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t imx_spi5status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int imx_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int imx_spi5cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif diff --git a/arch/arm/src/imx6/imx_enet.c b/arch/arm/src/imx6/imx_enet.c index b0e85f3168..67a8232337 100644 --- a/arch/arm/src/imx6/imx_enet.c +++ b/arch/arm/src/imx6/imx_enet.c @@ -260,7 +260,7 @@ * the contents of the Ethernet header */ -#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) #define IMX_BUF_SIZE ENET_ALIGN_UP(CONFIG_NET_ETH_PKTSIZE) @@ -337,25 +337,25 @@ static inline uint16_t imx_swap16(uint16_t value); /* Common TX logic */ -static bool imx_txringfull(FAR struct imx_driver_s *priv); -static int imx_transmit(FAR struct imx_driver_s *priv); +static bool imx_txringfull(struct imx_driver_s *priv); +static int imx_transmit(struct imx_driver_s *priv); static int imx_txpoll(struct net_driver_s *dev); /* Interrupt handling */ -static void imx_dispatch(FAR struct imx_driver_s *priv); -static void imx_receive(FAR struct imx_driver_s *priv); -static void imx_txdone(FAR struct imx_driver_s *priv); +static void imx_dispatch(struct imx_driver_s *priv); +static void imx_receive(struct imx_driver_s *priv); +static void imx_txdone(struct imx_driver_s *priv); -static void imx_enet_interrupt_work(FAR void *arg); -static int imx_enet_interrupt(int irq, FAR void *context, FAR void *arg); +static void imx_enet_interrupt_work(void *arg); +static int imx_enet_interrupt(int irq, void *context, void *arg); /* Watchdog timer expirations */ -static void imx_txtimeout_work(FAR void *arg); +static void imx_txtimeout_work(void *arg); static void imx_txtimeout_expiry(wdparm_t arg); -static void imx_poll_work(FAR void *arg); +static void imx_poll_work(void *arg); static void imx_polltimer_expiry(wdparm_t arg); /* NuttX callback functions */ @@ -363,7 +363,7 @@ static void imx_polltimer_expiry(wdparm_t arg); static int imx_ifup(struct net_driver_s *dev); static int imx_ifdown(struct net_driver_s *dev); -static void imx_txavail_work(FAR void *arg); +static void imx_txavail_work(void *arg); static int imx_txavail(struct net_driver_s *dev); /* Internal ifup function that allows phy reset to be optional */ @@ -372,8 +372,8 @@ static int imx_ifup_action(struct net_driver_s *dev, bool resetphy); #ifdef CONFIG_NET_MCASTGROUP static int imx_addmac(struct net_driver_s *dev, - FAR const uint8_t *mac); -static int imx_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac); + const uint8_t *mac); +static int imx_rmmac(struct net_driver_s *dev, const uint8_t *mac); #endif #ifdef CONFIG_NETDEV_IOCTL @@ -467,7 +467,7 @@ static inline uint16_t imx_swap16(uint16_t value) * ****************************************************************************/ -static bool imx_txringfull(FAR struct imx_driver_s *priv) +static bool imx_txringfull(struct imx_driver_s *priv) { #if CONFIG_IMX_ENET_NTXBUFFERS > 1 uint8_t txnext; @@ -509,7 +509,7 @@ static bool imx_txringfull(FAR struct imx_driver_s *priv) * ****************************************************************************/ -static int imx_transmit(FAR struct imx_driver_s *priv) +static int imx_transmit(struct imx_driver_s *priv) { struct enet_desc_s *txdesc; irqstate_t flags; @@ -642,8 +642,8 @@ static int imx_transmit(FAR struct imx_driver_s *priv) static int imx_txpoll(struct net_driver_s *dev) { - FAR struct imx_driver_s *priv = - (FAR struct imx_driver_s *)dev->d_private; + struct imx_driver_s *priv = + (struct imx_driver_s *)dev->d_private; /* If the polling resulted in data that should be sent out on the network, * the field d_len is set to a value > 0. @@ -719,7 +719,7 @@ static int imx_txpoll(struct net_driver_s *dev) * ****************************************************************************/ -static inline void imx_dispatch(FAR struct imx_driver_s *priv) +static inline void imx_dispatch(struct imx_driver_s *priv) { /* Update statistics */ @@ -856,7 +856,7 @@ static inline void imx_dispatch(FAR struct imx_driver_s *priv) * ****************************************************************************/ -static void imx_receive(FAR struct imx_driver_s *priv) +static void imx_receive(struct imx_driver_s *priv) { struct enet_desc_s *rxdesc; bool received; @@ -948,7 +948,7 @@ static void imx_receive(FAR struct imx_driver_s *priv) * ****************************************************************************/ -static void imx_txdone(FAR struct imx_driver_s *priv) +static void imx_txdone(struct imx_driver_s *priv) { struct enet_desc_s *txdesc; uint32_t regval; @@ -1031,9 +1031,9 @@ static void imx_txdone(FAR struct imx_driver_s *priv) * ****************************************************************************/ -static void imx_enet_interrupt_work(FAR void *arg) +static void imx_enet_interrupt_work(void *arg) { - FAR struct imx_driver_s *priv = (FAR struct imx_driver_s *)arg; + struct imx_driver_s *priv = (struct imx_driver_s *)arg; uint32_t pending; #ifdef CONFIG_NET_MCASTGROUP uint32_t gaurstore; @@ -1151,9 +1151,9 @@ static void imx_enet_interrupt_work(FAR void *arg) * ****************************************************************************/ -static int imx_enet_interrupt(int irq, FAR void *context, FAR void *arg) +static int imx_enet_interrupt(int irq, void *context, void *arg) { - register FAR struct imx_driver_s *priv = &g_enet[0]; + register struct imx_driver_s *priv = &g_enet[0]; /* Disable further Ethernet interrupts. Because Ethernet interrupts are * also disabled if the TX timeout event occurs, there can be no race @@ -1184,9 +1184,9 @@ static int imx_enet_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static void imx_txtimeout_work(FAR void *arg) +static void imx_txtimeout_work(void *arg) { - FAR struct imx_driver_s *priv = (FAR struct imx_driver_s *)arg; + struct imx_driver_s *priv = (struct imx_driver_s *)arg; /* Increment statistics and dump debug info */ @@ -1228,7 +1228,7 @@ static void imx_txtimeout_work(FAR void *arg) static void imx_txtimeout_expiry(wdparm_t arg) { - FAR struct imx_driver_s *priv = (FAR struct imx_driver_s *)arg; + struct imx_driver_s *priv = (struct imx_driver_s *)arg; /* Disable further Ethernet interrupts. This will prevent some race * conditions with interrupt work. There is still a potential race @@ -1261,9 +1261,9 @@ static void imx_txtimeout_expiry(wdparm_t arg) * ****************************************************************************/ -static void imx_poll_work(FAR void *arg) +static void imx_poll_work(void *arg) { - FAR struct imx_driver_s *priv = (FAR struct imx_driver_s *)arg; + struct imx_driver_s *priv = (struct imx_driver_s *)arg; /* Check if there is there is a transmission in progress. * We cannot perform the TX poll if he are unable to accept @@ -1307,7 +1307,7 @@ static void imx_poll_work(FAR void *arg) static void imx_polltimer_expiry(wdparm_t arg) { - FAR struct imx_driver_s *priv = (FAR struct imx_driver_s *)arg; + struct imx_driver_s *priv = (struct imx_driver_s *)arg; /* Schedule to perform the poll processing on the worker thread. */ @@ -1337,8 +1337,8 @@ static void imx_polltimer_expiry(wdparm_t arg) static int imx_ifup_action(struct net_driver_s *dev, bool resetphy) { - FAR struct imx_driver_s *priv = - (FAR struct imx_driver_s *)dev->d_private; + struct imx_driver_s *priv = + (struct imx_driver_s *)dev->d_private; uint8_t *mac = dev->d_mac.ether.ether_addr_octet; uint32_t regval; int ret; @@ -1483,8 +1483,8 @@ static int imx_ifup(struct net_driver_s *dev) static int imx_ifdown(struct net_driver_s *dev) { - FAR struct imx_driver_s *priv = - (FAR struct imx_driver_s *)dev->d_private; + struct imx_driver_s *priv = + (struct imx_driver_s *)dev->d_private; irqstate_t flags; ninfo("Taking down: %d.%d.%d.%d\n", @@ -1536,9 +1536,9 @@ static int imx_ifdown(struct net_driver_s *dev) * ****************************************************************************/ -static void imx_txavail_work(FAR void *arg) +static void imx_txavail_work(void *arg) { - FAR struct imx_driver_s *priv = (FAR struct imx_driver_s *)arg; + struct imx_driver_s *priv = (struct imx_driver_s *)arg; /* Ignore the notification if the interface is not yet up */ @@ -1583,8 +1583,8 @@ static void imx_txavail_work(FAR void *arg) static int imx_txavail(struct net_driver_s *dev) { - FAR struct imx_driver_s *priv = - (FAR struct imx_driver_s *)dev->d_private; + struct imx_driver_s *priv = + (struct imx_driver_s *)dev->d_private; /* Is our single work structure available? It may not be if there are * pending interrupt actions and we will have to ignore the Tx @@ -1702,7 +1702,7 @@ static uint32_t imx_enet_hash_index(const uint8_t *mac) ****************************************************************************/ #ifdef CONFIG_NET_MCASTGROUP -static int imx_addmac(struct net_driver_s *dev, FAR const uint8_t *mac) +static int imx_addmac(struct net_driver_s *dev, const uint8_t *mac) { uint32_t hashindex; uint32_t temp; @@ -1749,7 +1749,7 @@ static int imx_addmac(struct net_driver_s *dev, FAR const uint8_t *mac) ****************************************************************************/ #ifdef CONFIG_NET_MCASTGROUP -static int imx_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac) +static int imx_rmmac(struct net_driver_s *dev, const uint8_t *mac) { uint32_t hashindex; uint32_t temp; @@ -1799,8 +1799,8 @@ static int imx_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac) static int imx_ioctl(struct net_driver_s *dev, int cmd, unsigned long arg) { #ifdef CONFIG_NETDEV_PHY_IOCTL - FAR struct imx_driver_s *priv = - (FAR struct imx_driver_s *)dev->d_private; + struct imx_driver_s *priv = + (struct imx_driver_s *)dev->d_private; #endif int ret; diff --git a/arch/arm/src/imx6/imx_gpio.c b/arch/arm/src/imx6/imx_gpio.c index 3cb4f74c90..133d13a4c7 100644 --- a/arch/arm/src/imx6/imx_gpio.c +++ b/arch/arm/src/imx6/imx_gpio.c @@ -318,7 +318,7 @@ static const uint8_t g_gpio7_padmux[IMX_GPIO_NPINS] = IMX_PADMUX_INVALID, /* GPIO6 Pin 31 */ }; -static FAR const uint8_t *g_gpio_padmux[IMX_GPIO_NPORTS + 1] = +static const uint8_t *g_gpio_padmux[IMX_GPIO_NPORTS + 1] = { g_gpio1_padmux, /* GPIO1 */ g_gpio2_padmux, /* GPIO2 */ @@ -399,7 +399,7 @@ static int imx_gpio_configinput(gpio_pinset_t pinset) { int port = (pinset & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT; int pin = (pinset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT; - FAR const uint8_t *table; + const uint8_t *table; iomux_pinset_t ioset; uintptr_t regaddr; unsigned int index; diff --git a/arch/arm/src/imx6/imx_lowputc.c b/arch/arm/src/imx6/imx_lowputc.c index 3383820bc3..1fbfe96fb1 100644 --- a/arch/arm/src/imx6/imx_lowputc.c +++ b/arch/arm/src/imx6/imx_lowputc.c @@ -287,7 +287,7 @@ void imx_lowsetup(void) ****************************************************************************/ #ifdef IMX_HAVE_UART -int imx_uart_configure(uint32_t base, FAR const struct uart_config_s *config) +int imx_uart_configure(uint32_t base, const struct uart_config_s *config) { #ifndef CONFIG_SUPPRESS_UART_CONFIG uint64_t tmp; diff --git a/arch/arm/src/imx6/imx_lowputc.h b/arch/arm/src/imx6/imx_lowputc.h index df81bc86d1..4783403862 100644 --- a/arch/arm/src/imx6/imx_lowputc.h +++ b/arch/arm/src/imx6/imx_lowputc.h @@ -78,7 +78,7 @@ void imx_lowsetup(void); #ifdef IMX_HAVE_UART int imx_uart_configure(uint32_t base, - FAR const struct uart_config_s *config); + const struct uart_config_s *config); #endif /**************************************************************************** diff --git a/arch/arm/src/imx6/imx_pgalloc.c b/arch/arm/src/imx6/imx_pgalloc.c index 393661989d..bc4a171180 100644 --- a/arch/arm/src/imx6/imx_pgalloc.c +++ b/arch/arm/src/imx6/imx_pgalloc.c @@ -92,11 +92,11 @@ * ****************************************************************************/ -void up_allocate_pgheap(FAR void **heap_start, size_t *heap_size) +void up_allocate_pgheap(void **heap_start, size_t *heap_size) { DEBUGASSERT(heap_start && heap_size); - *heap_start = (FAR void *)((uintptr_t)IMX_MMDCDDR_PSECTION + + *heap_start = (void *)((uintptr_t)IMX_MMDCDDR_PSECTION + CONFIG_IMX6_DDRCS_PGHEAP_OFFSET); *heap_size = CONFIG_IMX6_DDRCS_PGHEAP_SIZE; } diff --git a/arch/arm/src/imx6/imx_serial.c b/arch/arm/src/imx6/imx_serial.c index 07f9b41dc6..109a398965 100644 --- a/arch/arm/src/imx6/imx_serial.c +++ b/arch/arm/src/imx6/imx_serial.c @@ -222,7 +222,7 @@ static int imx_setup(struct uart_dev_s *dev); static void imx_shutdown(struct uart_dev_s *dev); static int imx_attach(struct uart_dev_s *dev); static void imx_detach(struct uart_dev_s *dev); -static int imx_interrupt(int irq, void *context, FAR void *arg); +static int imx_interrupt(int irq, void *context, void *arg); static int imx_ioctl(struct file *filep, int cmd, unsigned long arg); static int imx_receive(struct uart_dev_s *dev, unsigned int *status); static void imx_rxint(struct uart_dev_s *dev, bool enable); @@ -631,7 +631,7 @@ static void imx_detach(struct uart_dev_s *dev) * ****************************************************************************/ -static int imx_interrupt(int irq, void *context, FAR void *arg) +static int imx_interrupt(int irq, void *context, void *arg) { struct uart_dev_s *dev = (struct uart_dev_s *)arg; struct imx_uart_s *priv; diff --git a/arch/arm/src/imx6/imx_timerisr.c b/arch/arm/src/imx6/imx_timerisr.c index b429eb5533..682842cb3a 100644 --- a/arch/arm/src/imx6/imx_timerisr.c +++ b/arch/arm/src/imx6/imx_timerisr.c @@ -118,7 +118,7 @@ static void imx_output_compare(uint32_t sr, uint32_t of) * ****************************************************************************/ -static int imx_timerisr(int irq, uint32_t *regs, FAR void *arg) +static int imx_timerisr(int irq, uint32_t *regs, void *arg) { /* Sample the SR (once) */ diff --git a/arch/arm/src/imxrt/imxrt_adc.c b/arch/arm/src/imxrt/imxrt_adc.c index a6d7fbeb16..32e33d9e22 100644 --- a/arch/arm/src/imxrt/imxrt_adc.c +++ b/arch/arm/src/imxrt/imxrt_adc.c @@ -64,36 +64,36 @@ struct imxrt_dev_s { - FAR const struct adc_callback_s *cb; /* Upper driver callback */ - uint8_t intf; /* ADC number (i.e. ADC1, ADC2) */ - uint32_t base; /* ADC register base */ - uint8_t initialized; /* ADC initialization counter */ - int irq; /* ADC IRQ number */ - int nchannels; /* Number of configured ADC channels */ - uint8_t chanlist[ADC_MAX_CHANNELS]; /* ADC channel list */ - uint8_t current; /* Current channel being converted */ + const struct adc_callback_s *cb; /* Upper driver callback */ + uint8_t intf; /* ADC number (i.e. ADC1, ADC2) */ + uint32_t base; /* ADC register base */ + uint8_t initialized; /* ADC initialization counter */ + int irq; /* ADC IRQ number */ + int nchannels; /* Number of configured ADC channels */ + uint8_t chanlist[ADC_MAX_CHANNELS]; /* ADC channel list */ + uint8_t current; /* Current channel being converted */ }; /**************************************************************************** * Private Function Prototypes ****************************************************************************/ -static void adc_putreg(FAR struct imxrt_dev_s *priv, uint32_t offset, +static void adc_putreg(struct imxrt_dev_s *priv, uint32_t offset, uint32_t value); -static uint32_t adc_getreg(FAR struct imxrt_dev_s *priv, uint32_t offset); -static void adc_modifyreg(FAR struct imxrt_dev_s *priv, uint32_t offset, +static uint32_t adc_getreg(struct imxrt_dev_s *priv, uint32_t offset); +static void adc_modifyreg(struct imxrt_dev_s *priv, uint32_t offset, uint32_t clearbits, uint32_t setbits); /* ADC methods */ -static int adc_bind(FAR struct adc_dev_s *dev, - FAR const struct adc_callback_s *callback); -static void adc_reset(FAR struct adc_dev_s *dev); -static int adc_setup(FAR struct adc_dev_s *dev); -static void adc_shutdown(FAR struct adc_dev_s *dev); -static void adc_rxint(FAR struct adc_dev_s *dev, bool enable); -static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg); -static int adc_interrupt(int irq, void *context, FAR void *arg); +static int adc_bind(struct adc_dev_s *dev, + const struct adc_callback_s *callback); +static void adc_reset(struct adc_dev_s *dev); +static int adc_setup(struct adc_dev_s *dev); +static void adc_shutdown(struct adc_dev_s *dev); +static void adc_rxint(struct adc_dev_s *dev, bool enable); +static int adc_ioctl(struct adc_dev_s *dev, int cmd, unsigned long arg); +static int adc_interrupt(int irq, void *context, void *arg); /**************************************************************************** * Private Data @@ -185,18 +185,18 @@ gpio_pinset_t g_adcpinlist2[ADC_MAX_CHANNELS] = * Private Functions ****************************************************************************/ -static void adc_putreg(FAR struct imxrt_dev_s *priv, uint32_t offset, +static void adc_putreg(struct imxrt_dev_s *priv, uint32_t offset, uint32_t value) { putreg32(value, priv->base + offset); } -static uint32_t adc_getreg(FAR struct imxrt_dev_s *priv, uint32_t offset) +static uint32_t adc_getreg(struct imxrt_dev_s *priv, uint32_t offset) { return getreg32(priv->base + offset); } -static void adc_modifyreg(FAR struct imxrt_dev_s *priv, uint32_t offset, +static void adc_modifyreg(struct imxrt_dev_s *priv, uint32_t offset, uint32_t clearbits, uint32_t setbits) { modifyreg32(priv->base + offset, clearbits, setbits); @@ -211,10 +211,10 @@ static void adc_modifyreg(FAR struct imxrt_dev_s *priv, uint32_t offset, * ****************************************************************************/ -static int adc_bind(FAR struct adc_dev_s *dev, - FAR const struct adc_callback_s *callback) +static int adc_bind(struct adc_dev_s *dev, + const struct adc_callback_s *callback) { - FAR struct imxrt_dev_s *priv = (FAR struct imxrt_dev_s *)dev->ad_priv; + struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev->ad_priv; DEBUGASSERT(priv != NULL); priv->cb = callback; @@ -230,9 +230,9 @@ static int adc_bind(FAR struct adc_dev_s *dev, * ****************************************************************************/ -static void adc_reset(FAR struct adc_dev_s *dev) +static void adc_reset(struct adc_dev_s *dev) { - FAR struct imxrt_dev_s *priv = (FAR struct imxrt_dev_s *)dev->ad_priv; + struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev->ad_priv; irqstate_t flags; flags = enter_critical_section(); @@ -350,9 +350,9 @@ exit_leave_critical: * ****************************************************************************/ -static int adc_setup(FAR struct adc_dev_s *dev) +static int adc_setup(struct adc_dev_s *dev) { - FAR struct imxrt_dev_s *priv = (FAR struct imxrt_dev_s *)dev->ad_priv; + struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev->ad_priv; /* Do nothing when the ADC device is already set up */ @@ -390,9 +390,9 @@ static int adc_setup(FAR struct adc_dev_s *dev) * ****************************************************************************/ -static void adc_shutdown(FAR struct adc_dev_s *dev) +static void adc_shutdown(struct adc_dev_s *dev) { - FAR struct imxrt_dev_s *priv = (FAR struct imxrt_dev_s *)dev->ad_priv; + struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev->ad_priv; /* Shutdown the ADC device only when not in use */ @@ -426,9 +426,9 @@ static void adc_shutdown(FAR struct adc_dev_s *dev) * ****************************************************************************/ -static void adc_rxint(FAR struct adc_dev_s *dev, bool enable) +static void adc_rxint(struct adc_dev_s *dev, bool enable) { - FAR struct imxrt_dev_s *priv = (FAR struct imxrt_dev_s *)dev->ad_priv; + struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev->ad_priv; if (enable) { @@ -455,11 +455,11 @@ static void adc_rxint(FAR struct adc_dev_s *dev, bool enable) * ****************************************************************************/ -static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg) +static int adc_ioctl(struct adc_dev_s *dev, int cmd, unsigned long arg) { /* TODO: ANIOC_TRIGGER, for SW triggered conversion */ - FAR struct imxrt_dev_s *priv = (FAR struct imxrt_dev_s *)dev->ad_priv; + struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev->ad_priv; int ret = -ENOTTY; switch (cmd) @@ -491,10 +491,10 @@ static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg) * ****************************************************************************/ -static int adc_interrupt(int irq, void *context, FAR void *arg) +static int adc_interrupt(int irq, void *context, void *arg) { - FAR struct adc_dev_s *dev = (FAR struct adc_dev_s *)arg; - FAR struct imxrt_dev_s *priv = (FAR struct imxrt_dev_s *)dev->ad_priv; + struct adc_dev_s *dev = (struct adc_dev_s *)arg; + struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev->ad_priv; int32_t data; if ((adc_getreg(priv, IMXRT_ADC_HS_OFFSET) & ADC_HS_COCO0) != 0) @@ -553,12 +553,12 @@ static int adc_interrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -FAR struct adc_dev_s *imxrt_adcinitialize(int intf, - FAR const uint8_t *chanlist, - int nchannels) +struct adc_dev_s *imxrt_adcinitialize(int intf, + const uint8_t *chanlist, + int nchannels) { - FAR struct adc_dev_s *dev; - FAR struct imxrt_dev_s *priv; + struct adc_dev_s *dev; + struct imxrt_dev_s *priv; DEBUGASSERT(nchannels > 0); @@ -587,7 +587,7 @@ FAR struct adc_dev_s *imxrt_adcinitialize(int intf, } } - priv = (FAR struct imxrt_dev_s *)dev->ad_priv; + priv = (struct imxrt_dev_s *)dev->ad_priv; priv->nchannels = nchannels; memcpy(priv->chanlist, chanlist, nchannels); diff --git a/arch/arm/src/imxrt/imxrt_adc.h b/arch/arm/src/imxrt/imxrt_adc.h index 135c06f151..43eb258115 100644 --- a/arch/arm/src/imxrt/imxrt_adc.h +++ b/arch/arm/src/imxrt/imxrt_adc.h @@ -67,9 +67,9 @@ extern "C" ****************************************************************************/ #ifdef CONFIG_IMXRT_ADC -FAR struct adc_dev_s *imxrt_adcinitialize(int intf, - FAR const uint8_t *chanlist, - int nchannels); +struct adc_dev_s *imxrt_adcinitialize(int intf, + const uint8_t *chanlist, + int nchannels); #endif #undef EXTERN diff --git a/arch/arm/src/imxrt/imxrt_allocateheap.c b/arch/arm/src/imxrt/imxrt_allocateheap.c index e925a0141c..4fda5dc729 100644 --- a/arch/arm/src/imxrt/imxrt_allocateheap.c +++ b/arch/arm/src/imxrt/imxrt_allocateheap.c @@ -295,9 +295,9 @@ const uintptr_t g_idle_topstack = (uintptr_t)&_ebss + ****************************************************************************/ #ifdef CONFIG_BUILD_KERNEL -void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) +void up_allocate_kheap(void **heap_start, size_t *heap_size) #else -void up_allocate_heap(FAR void **heap_start, size_t *heap_size) +void up_allocate_heap(void **heap_start, size_t *heap_size) #endif { #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) @@ -315,14 +315,14 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) /* Return the user-space heap settings */ board_autoled_on(LED_HEAPALLOCATE); - *heap_start = (FAR void *)ubase; + *heap_start = (void *)ubase; *heap_size = usize; #else /* Return the heap settings */ board_autoled_on(LED_HEAPALLOCATE); - *heap_start = (FAR void *)g_idle_topstack; + *heap_start = (void *)g_idle_topstack; *heap_size = PRIMARY_RAM_END - g_idle_topstack; #endif } @@ -339,7 +339,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) ****************************************************************************/ #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) -void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) +void up_allocate_kheap(void **heap_start, size_t *heap_size) { /* Get the unaligned size and position of the user-space heap. * This heap begins after the user-space .bss section at an offset @@ -354,7 +354,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) * that was not dedicated to the user heap). */ - *heap_start = (FAR void *)USERSPACE->us_bssend; + *heap_start = (void *)USERSPACE->us_bssend; *heap_size = ubase - (uintptr_t)USERSPACE->us_bssend; } #endif @@ -373,7 +373,7 @@ void arm_addregion(void) { /* Add region 1 to the user heap */ - kumm_addregion((FAR void *)REGION1_RAM_START, REGION1_RAM_SIZE); + kumm_addregion((void *)REGION1_RAM_START, REGION1_RAM_SIZE); #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) /* Allow user-mode access to region 1 */ @@ -384,7 +384,7 @@ void arm_addregion(void) #if CONFIG_MM_REGIONS > 2 /* Add region 2 to the user heap */ - kumm_addregion((FAR void *)REGION2_RAM_START, REGION2_RAM_SIZE); + kumm_addregion((void *)REGION2_RAM_START, REGION2_RAM_SIZE); #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) /* Allow user-mode access to region 2 */ diff --git a/arch/arm/src/imxrt/imxrt_edma.c b/arch/arm/src/imxrt/imxrt_edma.c index aa0a10bc9e..3ee1fe8a8c 100644 --- a/arch/arm/src/imxrt/imxrt_edma.c +++ b/arch/arm/src/imxrt/imxrt_edma.c @@ -625,7 +625,7 @@ static void imxrt_dmach_interrupt(struct imxrt_dmach_s *dmach) * ****************************************************************************/ -static int imxrt_edma_interrupt(int irq, void *context, FAR void *arg) +static int imxrt_edma_interrupt(int irq, void *context, void *arg) { struct imxrt_dmach_s *dmach; unsigned int chan; @@ -664,7 +664,7 @@ static int imxrt_edma_interrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -static int imxrt_error_interrupt(int irq, void *context, FAR void *arg) +static int imxrt_error_interrupt(int irq, void *context, void *arg) { uint32_t errstatus; uint32_t errmask; diff --git a/arch/arm/src/imxrt/imxrt_edma.h b/arch/arm/src/imxrt/imxrt_edma.h index 4772593daa..04e5fce1f8 100644 --- a/arch/arm/src/imxrt/imxrt_edma.h +++ b/arch/arm/src/imxrt/imxrt_edma.h @@ -125,7 +125,7 @@ * Public Types ****************************************************************************/ -typedef FAR void *DMACH_HANDLE; +typedef void *DMACH_HANDLE; typedef void (*edma_callback_t)(DMACH_HANDLE handle, void *arg, bool done, int result); diff --git a/arch/arm/src/imxrt/imxrt_ehci.c b/arch/arm/src/imxrt/imxrt_ehci.c index 1bf8bb6aaa..9a7e0be44c 100644 --- a/arch/arm/src/imxrt/imxrt_ehci.c +++ b/arch/arm/src/imxrt/imxrt_ehci.c @@ -376,7 +376,7 @@ struct imxrt_ehci_trace_s uint16_t id; bool fmt2; #endif - FAR const char *string; + const char *string; }; #endif /* HAVE_USBHOST_TRACE */ @@ -490,7 +490,7 @@ static ssize_t imxrt_transfer_wait(struct imxrt_epinfo_s *epinfo); #ifdef CONFIG_USBHOST_ASYNCH static inline int imxrt_ioc_async_setup(struct imxrt_rhport_s *rhport, struct imxrt_epinfo_s *epinfo, usbhost_asynch_t callback, - FAR void *arg); + void *arg); static void imxrt_asynch_completion(struct imxrt_epinfo_s *epinfo); #endif @@ -509,55 +509,55 @@ static inline void imxrt_ioc_bottomhalf(void); static inline void imxrt_portsc_bottomhalf(void); static inline void imxrt_syserr_bottomhalf(void); static inline void imxrt_async_advance_bottomhalf(void); -static void imxrt_ehci_bottomhalf(FAR void *arg); -static int imxrt_ehci_interrupt(int irq, FAR void *context, FAR void *arg); +static void imxrt_ehci_bottomhalf(void *arg); +static int imxrt_ehci_interrupt(int irq, void *context, void *arg); /* USB Host Controller Operations *******************************************/ -static int imxrt_wait(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s **hport); -static int imxrt_rh_enumerate(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport); -static int imxrt_enumerate(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport); +static int imxrt_wait(struct usbhost_connection_s *conn, + struct usbhost_hubport_s **hport); +static int imxrt_rh_enumerate(struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport); +static int imxrt_enumerate(struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport); -static int imxrt_ep0configure(FAR struct usbhost_driver_s *drvr, +static int imxrt_ep0configure(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, uint8_t funcaddr, uint8_t speed, uint16_t maxpacketsize); -static int imxrt_epalloc(FAR struct usbhost_driver_s *drvr, - FAR const struct usbhost_epdesc_s *epdesc, - FAR usbhost_ep_t *ep); -static int imxrt_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep); -static int imxrt_alloc(FAR struct usbhost_driver_s *drvr, - FAR uint8_t **buffer, FAR size_t *maxlen); -static int imxrt_free(FAR struct usbhost_driver_s *drvr, - FAR uint8_t *buffer); -static int imxrt_ioalloc(FAR struct usbhost_driver_s *drvr, - FAR uint8_t **buffer, size_t buflen); -static int imxrt_iofree(FAR struct usbhost_driver_s *drvr, - FAR uint8_t *buffer); -static int imxrt_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, - FAR const struct usb_ctrlreq_s *req, - FAR uint8_t *buffer); -static int imxrt_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, - FAR const struct usb_ctrlreq_s *req, - FAR const uint8_t *buffer); -static ssize_t imxrt_transfer(FAR struct usbhost_driver_s *drvr, - usbhost_ep_t ep, FAR uint8_t *buffer, +static int imxrt_epalloc(struct usbhost_driver_s *drvr, + const struct usbhost_epdesc_s *epdesc, + usbhost_ep_t *ep); +static int imxrt_epfree(struct usbhost_driver_s *drvr, usbhost_ep_t ep); +static int imxrt_alloc(struct usbhost_driver_s *drvr, + uint8_t **buffer, size_t *maxlen); +static int imxrt_free(struct usbhost_driver_s *drvr, + uint8_t *buffer); +static int imxrt_ioalloc(struct usbhost_driver_s *drvr, + uint8_t **buffer, size_t buflen); +static int imxrt_iofree(struct usbhost_driver_s *drvr, + uint8_t *buffer); +static int imxrt_ctrlin(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, + const struct usb_ctrlreq_s *req, + uint8_t *buffer); +static int imxrt_ctrlout(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, + const struct usb_ctrlreq_s *req, + const uint8_t *buffer); +static ssize_t imxrt_transfer(struct usbhost_driver_s *drvr, + usbhost_ep_t ep, uint8_t *buffer, size_t buflen); #ifdef CONFIG_USBHOST_ASYNCH -static int imxrt_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, - FAR uint8_t *buffer, size_t buflen, - usbhost_asynch_t callback, FAR void *arg); +static int imxrt_asynch(struct usbhost_driver_s *drvr, usbhost_ep_t ep, + uint8_t *buffer, size_t buflen, + usbhost_asynch_t callback, void *arg); #endif -static int imxrt_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep); +static int imxrt_cancel(struct usbhost_driver_s *drvr, usbhost_ep_t ep); #ifdef CONFIG_USBHOST_HUB -static int imxrt_connect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport, +static int imxrt_connect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport, bool connected); #endif -static void imxrt_disconnect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport); +static void imxrt_disconnect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport); /* Initialization ***********************************************************/ @@ -2649,7 +2649,7 @@ static ssize_t imxrt_transfer_wait(struct imxrt_epinfo_s *epinfo) static inline int imxrt_ioc_async_setup(struct imxrt_rhport_s *rhport, struct imxrt_epinfo_s *epinfo, usbhost_asynch_t callback, - FAR void *arg) + void *arg) { irqstate_t flags; int ret = -ENODEV; @@ -3321,7 +3321,7 @@ static inline void imxrt_async_advance_bottomhalf(void) * ****************************************************************************/ -static void imxrt_ehci_bottomhalf(FAR void *arg) +static void imxrt_ehci_bottomhalf(void *arg) { uint32_t pending = (uint32_t)arg; @@ -3458,7 +3458,7 @@ static void imxrt_ehci_bottomhalf(FAR void *arg) * ****************************************************************************/ -static int imxrt_ehci_interrupt(int irq, FAR void *context, FAR void *arg) +static int imxrt_ehci_interrupt(int irq, void *context, void *arg) { uint32_t usbsts; uint32_t pending; @@ -3490,7 +3490,7 @@ static int imxrt_ehci_interrupt(int irq, FAR void *context, FAR void *arg) DEBUGASSERT(work_available(&g_ehci.work)); DEBUGVERIFY(work_queue(HPWORK, &g_ehci.work, imxrt_ehci_bottomhalf, - (FAR void *)pending, 0)); + (void *)pending, 0)); /* Disable further EHCI interrupts so that we do not overrun the work * queue. @@ -3533,8 +3533,8 @@ static int imxrt_ehci_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static int imxrt_wait(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s **hport) +static int imxrt_wait(struct usbhost_connection_s *conn, + struct usbhost_hubport_s **hport) { irqstate_t flags; int rhpndx; @@ -3636,8 +3636,8 @@ static int imxrt_wait(FAR struct usbhost_connection_s *conn, * ****************************************************************************/ -static int imxrt_rh_enumerate(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport) +static int imxrt_rh_enumerate(struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport) { struct imxrt_rhport_s *rhport; volatile uint32_t *regaddr; @@ -3854,8 +3854,8 @@ static int imxrt_rh_enumerate(FAR struct usbhost_connection_s *conn, return OK; } -static int imxrt_enumerate(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport) +static int imxrt_enumerate(struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport) { int ret; @@ -3924,7 +3924,7 @@ static int imxrt_enumerate(FAR struct usbhost_connection_s *conn, * ****************************************************************************/ -static int imxrt_ep0configure(FAR struct usbhost_driver_s *drvr, +static int imxrt_ep0configure(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, uint8_t funcaddr, uint8_t speed, uint16_t maxpacketsize) { @@ -3972,9 +3972,9 @@ static int imxrt_ep0configure(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int imxrt_epalloc(FAR struct usbhost_driver_s *drvr, - FAR const struct usbhost_epdesc_s *epdesc, - FAR usbhost_ep_t *ep) +static int imxrt_epalloc(struct usbhost_driver_s *drvr, + const struct usbhost_epdesc_s *epdesc, + usbhost_ep_t *ep) { struct imxrt_epinfo_s *epinfo; struct usbhost_hubport_s *hport; @@ -4058,7 +4058,7 @@ static int imxrt_epalloc(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int imxrt_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) +static int imxrt_epfree(struct usbhost_driver_s *drvr, usbhost_ep_t ep) { struct imxrt_epinfo_s *epinfo = (struct imxrt_epinfo_s *)ep; @@ -4105,8 +4105,8 @@ static int imxrt_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) * ****************************************************************************/ -static int imxrt_alloc(FAR struct usbhost_driver_s *drvr, - FAR uint8_t **buffer, FAR size_t *maxlen) +static int imxrt_alloc(struct usbhost_driver_s *drvr, + uint8_t **buffer, size_t *maxlen) { int ret = -ENOMEM; DEBUGASSERT(drvr && buffer && maxlen); @@ -4116,8 +4116,8 @@ static int imxrt_alloc(FAR struct usbhost_driver_s *drvr, * multiple of the cache line size in length. */ - *buffer = (FAR uint8_t *)kmm_memalign(ARMV7M_DCACHE_LINESIZE, - IMXRT_EHCI_BUFSIZE); + *buffer = (uint8_t *)kmm_memalign(ARMV7M_DCACHE_LINESIZE, + IMXRT_EHCI_BUFSIZE); if (*buffer) { *maxlen = IMXRT_EHCI_BUFSIZE; @@ -4151,7 +4151,7 @@ static int imxrt_alloc(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int imxrt_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer) +static int imxrt_free(struct usbhost_driver_s *drvr, uint8_t *buffer) { DEBUGASSERT(drvr && buffer); @@ -4192,8 +4192,8 @@ static int imxrt_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer) * ****************************************************************************/ -static int imxrt_ioalloc(FAR struct usbhost_driver_s *drvr, - FAR uint8_t **buffer, size_t buflen) +static int imxrt_ioalloc(struct usbhost_driver_s *drvr, + uint8_t **buffer, size_t buflen) { DEBUGASSERT(drvr && buffer && buflen > 0); @@ -4204,7 +4204,7 @@ static int imxrt_ioalloc(FAR struct usbhost_driver_s *drvr, */ buflen = (buflen + DCACHE_LINEMASK) & ~DCACHE_LINEMASK; - *buffer = (FAR uint8_t *)kumm_memalign(ARMV7M_DCACHE_LINESIZE, buflen); + *buffer = (uint8_t *)kumm_memalign(ARMV7M_DCACHE_LINESIZE, buflen); return *buffer ? OK : -ENOMEM; } @@ -4231,8 +4231,8 @@ static int imxrt_ioalloc(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int imxrt_iofree(FAR struct usbhost_driver_s *drvr, - FAR uint8_t *buffer) +static int imxrt_iofree(struct usbhost_driver_s *drvr, + uint8_t *buffer) { DEBUGASSERT(drvr && buffer); @@ -4278,9 +4278,9 @@ static int imxrt_iofree(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int imxrt_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, - FAR const struct usb_ctrlreq_s *req, - FAR uint8_t *buffer) +static int imxrt_ctrlin(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, + const struct usb_ctrlreq_s *req, + uint8_t *buffer) { struct imxrt_rhport_s *rhport = (struct imxrt_rhport_s *)drvr; struct imxrt_epinfo_s *ep0info = (struct imxrt_epinfo_s *)ep0; @@ -4344,9 +4344,9 @@ errout_with_sem: return ret; } -static int imxrt_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, - FAR const struct usb_ctrlreq_s *req, - FAR const uint8_t *buffer) +static int imxrt_ctrlout(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, + const struct usb_ctrlreq_s *req, + const uint8_t *buffer) { /* imxrt_ctrlin can handle both directions. We just need to work around * the differences in the function signatures. @@ -4394,8 +4394,8 @@ static int imxrt_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, * ****************************************************************************/ -static ssize_t imxrt_transfer(FAR struct usbhost_driver_s *drvr, - usbhost_ep_t ep, FAR uint8_t *buffer, +static ssize_t imxrt_transfer(struct usbhost_driver_s *drvr, + usbhost_ep_t ep, uint8_t *buffer, size_t buflen) { struct imxrt_rhport_s *rhport = (struct imxrt_rhport_s *)drvr; @@ -4509,9 +4509,9 @@ errout_with_sem: ****************************************************************************/ #ifdef CONFIG_USBHOST_ASYNCH -static int imxrt_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, - FAR uint8_t *buffer, size_t buflen, - usbhost_asynch_t callback, FAR void *arg) +static int imxrt_asynch(struct usbhost_driver_s *drvr, usbhost_ep_t ep, + uint8_t *buffer, size_t buflen, + usbhost_asynch_t callback, void *arg) { struct imxrt_rhport_s *rhport = (struct imxrt_rhport_s *)drvr; struct imxrt_epinfo_s *epinfo = (struct imxrt_epinfo_s *)ep; @@ -4603,7 +4603,7 @@ errout_with_sem: * ****************************************************************************/ -static int imxrt_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) +static int imxrt_cancel(struct usbhost_driver_s *drvr, usbhost_ep_t ep) { struct imxrt_epinfo_s *epinfo = (struct imxrt_epinfo_s *)ep; struct imxrt_qh_s *qh; @@ -4808,8 +4808,8 @@ errout_with_sem: ****************************************************************************/ #ifdef CONFIG_USBHOST_HUB -static int imxrt_connect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport, +static int imxrt_connect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport, bool connected) { irqstate_t flags; @@ -4863,8 +4863,8 @@ static int imxrt_connect(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static void imxrt_disconnect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport) +static void imxrt_disconnect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport) { DEBUGASSERT(hport != NULL); hport->devclass = NULL; @@ -5018,9 +5018,9 @@ static int imxrt_reset(void) * ****************************************************************************/ -FAR struct usbhost_connection_s *imxrt_ehci_initialize(int controller) +struct usbhost_connection_s *imxrt_ehci_initialize(int controller) { - FAR struct usbhost_hubport_s *hport; + struct usbhost_hubport_s *hport; uint32_t regval; # if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_INFO) uint16_t regval16; @@ -5429,7 +5429,7 @@ FAR struct usbhost_connection_s *imxrt_ehci_initialize(int controller) ****************************************************************************/ #ifdef HAVE_USBHOST_TRACE -FAR const char *usbhost_trformat1(uint16_t id) +const char *usbhost_trformat1(uint16_t id) { int ndx = TRACE1_INDEX(id); @@ -5441,7 +5441,7 @@ FAR const char *usbhost_trformat1(uint16_t id) return NULL; } -FAR const char *usbhost_trformat2(uint16_t id) +const char *usbhost_trformat2(uint16_t id) { int ndx = TRACE2_INDEX(id); diff --git a/arch/arm/src/imxrt/imxrt_ehci.h b/arch/arm/src/imxrt/imxrt_ehci.h index dc4f6ef1c5..db2072c4c5 100644 --- a/arch/arm/src/imxrt/imxrt_ehci.h +++ b/arch/arm/src/imxrt/imxrt_ehci.h @@ -122,7 +122,7 @@ extern int imxrt_setup_overcurrent(xcpt_t handler, void *arg); #if defined(CONFIG_IMXRT_USBOTG) && defined(CONFIG_USBHOST) struct usbhost_connection_s; -FAR struct usbhost_connection_s *imxrt_ehci_initialize(int controller); +struct usbhost_connection_s *imxrt_ehci_initialize(int controller); #endif #undef EXTERN diff --git a/arch/arm/src/imxrt/imxrt_enc.c b/arch/arm/src/imxrt/imxrt_enc.c index 0274c30be9..a0a9a53ea0 100644 --- a/arch/arm/src/imxrt/imxrt_enc.c +++ b/arch/arm/src/imxrt/imxrt_enc.c @@ -273,14 +273,14 @@ struct imxrt_enc_lowerhalf_s * half callback structure: */ - FAR const struct qe_ops_s *ops; /* Lower half callback structure */ + const struct qe_ops_s *ops; /* Lower half callback structure */ /* IMXRT driver-specific fields: */ - FAR const struct imxrt_qeconfig_s *config; /* static configuration */ - sem_t sem_excl; /* Mutual exclusion semaphore to - * ensure atomic 32-bit reads. - */ + const struct imxrt_qeconfig_s *config; /* static configuration */ + sem_t sem_excl; /* Mutual exclusion semaphore to + * ensure atomic 32-bit reads. + */ }; /**************************************************************************** @@ -290,41 +290,41 @@ struct imxrt_enc_lowerhalf_s /* Helper functions */ static inline uint16_t imxrt_enc_getreg16 - (FAR struct imxrt_enc_lowerhalf_s *priv, int offset); -static inline void imxrt_enc_putreg16(FAR struct imxrt_enc_lowerhalf_s *priv, + (struct imxrt_enc_lowerhalf_s *priv, int offset); +static inline void imxrt_enc_putreg16(struct imxrt_enc_lowerhalf_s *priv, int offset, uint16_t value); static inline void imxrt_enc_modifyreg16 - (FAR struct imxrt_enc_lowerhalf_s *priv, int offset, + (struct imxrt_enc_lowerhalf_s *priv, int offset, uint16_t clearbits, uint16_t setbits); static void imxrt_enc_clock_enable (uint32_t base); static void imxrt_enc_clock_disable (uint32_t base); -static inline int imxrt_enc_sem_wait(FAR struct imxrt_enc_lowerhalf_s *priv); +static inline int imxrt_enc_sem_wait(struct imxrt_enc_lowerhalf_s *priv); static inline void imxrt_enc_sem_post - (FAR struct imxrt_enc_lowerhalf_s *priv); + (struct imxrt_enc_lowerhalf_s *priv); -static int imxrt_enc_reconfig(FAR struct imxrt_enc_lowerhalf_s *priv, +static int imxrt_enc_reconfig(struct imxrt_enc_lowerhalf_s *priv, uint16_t args); -static void imxrt_enc_set_initial_val(FAR struct imxrt_enc_lowerhalf_s *priv, +static void imxrt_enc_set_initial_val(struct imxrt_enc_lowerhalf_s *priv, uint32_t value); -static void imxrt_enc_modulo_enable(FAR struct imxrt_enc_lowerhalf_s *priv, +static void imxrt_enc_modulo_enable(struct imxrt_enc_lowerhalf_s *priv, uint32_t modulus); -static void imxrt_enc_modulo_disable(FAR struct imxrt_enc_lowerhalf_s *priv); +static void imxrt_enc_modulo_disable(struct imxrt_enc_lowerhalf_s *priv); #ifdef CONFIG_DEBUG_SENSORS -static int imxrt_enc_test_gen(FAR struct imxrt_enc_lowerhalf_s *priv, +static int imxrt_enc_test_gen(struct imxrt_enc_lowerhalf_s *priv, uint16_t value); #endif /* Lower-half Quadrature Encoder Driver Methods */ -static int imxrt_setup(FAR struct qe_lowerhalf_s *lower); -static int imxrt_shutdown(FAR struct qe_lowerhalf_s *lower); -static int imxrt_position(FAR struct qe_lowerhalf_s *lower, - FAR int32_t *pos); -static int imxrt_reset(FAR struct qe_lowerhalf_s *lower); -static int imxrt_ioctl(FAR struct qe_lowerhalf_s *lower, int cmd, +static int imxrt_setup(struct qe_lowerhalf_s *lower); +static int imxrt_shutdown(struct qe_lowerhalf_s *lower); +static int imxrt_position(struct qe_lowerhalf_s *lower, + int32_t *pos); +static int imxrt_reset(struct qe_lowerhalf_s *lower); +static int imxrt_ioctl(struct qe_lowerhalf_s *lower, int cmd, unsigned long arg); /**************************************************************************** @@ -471,7 +471,7 @@ static struct imxrt_enc_lowerhalf_s imxrt_enc4_priv = ****************************************************************************/ static inline uint16_t imxrt_enc_getreg16 - (FAR struct imxrt_enc_lowerhalf_s *priv, int offset) + (struct imxrt_enc_lowerhalf_s *priv, int offset) { return getreg16(priv->config->base + offset); } @@ -484,7 +484,7 @@ static inline uint16_t imxrt_enc_getreg16 * ****************************************************************************/ -static inline void imxrt_enc_putreg16(FAR struct imxrt_enc_lowerhalf_s *priv, +static inline void imxrt_enc_putreg16(struct imxrt_enc_lowerhalf_s *priv, int offset, uint16_t value) { putreg16(value, priv->config->base + offset); @@ -499,7 +499,7 @@ static inline void imxrt_enc_putreg16(FAR struct imxrt_enc_lowerhalf_s *priv, ****************************************************************************/ static inline void imxrt_enc_modifyreg16 - (FAR struct imxrt_enc_lowerhalf_s *priv, int offset, + (struct imxrt_enc_lowerhalf_s *priv, int offset, uint16_t clearbits, uint16_t setbits) { modifyreg16(priv->config->base + offset, clearbits, setbits); @@ -577,7 +577,7 @@ void imxrt_enc_clock_disable(uint32_t base) * ****************************************************************************/ -static inline int imxrt_enc_sem_wait(FAR struct imxrt_enc_lowerhalf_s *priv) +static inline int imxrt_enc_sem_wait(struct imxrt_enc_lowerhalf_s *priv) { return nxsem_wait_uninterruptible(&priv->sem_excl); } @@ -611,7 +611,7 @@ static inline void imxrt_enc_sem_post(struct imxrt_enc_lowerhalf_s *priv) * ****************************************************************************/ -static int imxrt_enc_reconfig(FAR struct imxrt_enc_lowerhalf_s *priv, +static int imxrt_enc_reconfig(struct imxrt_enc_lowerhalf_s *priv, uint16_t args) { uint16_t clear = 0; @@ -708,7 +708,7 @@ static int imxrt_enc_reconfig(FAR struct imxrt_enc_lowerhalf_s *priv, * ****************************************************************************/ -static void imxrt_enc_set_initial_val(FAR struct imxrt_enc_lowerhalf_s *priv, +static void imxrt_enc_set_initial_val(struct imxrt_enc_lowerhalf_s *priv, uint32_t value) { imxrt_enc_putreg16(priv, IMXRT_ENC_LINIT_OFFSET, value & 0xffff); @@ -727,7 +727,7 @@ static void imxrt_enc_set_initial_val(FAR struct imxrt_enc_lowerhalf_s *priv, * ****************************************************************************/ -static void imxrt_enc_modulo_enable(FAR struct imxrt_enc_lowerhalf_s *priv, +static void imxrt_enc_modulo_enable(struct imxrt_enc_lowerhalf_s *priv, uint32_t modulus) { imxrt_enc_putreg16(priv, IMXRT_ENC_LMOD_OFFSET, modulus & 0xffff); @@ -747,7 +747,7 @@ static void imxrt_enc_modulo_enable(FAR struct imxrt_enc_lowerhalf_s *priv, * ****************************************************************************/ -static void imxrt_enc_modulo_disable(FAR struct imxrt_enc_lowerhalf_s *priv) +static void imxrt_enc_modulo_disable(struct imxrt_enc_lowerhalf_s *priv) { imxrt_enc_modifyreg16(priv, IMXRT_ENC_CTRL2_OFFSET, ENC_CTRL2_MOD, 0); } @@ -772,7 +772,7 @@ static void imxrt_enc_modulo_disable(FAR struct imxrt_enc_lowerhalf_s *priv) * ****************************************************************************/ -static int imxrt_enc_test_gen(FAR struct imxrt_enc_lowerhalf_s *priv, +static int imxrt_enc_test_gen(struct imxrt_enc_lowerhalf_s *priv, uint16_t value) { if (value >> 9) @@ -821,11 +821,11 @@ static int imxrt_enc_test_gen(FAR struct imxrt_enc_lowerhalf_s *priv, * ****************************************************************************/ -static int imxrt_setup(FAR struct qe_lowerhalf_s *lower) +static int imxrt_setup(struct qe_lowerhalf_s *lower) { - FAR struct imxrt_enc_lowerhalf_s *priv = - (FAR struct imxrt_enc_lowerhalf_s *)lower; - FAR const struct imxrt_qeconfig_s *config = priv->config; + struct imxrt_enc_lowerhalf_s *priv = + (struct imxrt_enc_lowerhalf_s *)lower; + const struct imxrt_qeconfig_s *config = priv->config; uint32_t regval; int ret; @@ -895,10 +895,10 @@ static int imxrt_setup(FAR struct qe_lowerhalf_s *lower) * ****************************************************************************/ -static int imxrt_shutdown(FAR struct qe_lowerhalf_s *lower) +static int imxrt_shutdown(struct qe_lowerhalf_s *lower) { - FAR struct imxrt_enc_lowerhalf_s *priv = - (FAR struct imxrt_enc_lowerhalf_s *)lower; + struct imxrt_enc_lowerhalf_s *priv = + (struct imxrt_enc_lowerhalf_s *)lower; int ret; /* Ensure any in-progress operations are done. */ @@ -939,10 +939,10 @@ static int imxrt_shutdown(FAR struct qe_lowerhalf_s *lower) * ****************************************************************************/ -static int imxrt_position(FAR struct qe_lowerhalf_s *lower, FAR int32_t *pos) +static int imxrt_position(struct qe_lowerhalf_s *lower, int32_t *pos) { - FAR struct imxrt_enc_lowerhalf_s *priv = - (FAR struct imxrt_enc_lowerhalf_s *)lower; + struct imxrt_enc_lowerhalf_s *priv = + (struct imxrt_enc_lowerhalf_s *)lower; uint16_t lpos; uint16_t upos; int i; @@ -995,10 +995,10 @@ static int imxrt_position(FAR struct qe_lowerhalf_s *lower, FAR int32_t *pos) * ****************************************************************************/ -static int imxrt_reset(FAR struct qe_lowerhalf_s *lower) +static int imxrt_reset(struct qe_lowerhalf_s *lower) { - FAR struct imxrt_enc_lowerhalf_s *priv = - (FAR struct imxrt_enc_lowerhalf_s *)lower; + struct imxrt_enc_lowerhalf_s *priv = + (struct imxrt_enc_lowerhalf_s *)lower; int ret; /* Write a 1 to the SWIP bit to load UINIT and LINIT into UPOS and LPOS */ @@ -1023,7 +1023,7 @@ static int imxrt_reset(FAR struct qe_lowerhalf_s *lower) * ****************************************************************************/ -static int imxrt_ioctl(FAR struct qe_lowerhalf_s *lower, int cmd, +static int imxrt_ioctl(struct qe_lowerhalf_s *lower, int cmd, unsigned long arg) { struct imxrt_enc_lowerhalf_s *priv = (struct imxrt_enc_lowerhalf_s *)lower; @@ -1089,7 +1089,7 @@ static int imxrt_ioctl(FAR struct qe_lowerhalf_s *lower, int cmd, * ****************************************************************************/ -int imxrt_qeinitialize(FAR const char *devpath, int enc) +int imxrt_qeinitialize(const char *devpath, int enc) { struct imxrt_enc_lowerhalf_s * priv = NULL; @@ -1125,7 +1125,7 @@ int imxrt_qeinitialize(FAR const char *devpath, int enc) /* Register the upper-half driver */ - int ret = qe_register(devpath, (FAR struct qe_lowerhalf_s *)priv); + int ret = qe_register(devpath, (struct qe_lowerhalf_s *)priv); if (ret < 0) { snerr("ERROR: qe_register failed: %d\n", ret); diff --git a/arch/arm/src/imxrt/imxrt_enc.h b/arch/arm/src/imxrt/imxrt_enc.h index e1cd320925..a1d448754f 100644 --- a/arch/arm/src/imxrt/imxrt_enc.h +++ b/arch/arm/src/imxrt/imxrt_enc.h @@ -60,6 +60,6 @@ * ****************************************************************************/ -int imxrt_qeinitialize(FAR const char *devpath, int enc); +int imxrt_qeinitialize(const char *devpath, int enc); #endif /* __ARCH_ARM_SRC_IMXRT_IMXRT_ENC_H */ diff --git a/arch/arm/src/imxrt/imxrt_enet.c b/arch/arm/src/imxrt/imxrt_enet.c index ab27d70afe..df4bf4d820 100644 --- a/arch/arm/src/imxrt/imxrt_enet.c +++ b/arch/arm/src/imxrt/imxrt_enet.c @@ -244,7 +244,7 @@ * the contents of the Ethernet header */ -#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) #define IMXRT_BUF_SIZE ENET_ALIGN_UP(CONFIG_NET_ETH_PKTSIZE + \ CONFIG_NET_GUARDSIZE) @@ -319,25 +319,25 @@ static inline uint16_t imxrt_swap16(uint16_t value); /* Common TX logic */ -static bool imxrt_txringfull(FAR struct imxrt_driver_s *priv); -static int imxrt_transmit(FAR struct imxrt_driver_s *priv); +static bool imxrt_txringfull(struct imxrt_driver_s *priv); +static int imxrt_transmit(struct imxrt_driver_s *priv); static int imxrt_txpoll(struct net_driver_s *dev); /* Interrupt handling */ -static void imxrt_dispatch(FAR struct imxrt_driver_s *priv); -static void imxrt_receive(FAR struct imxrt_driver_s *priv); -static void imxrt_txdone(FAR struct imxrt_driver_s *priv); +static void imxrt_dispatch(struct imxrt_driver_s *priv); +static void imxrt_receive(struct imxrt_driver_s *priv); +static void imxrt_txdone(struct imxrt_driver_s *priv); -static void imxrt_enet_interrupt_work(FAR void *arg); -static int imxrt_enet_interrupt(int irq, FAR void *context, FAR void *arg); +static void imxrt_enet_interrupt_work(void *arg); +static int imxrt_enet_interrupt(int irq, void *context, void *arg); /* Watchdog timer expirations */ -static void imxrt_txtimeout_work(FAR void *arg); +static void imxrt_txtimeout_work(void *arg); static void imxrt_txtimeout_expiry(wdparm_t arg); -static void imxrt_poll_work(FAR void *arg); +static void imxrt_poll_work(void *arg); static void imxrt_polltimer_expiry(wdparm_t arg); /* NuttX callback functions */ @@ -345,7 +345,7 @@ static void imxrt_polltimer_expiry(wdparm_t arg); static int imxrt_ifup(struct net_driver_s *dev); static int imxrt_ifdown(struct net_driver_s *dev); -static void imxrt_txavail_work(FAR void *arg); +static void imxrt_txavail_work(void *arg); static int imxrt_txavail(struct net_driver_s *dev); /* Internal ifup function that allows phy reset to be optional */ @@ -354,8 +354,8 @@ static int imxrt_ifup_action(struct net_driver_s *dev, bool resetphy); #ifdef CONFIG_NET_MCASTGROUP static int imxrt_addmac(struct net_driver_s *dev, - FAR const uint8_t *mac); -static int imxrt_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac); + const uint8_t *mac); +static int imxrt_rmmac(struct net_driver_s *dev, const uint8_t *mac); #endif #ifdef CONFIG_NETDEV_IOCTL @@ -445,7 +445,7 @@ static inline uint16_t imxrt_swap16(uint16_t value) * ****************************************************************************/ -static bool imxrt_txringfull(FAR struct imxrt_driver_s *priv) +static bool imxrt_txringfull(struct imxrt_driver_s *priv) { uint8_t txnext; @@ -483,7 +483,7 @@ static bool imxrt_txringfull(FAR struct imxrt_driver_s *priv) * ****************************************************************************/ -static int imxrt_transmit(FAR struct imxrt_driver_s *priv) +static int imxrt_transmit(struct imxrt_driver_s *priv) { struct enet_desc_s *txdesc; irqstate_t flags; @@ -602,8 +602,8 @@ static int imxrt_transmit(FAR struct imxrt_driver_s *priv) static int imxrt_txpoll(struct net_driver_s *dev) { - FAR struct imxrt_driver_s *priv = - (FAR struct imxrt_driver_s *)dev->d_private; + struct imxrt_driver_s *priv = + (struct imxrt_driver_s *)dev->d_private; /* If the polling resulted in data that should be sent out on the network, * the field d_len is set to a value > 0. @@ -677,7 +677,7 @@ static int imxrt_txpoll(struct net_driver_s *dev) * ****************************************************************************/ -static inline void imxrt_dispatch(FAR struct imxrt_driver_s *priv) +static inline void imxrt_dispatch(struct imxrt_driver_s *priv) { /* Update statistics */ @@ -814,7 +814,7 @@ static inline void imxrt_dispatch(FAR struct imxrt_driver_s *priv) * ****************************************************************************/ -static void imxrt_receive(FAR struct imxrt_driver_s *priv) +static void imxrt_receive(struct imxrt_driver_s *priv) { struct enet_desc_s *rxdesc; bool received; @@ -902,7 +902,7 @@ static void imxrt_receive(FAR struct imxrt_driver_s *priv) * ****************************************************************************/ -static void imxrt_txdone(FAR struct imxrt_driver_s *priv) +static void imxrt_txdone(struct imxrt_driver_s *priv) { struct enet_desc_s *txdesc; uint32_t regval; @@ -985,9 +985,9 @@ static void imxrt_txdone(FAR struct imxrt_driver_s *priv) * ****************************************************************************/ -static void imxrt_enet_interrupt_work(FAR void *arg) +static void imxrt_enet_interrupt_work(void *arg) { - FAR struct imxrt_driver_s *priv = (FAR struct imxrt_driver_s *)arg; + struct imxrt_driver_s *priv = (struct imxrt_driver_s *)arg; uint32_t pending; #ifdef CONFIG_NET_MCASTGROUP uint32_t gaurstore; @@ -1105,9 +1105,9 @@ static void imxrt_enet_interrupt_work(FAR void *arg) * ****************************************************************************/ -static int imxrt_enet_interrupt(int irq, FAR void *context, FAR void *arg) +static int imxrt_enet_interrupt(int irq, void *context, void *arg) { - register FAR struct imxrt_driver_s *priv = &g_enet[0]; + register struct imxrt_driver_s *priv = &g_enet[0]; /* Disable further Ethernet interrupts. Because Ethernet interrupts are * also disabled if the TX timeout event occurs, there can be no race @@ -1138,9 +1138,9 @@ static int imxrt_enet_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static void imxrt_txtimeout_work(FAR void *arg) +static void imxrt_txtimeout_work(void *arg) { - FAR struct imxrt_driver_s *priv = (FAR struct imxrt_driver_s *)arg; + struct imxrt_driver_s *priv = (struct imxrt_driver_s *)arg; /* Increment statistics and dump debug info */ @@ -1182,7 +1182,7 @@ static void imxrt_txtimeout_work(FAR void *arg) static void imxrt_txtimeout_expiry(wdparm_t arg) { - FAR struct imxrt_driver_s *priv = (FAR struct imxrt_driver_s *)arg; + struct imxrt_driver_s *priv = (struct imxrt_driver_s *)arg; /* Disable further Ethernet interrupts. This will prevent some race * conditions with interrupt work. There is still a potential race @@ -1215,9 +1215,9 @@ static void imxrt_txtimeout_expiry(wdparm_t arg) * ****************************************************************************/ -static void imxrt_poll_work(FAR void *arg) +static void imxrt_poll_work(void *arg) { - FAR struct imxrt_driver_s *priv = (FAR struct imxrt_driver_s *)arg; + struct imxrt_driver_s *priv = (struct imxrt_driver_s *)arg; /* Check if there is there is a transmission in progress. * We cannot perform the TX poll if he are unable to accept @@ -1261,7 +1261,7 @@ static void imxrt_poll_work(FAR void *arg) static void imxrt_polltimer_expiry(wdparm_t arg) { - FAR struct imxrt_driver_s *priv = (FAR struct imxrt_driver_s *)arg; + struct imxrt_driver_s *priv = (struct imxrt_driver_s *)arg; /* Schedule to perform the poll processing on the worker thread. */ @@ -1291,8 +1291,8 @@ static void imxrt_polltimer_expiry(wdparm_t arg) static int imxrt_ifup_action(struct net_driver_s *dev, bool resetphy) { - FAR struct imxrt_driver_s *priv = - (FAR struct imxrt_driver_s *)dev->d_private; + struct imxrt_driver_s *priv = + (struct imxrt_driver_s *)dev->d_private; uint8_t *mac = dev->d_mac.ether.ether_addr_octet; uint32_t regval; int ret; @@ -1438,8 +1438,8 @@ static int imxrt_ifup(struct net_driver_s *dev) static int imxrt_ifdown(struct net_driver_s *dev) { - FAR struct imxrt_driver_s *priv = - (FAR struct imxrt_driver_s *)dev->d_private; + struct imxrt_driver_s *priv = + (struct imxrt_driver_s *)dev->d_private; irqstate_t flags; ninfo("Taking down: %d.%d.%d.%d\n", @@ -1491,9 +1491,9 @@ static int imxrt_ifdown(struct net_driver_s *dev) * ****************************************************************************/ -static void imxrt_txavail_work(FAR void *arg) +static void imxrt_txavail_work(void *arg) { - FAR struct imxrt_driver_s *priv = (FAR struct imxrt_driver_s *)arg; + struct imxrt_driver_s *priv = (struct imxrt_driver_s *)arg; /* Ignore the notification if the interface is not yet up */ @@ -1538,8 +1538,8 @@ static void imxrt_txavail_work(FAR void *arg) static int imxrt_txavail(struct net_driver_s *dev) { - FAR struct imxrt_driver_s *priv = - (FAR struct imxrt_driver_s *)dev->d_private; + struct imxrt_driver_s *priv = + (struct imxrt_driver_s *)dev->d_private; /* Is our single work structure available? It may not be if there are * pending interrupt actions and we will have to ignore the Tx @@ -1657,7 +1657,7 @@ static uint32_t imxrt_enet_hash_index(const uint8_t *mac) ****************************************************************************/ #ifdef CONFIG_NET_MCASTGROUP -static int imxrt_addmac(struct net_driver_s *dev, FAR const uint8_t *mac) +static int imxrt_addmac(struct net_driver_s *dev, const uint8_t *mac) { uint32_t hashindex; uint32_t temp; @@ -1704,7 +1704,7 @@ static int imxrt_addmac(struct net_driver_s *dev, FAR const uint8_t *mac) ****************************************************************************/ #ifdef CONFIG_NET_MCASTGROUP -static int imxrt_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac) +static int imxrt_rmmac(struct net_driver_s *dev, const uint8_t *mac) { uint32_t hashindex; uint32_t temp; @@ -1754,8 +1754,8 @@ static int imxrt_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac) static int imxrt_ioctl(struct net_driver_s *dev, int cmd, unsigned long arg) { #ifdef CONFIG_NETDEV_PHY_IOCTL - FAR struct imxrt_driver_s *priv = - (FAR struct imxrt_driver_s *)dev->d_private; + struct imxrt_driver_s *priv = + (struct imxrt_driver_s *)dev->d_private; #endif int ret; diff --git a/arch/arm/src/imxrt/imxrt_flexcan.c b/arch/arm/src/imxrt/imxrt_flexcan.c index b63ae0bbb5..29fd5dd83d 100644 --- a/arch/arm/src/imxrt/imxrt_flexcan.c +++ b/arch/arm/src/imxrt/imxrt_flexcan.c @@ -459,8 +459,8 @@ uint32_t imxrt_bitratetotimeseg(struct flexcan_timeseg *timeseg, /* Common TX logic */ -static bool imxrt_txringfull(FAR struct imxrt_driver_s *priv); -static int imxrt_transmit(FAR struct imxrt_driver_s *priv); +static bool imxrt_txringfull(struct imxrt_driver_s *priv); +static int imxrt_transmit(struct imxrt_driver_s *priv); static int imxrt_txpoll(struct net_driver_s *dev); /* Helper functions */ @@ -470,22 +470,22 @@ static void imxrt_setfreeze(uint32_t base, uint32_t freeze); static uint32_t imxrt_waitmcr_change(uint32_t base, uint32_t mask, uint32_t target_state); -static struct mb_s *flexcan_get_mb(FAR struct imxrt_driver_s *priv, +static struct mb_s *flexcan_get_mb(struct imxrt_driver_s *priv, uint32_t mbi); /* Interrupt handling */ -static void imxrt_receive(FAR struct imxrt_driver_s *priv, +static void imxrt_receive(struct imxrt_driver_s *priv, uint32_t flags); -static void imxrt_txdone_work(FAR void *arg); -static void imxrt_txdone(FAR struct imxrt_driver_s *priv); +static void imxrt_txdone_work(void *arg); +static void imxrt_txdone(struct imxrt_driver_s *priv); -static int imxrt_flexcan_interrupt(int irq, FAR void *context, - FAR void *arg); +static int imxrt_flexcan_interrupt(int irq, void *context, + void *arg); /* Watchdog timer expirations */ #ifdef TX_TIMEOUT_WQ -static void imxrt_txtimeout_work(FAR void *arg); +static void imxrt_txtimeout_work(void *arg); static void imxrt_txtimeout_expiry(int argc, uint32_t arg, ...); #endif @@ -494,7 +494,7 @@ static void imxrt_txtimeout_expiry(int argc, uint32_t arg, ...); static int imxrt_ifup(struct net_driver_s *dev); static int imxrt_ifdown(struct net_driver_s *dev); -static void imxrt_txavail_work(FAR void *arg); +static void imxrt_txavail_work(void *arg); static int imxrt_txavail(struct net_driver_s *dev); #ifdef CONFIG_NETDEV_IOCTL @@ -526,7 +526,7 @@ static void imxrt_reset(struct imxrt_driver_s *priv); * ****************************************************************************/ -static bool imxrt_txringfull(FAR struct imxrt_driver_s *priv) +static bool imxrt_txringfull(struct imxrt_driver_s *priv) { uint32_t mbi = RXMBCOUNT + 1; struct mb_s *mb; @@ -565,7 +565,7 @@ static bool imxrt_txringfull(FAR struct imxrt_driver_s *priv) * ****************************************************************************/ -static int imxrt_transmit(FAR struct imxrt_driver_s *priv) +static int imxrt_transmit(struct imxrt_driver_s *priv) { /* Attempt to write frame */ @@ -761,8 +761,8 @@ static int imxrt_transmit(FAR struct imxrt_driver_s *priv) static int imxrt_txpoll(struct net_driver_s *dev) { - FAR struct imxrt_driver_s *priv = - (FAR struct imxrt_driver_s *)dev->d_private; + struct imxrt_driver_s *priv = + (struct imxrt_driver_s *)dev->d_private; irqstate_t flags; /* If the polling resulted in data that should be sent out on the network, @@ -819,7 +819,7 @@ static int imxrt_txpoll(struct net_driver_s *dev) * ****************************************************************************/ -static void imxrt_receive(FAR struct imxrt_driver_s *priv, +static void imxrt_receive(struct imxrt_driver_s *priv, uint32_t flags) { uint32_t mbi; @@ -979,7 +979,7 @@ static void imxrt_receive(FAR struct imxrt_driver_s *priv, * ****************************************************************************/ -static void imxrt_txdone(FAR struct imxrt_driver_s *priv) +static void imxrt_txdone(struct imxrt_driver_s *priv) { uint32_t flags; uint32_t mbi; @@ -1034,9 +1034,9 @@ static void imxrt_txdone(FAR struct imxrt_driver_s *priv) * ****************************************************************************/ -static void imxrt_txdone_work(FAR void *arg) +static void imxrt_txdone_work(void *arg) { - FAR struct imxrt_driver_s *priv = (FAR struct imxrt_driver_s *)arg; + struct imxrt_driver_s *priv = (struct imxrt_driver_s *)arg; imxrt_txdone(priv); @@ -1069,10 +1069,10 @@ static void imxrt_txdone_work(FAR void *arg) * ****************************************************************************/ -static int imxrt_flexcan_interrupt(int irq, FAR void *context, - FAR void *arg) +static int imxrt_flexcan_interrupt(int irq, void *context, + void *arg) { - FAR struct imxrt_driver_s *priv = (struct imxrt_driver_s *)arg; + struct imxrt_driver_s *priv = (struct imxrt_driver_s *)arg; if (irq == priv->config->irq) { @@ -1125,9 +1125,9 @@ static int imxrt_flexcan_interrupt(int irq, FAR void *context, ****************************************************************************/ #ifdef TX_TIMEOUT_WQ -static void imxrt_txtimeout_work(FAR void *arg) +static void imxrt_txtimeout_work(void *arg) { - FAR struct imxrt_driver_s *priv = (FAR struct imxrt_driver_s *)arg; + struct imxrt_driver_s *priv = (struct imxrt_driver_s *)arg; uint32_t flags; uint32_t mbi; uint32_t mb_bit; @@ -1186,7 +1186,7 @@ static void imxrt_txtimeout_work(FAR void *arg) static void imxrt_txtimeout_expiry(int argc, uint32_t arg, ...) { - FAR struct imxrt_driver_s *priv = (FAR struct imxrt_driver_s *)arg; + struct imxrt_driver_s *priv = (struct imxrt_driver_s *)arg; /* Schedule to perform the TX timeout processing on the worker thread */ @@ -1264,7 +1264,7 @@ static uint32_t imxrt_waitfreezeack_change(uint32_t base, return imxrt_waitmcr_change(base, CAN_MCR_FRZACK, target_state); } -static struct mb_s *flexcan_get_mb(FAR struct imxrt_driver_s *priv, +static struct mb_s *flexcan_get_mb(struct imxrt_driver_s *priv, uint32_t mbi) { return (struct mb_s *)(priv->base + @@ -1290,8 +1290,8 @@ static struct mb_s *flexcan_get_mb(FAR struct imxrt_driver_s *priv, static int imxrt_ifup(struct net_driver_s *dev) { - FAR struct imxrt_driver_s *priv = - (FAR struct imxrt_driver_s *)dev->d_private; + struct imxrt_driver_s *priv = + (struct imxrt_driver_s *)dev->d_private; if (!imxrt_initialize(priv)) { @@ -1338,8 +1338,8 @@ static int imxrt_ifup(struct net_driver_s *dev) static int imxrt_ifdown(struct net_driver_s *dev) { - FAR struct imxrt_driver_s *priv = - (FAR struct imxrt_driver_s *)dev->d_private; + struct imxrt_driver_s *priv = + (struct imxrt_driver_s *)dev->d_private; imxrt_reset(priv); @@ -1364,9 +1364,9 @@ static int imxrt_ifdown(struct net_driver_s *dev) * ****************************************************************************/ -static void imxrt_txavail_work(FAR void *arg) +static void imxrt_txavail_work(void *arg) { - FAR struct imxrt_driver_s *priv = (FAR struct imxrt_driver_s *)arg; + struct imxrt_driver_s *priv = (struct imxrt_driver_s *)arg; /* Ignore the notification if the interface is not yet up */ @@ -1411,8 +1411,8 @@ static void imxrt_txavail_work(FAR void *arg) static int imxrt_txavail(struct net_driver_s *dev) { - FAR struct imxrt_driver_s *priv = - (FAR struct imxrt_driver_s *)dev->d_private; + struct imxrt_driver_s *priv = + (struct imxrt_driver_s *)dev->d_private; /* Is our single work structure available? It may not be if there are * pending interrupt actions and we will have to ignore the Tx @@ -1451,8 +1451,8 @@ static int imxrt_txavail(struct net_driver_s *dev) static int imxrt_ioctl(struct net_driver_s *dev, int cmd, unsigned long arg) { - FAR struct imxrt_driver_s *priv = - (FAR struct imxrt_driver_s *)dev->d_private; + struct imxrt_driver_s *priv = + (struct imxrt_driver_s *)dev->d_private; struct flexcan_timeseg data_timing; int ret; diff --git a/arch/arm/src/imxrt/imxrt_flexpwm.c b/arch/arm/src/imxrt/imxrt_flexpwm.c index 89b72ca1fb..6a2693f378 100644 --- a/arch/arm/src/imxrt/imxrt_flexpwm.c +++ b/arch/arm/src/imxrt/imxrt_flexpwm.c @@ -87,7 +87,7 @@ struct imxrt_flexpwm_module_s struct imxrt_flexpwm_s { const struct pwm_ops_s *ops; /* PWM operations */ - FAR struct imxrt_flexpwm_module_s *modules; + struct imxrt_flexpwm_module_s *modules; uint8_t modules_num; /* Number of modules */ uint32_t frequency; /* PWM frequency */ uint32_t base; /* Base address of peripheral register */ @@ -95,20 +95,21 @@ struct imxrt_flexpwm_s /* PWM driver methods */ -static int pwm_setup(FAR struct pwm_lowerhalf_s *dev); -static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev); -static int pwm_start(FAR struct pwm_lowerhalf_s *dev, - FAR const struct pwm_info_s *info); -static int pwm_stop(FAR struct pwm_lowerhalf_s *dev); -static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, +static int pwm_setup(struct pwm_lowerhalf_s *dev); +static int pwm_shutdown(struct pwm_lowerhalf_s *dev); +static int pwm_start(struct pwm_lowerhalf_s *dev, + const struct pwm_info_s *info); +static int pwm_stop(struct pwm_lowerhalf_s *dev); +static int pwm_ioctl(struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg); /* Helper functions */ -static int pwm_set_output(FAR struct pwm_lowerhalf_s *dev, uint8_t channel, - ub16_t duty); -static int pwm_change_freq(FAR struct pwm_lowerhalf_s *dev, - FAR const struct pwm_info_s *info, uint8_t channel); +static int pwm_set_output(struct pwm_lowerhalf_s *dev, uint8_t channel, + ub16_t duty); +static int pwm_change_freq(struct pwm_lowerhalf_s *dev, + const struct pwm_info_s *info, + uint8_t channel); /**************************************************************************** * Private Data @@ -555,10 +556,11 @@ static struct imxrt_flexpwm_s g_pwm4 = * ****************************************************************************/ -static int pwm_change_freq(FAR struct pwm_lowerhalf_s *dev, - FAR const struct pwm_info_s *info, uint8_t channel) +static int pwm_change_freq(struct pwm_lowerhalf_s *dev, + const struct pwm_info_s *info, + uint8_t channel) { - FAR struct imxrt_flexpwm_s *priv = (FAR struct imxrt_flexpwm_s *)dev; + struct imxrt_flexpwm_s *priv = (struct imxrt_flexpwm_s *)dev; #ifdef CONFIG_PWM_MULTICHAN uint8_t shift = info->channels[channel].channel - 1; #else @@ -635,10 +637,10 @@ static int pwm_change_freq(FAR struct pwm_lowerhalf_s *dev, * ****************************************************************************/ -static int pwm_set_output(FAR struct pwm_lowerhalf_s *dev, uint8_t channel, - ub16_t duty) +static int pwm_set_output(struct pwm_lowerhalf_s *dev, uint8_t channel, + ub16_t duty) { - FAR struct imxrt_flexpwm_s *priv = (FAR struct imxrt_flexpwm_s *)dev; + struct imxrt_flexpwm_s *priv = (struct imxrt_flexpwm_s *)dev; uint16_t period; uint16_t width; uint16_t regval; @@ -698,9 +700,9 @@ static int pwm_set_output(FAR struct pwm_lowerhalf_s *dev, uint8_t channel, * ****************************************************************************/ -static int pwm_setup(FAR struct pwm_lowerhalf_s *dev) +static int pwm_setup(struct pwm_lowerhalf_s *dev) { - FAR struct imxrt_flexpwm_s *priv = (FAR struct imxrt_flexpwm_s *)dev; + struct imxrt_flexpwm_s *priv = (struct imxrt_flexpwm_s *)dev; uint32_t pin = 0; uint16_t regval; uint8_t shift; @@ -820,9 +822,9 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) +static int pwm_shutdown(struct pwm_lowerhalf_s *dev) { - FAR struct imxrt_flexpwm_s *priv = (FAR struct imxrt_flexpwm_s *)dev; + struct imxrt_flexpwm_s *priv = (struct imxrt_flexpwm_s *)dev; for (int i = 0; i < priv->modules_num; i++) { @@ -874,10 +876,10 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int pwm_start(FAR struct pwm_lowerhalf_s *dev, - FAR const struct pwm_info_s *info) +static int pwm_start(struct pwm_lowerhalf_s *dev, + const struct pwm_info_s *info) { - FAR struct imxrt_flexpwm_s *priv = (FAR struct imxrt_flexpwm_s *)dev; + struct imxrt_flexpwm_s *priv = (struct imxrt_flexpwm_s *)dev; int ret = OK; uint8_t ldok_map = 0; @@ -974,9 +976,9 @@ static int pwm_start(FAR struct pwm_lowerhalf_s *dev, * ****************************************************************************/ -static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) +static int pwm_stop(struct pwm_lowerhalf_s *dev) { - FAR struct imxrt_flexpwm_s *priv = (FAR struct imxrt_flexpwm_s *)dev; + struct imxrt_flexpwm_s *priv = (struct imxrt_flexpwm_s *)dev; uint8_t shift; uint16_t regval; @@ -1028,7 +1030,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, +static int pwm_ioctl(struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg) { return -ENOTTY; @@ -1053,9 +1055,9 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, * ****************************************************************************/ -FAR struct pwm_lowerhalf_s *imxrt_pwminitialize(int pwm) +struct pwm_lowerhalf_s *imxrt_pwminitialize(int pwm) { - FAR struct imxrt_flexpwm_s *priv; + struct imxrt_flexpwm_s *priv; pwminfo("Initializing pwm %d\n", pwm); @@ -1090,6 +1092,6 @@ FAR struct pwm_lowerhalf_s *imxrt_pwminitialize(int pwm) return NULL; } - return (FAR struct pwm_lowerhalf_s *)priv; + return (struct pwm_lowerhalf_s *)priv; } #endif /* CONFIG_IMXRT_FLEXPWM */ diff --git a/arch/arm/src/imxrt/imxrt_flexpwm.h b/arch/arm/src/imxrt/imxrt_flexpwm.h index 591fd8bc71..c8a99f2c4d 100644 --- a/arch/arm/src/imxrt/imxrt_flexpwm.h +++ b/arch/arm/src/imxrt/imxrt_flexpwm.h @@ -66,7 +66,7 @@ extern "C" * ****************************************************************************/ -FAR struct pwm_lowerhalf_s *imxrt_pwminitialize(int pwm); +struct pwm_lowerhalf_s *imxrt_pwminitialize(int pwm); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/imxrt/imxrt_flexspi.c b/arch/arm/src/imxrt/imxrt_flexspi.c index 10a4256a7a..7c836af4fe 100644 --- a/arch/arm/src/imxrt/imxrt_flexspi.c +++ b/arch/arm/src/imxrt/imxrt_flexspi.c @@ -79,7 +79,7 @@ struct imxrt_flexspidev_s static int imxrt_flexspi_lock(struct flexspi_dev_s *dev, bool lock); static int imxrt_flexspi_transfer_blocking(struct flexspi_dev_s *dev, - FAR struct flexspi_transfer_s *xfer); + struct flexspi_transfer_s *xfer); static void imxrt_flexspi_software_reset(struct flexspi_dev_s *dev); static void imxrt_flexspi_update_lut(struct flexspi_dev_s *dev, uint32_t index, diff --git a/arch/arm/src/imxrt/imxrt_flexspi.h b/arch/arm/src/imxrt/imxrt_flexspi.h index 2a90c7a3fc..064e32d487 100644 --- a/arch/arm/src/imxrt/imxrt_flexspi.h +++ b/arch/arm/src/imxrt/imxrt_flexspi.h @@ -485,16 +485,16 @@ struct flexspi_device_config_s struct flexspi_dev_s; struct flexspi_ops_s { - CODE int (*lock)(FAR struct flexspi_dev_s *dev, bool lock); - CODE int (*transfer_blocking)(FAR struct flexspi_dev_s *dev, - FAR struct flexspi_transfer_s *xfer); - CODE void (*software_reset)(FAR struct flexspi_dev_s *dev); - CODE void (*update_lut)(FAR struct flexspi_dev_s *dev, - uint32_t index, const uint32_t *cmd, - uint32_t count); - CODE void (*set_device_config)(FAR struct flexspi_dev_s *dev, - FAR struct flexspi_device_config_s *config, - enum flexspi_port_e port); + int (*lock)(struct flexspi_dev_s *dev, bool lock); + int (*transfer_blocking)(struct flexspi_dev_s *dev, + struct flexspi_transfer_s *xfer); + void (*software_reset)(struct flexspi_dev_s *dev); + void (*update_lut)(struct flexspi_dev_s *dev, + uint32_t index, const uint32_t *cmd, + uint32_t count); + void (*set_device_config)(struct flexspi_dev_s *dev, + struct flexspi_device_config_s *config, + enum flexspi_port_e port); }; /* FlexSPI private data. This structure only defines the initial fields of @@ -504,7 +504,7 @@ struct flexspi_ops_s struct flexspi_dev_s { - FAR const struct flexspi_ops_s *ops; + const struct flexspi_ops_s *ops; }; /**************************************************************************** @@ -545,7 +545,7 @@ extern "C" ****************************************************************************/ struct flexspi_dev_s; -FAR struct flexspi_dev_s *imxrt_flexspi_initialize(int intf); +struct flexspi_dev_s *imxrt_flexspi_initialize(int intf); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/imxrt/imxrt_gpio.c b/arch/arm/src/imxrt/imxrt_gpio.c index 1b1c0abeb2..816f444ef2 100644 --- a/arch/arm/src/imxrt/imxrt_gpio.c +++ b/arch/arm/src/imxrt/imxrt_gpio.c @@ -570,7 +570,7 @@ static int imxrt_gpio_configinput(gpio_pinset_t pinset) { int port = (pinset & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT; int pin = (pinset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT; - FAR const uint8_t *table; + const uint8_t *table; iomux_pinset_t ioset; uintptr_t regaddr; unsigned int index; diff --git a/arch/arm/src/imxrt/imxrt_gpioirq.c b/arch/arm/src/imxrt/imxrt_gpioirq.c index 14b66fcbea..7ca21a9e0e 100644 --- a/arch/arm/src/imxrt/imxrt_gpioirq.c +++ b/arch/arm/src/imxrt/imxrt_gpioirq.c @@ -232,8 +232,8 @@ static int imxrt_gpio_info(int irq, uintptr_t *regaddr, unsigned int *pin) ****************************************************************************/ #ifdef CONFIG_IMXRT_GPIO1_0_15_IRQ -static int imxrt_gpio1_0_15_interrupt(int irq, FAR void *context, - FAR void *arg) +static int imxrt_gpio1_0_15_interrupt(int irq, void *context, + void *arg) { uint32_t status; int gpioirq; @@ -269,8 +269,8 @@ static int imxrt_gpio1_0_15_interrupt(int irq, FAR void *context, #endif #ifdef CONFIG_IMXRT_GPIO1_16_31_IRQ -static int imxrt_gpio1_16_31_interrupt(int irq, FAR void *context, - FAR void *arg) +static int imxrt_gpio1_16_31_interrupt(int irq, void *context, + void *arg) { uint32_t status; int gpioirq; @@ -306,8 +306,8 @@ static int imxrt_gpio1_16_31_interrupt(int irq, FAR void *context, #endif #ifdef CONFIG_IMXRT_GPIO2_0_15_IRQ -static int imxrt_gpio2_0_15_interrupt(int irq, FAR void *context, - FAR void *arg) +static int imxrt_gpio2_0_15_interrupt(int irq, void *context, + void *arg) { uint32_t status; int gpioirq; @@ -343,8 +343,8 @@ static int imxrt_gpio2_0_15_interrupt(int irq, FAR void *context, #endif #ifdef CONFIG_IMXRT_GPIO2_16_31_IRQ -static int imxrt_gpio2_16_31_interrupt(int irq, FAR void *context, - FAR void *arg) +static int imxrt_gpio2_16_31_interrupt(int irq, void *context, + void *arg) { uint32_t status; int gpioirq; @@ -380,8 +380,8 @@ static int imxrt_gpio2_16_31_interrupt(int irq, FAR void *context, #endif #ifdef CONFIG_IMXRT_GPIO3_0_15_IRQ -static int imxrt_gpio3_0_15_interrupt(int irq, FAR void *context, - FAR void *arg) +static int imxrt_gpio3_0_15_interrupt(int irq, void *context, + void *arg) { uint32_t status; int gpioirq; @@ -417,8 +417,8 @@ static int imxrt_gpio3_0_15_interrupt(int irq, FAR void *context, #endif #ifdef CONFIG_IMXRT_GPIO3_16_31_IRQ -static int imxrt_gpio3_16_31_interrupt(int irq, FAR void *context, - FAR void *arg) +static int imxrt_gpio3_16_31_interrupt(int irq, void *context, + void *arg) { uint32_t status; int gpioirq; @@ -455,8 +455,8 @@ static int imxrt_gpio3_16_31_interrupt(int irq, FAR void *context, #ifdef IMXRT_GPIO4_IMR #ifdef CONFIG_IMXRT_GPIO4_0_15_IRQ -static int imxrt_gpio4_0_15_interrupt(int irq, FAR void *context, - FAR void *arg) +static int imxrt_gpio4_0_15_interrupt(int irq, void *context, + void *arg) { uint32_t status; int gpioirq; @@ -492,8 +492,8 @@ static int imxrt_gpio4_0_15_interrupt(int irq, FAR void *context, #endif #ifdef CONFIG_IMXRT_GPIO4_16_31_IRQ -static int imxrt_gpio4_16_31_interrupt(int irq, FAR void *context, - FAR void *arg) +static int imxrt_gpio4_16_31_interrupt(int irq, void *context, + void *arg) { uint32_t status; int gpioirq; @@ -530,8 +530,8 @@ static int imxrt_gpio4_16_31_interrupt(int irq, FAR void *context, #endif #ifdef CONFIG_IMXRT_GPIO5_0_15_IRQ -static int imxrt_gpio5_0_15_interrupt(int irq, FAR void *context, - FAR void *arg) +static int imxrt_gpio5_0_15_interrupt(int irq, void *context, + void *arg) { uint32_t status; int gpioirq; @@ -567,8 +567,8 @@ static int imxrt_gpio5_0_15_interrupt(int irq, FAR void *context, #endif #ifdef CONFIG_IMXRT_GPIO5_16_31_IRQ -static int imxrt_gpio5_16_31_interrupt(int irq, FAR void *context, - FAR void *arg) +static int imxrt_gpio5_16_31_interrupt(int irq, void *context, + void *arg) { uint32_t status; int gpioirq; diff --git a/arch/arm/src/imxrt/imxrt_hprtc.c b/arch/arm/src/imxrt/imxrt_hprtc.c index 1f07d4186d..5540386d6b 100644 --- a/arch/arm/src/imxrt/imxrt_hprtc.c +++ b/arch/arm/src/imxrt/imxrt_hprtc.c @@ -94,7 +94,7 @@ bool g_hprtc_timset; /* True: time has been set since power up */ ****************************************************************************/ #if defined(CONFIG_RTC_ALARM) && defined(CONFIG_RTC_DRIVER) -static int imxrt_snvs_interrupt(int irq, void *context, FAR void *arg) +static int imxrt_snvs_interrupt(int irq, void *context, void *arg) { hprtc_alarm_callback_t cb; @@ -231,7 +231,7 @@ time_t up_rtc_time(void) * ****************************************************************************/ -int up_rtc_settime(FAR const struct timespec *ts) +int up_rtc_settime(const struct timespec *ts) { uint32_t regval; @@ -512,7 +512,7 @@ uint32_t imxrt_hprtc_getalarm(void) ****************************************************************************/ #if defined(CONFIG_RTC_ALARM) && defined(CONFIG_RTC_DRIVER) -int imxrt_hprtc_setalarm(FAR struct timespec *ts, hprtc_alarm_callback_t cb) +int imxrt_hprtc_setalarm(struct timespec *ts, hprtc_alarm_callback_t cb) { irqstate_t flags; uint32_t regval; diff --git a/arch/arm/src/imxrt/imxrt_hprtc.h b/arch/arm/src/imxrt/imxrt_hprtc.h index 3c6e21fa20..c32b8ef8b0 100644 --- a/arch/arm/src/imxrt/imxrt_hprtc.h +++ b/arch/arm/src/imxrt/imxrt_hprtc.h @@ -59,7 +59,7 @@ * alarm expires. */ -typedef CODE void (*hprtc_alarm_callback_t)(void); +typedef void (*hprtc_alarm_callback_t)(void); /**************************************************************************** * Public Data @@ -116,7 +116,7 @@ extern "C" #ifdef CONFIG_RTC_DRIVER struct rtc_lowerhalf_s; -FAR struct rtc_lowerhalf_s *imxrt_rtc_lowerhalf(void); +struct rtc_lowerhalf_s *imxrt_rtc_lowerhalf(void); #endif /**************************************************************************** @@ -207,7 +207,7 @@ uint32_t imxrt_hprtc_getalarm(void); ****************************************************************************/ #if defined(CONFIG_RTC_ALARM) && defined(CONFIG_RTC_DRIVER) -int imxrt_hprtc_setalarm(FAR struct timespec *ts, +int imxrt_hprtc_setalarm(struct timespec *ts, hprtc_alarm_callback_t cb); #endif diff --git a/arch/arm/src/imxrt/imxrt_irq.c b/arch/arm/src/imxrt/imxrt_irq.c index ebd5910c56..331732e7ab 100644 --- a/arch/arm/src/imxrt/imxrt_irq.c +++ b/arch/arm/src/imxrt/imxrt_irq.c @@ -220,7 +220,7 @@ static void imxrt_dumpnvic(const char *msg, int irq) ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -static int imxrt_nmi(int irq, FAR void *context, FAR void *arg) +static int imxrt_nmi(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! NMI received\n"); @@ -228,7 +228,7 @@ static int imxrt_nmi(int irq, FAR void *context, FAR void *arg) return 0; } -static int imxrt_busfault(int irq, FAR void *context, FAR void *arg) +static int imxrt_busfault(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Bus fault received: %08" PRIx32 "\n", @@ -237,7 +237,7 @@ static int imxrt_busfault(int irq, FAR void *context, FAR void *arg) return 0; } -static int imxrt_usagefault(int irq, FAR void *context, FAR void *arg) +static int imxrt_usagefault(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Usage fault received: %08" PRIx32 "\n", @@ -246,7 +246,7 @@ static int imxrt_usagefault(int irq, FAR void *context, FAR void *arg) return 0; } -static int imxrt_pendsv(int irq, FAR void *context, FAR void *arg) +static int imxrt_pendsv(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! PendSV received\n"); @@ -254,7 +254,7 @@ static int imxrt_pendsv(int irq, FAR void *context, FAR void *arg) return 0; } -static int imxrt_dbgmonitor(int irq, FAR void *context, FAR void *arg) +static int imxrt_dbgmonitor(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Debug Monitor received\n"); @@ -262,7 +262,7 @@ static int imxrt_dbgmonitor(int irq, FAR void *context, FAR void *arg) return 0; } -static int imxrt_reserved(int irq, FAR void *context, FAR void *arg) +static int imxrt_reserved(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Reserved interrupt\n"); diff --git a/arch/arm/src/imxrt/imxrt_lcd.c b/arch/arm/src/imxrt/imxrt_lcd.c index 55e0de6f85..2a32da09fd 100644 --- a/arch/arm/src/imxrt/imxrt_lcd.c +++ b/arch/arm/src/imxrt/imxrt_lcd.c @@ -93,20 +93,20 @@ * configuration of each color plane. */ -static int imxrt_getvideoinfo(FAR struct fb_vtable_s *vtable, - FAR struct fb_videoinfo_s *vinfo); -static int imxrt_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno, - FAR struct fb_planeinfo_s *pinfo); +static int imxrt_getvideoinfo(struct fb_vtable_s *vtable, + struct fb_videoinfo_s *vinfo); +static int imxrt_getplaneinfo(struct fb_vtable_s *vtable, int planeno, + struct fb_planeinfo_s *pinfo); /* The following is provided only if the video hardware supports RGB color * mapping */ #ifdef CONFIG_FB_CMAP -static int imxrt_getcmap(FAR struct fb_vtable_s *vtable, - FAR struct fb_cmap_s *cmap); -static int imxrt_putcmap(FAR struct fb_vtable_s *vtable, - FAR const struct fb_cmap_s *cmap); +static int imxrt_getcmap(struct fb_vtable_s *vtable, + struct fb_cmap_s *cmap); +static int imxrt_putcmap(struct fb_vtable_s *vtable, + const struct fb_cmap_s *cmap); #endif #ifdef CONFIG_FB_HWCURSOR @@ -131,7 +131,7 @@ static const struct fb_videoinfo_s g_videoinfo = static const struct fb_planeinfo_s g_planeinfo = { - .fbmem = (FAR void *)CONFIG_IMXRT_LCD_VRAMBASE, + .fbmem = (void *)CONFIG_IMXRT_LCD_VRAMBASE, .fblen = IMXRT_FBSIZE, .stride = IMXRT_STRIDE, .display = 0, @@ -239,8 +239,8 @@ struct fb_vtable_s g_fbobject = * Name: imxrt_getvideoinfo ****************************************************************************/ -static int imxrt_getvideoinfo(FAR struct fb_vtable_s *vtable, - FAR struct fb_videoinfo_s *vinfo) +static int imxrt_getvideoinfo(struct fb_vtable_s *vtable, + struct fb_videoinfo_s *vinfo) { lcdinfo("vtable=%p vinfo=%p\n", vtable, vinfo); if (vtable && vinfo) @@ -257,8 +257,8 @@ static int imxrt_getvideoinfo(FAR struct fb_vtable_s *vtable, * Name: imxrt_getplaneinfo ****************************************************************************/ -static int imxrt_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno, - FAR struct fb_planeinfo_s *pinfo) +static int imxrt_getplaneinfo(struct fb_vtable_s *vtable, int planeno, + struct fb_planeinfo_s *pinfo) { lcdinfo("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo); if (vtable && planeno == 0 && pinfo) @@ -276,8 +276,8 @@ static int imxrt_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno, ****************************************************************************/ #ifdef CONFIG_FB_CMAP -static int imxrt_getcmap(FAR struct fb_vtable_s *vtable, - FAR struct fb_cmap_s *cmap) +static int imxrt_getcmap(struct fb_vtable_s *vtable, + struct fb_cmap_s *cmap) { uint32_t n; uint32_t reg; @@ -324,8 +324,8 @@ static int imxrt_getcmap(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifdef CONFIG_FB_CMAP -static int imxrt_putcmap(FAR struct fb_vtable_s *vtable, - FAR const struct fb_cmap_s *cmap) +static int imxrt_putcmap(struct fb_vtable_s *vtable, + const struct fb_cmap_s *cmap) { uint32_t n; @@ -637,7 +637,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) { lcdinfo("vplane: %d\n", vplane); if (vplane == 0) diff --git a/arch/arm/src/imxrt/imxrt_lowputc.c b/arch/arm/src/imxrt/imxrt_lowputc.c index 7f0c432b68..0bc3b91ae3 100644 --- a/arch/arm/src/imxrt/imxrt_lowputc.c +++ b/arch/arm/src/imxrt/imxrt_lowputc.c @@ -361,7 +361,7 @@ void imxrt_lowsetup(void) #ifdef HAVE_LPUART_DEVICE int imxrt_lpuart_configure(uint32_t base, - FAR const struct uart_config_s *config) + const struct uart_config_s *config) { uint32_t src_freq = 0; uint32_t pll3_div = 0; diff --git a/arch/arm/src/imxrt/imxrt_lowputc.h b/arch/arm/src/imxrt/imxrt_lowputc.h index f69fff862c..d38012aa8d 100644 --- a/arch/arm/src/imxrt/imxrt_lowputc.h +++ b/arch/arm/src/imxrt/imxrt_lowputc.h @@ -83,7 +83,7 @@ void imxrt_lowsetup(void); #ifdef HAVE_LPUART_DEVICE int imxrt_lpuart_configure(uint32_t base, - FAR const struct uart_config_s *config); + const struct uart_config_s *config); #endif /**************************************************************************** diff --git a/arch/arm/src/imxrt/imxrt_lpi2c.c b/arch/arm/src/imxrt/imxrt_lpi2c.c index 894031814d..b230e37715 100644 --- a/arch/arm/src/imxrt/imxrt_lpi2c.c +++ b/arch/arm/src/imxrt/imxrt_lpi2c.c @@ -218,64 +218,64 @@ struct imxrt_lpi2c_priv_s ****************************************************************************/ static inline uint32_t - imxrt_lpi2c_getreg(FAR struct imxrt_lpi2c_priv_s *priv, uint16_t offset); -static inline void imxrt_lpi2c_putreg(FAR struct imxrt_lpi2c_priv_s *priv, + imxrt_lpi2c_getreg(struct imxrt_lpi2c_priv_s *priv, uint16_t offset); +static inline void imxrt_lpi2c_putreg(struct imxrt_lpi2c_priv_s *priv, uint16_t offset, uint32_t value); -static inline void imxrt_lpi2c_modifyreg(FAR struct imxrt_lpi2c_priv_s *priv, +static inline void imxrt_lpi2c_modifyreg(struct imxrt_lpi2c_priv_s *priv, uint16_t offset, uint32_t clearbits, uint32_t setbits); -static inline int imxrt_lpi2c_sem_wait(FAR struct imxrt_lpi2c_priv_s *priv); +static inline int imxrt_lpi2c_sem_wait(struct imxrt_lpi2c_priv_s *priv); #ifdef CONFIG_I2C_RESET static int - imxrt_lpi2c_sem_wait_noncancelable(FAR struct imxrt_lpi2c_priv_s *priv); + imxrt_lpi2c_sem_wait_noncancelable(struct imxrt_lpi2c_priv_s *priv); #endif #ifdef CONFIG_IMXRT_LPI2C_DYNTIMEO -static useconds_t imxrt_lpi2c_tousecs(int msgc, FAR struct i2c_msg_s *msgs); +static useconds_t imxrt_lpi2c_tousecs(int msgc, struct i2c_msg_s *msgs); #endif /* CONFIG_IMXRT_LPI2C_DYNTIMEO */ static inline int - imxrt_lpi2c_sem_waitdone(FAR struct imxrt_lpi2c_priv_s *priv); + imxrt_lpi2c_sem_waitdone(struct imxrt_lpi2c_priv_s *priv); static inline void - imxrt_lpi2c_sem_waitstop(FAR struct imxrt_lpi2c_priv_s *priv); + imxrt_lpi2c_sem_waitstop(struct imxrt_lpi2c_priv_s *priv); static inline void - imxrt_lpi2c_sem_post(FAR struct imxrt_lpi2c_priv_s *priv); + imxrt_lpi2c_sem_post(struct imxrt_lpi2c_priv_s *priv); static inline void - imxrt_lpi2c_sem_init(FAR struct imxrt_lpi2c_priv_s *priv); + imxrt_lpi2c_sem_init(struct imxrt_lpi2c_priv_s *priv); static inline void - imxrt_lpi2c_sem_destroy(FAR struct imxrt_lpi2c_priv_s *priv); + imxrt_lpi2c_sem_destroy(struct imxrt_lpi2c_priv_s *priv); #ifdef CONFIG_I2C_TRACE -static void imxrt_lpi2c_tracereset(FAR struct imxrt_lpi2c_priv_s *priv); -static void imxrt_lpi2c_tracenew(FAR struct imxrt_lpi2c_priv_s *priv, +static void imxrt_lpi2c_tracereset(struct imxrt_lpi2c_priv_s *priv); +static void imxrt_lpi2c_tracenew(struct imxrt_lpi2c_priv_s *priv, uint32_t status); -static void imxrt_lpi2c_traceevent(FAR struct imxrt_lpi2c_priv_s *priv, +static void imxrt_lpi2c_traceevent(struct imxrt_lpi2c_priv_s *priv, enum imxrt_trace_e event, uint32_t parm); -static void imxrt_lpi2c_tracedump(FAR struct imxrt_lpi2c_priv_s *priv); +static void imxrt_lpi2c_tracedump(struct imxrt_lpi2c_priv_s *priv); #endif /* CONFIG_I2C_TRACE */ -static void imxrt_lpi2c_setclock(FAR struct imxrt_lpi2c_priv_s *priv, +static void imxrt_lpi2c_setclock(struct imxrt_lpi2c_priv_s *priv, uint32_t frequency); -static inline void imxrt_lpi2c_sendstart(FAR struct imxrt_lpi2c_priv_s *priv, +static inline void imxrt_lpi2c_sendstart(struct imxrt_lpi2c_priv_s *priv, uint8_t address); -static inline void imxrt_lpi2c_sendstop(FAR struct imxrt_lpi2c_priv_s *priv); +static inline void imxrt_lpi2c_sendstop(struct imxrt_lpi2c_priv_s *priv); static inline uint32_t - imxrt_lpi2c_getstatus(FAR struct imxrt_lpi2c_priv_s *priv); + imxrt_lpi2c_getstatus(struct imxrt_lpi2c_priv_s *priv); static int imxrt_lpi2c_isr_process(struct imxrt_lpi2c_priv_s * priv); #ifndef CONFIG_I2C_POLLED -static int imxrt_lpi2c_isr(int irq, void *context, FAR void *arg); +static int imxrt_lpi2c_isr(int irq, void *context, void *arg); #endif /* !CONFIG_I2C_POLLED */ void imxrt_lpi2c_clock_enable (uint32_t base); void imxrt_lpi2c_clock_disable (uint32_t base); -static int imxrt_lpi2c_init(FAR struct imxrt_lpi2c_priv_s *priv); -static int imxrt_lpi2c_deinit(FAR struct imxrt_lpi2c_priv_s *priv); -static int imxrt_lpi2c_transfer(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count); +static int imxrt_lpi2c_init(struct imxrt_lpi2c_priv_s *priv); +static int imxrt_lpi2c_deinit(struct imxrt_lpi2c_priv_s *priv); +static int imxrt_lpi2c_transfer(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count); #ifdef CONFIG_I2C_RESET -static int imxrt_lpi2c_reset(FAR struct i2c_master_s *dev); +static int imxrt_lpi2c_reset(struct i2c_master_s *dev); #endif /**************************************************************************** @@ -475,7 +475,7 @@ static struct imxrt_lpi2c_priv_s imxrt_lpi2c4_priv = ****************************************************************************/ static inline uint32_t - imxrt_lpi2c_getreg(FAR struct imxrt_lpi2c_priv_s *priv, uint16_t offset) + imxrt_lpi2c_getreg(struct imxrt_lpi2c_priv_s *priv, uint16_t offset) { return getreg32(priv->config->base + offset); } @@ -488,7 +488,7 @@ static inline uint32_t * ****************************************************************************/ -static inline void imxrt_lpi2c_putreg(FAR struct imxrt_lpi2c_priv_s *priv, +static inline void imxrt_lpi2c_putreg(struct imxrt_lpi2c_priv_s *priv, uint16_t offset, uint32_t value) { putreg32(value, priv->config->base + offset); @@ -502,7 +502,7 @@ static inline void imxrt_lpi2c_putreg(FAR struct imxrt_lpi2c_priv_s *priv, * ****************************************************************************/ -static inline void imxrt_lpi2c_modifyreg(FAR struct imxrt_lpi2c_priv_s *priv, +static inline void imxrt_lpi2c_modifyreg(struct imxrt_lpi2c_priv_s *priv, uint16_t offset, uint32_t clearbits, uint32_t setbits) { @@ -518,7 +518,7 @@ static inline void imxrt_lpi2c_modifyreg(FAR struct imxrt_lpi2c_priv_s *priv, * ****************************************************************************/ -static inline int imxrt_lpi2c_sem_wait(FAR struct imxrt_lpi2c_priv_s *priv) +static inline int imxrt_lpi2c_sem_wait(struct imxrt_lpi2c_priv_s *priv) { return nxsem_wait(&priv->sem_excl); } @@ -533,7 +533,7 @@ static inline int imxrt_lpi2c_sem_wait(FAR struct imxrt_lpi2c_priv_s *priv) #ifdef CONFIG_I2C_RESET static int - imxrt_lpi2c_sem_wait_noncancelable(FAR struct imxrt_lpi2c_priv_s *priv) + imxrt_lpi2c_sem_wait_noncancelable(struct imxrt_lpi2c_priv_s *priv) { return nxsem_wait_uninterruptible(&priv->sem_excl); } @@ -549,7 +549,7 @@ static int ****************************************************************************/ #ifdef CONFIG_IMXRT_LPI2C_DYNTIMEO -static useconds_t imxrt_lpi2c_tousecs(int msgc, FAR struct i2c_msg_s *msgs) +static useconds_t imxrt_lpi2c_tousecs(int msgc, struct i2c_msg_s *msgs) { size_t bytecount = 0; int i; @@ -579,7 +579,7 @@ static useconds_t imxrt_lpi2c_tousecs(int msgc, FAR struct i2c_msg_s *msgs) #ifndef CONFIG_I2C_POLLED static inline int - imxrt_lpi2c_sem_waitdone(FAR struct imxrt_lpi2c_priv_s *priv) + imxrt_lpi2c_sem_waitdone(struct imxrt_lpi2c_priv_s *priv) { struct timespec abstime; irqstate_t flags; @@ -692,7 +692,7 @@ static inline int } #else static inline int - imxrt_lpi2c_sem_waitdone(FAR struct imxrt_lpi2c_priv_s *priv) + imxrt_lpi2c_sem_waitdone(struct imxrt_lpi2c_priv_s *priv) { clock_t timeout; clock_t start; @@ -752,7 +752,7 @@ static inline int ****************************************************************************/ static inline void - imxrt_lpi2c_sem_waitstop(FAR struct imxrt_lpi2c_priv_s *priv) + imxrt_lpi2c_sem_waitstop(struct imxrt_lpi2c_priv_s *priv) { clock_t start; clock_t elapsed; @@ -853,7 +853,7 @@ static inline void imxrt_lpi2c_sem_post(struct imxrt_lpi2c_priv_s *priv) * ****************************************************************************/ -static inline void imxrt_lpi2c_sem_init(FAR struct imxrt_lpi2c_priv_s *priv) +static inline void imxrt_lpi2c_sem_init(struct imxrt_lpi2c_priv_s *priv) { nxsem_init(&priv->sem_excl, 0, 1); @@ -876,7 +876,7 @@ static inline void imxrt_lpi2c_sem_init(FAR struct imxrt_lpi2c_priv_s *priv) ****************************************************************************/ static inline void - imxrt_lpi2c_sem_destroy(FAR struct imxrt_lpi2c_priv_s *priv) + imxrt_lpi2c_sem_destroy(struct imxrt_lpi2c_priv_s *priv) { nxsem_destroy(&priv->sem_excl); #ifndef CONFIG_I2C_POLLED @@ -893,7 +893,7 @@ static inline void ****************************************************************************/ #ifdef CONFIG_I2C_TRACE -static void imxrt_lpi2c_traceclear(FAR struct imxrt_lpi2c_priv_s *priv) +static void imxrt_lpi2c_traceclear(struct imxrt_lpi2c_priv_s *priv) { struct imxrt_trace_s *trace = &priv->trace[priv->tndx]; @@ -904,7 +904,7 @@ static void imxrt_lpi2c_traceclear(FAR struct imxrt_lpi2c_priv_s *priv) trace->time = 0; /* Time of first status or event */ } -static void imxrt_lpi2c_tracereset(FAR struct imxrt_lpi2c_priv_s *priv) +static void imxrt_lpi2c_tracereset(struct imxrt_lpi2c_priv_s *priv) { /* Reset the trace info for a new data collection */ @@ -913,7 +913,7 @@ static void imxrt_lpi2c_tracereset(FAR struct imxrt_lpi2c_priv_s *priv) imxrt_lpi2c_traceclear(priv); } -static void imxrt_lpi2c_tracenew(FAR struct imxrt_lpi2c_priv_s *priv, +static void imxrt_lpi2c_tracenew(struct imxrt_lpi2c_priv_s *priv, uint32_t status) { struct imxrt_trace_s *trace = &priv->trace[priv->tndx]; @@ -953,8 +953,8 @@ static void imxrt_lpi2c_tracenew(FAR struct imxrt_lpi2c_priv_s *priv, } } -static void imxrt_lpi2c_traceevent(FAR struct imxrt_lpi2c_priv_s *priv, - enum imxrt_trace_e event, uint32_t parm) +static void imxrt_lpi2c_traceevent(struct imxrt_lpi2c_priv_s *priv, + enum imxrt_trace_e event, uint32_t parm) { struct imxrt_trace_s *trace; @@ -980,7 +980,7 @@ static void imxrt_lpi2c_traceevent(FAR struct imxrt_lpi2c_priv_s *priv, } } -static void imxrt_lpi2c_tracedump(FAR struct imxrt_lpi2c_priv_s *priv) +static void imxrt_lpi2c_tracedump(struct imxrt_lpi2c_priv_s *priv) { struct imxrt_trace_s *trace; int i; @@ -1009,7 +1009,7 @@ static void imxrt_lpi2c_tracedump(FAR struct imxrt_lpi2c_priv_s *priv) * ****************************************************************************/ -static void imxrt_lpi2c_setclock(FAR struct imxrt_lpi2c_priv_s *priv, +static void imxrt_lpi2c_setclock(struct imxrt_lpi2c_priv_s *priv, uint32_t frequency) { uint32_t src_freq = 0; @@ -1170,7 +1170,7 @@ static void imxrt_lpi2c_setclock(FAR struct imxrt_lpi2c_priv_s *priv, * ****************************************************************************/ -static inline void imxrt_lpi2c_sendstart(FAR struct imxrt_lpi2c_priv_s *priv, +static inline void imxrt_lpi2c_sendstart(struct imxrt_lpi2c_priv_s *priv, uint8_t address) { uint32_t txcount = 0; @@ -1221,7 +1221,7 @@ static inline void imxrt_lpi2c_sendstart(FAR struct imxrt_lpi2c_priv_s *priv, * ****************************************************************************/ -static inline void imxrt_lpi2c_sendstop(FAR struct imxrt_lpi2c_priv_s *priv) +static inline void imxrt_lpi2c_sendstop(struct imxrt_lpi2c_priv_s *priv) { imxrt_lpi2c_putreg(priv, IMXRT_LPI2C_MTDR_OFFSET, LPI2C_MTDR_CMD_STOP); } @@ -1235,7 +1235,7 @@ static inline void imxrt_lpi2c_sendstop(FAR struct imxrt_lpi2c_priv_s *priv) ****************************************************************************/ static inline uint32_t - imxrt_lpi2c_getstatus(FAR struct imxrt_lpi2c_priv_s *priv) + imxrt_lpi2c_getstatus(struct imxrt_lpi2c_priv_s *priv) { return imxrt_lpi2c_getreg(priv, IMXRT_LPI2C_MSR_OFFSET); } @@ -1466,7 +1466,7 @@ static int imxrt_lpi2c_isr_process(struct imxrt_lpi2c_priv_s *priv) ****************************************************************************/ #ifndef CONFIG_I2C_POLLED -static int imxrt_lpi2c_isr(int irq, void *context, FAR void *arg) +static int imxrt_lpi2c_isr(int irq, void *context, void *arg) { struct imxrt_lpi2c_priv_s *priv = (struct imxrt_lpi2c_priv_s *)arg; @@ -1539,7 +1539,7 @@ void imxrt_lpi2c_clock_disable (uint32_t base) * ****************************************************************************/ -static int imxrt_lpi2c_init(FAR struct imxrt_lpi2c_priv_s *priv) +static int imxrt_lpi2c_init(struct imxrt_lpi2c_priv_s *priv) { /* Power-up and configure GPIOs */ @@ -1615,7 +1615,7 @@ static int imxrt_lpi2c_init(FAR struct imxrt_lpi2c_priv_s *priv) * ****************************************************************************/ -static int imxrt_lpi2c_deinit(FAR struct imxrt_lpi2c_priv_s *priv) +static int imxrt_lpi2c_deinit(struct imxrt_lpi2c_priv_s *priv) { /* Disable I2C */ @@ -1652,10 +1652,10 @@ static int imxrt_lpi2c_deinit(FAR struct imxrt_lpi2c_priv_s *priv) * ****************************************************************************/ -static int imxrt_lpi2c_transfer(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count) +static int imxrt_lpi2c_transfer(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count) { - FAR struct imxrt_lpi2c_priv_s *priv = (struct imxrt_lpi2c_priv_s *)dev; + struct imxrt_lpi2c_priv_s *priv = (struct imxrt_lpi2c_priv_s *)dev; int ret; DEBUGASSERT(count > 0); @@ -1767,9 +1767,9 @@ static int imxrt_lpi2c_transfer(FAR struct i2c_master_s *dev, ****************************************************************************/ #ifdef CONFIG_I2C_RESET -static int imxrt_lpi2c_reset(FAR struct i2c_master_s *dev) +static int imxrt_lpi2c_reset(struct i2c_master_s *dev) { - FAR struct imxrt_lpi2c_priv_s *priv = (FAR struct imxrt_lpi2c_priv_s *)dev; + struct imxrt_lpi2c_priv_s *priv = (struct imxrt_lpi2c_priv_s *)dev; unsigned int clock_count; unsigned int stretch_count; uint32_t scl_gpio; @@ -1900,7 +1900,7 @@ out: * ****************************************************************************/ -FAR struct i2c_master_s *imxrt_i2cbus_initialize(int port) +struct i2c_master_s *imxrt_i2cbus_initialize(int port) { struct imxrt_lpi2c_priv_s * priv = NULL; irqstate_t flags; @@ -1958,9 +1958,9 @@ FAR struct i2c_master_s *imxrt_i2cbus_initialize(int port) * ****************************************************************************/ -int imxrt_i2cbus_uninitialize(FAR struct i2c_master_s *dev) +int imxrt_i2cbus_uninitialize(struct i2c_master_s *dev) { - FAR struct imxrt_lpi2c_priv_s *priv = (struct imxrt_lpi2c_priv_s *)dev; + struct imxrt_lpi2c_priv_s *priv = (struct imxrt_lpi2c_priv_s *)dev; irqstate_t flags; DEBUGASSERT(dev); diff --git a/arch/arm/src/imxrt/imxrt_lpi2c.h b/arch/arm/src/imxrt/imxrt_lpi2c.h index c12f985bc5..477097fbb8 100644 --- a/arch/arm/src/imxrt/imxrt_lpi2c.h +++ b/arch/arm/src/imxrt/imxrt_lpi2c.h @@ -52,7 +52,7 @@ * ****************************************************************************/ -FAR struct i2c_master_s *imxrt_i2cbus_initialize(int port); +struct i2c_master_s *imxrt_i2cbus_initialize(int port); /**************************************************************************** * Name: imxrt_i2cbus_uninitialize @@ -69,6 +69,6 @@ FAR struct i2c_master_s *imxrt_i2cbus_initialize(int port); * ****************************************************************************/ -int imxrt_i2cbus_uninitialize(FAR struct i2c_master_s *dev); +int imxrt_i2cbus_uninitialize(struct i2c_master_s *dev); #endif /* __ARCH_ARM_SRC_IMXRT_IMXRT_LPI2C_H */ diff --git a/arch/arm/src/imxrt/imxrt_lpspi.c b/arch/arm/src/imxrt/imxrt_lpspi.c index 22beebecb4..e8afad3928 100644 --- a/arch/arm/src/imxrt/imxrt_lpspi.c +++ b/arch/arm/src/imxrt/imxrt_lpspi.c @@ -131,52 +131,52 @@ enum imxrt_delay_e /* Helpers */ static inline uint32_t -imxrt_lpspi_getreg32(FAR struct imxrt_lpspidev_s *priv, - uint8_t offset); -static inline void imxrt_lpspi_putreg32(FAR struct imxrt_lpspidev_s *priv, +imxrt_lpspi_getreg32(struct imxrt_lpspidev_s *priv, + uint8_t offset); +static inline void imxrt_lpspi_putreg32(struct imxrt_lpspidev_s *priv, uint8_t offset, uint32_t value); static inline uint32_t imxrt_lpspi_readword( - FAR struct imxrt_lpspidev_s *priv); -static inline void imxrt_lpspi_writeword(FAR struct imxrt_lpspidev_s *priv, + struct imxrt_lpspidev_s *priv); +static inline void imxrt_lpspi_writeword(struct imxrt_lpspidev_s *priv, uint16_t byte); static inline bool imxrt_lpspi_9to16bitmode( - FAR struct imxrt_lpspidev_s *priv); -static inline void imxrt_lpspi_master_set_delays(FAR struct imxrt_lpspidev_s + struct imxrt_lpspidev_s *priv); +static inline void imxrt_lpspi_master_set_delays(struct imxrt_lpspidev_s *priv, uint32_t delay_ns, enum imxrt_delay_e type); static inline void imxrt_lpspi_master_set_delay_scaler( - FAR struct imxrt_lpspidev_s *priv, + struct imxrt_lpspidev_s *priv, uint32_t scaler, enum imxrt_delay_e type); /* SPI methods */ -static int imxrt_lpspi_lock(FAR struct spi_dev_s *dev, bool lock); -static uint32_t imxrt_lpspi_setfrequency(FAR struct spi_dev_s *dev, +static int imxrt_lpspi_lock(struct spi_dev_s *dev, bool lock); +static uint32_t imxrt_lpspi_setfrequency(struct spi_dev_s *dev, uint32_t frequency); -static void imxrt_lpspi_setmode(FAR struct spi_dev_s *dev, +static void imxrt_lpspi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode); -static void imxrt_lpspi_setbits(FAR struct spi_dev_s *dev, int nbits); +static void imxrt_lpspi_setbits(struct spi_dev_s *dev, int nbits); #ifdef CONFIG_SPI_HWFEATURES -static int imxrt_lpspi_hwfeatures(FAR struct spi_dev_s *dev, +static int imxrt_lpspi_hwfeatures(struct spi_dev_s *dev, imxrt_lpspi_hwfeatures_t features); #endif -static uint32_t imxrt_lpspi_send(FAR struct spi_dev_s *dev, uint32_t wd); -static void imxrt_lpspi_exchange(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, - FAR void *rxbuffer, +static uint32_t imxrt_lpspi_send(struct spi_dev_s *dev, uint32_t wd); +static void imxrt_lpspi_exchange(struct spi_dev_s *dev, + const void *txbuffer, + void *rxbuffer, size_t nwords); #ifndef CONFIG_SPI_EXCHANGE -static void imxrt_lpspi_sndblock(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, size_t nwords); -static void imxrt_lpspi_recvblock(FAR struct spi_dev_s *dev, - FAR void *rxbuffer, +static void imxrt_lpspi_sndblock(struct spi_dev_s *dev, + const void *txbuffer, size_t nwords); +static void imxrt_lpspi_recvblock(struct spi_dev_s *dev, + void *rxbuffer, size_t nwords); #endif /* Initialization */ -static void imxrt_lpspi_bus_initialize(FAR struct imxrt_lpspidev_s *priv); +static void imxrt_lpspi_bus_initialize(struct imxrt_lpspidev_s *priv); /**************************************************************************** * Private Data @@ -385,7 +385,7 @@ static struct imxrt_lpspidev_s g_lpspi4dev = * ****************************************************************************/ -static inline uint8_t imxrt_lpspi_getreg8(FAR struct imxrt_lpspidev_s *priv, +static inline uint8_t imxrt_lpspi_getreg8(struct imxrt_lpspidev_s *priv, uint8_t offset) { return getreg8(priv->spibase + offset); @@ -404,7 +404,7 @@ static inline uint8_t imxrt_lpspi_getreg8(FAR struct imxrt_lpspidev_s *priv, * ****************************************************************************/ -static inline void imxrt_lpspi_putreg8(FAR struct imxrt_lpspidev_s *priv, +static inline void imxrt_lpspi_putreg8(struct imxrt_lpspidev_s *priv, uint8_t offset, uint8_t value) { putreg8(value, priv->spibase + offset); @@ -426,7 +426,7 @@ static inline void imxrt_lpspi_putreg8(FAR struct imxrt_lpspidev_s *priv, ****************************************************************************/ static inline uint32_t -imxrt_lpspi_getreg32(FAR struct imxrt_lpspidev_s *priv, +imxrt_lpspi_getreg32(struct imxrt_lpspidev_s *priv, uint8_t offset) { return getreg32(priv->spibase + offset); @@ -448,7 +448,7 @@ imxrt_lpspi_getreg32(FAR struct imxrt_lpspidev_s *priv, * ****************************************************************************/ -static inline void imxrt_lpspi_putreg32(FAR struct imxrt_lpspidev_s *priv, +static inline void imxrt_lpspi_putreg32(struct imxrt_lpspidev_s *priv, uint8_t offset, uint32_t value) { putreg32(value, priv->spibase + offset); @@ -469,7 +469,7 @@ static inline void imxrt_lpspi_putreg32(FAR struct imxrt_lpspidev_s *priv, ****************************************************************************/ static inline uint32_t -imxrt_lpspi_readword(FAR struct imxrt_lpspidev_s *priv) +imxrt_lpspi_readword(struct imxrt_lpspidev_s *priv) { /* Wait until the receive buffer is not empty */ @@ -496,7 +496,7 @@ imxrt_lpspi_readword(FAR struct imxrt_lpspidev_s *priv) * ****************************************************************************/ -static inline void imxrt_lpspi_writeword(FAR struct imxrt_lpspidev_s *priv, +static inline void imxrt_lpspi_writeword(struct imxrt_lpspidev_s *priv, uint16_t word) { /* Wait until the transmit buffer is empty */ @@ -523,7 +523,7 @@ static inline void imxrt_lpspi_writeword(FAR struct imxrt_lpspidev_s *priv, * ****************************************************************************/ -static inline uint8_t imxrt_lpspi_readbyte(FAR struct imxrt_lpspidev_s *priv) +static inline uint8_t imxrt_lpspi_readbyte(struct imxrt_lpspidev_s *priv) { /* Wait until the receive buffer is not empty */ @@ -550,7 +550,7 @@ static inline uint8_t imxrt_lpspi_readbyte(FAR struct imxrt_lpspidev_s *priv) * ****************************************************************************/ -static inline void imxrt_lpspi_writebyte(FAR struct imxrt_lpspidev_s *priv, +static inline void imxrt_lpspi_writebyte(struct imxrt_lpspidev_s *priv, uint8_t byte) { /* Wait until the transmit buffer is empty */ @@ -578,7 +578,7 @@ static inline void imxrt_lpspi_writebyte(FAR struct imxrt_lpspidev_s *priv, ****************************************************************************/ static inline bool -imxrt_lpspi_9to16bitmode(FAR struct imxrt_lpspidev_s *priv) +imxrt_lpspi_9to16bitmode(struct imxrt_lpspidev_s *priv) { bool ret; @@ -612,7 +612,7 @@ imxrt_lpspi_9to16bitmode(FAR struct imxrt_lpspidev_s *priv) * ****************************************************************************/ -static void imxrt_lpspi_modifyreg32(FAR struct imxrt_lpspidev_s *priv, +static void imxrt_lpspi_modifyreg32(struct imxrt_lpspidev_s *priv, uint8_t offset, uint32_t clrbits, uint32_t setbits) { @@ -636,7 +636,7 @@ static void imxrt_lpspi_modifyreg32(FAR struct imxrt_lpspidev_s *priv, ****************************************************************************/ static inline void imxrt_lpspi_master_set_delay_scaler( - FAR struct imxrt_lpspidev_s *priv, + struct imxrt_lpspidev_s *priv, uint32_t scaler, enum imxrt_delay_e type) { @@ -682,7 +682,7 @@ static inline void imxrt_lpspi_master_set_delay_scaler( ****************************************************************************/ static inline void imxrt_lpspi_master_set_delays( - FAR struct imxrt_lpspidev_s *priv, + struct imxrt_lpspidev_s *priv, uint32_t delay_ns, enum imxrt_delay_e type) { @@ -849,9 +849,9 @@ static inline void imxrt_lpspi_master_set_delays( * ****************************************************************************/ -static int imxrt_lpspi_lock(FAR struct spi_dev_s *dev, bool lock) +static int imxrt_lpspi_lock(struct spi_dev_s *dev, bool lock) { - FAR struct imxrt_lpspidev_s *priv = (FAR struct imxrt_lpspidev_s *)dev; + struct imxrt_lpspidev_s *priv = (struct imxrt_lpspidev_s *)dev; int ret; if (lock) @@ -881,10 +881,10 @@ static int imxrt_lpspi_lock(FAR struct spi_dev_s *dev, bool lock) * ****************************************************************************/ -static uint32_t imxrt_lpspi_setfrequency(FAR struct spi_dev_s *dev, +static uint32_t imxrt_lpspi_setfrequency(struct spi_dev_s *dev, uint32_t frequency) { - FAR struct imxrt_lpspidev_s *priv = (FAR struct imxrt_lpspidev_s *)dev; + struct imxrt_lpspidev_s *priv = (struct imxrt_lpspidev_s *)dev; uint32_t men; uint32_t pll_freq; @@ -1018,10 +1018,10 @@ static uint32_t imxrt_lpspi_setfrequency(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void imxrt_lpspi_setmode(FAR struct spi_dev_s *dev, +static void imxrt_lpspi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) { - FAR struct imxrt_lpspidev_s *priv = (FAR struct imxrt_lpspidev_s *)dev; + struct imxrt_lpspidev_s *priv = (struct imxrt_lpspidev_s *)dev; uint32_t setbits; uint32_t clrbits; uint32_t men; @@ -1107,9 +1107,9 @@ static void imxrt_lpspi_setmode(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void imxrt_lpspi_setbits(FAR struct spi_dev_s *dev, int nbits) +static void imxrt_lpspi_setbits(struct spi_dev_s *dev, int nbits) { - FAR struct imxrt_lpspidev_s *priv = (FAR struct imxrt_lpspidev_s *)dev; + struct imxrt_lpspidev_s *priv = (struct imxrt_lpspidev_s *)dev; uint32_t men; spiinfo("nbits=%d\n", nbits); @@ -1169,11 +1169,11 @@ static void imxrt_lpspi_setbits(FAR struct spi_dev_s *dev, int nbits) ****************************************************************************/ #ifdef CONFIG_SPI_HWFEATURES -static int imxrt_lpspi_hwfeatures(FAR struct spi_dev_s *dev, +static int imxrt_lpspi_hwfeatures(struct spi_dev_s *dev, imxrt_lpspi_hwfeatures_t features) { #ifdef CONFIG_SPI_BITORDER - FAR struct imxrt_lpspidev_s *priv = (FAR struct imxrt_lpspidev_s *)dev; + struct imxrt_lpspidev_s *priv = (struct imxrt_lpspidev_s *)dev; uint32_t setbits; uint32_t clrbits; @@ -1219,9 +1219,9 @@ static int imxrt_lpspi_hwfeatures(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static uint32_t imxrt_lpspi_send(FAR struct spi_dev_s *dev, uint32_t wd) +static uint32_t imxrt_lpspi_send(struct spi_dev_s *dev, uint32_t wd) { - FAR struct imxrt_lpspidev_s *priv = (FAR struct imxrt_lpspidev_s *)dev; + struct imxrt_lpspidev_s *priv = (struct imxrt_lpspidev_s *)dev; uint32_t regval; uint32_t ret; @@ -1271,17 +1271,17 @@ static uint32_t imxrt_lpspi_send(FAR struct spi_dev_s *dev, uint32_t wd) #if !defined(CONFIG_IMXRT_LPSPI_DMA) || defined(CONFIG_IMXRT_DMACAPABLE) #if !defined(CONFIG_IMXRT_LPSPI_DMA) -static void imxrt_lpspi_exchange(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, - FAR void *rxbuffer, +static void imxrt_lpspi_exchange(struct spi_dev_s *dev, + const void *txbuffer, + void *rxbuffer, size_t nwords) #else -static void imxrt_lpspi_exchange_nodma(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, - FAR void *rxbuffer, size_t nwords) +static void imxrt_lpspi_exchange_nodma(struct spi_dev_s *dev, + const void *txbuffer, + void *rxbuffer, size_t nwords) #endif { - FAR struct imxrt_lpspidev_s *priv = (FAR struct imxrt_lpspidev_s *)dev; + struct imxrt_lpspidev_s *priv = (struct imxrt_lpspidev_s *)dev; DEBUGASSERT(priv && priv->spibase); spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); @@ -1378,8 +1378,8 @@ static void imxrt_lpspi_exchange_nodma(FAR struct spi_dev_s *dev, ****************************************************************************/ #ifndef CONFIG_SPI_EXCHANGE -static void imxrt_lpspi_sndblock(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, size_t nwords) +static void imxrt_lpspi_sndblock(struct spi_dev_s *dev, + const void *txbuffer, size_t nwords) { spiinfo("txbuffer=%p nwords=%d\n", txbuffer, nwords); return imxrt_lpspi_exchange(dev, txbuffer, NULL, nwords); @@ -1407,8 +1407,8 @@ static void imxrt_lpspi_sndblock(FAR struct spi_dev_s *dev, ****************************************************************************/ #ifndef CONFIG_SPI_EXCHANGE -static void imxrt_lpspi_recvblock(FAR struct spi_dev_s *dev, - FAR void *rxbuffer, size_t nwords) +static void imxrt_lpspi_recvblock(struct spi_dev_s *dev, + void *rxbuffer, size_t nwords) { spiinfo("rxbuffer=%p nwords=%d\n", rxbuffer, nwords); return imxrt_lpspi_exchange(dev, NULL, rxbuffer, nwords); @@ -1520,7 +1520,7 @@ static void imxrt_lpspi_bus_initialize(struct imxrt_lpspidev_s *priv) /* Set frequency and delay times */ - imxrt_lpspi_setfrequency((FAR struct spi_dev_s *)priv, 400000); + imxrt_lpspi_setfrequency((struct spi_dev_s *)priv, 400000); /* Set default watermarks */ @@ -1529,9 +1529,9 @@ static void imxrt_lpspi_bus_initialize(struct imxrt_lpspidev_s *priv) /* Set Transmit Command Register */ - imxrt_lpspi_setbits((FAR struct spi_dev_s *)priv, 8); + imxrt_lpspi_setbits((struct spi_dev_s *)priv, 8); - imxrt_lpspi_setmode((FAR struct spi_dev_s *)priv, SPIDEV_MODE0); + imxrt_lpspi_setmode((struct spi_dev_s *)priv, SPIDEV_MODE0); /* Initialize the SPI semaphore that enforces mutually exclusive access */ @@ -1560,9 +1560,9 @@ static void imxrt_lpspi_bus_initialize(struct imxrt_lpspidev_s *priv) * ****************************************************************************/ -FAR struct spi_dev_s *imxrt_lpspibus_initialize(int bus) +struct spi_dev_s *imxrt_lpspibus_initialize(int bus) { - FAR struct imxrt_lpspidev_s *priv = NULL; + struct imxrt_lpspidev_s *priv = NULL; irqstate_t flags = enter_critical_section(); @@ -1696,7 +1696,7 @@ FAR struct spi_dev_s *imxrt_lpspibus_initialize(int bus) leave_critical_section(flags); - return (FAR struct spi_dev_s *)priv; + return (struct spi_dev_s *)priv; } #endif /* CONFIG_IMXRT_LPSPI1 */ diff --git a/arch/arm/src/imxrt/imxrt_lpspi.h b/arch/arm/src/imxrt/imxrt_lpspi.h index fe22494fa4..4849908491 100644 --- a/arch/arm/src/imxrt/imxrt_lpspi.h +++ b/arch/arm/src/imxrt/imxrt_lpspi.h @@ -65,7 +65,7 @@ struct spi_dev_s; /* Forward reference */ * ****************************************************************************/ -FAR struct spi_dev_s *imxrt_lpspibus_initialize(int bus); +struct spi_dev_s *imxrt_lpspibus_initialize(int bus); /**************************************************************************** * Name: imxrt_lpspi1/2/...select and imxrt_lpspi1/2/...status @@ -99,34 +99,34 @@ FAR struct spi_dev_s *imxrt_lpspibus_initialize(int bus); ****************************************************************************/ #ifdef CONFIG_IMXRT_LPSPI1 -void imxrt_lpspi1select(FAR struct spi_dev_s *dev, +void imxrt_lpspi1select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t imxrt_lpspi1status(FAR struct spi_dev_s *dev, uint32_t devid); -int imxrt_lpspi1cmddata(FAR struct spi_dev_s *dev, +uint8_t imxrt_lpspi1status(struct spi_dev_s *dev, uint32_t devid); +int imxrt_lpspi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #ifdef CONFIG_IMXRT_LPSPI2 -void imxrt_lpspi2select(FAR struct spi_dev_s *dev, +void imxrt_lpspi2select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t imxrt_lpspi2status(FAR struct spi_dev_s *dev, uint32_t devid); -int imxrt_lpspi2cmddata(FAR struct spi_dev_s *dev, +uint8_t imxrt_lpspi2status(struct spi_dev_s *dev, uint32_t devid); +int imxrt_lpspi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #ifdef CONFIG_IMXRT_LPSPI3 -void imxrt_lpspi3select(FAR struct spi_dev_s *dev, +void imxrt_lpspi3select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t imxrt_lpspi3status(FAR struct spi_dev_s *dev, uint32_t devid); -int imxrt_lpspi3cmddata(FAR struct spi_dev_s *dev, +uint8_t imxrt_lpspi3status(struct spi_dev_s *dev, uint32_t devid); +int imxrt_lpspi3cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #ifdef CONFIG_IMXRT_LPSPI4 -void imxrt_lpspi4select(FAR struct spi_dev_s *dev, +void imxrt_lpspi4select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t imxrt_lpspi4status(FAR struct spi_dev_s *dev, uint32_t devid); -int imxrt_lpspi4cmddata(FAR struct spi_dev_s *dev, +uint8_t imxrt_lpspi4status(struct spi_dev_s *dev, uint32_t devid); +int imxrt_lpspi4cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif @@ -152,27 +152,27 @@ int imxrt_lpspi4cmddata(FAR struct spi_dev_s *dev, #ifdef CONFIG_SPI_CALLBACK #ifdef CONFIG_IMXRT_LPSPI1 -int imxrt_lpspi1register(FAR struct spi_dev_s *dev, +int imxrt_lpspi1register(struct spi_dev_s *dev, spi_mediachange_t callback, - FAR void *arg); + void *arg); #endif #ifdef CONFIG_IMXRT_LPSPI2 -int imxrt_lpspi2register(FAR struct spi_dev_s *dev, +int imxrt_lpspi2register(struct spi_dev_s *dev, spi_mediachange_t callback, - FAR void *arg); + void *arg); #endif #ifdef CONFIG_IMXRT_LPSPI3 -int imxrt_lpspi3register(FAR struct spi_dev_s *dev, +int imxrt_lpspi3register(struct spi_dev_s *dev, spi_mediachange_t callback, - FAR void *arg); + void *arg); #endif #ifdef CONFIG_IMXRT_LPSPI4 -int imxrt_lpspi4register(FAR struct spi_dev_s *dev, +int imxrt_lpspi4register(struct spi_dev_s *dev, spi_mediachange_t callback, - FAR void *arg); + void *arg); #endif #endif diff --git a/arch/arm/src/imxrt/imxrt_lpsrtc.c b/arch/arm/src/imxrt/imxrt_lpsrtc.c index 33def0d394..04429bf1b7 100644 --- a/arch/arm/src/imxrt/imxrt_lpsrtc.c +++ b/arch/arm/src/imxrt/imxrt_lpsrtc.c @@ -184,7 +184,7 @@ time_t up_rtc_time(void) * ****************************************************************************/ -int up_rtc_settime(FAR const struct timespec *ts) +int up_rtc_settime(const struct timespec *ts) { uint32_t regval; diff --git a/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c b/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c index dd8771c52e..a9415697bf 100644 --- a/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c +++ b/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c @@ -55,19 +55,19 @@ struct imxrt_lowerhalf_s * operations vtable (which may lie in FLASH or ROM) */ - FAR const struct rtc_ops_s *ops; + const struct rtc_ops_s *ops; /* Data following is private to this driver and not visible outside of * this file. */ - sem_t devsem; /* Threads can only exclusively access the RTC */ + sem_t devsem; /* Threads can only exclusively access the RTC */ #ifdef CONFIG_RTC_ALARM /* Alarm callback information */ - volatile rtc_alarm_callback_t cb; /* Callback when the alarm expires */ - volatile FAR void *priv; /* Private argument to accompany callback */ + volatile rtc_alarm_callback_t cb; /* Callback when the alarm expires */ + volatile void *priv; /* Private argument to accompany callback */ #endif }; @@ -77,21 +77,21 @@ struct imxrt_lowerhalf_s /* Prototypes for static methods in struct rtc_ops_s */ -static int imxrt_rdtime(FAR struct rtc_lowerhalf_s *lower, - FAR struct rtc_time *rtctime); -static int imxrt_settime(FAR struct rtc_lowerhalf_s *lower, - FAR const struct rtc_time *rtctime); -static bool imxrt_havesettime(FAR struct rtc_lowerhalf_s *lower); +static int imxrt_rdtime(struct rtc_lowerhalf_s *lower, + struct rtc_time *rtctime); +static int imxrt_settime(struct rtc_lowerhalf_s *lower, + const struct rtc_time *rtctime); +static bool imxrt_havesettime(struct rtc_lowerhalf_s *lower); #ifdef CONFIG_RTC_ALARM -static int imxrt_setalarm(FAR struct rtc_lowerhalf_s *lower, - FAR const struct lower_setalarm_s *alarminfo); -static int imxrt_setrelative(FAR struct rtc_lowerhalf_s *lower, - FAR const struct lower_setrelative_s *alarminfo); -static int imxrt_cancelalarm(FAR struct rtc_lowerhalf_s *lower, +static int imxrt_setalarm(struct rtc_lowerhalf_s *lower, + const struct lower_setalarm_s *alarminfo); +static int imxrt_setrelative(struct rtc_lowerhalf_s *lower, + const struct lower_setrelative_s *alarminfo); +static int imxrt_cancelalarm(struct rtc_lowerhalf_s *lower, int alarmid); -static int imxrt_rdalarm(FAR struct rtc_lowerhalf_s *lower, - FAR struct lower_rdalarm_s *alarminfo); +static int imxrt_rdalarm(struct rtc_lowerhalf_s *lower, + struct lower_rdalarm_s *alarminfo); #endif /**************************************************************************** @@ -152,14 +152,14 @@ static struct imxrt_lowerhalf_s g_rtc_lowerhalf = #ifdef CONFIG_RTC_ALARM static void imxrt_alarm_callback(void) { - FAR struct imxrt_lowerhalf_s *rtc = &g_rtc_lowerhalf; + struct imxrt_lowerhalf_s *rtc = &g_rtc_lowerhalf; /* Sample and clear the callback information to minimize the window in * time in which race conditions can occur. */ rtc_alarm_callback_t cb = (rtc_alarm_callback_t)rtc->cb; - FAR void *arg = (FAR void *)rtc->priv; + void *arg = (void *)rtc->priv; rtc->cb = NULL; rtc->priv = NULL; @@ -189,8 +189,8 @@ static void imxrt_alarm_callback(void) * ****************************************************************************/ -static int imxrt_rdtime(FAR struct rtc_lowerhalf_s *lower, - FAR struct rtc_time *rtctime) +static int imxrt_rdtime(struct rtc_lowerhalf_s *lower, + struct rtc_time *rtctime) { time_t timer; @@ -200,7 +200,7 @@ static int imxrt_rdtime(FAR struct rtc_lowerhalf_s *lower, /* Convert the one second epoch time to a struct tm */ - if (gmtime_r(&timer, (FAR struct tm *)rtctime) == 0) + if (gmtime_r(&timer, (struct tm *)rtctime) == 0) { int errcode = get_errno(); DEBUGASSERT(errcode > 0); @@ -228,8 +228,8 @@ static int imxrt_rdtime(FAR struct rtc_lowerhalf_s *lower, * ****************************************************************************/ -static int imxrt_settime(FAR struct rtc_lowerhalf_s *lower, - FAR const struct rtc_time *rtctime) +static int imxrt_settime(struct rtc_lowerhalf_s *lower, + const struct rtc_time *rtctime) { struct timespec ts; @@ -237,7 +237,7 @@ static int imxrt_settime(FAR struct rtc_lowerhalf_s *lower, * rtc_time is cast compatible with struct tm. */ - ts.tv_sec = timegm((FAR struct tm *)rtctime); + ts.tv_sec = timegm((struct tm *)rtctime); ts.tv_nsec = 0; /* Now set the time (to one second accuracy) */ @@ -259,7 +259,7 @@ static int imxrt_settime(FAR struct rtc_lowerhalf_s *lower, * ****************************************************************************/ -static bool imxrt_havesettime(FAR struct rtc_lowerhalf_s *lower) +static bool imxrt_havesettime(struct rtc_lowerhalf_s *lower) { #ifdef CONFIG_IMXRT_SNVS_LPSRTC return imxrt_lpsrtc_havesettime(); @@ -286,14 +286,14 @@ static bool imxrt_havesettime(FAR struct rtc_lowerhalf_s *lower) ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -static int imxrt_setalarm(FAR struct rtc_lowerhalf_s *lower, - FAR const struct lower_setalarm_s *alarminfo) +static int imxrt_setalarm(struct rtc_lowerhalf_s *lower, + const struct lower_setalarm_s *alarminfo) { - FAR struct imxrt_lowerhalf_s *rtc; + struct imxrt_lowerhalf_s *rtc; int ret; DEBUGASSERT(lower != NULL && alarminfo != NULL && alarminfo->id == 0); - rtc = (FAR struct imxrt_lowerhalf_s *)lower; + rtc = (struct imxrt_lowerhalf_s *)lower; /* Get exclusive access to the alarm */ @@ -311,7 +311,7 @@ static int imxrt_setalarm(FAR struct rtc_lowerhalf_s *lower, /* Convert the RTC time to a timespec (1 second accuracy) */ - ts.tv_sec = timegm((FAR struct tm *)&alarminfo->time); + ts.tv_sec = timegm((struct tm *)&alarminfo->time); ts.tv_nsec = 0; /* Remember the callback information */ @@ -352,15 +352,15 @@ static int imxrt_setalarm(FAR struct rtc_lowerhalf_s *lower, ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -static int imxrt_setrelative(FAR struct rtc_lowerhalf_s *lower, - FAR const struct lower_setrelative_s *alarminfo) +static int imxrt_setrelative(struct rtc_lowerhalf_s *lower, + const struct lower_setrelative_s *alarminfo) { - FAR struct imxrt_lowerhalf_s *rtc; - FAR struct timespec ts; + struct imxrt_lowerhalf_s *rtc; + struct timespec ts; int ret = -EINVAL; DEBUGASSERT(lower != NULL && alarminfo != NULL && alarminfo->id == 0); - rtc = (FAR struct imxrt_lowerhalf_s *)lower; + rtc = (struct imxrt_lowerhalf_s *)lower; /* Get exclusive access to the alarm */ @@ -425,7 +425,7 @@ static int imxrt_setrelative(FAR struct rtc_lowerhalf_s *lower, ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -static int imxrt_cancelalarm(FAR struct rtc_lowerhalf_s *lower, int alarmid) +static int imxrt_cancelalarm(struct rtc_lowerhalf_s *lower, int alarmid) { /* We cancel the alarm by alarm by disabling the alarm and the alarm * interrupt. @@ -453,8 +453,8 @@ static int imxrt_cancelalarm(FAR struct rtc_lowerhalf_s *lower, int alarmid) ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -static int imxrt_rdalarm(FAR struct rtc_lowerhalf_s *lower, - FAR struct lower_rdalarm_s *alarminfo) +static int imxrt_rdalarm(struct rtc_lowerhalf_s *lower, + struct lower_rdalarm_s *alarminfo) { int ret = -EINVAL; @@ -474,7 +474,7 @@ static int imxrt_rdalarm(FAR struct rtc_lowerhalf_s *lower, /* Convert the one second epoch time to a struct tm */ ret = OK; - if (gmtime_r(&alarm, (FAR struct tm *)alarminfo->time) == 0) + if (gmtime_r(&alarm, (struct tm *)alarminfo->time) == 0) { int errcode = get_errno(); DEBUGASSERT(errcode > 0); @@ -511,11 +511,11 @@ static int imxrt_rdalarm(FAR struct rtc_lowerhalf_s *lower, * ****************************************************************************/ -FAR struct rtc_lowerhalf_s *imxrt_rtc_lowerhalf(void) +struct rtc_lowerhalf_s *imxrt_rtc_lowerhalf(void) { nxsem_init(&g_rtc_lowerhalf.devsem, 0, 1); - return (FAR struct rtc_lowerhalf_s *)&g_rtc_lowerhalf; + return (struct rtc_lowerhalf_s *)&g_rtc_lowerhalf; } #endif /* CONFIG_RTC_DRIVER */ diff --git a/arch/arm/src/imxrt/imxrt_serial.c b/arch/arm/src/imxrt/imxrt_serial.c index fc3db983a8..7bd8ec397d 100644 --- a/arch/arm/src/imxrt/imxrt_serial.c +++ b/arch/arm/src/imxrt/imxrt_serial.c @@ -352,7 +352,7 @@ static int imxrt_setup(struct uart_dev_s *dev); static void imxrt_shutdown(struct uart_dev_s *dev); static int imxrt_attach(struct uart_dev_s *dev); static void imxrt_detach(struct uart_dev_s *dev); -static int imxrt_interrupt(int irq, void *context, FAR void *arg); +static int imxrt_interrupt(int irq, void *context, void *arg); static int imxrt_ioctl(struct file *filep, int cmd, unsigned long arg); static int imxrt_receive(struct uart_dev_s *dev, unsigned int *status); static void imxrt_rxint(struct uart_dev_s *dev, bool enable); @@ -1054,7 +1054,7 @@ static void imxrt_detach(struct uart_dev_s *dev) * ****************************************************************************/ -static int imxrt_interrupt(int irq, void *context, FAR void *arg) +static int imxrt_interrupt(int irq, void *context, void *arg) { struct uart_dev_s *dev = (struct uart_dev_s *)arg; struct imxrt_uart_s *priv; diff --git a/arch/arm/src/imxrt/imxrt_tickless.c b/arch/arm/src/imxrt/imxrt_tickless.c index d5537be3b2..ec33d4878f 100644 --- a/arch/arm/src/imxrt/imxrt_tickless.c +++ b/arch/arm/src/imxrt/imxrt_tickless.c @@ -27,10 +27,10 @@ * * void up_timer_initialize(void): Initializes the timer facilities. * Called early in the initialization sequence (by up_initialize()). - * int up_timer_gettime(FAR struct timespec *ts): Returns the current + * int up_timer_gettime(struct timespec *ts): Returns the current * time from the platform specific time source. * int up_timer_cancel(void): Cancels the interval timer. - * int up_timer_start(FAR const struct timespec *ts): Start (or re-starts) + * int up_timer_start(const struct timespec *ts): Start (or re-starts) * the interval timer. * * The RTOS will provide the following interfaces for use by the platform- @@ -386,7 +386,7 @@ void up_timer_initialize(void) * up_timer_initialize() was called). This function is functionally * equivalent to: * - * int clock_gettime(clockid_t clockid, FAR struct timespec *ts); + * int clock_gettime(clockid_t clockid, struct timespec *ts); * * when clockid is CLOCK_MONOTONIC. * @@ -411,7 +411,7 @@ void up_timer_initialize(void) * ****************************************************************************/ -int up_timer_gettime(FAR struct timespec *ts) +int up_timer_gettime(struct timespec *ts) { uint64_t usec; uint32_t counter; @@ -498,7 +498,7 @@ int up_timer_gettime(FAR struct timespec *ts) * ****************************************************************************/ -int up_alarm_start(FAR const struct timespec *ts) +int up_alarm_start(const struct timespec *ts) { size_t offset = 1; uint64_t tm = ((uint64_t)ts->tv_sec * NSEC_PER_SEC + ts->tv_nsec) / @@ -581,7 +581,7 @@ int up_alarm_start(FAR const struct timespec *ts) * ****************************************************************************/ -int up_alarm_cancel(FAR struct timespec *ts) +int up_alarm_cancel(struct timespec *ts) { uint64_t nsecs = (((uint64_t)g_tickless.overflow << 32) | \ getreg32(g_tickless.base + IMXRT_GPT_CNT_OFFSET)) * \ diff --git a/arch/arm/src/imxrt/imxrt_usbdev.c b/arch/arm/src/imxrt/imxrt_usbdev.c index 63352b59b2..fc288a9657 100644 --- a/arch/arm/src/imxrt/imxrt_usbdev.c +++ b/arch/arm/src/imxrt/imxrt_usbdev.c @@ -418,10 +418,10 @@ static inline void imxrt_chgbits(uint32_t mask, uint32_t val, uint32_t addr); /* Request queue operations *************************************************/ -static FAR struct imxrt_req_s *imxrt_rqdequeue( - FAR struct imxrt_ep_s *privep); -static bool imxrt_rqenqueue(FAR struct imxrt_ep_s *privep, - FAR struct imxrt_req_s *req); +static struct imxrt_req_s *imxrt_rqdequeue( + struct imxrt_ep_s *privep); +static bool imxrt_rqenqueue(struct imxrt_ep_s *privep, + struct imxrt_req_s *req); /* Low level data transfers and request operations **************************/ @@ -465,35 +465,35 @@ static void imxrt_ep0nak(struct imxrt_usbdev_s *priv, uint8_t epphy); static bool imxrt_epcomplete(struct imxrt_usbdev_s *priv, uint8_t epphy); -static int imxrt_usbinterrupt(int irq, FAR void *context, - FAR void *arg); +static int imxrt_usbinterrupt(int irq, void *context, + void *arg); /* Endpoint operations ******************************************************/ /* USB device controller operations *****************************************/ -static int imxrt_epconfigure(FAR struct usbdev_ep_s *ep, +static int imxrt_epconfigure(struct usbdev_ep_s *ep, const struct usb_epdesc_s *desc, bool last); -static int imxrt_epdisable(FAR struct usbdev_ep_s *ep); -static FAR struct usbdev_req_s *imxrt_epallocreq(FAR struct usbdev_ep_s *ep); -static void imxrt_epfreereq(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *); +static int imxrt_epdisable(struct usbdev_ep_s *ep); +static struct usbdev_req_s *imxrt_epallocreq(struct usbdev_ep_s *ep); +static void imxrt_epfreereq(struct usbdev_ep_s *ep, + struct usbdev_req_s *); #ifdef CONFIG_USBDEV_DMA -static void *imxrt_epallocbuffer(FAR struct usbdev_ep_s *ep, +static void *imxrt_epallocbuffer(struct usbdev_ep_s *ep, uint16_t bytes); -static void imxrt_epfreebuffer(FAR struct usbdev_ep_s *ep, - FAR void *buf); +static void imxrt_epfreebuffer(struct usbdev_ep_s *ep, + void *buf); #endif -static int imxrt_epsubmit(FAR struct usbdev_ep_s *ep, +static int imxrt_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req); -static int imxrt_epcancel(FAR struct usbdev_ep_s *ep, +static int imxrt_epcancel(struct usbdev_ep_s *ep, struct usbdev_req_s *req); -static int imxrt_epstall(FAR struct usbdev_ep_s *ep, bool resume); +static int imxrt_epstall(struct usbdev_ep_s *ep, bool resume); -static FAR struct usbdev_ep_s *imxrt_allocep(FAR struct usbdev_s *dev, +static struct usbdev_ep_s *imxrt_allocep(struct usbdev_s *dev, uint8_t epno, bool in, uint8_t eptype); -static void imxrt_freeep(FAR struct usbdev_s *dev, - FAR struct usbdev_ep_s *ep); +static void imxrt_freeep(struct usbdev_s *dev, + struct usbdev_ep_s *ep); static int imxrt_getframe(struct usbdev_s *dev); static int imxrt_wakeup(struct usbdev_s *dev); static int imxrt_selfpowered(struct usbdev_s *dev, bool selfpowered); @@ -686,9 +686,9 @@ static inline void imxrt_chgbits(uint32_t mask, uint32_t val, uint32_t addr) * ****************************************************************************/ -static FAR struct imxrt_req_s *imxrt_rqdequeue(FAR struct imxrt_ep_s *privep) +static struct imxrt_req_s *imxrt_rqdequeue(struct imxrt_ep_s *privep) { - FAR struct imxrt_req_s *ret = privep->head; + struct imxrt_req_s *ret = privep->head; if (ret) { @@ -712,8 +712,8 @@ static FAR struct imxrt_req_s *imxrt_rqdequeue(FAR struct imxrt_ep_s *privep) * ****************************************************************************/ -static bool imxrt_rqenqueue(FAR struct imxrt_ep_s *privep, - FAR struct imxrt_req_s *req) +static bool imxrt_rqenqueue(struct imxrt_ep_s *privep, + struct imxrt_req_s *req) { bool is_empty = !privep->head; @@ -1905,7 +1905,7 @@ bool imxrt_epcomplete(struct imxrt_usbdev_s *priv, uint8_t epphy) * ****************************************************************************/ -static int imxrt_usbinterrupt(int irq, FAR void *context, FAR void *arg) +static int imxrt_usbinterrupt(int irq, void *context, void *arg) { struct imxrt_usbdev_s *priv = &g_usbdev; uint32_t disr; @@ -2114,11 +2114,11 @@ static int imxrt_usbinterrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static int imxrt_epconfigure(FAR struct usbdev_ep_s *ep, - FAR const struct usb_epdesc_s *desc, - bool last) +static int imxrt_epconfigure(struct usbdev_ep_s *ep, + const struct usb_epdesc_s *desc, + bool last) { - FAR struct imxrt_ep_s *privep = (FAR struct imxrt_ep_s *)ep; + struct imxrt_ep_s *privep = (struct imxrt_ep_s *)ep; struct imxrt_dqh_s *dqh = &g_qh[privep->epphy]; usbtrace(TRACE_EPCONFIGURE, privep->epphy); @@ -2219,9 +2219,9 @@ static int imxrt_epconfigure(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int imxrt_epdisable(FAR struct usbdev_ep_s *ep) +static int imxrt_epdisable(struct usbdev_ep_s *ep) { - FAR struct imxrt_ep_s *privep = (FAR struct imxrt_ep_s *)ep; + struct imxrt_ep_s *privep = (struct imxrt_ep_s *)ep; irqstate_t flags; #ifdef CONFIG_DEBUG_FEATURES @@ -2267,9 +2267,9 @@ static int imxrt_epdisable(FAR struct usbdev_ep_s *ep) * ****************************************************************************/ -static FAR struct usbdev_req_s *imxrt_epallocreq(FAR struct usbdev_ep_s *ep) +static struct usbdev_req_s *imxrt_epallocreq(struct usbdev_ep_s *ep) { - FAR struct imxrt_req_s *privreq; + struct imxrt_req_s *privreq; #ifdef CONFIG_DEBUG_FEATURES if (!ep) @@ -2279,9 +2279,9 @@ static FAR struct usbdev_req_s *imxrt_epallocreq(FAR struct usbdev_ep_s *ep) } #endif - usbtrace(TRACE_EPALLOCREQ, ((FAR struct imxrt_ep_s *)ep)->epphy); + usbtrace(TRACE_EPALLOCREQ, ((struct imxrt_ep_s *)ep)->epphy); - privreq = (FAR struct imxrt_req_s *)kmm_malloc(sizeof(struct imxrt_req_s)); + privreq = (struct imxrt_req_s *)kmm_malloc(sizeof(struct imxrt_req_s)); if (!privreq) { usbtrace(TRACE_DEVERROR(IMXRT_TRACEERR_ALLOCFAIL), 0); @@ -2300,10 +2300,10 @@ static FAR struct usbdev_req_s *imxrt_epallocreq(FAR struct usbdev_ep_s *ep) * ****************************************************************************/ -static void imxrt_epfreereq(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static void imxrt_epfreereq(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct imxrt_req_s *privreq = (FAR struct imxrt_req_s *)req; + struct imxrt_req_s *privreq = (struct imxrt_req_s *)req; #ifdef CONFIG_DEBUG_FEATURES if (!ep || !req) @@ -2313,7 +2313,7 @@ static void imxrt_epfreereq(FAR struct usbdev_ep_s *ep, } #endif - usbtrace(TRACE_EPFREEREQ, ((FAR struct imxrt_ep_s *)ep)->epphy); + usbtrace(TRACE_EPFREEREQ, ((struct imxrt_ep_s *)ep)->epphy); kmm_free(privreq); } @@ -2326,13 +2326,13 @@ static void imxrt_epfreereq(FAR struct usbdev_ep_s *ep, ****************************************************************************/ #ifdef CONFIG_USBDEV_DMA -static void *imxrt_epallocbuffer(FAR struct usbdev_ep_s *ep, uint16_t bytes) +static void *imxrt_epallocbuffer(struct usbdev_ep_s *ep, uint16_t bytes) { /* The USB peripheral DMA is very forgiving, as the dTD allows the buffer * to start at any address. Hence, no need for alignment. */ - FAR struct imxrt_ep_s *privep = (FAR struct imxrt_ep_s *)ep; + struct imxrt_ep_s *privep = (struct imxrt_ep_s *)ep; UNUSED(privep); usbtrace(TRACE_EPALLOCBUFFER, privep->epphy); @@ -2353,9 +2353,9 @@ static void *imxrt_epallocbuffer(FAR struct usbdev_ep_s *ep, uint16_t bytes) ****************************************************************************/ #ifdef CONFIG_USBDEV_DMA -static void imxrt_epfreebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf) +static void imxrt_epfreebuffer(struct usbdev_ep_s *ep, void *buf) { - FAR struct imxrt_ep_s *privep = (FAR struct imxrt_ep_s *)ep; + struct imxrt_ep_s *privep = (struct imxrt_ep_s *)ep; UNUSED(privep); usbtrace(TRACE_EPFREEBUFFER, privep->epphy); @@ -2376,12 +2376,12 @@ static void imxrt_epfreebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf) * ****************************************************************************/ -static int imxrt_epsubmit(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static int imxrt_epsubmit(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct imxrt_req_s *privreq = (FAR struct imxrt_req_s *)req; - FAR struct imxrt_ep_s *privep = (FAR struct imxrt_ep_s *)ep; - FAR struct imxrt_usbdev_s *priv; + struct imxrt_req_s *privreq = (struct imxrt_req_s *)req; + struct imxrt_ep_s *privep = (struct imxrt_ep_s *)ep; + struct imxrt_usbdev_s *priv; irqstate_t flags; int ret = OK; @@ -2451,10 +2451,10 @@ static int imxrt_epsubmit(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int imxrt_epcancel(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static int imxrt_epcancel(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct imxrt_ep_s *privep = (FAR struct imxrt_ep_s *)ep; + struct imxrt_ep_s *privep = (struct imxrt_ep_s *)ep; irqstate_t flags; #ifdef CONFIG_DEBUG_FEATURES @@ -2488,9 +2488,9 @@ static int imxrt_epcancel(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int imxrt_epstall(FAR struct usbdev_ep_s *ep, bool resume) +static int imxrt_epstall(struct usbdev_ep_s *ep, bool resume) { - FAR struct imxrt_ep_s *privep = (FAR struct imxrt_ep_s *)ep; + struct imxrt_ep_s *privep = (struct imxrt_ep_s *)ep; irqstate_t flags; /* STALL or RESUME the endpoint */ @@ -2543,11 +2543,11 @@ static int imxrt_epstall(FAR struct usbdev_ep_s *ep, bool resume) * ****************************************************************************/ -static FAR struct usbdev_ep_s *imxrt_allocep(FAR struct usbdev_s *dev, - uint8_t eplog, - bool in, uint8_t eptype) +static struct usbdev_ep_s *imxrt_allocep(struct usbdev_s *dev, + uint8_t eplog, + bool in, uint8_t eptype) { - FAR struct imxrt_usbdev_s *priv = (FAR struct imxrt_usbdev_s *)dev; + struct imxrt_usbdev_s *priv = (struct imxrt_usbdev_s *)dev; uint32_t epset = IMXRT_EPALLSET & ~IMXRT_EPCTRLSET; irqstate_t flags; int epndx = 0; @@ -2667,11 +2667,11 @@ static FAR struct usbdev_ep_s *imxrt_allocep(FAR struct usbdev_s *dev, * ****************************************************************************/ -static void imxrt_freeep(FAR struct usbdev_s *dev, - FAR struct usbdev_ep_s *ep) +static void imxrt_freeep(struct usbdev_s *dev, + struct usbdev_ep_s *ep) { - FAR struct imxrt_usbdev_s *priv = (FAR struct imxrt_usbdev_s *)dev; - FAR struct imxrt_ep_s *privep = (FAR struct imxrt_ep_s *)ep; + struct imxrt_usbdev_s *priv = (struct imxrt_usbdev_s *)dev; + struct imxrt_ep_s *privep = (struct imxrt_ep_s *)ep; irqstate_t flags; usbtrace(TRACE_DEVFREEEP, (uint16_t)privep->epphy); @@ -2697,7 +2697,7 @@ static void imxrt_freeep(FAR struct usbdev_s *dev, static int imxrt_getframe(struct usbdev_s *dev) { #ifdef CONFIG_IMXRT_USBDEV_FRAME_INTERRUPT - FAR struct imxrt_usbdev_s *priv = (FAR struct imxrt_usbdev_s *)dev; + struct imxrt_usbdev_s *priv = (struct imxrt_usbdev_s *)dev; /* Return last valid value of SOF read by the interrupt handler */ @@ -2746,7 +2746,7 @@ static int imxrt_wakeup(struct usbdev_s *dev) static int imxrt_selfpowered(struct usbdev_s *dev, bool selfpowered) { - FAR struct imxrt_usbdev_s *priv = (FAR struct imxrt_usbdev_s *)dev; + struct imxrt_usbdev_s *priv = (struct imxrt_usbdev_s *)dev; usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered); diff --git a/arch/arm/src/imxrt/imxrt_usdhc.c b/arch/arm/src/imxrt/imxrt_usdhc.c index 466a731ab6..558cfd3b54 100644 --- a/arch/arm/src/imxrt/imxrt_usdhc.c +++ b/arch/arm/src/imxrt/imxrt_usdhc.c @@ -291,73 +291,73 @@ static void imxrt_endtransfer(struct imxrt_dev_s *priv, /* Interrupt Handling *******************************************************/ -static int imxrt_interrupt(int irq, void *context, FAR void *arg); +static int imxrt_interrupt(int irq, void *context, void *arg); /* SDIO interface methods ***************************************************/ /* Mutual exclusion */ #ifdef CONFIG_SDIO_MUXBUS -static int imxrt_lock(FAR struct sdio_dev_s *dev, bool lock); +static int imxrt_lock(struct sdio_dev_s *dev, bool lock); #endif /* Initialization/setup */ -static void imxrt_reset(FAR struct sdio_dev_s *dev); -static sdio_capset_t imxrt_capabilities(FAR struct sdio_dev_s *dev); -static sdio_statset_t imxrt_status(FAR struct sdio_dev_s *dev); -static void imxrt_widebus(FAR struct sdio_dev_s *dev, bool enable); +static void imxrt_reset(struct sdio_dev_s *dev); +static sdio_capset_t imxrt_capabilities(struct sdio_dev_s *dev); +static sdio_statset_t imxrt_status(struct sdio_dev_s *dev); +static void imxrt_widebus(struct sdio_dev_s *dev, bool enable); #ifdef CONFIG_IMXRT_USDHC_ABSFREQ -static void imxrt_frequency(FAR struct sdio_dev_s *dev, uint32_t frequency); +static void imxrt_frequency(struct sdio_dev_s *dev, uint32_t frequency); #endif -static void imxrt_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate); -static int imxrt_attach(FAR struct sdio_dev_s *dev); +static void imxrt_clock(struct sdio_dev_s *dev, enum sdio_clock_e rate); +static int imxrt_attach(struct sdio_dev_s *dev); /* Command/Status/Data Transfer */ -static int imxrt_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int imxrt_sendcmd(struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg); #ifdef CONFIG_SDIO_BLOCKSETUP -static void imxrt_blocksetup(FAR struct sdio_dev_s *dev, +static void imxrt_blocksetup(struct sdio_dev_s *dev, unsigned int blocklen, unsigned int nblocks); #endif #ifndef CONFIG_IMXRT_USDHC_DMA -static int imxrt_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, +static int imxrt_recvsetup(struct sdio_dev_s *dev, uint8_t *buffer, size_t nbytes); -static int imxrt_sendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, size_t nbytes); +static int imxrt_sendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t nbytes); #endif -static int imxrt_cancel(FAR struct sdio_dev_s *dev); -static int imxrt_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd); -static int imxrt_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int imxrt_cancel(struct sdio_dev_s *dev); +static int imxrt_waitresponse(struct sdio_dev_s *dev, uint32_t cmd); +static int imxrt_recvshortcrc(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort); -static int imxrt_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int imxrt_recvlong(struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong[4]); -static int imxrt_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int imxrt_recvshort(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort); /* EVENT handler */ -static void imxrt_waitenable(FAR struct sdio_dev_s *dev, +static void imxrt_waitenable(struct sdio_dev_s *dev, sdio_eventset_t eventset, uint32_t timeout); -static sdio_eventset_t imxrt_eventwait(FAR struct sdio_dev_s *dev); -static void imxrt_callbackenable(FAR struct sdio_dev_s *dev, +static sdio_eventset_t imxrt_eventwait(struct sdio_dev_s *dev); +static void imxrt_callbackenable(struct sdio_dev_s *dev, sdio_eventset_t eventset); -static int imxrt_registercallback(FAR struct sdio_dev_s *dev, +static int imxrt_registercallback(struct sdio_dev_s *dev, worker_t callback, void *arg); /* DMA */ #ifdef CONFIG_IMXRT_USDHC_DMA -static int imxrt_dmarecvsetup(FAR struct sdio_dev_s *dev, - FAR uint8_t *buffer, size_t buflen); -static int imxrt_dmasendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, size_t buflen); +static int imxrt_dmarecvsetup(struct sdio_dev_s *dev, + uint8_t *buffer, size_t buflen); +static int imxrt_dmasendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t buflen); #endif /* Initialization/uninitialization/reset ************************************/ @@ -1217,7 +1217,7 @@ static void imxrt_endtransfer(struct imxrt_dev_s *priv, * ****************************************************************************/ -static int imxrt_interrupt(int irq, void *context, FAR void *arg) +static int imxrt_interrupt(int irq, void *context, void *arg) { struct imxrt_dev_s *priv = (struct imxrt_dev_s *)arg; uint32_t enabled; @@ -1392,7 +1392,7 @@ static int imxrt_interrupt(int irq, void *context, FAR void *arg) ****************************************************************************/ #ifdef CONFIG_SDIO_MUXBUS -static int imxrt_lock(FAR struct sdio_dev_s *dev, bool lock) +static int imxrt_lock(struct sdio_dev_s *dev, bool lock) { /* The multiplex bus is part of board support package. */ @@ -1416,9 +1416,9 @@ static int imxrt_lock(FAR struct sdio_dev_s *dev, bool lock) * ****************************************************************************/ -static void imxrt_reset(FAR struct sdio_dev_s *dev) +static void imxrt_reset(struct sdio_dev_s *dev) { - FAR struct imxrt_dev_s *priv = (FAR struct imxrt_dev_s *)dev; + struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev; /* Disable all interrupts so that nothing interferes with the following. */ @@ -1499,7 +1499,7 @@ static void imxrt_reset(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static sdio_capset_t imxrt_capabilities(FAR struct sdio_dev_s *dev) +static sdio_capset_t imxrt_capabilities(struct sdio_dev_s *dev) { sdio_capset_t caps = 0; struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev; @@ -1553,7 +1553,7 @@ static sdio_capset_t imxrt_capabilities(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static sdio_statset_t imxrt_status(FAR struct sdio_dev_s *dev) +static sdio_statset_t imxrt_status(struct sdio_dev_s *dev) { struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev; bool present = false; @@ -1608,9 +1608,9 @@ static sdio_statset_t imxrt_status(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static void imxrt_widebus(FAR struct sdio_dev_s *dev, bool wide) +static void imxrt_widebus(struct sdio_dev_s *dev, bool wide) { - FAR struct imxrt_dev_s *priv = (FAR struct imxrt_dev_s *)dev; + struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev; uint32_t regval; /* Set the Data Transfer Width (DTW) field in the PROCTL register. */ @@ -1645,7 +1645,7 @@ static void imxrt_widebus(FAR struct sdio_dev_s *dev, bool wide) ****************************************************************************/ #ifdef CONFIG_IMXRT_USDHC_ABSFREQ -static void imxrt_frequency(FAR struct sdio_dev_s *dev, uint32_t frequency) +static void imxrt_frequency(struct sdio_dev_s *dev, uint32_t frequency) { uint32_t sdclkfs; uint32_t prescaled; @@ -1778,10 +1778,10 @@ static void imxrt_frequency(FAR struct sdio_dev_s *dev, uint32_t frequency) * ****************************************************************************/ -static void imxrt_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate) +static void imxrt_clock(struct sdio_dev_s *dev, enum sdio_clock_e rate) { - FAR struct imxrt_dev_s *priv = - (FAR struct imxrt_dev_s *)dev; uint32_t regval; + struct imxrt_dev_s *priv = + (struct imxrt_dev_s *)dev; uint32_t regval; /* Clear the old prescaler and divisor values so that new ones can be * ORed in. @@ -1884,10 +1884,10 @@ static void imxrt_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate) * ****************************************************************************/ -static int imxrt_attach(FAR struct sdio_dev_s *dev) +static int imxrt_attach(struct sdio_dev_s *dev) { int ret; - FAR struct imxrt_dev_s *priv = (FAR struct imxrt_dev_s *)dev; + struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev; /* Attach the SDIO interrupt handler */ @@ -1949,10 +1949,10 @@ static int imxrt_attach(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static int imxrt_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int imxrt_sendcmd(struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg) { - FAR struct imxrt_dev_s *priv = (FAR struct imxrt_dev_s *)dev; + struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev; clock_t timeout; clock_t start; clock_t elapsed; @@ -2206,11 +2206,11 @@ static int imxrt_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, ****************************************************************************/ #ifdef CONFIG_SDIO_BLOCKSETUP -static void imxrt_blocksetup(FAR struct sdio_dev_s *dev, +static void imxrt_blocksetup(struct sdio_dev_s *dev, unsigned int blocklen, unsigned int nblocks) { - FAR struct imxrt_dev_s *priv = (FAR struct imxrt_dev_s *)dev; + struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev; mcinfo("blocklen=%d, total transfer=%d (%d blocks)\n", blocklen, blocklen * nblocks, nblocks); @@ -2247,7 +2247,7 @@ static void imxrt_blocksetup(FAR struct sdio_dev_s *dev, ****************************************************************************/ #ifndef CONFIG_IMXRT_USDHC_DMA -static int imxrt_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, +static int imxrt_recvsetup(struct sdio_dev_s *dev, uint8_t *buffer, size_t nbytes) { struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev; @@ -2296,8 +2296,8 @@ static int imxrt_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, ****************************************************************************/ #ifndef CONFIG_IMXRT_USDHC_DMA -static int imxrt_sendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, +static int imxrt_sendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t nbytes) { struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev; @@ -2341,7 +2341,7 @@ static int imxrt_sendsetup(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static int imxrt_cancel(FAR struct sdio_dev_s *dev) +static int imxrt_cancel(struct sdio_dev_s *dev) { struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev; @@ -2397,7 +2397,7 @@ static int imxrt_cancel(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static int imxrt_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd) +static int imxrt_waitresponse(struct sdio_dev_s *dev, uint32_t cmd) { clock_t timeout; clock_t start; @@ -2405,7 +2405,7 @@ static int imxrt_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd) uint32_t errors; uint32_t enerrors; - FAR struct imxrt_dev_s *priv = (FAR struct imxrt_dev_s *)dev; + struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev; int ret = OK; switch (cmd & MMCSD_RESPONSE_MASK) @@ -2499,10 +2499,10 @@ static int imxrt_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd) * ****************************************************************************/ -static int imxrt_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int imxrt_recvshortcrc(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort) { - FAR struct imxrt_dev_s *priv = (FAR struct imxrt_dev_s *)dev; + struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev; uint32_t regval; int ret = OK; @@ -2571,10 +2571,10 @@ static int imxrt_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, return ret; } -static int imxrt_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int imxrt_recvlong(struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong[4]) { - FAR struct imxrt_dev_s *priv = (FAR struct imxrt_dev_s *)dev; + struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev; uint32_t regval; int ret = OK; @@ -2629,10 +2629,10 @@ static int imxrt_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, return ret; } -static int imxrt_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int imxrt_recvshort(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort) { - FAR struct imxrt_dev_s *priv = (FAR struct imxrt_dev_s *)dev; + struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev; uint32_t regval; int ret = OK; @@ -2704,7 +2704,7 @@ static int imxrt_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, * ****************************************************************************/ -static void imxrt_waitenable(FAR struct sdio_dev_s *dev, +static void imxrt_waitenable(struct sdio_dev_s *dev, sdio_eventset_t eventset, uint32_t timeout) { struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev; @@ -2788,7 +2788,7 @@ static void imxrt_waitenable(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static sdio_eventset_t imxrt_eventwait(FAR struct sdio_dev_s *dev) +static sdio_eventset_t imxrt_eventwait(struct sdio_dev_s *dev) { struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev; sdio_eventset_t wkupevent = 0; int ret; @@ -2874,7 +2874,7 @@ static sdio_eventset_t imxrt_eventwait(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static void imxrt_callbackenable(FAR struct sdio_dev_s *dev, +static void imxrt_callbackenable(struct sdio_dev_s *dev, sdio_eventset_t eventset) { struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev; @@ -2908,7 +2908,7 @@ static void imxrt_callbackenable(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static int imxrt_registercallback(FAR struct sdio_dev_s *dev, +static int imxrt_registercallback(struct sdio_dev_s *dev, worker_t callback, void *arg) { struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev; @@ -2944,8 +2944,8 @@ static int imxrt_registercallback(FAR struct sdio_dev_s *dev, ****************************************************************************/ #ifdef CONFIG_IMXRT_USDHC_DMA -static int imxrt_dmarecvsetup(FAR struct sdio_dev_s *dev, - FAR uint8_t *buffer, size_t buflen) +static int imxrt_dmarecvsetup(struct sdio_dev_s *dev, + uint8_t *buffer, size_t buflen) { struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev; DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0); @@ -3032,8 +3032,8 @@ static int imxrt_dmarecvsetup(FAR struct sdio_dev_s *dev, ****************************************************************************/ #ifdef CONFIG_IMXRT_USDHC_DMA -static int imxrt_dmasendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, size_t buflen) +static int imxrt_dmasendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t buflen) { struct imxrt_dev_s *priv = (struct imxrt_dev_s *)dev; DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0); @@ -3183,7 +3183,7 @@ static void imxrt_callback(void *arg) * ****************************************************************************/ -void imxrt_usdhc_set_sdio_card_isr(FAR struct sdio_dev_s *dev, +void imxrt_usdhc_set_sdio_card_isr(struct sdio_dev_s *dev, int (*func)(void *), void *arg) { irqstate_t flags; @@ -3231,7 +3231,7 @@ void imxrt_usdhc_set_sdio_card_isr(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -FAR struct sdio_dev_s *imxrt_usdhc_initialize(int slotno) +struct sdio_dev_s *imxrt_usdhc_initialize(int slotno) { DEBUGASSERT(slotno < IMXRT_MAX_SDHC_DEV_SLOTS); struct imxrt_dev_s *priv = &g_sdhcdev[slotno]; diff --git a/arch/arm/src/imxrt/imxrt_usdhc.h b/arch/arm/src/imxrt/imxrt_usdhc.h index 7f0bb87063..7729efe5bf 100644 --- a/arch/arm/src/imxrt/imxrt_usdhc.h +++ b/arch/arm/src/imxrt/imxrt_usdhc.h @@ -52,7 +52,7 @@ * ****************************************************************************/ -void imxrt_usdhc_set_sdio_card_isr(FAR struct sdio_dev_s *dev, +void imxrt_usdhc_set_sdio_card_isr(struct sdio_dev_s *dev, int (*func)(void *), void *arg); /**************************************************************************** @@ -70,6 +70,6 @@ void imxrt_usdhc_set_sdio_card_isr(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -FAR struct sdio_dev_s *imxrt_usdhc_initialize(int slotno); +struct sdio_dev_s *imxrt_usdhc_initialize(int slotno); #endif /* __ARCH_ARM_SRC_IMXRT_IMXRT_USDHC_H */ diff --git a/arch/arm/src/imxrt/imxrt_wdog.c b/arch/arm/src/imxrt/imxrt_wdog.c index 730fbdec30..1a956e4e52 100644 --- a/arch/arm/src/imxrt/imxrt_wdog.c +++ b/arch/arm/src/imxrt/imxrt_wdog.c @@ -68,7 +68,7 @@ struct imxrt_wdog_lower { - FAR const struct watchdog_ops_s *ops; /* Lower half operations */ + const struct watchdog_ops_s *ops; /* Lower half operations */ uint32_t timeout; uint32_t enabled; }; @@ -83,13 +83,13 @@ uint32_t imxrt_wdog_ms_to_reg(uint32_t timeout); /* Lower half driver methods */ -static int imxrt_wdog_start(FAR struct watchdog_lowerhalf_s *lower); -static int imxrt_wdog_stop(FAR struct watchdog_lowerhalf_s *lower); -static int imxrt_wdog_keepalive(FAR struct watchdog_lowerhalf_s *lower); -static int imxrt_wdog_getstatus(FAR struct watchdog_lowerhalf_s *lower, - FAR struct watchdog_status_s *status); -static int imxrt_wdog_settimeout(FAR struct watchdog_lowerhalf_s *lower, - uint32_t timeout); +static int imxrt_wdog_start(struct watchdog_lowerhalf_s *lower); +static int imxrt_wdog_stop(struct watchdog_lowerhalf_s *lower); +static int imxrt_wdog_keepalive(struct watchdog_lowerhalf_s *lower); +static int imxrt_wdog_getstatus(struct watchdog_lowerhalf_s *lower, + struct watchdog_status_s *status); +static int imxrt_wdog_settimeout(struct watchdog_lowerhalf_s *lower, + uint32_t timeout); /**************************************************************************** * Private Data @@ -165,9 +165,9 @@ uint32_t imxrt_wdog_ms_to_reg(uint32_t ms) * ****************************************************************************/ -static int imxrt_wdog_start(FAR struct watchdog_lowerhalf_s *lower) +static int imxrt_wdog_start(struct watchdog_lowerhalf_s *lower) { - FAR struct imxrt_wdog_lower *priv = (FAR struct imxrt_wdog_lower *)lower; + struct imxrt_wdog_lower *priv = (struct imxrt_wdog_lower *)lower; uint16_t regval; if (priv->enabled == false) @@ -203,9 +203,9 @@ static int imxrt_wdog_start(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int imxrt_wdog_stop(FAR struct watchdog_lowerhalf_s *lower) +static int imxrt_wdog_stop(struct watchdog_lowerhalf_s *lower) { - FAR struct imxrt_wdog_lower *priv = (FAR struct imxrt_wdog_lower *)lower; + struct imxrt_wdog_lower *priv = (struct imxrt_wdog_lower *)lower; if (priv->enabled) { @@ -235,7 +235,7 @@ static int imxrt_wdog_stop(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int imxrt_wdog_keepalive(FAR struct watchdog_lowerhalf_s *lower) +static int imxrt_wdog_keepalive(struct watchdog_lowerhalf_s *lower) { irqstate_t flags = spin_lock_irqsave(NULL); @@ -263,10 +263,10 @@ static int imxrt_wdog_keepalive(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int imxrt_wdog_getstatus(FAR struct watchdog_lowerhalf_s *lower, - FAR struct watchdog_status_s *status) +static int imxrt_wdog_getstatus(struct watchdog_lowerhalf_s *lower, + struct watchdog_status_s *status) { - FAR struct imxrt_wdog_lower *priv = (FAR struct imxrt_wdog_lower *)lower; + struct imxrt_wdog_lower *priv = (struct imxrt_wdog_lower *)lower; status->flags = WDFLAGS_RESET; @@ -297,11 +297,11 @@ static int imxrt_wdog_getstatus(FAR struct watchdog_lowerhalf_s *lower, * ****************************************************************************/ -static int imxrt_wdog_settimeout(FAR struct watchdog_lowerhalf_s *lower, - uint32_t timeout) +static int imxrt_wdog_settimeout(struct watchdog_lowerhalf_s *lower, + uint32_t timeout) { uint32_t regval; - FAR struct imxrt_wdog_lower *priv = (FAR struct imxrt_wdog_lower *)lower; + struct imxrt_wdog_lower *priv = (struct imxrt_wdog_lower *)lower; if (timeout < WDOG_MIN || timeout > WDOG_MAX) { @@ -353,7 +353,7 @@ static int imxrt_wdog_settimeout(FAR struct watchdog_lowerhalf_s *lower, void imxrt_wdog_initialize(void) { - FAR struct imxrt_wdog_lower *priv = &g_wdgdev; + struct imxrt_wdog_lower *priv = &g_wdgdev; priv->ops = &g_wdgops; priv->timeout = WDOG_MIN; @@ -361,7 +361,7 @@ void imxrt_wdog_initialize(void) /* Register the watchdog driver at the path */ wdinfo("Entry: devpath=%s\n", DEVPATH); - watchdog_register(DEVPATH, (FAR struct watchdog_lowerhalf_s *)priv); + watchdog_register(DEVPATH, (struct watchdog_lowerhalf_s *)priv); } #endif /* CONFIG_WATCHDOG && CONFIG_IMXRT_WDOG */ diff --git a/arch/arm/src/kinetis/kinetis.h b/arch/arm/src/kinetis/kinetis.h index 7e20767fcc..6a397c7e25 100644 --- a/arch/arm/src/kinetis/kinetis.h +++ b/arch/arm/src/kinetis/kinetis.h @@ -686,7 +686,7 @@ void kinetis_clrpend(int irq); #ifdef CONFIG_KINETIS_SDHC struct sdio_dev_s; -FAR struct sdio_dev_s *sdhc_initialize(int slotno); +struct sdio_dev_s *sdhc_initialize(int slotno); #endif /**************************************************************************** @@ -709,7 +709,7 @@ FAR struct sdio_dev_s *sdhc_initialize(int slotno); ****************************************************************************/ #ifdef CONFIG_KINETIS_SDHC -void sdhc_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot); +void sdhc_mediachange(struct sdio_dev_s *dev, bool cardinslot); #endif /**************************************************************************** @@ -729,7 +729,7 @@ void sdhc_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot); ****************************************************************************/ #ifdef CONFIG_KINETIS_SDHC -void sdhc_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect); +void sdhc_wrprotect(struct sdio_dev_s *dev, bool wrprotect); #endif #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/kinetis/kinetis_alarm.h b/arch/arm/src/kinetis/kinetis_alarm.h index 323740cc1b..c239a1a164 100644 --- a/arch/arm/src/kinetis/kinetis_alarm.h +++ b/arch/arm/src/kinetis/kinetis_alarm.h @@ -39,7 +39,7 @@ /* The form of an alarm callback */ -typedef CODE void (*alarmcb_t)(void); +typedef void (*alarmcb_t)(void); /* These features are in KinetisK 1st generation * Time Alarm Interrupt @@ -54,8 +54,8 @@ enum alm_id_e { /* Used for indexing - must be sequential */ - RTC_ALARMA = 0, /* RTC ALARM A */ - RTC_ALARMM, /* FUT: RTC Monotonic */ + RTC_ALARMA = 0, /* RTC ALARM A */ + RTC_ALARMM, /* FUT: RTC Monotonic */ RTC_ALARM_LAST }; @@ -63,10 +63,10 @@ enum alm_id_e struct alm_setalarm_s { - int as_id; /* enum alm_id_e */ - struct tm as_time; /* Alarm expiration time */ - alarmcb_t as_cb; /* Callback (if non-NULL) */ - FAR void *as_arg; /* Argument for callback */ + int as_id; /* enum alm_id_e */ + struct tm as_time; /* Alarm expiration time */ + alarmcb_t as_cb; /* Callback (if non-NULL) */ + void *as_arg; /* Argument for callback */ }; /**************************************************************************** @@ -97,7 +97,7 @@ extern "C" * ****************************************************************************/ -int kinetis_rtc_setalarm(FAR const struct timespec *tp, alarmcb_t callback); +int kinetis_rtc_setalarm(const struct timespec *tp, alarmcb_t callback); /**************************************************************************** * Name: kinetis_rtc_rdalarm @@ -113,7 +113,7 @@ int kinetis_rtc_setalarm(FAR const struct timespec *tp, alarmcb_t callback); * ****************************************************************************/ -int kinetis_rtc_rdalarm(FAR struct timespec *tp); +int kinetis_rtc_rdalarm(struct timespec *tp); /**************************************************************************** * Name: kinetis_rtc_cancelalarm @@ -153,7 +153,7 @@ int kinetis_rtc_cancelalarm(void); * ****************************************************************************/ -FAR struct rtc_lowerhalf_s *kinetis_rtc_lowerhalf(void); +struct rtc_lowerhalf_s *kinetis_rtc_lowerhalf(void); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/kinetis/kinetis_allocateheap.c b/arch/arm/src/kinetis/kinetis_allocateheap.c index 1f3a9713fb..ecfc4cedaa 100644 --- a/arch/arm/src/kinetis/kinetis_allocateheap.c +++ b/arch/arm/src/kinetis/kinetis_allocateheap.c @@ -89,7 +89,7 @@ * ****************************************************************************/ -void up_allocate_heap(FAR void **heap_start, size_t *heap_size) +void up_allocate_heap(void **heap_start, size_t *heap_size) { #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) /* Get the unaligned size and position of the user-space heap. @@ -118,7 +118,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) /* Return the user-space heap settings */ board_autoled_on(LED_HEAPALLOCATE); - *heap_start = (FAR void *)ubase; + *heap_start = (void *)ubase; *heap_size = usize; /* Allow user-mode access to the user heap memory */ @@ -129,7 +129,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) /* Return the heap settings */ board_autoled_on(LED_HEAPALLOCATE); - *heap_start = (FAR void *)g_idle_topstack; + *heap_start = (void *)g_idle_topstack; *heap_size = CONFIG_RAM_END - g_idle_topstack; #endif } @@ -145,7 +145,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) ****************************************************************************/ #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) -void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) +void up_allocate_kheap(void **heap_start, size_t *heap_size) { /* Get the unaligned size and position of the user-space heap. * This heap begins after the user-space .bss section at an offset @@ -174,7 +174,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) * that was not dedicated to the user heap). */ - *heap_start = (FAR void *)USERSPACE->us_bssend; + *heap_start = (void *)USERSPACE->us_bssend; *heap_size = ubase - (uintptr_t)USERSPACE->us_bssend; } #endif diff --git a/arch/arm/src/kinetis/kinetis_edma.c b/arch/arm/src/kinetis/kinetis_edma.c index 19ca0391b4..d8925b067c 100644 --- a/arch/arm/src/kinetis/kinetis_edma.c +++ b/arch/arm/src/kinetis/kinetis_edma.c @@ -565,7 +565,7 @@ static void kinetis_dmaterminate(struct kinetis_dmach_s *dmach, int result) * ****************************************************************************/ -static int kinetis_edma_interrupt(int irq, void *context, FAR void *arg) +static int kinetis_edma_interrupt(int irq, void *context, void *arg) { struct kinetis_dmach_s *dmach; uintptr_t regaddr; @@ -650,7 +650,7 @@ static int kinetis_edma_interrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -static int kinetis_error_interrupt(int irq, void *context, FAR void *arg) +static int kinetis_error_interrupt(int irq, void *context, void *arg) { uint32_t errstatus; uint32_t errmask; diff --git a/arch/arm/src/kinetis/kinetis_edma.h b/arch/arm/src/kinetis/kinetis_edma.h index 72ba838337..f12ac414e5 100644 --- a/arch/arm/src/kinetis/kinetis_edma.h +++ b/arch/arm/src/kinetis/kinetis_edma.h @@ -134,7 +134,7 @@ * Public Types ****************************************************************************/ -typedef FAR void *DMACH_HANDLE; +typedef void *DMACH_HANDLE; typedef void (*edma_callback_t)(DMACH_HANDLE handle, void *arg, bool done, int result); diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c index af0cb20c64..a782ddc692 100644 --- a/arch/arm/src/kinetis/kinetis_enet.c +++ b/arch/arm/src/kinetis/kinetis_enet.c @@ -194,7 +194,7 @@ * header */ -#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) #define KINETIS_BUF_SIZE ((CONFIG_NET_ETH_PKTSIZE & 0xfffffff0) + 0x10) @@ -277,24 +277,24 @@ static inline uint16_t kinesis_swap16(uint16_t value); /* Common TX logic */ -static bool kinetis_txringfull(FAR struct kinetis_driver_s *priv); -static int kinetis_transmit(FAR struct kinetis_driver_s *priv); +static bool kinetis_txringfull(struct kinetis_driver_s *priv); +static int kinetis_transmit(struct kinetis_driver_s *priv); static int kinetis_txpoll(struct net_driver_s *dev); /* Interrupt handling */ -static void kinetis_receive(FAR struct kinetis_driver_s *priv); -static void kinetis_txdone(FAR struct kinetis_driver_s *priv); +static void kinetis_receive(struct kinetis_driver_s *priv); +static void kinetis_txdone(struct kinetis_driver_s *priv); -static void kinetis_interrupt_work(FAR void *arg); -static int kinetis_interrupt(int irq, FAR void *context, FAR void *arg); +static void kinetis_interrupt_work(void *arg); +static int kinetis_interrupt(int irq, void *context, void *arg); /* Watchdog timer expirations */ -static void kinetis_txtimeout_work(FAR void *arg); +static void kinetis_txtimeout_work(void *arg); static void kinetis_txtimeout_expiry(wdparm_t arg); -static void kinetis_poll_work(FAR void *arg); +static void kinetis_poll_work(void *arg); static void kinetis_polltimer_expiry(wdparm_t arg); /* NuttX callback functions */ @@ -302,13 +302,13 @@ static void kinetis_polltimer_expiry(wdparm_t arg); static int kinetis_ifup(struct net_driver_s *dev); static int kinetis_ifdown(struct net_driver_s *dev); -static void kinetis_txavail_work(FAR void *arg); +static void kinetis_txavail_work(void *arg); static int kinetis_txavail(struct net_driver_s *dev); #ifdef CONFIG_NET_MCASTGROUP static int kinetis_addmac(struct net_driver_s *dev, - FAR const uint8_t *mac); -static int kinetis_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac); + const uint8_t *mac); +static int kinetis_rmmac(struct net_driver_s *dev, const uint8_t *mac); #endif #ifdef CONFIG_NETDEV_IOCTL @@ -395,7 +395,7 @@ static inline uint16_t kinesis_swap16(uint16_t value) * ****************************************************************************/ -static bool kinetis_txringfull(FAR struct kinetis_driver_s *priv) +static bool kinetis_txringfull(struct kinetis_driver_s *priv) { uint8_t txnext; @@ -433,7 +433,7 @@ static bool kinetis_txringfull(FAR struct kinetis_driver_s *priv) * ****************************************************************************/ -static int kinetis_transmit(FAR struct kinetis_driver_s *priv) +static int kinetis_transmit(struct kinetis_driver_s *priv) { struct enet_desc_s *txdesc; uint8_t *buf; @@ -538,8 +538,8 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv) static int kinetis_txpoll(struct net_driver_s *dev) { - FAR struct kinetis_driver_s *priv = - (FAR struct kinetis_driver_s *)dev->d_private; + struct kinetis_driver_s *priv = + (struct kinetis_driver_s *)dev->d_private; /* If the polling resulted in data that should be sent out on the network, * the field d_len is set to a value > 0. @@ -612,7 +612,7 @@ static int kinetis_txpoll(struct net_driver_s *dev) * ****************************************************************************/ -static void kinetis_receive(FAR struct kinetis_driver_s *priv) +static void kinetis_receive(struct kinetis_driver_s *priv) { /* Loop while there are received packets to be processed */ @@ -781,7 +781,7 @@ static void kinetis_receive(FAR struct kinetis_driver_s *priv) * ****************************************************************************/ -static void kinetis_txdone(FAR struct kinetis_driver_s *priv) +static void kinetis_txdone(struct kinetis_driver_s *priv) { /* Verify that the oldest descriptor descriptor completed */ @@ -836,9 +836,9 @@ static void kinetis_txdone(FAR struct kinetis_driver_s *priv) * ****************************************************************************/ -static void kinetis_interrupt_work(FAR void *arg) +static void kinetis_interrupt_work(void *arg) { - FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg; + struct kinetis_driver_s *priv = (struct kinetis_driver_s *)arg; uint32_t pending; /* Process pending Ethernet interrupts */ @@ -942,9 +942,9 @@ static void kinetis_interrupt_work(FAR void *arg) * ****************************************************************************/ -static int kinetis_interrupt(int irq, FAR void *context, FAR void *arg) +static int kinetis_interrupt(int irq, void *context, void *arg) { - register FAR struct kinetis_driver_s *priv = &g_enet[0]; + register struct kinetis_driver_s *priv = &g_enet[0]; /* Disable further Ethernet interrupts. Because Ethernet interrupts are * also disabled if the TX timeout event occurs, there can be no race @@ -987,9 +987,9 @@ static int kinetis_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static void kinetis_txtimeout_work(FAR void *arg) +static void kinetis_txtimeout_work(void *arg) { - FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg; + struct kinetis_driver_s *priv = (struct kinetis_driver_s *)arg; /* Increment statistics and dump debug info */ @@ -1029,7 +1029,7 @@ static void kinetis_txtimeout_work(FAR void *arg) static void kinetis_txtimeout_expiry(wdparm_t arg) { - FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg; + struct kinetis_driver_s *priv = (struct kinetis_driver_s *)arg; /* Disable further Ethernet interrupts. This will prevent some race * conditions with interrupt work. There is still a potential race @@ -1063,9 +1063,9 @@ static void kinetis_txtimeout_expiry(wdparm_t arg) * ****************************************************************************/ -static void kinetis_poll_work(FAR void *arg) +static void kinetis_poll_work(void *arg) { - FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg; + struct kinetis_driver_s *priv = (struct kinetis_driver_s *)arg; /* Check if there is there is a transmission in progress. We cannot * perform the TX poll if he are unable to accept another packet for @@ -1109,7 +1109,7 @@ static void kinetis_poll_work(FAR void *arg) static void kinetis_polltimer_expiry(wdparm_t arg) { - FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg; + struct kinetis_driver_s *priv = (struct kinetis_driver_s *)arg; /* Schedule to perform the poll processing on the worker thread. */ @@ -1135,8 +1135,8 @@ static void kinetis_polltimer_expiry(wdparm_t arg) static int kinetis_ifup(struct net_driver_s *dev) { - FAR struct kinetis_driver_s *priv = - (FAR struct kinetis_driver_s *)dev->d_private; + struct kinetis_driver_s *priv = + (struct kinetis_driver_s *)dev->d_private; uint8_t *mac = dev->d_mac.ether.ether_addr_octet; uint32_t regval; int ret; @@ -1277,8 +1277,8 @@ static int kinetis_ifup(struct net_driver_s *dev) static int kinetis_ifdown(struct net_driver_s *dev) { - FAR struct kinetis_driver_s *priv = - (FAR struct kinetis_driver_s *)dev->d_private; + struct kinetis_driver_s *priv = + (struct kinetis_driver_s *)dev->d_private; irqstate_t flags; /* Disable the Ethernet interrupts at the NVIC */ @@ -1333,9 +1333,9 @@ static int kinetis_ifdown(struct net_driver_s *dev) * ****************************************************************************/ -static void kinetis_txavail_work(FAR void *arg) +static void kinetis_txavail_work(void *arg) { - FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg; + struct kinetis_driver_s *priv = (struct kinetis_driver_s *)arg; /* Ignore the notification if the interface is not yet up */ @@ -1380,8 +1380,8 @@ static void kinetis_txavail_work(FAR void *arg) static int kinetis_txavail(struct net_driver_s *dev) { - FAR struct kinetis_driver_s *priv = - (FAR struct kinetis_driver_s *)dev->d_private; + struct kinetis_driver_s *priv = + (struct kinetis_driver_s *)dev->d_private; /* Is our single work structure available? It may not be if there are * pending interrupt actions and we will have to ignore the Tx @@ -1417,10 +1417,10 @@ static int kinetis_txavail(struct net_driver_s *dev) ****************************************************************************/ #ifdef CONFIG_NET_MCASTGROUP -static int kinetis_addmac(struct net_driver_s *dev, FAR const uint8_t *mac) +static int kinetis_addmac(struct net_driver_s *dev, const uint8_t *mac) { - FAR struct kinetis_driver_s *priv = - (FAR struct kinetis_driver_s *)dev->d_private; + struct kinetis_driver_s *priv = + (struct kinetis_driver_s *)dev->d_private; /* Add the MAC address to the hardware multicast routing table */ @@ -1447,10 +1447,10 @@ static int kinetis_addmac(struct net_driver_s *dev, FAR const uint8_t *mac) ****************************************************************************/ #ifdef CONFIG_NET_MCASTGROUP -static int kinetis_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac) +static int kinetis_rmmac(struct net_driver_s *dev, const uint8_t *mac) { - FAR struct kinetis_driver_s *priv = - (FAR struct kinetis_driver_s *)dev->d_private; + struct kinetis_driver_s *priv = + (struct kinetis_driver_s *)dev->d_private; /* Add the MAC address to the hardware multicast routing table */ @@ -1482,8 +1482,8 @@ static int kinetis_ioctl(struct net_driver_s *dev, int cmd, unsigned long arg) { #ifdef CONFIG_NETDEV_PHY_IOCTL - FAR struct kinetis_driver_s *priv = - (FAR struct kinetis_driver_s *)dev->d_private; + struct kinetis_driver_s *priv = + (struct kinetis_driver_s *)dev->d_private; #endif int ret; diff --git a/arch/arm/src/kinetis/kinetis_flexcan.c b/arch/arm/src/kinetis/kinetis_flexcan.c index c4455bd9d8..64d2c215c6 100644 --- a/arch/arm/src/kinetis/kinetis_flexcan.c +++ b/arch/arm/src/kinetis/kinetis_flexcan.c @@ -490,8 +490,8 @@ uint32_t kinetis_bitratetotimeseg(struct flexcan_timeseg *timeseg, /* Common TX logic */ -static bool kinetis_txringfull(FAR struct kinetis_driver_s *priv); -static int kinetis_transmit(FAR struct kinetis_driver_s *priv); +static bool kinetis_txringfull(struct kinetis_driver_s *priv); +static int kinetis_transmit(struct kinetis_driver_s *priv); static int kinetis_txpoll(struct net_driver_s *dev); /* Helper functions */ @@ -507,17 +507,17 @@ static uint32_t kinetis_waitesr2_change(uint32_t base, /* Interrupt handling */ -static void kinetis_receive(FAR struct kinetis_driver_s *priv, +static void kinetis_receive(struct kinetis_driver_s *priv, uint32_t flags); -static void kinetis_txdone_work(FAR void *arg); -static void kinetis_txdone(FAR struct kinetis_driver_s *priv); +static void kinetis_txdone_work(void *arg); +static void kinetis_txdone(struct kinetis_driver_s *priv); -static int kinetis_flexcan_interrupt(int irq, FAR void *context, - FAR void *arg); +static int kinetis_flexcan_interrupt(int irq, void *context, + void *arg); /* Watchdog timer expirations */ #ifdef TX_TIMEOUT_WQ -static void kinetis_txtimeout_work(FAR void *arg); +static void kinetis_txtimeout_work(void *arg); static void kinetis_txtimeout_expiry(wdparm_t arg); #endif @@ -526,7 +526,7 @@ static void kinetis_txtimeout_expiry(wdparm_t arg); static int kinetis_ifup(struct net_driver_s *dev); static int kinetis_ifdown(struct net_driver_s *dev); -static void kinetis_txavail_work(FAR void *arg); +static void kinetis_txavail_work(void *arg); static int kinetis_txavail(struct net_driver_s *dev); #ifdef CONFIG_NETDEV_IOCTL @@ -558,7 +558,7 @@ static void kinetis_reset(struct kinetis_driver_s *priv); * ****************************************************************************/ -static bool kinetis_txringfull(FAR struct kinetis_driver_s *priv) +static bool kinetis_txringfull(struct kinetis_driver_s *priv) { uint32_t mbi = 0; @@ -595,7 +595,7 @@ static bool kinetis_txringfull(FAR struct kinetis_driver_s *priv) * ****************************************************************************/ -static int kinetis_transmit(FAR struct kinetis_driver_s *priv) +static int kinetis_transmit(struct kinetis_driver_s *priv) { /* Attempt to write frame */ @@ -786,8 +786,8 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv) static int kinetis_txpoll(struct net_driver_s *dev) { - FAR struct kinetis_driver_s *priv = - (FAR struct kinetis_driver_s *)dev->d_private; + struct kinetis_driver_s *priv = + (struct kinetis_driver_s *)dev->d_private; /* If the polling resulted in data that should be sent out on the network, * the field d_len is set to a value > 0. @@ -843,7 +843,7 @@ static int kinetis_txpoll(struct net_driver_s *dev) * ****************************************************************************/ -static void kinetis_receive(FAR struct kinetis_driver_s *priv, +static void kinetis_receive(struct kinetis_driver_s *priv, uint32_t flags) { uint32_t mb_index; @@ -982,7 +982,7 @@ static void kinetis_receive(FAR struct kinetis_driver_s *priv, * ****************************************************************************/ -static void kinetis_txdone(FAR struct kinetis_driver_s *priv) +static void kinetis_txdone(struct kinetis_driver_s *priv) { uint32_t flags; uint32_t mbi; @@ -1037,9 +1037,9 @@ static void kinetis_txdone(FAR struct kinetis_driver_s *priv) * ****************************************************************************/ -static void kinetis_txdone_work(FAR void *arg) +static void kinetis_txdone_work(void *arg) { - FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg; + struct kinetis_driver_s *priv = (struct kinetis_driver_s *)arg; kinetis_txdone(priv); @@ -1072,10 +1072,10 @@ static void kinetis_txdone_work(FAR void *arg) * ****************************************************************************/ -static int kinetis_flexcan_interrupt(int irq, FAR void *context, - FAR void *arg) +static int kinetis_flexcan_interrupt(int irq, void *context, + void *arg) { - FAR struct kinetis_driver_s *priv = (struct kinetis_driver_s *)arg; + struct kinetis_driver_s *priv = (struct kinetis_driver_s *)arg; if (irq == priv->config->mb_irq) { @@ -1128,9 +1128,9 @@ static int kinetis_flexcan_interrupt(int irq, FAR void *context, ****************************************************************************/ #ifdef TX_TIMEOUT_WQ -static void kinetis_txtimeout_work(FAR void *arg) +static void kinetis_txtimeout_work(void *arg) { - FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg; + struct kinetis_driver_s *priv = (struct kinetis_driver_s *)arg; uint32_t flags; uint32_t mbi; uint32_t mb_bit; @@ -1188,7 +1188,7 @@ static void kinetis_txtimeout_work(FAR void *arg) static void kinetis_txtimeout_expiry(wdparm_t arg) { - FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg; + struct kinetis_driver_s *priv = (struct kinetis_driver_s *)arg; /* Schedule to perform the TX timeout processing on the worker thread */ @@ -1304,8 +1304,8 @@ static uint32_t kinetis_waitfreezeack_change(uint32_t base, static int kinetis_ifup(struct net_driver_s *dev) { - FAR struct kinetis_driver_s *priv = - (FAR struct kinetis_driver_s *)dev->d_private; + struct kinetis_driver_s *priv = + (struct kinetis_driver_s *)dev->d_private; if (!kinetis_initialize(priv)) { @@ -1357,8 +1357,8 @@ static int kinetis_ifup(struct net_driver_s *dev) static int kinetis_ifdown(struct net_driver_s *dev) { - FAR struct kinetis_driver_s *priv = - (FAR struct kinetis_driver_s *)dev->d_private; + struct kinetis_driver_s *priv = + (struct kinetis_driver_s *)dev->d_private; kinetis_reset(priv); @@ -1383,9 +1383,9 @@ static int kinetis_ifdown(struct net_driver_s *dev) * ****************************************************************************/ -static void kinetis_txavail_work(FAR void *arg) +static void kinetis_txavail_work(void *arg) { - FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg; + struct kinetis_driver_s *priv = (struct kinetis_driver_s *)arg; /* Ignore the notification if the interface is not yet up */ @@ -1432,8 +1432,8 @@ static void kinetis_txavail_work(FAR void *arg) static int kinetis_txavail(struct net_driver_s *dev) { - FAR struct kinetis_driver_s *priv = - (FAR struct kinetis_driver_s *)dev->d_private; + struct kinetis_driver_s *priv = + (struct kinetis_driver_s *)dev->d_private; /* Is our single work structure available? It may not be if there are * pending interrupt actions and we will have to ignore the Tx @@ -1472,8 +1472,8 @@ static int kinetis_txavail(struct net_driver_s *dev) static int kinetis_ioctl(struct net_driver_s *dev, int cmd, unsigned long arg) { - FAR struct kinetis_driver_s *priv = - (FAR struct kinetis_driver_s *)dev->d_private; + struct kinetis_driver_s *priv = + (struct kinetis_driver_s *)dev->d_private; int ret; diff --git a/arch/arm/src/kinetis/kinetis_i2c.c b/arch/arm/src/kinetis/kinetis_i2c.c index c5e144be79..c6ef7af2d4 100644 --- a/arch/arm/src/kinetis/kinetis_i2c.c +++ b/arch/arm/src/kinetis/kinetis_i2c.c @@ -132,14 +132,14 @@ static void kinetis_i2c_putreg(struct kinetis_i2cdev_s *priv, /* Exclusion Helpers */ -static inline void kinetis_i2c_sem_init(FAR struct kinetis_i2cdev_s *priv); +static inline void kinetis_i2c_sem_init(struct kinetis_i2cdev_s *priv); static inline void - kinetis_i2c_sem_destroy(FAR struct kinetis_i2cdev_s *priv); -static inline int kinetis_i2c_sem_wait(FAR struct kinetis_i2cdev_s *priv); + kinetis_i2c_sem_destroy(struct kinetis_i2cdev_s *priv); +static inline int kinetis_i2c_sem_wait(struct kinetis_i2cdev_s *priv); #ifdef CONFIG_I2C_RESET static int - kinetis_i2c_sem_wait_noncancelable(FAR struct kinetis_i2cdev_s *priv); + kinetis_i2c_sem_wait_noncancelable(struct kinetis_i2cdev_s *priv); #endif static inline void kinetis_i2c_sem_post(struct kinetis_i2cdev_s *priv); @@ -151,8 +151,8 @@ static inline void kinetis_i2c_wait(struct kinetis_i2cdev_s *priv); /* I2C helpers */ -static int kinetis_i2c_init(FAR struct kinetis_i2cdev_s *priv); -static int kinetis_i2c_deinit(FAR struct kinetis_i2cdev_s *priv); +static int kinetis_i2c_init(struct kinetis_i2cdev_s *priv); +static int kinetis_i2c_deinit(struct kinetis_i2cdev_s *priv); static void kinetis_i2c_setfrequency(struct kinetis_i2cdev_s *priv, uint32_t frequency); @@ -311,7 +311,7 @@ static void kinetis_i2c_putreg(struct kinetis_i2cdev_s *priv, uint8_t value, * ****************************************************************************/ -static inline void kinetis_i2c_sem_init(FAR struct kinetis_i2cdev_s *priv) +static inline void kinetis_i2c_sem_init(struct kinetis_i2cdev_s *priv) { nxsem_init(&priv->mutex, 0, 1); @@ -331,7 +331,7 @@ static inline void kinetis_i2c_sem_init(FAR struct kinetis_i2cdev_s *priv) * ****************************************************************************/ -static inline void kinetis_i2c_sem_destroy(FAR struct kinetis_i2cdev_s *priv) +static inline void kinetis_i2c_sem_destroy(struct kinetis_i2cdev_s *priv) { nxsem_destroy(&priv->mutex); nxsem_destroy(&priv->wait); @@ -346,7 +346,7 @@ static inline void kinetis_i2c_sem_destroy(FAR struct kinetis_i2cdev_s *priv) * ****************************************************************************/ -static inline int kinetis_i2c_sem_wait(FAR struct kinetis_i2cdev_s *priv) +static inline int kinetis_i2c_sem_wait(struct kinetis_i2cdev_s *priv) { return nxsem_wait(&priv->mutex); } @@ -361,7 +361,7 @@ static inline int kinetis_i2c_sem_wait(FAR struct kinetis_i2cdev_s *priv) ****************************************************************************/ static int - kinetis_i2c_sem_wait_noncancelable(FAR struct kinetis_i2cdev_s *priv) + kinetis_i2c_sem_wait_noncancelable(struct kinetis_i2cdev_s *priv) { return nxsem_wait_uninterruptible(&priv->mutex); } @@ -414,7 +414,7 @@ static inline void kinetis_i2c_endwait(struct kinetis_i2cdev_s *priv) * ****************************************************************************/ -static int kinetis_i2c_init(FAR struct kinetis_i2cdev_s *priv) +static int kinetis_i2c_init(struct kinetis_i2cdev_s *priv) { uint32_t regval; @@ -475,7 +475,7 @@ static int kinetis_i2c_init(FAR struct kinetis_i2cdev_s *priv) * ****************************************************************************/ -static int kinetis_i2c_deinit(FAR struct kinetis_i2cdev_s *priv) +static int kinetis_i2c_deinit(struct kinetis_i2cdev_s *priv) { /* Disable I2C */ diff --git a/arch/arm/src/kinetis/kinetis_i2c.h b/arch/arm/src/kinetis/kinetis_i2c.h index b6c4f1587f..6e6e5ce4f0 100644 --- a/arch/arm/src/kinetis/kinetis_i2c.h +++ b/arch/arm/src/kinetis/kinetis_i2c.h @@ -50,7 +50,7 @@ * ****************************************************************************/ -FAR struct i2c_master_s *kinetis_i2cbus_initialize(int port); +struct i2c_master_s *kinetis_i2cbus_initialize(int port); /**************************************************************************** * Name: kinetis_i2cbus_uninitialize @@ -67,6 +67,6 @@ FAR struct i2c_master_s *kinetis_i2cbus_initialize(int port); * ****************************************************************************/ -int kinetis_i2cbus_uninitialize(FAR struct i2c_master_s *dev); +int kinetis_i2cbus_uninitialize(struct i2c_master_s *dev); #endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_I2C_H */ diff --git a/arch/arm/src/kinetis/kinetis_irq.c b/arch/arm/src/kinetis/kinetis_irq.c index 004faf7d66..599bab0e19 100644 --- a/arch/arm/src/kinetis/kinetis_irq.c +++ b/arch/arm/src/kinetis/kinetis_irq.c @@ -177,7 +177,7 @@ static void kinetis_dumpnvic(const char *msg, int irq) ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -static int kinetis_nmi(int irq, FAR void *context, FAR void *arg) +static int kinetis_nmi(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! NMI received\n"); @@ -185,7 +185,7 @@ static int kinetis_nmi(int irq, FAR void *context, FAR void *arg) return 0; } -static int kinetis_busfault(int irq, FAR void *context, FAR void *arg) +static int kinetis_busfault(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Bus fault received\n"); @@ -193,7 +193,7 @@ static int kinetis_busfault(int irq, FAR void *context, FAR void *arg) return 0; } -static int kinetis_usagefault(int irq, FAR void *context, FAR void *arg) +static int kinetis_usagefault(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Usage fault received\n"); @@ -201,7 +201,7 @@ static int kinetis_usagefault(int irq, FAR void *context, FAR void *arg) return 0; } -static int kinetis_pendsv(int irq, FAR void *context, FAR void *arg) +static int kinetis_pendsv(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! PendSV received\n"); @@ -209,7 +209,7 @@ static int kinetis_pendsv(int irq, FAR void *context, FAR void *arg) return 0; } -static int kinetis_dbgmonitor(int irq, FAR void *context, FAR void *arg) +static int kinetis_dbgmonitor(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Debug Monitor received\n"); @@ -217,7 +217,7 @@ static int kinetis_dbgmonitor(int irq, FAR void *context, FAR void *arg) return 0; } -static int kinetis_reserved(int irq, FAR void *context, FAR void *arg) +static int kinetis_reserved(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Reserved interrupt\n"); diff --git a/arch/arm/src/kinetis/kinetis_pinirq.c b/arch/arm/src/kinetis/kinetis_pinirq.c index d630e32e25..fc0fb717d5 100644 --- a/arch/arm/src/kinetis/kinetis_pinirq.c +++ b/arch/arm/src/kinetis/kinetis_pinirq.c @@ -106,7 +106,7 @@ static struct kinetis_pinirq_s g_porteisrs[32]; ****************************************************************************/ #ifdef HAVE_PORTINTS -static int kinetis_portinterrupt(int irq, FAR void *context, +static int kinetis_portinterrupt(int irq, void *context, uintptr_t addr, struct kinetis_pinirq_s *isrtab) { @@ -167,7 +167,7 @@ static int kinetis_portinterrupt(int irq, FAR void *context, ****************************************************************************/ #ifdef CONFIG_KINETIS_PORTAINTS -static int kinetis_portainterrupt(int irq, FAR void *context, FAR void *arg) +static int kinetis_portainterrupt(int irq, void *context, void *arg) { return kinetis_portinterrupt(irq, context, KINETIS_PORTA_ISFR, g_portaisrs); @@ -175,7 +175,7 @@ static int kinetis_portainterrupt(int irq, FAR void *context, FAR void *arg) #endif #ifdef CONFIG_KINETIS_PORTBINTS -static int kinetis_portbinterrupt(int irq, FAR void *context, FAR void *arg) +static int kinetis_portbinterrupt(int irq, void *context, void *arg) { return kinetis_portinterrupt(irq, context, KINETIS_PORTB_ISFR, g_portbisrs); @@ -183,7 +183,7 @@ static int kinetis_portbinterrupt(int irq, FAR void *context, FAR void *arg) #endif #ifdef CONFIG_KINETIS_PORTCINTS -static int kinetis_portcinterrupt(int irq, FAR void *context, FAR void *arg) +static int kinetis_portcinterrupt(int irq, void *context, void *arg) { return kinetis_portinterrupt(irq, context, KINETIS_PORTC_ISFR, g_portcisrs); @@ -191,7 +191,7 @@ static int kinetis_portcinterrupt(int irq, FAR void *context, FAR void *arg) #endif #ifdef CONFIG_KINETIS_PORTDINTS -static int kinetis_portdinterrupt(int irq, FAR void *context, FAR void *arg) +static int kinetis_portdinterrupt(int irq, void *context, void *arg) { return kinetis_portinterrupt(irq, context, KINETIS_PORTD_ISFR, g_portdisrs); @@ -199,7 +199,7 @@ static int kinetis_portdinterrupt(int irq, FAR void *context, FAR void *arg) #endif #ifdef CONFIG_KINETIS_PORTEINTS -static int kinetis_porteinterrupt(int irq, FAR void *context, FAR void *arg) +static int kinetis_porteinterrupt(int irq, void *context, void *arg) { return kinetis_portinterrupt(irq, context, KINETIS_PORTE_ISFR, g_porteisrs); diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c index f3a3791a30..4afd8e2805 100644 --- a/arch/arm/src/kinetis/kinetis_pwm.c +++ b/arch/arm/src/kinetis/kinetis_pwm.c @@ -74,12 +74,12 @@ struct kinetis_pwmtimer_s { - FAR const struct pwm_ops_s *ops; /* PWM operations */ - uint8_t tpmid; /* Timer/PWM Module ID {0,..,2} */ - uint8_t channel; /* Timer/PWM Module channel: {0,..5} */ - uint32_t base; /* The base address of the timer */ - uint32_t pincfg; /* Output pin configuration */ - uint32_t pclk; /* The frequency of the peripheral clock */ + const struct pwm_ops_s *ops; /* PWM operations */ + uint8_t tpmid; /* Timer/PWM Module ID {0,..,2} */ + uint8_t channel; /* Timer/PWM Module channel: {0,..5} */ + uint32_t base; /* The base address of the timer */ + uint32_t pincfg; /* Output pin configuration */ + uint32_t pclk; /* The frequency of the peripheral clock */ }; /**************************************************************************** @@ -94,26 +94,26 @@ static void pwm_putreg(struct kinetis_pwmtimer_s *priv, int offset, #ifdef CONFIG_DEBUG_PWM_INFO static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, - FAR const char *msg); + const char *msg); #else # define pwm_dumpregs(priv,msg) #endif /* Timer management */ -static int pwm_timer(FAR struct kinetis_pwmtimer_s *priv, - FAR const struct pwm_info_s *info); +static int pwm_timer(struct kinetis_pwmtimer_s *priv, + const struct pwm_info_s *info); /* PWM driver methods */ -static int pwm_setup(FAR struct pwm_lowerhalf_s *dev); -static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev); +static int pwm_setup(struct pwm_lowerhalf_s *dev); +static int pwm_shutdown(struct pwm_lowerhalf_s *dev); -static int pwm_start(FAR struct pwm_lowerhalf_s *dev, - FAR const struct pwm_info_s *info); +static int pwm_start(struct pwm_lowerhalf_s *dev, + const struct pwm_info_s *info); -static int pwm_stop(FAR struct pwm_lowerhalf_s *dev); -static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, +static int pwm_stop(struct pwm_lowerhalf_s *dev); +static int pwm_ioctl(struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg); /**************************************************************************** @@ -242,7 +242,7 @@ static void pwm_putreg(struct kinetis_pwmtimer_s *priv, int offset, #ifdef CONFIG_DEBUG_PWM_INFO static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, - FAR const char *msg) + const char *msg) { int nchannels = (priv->tpmid == 0) ? 8 : 2; @@ -341,8 +341,8 @@ static void pwm_dumpregs(struct kinetis_pwmtimer_s *priv, * ****************************************************************************/ -static int pwm_timer(FAR struct kinetis_pwmtimer_s *priv, - FAR const struct pwm_info_s *info) +static int pwm_timer(struct kinetis_pwmtimer_s *priv, + const struct pwm_info_s *info) { /* Calculated values */ @@ -550,10 +550,10 @@ static int pwm_timer(FAR struct kinetis_pwmtimer_s *priv, * ****************************************************************************/ -static int pwm_setup(FAR struct pwm_lowerhalf_s *dev) +static int pwm_setup(struct pwm_lowerhalf_s *dev) { uint32_t regval; - FAR struct kinetis_pwmtimer_s *priv = (FAR struct kinetis_pwmtimer_s *)dev; + struct kinetis_pwmtimer_s *priv = (struct kinetis_pwmtimer_s *)dev; /* Enable access to FTM modules */ @@ -594,9 +594,9 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) +static int pwm_shutdown(struct pwm_lowerhalf_s *dev) { - FAR struct kinetis_pwmtimer_s *priv = (FAR struct kinetis_pwmtimer_s *)dev; + struct kinetis_pwmtimer_s *priv = (struct kinetis_pwmtimer_s *)dev; uint32_t pincfg; pwminfo("FTM%d pincfg: %08" PRIx32 "\n", priv->tpmid, priv->pincfg); @@ -628,10 +628,10 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int pwm_start(FAR struct pwm_lowerhalf_s *dev, - FAR const struct pwm_info_s *info) +static int pwm_start(struct pwm_lowerhalf_s *dev, + const struct pwm_info_s *info) { - FAR struct kinetis_pwmtimer_s *priv = (FAR struct kinetis_pwmtimer_s *)dev; + struct kinetis_pwmtimer_s *priv = (struct kinetis_pwmtimer_s *)dev; return pwm_timer(priv, info); } @@ -654,9 +654,9 @@ static int pwm_start(FAR struct pwm_lowerhalf_s *dev, * ****************************************************************************/ -static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) +static int pwm_stop(struct pwm_lowerhalf_s *dev) { - FAR struct kinetis_pwmtimer_s *priv = (FAR struct kinetis_pwmtimer_s *)dev; + struct kinetis_pwmtimer_s *priv = (struct kinetis_pwmtimer_s *)dev; irqstate_t flags; pwminfo("FTM%d\n", priv->tpmid); @@ -736,11 +736,11 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, +static int pwm_ioctl(struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg) { #ifdef CONFIG_DEBUG_PWM_INFO - FAR struct kinetis_pwmtimer_s *priv = (FAR struct kinetis_pwmtimer_s *)dev; + struct kinetis_pwmtimer_s *priv = (struct kinetis_pwmtimer_s *)dev; /* There are no platform-specific ioctl commands */ @@ -768,9 +768,9 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, * ****************************************************************************/ -FAR struct pwm_lowerhalf_s *kinetis_pwminitialize(int timer) +struct pwm_lowerhalf_s *kinetis_pwminitialize(int timer) { - FAR struct kinetis_pwmtimer_s *lower; + struct kinetis_pwmtimer_s *lower; pwminfo("FTM%d\n", timer); @@ -805,7 +805,7 @@ FAR struct pwm_lowerhalf_s *kinetis_pwminitialize(int timer) return NULL; } - return (FAR struct pwm_lowerhalf_s *)lower; + return (struct pwm_lowerhalf_s *)lower; } #endif /* CONFIG_KINETIS_FTMn_PWM, n = 0,...,3 */ diff --git a/arch/arm/src/kinetis/kinetis_pwm.h b/arch/arm/src/kinetis/kinetis_pwm.h index d19885baf5..37e818c39d 100644 --- a/arch/arm/src/kinetis/kinetis_pwm.h +++ b/arch/arm/src/kinetis/kinetis_pwm.h @@ -26,8 +26,10 @@ ****************************************************************************/ #include +#include #include "chip.h" +#include "hardware/kinetis_pinmux.h" /**************************************************************************** * Pre-processor Definitions @@ -60,9 +62,6 @@ #if defined(CONFIG_KINETIS_FTM0_PWM) || defined(CONFIG_KINETIS_FTM1_PWM) || \ defined(CONFIG_KINETIS_FTM2_PWM) || defined(CONFIG_KINETIS_FTM3_PWM) -#include -#include "hardware/kinetis_pinmux.h" - /* For each timer that is enabled for PWM usage, we need the following * additional configuration settings: * @@ -198,7 +197,7 @@ extern "C" * ****************************************************************************/ -FAR struct pwm_lowerhalf_s *kinetis_pwminitialize(int timer); +struct pwm_lowerhalf_s *kinetis_pwminitialize(int timer); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/kinetis/kinetis_rtc.c b/arch/arm/src/kinetis/kinetis_rtc.c index 87b6dff287..fc2c871f12 100644 --- a/arch/arm/src/kinetis/kinetis_rtc.c +++ b/arch/arm/src/kinetis/kinetis_rtc.c @@ -90,7 +90,7 @@ volatile bool g_rtc_enabled = false; ****************************************************************************/ #ifdef CONFIG_DEBUG_RTC_INFO -static void rtc_dumpregs(FAR const char *msg) +static void rtc_dumpregs(const char *msg) { rtcinfo("%s:\n", msg); rtcinfo(" TSR: %08x\n", getreg32(KINETIS_RTC_TSR)); @@ -128,7 +128,7 @@ static void rtc_dumpregs(FAR const char *msg) ****************************************************************************/ #ifdef CONFIG_DEBUG_RTC_INFO -static void rtc_dumptime(FAR struct tm *tp, FAR const char *msg) +static void rtc_dumptime(struct tm *tp, const char *msg) { rtcinfo("%s:\n", msg); rtcinfo(" tm_sec: %08x\n", tp->tm_sec); @@ -158,7 +158,7 @@ static void rtc_dumptime(FAR struct tm *tp, FAR const char *msg) ****************************************************************************/ #if defined(CONFIG_RTC_ALARM) -static int kinetis_rtc_interrupt(int irq, void *context, FAR void *arg) +static int kinetis_rtc_interrupt(int irq, void *context, void *arg) { uint16_t rtc_sr; @@ -422,7 +422,7 @@ time_t up_rtc_time(void) ****************************************************************************/ #ifdef CONFIG_RTC_HIRES -int up_rtc_gettime(FAR struct timespec *tp) +int up_rtc_gettime(struct timespec *tp) { irqstate_t flags; uint32_t seconds; @@ -468,7 +468,7 @@ int up_rtc_gettime(FAR struct timespec *tp) * ****************************************************************************/ -int up_rtc_settime(FAR const struct timespec *tp) +int up_rtc_settime(const struct timespec *tp) { irqstate_t flags; uint32_t seconds; @@ -507,7 +507,7 @@ int up_rtc_settime(FAR const struct timespec *tp) ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -int kinetis_rtc_setalarm(FAR const struct timespec *tp, alarmcb_t callback) +int kinetis_rtc_setalarm(const struct timespec *tp, alarmcb_t callback) { /* Is there already something waiting on the ALARM? */ @@ -588,7 +588,7 @@ int kinetis_rtc_cancelalarm(void) ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -int kinetis_rtc_rdalarm(FAR struct timespec *tp) +int kinetis_rtc_rdalarm(struct timespec *tp) { DEBUGASSERT(tp != NULL); diff --git a/arch/arm/src/kinetis/kinetis_rtc_if.h b/arch/arm/src/kinetis/kinetis_rtc_if.h index 09834c78e4..6500e85a14 100644 --- a/arch/arm/src/kinetis/kinetis_rtc_if.h +++ b/arch/arm/src/kinetis/kinetis_rtc_if.h @@ -76,8 +76,8 @@ extern "C" ****************************************************************************/ #ifdef CONFIG_KINETIS_HAVE_RTC_SUBSECONDS -int kinetis_rtc_getdatetime_with_subseconds(FAR struct tm *tp, - FAR long *nsec); +int kinetis_rtc_getdatetime_with_subseconds(struct tm *tp, + long *nsec); #endif /**************************************************************************** @@ -98,7 +98,7 @@ int kinetis_rtc_getdatetime_with_subseconds(FAR struct tm *tp, #ifdef CONFIG_RTC_DATETIME struct tm; -int kinetis_rtc_setdatetime(FAR const struct tm *tp); +int kinetis_rtc_setdatetime(const struct tm *tp); #endif /**************************************************************************** @@ -124,7 +124,7 @@ int kinetis_rtc_setdatetime(FAR const struct tm *tp); ****************************************************************************/ #ifdef CONFIG_RTC_DRIVER -FAR struct rtc_lowerhalf_s *kinetis_rtc_lowerhalf(void); +struct rtc_lowerhalf_s *kinetis_rtc_lowerhalf(void); #endif #undef EXTERN diff --git a/arch/arm/src/kinetis/kinetis_rtc_lowerhalf.c b/arch/arm/src/kinetis/kinetis_rtc_lowerhalf.c index 2c9702f94f..3c859d8457 100644 --- a/arch/arm/src/kinetis/kinetis_rtc_lowerhalf.c +++ b/arch/arm/src/kinetis/kinetis_rtc_lowerhalf.c @@ -49,8 +49,8 @@ #ifdef CONFIG_RTC_ALARM struct kinetis_cbinfo_s { - volatile rtc_alarm_callback_t cb; /* Callback when the alarm expires */ - volatile FAR void *priv; /* Private argurment to accompany callback */ + volatile rtc_alarm_callback_t cb; /* Callback when the alarm expires */ + volatile void *priv; /* Private argurment to accompany callback */ }; #endif @@ -64,7 +64,7 @@ struct kinetis_lowerhalf_s * operations vtable (which may lie in FLASH or ROM) */ - FAR const struct rtc_ops_s *ops; + const struct rtc_ops_s *ops; /* Data following is private to this driver and not visible outside of * this file. @@ -83,20 +83,20 @@ struct kinetis_lowerhalf_s /* Prototypes for static methods in struct rtc_ops_s */ -static int kinetis_rdtime(FAR struct rtc_lowerhalf_s *lower, - FAR struct rtc_time *rtctime); -static int kinetis_settime(FAR struct rtc_lowerhalf_s *lower, - FAR const struct rtc_time *rtctime); +static int kinetis_rdtime(struct rtc_lowerhalf_s *lower, + struct rtc_time *rtctime); +static int kinetis_settime(struct rtc_lowerhalf_s *lower, + const struct rtc_time *rtctime); #ifdef CONFIG_RTC_ALARM -static int kinetis_setalarm(FAR struct rtc_lowerhalf_s *lower, - FAR const struct lower_setalarm_s *alarminfo); -static int kinetis_setrelative(FAR struct rtc_lowerhalf_s *lower, - FAR const struct lower_setrelative_s *alarminfo); -static int kinetis_cancelalarm(FAR struct rtc_lowerhalf_s *lower, +static int kinetis_setalarm(struct rtc_lowerhalf_s *lower, + const struct lower_setalarm_s *alarminfo); +static int kinetis_setrelative(struct rtc_lowerhalf_s *lower, + const struct lower_setrelative_s *alarminfo); +static int kinetis_cancelalarm(struct rtc_lowerhalf_s *lower, int alarmid); -static int kinetis_rdalarm(FAR struct rtc_lowerhalf_s *lower, - FAR struct lower_rdalarm_s *alarminfo); +static int kinetis_rdalarm(struct rtc_lowerhalf_s *lower, + struct lower_rdalarm_s *alarminfo); #endif /**************************************************************************** @@ -153,14 +153,14 @@ static struct kinetis_lowerhalf_s g_rtc_lowerhalf = #ifdef CONFIG_RTC_ALARM static void kinetis_alarm_callback(void) { - FAR struct kinetis_cbinfo_s *cbinfo = &g_rtc_lowerhalf.cbinfo; + struct kinetis_cbinfo_s *cbinfo = &g_rtc_lowerhalf.cbinfo; /* Sample and clear the callback information to minimize the window in * time in which race conditions can occur. */ rtc_alarm_callback_t cb = (rtc_alarm_callback_t)cbinfo->cb; - FAR void *arg = (FAR void *)cbinfo->priv; + void *arg = (void *)cbinfo->priv; cbinfo->cb = NULL; cbinfo->priv = NULL; @@ -190,18 +190,18 @@ static void kinetis_alarm_callback(void) * ****************************************************************************/ -static int kinetis_rdtime(FAR struct rtc_lowerhalf_s *lower, - FAR struct rtc_time *rtctime) +static int kinetis_rdtime(struct rtc_lowerhalf_s *lower, + struct rtc_time *rtctime) { #if defined(CONFIG_RTC_DATETIME) /* This operation depends on the fact that struct rtc_time is cast * compatible with struct tm. */ - return up_rtc_getdatetime((FAR struct tm *)rtctime); + return up_rtc_getdatetime((struct tm *)rtctime); #elif defined(CONFIG_RTC_HIRES) - FAR struct timespec ts; + struct timespec ts; int ret; /* Get the higher resolution time */ @@ -217,7 +217,7 @@ static int kinetis_rdtime(FAR struct rtc_lowerhalf_s *lower, * compatible. */ - if (!gmtime_r(&ts.tv_sec, (FAR struct tm *)rtctime)) + if (!gmtime_r(&ts.tv_sec, (struct tm *)rtctime)) { ret = -get_errno(); goto errout; @@ -238,7 +238,7 @@ errout: /* Convert the one second epoch time to a struct tm */ - if (!gmtime_r(&timer, (FAR struct tm *)rtctime)) + if (!gmtime_r(&timer, (struct tm *)rtctime)) { int errcode = get_errno(); DEBUGASSERT(errcode > 0); @@ -265,8 +265,8 @@ errout: * ****************************************************************************/ -static int kinetis_settime(FAR struct rtc_lowerhalf_s *lower, - FAR const struct rtc_time *rtctime) +static int kinetis_settime(struct rtc_lowerhalf_s *lower, + const struct rtc_time *rtctime) { struct timespec ts; @@ -274,7 +274,7 @@ static int kinetis_settime(FAR struct rtc_lowerhalf_s *lower, * rtc_time is cast compatible with struct tm. */ - ts.tv_sec = timegm((FAR struct tm *)rtctime); + ts.tv_sec = timegm((struct tm *)rtctime); ts.tv_nsec = 0; /* Set the time (to one second accuracy) */ @@ -300,11 +300,11 @@ static int kinetis_settime(FAR struct rtc_lowerhalf_s *lower, ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -static int kinetis_setalarm(FAR struct rtc_lowerhalf_s *lower, - FAR const struct lower_setalarm_s *alarminfo) +static int kinetis_setalarm(struct rtc_lowerhalf_s *lower, + const struct lower_setalarm_s *alarminfo) { - FAR struct kinetis_lowerhalf_s *priv; - FAR struct kinetis_cbinfo_s *cbinfo; + struct kinetis_lowerhalf_s *priv; + struct kinetis_cbinfo_s *cbinfo; struct timespec tp; @@ -313,7 +313,7 @@ static int kinetis_setalarm(FAR struct rtc_lowerhalf_s *lower, /* ID0-> Alarm A supported */ DEBUGASSERT(lower != NULL && alarminfo != NULL); - priv = (FAR struct kinetis_lowerhalf_s *)lower; + priv = (struct kinetis_lowerhalf_s *)lower; if (alarminfo->id == RTC_ALARMA) { @@ -325,7 +325,7 @@ static int kinetis_setalarm(FAR struct rtc_lowerhalf_s *lower, /* Convert from Julian calendar time to epoch time */ - tp.tv_sec = timegm((FAR struct tm *)&alarminfo->time) ; + tp.tv_sec = timegm((struct tm *)&alarminfo->time) ; /* And set the alarm */ @@ -360,8 +360,8 @@ static int kinetis_setalarm(FAR struct rtc_lowerhalf_s *lower, #ifdef CONFIG_RTC_ALARM static int -kinetis_setrelative(FAR struct rtc_lowerhalf_s *lower, - FAR const struct lower_setrelative_s *alarminfo) +kinetis_setrelative(struct rtc_lowerhalf_s *lower, + const struct lower_setrelative_s *alarminfo) { struct lower_setalarm_s setalarm; #if defined(CONFIG_RTC_DATETIME) @@ -418,7 +418,7 @@ kinetis_setrelative(FAR struct rtc_lowerhalf_s *lower, /* And convert the time back to Julian/broken out format */ - gmtime_r(&seconds, (FAR struct tm *)&setalarm.time); + gmtime_r(&seconds, (struct tm *)&setalarm.time); /* The set the alarm using this absolute time */ @@ -454,15 +454,15 @@ kinetis_setrelative(FAR struct rtc_lowerhalf_s *lower, #ifdef CONFIG_RTC_ALARM static int -kinetis_cancelalarm(FAR struct rtc_lowerhalf_s *lower, int alarmid) +kinetis_cancelalarm(struct rtc_lowerhalf_s *lower, int alarmid) { - FAR struct kinetis_lowerhalf_s *priv; - FAR struct kinetis_cbinfo_s *cbinfo; + struct kinetis_lowerhalf_s *priv; + struct kinetis_cbinfo_s *cbinfo; int ret = -EINVAL; DEBUGASSERT(lower != NULL); DEBUGASSERT(alarmid == RTC_ALARMA); - priv = (FAR struct kinetis_lowerhalf_s *)lower; + priv = (struct kinetis_lowerhalf_s *)lower; /* ID0-> Alarm A */ @@ -500,8 +500,8 @@ kinetis_cancelalarm(FAR struct rtc_lowerhalf_s *lower, int alarmid) ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -static int kinetis_rdalarm(FAR struct rtc_lowerhalf_s *lower, - FAR struct lower_rdalarm_s *alarminfo) +static int kinetis_rdalarm(struct rtc_lowerhalf_s *lower, + struct lower_rdalarm_s *alarminfo) { struct timespec ts; int ret = -EINVAL; @@ -518,8 +518,8 @@ static int kinetis_rdalarm(FAR struct rtc_lowerhalf_s *lower, sched_lock(); ret = kinetis_rtc_rdalarm(&ts); - localtime_r((FAR const time_t *)&ts.tv_sec, - (FAR struct tm *)alarminfo->time); + localtime_r((const time_t *)&ts.tv_sec, + (struct tm *)alarminfo->time); sched_unlock(); } @@ -553,9 +553,9 @@ static int kinetis_rdalarm(FAR struct rtc_lowerhalf_s *lower, * ****************************************************************************/ -FAR struct rtc_lowerhalf_s *kinetis_rtc_lowerhalf(void) +struct rtc_lowerhalf_s *kinetis_rtc_lowerhalf(void) { - return (FAR struct rtc_lowerhalf_s *)&g_rtc_lowerhalf; + return (struct rtc_lowerhalf_s *)&g_rtc_lowerhalf; } #endif /* CONFIG_RTC_DRIVER */ diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c index 3b3ffe012b..5521332d0b 100644 --- a/arch/arm/src/kinetis/kinetis_sdhc.c +++ b/arch/arm/src/kinetis/kinetis_sdhc.c @@ -272,76 +272,76 @@ static void kinetis_endtransfer(struct kinetis_dev_s *priv, /* Interrupt Handling *******************************************************/ -static int kinetis_interrupt(int irq, void *context, FAR void *arg); +static int kinetis_interrupt(int irq, void *context, void *arg); /* SDIO interface methods ***************************************************/ /* Mutual exclusion */ #ifdef CONFIG_SDIO_MUXBUS -static int kinetis_lock(FAR struct sdio_dev_s *dev, bool lock); +static int kinetis_lock(struct sdio_dev_s *dev, bool lock); #endif /* Initialization/setup */ -static void kinetis_reset(FAR struct sdio_dev_s *dev); -static sdio_capset_t kinetis_capabilities(FAR struct sdio_dev_s *dev); -static sdio_statset_t kinetis_status(FAR struct sdio_dev_s *dev); -static void kinetis_widebus(FAR struct sdio_dev_s *dev, bool enable); +static void kinetis_reset(struct sdio_dev_s *dev); +static sdio_capset_t kinetis_capabilities(struct sdio_dev_s *dev); +static sdio_statset_t kinetis_status(struct sdio_dev_s *dev); +static void kinetis_widebus(struct sdio_dev_s *dev, bool enable); #ifdef CONFIG_KINETIS_SDHC_ABSFREQ -static void kinetis_frequency(FAR struct sdio_dev_s *dev, +static void kinetis_frequency(struct sdio_dev_s *dev, uint32_t frequency); #endif -static void kinetis_clock(FAR struct sdio_dev_s *dev, +static void kinetis_clock(struct sdio_dev_s *dev, enum sdio_clock_e rate); -static int kinetis_attach(FAR struct sdio_dev_s *dev); +static int kinetis_attach(struct sdio_dev_s *dev); /* Command/Status/Data Transfer */ -static int kinetis_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int kinetis_sendcmd(struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg); #ifdef CONFIG_SDIO_BLOCKSETUP -static void kinetis_blocksetup(FAR struct sdio_dev_s *dev, +static void kinetis_blocksetup(struct sdio_dev_s *dev, unsigned int blocksize, unsigned int nblocks); #endif #ifndef CONFIG_KINETIS_SDHC_DMA -static int kinetis_recvsetup(FAR struct sdio_dev_s *dev, - FAR uint8_t *buffer, size_t nbytes); -static int kinetis_sendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, size_t nbytes); +static int kinetis_recvsetup(struct sdio_dev_s *dev, + uint8_t *buffer, size_t nbytes); +static int kinetis_sendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t nbytes); #endif -static int kinetis_cancel(FAR struct sdio_dev_s *dev); +static int kinetis_cancel(struct sdio_dev_s *dev); -static int kinetis_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd); -static int kinetis_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int kinetis_waitresponse(struct sdio_dev_s *dev, uint32_t cmd); +static int kinetis_recvshortcrc(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort); -static int kinetis_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int kinetis_recvlong(struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong[4]); -static int kinetis_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int kinetis_recvshort(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort); -static int kinetis_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int kinetis_recvnotimpl(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rnotimpl); /* EVENT handler */ -static void kinetis_waitenable(FAR struct sdio_dev_s *dev, +static void kinetis_waitenable(struct sdio_dev_s *dev, sdio_eventset_t eventset, uint32_t timeout); -static sdio_eventset_t kinetis_eventwait(FAR struct sdio_dev_s *dev); -static void kinetis_callbackenable(FAR struct sdio_dev_s *dev, +static sdio_eventset_t kinetis_eventwait(struct sdio_dev_s *dev); +static void kinetis_callbackenable(struct sdio_dev_s *dev, sdio_eventset_t eventset); -static int kinetis_registercallback(FAR struct sdio_dev_s *dev, +static int kinetis_registercallback(struct sdio_dev_s *dev, worker_t callback, void *arg); /* DMA */ #ifdef CONFIG_KINETIS_SDHC_DMA -static int kinetis_dmarecvsetup(FAR struct sdio_dev_s *dev, - FAR uint8_t *buffer, size_t buflen); -static int kinetis_dmasendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, size_t buflen); +static int kinetis_dmarecvsetup(struct sdio_dev_s *dev, + uint8_t *buffer, size_t buflen); +static int kinetis_dmasendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t buflen); #endif /* Initialization/uninitialization/reset ************************************/ @@ -1071,7 +1071,7 @@ static void kinetis_endtransfer(struct kinetis_dev_s *priv, * ****************************************************************************/ -static int kinetis_interrupt(int irq, void *context, FAR void *arg) +static int kinetis_interrupt(int irq, void *context, void *arg) { struct kinetis_dev_s *priv = &g_sdhcdev; uint32_t enabled; @@ -1218,7 +1218,7 @@ static int kinetis_interrupt(int irq, void *context, FAR void *arg) ****************************************************************************/ #ifdef CONFIG_SDIO_MUXBUS -static int kinetis_lock(FAR struct sdio_dev_s *dev, bool lock) +static int kinetis_lock(struct sdio_dev_s *dev, bool lock) { /* Single SDIO instance so there is only one possibility. The multiplex * bus is part of board support package. @@ -1243,9 +1243,9 @@ static int kinetis_lock(FAR struct sdio_dev_s *dev, bool lock) * ****************************************************************************/ -static void kinetis_reset(FAR struct sdio_dev_s *dev) +static void kinetis_reset(struct sdio_dev_s *dev) { - FAR struct kinetis_dev_s *priv = (FAR struct kinetis_dev_s *)dev; + struct kinetis_dev_s *priv = (struct kinetis_dev_s *)dev; uint32_t regval; /* Disable all interrupts so that nothing interferes with the following. */ @@ -1318,7 +1318,7 @@ static void kinetis_reset(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static sdio_capset_t kinetis_capabilities(FAR struct sdio_dev_s *dev) +static sdio_capset_t kinetis_capabilities(struct sdio_dev_s *dev) { sdio_capset_t caps = 0; @@ -1347,7 +1347,7 @@ static sdio_capset_t kinetis_capabilities(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static sdio_statset_t kinetis_status(FAR struct sdio_dev_s *dev) +static sdio_statset_t kinetis_status(struct sdio_dev_s *dev) { struct kinetis_dev_s *priv = (struct kinetis_dev_s *)dev; return priv->cdstatus; @@ -1370,7 +1370,7 @@ static sdio_statset_t kinetis_status(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static void kinetis_widebus(FAR struct sdio_dev_s *dev, bool wide) +static void kinetis_widebus(struct sdio_dev_s *dev, bool wide) { uint32_t regval; @@ -1406,7 +1406,7 @@ static void kinetis_widebus(FAR struct sdio_dev_s *dev, bool wide) ****************************************************************************/ #ifdef CONFIG_KINETIS_SDHC_ABSFREQ -static void kinetis_frequency(FAR struct sdio_dev_s *dev, uint32_t frequency) +static void kinetis_frequency(struct sdio_dev_s *dev, uint32_t frequency) { uint32_t sdclkfs; uint32_t prescaled; @@ -1542,7 +1542,7 @@ static void kinetis_frequency(FAR struct sdio_dev_s *dev, uint32_t frequency) ****************************************************************************/ #ifdef CONFIG_KINETIS_SDHC_ABSFREQ -static void kinetis_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate) +static void kinetis_clock(struct sdio_dev_s *dev, enum sdio_clock_e rate) { uint32_t frequency; uint32_t regval; @@ -1600,7 +1600,7 @@ static void kinetis_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate) kinetis_frequency(dev, frequency); } #else -static void kinetis_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate) +static void kinetis_clock(struct sdio_dev_s *dev, enum sdio_clock_e rate) { uint32_t regval; @@ -1705,7 +1705,7 @@ static void kinetis_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate) * ****************************************************************************/ -static int kinetis_attach(FAR struct sdio_dev_s *dev) +static int kinetis_attach(struct sdio_dev_s *dev) { int ret; @@ -1747,7 +1747,7 @@ static int kinetis_attach(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static int kinetis_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int kinetis_sendcmd(struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg) { clock_t timeout; @@ -1913,9 +1913,9 @@ static int kinetis_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, ****************************************************************************/ #ifdef CONFIG_SDIO_BLOCKSETUP -static void kinetis_blocksetup(FAR struct sdio_dev_s *dev, - unsigned int blocksize, - unsigned int nblocks) +static void kinetis_blocksetup(struct sdio_dev_s *dev, + unsigned int blocksize, + unsigned int nblocks) { uint32_t regval; @@ -1953,7 +1953,7 @@ static void kinetis_blocksetup(FAR struct sdio_dev_s *dev, ****************************************************************************/ #ifndef CONFIG_KINETIS_SDHC_DMA -static int kinetis_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, +static int kinetis_recvsetup(struct sdio_dev_s *dev, uint8_t *buffer, size_t nbytes) { struct kinetis_dev_s *priv = (struct kinetis_dev_s *)dev; @@ -2006,8 +2006,8 @@ static int kinetis_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, ****************************************************************************/ #ifndef CONFIG_KINETIS_SDHC_DMA -static int kinetis_sendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, size_t nbytes) +static int kinetis_sendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t nbytes) { struct kinetis_dev_s *priv = (struct kinetis_dev_s *)dev; @@ -2054,7 +2054,7 @@ static int kinetis_sendsetup(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static int kinetis_cancel(FAR struct sdio_dev_s *dev) +static int kinetis_cancel(struct sdio_dev_s *dev) { struct kinetis_dev_s *priv = (struct kinetis_dev_s *)dev; #ifdef CONFIG_KINETIS_SDHC_DMA @@ -2110,7 +2110,7 @@ static int kinetis_cancel(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static int kinetis_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd) +static int kinetis_waitresponse(struct sdio_dev_s *dev, uint32_t cmd) { clock_t timeout; clock_t start; @@ -2207,7 +2207,7 @@ static int kinetis_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd) * ****************************************************************************/ -static int kinetis_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int kinetis_recvshortcrc(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort) { uint32_t regval; @@ -2278,7 +2278,7 @@ static int kinetis_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, return ret; } -static int kinetis_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int kinetis_recvlong(struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong[4]) { uint32_t regval; @@ -2344,7 +2344,7 @@ static int kinetis_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, return ret; } -static int kinetis_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int kinetis_recvshort(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort) { uint32_t regval; @@ -2395,7 +2395,7 @@ static int kinetis_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, /* MMC responses not supported */ -static int kinetis_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int kinetis_recvnotimpl(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rnotimpl) { /* Just return an error */ @@ -2427,8 +2427,8 @@ static int kinetis_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd, * ****************************************************************************/ -static void kinetis_waitenable(FAR struct sdio_dev_s *dev, - sdio_eventset_t eventset, uint32_t timeout) +static void kinetis_waitenable(struct sdio_dev_s *dev, + sdio_eventset_t eventset, uint32_t timeout) { struct kinetis_dev_s *priv = (struct kinetis_dev_s *)dev; uint32_t waitints; @@ -2506,7 +2506,7 @@ static void kinetis_waitenable(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static sdio_eventset_t kinetis_eventwait(FAR struct sdio_dev_s *dev) +static sdio_eventset_t kinetis_eventwait(struct sdio_dev_s *dev) { struct kinetis_dev_s *priv = (struct kinetis_dev_s *)dev; sdio_eventset_t wkupevent = 0; @@ -2593,8 +2593,8 @@ static sdio_eventset_t kinetis_eventwait(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static void kinetis_callbackenable(FAR struct sdio_dev_s *dev, - sdio_eventset_t eventset) +static void kinetis_callbackenable(struct sdio_dev_s *dev, + sdio_eventset_t eventset) { struct kinetis_dev_s *priv = (struct kinetis_dev_s *)dev; @@ -2627,8 +2627,8 @@ static void kinetis_callbackenable(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static int kinetis_registercallback(FAR struct sdio_dev_s *dev, - worker_t callback, void *arg) +static int kinetis_registercallback(struct sdio_dev_s *dev, + worker_t callback, void *arg) { struct kinetis_dev_s *priv = (struct kinetis_dev_s *)dev; @@ -2663,8 +2663,8 @@ static int kinetis_registercallback(FAR struct sdio_dev_s *dev, ****************************************************************************/ #ifdef CONFIG_KINETIS_SDHC_DMA -static int kinetis_dmarecvsetup(FAR struct sdio_dev_s *dev, - FAR uint8_t *buffer, size_t buflen) +static int kinetis_dmarecvsetup(struct sdio_dev_s *dev, + uint8_t *buffer, size_t buflen) { struct kinetis_dev_s *priv = (struct kinetis_dev_s *)dev; @@ -2723,8 +2723,8 @@ static int kinetis_dmarecvsetup(FAR struct sdio_dev_s *dev, ****************************************************************************/ #ifdef CONFIG_KINETIS_SDHC_DMA -static int kinetis_dmasendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, size_t buflen) +static int kinetis_dmasendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t buflen) { struct kinetis_dev_s *priv = (struct kinetis_dev_s *)dev; @@ -2863,7 +2863,7 @@ static void kinetis_callback(void *arg) * ****************************************************************************/ -FAR struct sdio_dev_s *sdhc_initialize(int slotno) +struct sdio_dev_s *sdhc_initialize(int slotno) { uint32_t regval; @@ -2972,7 +2972,7 @@ FAR struct sdio_dev_s *sdhc_initialize(int slotno) * ****************************************************************************/ -void sdhc_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot) +void sdhc_mediachange(struct sdio_dev_s *dev, bool cardinslot) { struct kinetis_dev_s *priv = (struct kinetis_dev_s *)dev; sdio_statset_t cdstatus; @@ -3019,7 +3019,7 @@ void sdhc_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot) * ****************************************************************************/ -void sdhc_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect) +void sdhc_wrprotect(struct sdio_dev_s *dev, bool wrprotect) { struct kinetis_dev_s *priv = (struct kinetis_dev_s *)dev; irqstate_t flags; diff --git a/arch/arm/src/kinetis/kinetis_serial.c b/arch/arm/src/kinetis/kinetis_serial.c index 146d2de571..19a2f78ae0 100644 --- a/arch/arm/src/kinetis/kinetis_serial.c +++ b/arch/arm/src/kinetis/kinetis_serial.c @@ -316,9 +316,9 @@ static void up_shutdown(struct uart_dev_s *dev); static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); #ifdef CONFIG_DEBUG_FEATURES -static int up_interrupt(int irq, void *context, FAR void *arg); +static int up_interrupt(int irq, void *context, void *arg); #endif -static int up_interrupts(int irq, void *context, FAR void *arg); +static int up_interrupts(int irq, void *context, void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); static void up_rxint(struct uart_dev_s *dev, bool enable); #if !defined(SERIAL_HAVE_ALL_DMA) @@ -1123,7 +1123,7 @@ static void up_detach(struct uart_dev_s *dev) ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -static int up_interrupt(int irq, void *context, FAR void *arg) +static int up_interrupt(int irq, void *context, void *arg) { struct uart_dev_s *dev = (struct uart_dev_s *)arg; struct up_dev_s *priv; @@ -1165,7 +1165,7 @@ static int up_interrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -static int up_interrupts(int irq, void *context, FAR void *arg) +static int up_interrupts(int irq, void *context, void *arg) { struct uart_dev_s *dev = (struct uart_dev_s *)arg; struct up_dev_s *priv; diff --git a/arch/arm/src/kinetis/kinetis_spi.c b/arch/arm/src/kinetis/kinetis_spi.c index 07afe80d4a..87f3f68f73 100644 --- a/arch/arm/src/kinetis/kinetis_spi.c +++ b/arch/arm/src/kinetis/kinetis_spi.c @@ -120,69 +120,69 @@ struct kinetis_spidev_s /* Helpers */ -static inline uint32_t spi_getreg(FAR struct kinetis_spidev_s *priv, +static inline uint32_t spi_getreg(struct kinetis_spidev_s *priv, uint8_t offset); -static inline void spi_putreg(FAR struct kinetis_spidev_s *priv, +static inline void spi_putreg(struct kinetis_spidev_s *priv, uint8_t offset, uint32_t value); -static inline uint16_t spi_getreg16(FAR struct kinetis_spidev_s *priv, +static inline uint16_t spi_getreg16(struct kinetis_spidev_s *priv, uint8_t offset); -static inline void spi_putreg16(FAR struct kinetis_spidev_s *priv, +static inline void spi_putreg16(struct kinetis_spidev_s *priv, uint8_t offset, uint16_t value); -static inline uint8_t spi_getreg8(FAR struct kinetis_spidev_s *priv, +static inline uint8_t spi_getreg8(struct kinetis_spidev_s *priv, uint8_t offset); -static inline void spi_putreg8(FAR struct kinetis_spidev_s *priv, +static inline void spi_putreg8(struct kinetis_spidev_s *priv, uint8_t offset, uint8_t value); -static inline uint16_t spi_readword(FAR struct kinetis_spidev_s *priv); -static inline void spi_writeword(FAR struct kinetis_spidev_s *priv, +static inline uint16_t spi_readword(struct kinetis_spidev_s *priv); +static inline void spi_writeword(struct kinetis_spidev_s *priv, uint16_t word); -static inline void spi_run(FAR struct kinetis_spidev_s *priv, +static inline void spi_run(struct kinetis_spidev_s *priv, bool enable); -static inline void spi_write_control(FAR struct kinetis_spidev_s *priv, +static inline void spi_write_control(struct kinetis_spidev_s *priv, uint32_t control); -static inline void spi_write_status(FAR struct kinetis_spidev_s *priv, +static inline void spi_write_status(struct kinetis_spidev_s *priv, uint32_t status); -static inline void spi_wait_status(FAR struct kinetis_spidev_s *priv, +static inline void spi_wait_status(struct kinetis_spidev_s *priv, uint32_t status); -static uint16_t spi_send_data(FAR struct kinetis_spidev_s *priv, +static uint16_t spi_send_data(struct kinetis_spidev_s *priv, uint16_t wd, bool last); /* DMA support */ #ifdef CONFIG_KINETIS_SPI_DMA -static int spi_dmarxwait(FAR struct kinetis_spidev_s *priv); -static int spi_dmatxwait(FAR struct kinetis_spidev_s *priv); -static inline void spi_dmarxwakeup(FAR struct kinetis_spidev_s *priv); -static inline void spi_dmatxwakeup(FAR struct kinetis_spidev_s *priv); +static int spi_dmarxwait(struct kinetis_spidev_s *priv); +static int spi_dmatxwait(struct kinetis_spidev_s *priv); +static inline void spi_dmarxwakeup(struct kinetis_spidev_s *priv); +static inline void spi_dmatxwakeup(struct kinetis_spidev_s *priv); static void spi_dmarxcallback(DMACH_HANDLE handle, void *arg, bool done, int result); static void spi_dmatxcallback(DMACH_HANDLE handle, void *arg, bool done, int result); -static inline void spi_dmarxstart(FAR struct kinetis_spidev_s *priv); -static inline void spi_dmatxstart(FAR struct kinetis_spidev_s *priv); +static inline void spi_dmarxstart(struct kinetis_spidev_s *priv); +static inline void spi_dmatxstart(struct kinetis_spidev_s *priv); #endif /* SPI methods */ -static int spi_lock(FAR struct spi_dev_s *dev, bool lock); -static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, +static int spi_lock(struct spi_dev_s *dev, bool lock); +static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency); -static void spi_setmode(FAR struct spi_dev_s *dev, +static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode); -static void spi_setbits(FAR struct spi_dev_s *dev, int nbits); +static void spi_setbits(struct spi_dev_s *dev, int nbits); #ifdef CONFIG_SPI_HWFEATURES -static int spi_hwfeatures(FAR struct spi_dev_s *dev, +static int spi_hwfeatures(struct spi_dev_s *dev, spi_hwfeatures_t features); #endif -static uint32_t spi_send(FAR struct spi_dev_s *dev, uint32_t wd); -static void spi_exchange(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, - FAR void *rxbuffer, size_t nwords); +static uint32_t spi_send(struct spi_dev_s *dev, uint32_t wd); +static void spi_exchange(struct spi_dev_s *dev, + const void *txbuffer, + void *rxbuffer, size_t nwords); #ifndef CONFIG_SPI_EXCHANGE -static void spi_sndblock(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, size_t nwords); -static void spi_recvblock(FAR struct spi_dev_s *dev, - FAR void *rxbuffer, +static void spi_sndblock(struct spi_dev_s *dev, + const void *txbuffer, size_t nwords); +static void spi_recvblock(struct spi_dev_s *dev, + void *rxbuffer, size_t nwords); #endif @@ -359,7 +359,7 @@ static struct kinetis_spidev_s g_spi2dev = ****************************************************************************/ #ifdef CONFIG_KINETIS_SPI_DMA -static inline void spi_modifyreg(FAR struct kinetis_spidev_s *priv, +static inline void spi_modifyreg(struct kinetis_spidev_s *priv, uint8_t offset, uint32_t clearbits, uint32_t setbits) { @@ -382,7 +382,7 @@ static inline void spi_modifyreg(FAR struct kinetis_spidev_s *priv, * ****************************************************************************/ -static inline uint32_t spi_getreg(FAR struct kinetis_spidev_s *priv, +static inline uint32_t spi_getreg(struct kinetis_spidev_s *priv, uint8_t offset) { return getreg32(priv->spibase + offset); @@ -404,7 +404,7 @@ static inline uint32_t spi_getreg(FAR struct kinetis_spidev_s *priv, * ****************************************************************************/ -static inline void spi_putreg(FAR struct kinetis_spidev_s *priv, +static inline void spi_putreg(struct kinetis_spidev_s *priv, uint8_t offset, uint32_t value) { @@ -426,7 +426,7 @@ static inline void spi_putreg(FAR struct kinetis_spidev_s *priv, * ****************************************************************************/ -static inline uint16_t spi_getreg16(FAR struct kinetis_spidev_s *priv, +static inline uint16_t spi_getreg16(struct kinetis_spidev_s *priv, uint8_t offset) { return getreg16(priv->spibase + offset); @@ -448,7 +448,7 @@ static inline uint16_t spi_getreg16(FAR struct kinetis_spidev_s *priv, * ****************************************************************************/ -static inline void spi_putreg16(FAR struct kinetis_spidev_s *priv, +static inline void spi_putreg16(struct kinetis_spidev_s *priv, uint8_t offset, uint16_t value) { @@ -470,7 +470,7 @@ static inline void spi_putreg16(FAR struct kinetis_spidev_s *priv, * ****************************************************************************/ -static inline uint8_t spi_getreg8(FAR struct kinetis_spidev_s *priv, +static inline uint8_t spi_getreg8(struct kinetis_spidev_s *priv, uint8_t offset) { return getreg8(priv->spibase + offset); @@ -492,7 +492,7 @@ static inline uint8_t spi_getreg8(FAR struct kinetis_spidev_s *priv, * ****************************************************************************/ -static inline void spi_putreg8(FAR struct kinetis_spidev_s *priv, +static inline void spi_putreg8(struct kinetis_spidev_s *priv, uint8_t offset, uint8_t value) { @@ -514,7 +514,7 @@ static inline void spi_putreg8(FAR struct kinetis_spidev_s *priv, * ****************************************************************************/ -static inline void spi_write_status(FAR struct kinetis_spidev_s *priv, +static inline void spi_write_status(struct kinetis_spidev_s *priv, uint32_t status) { /* Write the SR Register */ @@ -537,7 +537,7 @@ static inline void spi_write_status(FAR struct kinetis_spidev_s *priv, * ****************************************************************************/ -static inline void spi_wait_status(FAR struct kinetis_spidev_s *priv, +static inline void spi_wait_status(struct kinetis_spidev_s *priv, uint32_t status) { while (status != (spi_getreg(priv, KINETIS_SPI_SR_OFFSET) & status)); @@ -558,7 +558,7 @@ static inline void spi_wait_status(FAR struct kinetis_spidev_s *priv, * ****************************************************************************/ -static inline void spi_write_control(FAR struct kinetis_spidev_s *priv, +static inline void spi_write_control(struct kinetis_spidev_s *priv, uint32_t control) { /* Write the control word to the SPI Data Register */ @@ -582,7 +582,7 @@ static inline void spi_write_control(FAR struct kinetis_spidev_s *priv, * ****************************************************************************/ -static inline void spi_writeword(FAR struct kinetis_spidev_s *priv, +static inline void spi_writeword(struct kinetis_spidev_s *priv, uint16_t word) { /* Wait until there is space in the fifo */ @@ -608,7 +608,7 @@ static inline void spi_writeword(FAR struct kinetis_spidev_s *priv, * ****************************************************************************/ -static inline uint16_t spi_readword(FAR struct kinetis_spidev_s *priv) +static inline uint16_t spi_readword(struct kinetis_spidev_s *priv) { /* Wait until transfer completes and the data is in the RX FIFO */ @@ -634,7 +634,7 @@ static inline uint16_t spi_readword(FAR struct kinetis_spidev_s *priv) * ****************************************************************************/ -void inline spi_run(FAR struct kinetis_spidev_s *priv, bool enable) +void inline spi_run(struct kinetis_spidev_s *priv, bool enable) { uint32_t regval; @@ -665,9 +665,9 @@ void inline spi_run(FAR struct kinetis_spidev_s *priv, bool enable) * ****************************************************************************/ -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 kinetis_spidev_s *priv = (FAR struct kinetis_spidev_s *)dev; + struct kinetis_spidev_s *priv = (struct kinetis_spidev_s *)dev; int ret; if (lock) @@ -697,10 +697,10 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock) * ****************************************************************************/ -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 kinetis_spidev_s *priv = (FAR struct kinetis_spidev_s *)dev; + struct kinetis_spidev_s *priv = (struct kinetis_spidev_s *)dev; uint32_t prescale; uint32_t prescalev; @@ -814,9 +814,9 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) +static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) { - FAR struct kinetis_spidev_s *priv = (FAR struct kinetis_spidev_s *)dev; + struct kinetis_spidev_s *priv = (struct kinetis_spidev_s *)dev; uint32_t regval; spiinfo("mode=%d\n", mode); @@ -875,9 +875,9 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) * ****************************************************************************/ -static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) +static void spi_setbits(struct spi_dev_s *dev, int nbits) { - FAR struct kinetis_spidev_s *priv = (FAR struct kinetis_spidev_s *)dev; + struct kinetis_spidev_s *priv = (struct kinetis_spidev_s *)dev; uint32_t regval; if (nbits != priv->nbits) @@ -919,11 +919,11 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) ****************************************************************************/ #ifdef CONFIG_SPI_HWFEATURES -static int spi_hwfeatures(FAR struct spi_dev_s *dev, +static int spi_hwfeatures(struct spi_dev_s *dev, spi_hwfeatures_t features) { #ifdef CONFIG_SPI_BITORDER - FAR struct kinetis_spidev_s *priv = (FAR struct spi_dev_s *)dev; + struct kinetis_spidev_s *priv = (struct spi_dev_s *)dev; uint32_t setbits; uint32_t clrbits; @@ -972,7 +972,7 @@ static int spi_hwfeatures(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static uint16_t spi_send_data(FAR struct kinetis_spidev_s *priv, uint16_t wd, +static uint16_t spi_send_data(struct kinetis_spidev_s *priv, uint16_t wd, bool last) { uint16_t ret; @@ -1021,9 +1021,9 @@ static uint16_t spi_send_data(FAR struct kinetis_spidev_s *priv, uint16_t wd, * ****************************************************************************/ -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 kinetis_spidev_s *priv = (FAR struct kinetis_spidev_s *)dev; + struct kinetis_spidev_s *priv = (struct kinetis_spidev_s *)dev; return (uint32_t)spi_send_data(priv, (uint16_t)wd, true); } @@ -1051,15 +1051,15 @@ static uint32_t spi_send(FAR struct spi_dev_s *dev, uint32_t wd) #if !defined(CONFIG_STM32_SPI_DMA) || defined(CONFIG_STM32_SPI_DMATHRESHOLD) # if !defined(CONFIG_KINETIS_SPI_DMA) -static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, - FAR void *rxbuffer, size_t nwords) +static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, + void *rxbuffer, size_t nwords) # else -static void spi_exchange_nodma(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, - FAR void *rxbuffer, size_t nwords) +static void spi_exchange_nodma(struct spi_dev_s *dev, + const void *txbuffer, + void *rxbuffer, size_t nwords) # endif { - FAR struct kinetis_spidev_s *priv = (FAR struct kinetis_spidev_s *)dev; + struct kinetis_spidev_s *priv = (struct kinetis_spidev_s *)dev; uint8_t *brxptr = (uint8_t *)rxbuffer; const uint8_t *btxptr = (uint8_t *)txbuffer; uint16_t *wrxptr = (uint16_t *)rxbuffer; @@ -1153,15 +1153,15 @@ static void spi_exchange_nodma(FAR struct spi_dev_s *dev, ****************************************************************************/ #ifdef CONFIG_KINETIS_SPI_DMA -static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, - FAR void *rxbuffer, size_t nwords) +static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, + void *rxbuffer, size_t nwords) { - int ret; - size_t adjust; - ssize_t nbytes; - static uint8_t rxdummy[4] aligned_data(4); - static const uint16_t txdummy = 0xffff; - FAR struct kinetis_spidev_s *priv = (FAR struct kinetis_spidev_s *)dev; + int ret; + size_t adjust; + ssize_t nbytes; + static uint8_t rxdummy[4] aligned_data(4); + static const uint16_t txdummy = 0xffff; + struct kinetis_spidev_s *priv = (struct kinetis_spidev_s *)dev; DEBUGASSERT(priv != NULL); DEBUGASSERT(priv && priv->spibase); @@ -1305,8 +1305,8 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, ****************************************************************************/ #ifndef CONFIG_SPI_EXCHANGE -static void spi_sndblock(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, +static void spi_sndblock(struct spi_dev_s *dev, + const void *txbuffer, size_t nwords) { spiinfo("txbuffer=%p nwords=%d\n", txbuffer, nwords); @@ -1335,7 +1335,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, ****************************************************************************/ #ifndef CONFIG_SPI_EXCHANGE -static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *rxbuffer, +static void spi_recvblock(struct spi_dev_s *dev, void *rxbuffer, size_t nwords) { spiinfo("rxbuffer=%p nwords=%d\n", rxbuffer, nwords); @@ -1352,7 +1352,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *rxbuffer, ****************************************************************************/ #ifdef CONFIG_KINETIS_SPI_DMA -static int spi_dmarxwait(FAR struct kinetis_spidev_s *priv) +static int spi_dmarxwait(struct kinetis_spidev_s *priv) { int ret; @@ -1385,7 +1385,7 @@ static int spi_dmarxwait(FAR struct kinetis_spidev_s *priv) ****************************************************************************/ #ifdef CONFIG_KINETIS_SPI_DMA -static int spi_dmatxwait(FAR struct kinetis_spidev_s *priv) +static int spi_dmatxwait(struct kinetis_spidev_s *priv) { int ret; @@ -1418,7 +1418,7 @@ static int spi_dmatxwait(FAR struct kinetis_spidev_s *priv) ****************************************************************************/ #ifdef CONFIG_KINETIS_SPI_DMA -static inline void spi_dmarxwakeup(FAR struct kinetis_spidev_s *priv) +static inline void spi_dmarxwakeup(struct kinetis_spidev_s *priv) { nxsem_post(&priv->rxsem); } @@ -1433,7 +1433,7 @@ static inline void spi_dmarxwakeup(FAR struct kinetis_spidev_s *priv) ****************************************************************************/ #ifdef CONFIG_KINETIS_SPI_DMA -static inline void spi_dmatxwakeup(FAR struct kinetis_spidev_s *priv) +static inline void spi_dmatxwakeup(struct kinetis_spidev_s *priv) { nxsem_post(&priv->txsem); } @@ -1451,7 +1451,7 @@ static inline void spi_dmatxwakeup(FAR struct kinetis_spidev_s *priv) static void spi_dmarxcallback(DMACH_HANDLE handle, void *arg, bool done, int result) { - FAR struct kinetis_spidev_s *priv = (FAR struct kinetis_spidev_s *)arg; + struct kinetis_spidev_s *priv = (struct kinetis_spidev_s *)arg; priv->rxresult = result | 0x80000000; /* assure non-zero */ spi_dmarxwakeup(priv); @@ -1470,7 +1470,7 @@ static void spi_dmarxcallback(DMACH_HANDLE handle, void *arg, bool done, static void spi_dmatxcallback(DMACH_HANDLE handle, void *arg, bool done, int result) { - FAR struct kinetis_spidev_s *priv = (FAR struct kinetis_spidev_s *)arg; + struct kinetis_spidev_s *priv = (struct kinetis_spidev_s *)arg; /* Wake-up the SPI driver */ @@ -1488,7 +1488,7 @@ static void spi_dmatxcallback(DMACH_HANDLE handle, void *arg, bool done, ****************************************************************************/ #ifdef CONFIG_KINETIS_SPI_DMA -static inline void spi_dmarxstart(FAR struct kinetis_spidev_s *priv) +static inline void spi_dmarxstart(struct kinetis_spidev_s *priv) { priv->rxresult = 0; kinetis_dmach_start(priv->rxdma, spi_dmarxcallback, priv); @@ -1504,7 +1504,7 @@ static inline void spi_dmarxstart(FAR struct kinetis_spidev_s *priv) ****************************************************************************/ #ifdef CONFIG_KINETIS_SPI_DMA -static inline void spi_dmatxstart(FAR struct kinetis_spidev_s *priv) +static inline void spi_dmatxstart(struct kinetis_spidev_s *priv) { priv->txresult = 0; kinetis_dmach_start(priv->txdma, spi_dmatxcallback, priv); @@ -1529,9 +1529,9 @@ static inline void spi_dmatxstart(FAR struct kinetis_spidev_s *priv) * ****************************************************************************/ -FAR struct spi_dev_s *kinetis_spibus_initialize(int port) +struct spi_dev_s *kinetis_spibus_initialize(int port) { - FAR struct kinetis_spidev_s *priv; + struct kinetis_spidev_s *priv; uint32_t regval; /* Configure multiplexed pins as connected on the board. Chip select pins diff --git a/arch/arm/src/kinetis/kinetis_spi.h b/arch/arm/src/kinetis/kinetis_spi.h index 9d993b1920..759ec3349c 100644 --- a/arch/arm/src/kinetis/kinetis_spi.h +++ b/arch/arm/src/kinetis/kinetis_spi.h @@ -68,7 +68,7 @@ struct spi_dev_s; * ****************************************************************************/ -FAR struct spi_dev_s *kinetis_spibus_initialize(int bus); +struct spi_dev_s *kinetis_spibus_initialize(int bus); /**************************************************************************** * Name: @@ -102,27 +102,27 @@ FAR struct spi_dev_s *kinetis_spibus_initialize(int bus); ****************************************************************************/ #ifdef CONFIG_KINETIS_SPI0 -void kinetis_spi0select(FAR struct spi_dev_s *dev, +void kinetis_spi0select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t kinetis_spi0status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t kinetis_spi0status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int kinetis_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int kinetis_spi0cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_KINETIS_SPI1 -void kinetis_spi1select(FAR struct spi_dev_s *dev, +void kinetis_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t kinetis_spi1status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t kinetis_spi1status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int kinetis_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int kinetis_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_KINETIS_SPI2 -void kinetis_spi2select(FAR struct spi_dev_s *dev, +void kinetis_spi2select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t kinetis_spi2status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t kinetis_spi2status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int kinetis_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int kinetis_spi2cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif @@ -148,7 +148,7 @@ int kinetis_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #if defined(CONFIG_KINETIS_SPI0) || defined(CONFIG_KINETIS_SPI1) || defined(CONFIG_KINETIS_SPI2) struct spi_dev_s; -void spi_flush(FAR struct spi_dev_s *dev); +void spi_flush(struct spi_dev_s *dev); #endif #endif /* __ASSEMBLY__ */ diff --git a/arch/arm/src/kinetis/kinetis_timerisr.c b/arch/arm/src/kinetis/kinetis_timerisr.c index 4d7befbd86..552e6eb49b 100644 --- a/arch/arm/src/kinetis/kinetis_timerisr.c +++ b/arch/arm/src/kinetis/kinetis_timerisr.c @@ -73,7 +73,7 @@ * ****************************************************************************/ -static int kinetis_timerisr(int irq, uint32_t *regs, FAR void *arg) +static int kinetis_timerisr(int irq, uint32_t *regs, void *arg) { /* Process timer interrupt */ diff --git a/arch/arm/src/kinetis/kinetis_usbdev.c b/arch/arm/src/kinetis/kinetis_usbdev.c index 64f6086535..f6484274b2 100644 --- a/arch/arm/src/kinetis/kinetis_usbdev.c +++ b/arch/arm/src/kinetis/kinetis_usbdev.c @@ -580,7 +580,7 @@ static void khci_ep0outcomplete(struct khci_usbdev_s *priv); static void khci_ep0incomplete(struct khci_usbdev_s *priv); static void khci_ep0transfer(struct khci_usbdev_s *priv, uint16_t ustat); -static int khci_interrupt(int irq, void *context, FAR void *arg); +static int khci_interrupt(int irq, void *context, void *arg); /* Endpoint helpers *********************************************************/ @@ -2876,7 +2876,7 @@ static void khci_ep0transfer(struct khci_usbdev_s *priv, uint16_t ustat) * Name: khci_interrupt ****************************************************************************/ -static int khci_interrupt(int irq, void *context, FAR void *arg) +static int khci_interrupt(int irq, void *context, void *arg) { uint16_t usbir; uint32_t regval; diff --git a/arch/arm/src/kinetis/kinetis_usbhshost.c b/arch/arm/src/kinetis/kinetis_usbhshost.c index 9a69c3ab6d..d228edd692 100644 --- a/arch/arm/src/kinetis/kinetis_usbhshost.c +++ b/arch/arm/src/kinetis/kinetis_usbhshost.c @@ -386,7 +386,7 @@ struct kinetis_ehci_trace_s uint16_t id; bool fmt2; #endif - FAR const char *string; + const char *string; }; #endif /* HAVE_USBHOST_TRACE */ @@ -506,7 +506,7 @@ static ssize_t kinetis_transfer_wait(struct kinetis_epinfo_s *epinfo); #ifdef CONFIG_USBHOST_ASYNCH static inline int kinetis_ioc_async_setup(struct kinetis_rhport_s *rhport, struct kinetis_epinfo_s *epinfo, usbhost_asynch_t callback, - FAR void *arg); + void *arg); static void kinetis_asynch_completion(struct kinetis_epinfo_s *epinfo); #endif @@ -526,59 +526,59 @@ static inline void kinetis_ioc_bottomhalf(void); static inline void kinetis_portsc_bottomhalf(void); static inline void kinetis_syserr_bottomhalf(void); static inline void kinetis_async_advance_bottomhalf(void); -static void kinetis_ehci_bottomhalf(FAR void *arg); +static void kinetis_ehci_bottomhalf(void *arg); static int kinetis_ehci_interrupt(int irq, - FAR void *context, FAR void *arg); + void *context, void *arg); /* USB Host Controller Operations *******************************************/ -static int kinetis_wait(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s **hport); -static int kinetis_rh_enumerate(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport); -static int kinetis_enumerate(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport); -static int kinetis_ep0configure(FAR struct usbhost_driver_s *drvr, +static int kinetis_wait(struct usbhost_connection_s *conn, + struct usbhost_hubport_s **hport); +static int kinetis_rh_enumerate(struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport); +static int kinetis_enumerate(struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport); +static int kinetis_ep0configure(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, uint8_t funcaddr, uint8_t speed, uint16_t maxpacketsize); -static int kinetis_epalloc(FAR struct usbhost_driver_s *drvr, - FAR const struct usbhost_epdesc_s *epdesc, - FAR usbhost_ep_t *ep); -static int kinetis_epfree(FAR struct usbhost_driver_s *drvr, +static int kinetis_epalloc(struct usbhost_driver_s *drvr, + const struct usbhost_epdesc_s *epdesc, + usbhost_ep_t *ep); +static int kinetis_epfree(struct usbhost_driver_s *drvr, usbhost_ep_t ep); -static int kinetis_alloc(FAR struct usbhost_driver_s *drvr, - FAR uint8_t **buffer, FAR size_t *maxlen); -static int kinetis_free(FAR struct usbhost_driver_s *drvr, - FAR uint8_t *buffer); -static int kinetis_ioalloc(FAR struct usbhost_driver_s *drvr, - FAR uint8_t **buffer, size_t buflen); -static int kinetis_iofree(FAR struct usbhost_driver_s *drvr, - FAR uint8_t *buffer); -static int kinetis_ctrlin(FAR struct usbhost_driver_s *drvr, +static int kinetis_alloc(struct usbhost_driver_s *drvr, + uint8_t **buffer, size_t *maxlen); +static int kinetis_free(struct usbhost_driver_s *drvr, + uint8_t *buffer); +static int kinetis_ioalloc(struct usbhost_driver_s *drvr, + uint8_t **buffer, size_t buflen); +static int kinetis_iofree(struct usbhost_driver_s *drvr, + uint8_t *buffer); +static int kinetis_ctrlin(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, - FAR const struct usb_ctrlreq_s *req, - FAR uint8_t *buffer); -static int kinetis_ctrlout(FAR struct usbhost_driver_s *drvr, + const struct usb_ctrlreq_s *req, + uint8_t *buffer); +static int kinetis_ctrlout(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, - FAR const struct usb_ctrlreq_s *req, - FAR const uint8_t *buffer); -static ssize_t kinetis_transfer(FAR struct usbhost_driver_s *drvr, - usbhost_ep_t ep, FAR uint8_t *buffer, + const struct usb_ctrlreq_s *req, + const uint8_t *buffer); +static ssize_t kinetis_transfer(struct usbhost_driver_s *drvr, + usbhost_ep_t ep, uint8_t *buffer, size_t buflen); #ifdef CONFIG_USBHOST_ASYNCH -static int kinetis_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, - FAR uint8_t *buffer, size_t buflen, - usbhost_asynch_t callback, FAR void *arg); +static int kinetis_asynch(struct usbhost_driver_s *drvr, usbhost_ep_t ep, + uint8_t *buffer, size_t buflen, + usbhost_asynch_t callback, void *arg); #endif -static int kinetis_cancel(FAR struct usbhost_driver_s *drvr, +static int kinetis_cancel(struct usbhost_driver_s *drvr, usbhost_ep_t ep); #ifdef CONFIG_USBHOST_HUB -static int kinetis_connect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport, +static int kinetis_connect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport, bool connected); #endif -static void kinetis_disconnect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport); +static void kinetis_disconnect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport); /* Initialization ***********************************************************/ @@ -2699,7 +2699,7 @@ static ssize_t kinetis_transfer_wait(struct kinetis_epinfo_s *epinfo) static inline int kinetis_ioc_async_setup(struct kinetis_rhport_s *rhport, struct kinetis_epinfo_s *epinfo, usbhost_asynch_t callback, - FAR void *arg) + void *arg) { irqstate_t flags; int ret = -ENODEV; @@ -3392,7 +3392,7 @@ static inline void kinetis_async_advance_bottomhalf(void) * ****************************************************************************/ -static void kinetis_ehci_bottomhalf(FAR void *arg) +static void kinetis_ehci_bottomhalf(void *arg) { uint32_t pending = (uint32_t)arg; @@ -3535,7 +3535,7 @@ static void kinetis_ehci_bottomhalf(FAR void *arg) * ****************************************************************************/ -static int kinetis_ehci_interrupt(int irq, FAR void *context, FAR void *arg) +static int kinetis_ehci_interrupt(int irq, void *context, void *arg) { uint32_t usbsts; uint32_t pending; @@ -3567,7 +3567,7 @@ static int kinetis_ehci_interrupt(int irq, FAR void *context, FAR void *arg) DEBUGASSERT(work_available(&g_ehci.work)); DEBUGVERIFY(work_queue(HPWORK, &g_ehci.work, kinetis_ehci_bottomhalf, - (FAR void *)pending, 0)); + (void *)pending, 0)); /* Disable further EHCI interrupts so that we do not overrun the work * queue. We acknowledge the interrupts after servicing. @@ -3604,8 +3604,8 @@ static int kinetis_ehci_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static int kinetis_wait(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s **hport) +static int kinetis_wait(struct usbhost_connection_s *conn, + struct usbhost_hubport_s **hport) { irqstate_t flags; int rhpndx; @@ -3707,8 +3707,8 @@ static int kinetis_wait(FAR struct usbhost_connection_s *conn, * ****************************************************************************/ -static int kinetis_rh_enumerate(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport) +static int kinetis_rh_enumerate(struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport) { struct kinetis_rhport_s *rhport; volatile uint32_t *regaddr; @@ -3923,8 +3923,8 @@ static int kinetis_rh_enumerate(FAR struct usbhost_connection_s *conn, return OK; } -static int kinetis_enumerate(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport) +static int kinetis_enumerate(struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport) { int ret; @@ -3993,9 +3993,9 @@ static int kinetis_enumerate(FAR struct usbhost_connection_s *conn, * ****************************************************************************/ -static int kinetis_ep0configure(FAR struct usbhost_driver_s *drvr, - usbhost_ep_t ep0, uint8_t funcaddr, - uint8_t speed, uint16_t maxpacketsize) +static int kinetis_ep0configure(struct usbhost_driver_s *drvr, + usbhost_ep_t ep0, uint8_t funcaddr, + uint8_t speed, uint16_t maxpacketsize) { struct kinetis_epinfo_s *epinfo = (struct kinetis_epinfo_s *)ep0; int ret; @@ -4041,9 +4041,9 @@ static int kinetis_ep0configure(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int kinetis_epalloc(FAR struct usbhost_driver_s *drvr, - FAR const struct usbhost_epdesc_s *epdesc, - FAR usbhost_ep_t *ep) +static int kinetis_epalloc(struct usbhost_driver_s *drvr, + const struct usbhost_epdesc_s *epdesc, + usbhost_ep_t *ep) { struct kinetis_epinfo_s *epinfo; struct usbhost_hubport_s *hport; @@ -4127,7 +4127,7 @@ static int kinetis_epalloc(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int kinetis_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) +static int kinetis_epfree(struct usbhost_driver_s *drvr, usbhost_ep_t ep) { struct kinetis_epinfo_s *epinfo = (struct kinetis_epinfo_s *)ep; @@ -4174,8 +4174,8 @@ static int kinetis_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) * ****************************************************************************/ -static int kinetis_alloc(FAR struct usbhost_driver_s *drvr, - FAR uint8_t **buffer, FAR size_t *maxlen) +static int kinetis_alloc(struct usbhost_driver_s *drvr, + uint8_t **buffer, size_t *maxlen) { int ret = -ENOMEM; DEBUGASSERT(drvr && buffer && maxlen); @@ -4185,8 +4185,8 @@ static int kinetis_alloc(FAR struct usbhost_driver_s *drvr, * multiple of the cache line size in length. */ - *buffer = (FAR uint8_t *)kmm_memalign(ARMV7M_DCACHE_LINESIZE, - KINETIS_EHCI_BUFSIZE); + *buffer = (uint8_t *)kmm_memalign(ARMV7M_DCACHE_LINESIZE, + KINETIS_EHCI_BUFSIZE); if (*buffer) { *maxlen = KINETIS_EHCI_BUFSIZE; @@ -4220,8 +4220,8 @@ static int kinetis_alloc(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int kinetis_free(FAR struct usbhost_driver_s *drvr, - FAR uint8_t *buffer) +static int kinetis_free(struct usbhost_driver_s *drvr, + uint8_t *buffer) { DEBUGASSERT(drvr && buffer); @@ -4262,8 +4262,8 @@ static int kinetis_free(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int kinetis_ioalloc(FAR struct usbhost_driver_s *drvr, - FAR uint8_t **buffer, size_t buflen) +static int kinetis_ioalloc(struct usbhost_driver_s *drvr, + uint8_t **buffer, size_t buflen) { DEBUGASSERT(drvr && buffer && buflen > 0); @@ -4274,7 +4274,7 @@ static int kinetis_ioalloc(FAR struct usbhost_driver_s *drvr, */ buflen = (buflen + DCACHE_LINEMASK) & ~DCACHE_LINEMASK; - *buffer = (FAR uint8_t *)kumm_memalign(ARMV7M_DCACHE_LINESIZE, buflen); + *buffer = (uint8_t *)kumm_memalign(ARMV7M_DCACHE_LINESIZE, buflen); return *buffer ? OK : -ENOMEM; } @@ -4301,8 +4301,8 @@ static int kinetis_ioalloc(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int kinetis_iofree(FAR struct usbhost_driver_s *drvr, - FAR uint8_t *buffer) +static int kinetis_iofree(struct usbhost_driver_s *drvr, + uint8_t *buffer) { DEBUGASSERT(drvr && buffer); @@ -4348,10 +4348,10 @@ static int kinetis_iofree(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int kinetis_ctrlin(FAR struct usbhost_driver_s *drvr, +static int kinetis_ctrlin(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, - FAR const struct usb_ctrlreq_s *req, - FAR uint8_t *buffer) + const struct usb_ctrlreq_s *req, + uint8_t *buffer) { struct kinetis_rhport_s *rhport = (struct kinetis_rhport_s *)drvr; struct kinetis_epinfo_s *ep0info = (struct kinetis_epinfo_s *)ep0; @@ -4415,10 +4415,10 @@ errout_with_sem: return ret; } -static int kinetis_ctrlout(FAR struct usbhost_driver_s *drvr, +static int kinetis_ctrlout(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, - FAR const struct usb_ctrlreq_s *req, - FAR const uint8_t *buffer) + const struct usb_ctrlreq_s *req, + const uint8_t *buffer) { /* kinetis_ctrlin can handle both directions. We just need to work around * the differences in the function signatures. @@ -4466,9 +4466,9 @@ static int kinetis_ctrlout(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static ssize_t kinetis_transfer(FAR struct usbhost_driver_s *drvr, - usbhost_ep_t ep, FAR uint8_t *buffer, - size_t buflen) +static ssize_t kinetis_transfer(struct usbhost_driver_s *drvr, + usbhost_ep_t ep, uint8_t *buffer, + size_t buflen) { struct kinetis_rhport_s *rhport = (struct kinetis_rhport_s *)drvr; struct kinetis_epinfo_s *epinfo = (struct kinetis_epinfo_s *)ep; @@ -4579,9 +4579,9 @@ errout_with_sem: ****************************************************************************/ #ifdef CONFIG_USBHOST_ASYNCH -static int kinetis_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, - FAR uint8_t *buffer, size_t buflen, - usbhost_asynch_t callback, FAR void *arg) +static int kinetis_asynch(struct usbhost_driver_s *drvr, usbhost_ep_t ep, + uint8_t *buffer, size_t buflen, + usbhost_asynch_t callback, void *arg) { struct kinetis_rhport_s *rhport = (struct kinetis_rhport_s *)drvr; struct kinetis_epinfo_s *epinfo = (struct kinetis_epinfo_s *)ep; @@ -4673,7 +4673,7 @@ errout_with_sem: * ****************************************************************************/ -static int kinetis_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) +static int kinetis_cancel(struct usbhost_driver_s *drvr, usbhost_ep_t ep) { struct kinetis_epinfo_s *epinfo = (struct kinetis_epinfo_s *)ep; struct kinetis_qh_s *qh; @@ -4878,9 +4878,9 @@ errout_with_sem: ****************************************************************************/ #ifdef CONFIG_USBHOST_HUB -static int kinetis_connect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport, - bool connected) +static int kinetis_connect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport, + bool connected) { irqstate_t flags; @@ -4933,8 +4933,8 @@ static int kinetis_connect(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static void kinetis_disconnect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport) +static void kinetis_disconnect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport) { DEBUGASSERT(hport != NULL); hport->devclass = NULL; @@ -5088,9 +5088,9 @@ static int kinetis_reset(void) * ****************************************************************************/ -FAR struct usbhost_connection_s *kinetis_ehci_initialize(int controller) +struct usbhost_connection_s *kinetis_ehci_initialize(int controller) { - FAR struct usbhost_hubport_s *hport; + struct usbhost_hubport_s *hport; uint32_t regval; # if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_INFO) uint16_t regval16; @@ -5495,7 +5495,7 @@ FAR struct usbhost_connection_s *kinetis_ehci_initialize(int controller) ****************************************************************************/ #ifdef HAVE_USBHOST_TRACE -FAR const char *usbhost_trformat1(uint16_t id) +const char *usbhost_trformat1(uint16_t id) { int ndx = TRACE1_INDEX(id); @@ -5507,7 +5507,7 @@ FAR const char *usbhost_trformat1(uint16_t id) return NULL; } -FAR const char *usbhost_trformat2(uint16_t id) +const char *usbhost_trformat2(uint16_t id) { int ndx = TRACE2_INDEX(id); diff --git a/arch/arm/src/kinetis/kinetis_usbhshost.h b/arch/arm/src/kinetis/kinetis_usbhshost.h index af8d12e4e8..7640e88b6a 100644 --- a/arch/arm/src/kinetis/kinetis_usbhshost.h +++ b/arch/arm/src/kinetis/kinetis_usbhshost.h @@ -122,7 +122,7 @@ extern int kinetis_setup_overcurrent(xcpt_t handler, void *arg); #if defined(CONFIG_KINETIS_USBHS) && defined(CONFIG_USBHOST) struct usbhost_connection_s; -FAR struct usbhost_connection_s *kinetis_ehci_initialize(int controller); +struct usbhost_connection_s *kinetis_ehci_initialize(int controller); #endif #undef EXTERN diff --git a/arch/arm/src/kinetis/kinetis_usbotg.h b/arch/arm/src/kinetis/kinetis_usbotg.h index c01683464a..00f4598aec 100644 --- a/arch/arm/src/kinetis/kinetis_usbotg.h +++ b/arch/arm/src/kinetis/kinetis_usbotg.h @@ -49,6 +49,6 @@ struct usbotg_bdtentry_s ****************************************************************************/ struct usbdev_s; -int kinetis_usbpullup(FAR struct usbdev_s *dev, bool enable); -void kinetis_usbsuspend(FAR struct usbdev_s *dev, bool resume); +int kinetis_usbpullup(struct usbdev_s *dev, bool enable); +void kinetis_usbsuspend(struct usbdev_s *dev, bool resume); #endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_USBOTG_H */ diff --git a/arch/arm/src/kl/kl_dma.h b/arch/arm/src/kl/kl_dma.h index 1a6dfc4392..97b9325d77 100644 --- a/arch/arm/src/kl/kl_dma.h +++ b/arch/arm/src/kl/kl_dma.h @@ -52,7 +52,7 @@ extern "C" * Public Types ****************************************************************************/ -typedef FAR void *DMA_HANDLE; +typedef void *DMA_HANDLE; typedef void (*dma_callback_t)(DMA_HANDLE handle, void *arg, int result); /* The following is used for sampling DMA registers when CONFIG DEBUG_DMA diff --git a/arch/arm/src/kl/kl_gpioirq.c b/arch/arm/src/kl/kl_gpioirq.c index 269e01083c..891a2af8e9 100644 --- a/arch/arm/src/kl/kl_gpioirq.c +++ b/arch/arm/src/kl/kl_gpioirq.c @@ -100,8 +100,8 @@ static struct g_portisrs_s g_portdisrs[32]; ****************************************************************************/ #ifdef HAVE_PORTINTS -static int kl_portinterrupt(int irq, FAR void *context, - uintptr_t addr, xcpt_t *isrtab) +static int kl_portinterrupt(int irq, void *context, + uintptr_t addr, xcpt_t *isrtab) { uint32_t isfr = getreg32(addr); int i; @@ -160,14 +160,14 @@ static int kl_portinterrupt(int irq, FAR void *context, ****************************************************************************/ #ifdef CONFIG_KL_PORTAINTS -static int kl_portainterrupt(int irq, FAR void *context, FAR void *arg) +static int kl_portainterrupt(int irq, void *context, void *arg) { return kl_portinterrupt(irq, context, KL_PORTA_ISFR, g_portaisrs); } #endif #ifdef CONFIG_KL_PORTDINTS -static int kl_portdinterrupt(int irq, FAR void *context, FAR void *arg) +static int kl_portdinterrupt(int irq, void *context, void *arg) { return kl_portinterrupt(irq, context, KL_PORTD_ISFR, g_portdisrs); } diff --git a/arch/arm/src/kl/kl_irq.c b/arch/arm/src/kl/kl_irq.c index e972fc208b..5dcdb5954a 100644 --- a/arch/arm/src/kl/kl_irq.c +++ b/arch/arm/src/kl/kl_irq.c @@ -122,7 +122,7 @@ static void kl_dumpnvic(const char *msg, int irq) ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -static int kl_nmi(int irq, FAR void *context, FAR void *arg) +static int kl_nmi(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! NMI received\n"); @@ -130,7 +130,7 @@ static int kl_nmi(int irq, FAR void *context, FAR void *arg) return 0; } -static int kl_pendsv(int irq, FAR void *context, FAR void *arg) +static int kl_pendsv(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! PendSV received\n"); @@ -138,7 +138,7 @@ static int kl_pendsv(int irq, FAR void *context, FAR void *arg) return 0; } -static int kl_reserved(int irq, FAR void *context, FAR void *arg) +static int kl_reserved(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Reserved interrupt\n"); diff --git a/arch/arm/src/kl/kl_pwm.c b/arch/arm/src/kl/kl_pwm.c index a158b6bac2..94b9d40826 100644 --- a/arch/arm/src/kl/kl_pwm.c +++ b/arch/arm/src/kl/kl_pwm.c @@ -72,12 +72,12 @@ struct kl_pwmtimer_s { - FAR const struct pwm_ops_s *ops; /* PWM operations */ - uint8_t tpmid; /* Timer/PWM Module ID {0,..,2} */ - uint8_t channel; /* Timer/PWM Module channel: {0,..5} */ - uint32_t base; /* The base address of the timer */ - uint32_t pincfg; /* Output pin configuration */ - uint32_t pclk; /* The frequency of the peripheral clock */ + const struct pwm_ops_s *ops; /* PWM operations */ + uint8_t tpmid; /* Timer/PWM Module ID {0,..,2} */ + uint8_t channel; /* Timer/PWM Module channel: {0,..5} */ + uint32_t base; /* The base address of the timer */ + uint32_t pincfg; /* Output pin configuration */ + uint32_t pclk; /* The frequency of the peripheral clock */ }; /**************************************************************************** @@ -91,26 +91,26 @@ static void pwm_putreg(struct kl_pwmtimer_s *priv, int offset, uint32_t value); #ifdef CONFIG_DEBUG_PWM_INFO -static void pwm_dumpregs(struct kl_pwmtimer_s *priv, FAR const char *msg); +static void pwm_dumpregs(struct kl_pwmtimer_s *priv, const char *msg); #else # define pwm_dumpregs(priv,msg) #endif /* Timer management */ -static int pwm_timer(FAR struct kl_pwmtimer_s *priv, - FAR const struct pwm_info_s *info); +static int pwm_timer(struct kl_pwmtimer_s *priv, + const struct pwm_info_s *info); /* PWM driver methods */ -static int pwm_setup(FAR struct pwm_lowerhalf_s *dev); -static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev); +static int pwm_setup(struct pwm_lowerhalf_s *dev); +static int pwm_shutdown(struct pwm_lowerhalf_s *dev); -static int pwm_start(FAR struct pwm_lowerhalf_s *dev, - FAR const struct pwm_info_s *info); +static int pwm_start(struct pwm_lowerhalf_s *dev, + const struct pwm_info_s *info); -static int pwm_stop(FAR struct pwm_lowerhalf_s *dev); -static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, +static int pwm_stop(struct pwm_lowerhalf_s *dev); +static int pwm_ioctl(struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg); /**************************************************************************** @@ -226,7 +226,7 @@ static void pwm_putreg(struct kl_pwmtimer_s *priv, int offset, ****************************************************************************/ #ifdef CONFIG_DEBUG_PWM_INFO -static void pwm_dumpregs(struct kl_pwmtimer_s *priv, FAR const char *msg) +static void pwm_dumpregs(struct kl_pwmtimer_s *priv, const char *msg) { int nchannels = (priv->tpmid == 0) ? 6 : 2; @@ -307,8 +307,8 @@ static void pwm_dumpregs(struct kl_pwmtimer_s *priv, FAR const char *msg) * ****************************************************************************/ -static int pwm_timer(FAR struct kl_pwmtimer_s *priv, - FAR const struct pwm_info_s *info) +static int pwm_timer(struct kl_pwmtimer_s *priv, + const struct pwm_info_s *info) { /* Calculated values */ @@ -495,10 +495,10 @@ static int pwm_timer(FAR struct kl_pwmtimer_s *priv, * ****************************************************************************/ -static int pwm_setup(FAR struct pwm_lowerhalf_s *dev) +static int pwm_setup(struct pwm_lowerhalf_s *dev) { uint32_t regval; - FAR struct kl_pwmtimer_s *priv = (FAR struct kl_pwmtimer_s *)dev; + struct kl_pwmtimer_s *priv = (struct kl_pwmtimer_s *)dev; /* Enable access to TPM modules */ @@ -532,9 +532,9 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) +static int pwm_shutdown(struct pwm_lowerhalf_s *dev) { - FAR struct kl_pwmtimer_s *priv = (FAR struct kl_pwmtimer_s *)dev; + struct kl_pwmtimer_s *priv = (struct kl_pwmtimer_s *)dev; uint32_t pincfg; pwminfo("TPM%d pincfg: %08" PRIx32 "\n", priv->tpmid, priv->pincfg); @@ -566,10 +566,10 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int pwm_start(FAR struct pwm_lowerhalf_s *dev, - FAR const struct pwm_info_s *info) +static int pwm_start(struct pwm_lowerhalf_s *dev, + const struct pwm_info_s *info) { - FAR struct kl_pwmtimer_s *priv = (FAR struct kl_pwmtimer_s *)dev; + struct kl_pwmtimer_s *priv = (struct kl_pwmtimer_s *)dev; return pwm_timer(priv, info); } @@ -592,9 +592,9 @@ static int pwm_start(FAR struct pwm_lowerhalf_s *dev, * ****************************************************************************/ -static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) +static int pwm_stop(struct pwm_lowerhalf_s *dev) { - FAR struct kl_pwmtimer_s *priv = (FAR struct kl_pwmtimer_s *)dev; + struct kl_pwmtimer_s *priv = (struct kl_pwmtimer_s *)dev; irqstate_t flags; pwminfo("TPM%d\n", priv->tpmid); @@ -666,11 +666,11 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, +static int pwm_ioctl(struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg) { #ifdef CONFIG_DEBUG_PWM_INFO - FAR struct kl_pwmtimer_s *priv = (FAR struct kl_pwmtimer_s *)dev; + struct kl_pwmtimer_s *priv = (struct kl_pwmtimer_s *)dev; /* There are no platform-specific ioctl commands */ @@ -698,9 +698,9 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, * ****************************************************************************/ -FAR struct pwm_lowerhalf_s *kl_pwminitialize(int timer) +struct pwm_lowerhalf_s *kl_pwminitialize(int timer) { - FAR struct kl_pwmtimer_s *lower; + struct kl_pwmtimer_s *lower; pwminfo("TPM%d\n", timer); @@ -732,7 +732,7 @@ FAR struct pwm_lowerhalf_s *kl_pwminitialize(int timer) return NULL; } - return (FAR struct pwm_lowerhalf_s *)lower; + return (struct pwm_lowerhalf_s *)lower; } #endif /* CONFIG_KL_TPMn_PWM, n = 0,...,2 */ diff --git a/arch/arm/src/kl/kl_pwm.h b/arch/arm/src/kl/kl_pwm.h index 9d902fb95e..fc5ddf5248 100644 --- a/arch/arm/src/kl/kl_pwm.h +++ b/arch/arm/src/kl/kl_pwm.h @@ -173,7 +173,7 @@ extern "C" * ****************************************************************************/ -FAR struct pwm_lowerhalf_s *kl_pwminitialize(int timer); +struct pwm_lowerhalf_s *kl_pwminitialize(int timer); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/kl/kl_spi.c b/arch/arm/src/kl/kl_spi.c index 4294a1805f..1443964ebf 100644 --- a/arch/arm/src/kl/kl_spi.c +++ b/arch/arm/src/kl/kl_spi.c @@ -67,26 +67,26 @@ struct kl_spidev_s /* Helpers */ -static inline uint8_t spi_getreg(FAR struct kl_spidev_s *priv, +static inline uint8_t spi_getreg(struct kl_spidev_s *priv, uint8_t offset); -static inline void spi_putreg(FAR struct kl_spidev_s *priv, uint8_t offset, +static inline void spi_putreg(struct kl_spidev_s *priv, uint8_t offset, uint8_t value); /* SPI methods */ -static int spi_lock(FAR struct spi_dev_s *dev, bool lock); -static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, +static int spi_lock(struct spi_dev_s *dev, bool lock); +static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency); -static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode); -static void spi_setbits(FAR struct spi_dev_s *dev, int nbits); -static uint32_t spi_send(FAR struct spi_dev_s *dev, uint32_t wd); -static void spi_exchange(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, FAR void *rxbuffer, +static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode); +static void spi_setbits(struct spi_dev_s *dev, int nbits); +static uint32_t spi_send(struct spi_dev_s *dev, uint32_t wd); +static void spi_exchange(struct spi_dev_s *dev, + const void *txbuffer, void *rxbuffer, size_t nwords); #ifndef CONFIG_SPI_EXCHANGE -static void spi_sndblock(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, size_t nwords); -static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *rxbuffer, +static void spi_sndblock(struct spi_dev_s *dev, + const void *txbuffer, size_t nwords); +static void spi_recvblock(struct spi_dev_s *dev, void *rxbuffer, size_t nwords); #endif @@ -180,7 +180,7 @@ static struct kl_spidev_s g_spi1dev = * ****************************************************************************/ -static inline uint8_t spi_getreg(FAR struct kl_spidev_s *priv, +static inline uint8_t spi_getreg(struct kl_spidev_s *priv, uint8_t offset) { return getreg8(priv->spibase + offset); @@ -202,7 +202,7 @@ static inline uint8_t spi_getreg(FAR struct kl_spidev_s *priv, * ****************************************************************************/ -static inline void spi_putreg(FAR struct kl_spidev_s *priv, uint8_t offset, +static inline void spi_putreg(struct kl_spidev_s *priv, uint8_t offset, uint8_t value) { putreg8(value, priv->spibase + offset); @@ -229,9 +229,9 @@ static inline void spi_putreg(FAR struct kl_spidev_s *priv, uint8_t offset, * ****************************************************************************/ -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 kl_spidev_s *priv = (FAR struct kl_spidev_s *)dev; + struct kl_spidev_s *priv = (struct kl_spidev_s *)dev; int ret; if (lock) @@ -261,10 +261,10 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock) * ****************************************************************************/ -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 kl_spidev_s *priv = (FAR struct kl_spidev_s *)dev; + struct kl_spidev_s *priv = (struct kl_spidev_s *)dev; uint32_t divisor; uint32_t actual; unsigned int spr; @@ -358,9 +358,9 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) +static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) { - FAR struct kl_spidev_s *priv = (FAR struct kl_spidev_s *)dev; + struct kl_spidev_s *priv = (struct kl_spidev_s *)dev; uint8_t regval; spiinfo("mode=%d\n", mode); @@ -419,7 +419,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) * ****************************************************************************/ -static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) +static void spi_setbits(struct spi_dev_s *dev, int nbits) { /* Only 8-bit mode is supported */ @@ -442,9 +442,9 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) * ****************************************************************************/ -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 kl_spidev_s *priv = (FAR struct kl_spidev_s *)dev; + struct kl_spidev_s *priv = (struct kl_spidev_s *)dev; /* Make sure that the transmit buffer is empty */ @@ -487,12 +487,12 @@ static uint32_t spi_send(FAR struct spi_dev_s *dev, uint32_t wd) * ****************************************************************************/ -static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, - FAR void *rxbuffer, size_t nwords) +static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, + void *rxbuffer, size_t nwords) { - FAR struct kl_spidev_s *priv = (FAR struct kl_spidev_s *)dev; - FAR uint8_t *rxptr = (FAR uint8_t *)rxbuffer; - FAR uint8_t *txptr = (FAR uint8_t *)txbuffer; + struct kl_spidev_s *priv = (struct kl_spidev_s *)dev; + uint8_t *rxptr = (uint8_t *)rxbuffer; + uint8_t *txptr = (uint8_t *)txbuffer; uint8_t data; spiinfo("txbuffer=%p rxbuffer=%p nwords=%d\n", txbuffer, rxbuffer, nwords); @@ -559,7 +559,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, ****************************************************************************/ #ifndef CONFIG_SPI_EXCHANGE -static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer, +static void spi_sndblock(struct spi_dev_s *dev, const void *txbuffer, size_t nwords) { spiinfo("txbuffer=%p nwords=%d\n", txbuffer, nwords); @@ -588,7 +588,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer, ****************************************************************************/ #ifndef CONFIG_SPI_EXCHANGE -static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *rxbuffer, +static void spi_recvblock(struct spi_dev_s *dev, void *rxbuffer, size_t nwords) { spiinfo("rxbuffer=%p nwords=%d\n", rxbuffer, nwords); @@ -614,9 +614,9 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *rxbuffer, * ****************************************************************************/ -FAR struct spi_dev_s *kl_spibus_initialize(int port) +struct spi_dev_s *kl_spibus_initialize(int port) { - FAR struct kl_spidev_s *priv; + struct kl_spidev_s *priv; uint32_t regval; /* Configure multiplexed pins as connected on the board. Chip select pins @@ -687,7 +687,7 @@ FAR struct spi_dev_s *kl_spibus_initialize(int port) /* Select a default frequency of approx. 400KHz */ - spi_setfrequency((FAR struct spi_dev_s *)priv, 400000); + spi_setfrequency((struct spi_dev_s *)priv, 400000); /* Initialize the SPI semaphore that enforces mutually exclusive access */ diff --git a/arch/arm/src/kl/kl_spi.h b/arch/arm/src/kl/kl_spi.h index 0a0180c3f8..a2ddb657aa 100644 --- a/arch/arm/src/kl/kl_spi.h +++ b/arch/arm/src/kl/kl_spi.h @@ -64,7 +64,7 @@ struct spi_dev_s; /* Forward reference */ * ****************************************************************************/ -FAR struct spi_dev_s *kl_spibus_initialize(int port); +struct spi_dev_s *kl_spibus_initialize(int port); /**************************************************************************** * Name: kl_spi[n]select, kl_spi[n]status, and kl_spi[n]cmddata @@ -97,20 +97,20 @@ FAR struct spi_dev_s *kl_spibus_initialize(int port); ****************************************************************************/ #ifdef CONFIG_KL_SPI0 -void kl_spi0select(FAR struct spi_dev_s *dev, +void kl_spi0select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t kl_spi0status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t kl_spi0status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int kl_spi0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int kl_spi0cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_KL_SPI1 -void kl_spi1select(FAR struct spi_dev_s *dev, +void kl_spi1select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t kl_spi1status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t kl_spi1status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int kl_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int kl_spi1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif diff --git a/arch/arm/src/kl/kl_timerisr.c b/arch/arm/src/kl/kl_timerisr.c index e58c4ca8ef..2f1c059253 100644 --- a/arch/arm/src/kl/kl_timerisr.c +++ b/arch/arm/src/kl/kl_timerisr.c @@ -89,7 +89,7 @@ * ****************************************************************************/ -static int kl_timerisr(int irq, uint32_t *regs, FAR void *arg) +static int kl_timerisr(int irq, uint32_t *regs, void *arg) { /* Process timer interrupt */ diff --git a/arch/arm/src/lc823450/lc823450_adc.c b/arch/arm/src/lc823450/lc823450_adc.c index 8dafb95e38..c9b6a4adea 100644 --- a/arch/arm/src/lc823450/lc823450_adc.c +++ b/arch/arm/src/lc823450/lc823450_adc.c @@ -77,7 +77,7 @@ struct lc823450_adc_inst_s { - FAR const struct adc_callback_s *cb; + const struct adc_callback_s *cb; struct adc_dev_s dev; sem_t sem_excl; /* Mutual exclusion semaphore */ @@ -94,17 +94,17 @@ struct lc823450_adc_inst_s static inline void lc823450_adc_clearirq(void); static inline int lc823450_adc_sem_wait( - FAR struct lc823450_adc_inst_s *inst); + struct lc823450_adc_inst_s *inst); static inline void lc823450_adc_sem_post( - FAR struct lc823450_adc_inst_s *inst); + struct lc823450_adc_inst_s *inst); -static int lc823450_adc_bind(FAR struct adc_dev_s *dev, - FAR const struct adc_callback_s *callback); -static void lc823450_adc_reset(FAR struct adc_dev_s *dev); -static int lc823450_adc_setup(FAR struct adc_dev_s *dev); -static void lc823450_adc_shutdown(FAR struct adc_dev_s *dev); -static void lc823450_adc_rxint(FAR struct adc_dev_s *dev, bool enable); -static int lc823450_adc_ioctl(FAR struct adc_dev_s *dev, int cmd, +static int lc823450_adc_bind(struct adc_dev_s *dev, + const struct adc_callback_s *callback); +static void lc823450_adc_reset(struct adc_dev_s *dev); +static int lc823450_adc_setup(struct adc_dev_s *dev); +static void lc823450_adc_shutdown(struct adc_dev_s *dev); +static void lc823450_adc_rxint(struct adc_dev_s *dev, bool enable); +static int lc823450_adc_ioctl(struct adc_dev_s *dev, int cmd, unsigned long arg); /**************************************************************************** @@ -206,7 +206,7 @@ static void lc823450_adc_standby(int on) * ****************************************************************************/ -static void lc823450_adc_start(FAR struct lc823450_adc_inst_s *inst) +static void lc823450_adc_start(struct lc823450_adc_inst_s *inst) { uint32_t pclk; /* APB clock in Hz */ uint8_t i; @@ -264,7 +264,7 @@ static void lc823450_adc_start(FAR struct lc823450_adc_inst_s *inst) * ****************************************************************************/ -static inline int lc823450_adc_sem_wait(FAR struct lc823450_adc_inst_s *inst) +static inline int lc823450_adc_sem_wait(struct lc823450_adc_inst_s *inst) { return nxsem_wait_uninterruptible(&inst->sem_excl); } @@ -278,7 +278,7 @@ static inline int lc823450_adc_sem_wait(FAR struct lc823450_adc_inst_s *inst) ****************************************************************************/ static inline void lc823450_adc_sem_post( - FAR struct lc823450_adc_inst_s *inst) + struct lc823450_adc_inst_s *inst) { nxsem_post(&inst->sem_excl); } @@ -292,7 +292,7 @@ static inline void lc823450_adc_sem_post( ****************************************************************************/ #ifndef CONFIG_ADC_POLLED -static int lc823450_adc_isr(int irq, void *context, FAR void *arg) +static int lc823450_adc_isr(int irq, void *context, void *arg) { ainfo("interrupt\n"); @@ -311,11 +311,11 @@ static int lc823450_adc_isr(int irq, void *context, FAR void *arg) * ****************************************************************************/ -static int lc823450_adc_bind(FAR struct adc_dev_s *dev, - FAR const struct adc_callback_s *callback) +static int lc823450_adc_bind(struct adc_dev_s *dev, + const struct adc_callback_s *callback) { - FAR struct lc823450_adc_inst_s *priv = - (FAR struct lc823450_adc_inst_s *)dev->ad_priv; + struct lc823450_adc_inst_s *priv = + (struct lc823450_adc_inst_s *)dev->ad_priv; DEBUGASSERT(priv != NULL); priv->cb = callback; @@ -335,7 +335,7 @@ static int lc823450_adc_bind(FAR struct adc_dev_s *dev, * ****************************************************************************/ -static void lc823450_adc_reset(FAR struct adc_dev_s *dev) +static void lc823450_adc_reset(struct adc_dev_s *dev) { ainfo("\n"); } @@ -355,7 +355,7 @@ static void lc823450_adc_reset(FAR struct adc_dev_s *dev) * ****************************************************************************/ -static int lc823450_adc_setup(FAR struct adc_dev_s *dev) +static int lc823450_adc_setup(struct adc_dev_s *dev) { ainfo("\n"); return OK; @@ -374,7 +374,7 @@ static int lc823450_adc_setup(FAR struct adc_dev_s *dev) * ****************************************************************************/ -static void lc823450_adc_shutdown(FAR struct adc_dev_s *dev) +static void lc823450_adc_shutdown(struct adc_dev_s *dev) { ainfo("\n"); } @@ -391,10 +391,10 @@ static void lc823450_adc_shutdown(FAR struct adc_dev_s *dev) * ****************************************************************************/ -static void lc823450_adc_rxint(FAR struct adc_dev_s *dev, bool enable) +static void lc823450_adc_rxint(struct adc_dev_s *dev, bool enable) { - FAR struct lc823450_adc_inst_s *inst = - (FAR struct lc823450_adc_inst_s *)dev->ad_priv; + struct lc823450_adc_inst_s *inst = + (struct lc823450_adc_inst_s *)dev->ad_priv; int ret; ainfo("enable: %d\n", enable); @@ -431,14 +431,14 @@ static void lc823450_adc_rxint(FAR struct adc_dev_s *dev, bool enable) * ****************************************************************************/ -static int lc823450_adc_ioctl(FAR struct adc_dev_s *dev, int cmd, +static int lc823450_adc_ioctl(struct adc_dev_s *dev, int cmd, unsigned long arg) { int ret = 0; uint32_t val; uint8_t ch; - FAR struct lc823450_adc_inst_s *priv = - (FAR struct lc823450_adc_inst_s *)dev->ad_priv; + struct lc823450_adc_inst_s *priv = + (struct lc823450_adc_inst_s *)dev->ad_priv; ainfo("cmd=%xh\n", cmd); @@ -515,7 +515,7 @@ static int lc823450_adc_ioctl(FAR struct adc_dev_s *dev, int cmd, * ****************************************************************************/ -FAR struct adc_dev_s *lc823450_adcinitialize(void) +struct adc_dev_s *lc823450_adcinitialize(void) { int ret; struct lc823450_adc_inst_s *inst; @@ -601,13 +601,13 @@ FAR struct adc_dev_s *lc823450_adcinitialize(void) * Name: lc823450_adc_receive ****************************************************************************/ -int lc823450_adc_receive(FAR struct adc_dev_s *dev, - FAR struct adc_msg_s *msg) +int lc823450_adc_receive(struct adc_dev_s *dev, + struct adc_msg_s *msg) { uint8_t ch; int ret; - FAR struct lc823450_adc_inst_s *inst = - (FAR struct lc823450_adc_inst_s *)dev->ad_priv; + struct lc823450_adc_inst_s *inst = + (struct lc823450_adc_inst_s *)dev->ad_priv; if (!g_inst) { diff --git a/arch/arm/src/lc823450/lc823450_adc.h b/arch/arm/src/lc823450/lc823450_adc.h index 016bd36eda..34c501bd48 100644 --- a/arch/arm/src/lc823450/lc823450_adc.h +++ b/arch/arm/src/lc823450/lc823450_adc.h @@ -95,7 +95,7 @@ extern "C" * Public Function Prototypes ****************************************************************************/ -FAR struct adc_dev_s *lc823450_adcinitialize(void); +struct adc_dev_s *lc823450_adcinitialize(void); #if defined(__cplusplus) } diff --git a/arch/arm/src/lc823450/lc823450_allocateheap2.c b/arch/arm/src/lc823450/lc823450_allocateheap2.c index 7a24fe7ddc..89b6fd875d 100644 --- a/arch/arm/src/lc823450/lc823450_allocateheap2.c +++ b/arch/arm/src/lc823450/lc823450_allocateheap2.c @@ -61,7 +61,7 @@ ****************************************************************************/ #ifdef CONFIG_HEAP_COLORATION -static inline void up_heap_color(FAR void *start, size_t size) +static inline void up_heap_color(void *start, size_t size) { memset(start, HEAP_COLOR, size); } @@ -107,7 +107,7 @@ static inline void up_heap_color(FAR void *start, size_t size) * ****************************************************************************/ -void up_allocate_heap(FAR void **heap_start, size_t *heap_size) +void up_allocate_heap(void **heap_start, size_t *heap_size) { #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) /* Get the unaligned size and position of the user-space heap. @@ -136,12 +136,12 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) /* Return the user-space heap settings */ - *heap_start = (FAR void *)ubase; + *heap_start = (void *)ubase; *heap_size = usize; /* Colorize the heap for debug */ - up_heap_color((FAR void *)ubase, usize); + up_heap_color((void *)ubase, usize); /* Allow user-mode access to the user heap memory */ @@ -175,7 +175,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) ****************************************************************************/ #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) -void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) +void up_allocate_kheap(void **heap_start, size_t *heap_size) { /* Get the unaligned size and position of the user-space heap. * This heap begins after the user-space .bss section at an offset @@ -205,7 +205,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) * that was not dedicated to the user heap). */ - *heap_start = (FAR void *)USERSPACE->us_bssend; + *heap_start = (void *)USERSPACE->us_bssend; *heap_size = ubase - (uintptr_t)USERSPACE->us_bssend; } #endif @@ -222,7 +222,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) #if CONFIG_MM_REGIONS > 1 void arm_addregion(void) { - FAR void *region_start; + void *region_start; size_t region_size; /* NOTE: add 1KB to avoid conflicts of initial stack */ diff --git a/arch/arm/src/lc823450/lc823450_cpuidlestack.c b/arch/arm/src/lc823450/lc823450_cpuidlestack.c index 5e57ba612e..6e710b0c75 100644 --- a/arch/arm/src/lc823450/lc823450_cpuidlestack.c +++ b/arch/arm/src/lc823450/lc823450_cpuidlestack.c @@ -76,7 +76,7 @@ * ****************************************************************************/ -int up_cpu_idlestack(int cpu, FAR struct tcb_s *tcb, size_t stack_size) +int up_cpu_idlestack(int cpu, struct tcb_s *tcb, size_t stack_size) { #if CONFIG_SMP_NCPUS > 1 up_create_stack(tcb, stack_size, TCB_FLAG_TTYPE_KERNEL); diff --git a/arch/arm/src/lc823450/lc823450_cpupause.c b/arch/arm/src/lc823450/lc823450_cpupause.c index bc5eccca3a..0f311cd0af 100644 --- a/arch/arm/src/lc823450/lc823450_cpupause.c +++ b/arch/arm/src/lc823450/lc823450_cpupause.c @@ -122,7 +122,7 @@ bool up_cpu_pausereq(int cpu) int up_cpu_paused(int cpu) { - FAR struct tcb_s *tcb = this_task(); + struct tcb_s *tcb = this_task(); /* Update scheduler parameters */ @@ -186,7 +186,7 @@ int up_cpu_paused(int cpu) * ****************************************************************************/ -int lc823450_pause_handler(int irq, void *c, FAR void *arg) +int lc823450_pause_handler(int irq, void *c, void *arg) { int cpu = up_cpu_index(); diff --git a/arch/arm/src/lc823450/lc823450_cpustart.c b/arch/arm/src/lc823450/lc823450_cpustart.c index 80a0127f9e..6f4b3e1b43 100644 --- a/arch/arm/src/lc823450/lc823450_cpustart.c +++ b/arch/arm/src/lc823450/lc823450_cpustart.c @@ -69,7 +69,7 @@ extern volatile spinlock_t g_cpu_wait[CONFIG_SMP_NCPUS]; * Private Functions ****************************************************************************/ -extern int lc823450_pause_handler(int irq, void *c, FAR void *arg); +extern int lc823450_pause_handler(int irq, void *c, void *arg); /**************************************************************************** * Name: cpu1_boot diff --git a/arch/arm/src/lc823450/lc823450_dma.c b/arch/arm/src/lc823450/lc823450_dma.c index 5d8f1cbd7a..f4dac0f316 100644 --- a/arch/arm/src/lc823450/lc823450_dma.c +++ b/arch/arm/src/lc823450/lc823450_dma.c @@ -171,7 +171,7 @@ static int dma_interrupt_core(void *context) * Name: dma_interrupt ****************************************************************************/ -static int dma_interrupt(int irq, FAR void *context, FAR void *arg) +static int dma_interrupt(int irq, void *context, void *arg) { int i; uint32_t stat; diff --git a/arch/arm/src/lc823450/lc823450_dvfs2.c b/arch/arm/src/lc823450/lc823450_dvfs2.c index 9613ba450d..c246dd0cdd 100644 --- a/arch/arm/src/lc823450/lc823450_dvfs2.c +++ b/arch/arm/src/lc823450/lc823450_dvfs2.c @@ -158,7 +158,7 @@ static int _dvfs_another_cpu_state(int me) * Callback for 1 shot timer ****************************************************************************/ -int lc823450_dvfs_oneshot(int irq, uint32_t *regs, FAR void *arg) +int lc823450_dvfs_oneshot(int irq, uint32_t *regs, void *arg) { /* voltage has reached at 1.2V */ diff --git a/arch/arm/src/lc823450/lc823450_dvfs2.h b/arch/arm/src/lc823450/lc823450_dvfs2.h index 9674bc1ede..9ff635dc98 100644 --- a/arch/arm/src/lc823450/lc823450_dvfs2.h +++ b/arch/arm/src/lc823450/lc823450_dvfs2.h @@ -51,7 +51,7 @@ void lc823450_dvfs_enter_idle(void); void lc823450_dvfs_exit_idle(int irq); int lc823450_dvfs_set_freq(int freq); void lc823450_dvfs_tick_callback(void); -int lc823450_dvfs_oneshot(int irq, uint32_t *regs, FAR void *arg); +int lc823450_dvfs_oneshot(int irq, uint32_t *regs, void *arg); int dvfs_procfs_register(void); diff --git a/arch/arm/src/lc823450/lc823450_gpio.c b/arch/arm/src/lc823450/lc823450_gpio.c index 20edcddf00..c07d7828fb 100644 --- a/arch/arm/src/lc823450/lc823450_gpio.c +++ b/arch/arm/src/lc823450/lc823450_gpio.c @@ -53,12 +53,12 @@ ****************************************************************************/ #ifdef CONFIG_IOEX -static FAR struct ioex_dev_s *g_ioex_dev; +static struct ioex_dev_s *g_ioex_dev; #endif #ifdef CONFIG_LC823450_VGPIO #define GPIO_VIRTUAL_NUM 32 -static FAR struct vgpio_ops_s *vgpio_ops[GPIO_VIRTUAL_NUM]; +static struct vgpio_ops_s *vgpio_ops[GPIO_VIRTUAL_NUM]; #endif /* CONFIG_LC823450_VGPIO */ /**************************************************************************** @@ -504,7 +504,7 @@ int lc823450_gpio_initialize(void) ****************************************************************************/ #ifdef CONFIG_LC823450_VGPIO -int lc823450_vgpio_register(unsigned int pin, FAR struct vgpio_ops_s *ops) +int lc823450_vgpio_register(unsigned int pin, struct vgpio_ops_s *ops) { assert(pin < GPIO_VIRTUAL_NUM); vgpio_ops[pin] = ops; diff --git a/arch/arm/src/lc823450/lc823450_gpio.h b/arch/arm/src/lc823450/lc823450_gpio.h index afa4542019..983d5d4316 100644 --- a/arch/arm/src/lc823450/lc823450_gpio.h +++ b/arch/arm/src/lc823450/lc823450_gpio.h @@ -239,7 +239,7 @@ bool lc823450_gpio_read(uint16_t gpiocfg); ****************************************************************************/ #ifdef CONFIG_DEBUG -int lc823450_gpio_dump(uint16_t gpiocfg, FAR const char *msg); +int lc823450_gpio_dump(uint16_t gpiocfg, const char *msg); #else # define lc823450_gpio_dump(p,m) #endif @@ -253,7 +253,7 @@ int lc823450_gpio_dump(uint16_t gpiocfg, FAR const char *msg); ****************************************************************************/ #ifdef CONFIG_LC823450_VGPIO -int lc823450_vgpio_register(unsigned int pin, FAR struct vgpio_ops_s *ops); +int lc823450_vgpio_register(unsigned int pin, struct vgpio_ops_s *ops); #endif /* CONFIG_LC823450_VGPIO */ #if defined(__cplusplus) diff --git a/arch/arm/src/lc823450/lc823450_i2c.c b/arch/arm/src/lc823450/lc823450_i2c.c index 9421be42ee..922fb36336 100644 --- a/arch/arm/src/lc823450/lc823450_i2c.c +++ b/arch/arm/src/lc823450/lc823450_i2c.c @@ -110,28 +110,27 @@ struct lc823450_i2c_priv_s { /* Standard I2C operations */ - FAR const struct i2c_ops_s *ops; + const struct i2c_ops_s *ops; /* Port configuration */ - FAR const struct lc823450_i2c_config_s *config; + const struct lc823450_i2c_config_s *config; - int refs; /* Reference count */ - sem_t sem_excl; /* Mutual exclusion semaphore */ + int refs; /* Reference count */ + sem_t sem_excl; /* Mutual exclusion semaphore */ #ifndef CONFIG_I2C_POLLED - sem_t sem_isr; /* Interrupt wait semaphore */ + sem_t sem_isr; /* Interrupt wait semaphore */ #endif - volatile uint8_t irqstate; /* Interrupt handshake (see enum lc823450_irqstate_e) */ + volatile uint8_t irqstate; /* Interrupt handshake (see enum lc823450_irqstate_e) */ - uint32_t frequency; /* Current I2C bus furequency */ - uint8_t msgc; /* Message count */ - FAR struct i2c_msg_s *msgv; /* Message list */ - FAR uint8_t *ptr; /* Current message buffer */ - int dcnt; /* Current message length */ - uint16_t flags; /* Current message flags */ - - uint32_t timeoms; /* I2C transfer timeout in msec */ - bool timedout; /* If true, I2C transfer timed-out */ + uint32_t frequency; /* Current I2C bus furequency */ + uint8_t msgc; /* Message count */ + struct i2c_msg_s *msgv; /* Message list */ + uint8_t *ptr; /* Current message buffer */ + int dcnt; /* Current message length */ + uint16_t flags; /* Current message flags */ + uint32_t timeoms; /* I2C transfer timeout in msec */ + bool timedout; /* If true, I2C transfer timed-out */ }; /**************************************************************************** @@ -139,46 +138,46 @@ struct lc823450_i2c_priv_s ****************************************************************************/ static inline int - lc823450_i2c_sem_wait(FAR struct lc823450_i2c_priv_s *priv); + lc823450_i2c_sem_wait(struct lc823450_i2c_priv_s *priv); static inline void - lc823450_i2c_sem_post(FAR struct lc823450_i2c_priv_s *priv); + lc823450_i2c_sem_post(struct lc823450_i2c_priv_s *priv); static inline int - lc823450_i2c_sem_waitdone(FAR struct lc823450_i2c_priv_s *priv); + lc823450_i2c_sem_waitdone(struct lc823450_i2c_priv_s *priv); #ifndef CONFIG_I2C_POLLED static inline void - lc823450_i2c_enableirq(FAR struct lc823450_i2c_priv_s *priv); + lc823450_i2c_enableirq(struct lc823450_i2c_priv_s *priv); static inline void - lc823450_i2c_disableirq(FAR struct lc823450_i2c_priv_s *priv); + lc823450_i2c_disableirq(struct lc823450_i2c_priv_s *priv); #endif static inline bool - lc823450_i2c_checkirq(FAR struct lc823450_i2c_priv_s *priv); + lc823450_i2c_checkirq(struct lc823450_i2c_priv_s *priv); static inline bool - lc823450_i2c_checkbusy(FAR struct lc823450_i2c_priv_s *priv); + lc823450_i2c_checkbusy(struct lc823450_i2c_priv_s *priv); static inline void - lc823450_i2c_prepxfer(FAR struct lc823450_i2c_priv_s *priv); + lc823450_i2c_prepxfer(struct lc823450_i2c_priv_s *priv); static inline void - lc823450_i2c_sendstart(FAR struct lc823450_i2c_priv_s *priv); + lc823450_i2c_sendstart(struct lc823450_i2c_priv_s *priv); static inline void - lc823450_i2c_sendstop(FAR struct lc823450_i2c_priv_s *priv); + lc823450_i2c_sendstop(struct lc823450_i2c_priv_s *priv); static inline uint32_t - lc823450_i2c_readdata(FAR struct lc823450_i2c_priv_s *priv); -static void lc823450_i2c_starttransfer(FAR struct lc823450_i2c_priv_s *priv); + lc823450_i2c_readdata(struct lc823450_i2c_priv_s *priv); +static void lc823450_i2c_starttransfer(struct lc823450_i2c_priv_s *priv); -static int lc823450_i2c_poll(FAR struct lc823450_i2c_priv_s *priv); +static int lc823450_i2c_poll(struct lc823450_i2c_priv_s *priv); #ifndef CONFIG_I2C_POLLED -static int lc823450_i2c_isr(int irq, FAR void *context, FAR void *arg); +static int lc823450_i2c_isr(int irq, void *context, void *arg); #endif -static int lc823450_i2c_init(FAR struct lc823450_i2c_priv_s *priv, int port); +static int lc823450_i2c_init(struct lc823450_i2c_priv_s *priv, int port); static int - lc823450_i2c_deinit(FAR struct lc823450_i2c_priv_s *priv, int port); + lc823450_i2c_deinit(struct lc823450_i2c_priv_s *priv, int port); -static int lc823450_i2c_transfer(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count); +static int lc823450_i2c_transfer(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count); #ifdef CONFIG_I2C_RESET -static int lc823450_i2c_reset(FAR struct i2c_master_s *priv); +static int lc823450_i2c_reset(struct i2c_master_s *priv); #endif /**************************************************************************** @@ -260,7 +259,7 @@ static struct lc823450_i2c_priv_s lc823450_i2c1_priv = * ****************************************************************************/ -static inline int lc823450_i2c_sem_wait(FAR struct lc823450_i2c_priv_s *priv) +static inline int lc823450_i2c_sem_wait(struct lc823450_i2c_priv_s *priv) { return nxsem_wait(&priv->sem_excl); } @@ -274,7 +273,7 @@ static inline int lc823450_i2c_sem_wait(FAR struct lc823450_i2c_priv_s *priv) ****************************************************************************/ static inline void - lc823450_i2c_sem_post(FAR struct lc823450_i2c_priv_s *priv) + lc823450_i2c_sem_post(struct lc823450_i2c_priv_s *priv) { nxsem_post(&priv->sem_excl); } @@ -289,7 +288,7 @@ static inline void #ifndef CONFIG_I2C_POLLED static inline int - lc823450_i2c_sem_waitdone(FAR struct lc823450_i2c_priv_s *priv) + lc823450_i2c_sem_waitdone(struct lc823450_i2c_priv_s *priv) { struct timespec abstime; int ret; @@ -337,7 +336,7 @@ static inline int } #else static inline int - lc823450_i2c_sem_waitdone(FAR struct lc823450_i2c_priv_s *priv) + lc823450_i2c_sem_waitdone(struct lc823450_i2c_priv_s *priv) { uint32_t timeout; clock_t start; @@ -389,7 +388,7 @@ static inline int * ****************************************************************************/ -static void lc823450_i2c_prepxfer(FAR struct lc823450_i2c_priv_s *priv) +static void lc823450_i2c_prepxfer(struct lc823450_i2c_priv_s *priv) { uint32_t base = priv->config->base; putreg32(((lc823450_get_systemfreq() / priv->msgv->frequency + 7) / 8) & @@ -408,7 +407,7 @@ static void lc823450_i2c_prepxfer(FAR struct lc823450_i2c_priv_s *priv) ****************************************************************************/ static inline bool - lc823450_i2c_checkbusy(FAR struct lc823450_i2c_priv_s *priv) + lc823450_i2c_checkbusy(struct lc823450_i2c_priv_s *priv) { return (getreg32(priv->config->base + I2CSTR) & I2C_STR_BBSY) != 0; } @@ -422,7 +421,7 @@ static inline bool ****************************************************************************/ static inline bool - lc823450_i2c_checkirq(FAR struct lc823450_i2c_priv_s *priv) + lc823450_i2c_checkirq(struct lc823450_i2c_priv_s *priv) { return (getreg32(priv->config->base + I2CSTR) & I2C_STR_IREQ) != 0; } @@ -436,7 +435,7 @@ static inline bool ****************************************************************************/ static inline bool - lc823450_i2c_checkack(FAR struct lc823450_i2c_priv_s *priv) + lc823450_i2c_checkack(struct lc823450_i2c_priv_s *priv) { return (getreg32(priv->config->base + I2CSTR) & I2C_STR_ACKD) != 0; } @@ -450,7 +449,7 @@ static inline bool ****************************************************************************/ static inline void - lc823450_i2c_sendstart(FAR struct lc823450_i2c_priv_s *priv) + lc823450_i2c_sendstart(struct lc823450_i2c_priv_s *priv) { modifyreg32(priv->config->base + I2CCTL, I2C_CTL_TRX, I2C_CTL_TRX); modifyreg32(priv->config->base + I2CCTL, I2C_CTL_ST, I2C_CTL_ST); @@ -465,7 +464,7 @@ static inline void ****************************************************************************/ static inline void - lc823450_i2c_sendstop(FAR struct lc823450_i2c_priv_s *priv) + lc823450_i2c_sendstop(struct lc823450_i2c_priv_s *priv) { modifyreg32(priv->config->base + I2CSTR, I2C_STR_IREQ, 0); modifyreg32(priv->config->base + I2CCTL, I2C_CTL_TRX, I2C_CTL_TRX); @@ -480,7 +479,7 @@ static inline void * ****************************************************************************/ -static inline void lc823450_i2c_clrstop(FAR struct lc823450_i2c_priv_s *priv) +static inline void lc823450_i2c_clrstop(struct lc823450_i2c_priv_s *priv) { modifyreg32(priv->config->base + I2CSTR, I2C_STR_IREQ, 0); } @@ -494,9 +493,9 @@ static inline void lc823450_i2c_clrstop(FAR struct lc823450_i2c_priv_s *priv) ****************************************************************************/ #ifdef CONFIG_I2C_RESET -static int lc823450_i2c_reset(FAR struct i2c_master_s *dev) +static int lc823450_i2c_reset(struct i2c_master_s *dev) { - FAR struct lc823450_i2c_priv_s *priv = (struct lc823450_i2c_priv_s *)dev; + struct lc823450_i2c_priv_s *priv = (struct lc823450_i2c_priv_s *)dev; modifyreg32(priv->config->base + I2CCTL, I2C_CTL_SRST, I2C_CTL_SRST); modifyreg32(priv->config->base + I2CCTL, I2C_CTL_IREQEN, 0); @@ -515,7 +514,7 @@ static int lc823450_i2c_reset(FAR struct i2c_master_s *dev) #ifndef CONFIG_I2C_POLLED static inline void - lc823450_i2c_enableirq(FAR struct lc823450_i2c_priv_s *priv) + lc823450_i2c_enableirq(struct lc823450_i2c_priv_s *priv) { modifyreg32(priv->config->base + I2CCTL, I2C_CTL_IREQEN, I2C_CTL_IREQEN); } @@ -531,7 +530,7 @@ static inline void #ifndef CONFIG_I2C_POLLED static inline void - lc823450_i2c_disableirq(FAR struct lc823450_i2c_priv_s *priv) + lc823450_i2c_disableirq(struct lc823450_i2c_priv_s *priv) { modifyreg32(priv->config->base + I2CCTL, I2C_CTL_IREQEN, 0); } @@ -546,7 +545,7 @@ static inline void ****************************************************************************/ static inline uint32_t - lc823450_i2c_readdata(FAR struct lc823450_i2c_priv_s *priv) + lc823450_i2c_readdata(struct lc823450_i2c_priv_s *priv) { return getreg32(priv->config->base + I2CRXD); } @@ -559,13 +558,13 @@ static inline uint32_t * ****************************************************************************/ -static void lc823450_i2c_sendnack(FAR struct lc823450_i2c_priv_s *priv) +static void lc823450_i2c_sendnack(struct lc823450_i2c_priv_s *priv) { modifyreg32(priv->config->base + I2CCTL, I2C_CTL_ACK, 0); modifyreg32(priv->config->base + I2CCTL, I2C_CTL_BTRIG, I2C_CTL_BTRIG); } -static void lc823450_i2c_starttransfer(FAR struct lc823450_i2c_priv_s *priv) +static void lc823450_i2c_starttransfer(struct lc823450_i2c_priv_s *priv) { if (priv->flags & I2C_M_READ) { @@ -625,7 +624,7 @@ static void lc823450_i2c_starttransfer(FAR struct lc823450_i2c_priv_s *priv) * ****************************************************************************/ -static int lc823450_i2c_poll(FAR struct lc823450_i2c_priv_s *priv) +static int lc823450_i2c_poll(struct lc823450_i2c_priv_s *priv) { bool ack; @@ -784,7 +783,7 @@ static int lc823450_i2c_poll(FAR struct lc823450_i2c_priv_s *priv) * done. Please refer to macaron's code. */ - lc823450_i2c_reset((FAR struct i2c_master_s *)priv); + lc823450_i2c_reset((struct i2c_master_s *)priv); #endif #ifndef CONFIG_I2C_POLLED @@ -828,10 +827,10 @@ static int lc823450_i2c_poll(FAR struct lc823450_i2c_priv_s *priv) ****************************************************************************/ #ifndef CONFIG_I2C_POLLED -static int lc823450_i2c_isr(int irq, FAR void *context, FAR void *arg) +static int lc823450_i2c_isr(int irq, void *context, void *arg) { - FAR struct lc823450_i2c_priv_s *priv = - (FAR struct lc823450_i2c_priv_s *)arg; + struct lc823450_i2c_priv_s *priv = + (struct lc823450_i2c_priv_s *)arg; DEBUGASSERT(priv != NULL); return lc823450_i2c_poll(priv); @@ -850,7 +849,7 @@ static int lc823450_i2c_isr(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static int lc823450_i2c_init(FAR struct lc823450_i2c_priv_s *priv, int port) +static int lc823450_i2c_init(struct lc823450_i2c_priv_s *priv, int port) { /* Attach ISRs */ @@ -910,7 +909,7 @@ static int lc823450_i2c_init(FAR struct lc823450_i2c_priv_s *priv, int port) * ****************************************************************************/ -static int lc823450_i2c_deinit(FAR struct lc823450_i2c_priv_s *priv, +static int lc823450_i2c_deinit(struct lc823450_i2c_priv_s *priv, int port) { /* Disable I2C */ @@ -979,10 +978,10 @@ static int lc823450_i2c_deinit(FAR struct lc823450_i2c_priv_s *priv, * ****************************************************************************/ -static int lc823450_i2c_transfer(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count) +static int lc823450_i2c_transfer(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count) { - FAR struct lc823450_i2c_priv_s *priv = (struct lc823450_i2c_priv_s *)dev; + struct lc823450_i2c_priv_s *priv = (struct lc823450_i2c_priv_s *)dev; irqstate_t irqs; int ret = 0; @@ -1108,9 +1107,9 @@ exit: * ****************************************************************************/ -FAR struct i2c_master_s *lc823450_i2cbus_initialize(int port) +struct i2c_master_s *lc823450_i2cbus_initialize(int port) { - FAR struct lc823450_i2c_priv_s *priv = NULL; + struct lc823450_i2c_priv_s *priv = NULL; irqstate_t flags; switch (port) @@ -1157,9 +1156,9 @@ FAR struct i2c_master_s *lc823450_i2cbus_initialize(int port) * ****************************************************************************/ -int lc823450_i2cbus_uninitialize(FAR struct i2c_master_s *dev) +int lc823450_i2cbus_uninitialize(struct i2c_master_s *dev) { - FAR struct lc823450_i2c_priv_s *priv = (struct lc823450_i2c_priv_s *)dev; + struct lc823450_i2c_priv_s *priv = (struct lc823450_i2c_priv_s *)dev; irqstate_t flags; int port = -1; @@ -1220,10 +1219,10 @@ int lc823450_i2cbus_uninitialize(FAR struct i2c_master_s *dev) * Name: lc823450_i2cbus_changetimeout ****************************************************************************/ -void lc823450_i2cbus_changetimeout(FAR struct i2c_master_s *dev, +void lc823450_i2cbus_changetimeout(struct i2c_master_s *dev, uint32_t timeoms) { - FAR struct lc823450_i2c_priv_s *priv = (struct lc823450_i2c_priv_s *)dev; + struct lc823450_i2c_priv_s *priv = (struct lc823450_i2c_priv_s *)dev; priv->timeoms = timeoms; } diff --git a/arch/arm/src/lc823450/lc823450_i2c.h b/arch/arm/src/lc823450/lc823450_i2c.h index 47af6bdf33..2e9166500a 100644 --- a/arch/arm/src/lc823450/lc823450_i2c.h +++ b/arch/arm/src/lc823450/lc823450_i2c.h @@ -89,9 +89,9 @@ extern "C" * Public Function Prototypes ****************************************************************************/ -FAR struct i2c_master_s *lc823450_i2cbus_initialize(int port); -int lc823450_i2cbus_uninitialize(FAR struct i2c_master_s *dev); -void lc823450_i2cbus_changetimeout(FAR struct i2c_master_s *dev, +struct i2c_master_s *lc823450_i2cbus_initialize(int port); +int lc823450_i2cbus_uninitialize(struct i2c_master_s *dev); +void lc823450_i2cbus_changetimeout(struct i2c_master_s *dev, uint32_t timeoms); #if defined(__cplusplus) diff --git a/arch/arm/src/lc823450/lc823450_i2s.c b/arch/arm/src/lc823450/lc823450_i2s.c index d067b406d0..18e6db93d4 100644 --- a/arch/arm/src/lc823450/lc823450_i2s.c +++ b/arch/arm/src/lc823450/lc823450_i2s.c @@ -310,7 +310,7 @@ static void _setup_audio_pll(uint32_t freq) * Name: _i2s_semtake ****************************************************************************/ -static int _i2s_semtake(FAR sem_t *sem) +static int _i2s_semtake(sem_t *sem) { return nxsem_wait_uninterruptible(sem); } @@ -405,7 +405,7 @@ static void _setup_tx_threshold(uint32_t tx_th) static int lc823450_i2s_ioctl(struct i2s_dev_s *dev, int cmd, unsigned long arg) { - FAR const struct audio_caps_desc_s *cap_desc; + const struct audio_caps_desc_s *cap_desc; uint32_t tx_th; uint32_t rate[2]; uint8_t ch[2]; @@ -414,7 +414,7 @@ static int lc823450_i2s_ioctl(struct i2s_dev_s *dev, int cmd, switch (cmd) { case AUDIOIOC_CONFIGURE: - cap_desc = (FAR const struct audio_caps_desc_s *)((uintptr_t)arg); + cap_desc = (const struct audio_caps_desc_s *)((uintptr_t)arg); DEBUGASSERT(NULL != cap_desc); tx_th = cap_desc->caps.ac_controls.w >> 24; @@ -617,7 +617,7 @@ static uint32_t lc823450_i2s_txdatawidth(struct i2s_dev_s *dev, int bits) * Name: _i2s_isr ****************************************************************************/ -static int _i2s_isr(int irq, FAR void *context, FAR void *arg) +static int _i2s_isr(int irq, void *context, void *arg) { uint32_t status = getreg32(ABUFSTS1); uint32_t irqen0 = getreg32(ABUFIRQEN0); @@ -1008,9 +1008,9 @@ static int lc823450_i2s_configure(void) * Name: lc823450_i2sdev_initialize ****************************************************************************/ -FAR struct i2s_dev_s *lc823450_i2sdev_initialize(void) +struct i2s_dev_s *lc823450_i2sdev_initialize(void) { - FAR struct lc823450_i2s_s *priv = NULL; + struct lc823450_i2s_s *priv = NULL; /* The support STM32 parts have only a single I2S port */ diff --git a/arch/arm/src/lc823450/lc823450_i2s.h b/arch/arm/src/lc823450/lc823450_i2s.h index 0b094d74f0..c4e95fbc7c 100644 --- a/arch/arm/src/lc823450/lc823450_i2s.h +++ b/arch/arm/src/lc823450/lc823450_i2s.h @@ -49,7 +49,7 @@ extern "C" * Public Function Prototypes ****************************************************************************/ -FAR struct i2s_dev_s *lc823450_i2sdev_initialize(void); +struct i2s_dev_s *lc823450_i2sdev_initialize(void); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/lc823450/lc823450_ipl2.c b/arch/arm/src/lc823450/lc823450_ipl2.c index 556d8be8bc..3ce9aebc60 100644 --- a/arch/arm/src/lc823450/lc823450_ipl2.c +++ b/arch/arm/src/lc823450/lc823450_ipl2.c @@ -455,7 +455,7 @@ extern volatile int g_update_flag; #ifdef CONFIG_CHARGER static void chg_disable(void) { - FAR struct i2c_dev_s *i2c; + struct i2c_dev_s *i2c; int ret; uint32_t freq; diff --git a/arch/arm/src/lc823450/lc823450_irq.c b/arch/arm/src/lc823450/lc823450_irq.c index f4fee9e29e..c8ea7443db 100644 --- a/arch/arm/src/lc823450/lc823450_irq.c +++ b/arch/arm/src/lc823450/lc823450_irq.c @@ -189,7 +189,7 @@ static void lc823450_dumpnvic(const char *msg, int irq) ****************************************************************************/ #ifdef CONFIG_DEBUG -static int lc823450_nmi(int irq, FAR void *context, FAR void *arg) +static int lc823450_nmi(int irq, void *context, void *arg) { enter_critical_section(); irqinfo("PANIC!!! NMI received\n"); @@ -197,7 +197,7 @@ static int lc823450_nmi(int irq, FAR void *context, FAR void *arg) return 0; } -static int lc823450_busfault(int irq, FAR void *context, FAR void *arg) +static int lc823450_busfault(int irq, void *context, void *arg) { enter_critical_section(); irqinfo("PANIC!!! Bus fault received: %08x\n", getreg32(NVIC_CFAULTS)); @@ -205,7 +205,7 @@ static int lc823450_busfault(int irq, FAR void *context, FAR void *arg) return 0; } -static int lc823450_usagefault(int irq, FAR void *context, FAR void *arg) +static int lc823450_usagefault(int irq, void *context, void *arg) { enter_critical_section(); irqinfo("PANIC!!! Usage fault received: %08x\n", getreg32(NVIC_CFAULTS)); @@ -213,7 +213,7 @@ static int lc823450_usagefault(int irq, FAR void *context, FAR void *arg) return 0; } -static int lc823450_pendsv(int irq, FAR void *context, FAR void *arg) +static int lc823450_pendsv(int irq, void *context, void *arg) { enter_critical_section(); irqinfo("PANIC!!! PendSV received\n"); @@ -221,7 +221,7 @@ static int lc823450_pendsv(int irq, FAR void *context, FAR void *arg) return 0; } -static int lc823450_dbgmonitor(int irq, FAR void *context, FAR void *arg) +static int lc823450_dbgmonitor(int irq, void *context, void *arg) { enter_critical_section(); irqinfo("PANIC!!! Debug Monitor received\n"); @@ -229,7 +229,7 @@ static int lc823450_dbgmonitor(int irq, FAR void *context, FAR void *arg) return 0; } -static int lc823450_reserved(int irq, FAR void *context, FAR void *arg) +static int lc823450_reserved(int irq, void *context, void *arg) { enter_critical_section(); irqinfo("PANIC!!! Reserved interrupt\n"); @@ -296,7 +296,7 @@ static void lc823450_extint_clr(int irq) * ****************************************************************************/ -static int lc823450_extint_isr(int irq, FAR void *context, FAR void *arg) +static int lc823450_extint_isr(int irq, void *context, void *arg) { uint32_t regaddr; uint32_t pending; diff --git a/arch/arm/src/lc823450/lc823450_mmcl.c b/arch/arm/src/lc823450/lc823450_mmcl.c index cff1eff5cf..9376251577 100644 --- a/arch/arm/src/lc823450/lc823450_mmcl.c +++ b/arch/arm/src/lc823450/lc823450_mmcl.c @@ -50,26 +50,26 @@ struct mmcl_dev_s { #ifdef CONFIG_FS_EVFAT - uint32_t channel; /* 0: eMMC, 1: SD */ + uint32_t channel; /* 0: eMMC, 1: SD */ #endif - FAR struct mtd_dev_s *mtd; /* Contained MTD interface */ - struct mtd_geometry_s geo; /* Device geometry */ + struct mtd_dev_s *mtd; /* Contained MTD interface */ + struct mtd_geometry_s geo; /* Device geometry */ }; /**************************************************************************** * Private Function Prototypes ****************************************************************************/ -static int mmcl_open(FAR struct inode *inode); -static int mmcl_close(FAR struct inode *inode); -static ssize_t mmcl_read(FAR struct inode *inode, unsigned char *buffer, +static int mmcl_open(struct inode *inode); +static int mmcl_close(struct inode *inode); +static ssize_t mmcl_read(struct inode *inode, unsigned char *buffer, blkcnt_t start_sector, unsigned int nsectors); -static ssize_t mmcl_write(FAR struct inode *inode, +static ssize_t mmcl_write(struct inode *inode, const unsigned char *buffer, blkcnt_t start_sector, unsigned int nsectors); -static int mmcl_geometry(FAR struct inode *inode, +static int mmcl_geometry(struct inode *inode, struct geometry *geometry); -static int mmcl_ioctl(FAR struct inode *inode, int cmd, +static int mmcl_ioctl(struct inode *inode, int cmd, unsigned long arg); /**************************************************************************** @@ -97,7 +97,7 @@ static const struct block_operations g_bops = * ****************************************************************************/ -static int mmcl_open(FAR struct inode *inode) +static int mmcl_open(struct inode *inode) { finfo("Entry\n"); return OK; @@ -110,7 +110,7 @@ static int mmcl_open(FAR struct inode *inode) * ****************************************************************************/ -static int mmcl_close(FAR struct inode *inode) +static int mmcl_close(struct inode *inode) { finfo("Entry\n"); return OK; @@ -123,7 +123,7 @@ static int mmcl_close(FAR struct inode *inode) * ****************************************************************************/ -static ssize_t mmcl_read(FAR struct inode *inode, unsigned char *buffer, +static ssize_t mmcl_read(struct inode *inode, unsigned char *buffer, blkcnt_t start_sector, unsigned int nsectors) { ssize_t nread; @@ -152,7 +152,7 @@ static ssize_t mmcl_read(FAR struct inode *inode, unsigned char *buffer, * ****************************************************************************/ -static ssize_t mmcl_write(FAR struct inode *inode, +static ssize_t mmcl_write(struct inode *inode, const unsigned char *buffer, blkcnt_t start_sector, unsigned int nsectors) { @@ -182,7 +182,7 @@ static ssize_t mmcl_write(FAR struct inode *inode, * ****************************************************************************/ -static int mmcl_geometry(FAR struct inode *inode, struct geometry *geometry) +static int mmcl_geometry(struct inode *inode, struct geometry *geometry) { struct mmcl_dev_s *dev; @@ -217,7 +217,7 @@ static int mmcl_geometry(FAR struct inode *inode, struct geometry *geometry) * ****************************************************************************/ -static int mmcl_ioctl(FAR struct inode *inode, int cmd, unsigned long arg) +static int mmcl_ioctl(struct inode *inode, int cmd, unsigned long arg) { struct mmcl_dev_s *dev ; int ret; @@ -239,8 +239,8 @@ static int mmcl_ioctl(FAR struct inode *inode, int cmd, unsigned long arg) * Name: mmcl_allocdev ****************************************************************************/ -static FAR struct mmcl_dev_s *mmcl_allocdev(int number, - FAR struct mtd_dev_s *mtd) +static struct mmcl_dev_s *mmcl_allocdev(int number, + struct mtd_dev_s *mtd) { struct mmcl_dev_s *dev; int ret; @@ -299,7 +299,7 @@ static void mmcl_freedev(struct mmcl_dev_s *dev) * ****************************************************************************/ -int mmcl_initialize(int minor, FAR struct mtd_dev_s *mtd) +int mmcl_initialize(int minor, struct mtd_dev_s *mtd) { struct mmcl_dev_s *dev; const char *devname[CONFIG_MTD_DEV_MAX] = @@ -350,11 +350,11 @@ int mmcl_initialize(int minor, FAR struct mtd_dev_s *mtd) * Name: mmcl_uninitialize ****************************************************************************/ -int mmcl_uninitialize(FAR const char *devname) +int mmcl_uninitialize(const char *devname) { int ret; - FAR struct inode *inode; - FAR struct mmcl_dev_s *dev; + struct inode *inode; + struct mmcl_dev_s *dev; DEBUGASSERT(devname); @@ -389,7 +389,7 @@ int mmcl_uninitialize(FAR const char *devname) * Name: mmcl_createpartition ****************************************************************************/ -int mmcl_createpartition(int minor, int number, FAR struct mtd_dev_s *mtd) +int mmcl_createpartition(int minor, int number, struct mtd_dev_s *mtd) { struct mmcl_dev_s *dev; char devname[32]; diff --git a/arch/arm/src/lc823450/lc823450_mmcl.h b/arch/arm/src/lc823450/lc823450_mmcl.h index 2cd1935923..a939cabf1f 100644 --- a/arch/arm/src/lc823450/lc823450_mmcl.h +++ b/arch/arm/src/lc823450/lc823450_mmcl.h @@ -43,9 +43,9 @@ extern "C" * Public Function Prototypes ****************************************************************************/ -int mmcl_initialize(int minor, FAR struct mtd_dev_s *mtd); -int mmcl_uninitialize(FAR const char *devname); -int mmcl_createpartition(int minor, int number, FAR struct mtd_dev_s *mtd); +int mmcl_initialize(int minor, struct mtd_dev_s *mtd); +int mmcl_uninitialize(const char *devname); +int mmcl_createpartition(int minor, int number, struct mtd_dev_s *mtd); #if defined(__cplusplus) } diff --git a/arch/arm/src/lc823450/lc823450_mtd.c b/arch/arm/src/lc823450/lc823450_mtd.c index 28789115bf..0be073e0f8 100644 --- a/arch/arm/src/lc823450/lc823450_mtd.c +++ b/arch/arm/src/lc823450/lc823450_mtd.c @@ -91,8 +91,8 @@ struct lc823450_partinfo_s ****************************************************************************/ static sem_t g_sem = SEM_INITIALIZER(1); -static FAR struct mtd_dev_s *g_mtdpart[LC823450_NPARTS]; -static FAR struct mtd_dev_s *g_mtdmaster[CONFIG_MTD_DEV_MAX]; /* 0: eMMC, 1: SDC */ +static struct mtd_dev_s *g_mtdpart[LC823450_NPARTS]; +static struct mtd_dev_s *g_mtdmaster[CONFIG_MTD_DEV_MAX]; /* 0: eMMC, 1: SDC */ static const char g_mtdname[2][4] = { @@ -122,7 +122,7 @@ static struct lc823450_partinfo_s partinfo[LC823450_NPARTS] = * Name: mtd_semtake ****************************************************************************/ -static int mtd_semtake(FAR sem_t *sem) +static int mtd_semtake(sem_t *sem) { return nxsem_wait_uninterruptible(sem); } @@ -131,7 +131,7 @@ static int mtd_semtake(FAR sem_t *sem) * Name: mtd_semgive ****************************************************************************/ -static void mtd_semgive(FAR sem_t *sem) +static void mtd_semgive(sem_t *sem) { nxsem_post(sem); } @@ -144,7 +144,7 @@ static void mtd_semgive(FAR sem_t *sem) * ****************************************************************************/ -static int lc823450_erase(FAR struct mtd_dev_s *dev, off_t startblock, +static int lc823450_erase(struct mtd_dev_s *dev, off_t startblock, size_t nblocks) { finfo("dev=%p startblock=%jd nblocks=%zd\n", @@ -160,11 +160,11 @@ static int lc823450_erase(FAR struct mtd_dev_s *dev, off_t startblock, * ****************************************************************************/ -static ssize_t lc823450_bread(FAR struct mtd_dev_s *dev, off_t startblock, - size_t nblocks, FAR uint8_t *buf) +static ssize_t lc823450_bread(struct mtd_dev_s *dev, off_t startblock, + size_t nblocks, uint8_t *buf) { int ret; - FAR struct lc823450_mtd_dev_s *priv = (FAR struct lc823450_mtd_dev_s *)dev; + struct lc823450_mtd_dev_s *priv = (struct lc823450_mtd_dev_s *)dev; unsigned long type; @@ -233,11 +233,11 @@ static ssize_t lc823450_bread(FAR struct mtd_dev_s *dev, off_t startblock, * ****************************************************************************/ -static ssize_t lc823450_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, - size_t nblocks, FAR const uint8_t *buf) +static ssize_t lc823450_bwrite(struct mtd_dev_s *dev, off_t startblock, + size_t nblocks, const uint8_t *buf) { int ret; - FAR struct lc823450_mtd_dev_s *priv = (FAR struct lc823450_mtd_dev_s *)dev; + struct lc823450_mtd_dev_s *priv = (struct lc823450_mtd_dev_s *)dev; unsigned long type; @@ -302,13 +302,13 @@ static ssize_t lc823450_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, * Name: lc823450_ioctl ****************************************************************************/ -static int lc823450_ioctl(FAR struct mtd_dev_s *dev, int cmd, +static int lc823450_ioctl(struct mtd_dev_s *dev, int cmd, unsigned long arg) { int ret; - FAR struct lc823450_mtd_dev_s *priv = (FAR struct lc823450_mtd_dev_s *)dev; - FAR struct mtd_geometry_s *geo; - FAR void **ppv; + struct lc823450_mtd_dev_s *priv = (struct lc823450_mtd_dev_s *)dev; + struct mtd_geometry_s *geo; + void **ppv; finfo("cmd=%xh, arg=%lxh\n", cmd, arg); @@ -331,7 +331,7 @@ static int lc823450_ioctl(FAR struct mtd_dev_s *dev, int cmd, { case MTDIOC_GEOMETRY: finfo("MTDIOC_GEOMETRY\n"); - geo = (FAR struct mtd_geometry_s *)arg; + geo = (struct mtd_geometry_s *)arg; if (geo) { /* Populate the geometry structure with information needed to @@ -351,8 +351,8 @@ static int lc823450_ioctl(FAR struct mtd_dev_s *dev, int cmd, case BIOC_PARTINFO: { - FAR struct partition_info_s *info = - (FAR struct partition_info_s *)arg; + struct partition_info_s *info = + (struct partition_info_s *)arg; if (info != NULL) { info->numsectors = priv->nblocks; @@ -366,7 +366,7 @@ static int lc823450_ioctl(FAR struct mtd_dev_s *dev, int cmd, case BIOC_XIPBASE: finfo("BIOC_XIPBASE\n"); - ppv = (FAR void**)arg; + ppv = (void**)arg; if (ppv) { /* If media is directly acccesible, return (void*) base address @@ -389,7 +389,7 @@ static int lc823450_ioctl(FAR struct mtd_dev_s *dev, int cmd, #ifdef TODO case MTDIOC_CIDSTR: - ret = lc823450_sdc_getcid(priv->channel, (FAR char *)arg, 33); + ret = lc823450_sdc_getcid(priv->channel, (char *)arg, 33); break; #endif @@ -413,7 +413,7 @@ static int lc823450_ioctl(FAR struct mtd_dev_s *dev, int cmd, * Semaphore has been taken. ****************************************************************************/ -static int mtd_mediainitialize(FAR struct lc823450_mtd_dev_s *dev) +static int mtd_mediainitialize(struct lc823450_mtd_dev_s *dev) { int ret; unsigned long nblocks; @@ -522,15 +522,15 @@ exit_with_error: * Semaphore has been taken. ****************************************************************************/ -static FAR struct mtd_dev_s *lc823450_mtd_allocdev(uint32_t channel) +static struct mtd_dev_s *lc823450_mtd_allocdev(uint32_t channel) { int ret; int mtype = lc823450_sdc_refmediatype(channel); - FAR struct lc823450_mtd_dev_s *priv; + struct lc823450_mtd_dev_s *priv; /* Create an instance of the LC823450 MTD device state structure */ - priv = (FAR struct lc823450_mtd_dev_s *) + priv = (struct lc823450_mtd_dev_s *) kmm_zalloc(sizeof(struct lc823450_mtd_dev_s)); if (!priv) { @@ -588,7 +588,7 @@ int lc823450_mtd_initialize(uint32_t devno) int i; int partno; int ret; - FAR struct lc823450_mtd_dev_s *priv; + struct lc823450_mtd_dev_s *priv; off_t maxblock; uint32_t ch = (devno == CONFIG_MTD_DEVNO_EMMC)? 0 : 1; @@ -647,7 +647,7 @@ int lc823450_mtd_initialize(uint32_t devno) finfo("/dev/mtdblock%d created\n", devno); #endif - priv = (FAR struct lc823450_mtd_dev_s *)g_mtdmaster[ch]; + priv = (struct lc823450_mtd_dev_s *)g_mtdmaster[ch]; /* If SDC, create no child partition */ @@ -787,7 +787,7 @@ int lc823450_mtd_uninitialize(uint32_t devno) { int ret; char devname[16]; - FAR struct lc823450_mtd_dev_s *priv; + struct lc823450_mtd_dev_s *priv; const uint32_t ch = 1; /* SDC */ finfo("devno=%" PRId32 "\n", devno); @@ -799,7 +799,7 @@ int lc823450_mtd_uninitialize(uint32_t devno) return ret; } - priv = (FAR struct lc823450_mtd_dev_s *)g_mtdmaster[ch]; + priv = (struct lc823450_mtd_dev_s *)g_mtdmaster[ch]; if (!priv) { finfo("SD card is not identified yet\n"); diff --git a/arch/arm/src/lc823450/lc823450_procfs_dvfs.c b/arch/arm/src/lc823450/lc823450_procfs_dvfs.c index 71d14b3090..f29fcca04a 100644 --- a/arch/arm/src/lc823450/lc823450_procfs_dvfs.c +++ b/arch/arm/src/lc823450/lc823450_procfs_dvfs.c @@ -74,16 +74,16 @@ struct dvfs_file_s * Private Function Prototypes ****************************************************************************/ -static int dvfs_open(FAR struct file *filep, FAR const char *relpath, +static int dvfs_open(struct file *filep, const char *relpath, int oflags, mode_t mode); -static int dvfs_close(FAR struct file *filep); -static ssize_t dvfs_read(FAR struct file *filep, FAR char *buffer, +static int dvfs_close(struct file *filep); +static ssize_t dvfs_read(struct file *filep, char *buffer, size_t buflen); -static ssize_t dvfs_write(FAR struct file *filep, FAR const char *buffer, +static ssize_t dvfs_write(struct file *filep, const char *buffer, size_t buflen); -static int dvfs_dup(FAR const struct file *oldp, - FAR struct file *newp); -static int dvfs_stat(FAR const char *relpath, FAR struct stat *buf); +static int dvfs_dup(const struct file *oldp, + struct file *newp); +static int dvfs_stat(const char *relpath, struct stat *buf); /**************************************************************************** * Private Data @@ -126,16 +126,16 @@ extern uint32_t g_dvfs_freq_stat[3]; * Name: dvfs_open ****************************************************************************/ -static int dvfs_open(FAR struct file *filep, FAR const char *relpath, +static int dvfs_open(struct file *filep, const char *relpath, int oflags, mode_t mode) { - FAR struct dvfs_file_s *priv; + struct dvfs_file_s *priv; finfo("Open '%s'\n", relpath); /* Allocate a container to hold the task and attribute selection */ - priv = (FAR struct dvfs_file_s *)kmm_zalloc(sizeof(struct dvfs_file_s)); + priv = (struct dvfs_file_s *)kmm_zalloc(sizeof(struct dvfs_file_s)); if (!priv) { ferr("ERROR: Failed to allocate file attributes\n"); @@ -144,7 +144,7 @@ static int dvfs_open(FAR struct file *filep, FAR const char *relpath, /* Save the index as the open-specific state in filep->f_priv */ - filep->f_priv = (FAR void *)priv; + filep->f_priv = (void *)priv; return OK; } @@ -152,13 +152,13 @@ static int dvfs_open(FAR struct file *filep, FAR const char *relpath, * Name: dvfs_close ****************************************************************************/ -static int dvfs_close(FAR struct file *filep) +static int dvfs_close(struct file *filep) { - FAR struct dvfs_file_s *priv; + struct dvfs_file_s *priv; /* Recover our private data from the struct file instance */ - priv = (FAR struct dvfs_file_s *)filep->f_priv; + priv = (struct dvfs_file_s *)filep->f_priv; DEBUGASSERT(priv); /* Release the file attributes structure */ @@ -172,10 +172,10 @@ static int dvfs_close(FAR struct file *filep) * Name: dvfs_read ****************************************************************************/ -static ssize_t dvfs_read(FAR struct file *filep, FAR char *buffer, +static ssize_t dvfs_read(struct file *filep, char *buffer, size_t buflen) { - FAR struct dvfs_file_s *priv; + struct dvfs_file_s *priv; size_t linesize; size_t copysize; size_t remaining; @@ -186,7 +186,7 @@ static ssize_t dvfs_read(FAR struct file *filep, FAR char *buffer, finfo("buffer=%p buflen=%d\n", buffer, (int)buflen); - priv = (FAR struct dvfs_file_s *)filep->f_priv; + priv = (struct dvfs_file_s *)filep->f_priv; DEBUGASSERT(priv); remaining = buflen; @@ -262,7 +262,7 @@ static ssize_t dvfs_read(FAR struct file *filep, FAR char *buffer, * Name: procfs_write ****************************************************************************/ -static ssize_t dvfs_write(FAR struct file *filep, FAR const char *buffer, +static ssize_t dvfs_write(struct file *filep, const char *buffer, size_t buflen) { char line[DVFS_LINELEN]; @@ -306,21 +306,21 @@ static ssize_t dvfs_write(FAR struct file *filep, FAR const char *buffer, * Name: dvfs_dup ****************************************************************************/ -static int dvfs_dup(FAR const struct file *oldp, FAR struct file *newp) +static int dvfs_dup(const struct file *oldp, struct file *newp) { - FAR struct dvfs_file_s *oldpriv; - FAR struct dvfs_file_s *newpriv; + struct dvfs_file_s *oldpriv; + struct dvfs_file_s *newpriv; finfo("Dup %p->%p\n", oldp, newp); /* Recover our private data from the old struct file instance */ - oldpriv = (FAR struct dvfs_file_s *)oldp->f_priv; + oldpriv = (struct dvfs_file_s *)oldp->f_priv; DEBUGASSERT(oldpriv); /* Allocate a new container to hold the task and attribute selection */ - newpriv = (FAR struct dvfs_file_s *)kmm_zalloc(sizeof(struct dvfs_file_s)); + newpriv = (struct dvfs_file_s *)kmm_zalloc(sizeof(struct dvfs_file_s)); if (!newpriv) { ferr("ERROR: Failed to allocate file attributes\n"); @@ -333,7 +333,7 @@ static int dvfs_dup(FAR const struct file *oldp, FAR struct file *newp) /* Save the new attributes in the new file structure */ - newp->f_priv = (FAR void *)newpriv; + newp->f_priv = (void *)newpriv; return OK; } diff --git a/arch/arm/src/lc823450/lc823450_pwm.h b/arch/arm/src/lc823450/lc823450_pwm.h index 32e4c7c2b2..b195c7fefc 100644 --- a/arch/arm/src/lc823450/lc823450_pwm.h +++ b/arch/arm/src/lc823450/lc823450_pwm.h @@ -88,7 +88,7 @@ extern "C" * Public Function Prototypes ****************************************************************************/ -EXTERN FAR struct pwm_lowerhalf_s *lc823450_pwminitialize(int timer); +EXTERN struct pwm_lowerhalf_s *lc823450_pwminitialize(int timer); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/lc823450/lc823450_rtc.c b/arch/arm/src/lc823450/lc823450_rtc.c index 0a4b7d0385..e940d8e4af 100644 --- a/arch/arm/src/lc823450/lc823450_rtc.c +++ b/arch/arm/src/lc823450/lc823450_rtc.c @@ -226,7 +226,7 @@ static void rtc_pmnotify(struct pm_callback_s *cb, enum pm_state_e pmstate) ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -static int rtc_interrupt(int irq, void *context, FAR void *arg) +static int rtc_interrupt(int irq, void *context, void *arg) { struct tm tm; up_rtc_getdatetime(&tm); @@ -282,7 +282,7 @@ static int rtc_interrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -static int up_rtc_getdatetime_main(FAR struct tm *tp) +static int up_rtc_getdatetime_main(struct tm *tp) { #ifdef CONFIG_RTC_DIV tp->tm_sec = getreg8(RTC_SEC); @@ -452,7 +452,7 @@ int up_rtc_initialize(void) return OK; } -int up_rtc_getdatetime(FAR struct tm *tp) +int up_rtc_getdatetime(struct tm *tp) { struct tm tm1; struct tm tm2; @@ -508,7 +508,7 @@ int up_rtc_getdatetime(FAR struct tm *tp) * ****************************************************************************/ -int up_rtc_settime(FAR const struct timespec *ts) +int up_rtc_settime(const struct timespec *ts) { struct tm *tp; @@ -579,7 +579,7 @@ int up_rtc_settime(FAR const struct timespec *ts) ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -int up_rtc_setalarm(FAR const struct timespec *ts, alarmcb_t callback) +int up_rtc_setalarm(const struct timespec *ts, alarmcb_t callback) { struct tm *tp; @@ -654,7 +654,7 @@ int up_rtc_cancelalarm(void) * ****************************************************************************/ -int up_rtc_getrawtime(FAR struct timespec *ts) +int up_rtc_getrawtime(struct timespec *ts) { struct tm tm; struct timespec now; diff --git a/arch/arm/src/lc823450/lc823450_sdc.c b/arch/arm/src/lc823450/lc823450_sdc.c index cbbbcddd01..2f5f870fbc 100644 --- a/arch/arm/src/lc823450/lc823450_sdc.c +++ b/arch/arm/src/lc823450/lc823450_sdc.c @@ -137,7 +137,7 @@ extern SINT_T sddep_write(void *src, void *dst, UI_32 size, SINT_T type, * Name: _sdc_semtake ****************************************************************************/ -static int _sdc_semtake(FAR sem_t *sem) +static int _sdc_semtake(sem_t *sem) { return nxsem_wait_uninterruptible(sem); } @@ -146,7 +146,7 @@ static int _sdc_semtake(FAR sem_t *sem) * Name: _sdc_semgive ****************************************************************************/ -static void _sdc_semgive(FAR sem_t *sem) +static void _sdc_semgive(sem_t *sem) { nxsem_post(sem); } diff --git a/arch/arm/src/lc823450/lc823450_sddrv_dep.c b/arch/arm/src/lc823450/lc823450_sddrv_dep.c index 9b17865d16..6d26527a43 100644 --- a/arch/arm/src/lc823450/lc823450_sddrv_dep.c +++ b/arch/arm/src/lc823450/lc823450_sddrv_dep.c @@ -132,7 +132,7 @@ static void dma_callback(DMA_HANDLE hdma, void *arg, int result) * Name: _sddep_semtake ****************************************************************************/ -static int _sddep_semtake(FAR sem_t *sem) +static int _sddep_semtake(sem_t *sem) { return nxsem_wait_uninterruptible(sem); } diff --git a/arch/arm/src/lc823450/lc823450_serial.c b/arch/arm/src/lc823450/lc823450_serial.c index c0d669c567..6f1c40261b 100644 --- a/arch/arm/src/lc823450/lc823450_serial.c +++ b/arch/arm/src/lc823450/lc823450_serial.c @@ -182,7 +182,7 @@ static int up_setup(struct uart_dev_s *dev); static void up_shutdown(struct uart_dev_s *dev); static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); -static int up_interrupt(int irq, void *context, FAR void *arg); +static int up_interrupt(int irq, void *context, void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); @@ -655,7 +655,7 @@ static void up_detach(struct uart_dev_s *dev) * ****************************************************************************/ -static int up_interrupt(int irq, void *context, FAR void *arg) +static int up_interrupt(int irq, void *context, void *arg) { struct uart_dev_s *dev; struct up_dev_s *priv; diff --git a/arch/arm/src/lc823450/lc823450_spi.c b/arch/arm/src/lc823450/lc823450_spi.c index 255fdcffc2..b2ef45fcb6 100644 --- a/arch/arm/src/lc823450/lc823450_spi.c +++ b/arch/arm/src/lc823450/lc823450_spi.c @@ -84,17 +84,17 @@ struct lc823450_spidev_s /* SPI methods */ #ifndef CONFIG_SPI_OWNBUS -static int spi_lock(FAR struct spi_dev_s *dev, bool lock); +static int spi_lock(struct spi_dev_s *dev, bool lock); #endif -static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, +static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency); -static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode); -static void spi_setbits(FAR struct spi_dev_s *dev, int nbits); -static uint32_t spi_send(FAR struct spi_dev_s *dev, uint32_t wd); +static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode); +static void spi_setbits(struct spi_dev_s *dev, int nbits); +static uint32_t spi_send(struct spi_dev_s *dev, uint32_t wd); #ifndef CONFIG_SPI_EXCHANGE -static void spi_sndblock(FAR struct spi_dev_s *dev, - FAR const void *buffer, size_t nwords); -static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, +static void spi_sndblock(struct spi_dev_s *dev, + const void *buffer, size_t nwords); +static void spi_recvblock(struct spi_dev_s *dev, void *buffer, size_t nwords); #endif @@ -137,9 +137,9 @@ static struct lc823450_spidev_s g_spidev = ****************************************************************************/ #ifndef CONFIG_SPI_OWNBUS -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 lc823450_spidev_s *priv = (FAR struct lc823450_spidev_s *)dev; + struct lc823450_spidev_s *priv = (struct lc823450_spidev_s *)dev; int ret; if (lock) @@ -170,10 +170,10 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock) * ****************************************************************************/ -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 lc823450_spidev_s *priv = (FAR struct lc823450_spidev_s *)dev; + struct lc823450_spidev_s *priv = (struct lc823450_spidev_s *)dev; unsigned long sysclk = lc823450_get_systemfreq(); uint32_t actual; int div; @@ -222,9 +222,9 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) +static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) { - FAR struct lc823450_spidev_s *priv = (FAR struct lc823450_spidev_s *)dev; + struct lc823450_spidev_s *priv = (struct lc823450_spidev_s *)dev; #ifndef CONFIG_SPI_OWNBUS if (priv->mode == mode) @@ -276,9 +276,9 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) * ****************************************************************************/ -static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) +static void spi_setbits(struct spi_dev_s *dev, int nbits) { - FAR struct lc823450_spidev_s *priv = (FAR struct lc823450_spidev_s *)dev; + struct lc823450_spidev_s *priv = (struct lc823450_spidev_s *)dev; #ifndef CONFIG_SPI_OWNBUS if (priv->nbits == nbits) @@ -326,13 +326,13 @@ static void spi_dma_callback(DMA_HANDLE hdma, void *arg, int result) ****************************************************************************/ #ifdef CONFIG_LC823450_SPI_DMA -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) { spi_sndblock(dev, &wd, 1); return 0; } #else /* CONFIG_LC823450_SPI_DMA */ -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) { putreg16((uint16_t)wd, LC823450_SPI_STR); @@ -370,10 +370,10 @@ static uint32_t spi_send(FAR struct spi_dev_s *dev, uint32_t wd) ****************************************************************************/ #ifndef CONFIG_SPI_EXCHANGE -static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, +static void spi_sndblock(struct spi_dev_s *dev, const void *buffer, size_t nwords) { - FAR struct lc823450_spidev_s *priv = (FAR struct lc823450_spidev_s *)dev; + struct lc823450_spidev_s *priv = (struct lc823450_spidev_s *)dev; #ifdef CONFIG_LC823450_SPI_DMA /* TODO: 16bit */ @@ -459,10 +459,10 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, ****************************************************************************/ #ifndef CONFIG_SPI_EXCHANGE -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 nwords) { - FAR struct lc823450_spidev_s *priv = (FAR struct lc823450_spidev_s *)dev; + struct lc823450_spidev_s *priv = (struct lc823450_spidev_s *)dev; int i; uint8_t *buf = buffer; uint16_t *buf16 = buffer; @@ -502,9 +502,9 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, * ****************************************************************************/ -FAR struct spi_dev_s *lc823450_spibus_initialize(int port) +struct spi_dev_s *lc823450_spibus_initialize(int port) { - FAR struct lc823450_spidev_s *priv = &g_spidev; + struct lc823450_spidev_s *priv = &g_spidev; irqstate_t flags; DEBUGASSERT(port == 0); diff --git a/arch/arm/src/lc823450/lc823450_spi.h b/arch/arm/src/lc823450/lc823450_spi.h index 0976ca150b..276e77dd7b 100644 --- a/arch/arm/src/lc823450/lc823450_spi.h +++ b/arch/arm/src/lc823450/lc823450_spi.h @@ -151,14 +151,14 @@ extern "C" #define EXTERN extern #endif -FAR struct spi_dev_s *lc823450_spibus_initialize(int bus); +struct spi_dev_s *lc823450_spibus_initialize(int bus); void lc823450_spiinitialize(void); -void lc823450_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, +void lc823450_spiselect(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t lc823450_spistatus(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t lc823450_spistatus(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int lc823450_spicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int lc823450_spicmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #undef EXTERN diff --git a/arch/arm/src/lc823450/lc823450_testset.c b/arch/arm/src/lc823450/lc823450_testset.c index 2683cf5d04..db519cff2c 100644 --- a/arch/arm/src/lc823450/lc823450_testset.c +++ b/arch/arm/src/lc823450/lc823450_testset.c @@ -63,7 +63,7 @@ * ****************************************************************************/ -spinlock_t up_testset(volatile FAR spinlock_t *lock) +spinlock_t up_testset(volatile spinlock_t *lock) { uint32_t val; spinlock_t ret; diff --git a/arch/arm/src/lc823450/lc823450_timer.c b/arch/arm/src/lc823450/lc823450_timer.c index 15e5516811..24ab57e0ce 100644 --- a/arch/arm/src/lc823450/lc823450_timer.c +++ b/arch/arm/src/lc823450/lc823450_timer.c @@ -137,7 +137,7 @@ struct hrt_s static dq_queue_t hrt_timer_queue; static void hrt_queue_refresh(void); static void hrt_usleep_setup(void); -static int hrt_interrupt(int irq, FAR void *context, FAR void *arg); +static int hrt_interrupt(int irq, void *context, void *arg); static void hrt_usleep_add(struct hrt_s *phrt); #endif @@ -266,7 +266,7 @@ static void hrt_usleep_setup(void) ****************************************************************************/ #ifdef CONFIG_HRT_TIMER -static int hrt_interrupt(int irq, FAR void *context, FAR void *arg) +static int hrt_interrupt(int irq, void *context, void *arg) { /* Disable MTM2-Ch0 */ @@ -333,7 +333,7 @@ static void hrt_usleep_add(struct hrt_s *phrt) ****************************************************************************/ #ifdef CONFIG_PROFILE -int up_proftimerisr(int irq, uint32_t *regs, FAR void *arg) +int up_proftimerisr(int irq, uint32_t *regs, void *arg) { putreg32(1 << 1, MT30STS); if (profile_en) @@ -358,7 +358,7 @@ int up_proftimerisr(int irq, uint32_t *regs, FAR void *arg) * Name: up_timerisr ****************************************************************************/ -int up_timerisr(int irq, uint32_t *regs, FAR void *arg) +int up_timerisr(int irq, uint32_t *regs, void *arg) { /* Process timer interrupt */ @@ -688,7 +688,7 @@ void lc823450_mtm_stop_oneshot(void) * ****************************************************************************/ -int up_rtc_gettime(FAR struct timespec *tp) +int up_rtc_gettime(struct timespec *tp) { uint64_t secs; uint64_t nsecs; diff --git a/arch/arm/src/lc823450/lc823450_usbdev.c b/arch/arm/src/lc823450/lc823450_usbdev.c index 690b7b1e02..db4050d362 100644 --- a/arch/arm/src/lc823450/lc823450_usbdev.c +++ b/arch/arm/src/lc823450/lc823450_usbdev.c @@ -168,7 +168,7 @@ int lc823450_usbpullup(struct usbdev_s *dev, bool enable); static void subintr_usbdev(void); static void subintr_ep0(void); static void subintr_ep(uint8_t epnum); -static int lc823450_usbinterrupt(int irq, void *context, FAR void *arg); +static int lc823450_usbinterrupt(int irq, void *context, void *arg); #if defined(CONFIG_BATTERY) && defined(CONFIG_USBDEV_CHARGER) static void usb_reset_work_func(void *arg); #endif @@ -1377,7 +1377,7 @@ static void subintr_ep(uint8_t epnum) * ****************************************************************************/ -static int lc823450_usbinterrupt(int irq, void *context, FAR void *arg) +static int lc823450_usbinterrupt(int irq, void *context, void *arg) { uint32_t disr; int i; diff --git a/arch/arm/src/lc823450/lc823450_wdt.c b/arch/arm/src/lc823450/lc823450_wdt.c index 03f2430a4a..97424fb689 100644 --- a/arch/arm/src/lc823450/lc823450_wdt.c +++ b/arch/arm/src/lc823450/lc823450_wdt.c @@ -100,21 +100,21 @@ struct lc823450_wdt_lowerhalf_s #ifdef CONFIG_LC823450_WDT_INTERRUPT static int lc823450_wdt_interrupt(int irq, - FAR void *context, FAR void *arg); + void *context, void *arg); #endif /* "Lower half" driver methods **********************************************/ -static int lc823450_wdt_start(FAR struct watchdog_lowerhalf_s *lower); -static int lc823450_wdt_stop(FAR struct watchdog_lowerhalf_s *lower); -static int lc823450_wdt_keepalive(FAR struct watchdog_lowerhalf_s *lower); -static int lc823450_wdt_getstatus(FAR struct watchdog_lowerhalf_s *lower, - FAR struct watchdog_status_s *status); -static int lc823450_wdt_settimeout(FAR struct watchdog_lowerhalf_s *lower, +static int lc823450_wdt_start(struct watchdog_lowerhalf_s *lower); +static int lc823450_wdt_stop(struct watchdog_lowerhalf_s *lower); +static int lc823450_wdt_keepalive(struct watchdog_lowerhalf_s *lower); +static int lc823450_wdt_getstatus(struct watchdog_lowerhalf_s *lower, + struct watchdog_status_s *status); +static int lc823450_wdt_settimeout(struct watchdog_lowerhalf_s *lower, uint32_t timeout); -static xcpt_t lc823450_wdt_capture(FAR struct watchdog_lowerhalf_s *lower, +static xcpt_t lc823450_wdt_capture(struct watchdog_lowerhalf_s *lower, xcpt_t handler); -static int lc823450_wdt_ioctl(FAR struct watchdog_lowerhalf_s *lower, +static int lc823450_wdt_ioctl(struct watchdog_lowerhalf_s *lower, int cmd, unsigned long arg); /**************************************************************************** @@ -172,9 +172,9 @@ static void wdg_work_func(void *arg) ****************************************************************************/ #ifdef CONFIG_LC823450_WDT_INTERRUPT -static int lc823450_wdt_interrupt(int irq, FAR void *context, FAR void *arg) +static int lc823450_wdt_interrupt(int irq, void *context, void *arg) { - FAR struct lc823450_wdt_lowerhalf_s *priv = &g_wdtdev; + struct lc823450_wdt_lowerhalf_s *priv = &g_wdtdev; if (!(getreg32(WDT_PT0STS) & (1 << WDT_PT0STS_CSTS))) { @@ -212,7 +212,7 @@ static int lc823450_wdt_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static int lc823450_wdt_start(FAR struct watchdog_lowerhalf_s *lower) +static int lc823450_wdt_start(struct watchdog_lowerhalf_s *lower) { modifyreg32(WDT_PT0CTL, 0, 1 << WDT_PT0CTL_WT0ACT); @@ -235,7 +235,7 @@ static int lc823450_wdt_start(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int lc823450_wdt_stop(FAR struct watchdog_lowerhalf_s *lower) +static int lc823450_wdt_stop(struct watchdog_lowerhalf_s *lower) { modifyreg32(WDT_PT0CTL, 1 << WDT_PT0CTL_WT0ACT, 0); @@ -260,10 +260,10 @@ static int lc823450_wdt_stop(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int lc823450_wdt_keepalive(FAR struct watchdog_lowerhalf_s *lower) +static int lc823450_wdt_keepalive(struct watchdog_lowerhalf_s *lower) { - FAR struct lc823450_wdt_lowerhalf_s *priv = - (FAR struct lc823450_wdt_lowerhalf_s *)lower; + struct lc823450_wdt_lowerhalf_s *priv = + (struct lc823450_wdt_lowerhalf_s *)lower; wdinfo("Entry\n"); @@ -288,11 +288,11 @@ static int lc823450_wdt_keepalive(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int lc823450_wdt_getstatus(FAR struct watchdog_lowerhalf_s *lower, - FAR struct watchdog_status_s *status) +static int lc823450_wdt_getstatus(struct watchdog_lowerhalf_s *lower, + struct watchdog_status_s *status) { - FAR struct lc823450_wdt_lowerhalf_s *priv = - (FAR struct lc823450_wdt_lowerhalf_s *)lower; + struct lc823450_wdt_lowerhalf_s *priv = + (struct lc823450_wdt_lowerhalf_s *)lower; uint32_t wdt_freq; @@ -351,11 +351,11 @@ static int lc823450_wdt_getstatus(FAR struct watchdog_lowerhalf_s *lower, * ****************************************************************************/ -static int lc823450_wdt_settimeout(FAR struct watchdog_lowerhalf_s *lower, +static int lc823450_wdt_settimeout(struct watchdog_lowerhalf_s *lower, uint32_t timeout) { - FAR struct lc823450_wdt_lowerhalf_s *priv = - (FAR struct lc823450_wdt_lowerhalf_s *)lower; + struct lc823450_wdt_lowerhalf_s *priv = + (struct lc823450_wdt_lowerhalf_s *)lower; int32_t wt0pstst; uint32_t wdt_freq; @@ -422,15 +422,15 @@ static int lc823450_wdt_settimeout(FAR struct watchdog_lowerhalf_s *lower, * ****************************************************************************/ -static xcpt_t lc823450_wdt_capture(FAR struct watchdog_lowerhalf_s *lower, +static xcpt_t lc823450_wdt_capture(struct watchdog_lowerhalf_s *lower, xcpt_t handler) { #ifndef CONFIG_LC823450_WDT_INTERRUPT wdinfo("ERROR: Not configured for this mode\n"); return NULL; #else - FAR struct lc823450_wdt_lowerhalf_s *priv = - (FAR struct lc823450_wdt_lowerhalf_s *)lower; + struct lc823450_wdt_lowerhalf_s *priv = + (struct lc823450_wdt_lowerhalf_s *)lower; irqstate_t flags; xcpt_t oldhandler; @@ -486,7 +486,7 @@ static xcpt_t lc823450_wdt_capture(FAR struct watchdog_lowerhalf_s *lower, * ****************************************************************************/ -static int lc823450_wdt_ioctl(FAR struct watchdog_lowerhalf_s *lower, +static int lc823450_wdt_ioctl(struct watchdog_lowerhalf_s *lower, int cmd, unsigned long arg) { wdinfo("cmd=%d arg=%ld\n", cmd, arg); @@ -518,7 +518,7 @@ static int lc823450_wdt_ioctl(FAR struct watchdog_lowerhalf_s *lower, int lc823450_wdt_initialize(void) { - FAR struct lc823450_wdt_lowerhalf_s *priv = &g_wdtdev; + struct lc823450_wdt_lowerhalf_s *priv = &g_wdtdev; priv->wdt_lh.ops = &g_wdgops; @@ -542,7 +542,7 @@ int lc823450_wdt_initialize(void) /* Register the watchdog driver as /dev/watchdog0 */ watchdog_register("/dev/watchdog0", - (FAR struct watchdog_lowerhalf_s *)priv); + (struct watchdog_lowerhalf_s *)priv); return OK; } diff --git a/arch/arm/src/lpc17xx_40xx/lpc176x_rtc.c b/arch/arm/src/lpc17xx_40xx/lpc176x_rtc.c index a072bb3f73..8fdd7aa48e 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc176x_rtc.c +++ b/arch/arm/src/lpc17xx_40xx/lpc176x_rtc.c @@ -94,7 +94,7 @@ volatile bool g_rtc_enabled = false; ****************************************************************************/ #ifdef CONFIG_DEBUG_RTC_INFO -static void rtc_dumpregs(FAR const char *msg) +static void rtc_dumpregs(const char *msg) { rtcinfo("%s:\n", msg); rtcinfo(" DOM : %08x\n", (getreg32(LPC17_40_RTC_DOM) & RTC_DOM_MASK)); @@ -119,7 +119,7 @@ static void rtc_dumpregs(FAR const char *msg) ****************************************************************************/ #ifdef CONFIG_DEBUG_RTC_INFO -static void rtc_dumptime(FAR struct tm *tp, FAR const char *msg) +static void rtc_dumptime(struct tm *tp, const char *msg) { rtcinfo("%s:\n", msg); rtcinfo(" tm_sec: %08x\n", tp->tm_sec); @@ -189,7 +189,7 @@ static int rtc_setup(void) ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -static int rtc_interrupt(int irq, void *context, FAR void *arg) +static int rtc_interrupt(int irq, void *context, void *arg) { #warning "Missing logic" return OK; @@ -273,7 +273,7 @@ int up_rtc_initialize(void) * ****************************************************************************/ -int up_rtc_getdatetime(FAR struct tm *tp) +int up_rtc_getdatetime(struct tm *tp) { rtc_dumpregs("Reading Time"); @@ -318,9 +318,9 @@ int up_rtc_getdatetime(FAR struct tm *tp) * ****************************************************************************/ -int up_rtc_settime(FAR const struct timespec *tp) +int up_rtc_settime(const struct timespec *tp) { - FAR struct tm newtime; + struct tm newtime; /* Break out the time values * (not that the time is set only to units of seconds) @@ -358,7 +358,7 @@ int up_rtc_settime(FAR const struct timespec *tp) ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -int lpc17_40_rtc_setalarm(FAR const struct timespec *tp, alarmcb_t callback) +int lpc17_40_rtc_setalarm(const struct timespec *tp, alarmcb_t callback) { int ret = -EBUSY; diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c index da106ef420..6499b52a5c 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c @@ -88,7 +88,7 @@ struct up_dev_s { - FAR const struct adc_callback_s *cb; + const struct adc_callback_s *cb; uint8_t mask; uint32_t sps; int irq; @@ -100,18 +100,18 @@ struct up_dev_s * Private Function Prototypes ****************************************************************************/ -static void adc_receive(FAR struct up_dev_s *priv, uint8_t ch, int32_t data); +static void adc_receive(struct up_dev_s *priv, uint8_t ch, int32_t data); /* ADC methods */ -static int adc_bind(FAR struct adc_dev_s *dev, - FAR const struct adc_callback_s *callback); -static void adc_reset(FAR struct adc_dev_s *dev); -static int adc_setup(FAR struct adc_dev_s *dev); -static void adc_shutdown(FAR struct adc_dev_s *dev); -static void adc_rxint(FAR struct adc_dev_s *dev, bool enable); -static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg); -static int adc_interrupt(int irq, void *context, FAR void *arg); +static int adc_bind(struct adc_dev_s *dev, + const struct adc_callback_s *callback); +static void adc_reset(struct adc_dev_s *dev); +static int adc_setup(struct adc_dev_s *dev); +static void adc_shutdown(struct adc_dev_s *dev); +static void adc_rxint(struct adc_dev_s *dev, bool enable); +static int adc_ioctl(struct adc_dev_s *dev, int cmd, unsigned long arg); +static int adc_interrupt(int irq, void *context, void *arg); /**************************************************************************** * Private Data @@ -152,7 +152,7 @@ static struct adc_dev_s g_adcdev = * ****************************************************************************/ -static void adc_receive(FAR struct up_dev_s *priv, uint8_t ch, int32_t data) +static void adc_receive(struct up_dev_s *priv, uint8_t ch, int32_t data) { /* Verify that the upper-half driver has bound its callback functions. */ @@ -174,10 +174,10 @@ static void adc_receive(FAR struct up_dev_s *priv, uint8_t ch, int32_t data) * ****************************************************************************/ -static int adc_bind(FAR struct adc_dev_s *dev, - FAR const struct adc_callback_s *callback) +static int adc_bind(struct adc_dev_s *dev, + const struct adc_callback_s *callback) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->ad_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->ad_priv; DEBUGASSERT(priv != NULL); priv->cb = callback; @@ -193,9 +193,9 @@ static int adc_bind(FAR struct adc_dev_s *dev, * ****************************************************************************/ -static void adc_reset(FAR struct adc_dev_s *dev) +static void adc_reset(struct adc_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->ad_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->ad_priv; irqstate_t flags; uint32_t clkdiv; uint32_t regval; @@ -308,9 +308,9 @@ static void adc_reset(FAR struct adc_dev_s *dev) * ****************************************************************************/ -static int adc_setup(FAR struct adc_dev_s *dev) +static int adc_setup(struct adc_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->ad_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->ad_priv; int i; int ret = irq_attach(priv->irq, adc_interrupt, NULL); @@ -337,9 +337,9 @@ static int adc_setup(FAR struct adc_dev_s *dev) * ****************************************************************************/ -static void adc_shutdown(FAR struct adc_dev_s *dev) +static void adc_shutdown(struct adc_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->ad_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->ad_priv; /* Disable ADC interrupts, both at the level of the ADC device and at the * level of the NVIC. @@ -361,9 +361,9 @@ static void adc_shutdown(FAR struct adc_dev_s *dev) * ****************************************************************************/ -static void adc_rxint(FAR struct adc_dev_s *dev, bool enable) +static void adc_rxint(struct adc_dev_s *dev, bool enable) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->ad_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->ad_priv; if (enable) { @@ -401,7 +401,7 @@ static void adc_rxint(FAR struct adc_dev_s *dev, bool enable) * ****************************************************************************/ -static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg) +static int adc_ioctl(struct adc_dev_s *dev, int cmd, unsigned long arg) { /* No ioctl commands supported */ @@ -416,12 +416,12 @@ static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg) * ****************************************************************************/ -static int adc_interrupt(int irq, void *context, FAR void *arg) +static int adc_interrupt(int irq, void *context, void *arg) { #ifndef CONFIG_LPC17_40_ADC_BURSTMODE #ifdef CONFIG_LPC17_40_ADC_CHANLIST - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)g_adcdev.ad_priv; + struct up_dev_s *priv = (struct up_dev_s *)g_adcdev.ad_priv; uint32_t regval; unsigned char ch; int32_t value; @@ -453,7 +453,7 @@ static int adc_interrupt(int irq, void *context, FAR void *arg) #else - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)g_adcdev.ad_priv; + struct up_dev_s *priv = (struct up_dev_s *)g_adcdev.ad_priv; uint32_t regval; unsigned char ch; int32_t value; @@ -477,7 +477,7 @@ static int adc_interrupt(int irq, void *context, FAR void *arg) #endif #else /* CONFIG_LPC17_40_ADC_BURSTMODE */ - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)g_adcdev.ad_priv; + struct up_dev_s *priv = (struct up_dev_s *)g_adcdev.ad_priv; volatile uint32_t reg_val; volatile uint32_t reg_val2; volatile uint32_t reg_val3; @@ -616,7 +616,7 @@ static int adc_interrupt(int irq, void *context, FAR void *arg) if (adc0_int_done == 1) { work_queue(HPWORK, &priv->irqwork, adc_irqworker, - (FAR void *)priv, 0); + (void *)priv, 0); } #endif /* CONFIG_ADC_WORKER_THREAD */ @@ -656,7 +656,7 @@ static int adc_interrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -FAR struct adc_dev_s *lpc17_40_adcinitialize(void) +struct adc_dev_s *lpc17_40_adcinitialize(void) { return &g_adcdev; } diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.h b/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.h index 7ace28995b..c32608fd48 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.h +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.h @@ -99,7 +99,7 @@ EXTERN uint8_t g_adc_chanlist[CONFIG_LPC17_40_ADC_NCHANNELS]; ****************************************************************************/ #ifdef CONFIG_LPC17_40_ADC -FAR struct adc_dev_s *lpc17_40_adcinitialize(void); +struct adc_dev_s *lpc17_40_adcinitialize(void); #endif #undef EXTERN diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_allocateheap.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_allocateheap.c index af1def8df7..0cf64d0059 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_allocateheap.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_allocateheap.c @@ -201,7 +201,7 @@ * ****************************************************************************/ -void up_allocate_heap(FAR void **heap_start, size_t *heap_size) +void up_allocate_heap(void **heap_start, size_t *heap_size) { #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) /* Get the unaligned size and position of the user-space heap. @@ -230,7 +230,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) /* Return the user-space heap settings */ board_autoled_on(LED_HEAPALLOCATE); - *heap_start = (FAR void *)ubase; + *heap_start = (void *)ubase; *heap_size = usize; /* Allow user-mode access to the user heap memory */ @@ -265,7 +265,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) } board_autoled_on(LED_HEAPALLOCATE); - *heap_start = (FAR void *)sram_start; + *heap_start = (void *)sram_start; *heap_size = CONFIG_RAM_END - sram_start; #else @@ -275,7 +275,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) */ board_autoled_on(LED_HEAPALLOCATE); - *heap_start = (FAR void *)g_idle_topstack; + *heap_start = (void *)g_idle_topstack; *heap_size = CONFIG_RAM_END - g_idle_topstack; #endif } @@ -294,7 +294,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) ****************************************************************************/ #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) -void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) +void up_allocate_kheap(void **heap_start, size_t *heap_size) { /* Get the unaligned size and position of the user-space heap. * This heap begins after the user-space .bss section at an offset @@ -323,7 +323,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) * that was not dedicated to the user heap). */ - *heap_start = (FAR void *)USERSPACE->us_bssend; + *heap_start = (void *)USERSPACE->us_bssend; *heap_size = ubase - (uintptr_t)USERSPACE->us_bssend; } #endif @@ -371,7 +371,7 @@ void arm_addregion(void) /* Add the AHB SRAM user heap region. */ - kumm_addregion((FAR void *)LPC17_40_AHB_HEAPBASE, LPC17_40_AHB_HEAPSIZE); + kumm_addregion((void *)LPC17_40_AHB_HEAPBASE, LPC17_40_AHB_HEAPSIZE); #endif #if CONFIG_MM_REGIONS >= 3 @@ -426,7 +426,7 @@ void arm_addregion(void) /* Add external DRAM heap memory to the user heap */ - kumm_addregion((FAR void *)dram_start, heap_size); + kumm_addregion((void *)dram_start, heap_size); } #endif @@ -441,7 +441,7 @@ void arm_addregion(void) #endif /* Add external SRAM heap memory to the user heap */ - kumm_addregion((FAR void *)LPC17_40_EXTSRAM_CS0, + kumm_addregion((void *)LPC17_40_EXTSRAM_CS0, CONFIG_LPC17_40_EXTSRAM0SIZE); #endif #endif diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_can.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_can.c index 788c78ec25..6672ed1504 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_can.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_can.c @@ -215,23 +215,23 @@ static void can_putcommon(uint32_t addr, uint32_t value); /* CAN methods */ -static void lpc17can_reset(FAR struct can_dev_s *dev); -static int lpc17can_setup(FAR struct can_dev_s *dev); -static void lpc17can_shutdown(FAR struct can_dev_s *dev); -static void lpc17can_rxint(FAR struct can_dev_s *dev, bool enable); -static void lpc17can_txint(FAR struct can_dev_s *dev, bool enable); -static int lpc17can_ioctl(FAR struct can_dev_s *dev, int cmd, +static void lpc17can_reset(struct can_dev_s *dev); +static int lpc17can_setup(struct can_dev_s *dev); +static void lpc17can_shutdown(struct can_dev_s *dev); +static void lpc17can_rxint(struct can_dev_s *dev, bool enable); +static void lpc17can_txint(struct can_dev_s *dev, bool enable); +static int lpc17can_ioctl(struct can_dev_s *dev, int cmd, unsigned long arg); -static int lpc17can_remoterequest(FAR struct can_dev_s *dev, uint16_t id); -static int lpc17can_send(FAR struct can_dev_s *dev, - FAR struct can_msg_s *msg); -static bool lpc17can_txready(FAR struct can_dev_s *dev); -static bool lpc17can_txempty(FAR struct can_dev_s *dev); +static int lpc17can_remoterequest(struct can_dev_s *dev, uint16_t id); +static int lpc17can_send(struct can_dev_s *dev, + struct can_msg_s *msg); +static bool lpc17can_txready(struct can_dev_s *dev); +static bool lpc17can_txempty(struct can_dev_s *dev); /* CAN interrupts */ -static void can_interrupt(FAR struct can_dev_s *dev); -static int can12_interrupt(int irq, void *context, FAR void *arg); +static void can_interrupt(struct can_dev_s *dev); +static int can12_interrupt(int irq, void *context, void *arg); /* Initialization */ @@ -496,9 +496,9 @@ static void can_putcommon(uint32_t addr, uint32_t value) * ****************************************************************************/ -static void lpc17can_reset(FAR struct can_dev_s *dev) +static void lpc17can_reset(struct can_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; irqstate_t flags; int ret; @@ -549,9 +549,9 @@ static void lpc17can_reset(FAR struct can_dev_s *dev) * ****************************************************************************/ -static int lpc17can_setup(FAR struct can_dev_s *dev) +static int lpc17can_setup(struct can_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; int ret; caninfo("CAN%d\n", priv->port); @@ -580,10 +580,10 @@ static int lpc17can_setup(FAR struct can_dev_s *dev) * ****************************************************************************/ -static void lpc17can_shutdown(FAR struct can_dev_s *dev) +static void lpc17can_shutdown(struct can_dev_s *dev) { #ifdef CONFIG_DEBUG_CAN_INFO - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; caninfo("CAN%d\n", priv->port); #endif @@ -606,9 +606,9 @@ static void lpc17can_shutdown(FAR struct can_dev_s *dev) * ****************************************************************************/ -static void lpc17can_rxint(FAR struct can_dev_s *dev, bool enable) +static void lpc17can_rxint(struct can_dev_s *dev, bool enable) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; uint32_t regval; irqstate_t flags; @@ -647,9 +647,9 @@ static void lpc17can_rxint(FAR struct can_dev_s *dev, bool enable) * ****************************************************************************/ -static void lpc17can_txint(FAR struct can_dev_s *dev, bool enable) +static void lpc17can_txint(struct can_dev_s *dev, bool enable) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; uint32_t regval; irqstate_t flags; @@ -691,7 +691,7 @@ static void lpc17can_txint(FAR struct can_dev_s *dev, bool enable) * ****************************************************************************/ -static int lpc17can_ioctl(FAR struct can_dev_s *dev, int cmd, +static int lpc17can_ioctl(struct can_dev_s *dev, int cmd, unsigned long arg) { canerr("ERROR: Fix me -- Not Implemented\n"); @@ -712,7 +712,7 @@ static int lpc17can_ioctl(FAR struct can_dev_s *dev, int cmd, * ****************************************************************************/ -static int lpc17can_remoterequest(FAR struct can_dev_s *dev, uint16_t id) +static int lpc17can_remoterequest(struct can_dev_s *dev, uint16_t id) { canerr("ERROR: Fix me -- Not Implemented\n"); return 0; @@ -741,10 +741,10 @@ static int lpc17can_remoterequest(FAR struct can_dev_s *dev, uint16_t id) * ****************************************************************************/ -static int lpc17can_send(FAR struct can_dev_s *dev, - FAR struct can_msg_s *msg) +static int lpc17can_send(struct can_dev_s *dev, + struct can_msg_s *msg) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; uint32_t tid = (uint32_t)msg->cm_hdr.ch_id; uint32_t tfi = (uint32_t)msg->cm_hdr.ch_dlc << 16; uint32_t regval; @@ -905,9 +905,9 @@ static int lpc17can_send(FAR struct can_dev_s *dev, * ****************************************************************************/ -static bool lpc17can_txready(FAR struct can_dev_s *dev) +static bool lpc17can_txready(struct can_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; uint32_t regval = can_getreg(priv, LPC17_40_CAN_SR_OFFSET); return ((regval & (CAN_SR_TBS1 | CAN_SR_TBS2 | CAN_SR_TBS3)) != 0); } @@ -930,9 +930,9 @@ static bool lpc17can_txready(FAR struct can_dev_s *dev) * ****************************************************************************/ -static bool lpc17can_txempty(FAR struct can_dev_s *dev) +static bool lpc17can_txempty(struct can_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; uint32_t regval = can_getreg(priv, LPC17_40_CAN_GSR_OFFSET); return ((regval & CAN_GSR_TBS) != 0); } @@ -951,9 +951,9 @@ static bool lpc17can_txempty(FAR struct can_dev_s *dev) * ****************************************************************************/ -static void can_interrupt(FAR struct can_dev_s *dev) +static void can_interrupt(struct can_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; struct can_hdr_s hdr; uint32_t data[2]; uint32_t rfs; @@ -1069,7 +1069,7 @@ static void can_interrupt(FAR struct can_dev_s *dev) * ****************************************************************************/ -static int can12_interrupt(int irq, void *context, FAR void *arg) +static int can12_interrupt(int irq, void *context, void *arg) { /* Handle CAN1/2 interrupts */ @@ -1246,9 +1246,9 @@ static int can_bittiming(struct up_dev_s *priv) * ****************************************************************************/ -FAR struct can_dev_s *lpc17_40_caninitialize(int port) +struct can_dev_s *lpc17_40_caninitialize(int port) { - FAR struct can_dev_s *candev; + struct can_dev_s *candev; irqstate_t flags; uint32_t regval; diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_can.h b/arch/arm/src/lpc17xx_40xx/lpc17_40_can.h index 51af8a9269..223f341b9b 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_can.h +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_can.h @@ -66,7 +66,7 @@ extern "C" #if defined(CONFIG_CAN) && (defined(CONFIG_LPC17_40_CAN1) || defined(CONFIG_LPC17_40_CAN2)) struct can_dev_s; -FAR struct can_dev_s *lpc17_40_caninitialize(int port); +struct can_dev_s *lpc17_40_caninitialize(int port); #endif #ifdef __cplusplus diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c index ac529259b9..7833b3f5e7 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c @@ -76,12 +76,12 @@ /* DAC methods */ -static void dac_reset(FAR struct dac_dev_s *dev); -static int dac_setup(FAR struct dac_dev_s *dev); -static void dac_shutdown(FAR struct dac_dev_s *dev); -static void dac_txint(FAR struct dac_dev_s *dev, bool enable); -static int dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg); -static int dac_ioctl(FAR struct dac_dev_s *dev, int cmd, unsigned long arg); +static void dac_reset(struct dac_dev_s *dev); +static int dac_setup(struct dac_dev_s *dev); +static void dac_shutdown(struct dac_dev_s *dev); +static void dac_txint(struct dac_dev_s *dev, bool enable); +static int dac_send(struct dac_dev_s *dev, struct dac_msg_s *msg); +static int dac_ioctl(struct dac_dev_s *dev, int cmd, unsigned long arg); /**************************************************************************** * Private Data @@ -110,7 +110,7 @@ static struct dac_dev_s g_dacdev = * is called, before ao_setup() and on error conditions. */ -static void dac_reset(FAR struct dac_dev_s *dev) +static void dac_reset(struct dac_dev_s *dev) { irqstate_t flags; uint32_t regval; @@ -135,7 +135,7 @@ static void dac_reset(FAR struct dac_dev_s *dev) * are all disabled upon return. */ -static int dac_setup(FAR struct dac_dev_s *dev) +static int dac_setup(struct dac_dev_s *dev) { return OK; } @@ -144,17 +144,17 @@ static int dac_setup(FAR struct dac_dev_s *dev) * This method reverses the operation the setup method. */ -static void dac_shutdown(FAR struct dac_dev_s *dev) +static void dac_shutdown(struct dac_dev_s *dev) { } /* Call to enable or disable TX interrupts */ -static void dac_txint(FAR struct dac_dev_s *dev, bool enable) +static void dac_txint(struct dac_dev_s *dev, bool enable) { } -static int dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg) +static int dac_send(struct dac_dev_s *dev, struct dac_msg_s *msg) { /* adjust the binary value to the lpc1768's register format (plus high * speed profile in bit 16) @@ -167,7 +167,7 @@ static int dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg) /* All ioctl calls will be routed through this method */ -static int dac_ioctl(FAR struct dac_dev_s *dev, int cmd, unsigned long arg) +static int dac_ioctl(struct dac_dev_s *dev, int cmd, unsigned long arg) { aerr("ERROR: Fix me -- Not Implemented\n"); return 0; @@ -188,7 +188,7 @@ static int dac_ioctl(FAR struct dac_dev_s *dev, int cmd, unsigned long arg) * ****************************************************************************/ -FAR struct dac_dev_s *lpc17_40_dacinitialize(void) +struct dac_dev_s *lpc17_40_dacinitialize(void) { return &g_dacdev; } diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.h b/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.h index ee70b68a20..bbc2448066 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.h +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.h @@ -62,7 +62,7 @@ extern "C" ****************************************************************************/ #ifdef CONFIG_LPC17_40_DAC -FAR struct dac_dev_s *lpc17_40_dacinitialize(void); +struct dac_dev_s *lpc17_40_dacinitialize(void); #endif #ifdef __cplusplus diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c index 3d7684f71d..a09663fe9f 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c @@ -165,7 +165,7 @@ /* This is a helper pointer for accessing the contents of Ethernet header */ -#define BUF ((FAR struct eth_hdr_s *)priv->lp_dev.d_buf) +#define BUF ((struct eth_hdr_s *)priv->lp_dev.d_buf) /* This is the number of ethernet GPIO pins that must be configured */ @@ -362,27 +362,27 @@ static int lpc17_40_txpoll(struct net_driver_s *dev); static void lpc17_40_response(struct lpc17_40_driver_s *priv); -static void lpc17_40_txdone_work(FAR void *arg); -static void lpc17_40_rxdone_work(FAR void *arg); -static int lpc17_40_interrupt(int irq, void *context, FAR void *arg); +static void lpc17_40_txdone_work(void *arg); +static void lpc17_40_rxdone_work(void *arg); +static int lpc17_40_interrupt(int irq, void *context, void *arg); /* Watchdog timer expirations */ -static void lpc17_40_txtimeout_work(FAR void *arg); +static void lpc17_40_txtimeout_work(void *arg); static void lpc17_40_txtimeout_expiry(wdparm_t arg); -static void lpc17_40_poll_work(FAR void *arg); +static void lpc17_40_poll_work(void *arg); static void lpc17_40_poll_expiry(wdparm_t arg); /* NuttX callback functions */ #ifdef CONFIG_NET_ICMPv6 -static void lpc17_40_ipv6multicast(FAR struct lpc17_40_driver_s *priv); +static void lpc17_40_ipv6multicast(struct lpc17_40_driver_s *priv); #endif static int lpc17_40_ifup(struct net_driver_s *dev); static int lpc17_40_ifdown(struct net_driver_s *dev); -static void lpc17_40_txavail_work(FAR void *arg); +static void lpc17_40_txavail_work(void *arg); static int lpc17_40_txavail(struct net_driver_s *dev); #if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6) @@ -416,7 +416,7 @@ static void lpc17_40_showmii(uint8_t phyaddr, const char *msg); # endif #if defined(CONFIG_NETDEV_PHY_IOCTL) && defined(CONFIG_ARCH_PHY_INTERRUPT) -static int lpc17_40_phyintenable(FAR struct lpc17_40_driver_s *priv); +static int lpc17_40_phyintenable(struct lpc17_40_driver_s *priv); #endif static void lpc17_40_phywrite(uint8_t phyaddr, uint8_t regaddr, uint16_t phydata); @@ -843,9 +843,9 @@ static void lpc17_40_response(struct lpc17_40_driver_s *priv) * ****************************************************************************/ -static void lpc17_40_rxdone_work(FAR void *arg) +static void lpc17_40_rxdone_work(void *arg) { - FAR struct lpc17_40_driver_s *priv = (FAR struct lpc17_40_driver_s *)arg; + struct lpc17_40_driver_s *priv = (struct lpc17_40_driver_s *)arg; irqstate_t flags; uint32_t *rxstat; bool fragment; @@ -1111,9 +1111,9 @@ static void lpc17_40_rxdone_work(FAR void *arg) * ****************************************************************************/ -static void lpc17_40_txdone_work(FAR void *arg) +static void lpc17_40_txdone_work(void *arg) { - FAR struct lpc17_40_driver_s *priv = (FAR struct lpc17_40_driver_s *)arg; + struct lpc17_40_driver_s *priv = (struct lpc17_40_driver_s *)arg; /* Verify that the hardware is ready to send another packet. Since a Tx * just completed, this must be the case. @@ -1169,7 +1169,7 @@ static void lpc17_40_txdone_work(FAR void *arg) * ****************************************************************************/ -static int lpc17_40_interrupt(int irq, void *context, FAR void *arg) +static int lpc17_40_interrupt(int irq, void *context, void *arg) { register struct lpc17_40_driver_s *priv; uint32_t status; @@ -1374,9 +1374,9 @@ static int lpc17_40_interrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -static void lpc17_40_txtimeout_work(FAR void *arg) +static void lpc17_40_txtimeout_work(void *arg) { - FAR struct lpc17_40_driver_s *priv = (FAR struct lpc17_40_driver_s *)arg; + struct lpc17_40_driver_s *priv = (struct lpc17_40_driver_s *)arg; /* Increment statistics and dump debug info */ @@ -1457,9 +1457,9 @@ static void lpc17_40_txtimeout_expiry(wdparm_t arg) * ****************************************************************************/ -static void lpc17_40_poll_work(FAR void *arg) +static void lpc17_40_poll_work(void *arg) { - FAR struct lpc17_40_driver_s *priv = (FAR struct lpc17_40_driver_s *)arg; + struct lpc17_40_driver_s *priv = (struct lpc17_40_driver_s *)arg; unsigned int prodidx; unsigned int considx; @@ -1519,7 +1519,7 @@ static void lpc17_40_poll_work(FAR void *arg) static void lpc17_40_poll_expiry(wdparm_t arg) { - FAR struct lpc17_40_driver_s *priv = (FAR struct lpc17_40_driver_s *)arg; + struct lpc17_40_driver_s *priv = (struct lpc17_40_driver_s *)arg; DEBUGASSERT(arg); @@ -1545,7 +1545,7 @@ static void lpc17_40_poll_expiry(wdparm_t arg) ****************************************************************************/ #ifdef CONFIG_NET_ICMPv6 -static void lpc17_40_ipv6multicast(FAR struct lpc17_40_driver_s *priv) +static void lpc17_40_ipv6multicast(struct lpc17_40_driver_s *priv) { struct net_driver_s *dev; uint16_t tmp16; @@ -1824,9 +1824,9 @@ static int lpc17_40_ifdown(struct net_driver_s *dev) * ****************************************************************************/ -static void lpc17_40_txavail_work(FAR void *arg) +static void lpc17_40_txavail_work(void *arg) { - FAR struct lpc17_40_driver_s *priv = (FAR struct lpc17_40_driver_s *)arg; + struct lpc17_40_driver_s *priv = (struct lpc17_40_driver_s *)arg; /* Ignore the notification if the interface is not yet up */ @@ -1867,8 +1867,8 @@ static void lpc17_40_txavail_work(FAR void *arg) static int lpc17_40_txavail(struct net_driver_s *dev) { - FAR struct lpc17_40_driver_s *priv = - (FAR struct lpc17_40_driver_s *)dev->d_private; + struct lpc17_40_driver_s *priv = + (struct lpc17_40_driver_s *)dev->d_private; /* Is our single poll work structure available? It may not be if there * are pending polling actions and we will have to ignore the Tx diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c index 12e86acfbc..e1729383d3 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c @@ -175,7 +175,7 @@ static void lpc17_40_dmadone(struct lpc17_40_dmach_s *dmach) * ****************************************************************************/ -static int gpdma_interrupt(int irq, FAR void *context, FAR void *arg) +static int gpdma_interrupt(int irq, void *context, void *arg) { struct lpc17_40_dmach_s *dmach; uint32_t regval; diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.h b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.h index a6db12cb30..2e56c64dc7 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.h +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.h @@ -39,7 +39,7 @@ #ifdef CONFIG_LPC17_40_GPDMA /* DMA_HANDLE is an opaque reference to an allocated DMA channel */ -typedef FAR void *DMA_HANDLE; +typedef void *DMA_HANDLE; /* dma_callback_t a function pointer provided to lpc17_40_dmastart. This * function is called at the completion of the DMA transfer. 'arg' is the diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpioint.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpioint.c index a16697e3ad..d2172a1a86 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpioint.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpioint.c @@ -388,7 +388,7 @@ static void lpc17_40_gpiodemux(uint32_t intbase, uint32_t intmask, * ****************************************************************************/ -static int lpc17_40_gpiointerrupt(int irq, void *context, FAR void *arg) +static int lpc17_40_gpiointerrupt(int irq, void *context, void *arg) { /* Get the GPIO interrupt status */ diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c index c7cd0adc5d..f2706a7d7c 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c @@ -127,7 +127,7 @@ struct lpc17_40_i2cdev_s static int lpc17_40_i2c_start(struct lpc17_40_i2cdev_s *priv); static void lpc17_40_i2c_stop(struct lpc17_40_i2cdev_s *priv); -static int lpc17_40_i2c_interrupt(int irq, FAR void *context, void *arg); +static int lpc17_40_i2c_interrupt(int irq, void *context, void *arg); static void lpc17_40_i2c_timeout(wdparm_t arg); static void lpc17_40_i2c_setfrequency(struct lpc17_40_i2cdev_s *priv, uint32_t frequency); @@ -135,10 +135,10 @@ static void lpc17_40_stopnext(struct lpc17_40_i2cdev_s *priv); /* I2C device operations */ -static int lpc17_40_i2c_transfer(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count); +static int lpc17_40_i2c_transfer(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count); #ifdef CONFIG_I2C_RESET -static int lpc17_40_i2c_reset(FAR struct i2c_master_s * dev); +static int lpc17_40_i2c_reset(struct i2c_master_s * dev); #endif /**************************************************************************** @@ -292,8 +292,8 @@ static void lpc17_40_i2c_timeout(wdparm_t arg) * ****************************************************************************/ -static int lpc17_40_i2c_transfer(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count) +static int lpc17_40_i2c_transfer(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count) { struct lpc17_40_i2cdev_s *priv = (struct lpc17_40_i2cdev_s *)dev; int ret; @@ -375,7 +375,7 @@ static void lpc17_40_stopnext(struct lpc17_40_i2cdev_s *priv) * ****************************************************************************/ -static int lpc17_40_i2c_interrupt(int irq, FAR void *context, void *arg) +static int lpc17_40_i2c_interrupt(int irq, void *context, void *arg) { struct lpc17_40_i2cdev_s *priv = (struct lpc17_40_i2cdev_s *)arg; struct i2c_msg_s *msg; @@ -492,7 +492,7 @@ static int lpc17_40_i2c_interrupt(int irq, FAR void *context, void *arg) ****************************************************************************/ #ifdef CONFIG_I2C_RESET -static int lpc17_40_i2c_reset(FAR struct i2c_master_s * dev) +static int lpc17_40_i2c_reset(struct i2c_master_s * dev) { return OK; } @@ -649,7 +649,7 @@ struct i2c_master_s *lpc17_40_i2cbus_initialize(int port) * ****************************************************************************/ -int lpc17_40_i2cbus_uninitialize(FAR struct i2c_master_s * dev) +int lpc17_40_i2cbus_uninitialize(struct i2c_master_s * dev) { struct lpc17_40_i2cdev_s *priv = (struct lpc17_40_i2cdev_s *) dev; diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.h b/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.h index c97693e74b..4d3f2aaeb2 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.h +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.h @@ -50,7 +50,7 @@ * ****************************************************************************/ -FAR struct i2c_master_s *lpc17_40_i2cbus_initialize(int port); +struct i2c_master_s *lpc17_40_i2cbus_initialize(int port); /**************************************************************************** * Name: lpc17_40_i2cbus_uninitialize @@ -67,6 +67,6 @@ FAR struct i2c_master_s *lpc17_40_i2cbus_initialize(int port); * ****************************************************************************/ -int lpc17_40_i2cbus_uninitialize(FAR struct i2c_master_s *dev); +int lpc17_40_i2cbus_uninitialize(struct i2c_master_s *dev); #endif /* __ARCH_ARM_SRC_LPC17XX_40XX_LPC17_40_I2C_H */ diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c index ad6e27ca0b..c88341da48 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c @@ -146,7 +146,7 @@ static void lpc17_40_dumpnvic(const char *msg, int irq) ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -static int lpc17_40_nmi(int irq, FAR void *context, FAR void *arg) +static int lpc17_40_nmi(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! NMI received\n"); @@ -154,7 +154,7 @@ static int lpc17_40_nmi(int irq, FAR void *context, FAR void *arg) return 0; } -static int lpc17_40_busfault(int irq, FAR void *context, FAR void *arg) +static int lpc17_40_busfault(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Bus fault received\n"); @@ -162,7 +162,7 @@ static int lpc17_40_busfault(int irq, FAR void *context, FAR void *arg) return 0; } -static int lpc17_40_usagefault(int irq, FAR void *context, FAR void *arg) +static int lpc17_40_usagefault(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Usage fault received\n"); @@ -170,7 +170,7 @@ static int lpc17_40_usagefault(int irq, FAR void *context, FAR void *arg) return 0; } -static int lpc17_40_pendsv(int irq, FAR void *context, FAR void *arg) +static int lpc17_40_pendsv(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! PendSV received\n"); @@ -178,7 +178,7 @@ static int lpc17_40_pendsv(int irq, FAR void *context, FAR void *arg) return 0; } -static int lpc17_40_dbgmonitor(int irq, FAR void *context, FAR void *arg) +static int lpc17_40_dbgmonitor(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Debug Monitor received\n"); @@ -186,7 +186,7 @@ static int lpc17_40_dbgmonitor(int irq, FAR void *context, FAR void *arg) return 0; } -static int lpc17_40_reserved(int irq, FAR void *context, FAR void *arg) +static int lpc17_40_reserved(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Reserved interrupt\n"); diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_lcd.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_lcd.c index 3ed79a23d8..f286281351 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_lcd.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_lcd.c @@ -91,20 +91,20 @@ * configuration of each color plane. */ -static int lpc17_40_getvideoinfo(FAR struct fb_vtable_s *vtable, - FAR struct fb_videoinfo_s *vinfo); -static int lpc17_40_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno, - FAR struct fb_planeinfo_s *pinfo); +static int lpc17_40_getvideoinfo(struct fb_vtable_s *vtable, + struct fb_videoinfo_s *vinfo); +static int lpc17_40_getplaneinfo(struct fb_vtable_s *vtable, int planeno, + struct fb_planeinfo_s *pinfo); /* The following is provided only if the video hardware supports RGB color * mapping */ #ifdef CONFIG_FB_CMAP -static int lpc17_40_getcmap(FAR struct fb_vtable_s *vtable, - FAR struct fb_cmap_s *cmap); -static int lpc17_40_putcmap(FAR struct fb_vtable_s *vtable, - FAR const struct fb_cmap_s *cmap); +static int lpc17_40_getcmap(struct fb_vtable_s *vtable, + struct fb_cmap_s *cmap); +static int lpc17_40_putcmap(struct fb_vtable_s *vtable, + const struct fb_cmap_s *cmap); #endif /* The following is provided only if the video hardware supports a hardware @@ -112,10 +112,10 @@ static int lpc17_40_putcmap(FAR struct fb_vtable_s *vtable, */ #ifdef CONFIG_FB_HWCURSOR -static int lpc17_40_getcursor(FAR struct fb_vtable_s *vtable, - FAR struct fb_cursorattrib_s *attrib); -static int lpc17_40_setcursor(FAR struct fb_vtable_s *vtable, - FAR struct fb_setcursor_s *settings); +static int lpc17_40_getcursor(struct fb_vtable_s *vtable, + struct fb_cursorattrib_s *attrib); +static int lpc17_40_setcursor(struct fb_vtable_s *vtable, + struct fb_setcursor_s *settings); #endif /**************************************************************************** @@ -136,7 +136,7 @@ static const struct fb_videoinfo_s g_videoinfo = static const struct fb_planeinfo_s g_planeinfo = { - .fbmem = (FAR void *)CONFIG_LPC17_40_LCD_VRAMBASE, + .fbmem = (void *)CONFIG_LPC17_40_LCD_VRAMBASE, .fblen = LPC17_40_FBSIZE, .stride = LPC17_40_STRIDE, .display = 0, @@ -185,8 +185,8 @@ struct fb_vtable_s g_fbobject = * Name: lpc17_40_getvideoinfo ****************************************************************************/ -static int lpc17_40_getvideoinfo(FAR struct fb_vtable_s *vtable, - FAR struct fb_videoinfo_s *vinfo) +static int lpc17_40_getvideoinfo(struct fb_vtable_s *vtable, + struct fb_videoinfo_s *vinfo) { lcdinfo("vtable=%p vinfo=%p\n", vtable, vinfo); if (vtable && vinfo) @@ -203,8 +203,8 @@ static int lpc17_40_getvideoinfo(FAR struct fb_vtable_s *vtable, * Name: lpc17_40_getplaneinfo ****************************************************************************/ -static int lpc17_40_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno, - FAR struct fb_planeinfo_s *pinfo) +static int lpc17_40_getplaneinfo(struct fb_vtable_s *vtable, int planeno, + struct fb_planeinfo_s *pinfo) { lcdinfo("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo); if (vtable && planeno == 0 && pinfo) @@ -222,8 +222,8 @@ static int lpc17_40_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno, ****************************************************************************/ #ifdef CONFIG_FB_CMAP -static int lpc17_40_getcmap(FAR struct fb_vtable_s *vtable, - FAR struct fb_cmap_s *cmap) +static int lpc17_40_getcmap(struct fb_vtable_s *vtable, + struct fb_cmap_s *cmap) { uint32_t *pal; uint32_t rgb; @@ -296,8 +296,8 @@ static int lpc17_40_getcmap(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifdef CONFIG_FB_CMAP -static int lpc17_40_putcmap(FAR struct fb_vtable_s *vtable, - FAR const struct fb_cmap_s *cmap) +static int lpc17_40_putcmap(struct fb_vtable_s *vtable, + const struct fb_cmap_s *cmap) { uint32_t *pal; uint32_t rgb0; @@ -368,8 +368,8 @@ static int lpc17_40_putcmap(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifdef CONFIG_FB_HWCURSOR -static int lpc17_40_getcursor(FAR struct fb_vtable_s *vtable, - FAR struct fb_cursorattrib_s *attrib) +static int lpc17_40_getcursor(struct fb_vtable_s *vtable, + struct fb_cursorattrib_s *attrib) { lcdinfo("vtable=%p attrib=%p\n", vtable, attrib); if (vtable && attrib) @@ -401,8 +401,8 @@ static int lpc17_40_getcursor(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifdef CONFIG_FB_HWCURSOR -static int lpc17_40_setcursor(FAR struct fb_vtable_s *vtable, - FAR struct fb_setcursor_s *settings) +static int lpc17_40_setcursor(struct fb_vtable_s *vtable, + struct fb_setcursor_s *settings) { lcdinfo("vtable=%p settings=%p\n", vtable, settings); if (vtable && settings) @@ -723,7 +723,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) { lcdinfo("vplane: %d\n", vplane); if (vplane == 0) diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_mcpwm.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_mcpwm.c index b91863de1f..8df1fa5b4d 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_mcpwm.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_mcpwm.c @@ -81,14 +81,14 @@ struct lpc17_40_mcpwmtimer_s { - FAR const struct pwm_ops_s *ops; /* PWM operations */ - uint8_t timid; /* Timer ID {0,...,7} */ - uint8_t channel; /* Timer output channel: {1,..4} */ - uint8_t timtype; /* See the TIMTYPE_* definitions */ - uint32_t base; /* The base address of the timer */ - uint32_t pincfg; /* Output pin configuration */ - uint32_t pclk; /* The frequency of the peripheral clock - * that drives the timer module. */ + const struct pwm_ops_s *ops; /* PWM operations */ + uint8_t timid; /* Timer ID {0,...,7} */ + uint8_t channel; /* Timer output channel: {1,..4} */ + uint8_t timtype; /* See the TIMTYPE_* definitions */ + uint32_t base; /* The base address of the timer */ + uint32_t pincfg; /* Output pin configuration */ + uint32_t pclk; /* The frequency of the peripheral clock + * that drives the timer module. */ }; /**************************************************************************** @@ -103,27 +103,27 @@ static void mcpwm_putreg(struct lpc17_40_mcpwmtimer_s *priv, #ifdef CONFIG_DEBUG_PWM_INFO static void mcpwm_dumpregs(struct lpc17_40_mcpwmtimer_s *priv, - FAR const char *msg); + const char *msg); #else # define mcpwm_dumpregs(priv,msg) #endif /* Timer management */ -static int mcpwm_timer(FAR struct lpc17_40_mcpwmtimer_s *priv, - FAR const struct pwm_info_s *info); +static int mcpwm_timer(struct lpc17_40_mcpwmtimer_s *priv, + const struct pwm_info_s *info); /* PWM driver methods */ -static int mcpwm_setup(FAR struct pwm_lowerhalf_s *dev); -static int mcpwm_shutdown(FAR struct pwm_lowerhalf_s *dev); +static int mcpwm_setup(struct pwm_lowerhalf_s *dev); +static int mcpwm_shutdown(struct pwm_lowerhalf_s *dev); -static int mcpwm_start(FAR struct pwm_lowerhalf_s *dev, - FAR const struct pwm_info_s *info); +static int mcpwm_start(struct pwm_lowerhalf_s *dev, + const struct pwm_info_s *info); -static int mcpwm_stop(FAR struct pwm_lowerhalf_s *dev); -static int mcpwm_ioctl(FAR struct pwm_lowerhalf_s *dev, - int cmd, unsigned long arg); +static int mcpwm_stop(struct pwm_lowerhalf_s *dev); +static int mcpwm_ioctl(struct pwm_lowerhalf_s *dev, + int cmd, unsigned long arg); /**************************************************************************** * Private Data @@ -215,8 +215,8 @@ static void mcpwm_putreg(struct lpc17_40_mcpwmtimer_s *priv, ****************************************************************************/ #ifdef CONFIG_DEBUG_PWM_INFO -static void mcpwm_dumpregs(FAR struct lpc17_40_mcpwmtimer_s *priv, - FAR const char *msg) +static void mcpwm_dumpregs(struct lpc17_40_mcpwmtimer_s *priv, + const char *msg) { pwminfo("%s:\n", msg); pwminfo(" CR1: %04x CR2: %04x SMCR: %04x DIER: %04x\n", @@ -258,8 +258,8 @@ static void mcpwm_dumpregs(FAR struct lpc17_40_mcpwmtimer_s *priv, * ****************************************************************************/ -static int mcpwm_timer(FAR struct lpc17_40_mcpwmtimer_s *priv, - FAR const struct pwm_info_s *info) +static int mcpwm_timer(struct lpc17_40_mcpwmtimer_s *priv, + const struct pwm_info_s *info) { irqstate_t flags; uint32_t regval; @@ -340,7 +340,7 @@ static int mcpwm_tim1interrupt(int irq, void *context) * ****************************************************************************/ -static void mcpwm_set_apb_clock(FAR struct lpc17_40_mcpwmtimer_s *priv, +static void mcpwm_set_apb_clock(struct lpc17_40_mcpwmtimer_s *priv, bool on) { uint32_t en_bit; @@ -391,10 +391,10 @@ static void mcpwm_set_apb_clock(FAR struct lpc17_40_mcpwmtimer_s *priv, * ****************************************************************************/ -static int mcpwm_setup(FAR struct pwm_lowerhalf_s *dev) +static int mcpwm_setup(struct pwm_lowerhalf_s *dev) { - FAR struct lpc17_40_mcpwmtimer_s *priv = - (FAR struct lpc17_40_mcpwmtimer_s *)dev; + struct lpc17_40_mcpwmtimer_s *priv = + (struct lpc17_40_mcpwmtimer_s *)dev; irqstate_t flags; uint32_t regval; @@ -489,10 +489,10 @@ static int mcpwm_setup(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int mcpwm_shutdown(FAR struct pwm_lowerhalf_s *dev) +static int mcpwm_shutdown(struct pwm_lowerhalf_s *dev) { - FAR struct lpc17_40_mcpwmtimer_s *priv = - (FAR struct lpc17_40_mcpwmtimer_s *)dev; + struct lpc17_40_mcpwmtimer_s *priv = + (struct lpc17_40_mcpwmtimer_s *)dev; uint32_t pincfg; pwminfo("TIM%d pincfg: %08x\n", priv->timid, priv->pincfg); @@ -517,11 +517,11 @@ static int mcpwm_shutdown(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int mcpwm_start(FAR struct pwm_lowerhalf_s *dev, - FAR const struct pwm_info_s *info) +static int mcpwm_start(struct pwm_lowerhalf_s *dev, + const struct pwm_info_s *info) { - FAR struct lpc17_40_mcpwmtimer_s *priv = - (FAR struct lpc17_40_mcpwmtimer_s *)dev; + struct lpc17_40_mcpwmtimer_s *priv = + (struct lpc17_40_mcpwmtimer_s *)dev; return mcpwm_timer(priv, info); } @@ -544,10 +544,10 @@ static int mcpwm_start(FAR struct pwm_lowerhalf_s *dev, * ****************************************************************************/ -static int mcpwm_stop(FAR struct pwm_lowerhalf_s *dev) +static int mcpwm_stop(struct pwm_lowerhalf_s *dev) { - FAR struct lpc17_40_mcpwmtimer_s *priv = - (FAR struct lpc17_40_mcpwmtimer_s *)dev; + struct lpc17_40_mcpwmtimer_s *priv = + (struct lpc17_40_mcpwmtimer_s *)dev; uint32_t resetbit; uint32_t regaddr; uint32_t regval; @@ -600,12 +600,12 @@ static int mcpwm_stop(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int mcpwm_ioctl(FAR struct pwm_lowerhalf_s *dev, +static int mcpwm_ioctl(struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg) { #ifdef CONFIG_DEBUG_PWM_INFO - FAR struct lpc17_40_mcpwmtimer_s *priv = - (FAR struct lpc17_40_mcpwmtimer_s *)dev; + struct lpc17_40_mcpwmtimer_s *priv = + (struct lpc17_40_mcpwmtimer_s *)dev; /* There are no platform-specific ioctl commands */ @@ -635,9 +635,9 @@ static int mcpwm_ioctl(FAR struct pwm_lowerhalf_s *dev, * ****************************************************************************/ -FAR struct pwm_lowerhalf_s *lpc17_40_mcpwminitialize(int timer) +struct pwm_lowerhalf_s *lpc17_40_mcpwminitialize(int timer) { - FAR struct lpc17_40_mcpwmtimer_s *lower; + struct lpc17_40_mcpwmtimer_s *lower; pwminfo("TIM%d\n", timer); @@ -657,7 +657,7 @@ FAR struct pwm_lowerhalf_s *lpc17_40_mcpwminitialize(int timer) return NULL; } - return (FAR struct pwm_lowerhalf_s *)lower; + return (struct pwm_lowerhalf_s *)lower; } #endif /* CONFIG_LPC17_40_TIMn_PWM, n = 1,...,14 */ diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_progmem.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_progmem.c index e83a248944..1afab95617 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_progmem.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_progmem.c @@ -67,13 +67,13 @@ static uint32_t lpc17_40_iap_copy_ram_to_flash(void *flash, * ****************************************************************************/ -static void lpc17_40_iap(FAR void *in, FAR void *out) +static void lpc17_40_iap(void *in, void *out) { irqstate_t flags; flags = enter_critical_section(); - ((void (*)(FAR void *, FAR void *))LPC17_40_IAP_ENTRY_ADDR)(in, out); + ((void (*)(void *, void *))LPC17_40_IAP_ENTRY_ADDR)(in, out); leave_critical_section(flags); } @@ -421,7 +421,7 @@ ssize_t up_progmem_ispageerased(size_t page) * ****************************************************************************/ -ssize_t up_progmem_write(size_t addr, FAR const void *buf, size_t count) +ssize_t up_progmem_write(size_t addr, const void *buf, size_t count) { size_t page; uint32_t rc; diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_pwm.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_pwm.c index ba49967f52..08864ad104 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_pwm.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_pwm.c @@ -98,14 +98,14 @@ struct lpc17_40_pwmtimer_s { - FAR const struct pwm_ops_s *ops; /* PWM operations */ - uint8_t timid; /* Timer ID {0,...,7} */ - uint8_t channel; /* Timer output channel: {1,..4} */ - uint8_t timtype; /* See the TIMTYPE_* definitions */ - uint32_t base; /* The base address of the timer */ - uint32_t pincfg; /* Output pin configuration */ - uint32_t pclk; /* The frequency of the peripheral clock - * that drives the timer module. */ + const struct pwm_ops_s *ops; /* PWM operations */ + uint8_t timid; /* Timer ID {0,...,7} */ + uint8_t channel; /* Timer output channel: {1,..4} */ + uint8_t timtype; /* See the TIMTYPE_* definitions */ + uint32_t base; /* The base address of the timer */ + uint32_t pincfg; /* Output pin configuration */ + uint32_t pclk; /* The frequency of the peripheral clock + * that drives the timer module. */ }; /**************************************************************************** @@ -120,26 +120,26 @@ static void pwm_putreg(struct lpc17_40_pwmtimer_s *priv, #ifdef CONFIG_DEBUG_PWM_INFO static void pwm_dumpregs(struct lpc17_40_pwmtimer_s *priv, - FAR const char *msg); + const char *msg); #else # define pwm_dumpregs(priv,msg) #endif /* Timer management */ -static int pwm_timer(FAR struct lpc17_40_pwmtimer_s *priv, - FAR const struct pwm_info_s *info); +static int pwm_timer(struct lpc17_40_pwmtimer_s *priv, + const struct pwm_info_s *info); /* PWM driver methods */ -static int pwm_setup(FAR struct pwm_lowerhalf_s *dev); -static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev); +static int pwm_setup(struct pwm_lowerhalf_s *dev); +static int pwm_shutdown(struct pwm_lowerhalf_s *dev); -static int pwm_start(FAR struct pwm_lowerhalf_s *dev, - FAR const struct pwm_info_s *info); +static int pwm_start(struct pwm_lowerhalf_s *dev, + const struct pwm_info_s *info); -static int pwm_stop(FAR struct pwm_lowerhalf_s *dev); -static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, +static int pwm_stop(struct pwm_lowerhalf_s *dev); +static int pwm_ioctl(struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg); /**************************************************************************** @@ -233,7 +233,7 @@ static void pwm_putreg(struct lpc17_40_pwmtimer_s *priv, #ifdef CONFIG_DEBUG_PWM_INFO static void pwm_dumpregs(struct lpc17_40_pwmtimer_s *priv, - FAR const char *msg) + const char *msg) { pwminfo("%s:\n", msg); pwminfo(" CR1: %04x CR2: %04x SMCR: %04x DIER: %04x\n", @@ -275,8 +275,8 @@ static void pwm_dumpregs(struct lpc17_40_pwmtimer_s *priv, * ****************************************************************************/ -static int pwm_timer(FAR struct lpc17_40_pwmtimer_s *priv, - FAR const struct pwm_info_s *info) +static int pwm_timer(struct lpc17_40_pwmtimer_s *priv, + const struct pwm_info_s *info) { irqstate_t flags; @@ -343,7 +343,7 @@ static int pwm_interrupt(struct lpc17_40_pwmtimer_s *priv) * ****************************************************************************/ -static int pwm_tim1interrupt(int irq, void *context, FAR void *arg) +static int pwm_tim1interrupt(int irq, void *context, void *arg) { return pwm_interrupt(&g_pwm1dev); } @@ -360,7 +360,7 @@ static int pwm_tim1interrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -static void pwm_set_apb_clock(FAR struct lpc17_40_pwmtimer_s *priv, bool on) +static void pwm_set_apb_clock(struct lpc17_40_pwmtimer_s *priv, bool on) { uint32_t en_bit; uint32_t regaddr; @@ -410,10 +410,10 @@ static void pwm_set_apb_clock(FAR struct lpc17_40_pwmtimer_s *priv, bool on) * ****************************************************************************/ -static int pwm_setup(FAR struct pwm_lowerhalf_s *dev) +static int pwm_setup(struct pwm_lowerhalf_s *dev) { - FAR struct lpc17_40_pwmtimer_s *priv = - (FAR struct lpc17_40_pwmtimer_s *)dev; + struct lpc17_40_pwmtimer_s *priv = + (struct lpc17_40_pwmtimer_s *)dev; irqstate_t flags; uint32_t regval; @@ -461,10 +461,10 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) +static int pwm_shutdown(struct pwm_lowerhalf_s *dev) { - FAR struct lpc17_40_pwmtimer_s *priv = - (FAR struct lpc17_40_pwmtimer_s *)dev; + struct lpc17_40_pwmtimer_s *priv = + (struct lpc17_40_pwmtimer_s *)dev; uint32_t pincfg; pwminfo("TIM%d pincfg: %08x\n", priv->timid, priv->pincfg); @@ -489,11 +489,11 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int pwm_start(FAR struct pwm_lowerhalf_s *dev, - FAR const struct pwm_info_s *info) +static int pwm_start(struct pwm_lowerhalf_s *dev, + const struct pwm_info_s *info) { - FAR struct lpc17_40_pwmtimer_s *priv = - (FAR struct lpc17_40_pwmtimer_s *)dev; + struct lpc17_40_pwmtimer_s *priv = + (struct lpc17_40_pwmtimer_s *)dev; return pwm_timer(priv, info); } @@ -516,10 +516,10 @@ static int pwm_start(FAR struct pwm_lowerhalf_s *dev, * ****************************************************************************/ -static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) +static int pwm_stop(struct pwm_lowerhalf_s *dev) { - FAR struct lpc17_40_pwmtimer_s *priv = - (FAR struct lpc17_40_pwmtimer_s *)dev; + struct lpc17_40_pwmtimer_s *priv = + (struct lpc17_40_pwmtimer_s *)dev; uint32_t resetbit; uint32_t regaddr; uint32_t regval; @@ -572,12 +572,12 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, +static int pwm_ioctl(struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg) { #ifdef CONFIG_DEBUG_PWM_INFO - FAR struct lpc17_40_pwmtimer_s *priv = - (FAR struct lpc17_40_pwmtimer_s *)dev; + struct lpc17_40_pwmtimer_s *priv = + (struct lpc17_40_pwmtimer_s *)dev; /* There are no platform-specific ioctl commands */ @@ -607,9 +607,9 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, * ****************************************************************************/ -FAR struct pwm_lowerhalf_s *lpc17_40_pwminitialize(int timer) +struct pwm_lowerhalf_s *lpc17_40_pwminitialize(int timer) { - FAR struct lpc17_40_pwmtimer_s *lower; + struct lpc17_40_pwmtimer_s *lower; pwminfo("TIM%d\n", timer); @@ -629,7 +629,7 @@ FAR struct pwm_lowerhalf_s *lpc17_40_pwminitialize(int timer) return NULL; } - return (FAR struct pwm_lowerhalf_s *)lower; + return (struct pwm_lowerhalf_s *)lower; } #endif /* CONFIG_LPC17_40_TIMn_PWM, n = 1,...,14 */ diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_rtc.h b/arch/arm/src/lpc17xx_40xx/lpc17_40_rtc.h index 2440b1ba93..6cd54f6e88 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_rtc.h +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_rtc.h @@ -65,7 +65,7 @@ typedef void (*alarmcb_t)(void); #ifdef CONFIG_RTC_ALARM struct timespec; -int lpc17_40_rtc_setalarm(FAR const struct timespec *tp, alarmcb_t callback); +int lpc17_40_rtc_setalarm(const struct timespec *tp, alarmcb_t callback); #endif #endif /* __ARCH_ARM_SRC_LPC17XX_40XX_LPC17_40_RTC_H */ diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c index 87fde5773b..c4a64f1e10 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c @@ -340,63 +340,63 @@ static void lpc17_40_endtransfer(struct lpc17_40_dev_s *priv, /* Interrupt Handling *******************************************************/ -static int lpc17_40_interrupt(int irq, void *context, FAR void *arg); +static int lpc17_40_interrupt(int irq, void *context, void *arg); /* SD Card Interface Methods ************************************************/ /* Mutual exclusion */ #ifdef CONFIG_SDIO_MUXBUS -static int lpc17_40_lock(FAR struct sdio_dev_s *dev, bool lock); +static int lpc17_40_lock(struct sdio_dev_s *dev, bool lock); #endif /* Initialization/setup */ -static void lpc17_40_reset(FAR struct sdio_dev_s *dev); -static sdio_capset_t lpc17_40_capabilities(FAR struct sdio_dev_s *dev); -static uint8_t lpc17_40_status(FAR struct sdio_dev_s *dev); -static void lpc17_40_widebus(FAR struct sdio_dev_s *dev, bool enable); -static void lpc17_40_clock(FAR struct sdio_dev_s *dev, +static void lpc17_40_reset(struct sdio_dev_s *dev); +static sdio_capset_t lpc17_40_capabilities(struct sdio_dev_s *dev); +static uint8_t lpc17_40_status(struct sdio_dev_s *dev); +static void lpc17_40_widebus(struct sdio_dev_s *dev, bool enable); +static void lpc17_40_clock(struct sdio_dev_s *dev, enum sdio_clock_e rate); -static int lpc17_40_attach(FAR struct sdio_dev_s *dev); +static int lpc17_40_attach(struct sdio_dev_s *dev); /* Command/Status/Data Transfer */ -static int lpc17_40_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc17_40_sendcmd(struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg); -static int lpc17_40_recvsetup(FAR struct sdio_dev_s *dev, - FAR uint8_t *buffer, size_t nbytes); -static int lpc17_40_sendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, size_t nbytes); -static int lpc17_40_cancel(FAR struct sdio_dev_s *dev); +static int lpc17_40_recvsetup(struct sdio_dev_s *dev, + uint8_t *buffer, size_t nbytes); +static int lpc17_40_sendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t nbytes); +static int lpc17_40_cancel(struct sdio_dev_s *dev); -static int lpc17_40_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd); -static int lpc17_40_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc17_40_waitresponse(struct sdio_dev_s *dev, uint32_t cmd); +static int lpc17_40_recvshortcrc(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort); -static int lpc17_40_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc17_40_recvlong(struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong[4]); -static int lpc17_40_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc17_40_recvshort(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort); -static int lpc17_40_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc17_40_recvnotimpl(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rnotimpl); /* EVENT handler */ -static void lpc17_40_waitenable(FAR struct sdio_dev_s *dev, +static void lpc17_40_waitenable(struct sdio_dev_s *dev, sdio_eventset_t eventset, uint32_t timeout); -static sdio_eventset_t lpc17_40_eventwait(FAR struct sdio_dev_s *dev); -static void lpc17_40_callbackenable(FAR struct sdio_dev_s *dev, +static sdio_eventset_t lpc17_40_eventwait(struct sdio_dev_s *dev); +static void lpc17_40_callbackenable(struct sdio_dev_s *dev, sdio_eventset_t eventset); -static int lpc17_40_registercallback(FAR struct sdio_dev_s *dev, +static int lpc17_40_registercallback(struct sdio_dev_s *dev, worker_t callback, void *arg); /* DMA */ #ifdef CONFIG_LPC17_40_SDCARD_DMA -static int lpc17_40_dmarecvsetup(FAR struct sdio_dev_s *dev, - FAR uint8_t *buffer, size_t buflen); -static int lpc17_40_dmasendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, size_t buflen); +static int lpc17_40_dmarecvsetup(struct sdio_dev_s *dev, + uint8_t *buffer, size_t buflen); +static int lpc17_40_dmasendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t buflen); #endif /* Initialization/uninitialization/reset ************************************/ @@ -802,7 +802,7 @@ static void lpc17_40_dumpsamples(struct lpc17_40_dev_s *priv) #ifdef CONFIG_LPC17_40_SDCARD_DMA static void lpc17_40_dmacallback(DMA_HANDLE handle, void *arg, int status) { - FAR struct lpc17_40_dev_s *priv = (FAR struct lpc17_40_dev_s *)arg; + struct lpc17_40_dev_s *priv = (struct lpc17_40_dev_s *)arg; DEBUGASSERT(priv->dmamode); sdio_eventset_t result; @@ -1206,7 +1206,7 @@ static void lpc17_40_endtransfer(struct lpc17_40_dev_s *priv, * ****************************************************************************/ -static int lpc17_40_interrupt(int irq, void *context, FAR void *arg) +static int lpc17_40_interrupt(int irq, void *context, void *arg) { struct lpc17_40_dev_s *priv = &g_scard_dev; uint32_t enabled; @@ -1422,7 +1422,7 @@ static int lpc17_40_interrupt(int irq, void *context, FAR void *arg) ****************************************************************************/ #ifdef CONFIG_SDIO_MUXBUS -static int lpc17_40_lock(FAR struct sdio_dev_s *dev, bool lock) +static int lpc17_40_lock(struct sdio_dev_s *dev, bool lock) { /* Single SD card instance so there is only one possibility. The multiplex * bus is part of board support package. @@ -1447,9 +1447,9 @@ static int lpc17_40_lock(FAR struct sdio_dev_s *dev, bool lock) * ****************************************************************************/ -static void lpc17_40_reset(FAR struct sdio_dev_s *dev) +static void lpc17_40_reset(struct sdio_dev_s *dev) { - FAR struct lpc17_40_dev_s *priv = (FAR struct lpc17_40_dev_s *)dev; + struct lpc17_40_dev_s *priv = (struct lpc17_40_dev_s *)dev; irqstate_t flags; uint32_t regval; @@ -1517,7 +1517,7 @@ static void lpc17_40_reset(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static sdio_capset_t lpc17_40_capabilities(FAR struct sdio_dev_s *dev) +static sdio_capset_t lpc17_40_capabilities(struct sdio_dev_s *dev) { sdio_capset_t caps = 0; @@ -1545,7 +1545,7 @@ static sdio_capset_t lpc17_40_capabilities(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static sdio_statset_t lpc17_40_status(FAR struct sdio_dev_s *dev) +static sdio_statset_t lpc17_40_status(struct sdio_dev_s *dev) { struct lpc17_40_dev_s *priv = (struct lpc17_40_dev_s *)dev; return priv->cdstatus; @@ -1568,7 +1568,7 @@ static sdio_statset_t lpc17_40_status(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static void lpc17_40_widebus(FAR struct sdio_dev_s *dev, bool wide) +static void lpc17_40_widebus(struct sdio_dev_s *dev, bool wide) { struct lpc17_40_dev_s *priv = (struct lpc17_40_dev_s *)dev; priv->widebus = wide; @@ -1589,7 +1589,7 @@ static void lpc17_40_widebus(FAR struct sdio_dev_s *dev, bool wide) * ****************************************************************************/ -static void lpc17_40_clock(FAR struct sdio_dev_s *dev, +static void lpc17_40_clock(struct sdio_dev_s *dev, enum sdio_clock_e rate) { uint32_t clkcr; @@ -1650,7 +1650,7 @@ static void lpc17_40_clock(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static int lpc17_40_attach(FAR struct sdio_dev_s *dev) +static int lpc17_40_attach(struct sdio_dev_s *dev) { int ret; @@ -1692,7 +1692,7 @@ static int lpc17_40_attach(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static int lpc17_40_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc17_40_sendcmd(struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg) { uint32_t regval; @@ -1769,8 +1769,8 @@ static int lpc17_40_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, * ****************************************************************************/ -static int lpc17_40_recvsetup(FAR struct sdio_dev_s *dev, - FAR uint8_t *buffer, +static int lpc17_40_recvsetup(struct sdio_dev_s *dev, + uint8_t *buffer, size_t nbytes) { struct lpc17_40_dev_s *priv = (struct lpc17_40_dev_s *)dev; @@ -1828,8 +1828,8 @@ static int lpc17_40_recvsetup(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static int lpc17_40_sendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, +static int lpc17_40_sendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t nbytes) { struct lpc17_40_dev_s *priv = (struct lpc17_40_dev_s *)dev; @@ -1881,7 +1881,7 @@ static int lpc17_40_sendsetup(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static int lpc17_40_cancel(FAR struct sdio_dev_s *dev) +static int lpc17_40_cancel(struct sdio_dev_s *dev) { struct lpc17_40_dev_s *priv = (struct lpc17_40_dev_s *)dev; @@ -1935,7 +1935,7 @@ static int lpc17_40_cancel(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static int lpc17_40_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd) +static int lpc17_40_waitresponse(struct sdio_dev_s *dev, uint32_t cmd) { int32_t timeout; uint32_t events; @@ -2009,7 +2009,7 @@ static int lpc17_40_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd) * ****************************************************************************/ -static int lpc17_40_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc17_40_recvshortcrc(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort) { #ifdef CONFIG_DEBUG_FEATURES @@ -2098,7 +2098,7 @@ static int lpc17_40_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, return ret; } -static int lpc17_40_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc17_40_recvlong(struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong[4]) { uint32_t regval; @@ -2153,7 +2153,7 @@ static int lpc17_40_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, return ret; } -static int lpc17_40_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc17_40_recvshort(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort) { uint32_t regval; @@ -2203,7 +2203,7 @@ static int lpc17_40_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, /* MMC responses not supported */ -static int lpc17_40_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc17_40_recvnotimpl(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rnotimpl) { putreg32(SDCARD_RESPDONE_ICR | SDCARD_CMDDONE_ICR, LPC17_40_SDCARD_CLEAR); @@ -2234,7 +2234,7 @@ static int lpc17_40_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd, * ****************************************************************************/ -static void lpc17_40_waitenable(FAR struct sdio_dev_s *dev, +static void lpc17_40_waitenable(struct sdio_dev_s *dev, sdio_eventset_t eventset, uint32_t timeout) { struct lpc17_40_dev_s *priv = (struct lpc17_40_dev_s *)dev; @@ -2321,7 +2321,7 @@ static void lpc17_40_waitenable(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static sdio_eventset_t lpc17_40_eventwait(FAR struct sdio_dev_s *dev) +static sdio_eventset_t lpc17_40_eventwait(struct sdio_dev_s *dev) { struct lpc17_40_dev_s *priv = (struct lpc17_40_dev_s *)dev; sdio_eventset_t wkupevent = 0; @@ -2411,8 +2411,8 @@ static sdio_eventset_t lpc17_40_eventwait(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static void lpc17_40_callbackenable(FAR struct sdio_dev_s *dev, - sdio_eventset_t eventset) +static void lpc17_40_callbackenable(struct sdio_dev_s *dev, + sdio_eventset_t eventset) { struct lpc17_40_dev_s *priv = (struct lpc17_40_dev_s *)dev; @@ -2445,8 +2445,8 @@ static void lpc17_40_callbackenable(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static int lpc17_40_registercallback(FAR struct sdio_dev_s *dev, - worker_t callback, void *arg) +static int lpc17_40_registercallback(struct sdio_dev_s *dev, + worker_t callback, void *arg) { struct lpc17_40_dev_s *priv = (struct lpc17_40_dev_s *)dev; @@ -2481,8 +2481,8 @@ static int lpc17_40_registercallback(FAR struct sdio_dev_s *dev, ****************************************************************************/ #ifdef CONFIG_LPC17_40_SDCARD_DMA -static int lpc17_40_dmarecvsetup(FAR struct sdio_dev_s *dev, - FAR uint8_t *buffer, +static int lpc17_40_dmarecvsetup(struct sdio_dev_s *dev, + uint8_t *buffer, size_t buflen) { struct lpc17_40_dev_s *priv = (struct lpc17_40_dev_s *)dev; @@ -2563,8 +2563,8 @@ static int lpc17_40_dmarecvsetup(FAR struct sdio_dev_s *dev, ****************************************************************************/ #ifdef CONFIG_LPC17_40_SDCARD_DMA -static int lpc17_40_dmasendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, size_t buflen) +static int lpc17_40_dmasendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t buflen) { struct lpc17_40_dev_s *priv = (struct lpc17_40_dev_s *)dev; uint32_t dblocksize; @@ -2750,7 +2750,7 @@ static void lpc17_40_default(void) * ****************************************************************************/ -FAR struct sdio_dev_s *sdio_initialize(int slotno) +struct sdio_dev_s *sdio_initialize(int slotno) { uint32_t regval; @@ -2832,7 +2832,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno) * ****************************************************************************/ -void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot) +void sdio_mediachange(struct sdio_dev_s *dev, bool cardinslot) { struct lpc17_40_dev_s *priv = (struct lpc17_40_dev_s *)dev; sdio_statset_t cdstatus; @@ -2879,7 +2879,7 @@ void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot) * ****************************************************************************/ -void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect) +void sdio_wrprotect(struct sdio_dev_s *dev, bool wrprotect) { struct lpc17_40_dev_s *priv = (struct lpc17_40_dev_s *)dev; irqstate_t flags; diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.h b/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.h index 450acd3995..0de065d578 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.h +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.h @@ -63,7 +63,7 @@ extern "C" ****************************************************************************/ struct sdio_dev_s; /* See include/nuttx/sdio.h */ -FAR struct sdio_dev_s *sdio_initialize(int slotno); +struct sdio_dev_s *sdio_initialize(int slotno); /**************************************************************************** * Name: sdio_mediachange @@ -84,7 +84,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno); * ****************************************************************************/ -void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot); +void sdio_mediachange(struct sdio_dev_s *dev, bool cardinslot); /**************************************************************************** * Name: sdio_wrprotect @@ -102,7 +102,7 @@ void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot); * ****************************************************************************/ -void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect); +void sdio_wrprotect(struct sdio_dev_s *dev, bool wrprotect); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_spi.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_spi.c index b6db132e46..c0342cfafd 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_spi.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_spi.c @@ -97,15 +97,15 @@ struct lpc17_40_spidev_s /* SPI methods */ -static int spi_lock(FAR struct spi_dev_s *dev, bool lock); -static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, +static int spi_lock(struct spi_dev_s *dev, bool lock); +static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency); -static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode); -static void spi_setbits(FAR struct spi_dev_s *dev, int nbits); -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 nwords); -static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, +static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode); +static void spi_setbits(struct spi_dev_s *dev, int nbits); +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 nwords); +static void spi_recvblock(struct spi_dev_s *dev, void *buffer, size_t nwords); /**************************************************************************** @@ -173,9 +173,9 @@ static struct lpc17_40_spidev_s g_spidev = * ****************************************************************************/ -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 lpc17_40_spidev_s *priv = (FAR struct lpc17_40_spidev_s *)dev; + struct lpc17_40_spidev_s *priv = (struct lpc17_40_spidev_s *)dev; int ret; if (lock) @@ -205,10 +205,10 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock) * ****************************************************************************/ -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 lpc17_40_spidev_s *priv = (FAR struct lpc17_40_spidev_s *)dev; + struct lpc17_40_spidev_s *priv = (struct lpc17_40_spidev_s *)dev; uint32_t divisor; uint32_t actual; @@ -276,9 +276,9 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) +static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) { - FAR struct lpc17_40_spidev_s *priv = (FAR struct lpc17_40_spidev_s *)dev; + struct lpc17_40_spidev_s *priv = (struct lpc17_40_spidev_s *)dev; uint32_t regval; /* Has the mode changed? */ @@ -335,9 +335,9 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) * ****************************************************************************/ -static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) +static void spi_setbits(struct spi_dev_s *dev, int nbits) { - FAR struct lpc17_40_spidev_s *priv = (FAR struct lpc17_40_spidev_s *)dev; + struct lpc17_40_spidev_s *priv = (struct lpc17_40_spidev_s *)dev; uint32_t regval; /* Has the number of bits changed? */ @@ -378,7 +378,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) * ****************************************************************************/ -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) { /* Write the data to transmitted to the SPI Data Register */ @@ -417,10 +417,10 @@ 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 nwords) +static void spi_sndblock(struct spi_dev_s *dev, + const void *buffer, size_t nwords) { - FAR uint8_t *ptr = (FAR uint8_t *)buffer; + uint8_t *ptr = (uint8_t *)buffer; uint8_t data; spiinfo("nwords: %d\n", nwords); @@ -465,10 +465,10 @@ 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 nwords) { - FAR uint8_t *ptr = (FAR uint8_t *)buffer; + uint8_t *ptr = (uint8_t *)buffer; spiinfo("nwords: %d\n", nwords); while (nwords) @@ -515,9 +515,9 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, * ****************************************************************************/ -FAR struct spi_dev_s *lpc17_40_spibus_initialize(int port) +struct spi_dev_s *lpc17_40_spibus_initialize(int port) { - FAR struct lpc17_40_spidev_s *priv = &g_spidev; + struct lpc17_40_spidev_s *priv = &g_spidev; irqstate_t flags; uint32_t regval; @@ -562,7 +562,7 @@ FAR struct spi_dev_s *lpc17_40_spibus_initialize(int port) /* Select a default frequency of approx. 400KHz */ - spi_setfrequency((FAR struct spi_dev_s *)priv, 400000); + spi_setfrequency((struct spi_dev_s *)priv, 400000); /* Initialize the SPI semaphore that enforces mutually exclusive access */ diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_spi.h b/arch/arm/src/lpc17xx_40xx/lpc17_40_spi.h index 6d30511019..2705584ef5 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_spi.h +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_spi.h @@ -71,7 +71,7 @@ struct spi_dev_s; /* Forward reference */ * ****************************************************************************/ -FAR struct spi_dev_s *lpc17_40_spibus_initialize(int port); +struct spi_dev_s *lpc17_40_spibus_initialize(int port); /**************************************************************************** * Name: lpc17_40_spiselect, lpc17_40_status, and lpc17_40_spicmddata @@ -103,11 +103,11 @@ FAR struct spi_dev_s *lpc17_40_spibus_initialize(int port); * ****************************************************************************/ -void lpc17_40_spiselect(FAR struct spi_dev_s *dev, +void lpc17_40_spiselect(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t lpc17_40_spistatus(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t lpc17_40_spistatus(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int lpc17_40_spicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int lpc17_40_spicmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif /**************************************************************************** @@ -126,7 +126,7 @@ int lpc17_40_spicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); * ****************************************************************************/ -void spi_flush(FAR struct spi_dev_s *dev); +void spi_flush(struct spi_dev_s *dev); /**************************************************************************** * Name: lpc17_40_spiregister @@ -149,9 +149,9 @@ void spi_flush(FAR struct spi_dev_s *dev); ****************************************************************************/ #ifdef CONFIG_SPI_CALLBACK -int lpc17_40_spiregister(FAR struct spi_dev_s *dev, +int lpc17_40_spiregister(struct spi_dev_s *dev, spi_mediachange_t callback, - FAR void *arg); + void *arg); #endif #if defined(__cplusplus) diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.c index 37dca3ffc2..2047883a36 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.c @@ -115,34 +115,34 @@ struct lpc17_40_sspdev_s /* Helpers */ -static inline uint32_t ssp_getreg(FAR struct lpc17_40_sspdev_s *priv, +static inline uint32_t ssp_getreg(struct lpc17_40_sspdev_s *priv, uint8_t offset); -static inline void ssp_putreg(FAR struct lpc17_40_sspdev_s *priv, +static inline void ssp_putreg(struct lpc17_40_sspdev_s *priv, uint8_t offset, uint32_t value); /* SPI methods */ -static int ssp_lock(FAR struct spi_dev_s *dev, bool lock); -static uint32_t ssp_setfrequency(FAR struct spi_dev_s *dev, +static int ssp_lock(struct spi_dev_s *dev, bool lock); +static uint32_t ssp_setfrequency(struct spi_dev_s *dev, uint32_t frequency); -static void ssp_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode); -static void ssp_setbits(FAR struct spi_dev_s *dev, int nbits); -static uint32_t ssp_send(FAR struct spi_dev_s *dev, uint32_t wd); -static void ssp_sndblock(FAR struct spi_dev_s *dev, - FAR const void *buffer, size_t nwords); -static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, +static void ssp_setmode(struct spi_dev_s *dev, enum spi_mode_e mode); +static void ssp_setbits(struct spi_dev_s *dev, int nbits); +static uint32_t ssp_send(struct spi_dev_s *dev, uint32_t wd); +static void ssp_sndblock(struct spi_dev_s *dev, + const void *buffer, size_t nwords); +static void ssp_recvblock(struct spi_dev_s *dev, void *buffer, size_t nwords); /* Initialization */ #ifdef CONFIG_LPC17_40_SSP0 -static inline FAR struct lpc17_40_sspdev_s *lpc17_40_ssp0initialize(void); +static inline struct lpc17_40_sspdev_s *lpc17_40_ssp0initialize(void); #endif #ifdef CONFIG_LPC17_40_SSP1 -static inline FAR struct lpc17_40_sspdev_s *lpc17_40_ssp1initialize(void); +static inline struct lpc17_40_sspdev_s *lpc17_40_ssp1initialize(void); #endif #ifdef CONFIG_LPC17_40_SSP2 -static inline FAR struct lpc17_40_sspdev_s *lpc17_40_ssp2initialize(void); +static inline struct lpc17_40_sspdev_s *lpc17_40_ssp2initialize(void); #endif /**************************************************************************** @@ -280,7 +280,7 @@ static struct lpc17_40_sspdev_s g_ssp2dev = * ****************************************************************************/ -static inline uint32_t ssp_getreg(FAR struct lpc17_40_sspdev_s *priv, +static inline uint32_t ssp_getreg(struct lpc17_40_sspdev_s *priv, uint8_t offset) { return getreg32(priv->sspbase + (uint32_t)offset); @@ -302,7 +302,7 @@ static inline uint32_t ssp_getreg(FAR struct lpc17_40_sspdev_s *priv, * ****************************************************************************/ -static inline void ssp_putreg(FAR struct lpc17_40_sspdev_s *priv, +static inline void ssp_putreg(struct lpc17_40_sspdev_s *priv, uint8_t offset, uint32_t value) { putreg32(value, priv->sspbase + (uint32_t)offset); @@ -329,9 +329,9 @@ static inline void ssp_putreg(FAR struct lpc17_40_sspdev_s *priv, * ****************************************************************************/ -static int ssp_lock(FAR struct spi_dev_s *dev, bool lock) +static int ssp_lock(struct spi_dev_s *dev, bool lock) { - FAR struct lpc17_40_sspdev_s *priv = (FAR struct lpc17_40_sspdev_s *)dev; + struct lpc17_40_sspdev_s *priv = (struct lpc17_40_sspdev_s *)dev; int ret; if (lock) @@ -361,10 +361,10 @@ static int ssp_lock(FAR struct spi_dev_s *dev, bool lock) * ****************************************************************************/ -static uint32_t ssp_setfrequency(FAR struct spi_dev_s *dev, +static uint32_t ssp_setfrequency(struct spi_dev_s *dev, uint32_t frequency) { - FAR struct lpc17_40_sspdev_s *priv = (FAR struct lpc17_40_sspdev_s *)dev; + struct lpc17_40_sspdev_s *priv = (struct lpc17_40_sspdev_s *)dev; uint32_t cpsdvsr; uint32_t scr; uint32_t regval; @@ -467,9 +467,9 @@ static uint32_t ssp_setfrequency(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void ssp_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) +static void ssp_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) { - FAR struct lpc17_40_sspdev_s *priv = (FAR struct lpc17_40_sspdev_s *)dev; + struct lpc17_40_sspdev_s *priv = (struct lpc17_40_sspdev_s *)dev; uint32_t regval; /* Has the mode changed? */ @@ -527,9 +527,9 @@ static void ssp_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) * ****************************************************************************/ -static void ssp_setbits(FAR struct spi_dev_s *dev, int nbits) +static void ssp_setbits(struct spi_dev_s *dev, int nbits) { - FAR struct lpc17_40_sspdev_s *priv = (FAR struct lpc17_40_sspdev_s *)dev; + struct lpc17_40_sspdev_s *priv = (struct lpc17_40_sspdev_s *)dev; uint32_t regval; /* Has the number of bits changed? */ @@ -569,9 +569,9 @@ static void ssp_setbits(FAR struct spi_dev_s *dev, int nbits) * ****************************************************************************/ -static uint32_t ssp_send(FAR struct spi_dev_s *dev, uint32_t wd) +static uint32_t ssp_send(struct spi_dev_s *dev, uint32_t wd) { - FAR struct lpc17_40_sspdev_s *priv = (FAR struct lpc17_40_sspdev_s *)dev; + struct lpc17_40_sspdev_s *priv = (struct lpc17_40_sspdev_s *)dev; register uint32_t regval; /* Wait while the TX FIFO is full */ @@ -613,15 +613,15 @@ static uint32_t ssp_send(FAR struct spi_dev_s *dev, uint32_t wd) * ****************************************************************************/ -static void ssp_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, +static void ssp_sndblock(struct spi_dev_s *dev, const void *buffer, size_t nwords) { - FAR struct lpc17_40_sspdev_s *priv = (FAR struct lpc17_40_sspdev_s *)dev; + struct lpc17_40_sspdev_s *priv = (struct lpc17_40_sspdev_s *)dev; union { - FAR const uint8_t *p8; - FAR const uint16_t *p16; - FAR const void *pv; + const uint8_t *p8; + const uint16_t *p16; + const void *pv; } u; uint32_t data; @@ -706,15 +706,15 @@ static void ssp_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, * ****************************************************************************/ -static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, +static void ssp_recvblock(struct spi_dev_s *dev, void *buffer, size_t nwords) { - FAR struct lpc17_40_sspdev_s *priv = (FAR struct lpc17_40_sspdev_s *)dev; + struct lpc17_40_sspdev_s *priv = (struct lpc17_40_sspdev_s *)dev; union { - FAR uint8_t *p8; - FAR uint16_t *p16; - FAR void *pv; + uint8_t *p8; + uint16_t *p16; + void *pv; } u; uint32_t data; @@ -780,7 +780,7 @@ static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, ****************************************************************************/ #ifdef CONFIG_LPC17_40_SSP0 -static inline FAR struct lpc17_40_sspdev_s *lpc17_40_ssp0initialize(void) +static inline struct lpc17_40_sspdev_s *lpc17_40_ssp0initialize(void) { irqstate_t flags; uint32_t regval; @@ -834,7 +834,7 @@ static inline FAR struct lpc17_40_sspdev_s *lpc17_40_ssp0initialize(void) ****************************************************************************/ #ifdef CONFIG_LPC17_40_SSP1 -static inline FAR struct lpc17_40_sspdev_s *lpc17_40_ssp1initialize(void) +static inline struct lpc17_40_sspdev_s *lpc17_40_ssp1initialize(void) { irqstate_t flags; uint32_t regval; @@ -888,7 +888,7 @@ static inline FAR struct lpc17_40_sspdev_s *lpc17_40_ssp1initialize(void) ****************************************************************************/ #ifdef CONFIG_LPC17_40_SSP2 -static inline FAR struct lpc17_40_sspdev_s *lpc17_40_ssp2initialize(void) +static inline struct lpc17_40_sspdev_s *lpc17_40_ssp2initialize(void) { irqstate_t flags; uint32_t regval; @@ -944,9 +944,9 @@ static inline FAR struct lpc17_40_sspdev_s *lpc17_40_ssp2initialize(void) * ****************************************************************************/ -FAR struct spi_dev_s *lpc17_40_sspbus_initialize(int port) +struct spi_dev_s *lpc17_40_sspbus_initialize(int port) { - FAR struct lpc17_40_sspdev_s *priv; + struct lpc17_40_sspdev_s *priv; uint32_t regval; int i; @@ -991,7 +991,7 @@ FAR struct spi_dev_s *lpc17_40_sspbus_initialize(int port) /* Select a default frequency of approx. 400KHz */ - ssp_setfrequency((FAR struct spi_dev_s *)priv, 400000); + ssp_setfrequency((struct spi_dev_s *)priv, 400000); /* Initialize the SPI semaphore that enforces mutually exclusive access */ @@ -1024,9 +1024,9 @@ FAR struct spi_dev_s *lpc17_40_sspbus_initialize(int port) * ****************************************************************************/ -void ssp_flush(FAR struct spi_dev_s *dev) +void ssp_flush(struct spi_dev_s *dev) { - FAR struct lpc17_40_sspdev_s *priv = (FAR struct lpc17_40_sspdev_s *)dev; + struct lpc17_40_sspdev_s *priv = (struct lpc17_40_sspdev_s *)dev; /* Wait for the TX FIFO not full indication */ diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.h b/arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.h index c8ecd40926..50eebfc791 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.h +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.h @@ -65,7 +65,7 @@ extern "C" * ****************************************************************************/ -FAR struct spi_dev_s *lpc17_40_sspbus_initialize(int port); +struct spi_dev_s *lpc17_40_sspbus_initialize(int port); /**************************************************************************** * Name: @@ -100,21 +100,21 @@ FAR struct spi_dev_s *lpc17_40_sspbus_initialize(int port); ****************************************************************************/ #ifdef CONFIG_LPC17_40_SSP0 -void lpc17_40_ssp0select(FAR struct spi_dev_s *dev, +void lpc17_40_ssp0select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t lpc17_40_ssp0status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t lpc17_40_ssp0status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int lpc17_40_ssp0cmddata(FAR struct spi_dev_s *dev, +int lpc17_40_ssp0cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_LPC17_40_SSP1 -void lpc17_40_ssp1select(FAR struct spi_dev_s *dev, +void lpc17_40_ssp1select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t lpc17_40_ssp1status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t lpc17_40_ssp1status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int lpc17_40_ssp1cmddata(FAR struct spi_dev_s *dev, +int lpc17_40_ssp1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif @@ -136,7 +136,7 @@ int lpc17_40_ssp1cmddata(FAR struct spi_dev_s *dev, ****************************************************************************/ #if defined(CONFIG_LPC17_40_SSP0) || defined(CONFIG_LPC17_40_SSP1) -void ssp_flush(FAR struct spi_dev_s *dev); +void ssp_flush(struct spi_dev_s *dev); #endif /**************************************************************************** @@ -161,15 +161,15 @@ void ssp_flush(FAR struct spi_dev_s *dev); #ifdef CONFIG_SPI_CALLBACK #ifdef CONFIG_LPC17_40_SSP0 -int lpc17_40_ssp0register(FAR struct spi_dev_s *dev, +int lpc17_40_ssp0register(struct spi_dev_s *dev, spi_mediachange_t callback, - FAR void *arg); + void *arg); #endif #ifdef CONFIG_LPC17_40_SSP1 -int lpc17_40_ssp1register(FAR struct spi_dev_s *dev, +int lpc17_40_ssp1register(struct spi_dev_s *dev, spi_mediachange_t callback, - FAR void *arg); + void *arg); #endif #endif diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_timer.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_timer.c index f6657359ad..64d19c8781 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_timer.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_timer.c @@ -81,14 +81,14 @@ struct lpc17_40_timer_s { - FAR const struct pwm_ops_s *ops; /* PWM operations */ - uint8_t timid; /* Timer ID {0,...,7} */ - uint8_t channel; /* Timer output channel: {1,..4} */ - uint8_t timtype; /* See the TIMTYPE_* definitions */ - uint32_t base; /* The base address of the timer */ - uint32_t pincfg; /* Output pin configuration */ - uint32_t pclk; /* The frequency of the peripheral clock - * that drives the timer module. */ + const struct pwm_ops_s *ops; /* PWM operations */ + uint8_t timid; /* Timer ID {0,...,7} */ + uint8_t channel; /* Timer output channel: {1,..4} */ + uint8_t timtype; /* See the TIMTYPE_* definitions */ + uint32_t base; /* The base address of the timer */ + uint32_t pincfg; /* Output pin configuration */ + uint32_t pclk; /* The frequency of the peripheral clock + * that drives the timer module. */ }; /**************************************************************************** @@ -103,27 +103,27 @@ static void timer_putreg(struct lpc17_40_timer_s *priv, #ifdef CONFIG_DEBUG_PWM_INFO static void timer_dumpregs(struct lpc17_40_timer_s *priv, - FAR const char *msg); + const char *msg); #else # define timer_dumpregs(priv,msg) #endif /* Timer management */ -static int timer_timer(FAR struct lpc17_40_timer_s *priv, - FAR const struct pwm_info_s *info); +static int timer_timer(struct lpc17_40_timer_s *priv, + const struct pwm_info_s *info); /* PWM driver methods */ -static int timer_setup(FAR struct pwm_lowerhalf_s *dev); -static int timer_shutdown(FAR struct pwm_lowerhalf_s *dev); +static int timer_setup(struct pwm_lowerhalf_s *dev); +static int timer_shutdown(struct pwm_lowerhalf_s *dev); -static int timer_start(FAR struct pwm_lowerhalf_s *dev, - FAR const struct pwm_info_s *info); +static int timer_start(struct pwm_lowerhalf_s *dev, + const struct pwm_info_s *info); -static int timer_stop(FAR struct pwm_lowerhalf_s *dev); -static int timer_ioctl(FAR struct pwm_lowerhalf_s *dev, - int cmd, unsigned long arg); +static int timer_stop(struct pwm_lowerhalf_s *dev); +static int timer_ioctl(struct pwm_lowerhalf_s *dev, + int cmd, unsigned long arg); /**************************************************************************** * Private Data @@ -216,7 +216,7 @@ static void timer_putreg(struct lpc17_40_timer_s *priv, int offset, #ifdef CONFIG_DEBUG_PWM_INFO static void timer_dumpregs(struct lpc17_40_timer_s *priv, - FAR const char *msg) + const char *msg) { pwminfo("%s:\n", msg); pwminfo(" CR1: %04x CR2: %04x SMCR: %04x DIER: %04x\n", @@ -258,8 +258,8 @@ static void timer_dumpregs(struct lpc17_40_timer_s *priv, * ****************************************************************************/ -static int timer_timer(FAR struct lpc17_40_timer_s *priv, - FAR const struct pwm_info_s *info) +static int timer_timer(struct lpc17_40_timer_s *priv, + const struct pwm_info_s *info) { irqstate_t flags; uint32_t regval; @@ -353,9 +353,9 @@ static int timer_tim1interrupt(int irq, void *context) * ****************************************************************************/ -static int timer_setup(FAR struct pwm_lowerhalf_s *dev) +static int timer_setup(struct pwm_lowerhalf_s *dev) { - FAR struct lpc17_40_timer_s *priv = (FAR struct lpc17_40_timer_s *)dev; + struct lpc17_40_timer_s *priv = (struct lpc17_40_timer_s *)dev; irqstate_t flags; uint32_t regval; @@ -442,9 +442,9 @@ static int timer_setup(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int timer_shutdown(FAR struct pwm_lowerhalf_s *dev) +static int timer_shutdown(struct pwm_lowerhalf_s *dev) { - FAR struct lpc17_40_timer_s *priv = (FAR struct lpc17_40_timer_s *)dev; + struct lpc17_40_timer_s *priv = (struct lpc17_40_timer_s *)dev; uint32_t pincfg; pwminfo("TIM%d pincfg: %08x\n", priv->timid, priv->pincfg); @@ -469,10 +469,10 @@ static int timer_shutdown(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int timer_start(FAR struct pwm_lowerhalf_s *dev, - FAR const struct pwm_info_s *info) +static int timer_start(struct pwm_lowerhalf_s *dev, + const struct pwm_info_s *info) { - FAR struct lpc17_40_timer_s *priv = (FAR struct lpc17_40_timer_s *)dev; + struct lpc17_40_timer_s *priv = (struct lpc17_40_timer_s *)dev; return timer_timer(priv, info); } @@ -495,9 +495,9 @@ static int timer_start(FAR struct pwm_lowerhalf_s *dev, * ****************************************************************************/ -static int timer_stop(FAR struct pwm_lowerhalf_s *dev) +static int timer_stop(struct pwm_lowerhalf_s *dev) { - FAR struct lpc17_40_timer_s *priv = (FAR struct lpc17_40_timer_s *)dev; + struct lpc17_40_timer_s *priv = (struct lpc17_40_timer_s *)dev; uint32_t resetbit; uint32_t regaddr; uint32_t regval; @@ -550,11 +550,11 @@ static int timer_stop(FAR struct pwm_lowerhalf_s *dev) * ****************************************************************************/ -static int timer_ioctl(FAR struct pwm_lowerhalf_s *dev, +static int timer_ioctl(struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg) { #ifdef CONFIG_DEBUG_PWM_INFO - FAR struct lpc17_40_timer_s *priv = (FAR struct lpc17_40_timer_s *)dev; + struct lpc17_40_timer_s *priv = (struct lpc17_40_timer_s *)dev; /* There are no platform-specific ioctl commands */ @@ -584,9 +584,9 @@ static int timer_ioctl(FAR struct pwm_lowerhalf_s *dev, * ****************************************************************************/ -FAR struct pwm_lowerhalf_s *lpc17_40_timerinitialize(int timer) +struct pwm_lowerhalf_s *lpc17_40_timerinitialize(int timer) { - FAR struct lpc17_40_timer_s *lower; + struct lpc17_40_timer_s *lower; pwminfo("TIM%d\n", timer); @@ -606,7 +606,7 @@ FAR struct pwm_lowerhalf_s *lpc17_40_timerinitialize(int timer) return NULL; } - return (FAR struct pwm_lowerhalf_s *)lower; + return (struct pwm_lowerhalf_s *)lower; } #endif /* CONFIG_LPC17_40_TIMn_TIMER, n = 1,...,14 */ diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_usbdev.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_usbdev.c index 6ac05468b9..06dd1ec2e9 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_usbdev.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_usbdev.c @@ -375,10 +375,10 @@ static uint32_t lpc17_40_usbcmd(uint16_t cmd, uint8_t data); /* Request queue operations *************************************************/ -static FAR -struct lpc17_40_req_s *lpc17_40_rqdequeue(FAR struct lpc17_40_ep_s *privep); -static void lpc17_40_rqenqueue(FAR struct lpc17_40_ep_s *privep, - FAR struct lpc17_40_req_s *req); +static +struct lpc17_40_req_s *lpc17_40_rqdequeue(struct lpc17_40_ep_s *privep); +static void lpc17_40_rqenqueue(struct lpc17_40_ep_s *privep, + struct lpc17_40_req_s *req); /* Low level data transfers and request operations **************************/ @@ -413,7 +413,7 @@ static inline void lpc17_40_ep0dataoutinterrupt(struct lpc17_40_usbdev_s *priv); static inline void lpc17_40_ep0dataininterrupt(struct lpc17_40_usbdev_s *priv); -static int lpc17_40_usbinterrupt(int irq, FAR void *context, FAR void *arg); +static int lpc17_40_usbinterrupt(int irq, void *context, void *arg); #ifdef CONFIG_LPC17_40_USBDEV_DMA static int lpc17_40_dmasetup(struct lpc17_40_usbdev_s *priv, uint8_t epphy, @@ -425,30 +425,29 @@ static void lpc17_40_dmadisable(uint8_t epphy); /* Endpoint operations ******************************************************/ -static int lpc17_40_epconfigure(FAR struct usbdev_ep_s *ep, +static int lpc17_40_epconfigure(struct usbdev_ep_s *ep, const struct usb_epdesc_s *desc, bool last); -static int lpc17_40_epdisable(FAR struct usbdev_ep_s *ep); -static FAR -struct usbdev_req_s *lpc17_40_epallocreq(FAR struct usbdev_ep_s *ep); -static void lpc17_40_epfreereq(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *); +static int lpc17_40_epdisable(struct usbdev_ep_s *ep); +static struct usbdev_req_s *lpc17_40_epallocreq(struct usbdev_ep_s *ep); +static void lpc17_40_epfreereq(struct usbdev_ep_s *ep, + struct usbdev_req_s *); #ifdef CONFIG_USBDEV_DMA -static FAR void *lpc17_40_epallocbuffer(FAR struct usbdev_ep_s *ep, +static void *lpc17_40_epallocbuffer(struct usbdev_ep_s *ep, uint16_t nbytes); -static void lpc17_40_epfreebuffer(FAR struct usbdev_ep_s *ep, void *buf); +static void lpc17_40_epfreebuffer(struct usbdev_ep_s *ep, void *buf); #endif -static int lpc17_40_epsubmit(FAR struct usbdev_ep_s *ep, +static int lpc17_40_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req); -static int lpc17_40_epcancel(FAR struct usbdev_ep_s *ep, +static int lpc17_40_epcancel(struct usbdev_ep_s *ep, struct usbdev_req_s *req); -static int lpc17_40_epstall(FAR struct usbdev_ep_s *ep, bool resume); +static int lpc17_40_epstall(struct usbdev_ep_s *ep, bool resume); /* USB device controller operations *****************************************/ -static FAR struct usbdev_ep_s *lpc17_40_allocep(FAR struct usbdev_s *dev, +static struct usbdev_ep_s *lpc17_40_allocep(struct usbdev_s *dev, uint8_t epno, bool in, uint8_t eptype); -static void lpc17_40_freeep(FAR struct usbdev_s *dev, - FAR struct usbdev_ep_s *ep); +static void lpc17_40_freeep(struct usbdev_s *dev, + struct usbdev_ep_s *ep); static int lpc17_40_getframe(struct usbdev_s *dev); static int lpc17_40_wakeup(struct usbdev_s *dev); static int lpc17_40_selfpowered(struct usbdev_s *dev, bool selfpowered); @@ -810,10 +809,10 @@ static uint32_t lpc17_40_usbcmd(uint16_t cmd, uint8_t data) * ****************************************************************************/ -static FAR -struct lpc17_40_req_s *lpc17_40_rqdequeue(FAR struct lpc17_40_ep_s *privep) +static +struct lpc17_40_req_s *lpc17_40_rqdequeue(struct lpc17_40_ep_s *privep) { - FAR struct lpc17_40_req_s *ret = privep->head; + struct lpc17_40_req_s *ret = privep->head; if (ret) { @@ -837,8 +836,8 @@ struct lpc17_40_req_s *lpc17_40_rqdequeue(FAR struct lpc17_40_ep_s *privep) * ****************************************************************************/ -static void lpc17_40_rqenqueue(FAR struct lpc17_40_ep_s *privep, - FAR struct lpc17_40_req_s *req) +static void lpc17_40_rqenqueue(struct lpc17_40_ep_s *privep, + struct lpc17_40_req_s *req) { req->flink = NULL; if (!privep->head) @@ -2115,7 +2114,7 @@ void lpc17_40_ep0dataininterrupt(struct lpc17_40_usbdev_s *priv) * ****************************************************************************/ -static int lpc17_40_usbinterrupt(int irq, FAR void *context, FAR void *arg) +static int lpc17_40_usbinterrupt(int irq, void *context, void *arg) { struct lpc17_40_usbdev_s *priv = &g_usbdev; struct lpc17_40_ep_s *privep ; @@ -2656,11 +2655,11 @@ static void lpc17_40_dmadisable(uint8_t epphy) * ****************************************************************************/ -static int lpc17_40_epconfigure(FAR struct usbdev_ep_s *ep, - FAR const struct usb_epdesc_s *desc, - bool last) +static int lpc17_40_epconfigure(struct usbdev_ep_s *ep, + const struct usb_epdesc_s *desc, + bool last) { - FAR struct lpc17_40_ep_s *privep = (FAR struct lpc17_40_ep_s *)ep; + struct lpc17_40_ep_s *privep = (struct lpc17_40_ep_s *)ep; uint32_t inten; usbtrace(TRACE_EPCONFIGURE, privep->epphy); @@ -2707,9 +2706,9 @@ static int lpc17_40_epconfigure(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int lpc17_40_epdisable(FAR struct usbdev_ep_s *ep) +static int lpc17_40_epdisable(struct usbdev_ep_s *ep) { - FAR struct lpc17_40_ep_s *privep = (FAR struct lpc17_40_ep_s *)ep; + struct lpc17_40_ep_s *privep = (struct lpc17_40_ep_s *)ep; irqstate_t flags; uint32_t mask = (1 << privep->epphy); uint32_t regval; @@ -2753,10 +2752,9 @@ static int lpc17_40_epdisable(FAR struct usbdev_ep_s *ep) * ****************************************************************************/ -static FAR -struct usbdev_req_s *lpc17_40_epallocreq(FAR struct usbdev_ep_s *ep) +static struct usbdev_req_s *lpc17_40_epallocreq(struct usbdev_ep_s *ep) { - FAR struct lpc17_40_req_s *privreq; + struct lpc17_40_req_s *privreq; #ifdef CONFIG_DEBUG_USB if (!ep) @@ -2766,9 +2764,9 @@ struct usbdev_req_s *lpc17_40_epallocreq(FAR struct usbdev_ep_s *ep) } #endif - usbtrace(TRACE_EPALLOCREQ, ((FAR struct lpc17_40_ep_s *)ep)->epphy); + usbtrace(TRACE_EPALLOCREQ, ((struct lpc17_40_ep_s *)ep)->epphy); - privreq = (FAR struct lpc17_40_req_s *) + privreq = (struct lpc17_40_req_s *) kmm_malloc(sizeof(struct lpc17_40_req_s)); if (!privreq) { @@ -2788,10 +2786,10 @@ struct usbdev_req_s *lpc17_40_epallocreq(FAR struct usbdev_ep_s *ep) * ****************************************************************************/ -static void lpc17_40_epfreereq(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static void lpc17_40_epfreereq(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct lpc17_40_req_s *privreq = (FAR struct lpc17_40_req_s *)req; + struct lpc17_40_req_s *privreq = (struct lpc17_40_req_s *)req; #ifdef CONFIG_DEBUG_USB if (!ep || !req) @@ -2801,7 +2799,7 @@ static void lpc17_40_epfreereq(FAR struct usbdev_ep_s *ep, } #endif - usbtrace(TRACE_EPFREEREQ, ((FAR struct lpc17_40_ep_s *)ep)->epphy); + usbtrace(TRACE_EPFREEREQ, ((struct lpc17_40_ep_s *)ep)->epphy); kmm_free(privreq); } @@ -2815,12 +2813,12 @@ static void lpc17_40_epfreereq(FAR struct usbdev_ep_s *ep, ****************************************************************************/ #ifdef CONFIG_USBDEV_DMA -static FAR void *lpc17_40_epallocbuffer(FAR struct usbdev_ep_s *ep, - uint16_t nbytes) +static void *lpc17_40_epallocbuffer(struct usbdev_ep_s *ep, + uint16_t nbytes) { #if defined(CONFIG_LPC17_40_USBDEV_DMA) - FAR struct lpc17_40_ep_s *privep = (FAR struct lpc17_40_ep_s *)ep; + struct lpc17_40_ep_s *privep = (struct lpc17_40_ep_s *)ep; int descndx; usbtrace(TRACE_EPALLOCBUFFER, privep->epphy); @@ -2857,12 +2855,12 @@ static FAR void *lpc17_40_epallocbuffer(FAR struct usbdev_ep_s *ep, ****************************************************************************/ #ifdef CONFIG_USBDEV_DMA -static void lpc17_40_epfreebuffer(FAR struct usbdev_ep_s *ep, - FAR void *buf) +static void lpc17_40_epfreebuffer(struct usbdev_ep_s *ep, + void *buf) { #if defined(CONFIG_LPC17_40_USBDEV_DMA) - FAR struct lpc17_40_ep_s *privep = (FAR struct lpc17_40_ep_s *)ep; + struct lpc17_40_ep_s *privep = (struct lpc17_40_ep_s *)ep; usbtrace(TRACE_EPFREEBUFFER, privep->epphy); @@ -2898,12 +2896,12 @@ static void lpc17_40_epfreebuffer(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int lpc17_40_epsubmit(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static int lpc17_40_epsubmit(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct lpc17_40_req_s *privreq = (FAR struct lpc17_40_req_s *)req; - FAR struct lpc17_40_ep_s *privep = (FAR struct lpc17_40_ep_s *)ep; - FAR struct lpc17_40_usbdev_s *priv; + struct lpc17_40_req_s *privreq = (struct lpc17_40_req_s *)req; + struct lpc17_40_ep_s *privep = (struct lpc17_40_ep_s *)ep; + struct lpc17_40_usbdev_s *priv; irqstate_t flags; int ret = OK; @@ -2989,10 +2987,10 @@ static int lpc17_40_epsubmit(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int lpc17_40_epcancel(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static int lpc17_40_epcancel(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct lpc17_40_ep_s *privep = (FAR struct lpc17_40_ep_s *)ep; + struct lpc17_40_ep_s *privep = (struct lpc17_40_ep_s *)ep; irqstate_t flags; #ifdef CONFIG_DEBUG_USB @@ -3019,9 +3017,9 @@ static int lpc17_40_epcancel(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int lpc17_40_epstall(FAR struct usbdev_ep_s *ep, bool resume) +static int lpc17_40_epstall(struct usbdev_ep_s *ep, bool resume) { - FAR struct lpc17_40_ep_s *privep = (FAR struct lpc17_40_ep_s *)ep; + struct lpc17_40_ep_s *privep = (struct lpc17_40_ep_s *)ep; irqstate_t flags; /* STALL or RESUME the endpoint */ @@ -3063,11 +3061,11 @@ static int lpc17_40_epstall(FAR struct usbdev_ep_s *ep, bool resume) * ****************************************************************************/ -static FAR struct usbdev_ep_s *lpc17_40_allocep(FAR struct usbdev_s *dev, - uint8_t eplog, - bool in, uint8_t eptype) +static struct usbdev_ep_s *lpc17_40_allocep(struct usbdev_s *dev, + uint8_t eplog, + bool in, uint8_t eptype) { - FAR struct lpc17_40_usbdev_s *priv = (FAR struct lpc17_40_usbdev_s *)dev; + struct lpc17_40_usbdev_s *priv = (struct lpc17_40_usbdev_s *)dev; uint32_t epset = LPC17_40_EPALLSET & ~LPC17_40_EPCTRLSET; irqstate_t flags; int epndx = 0; @@ -3189,11 +3187,11 @@ static FAR struct usbdev_ep_s *lpc17_40_allocep(FAR struct usbdev_s *dev, * ****************************************************************************/ -static void lpc17_40_freeep(FAR struct usbdev_s *dev, - FAR struct usbdev_ep_s *ep) +static void lpc17_40_freeep(struct usbdev_s *dev, + struct usbdev_ep_s *ep) { - FAR struct lpc17_40_usbdev_s *priv = (FAR struct lpc17_40_usbdev_s *)dev; - FAR struct lpc17_40_ep_s *privep = (FAR struct lpc17_40_ep_s *)ep; + struct lpc17_40_usbdev_s *priv = (struct lpc17_40_usbdev_s *)dev; + struct lpc17_40_ep_s *privep = (struct lpc17_40_ep_s *)ep; irqstate_t flags; usbtrace(TRACE_DEVFREEEP, (uint16_t)privep->epphy); @@ -3219,7 +3217,7 @@ static void lpc17_40_freeep(FAR struct usbdev_s *dev, static int lpc17_40_getframe(struct usbdev_s *dev) { #ifdef CONFIG_LPC17_40_USBDEV_FRAME_INTERRUPT - FAR struct lpc17_40_usbdev_s *priv = (FAR struct lpc17_40_usbdev_s *)dev; + struct lpc17_40_usbdev_s *priv = (struct lpc17_40_usbdev_s *)dev; /* Return last valid value of SOF read by the interrupt handler */ @@ -3269,7 +3267,7 @@ static int lpc17_40_wakeup(struct usbdev_s *dev) static int lpc17_40_selfpowered(struct usbdev_s *dev, bool selfpowered) { - FAR struct lpc17_40_usbdev_s *priv = (FAR struct lpc17_40_usbdev_s *)dev; + struct lpc17_40_usbdev_s *priv = (struct lpc17_40_usbdev_s *)dev; usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered); diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.c index 0f25c3a4cd..fce8573018 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.c @@ -339,7 +339,7 @@ static int lpc17_40_ctrltd(struct lpc17_40_usbhost_s *priv, /* Interrupt handling *******************************************************/ -static int lpc17_40_usbinterrupt(int irq, void *context, FAR void *arg); +static int lpc17_40_usbinterrupt(int irq, void *context, void *arg); /* USB host controller operations *******************************************/ @@ -386,16 +386,16 @@ static ssize_t lpc17_40_transfer(struct usbhost_driver_s *drvr, #ifdef CONFIG_USBHOST_ASYNCH static void lpc17_40_asynch_completion(struct lpc17_40_usbhost_s *priv, struct lpc17_40_ed_s *ed); -static int lpc17_40_asynch(FAR struct usbhost_driver_s *drvr, - usbhost_ep_t ep, FAR uint8_t *buffer, +static int lpc17_40_asynch(struct usbhost_driver_s *drvr, + usbhost_ep_t ep, uint8_t *buffer, size_t buflen, usbhost_asynch_t callback, - FAR void *arg); + void *arg); #endif -static int lpc17_40_cancel(FAR struct usbhost_driver_s *drvr, +static int lpc17_40_cancel(struct usbhost_driver_s *drvr, usbhost_ep_t ep); #ifdef CONFIG_USBHOST_HUB -static int lpc17_40_connect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport, +static int lpc17_40_connect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport, bool connected); #endif static void lpc17_40_disconnect(struct usbhost_driver_s *drvr, @@ -1322,9 +1322,9 @@ static inline int lpc17_40_reminted(struct lpc17_40_usbhost_s *priv, struct lpc17_40_ed_s *head; struct lpc17_40_ed_s *curr; struct lpc17_40_ed_s *prev; - unsigned int interval; - unsigned int offset; - uint32_t regval; + unsigned int interval; + unsigned int offset; + uint32_t regval; /* Disable periodic list processing. Does this take effect immediately? * Or at the next SOF... need to check. @@ -1680,7 +1680,7 @@ errout_with_xfrinfo: * ****************************************************************************/ -static int lpc17_40_usbinterrupt(int irq, void *context, FAR void *arg) +static int lpc17_40_usbinterrupt(int irq, void *context, void *arg) { struct lpc17_40_usbhost_s *priv = &g_usbhost; struct lpc17_40_ed_s *ed; @@ -2141,8 +2141,8 @@ static int lpc17_40_rh_enumerate(struct usbhost_connection_s *conn, return OK; } -static int lpc17_40_enumerate(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport) +static int lpc17_40_enumerate(struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport) { int ret; @@ -2435,7 +2435,7 @@ static int lpc17_40_epfree(struct usbhost_driver_s *drvr, usbhost_ep_t ep) { struct lpc17_40_usbhost_s *priv = (struct lpc17_40_usbhost_s *)drvr; struct lpc17_40_ed_s *ed = (struct lpc17_40_ed_s *)ep; - int ret; + int ret; /* There should not be any pending, real TDs linked to this ED */ @@ -3452,7 +3452,7 @@ errout_with_sem: * ****************************************************************************/ -static int lpc17_40_cancel(FAR struct usbhost_driver_s *drvr, +static int lpc17_40_cancel(struct usbhost_driver_s *drvr, usbhost_ep_t ep) { #ifdef CONFIG_USBHOST_ASYNCH @@ -3607,8 +3607,8 @@ static int lpc17_40_cancel(FAR struct usbhost_driver_s *drvr, ****************************************************************************/ #ifdef CONFIG_USBHOST_HUB -static int lpc17_40_connect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport, +static int lpc17_40_connect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport, bool connected) { struct lpc17_40_usbhost_s *priv = (struct lpc17_40_usbhost_s *)drvr; diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.h b/arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.h index 732bc259d3..bb0f1795c6 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.h +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.h @@ -81,7 +81,7 @@ extern "C" #ifdef CONFIG_USBHOST struct usbhost_connection_s; -FAR struct usbhost_connection_s *lpc17_40_usbhost_initialize(int controller); +struct usbhost_connection_s *lpc17_40_usbhost_initialize(int controller); #endif #undef EXTERN diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.c index 72e79af158..e05dc37a09 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.c @@ -61,10 +61,10 @@ struct lpc17_40_lowerhalf_s { - FAR const struct watchdog_ops_s *ops; /* Lower half operations */ - uint32_t timeout; /* The (actual) selected timeout */ - uint32_t lastreset; /* The last reset time */ - bool started; /* true: The watchdog timer has been started */ + const struct watchdog_ops_s *ops; /* Lower half operations */ + uint32_t timeout; /* The (actual) selected timeout */ + uint32_t lastreset; /* The last reset time */ + bool started; /* true: The watchdog timer has been started */ }; /**************************************************************************** @@ -73,12 +73,12 @@ struct lpc17_40_lowerhalf_s /* "Lower half" driver methods **********************************************/ -static int lpc17_40_start(FAR struct watchdog_lowerhalf_s *lower); -static int lpc17_40_stop(FAR struct watchdog_lowerhalf_s *lower); -static int lpc17_40_keepalive(FAR struct watchdog_lowerhalf_s *lower); -static int lpc17_40_getstatus(FAR struct watchdog_lowerhalf_s *lower, - FAR struct watchdog_status_s *status); -static int lpc17_40_settimeout(FAR struct watchdog_lowerhalf_s *lower, +static int lpc17_40_start(struct watchdog_lowerhalf_s *lower); +static int lpc17_40_stop(struct watchdog_lowerhalf_s *lower); +static int lpc17_40_keepalive(struct watchdog_lowerhalf_s *lower); +static int lpc17_40_getstatus(struct watchdog_lowerhalf_s *lower, + struct watchdog_status_s *status); +static int lpc17_40_settimeout(struct watchdog_lowerhalf_s *lower, uint32_t timeout); /**************************************************************************** @@ -121,10 +121,10 @@ static struct lpc17_40_lowerhalf_s g_wdgdev; * ****************************************************************************/ -static int lpc17_40_start(FAR struct watchdog_lowerhalf_s *lower) +static int lpc17_40_start(struct watchdog_lowerhalf_s *lower) { - FAR struct lpc17_40_lowerhalf_s *priv = - (FAR struct lpc17_40_lowerhalf_s *)lower; + struct lpc17_40_lowerhalf_s *priv = + (struct lpc17_40_lowerhalf_s *)lower; irqstate_t flags; uint32_t wdmod; @@ -167,7 +167,7 @@ static int lpc17_40_start(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int lpc17_40_stop(FAR struct watchdog_lowerhalf_s *lower) +static int lpc17_40_stop(struct watchdog_lowerhalf_s *lower) { /* There is no way to disable WDT once it has been started. */ @@ -191,10 +191,10 @@ static int lpc17_40_stop(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int lpc17_40_keepalive(FAR struct watchdog_lowerhalf_s *lower) +static int lpc17_40_keepalive(struct watchdog_lowerhalf_s *lower) { - FAR struct lpc17_40_lowerhalf_s *priv = - (FAR struct lpc17_40_lowerhalf_s *)lower; + struct lpc17_40_lowerhalf_s *priv = + (struct lpc17_40_lowerhalf_s *)lower; irqstate_t flags; /* Reload the WDT. */ @@ -224,11 +224,11 @@ static int lpc17_40_keepalive(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int lpc17_40_getstatus(FAR struct watchdog_lowerhalf_s *lower, - FAR struct watchdog_status_s *status) +static int lpc17_40_getstatus(struct watchdog_lowerhalf_s *lower, + struct watchdog_status_s *status) { - FAR struct lpc17_40_lowerhalf_s *priv = - (FAR struct lpc17_40_lowerhalf_s *)lower; + struct lpc17_40_lowerhalf_s *priv = + (struct lpc17_40_lowerhalf_s *)lower; uint32_t ticks; uint32_t elapsed; @@ -279,11 +279,11 @@ static int lpc17_40_getstatus(FAR struct watchdog_lowerhalf_s *lower, * ****************************************************************************/ -static int lpc17_40_settimeout(FAR struct watchdog_lowerhalf_s *lower, +static int lpc17_40_settimeout(struct watchdog_lowerhalf_s *lower, uint32_t timeout) { - FAR struct lpc17_40_lowerhalf_s *priv = - (FAR struct lpc17_40_lowerhalf_s *)lower; + struct lpc17_40_lowerhalf_s *priv = + (struct lpc17_40_lowerhalf_s *)lower; uint64_t wdt_clk; uint64_t wdtc; @@ -331,9 +331,9 @@ static int lpc17_40_settimeout(FAR struct watchdog_lowerhalf_s *lower, * ****************************************************************************/ -void lpc17_40_wdtinitialize(FAR const char *devpath) +void lpc17_40_wdtinitialize(const char *devpath) { - FAR struct lpc17_40_lowerhalf_s *priv = &g_wdgdev; + struct lpc17_40_lowerhalf_s *priv = &g_wdgdev; /* Initialize the driver state structure. */ @@ -346,12 +346,12 @@ void lpc17_40_wdtinitialize(FAR const char *devpath) * yet. */ - lpc17_40_settimeout((FAR struct watchdog_lowerhalf_s *)priv, + lpc17_40_settimeout((struct watchdog_lowerhalf_s *)priv, LPC17_40_WDT_DEFTIMEOUT); /* Register the watchdog driver as devpath. */ - watchdog_register(devpath, (FAR struct watchdog_lowerhalf_s *)priv); + watchdog_register(devpath, (struct watchdog_lowerhalf_s *)priv); } #endif /* CONFIG_WATCHDOG && CONFIG_LPC17_40_WDT */ diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.h b/arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.h index fde2b095a5..993ebda23b 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.h +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.h @@ -66,7 +66,7 @@ extern "C" * ****************************************************************************/ -void lpc17_40_wdtinitialize(FAR const char *devpath); +void lpc17_40_wdtinitialize(const char *devpath); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/lpc214x/lpc214x_spi.h b/arch/arm/src/lpc214x/lpc214x_spi.h index b8a17a6d31..105061067a 100644 --- a/arch/arm/src/lpc214x/lpc214x_spi.h +++ b/arch/arm/src/lpc214x/lpc214x_spi.h @@ -156,6 +156,6 @@ struct spi_dev_s; /* Forward reference */ * ****************************************************************************/ -FAR struct spi_dev_s *lpc214x_spibus_initialize(int port); +struct spi_dev_s *lpc214x_spibus_initialize(int port); #endif /* __ARCH_ARM_SRC_LPC214X_LPC214X_SPI_H */ diff --git a/arch/arm/src/lpc214x/lpc214x_usbdev.c b/arch/arm/src/lpc214x/lpc214x_usbdev.c index 41fe25317d..3db5e98867 100644 --- a/arch/arm/src/lpc214x/lpc214x_usbdev.c +++ b/arch/arm/src/lpc214x/lpc214x_usbdev.c @@ -381,10 +381,9 @@ static uint32_t lpc214x_usbcmd(uint16_t cmd, uint8_t data); /* Request queue operations *************************************************/ -static FAR -struct lpc214x_req_s *lpc214x_rqdequeue(FAR struct lpc214x_ep_s *privep); -static void lpc214x_rqenqueue(FAR struct lpc214x_ep_s *privep, - FAR struct lpc214x_req_s *req); +static struct lpc214x_req_s *lpc214x_rqdequeue(struct lpc214x_ep_s *privep); +static void lpc214x_rqenqueue(struct lpc214x_ep_s *privep, + struct lpc214x_req_s *req); /* Low level data transfers and request operations **************************/ @@ -419,7 +418,7 @@ static inline void lpc214x_ep0dataoutinterrupt(struct lpc214x_usbdev_s *priv); static inline void lpc214x_ep0dataininterrupt(struct lpc214x_usbdev_s *priv); -static int lpc214x_usbinterrupt(int irq, FAR void *context, FAR void *arg); +static int lpc214x_usbinterrupt(int irq, void *context, void *arg); #ifdef CONFIG_LPC214X_USBDEV_DMA static int lpc214x_dmasetup(struct lpc214x_usbdev_s *priv, uint8_t epphy, @@ -431,30 +430,29 @@ static void lpc214x_dmadisable(uint8_t epphy); /* Endpoint operations ******************************************************/ -static int lpc214x_epconfigure(FAR struct usbdev_ep_s *ep, +static int lpc214x_epconfigure(struct usbdev_ep_s *ep, const struct usb_epdesc_s *desc, bool last); -static int lpc214x_epdisable(FAR struct usbdev_ep_s *ep); -static FAR -struct usbdev_req_s *lpc214x_epallocreq(FAR struct usbdev_ep_s *ep); -static void lpc214x_epfreereq(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *); +static int lpc214x_epdisable(struct usbdev_ep_s *ep); +static struct usbdev_req_s *lpc214x_epallocreq(struct usbdev_ep_s *ep); +static void lpc214x_epfreereq(struct usbdev_ep_s *ep, + struct usbdev_req_s *); #ifdef CONFIG_USBDEV_DMA -static FAR void *lpc214x_epallocbuffer(FAR struct usbdev_ep_s *ep, +static void *lpc214x_epallocbuffer(struct usbdev_ep_s *ep, uint16_t nbytes); -static void lpc214x_epfreebuffer(FAR struct usbdev_ep_s *ep, void *buf); +static void lpc214x_epfreebuffer(struct usbdev_ep_s *ep, void *buf); #endif -static int lpc214x_epsubmit(FAR struct usbdev_ep_s *ep, +static int lpc214x_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req); -static int lpc214x_epcancel(FAR struct usbdev_ep_s *ep, +static int lpc214x_epcancel(struct usbdev_ep_s *ep, struct usbdev_req_s *req); -static int lpc214x_epstall(FAR struct usbdev_ep_s *ep, bool resume); +static int lpc214x_epstall(struct usbdev_ep_s *ep, bool resume); /* USB device controller operations *****************************************/ -static FAR struct usbdev_ep_s *lcp214x_allocep(FAR struct usbdev_s *dev, +static struct usbdev_ep_s *lcp214x_allocep(struct usbdev_s *dev, uint8_t epno, bool in, uint8_t eptype); -static void lpc214x_freeep(FAR struct usbdev_s *dev, - FAR struct usbdev_ep_s *ep); +static void lpc214x_freeep(struct usbdev_s *dev, + struct usbdev_ep_s *ep); static int lpc214x_getframe(struct usbdev_s *dev); static int lpc214x_wakeup(struct usbdev_s *dev); static int lpc214x_selfpowered(struct usbdev_s *dev, bool selfpowered); @@ -748,10 +746,9 @@ static uint32_t lpc214x_usbcmd(uint16_t cmd, uint8_t data) * ****************************************************************************/ -static FAR -struct lpc214x_req_s *lpc214x_rqdequeue(FAR struct lpc214x_ep_s *privep) +static struct lpc214x_req_s *lpc214x_rqdequeue(struct lpc214x_ep_s *privep) { - FAR struct lpc214x_req_s *ret = privep->head; + struct lpc214x_req_s *ret = privep->head; if (ret) { @@ -775,8 +772,8 @@ struct lpc214x_req_s *lpc214x_rqdequeue(FAR struct lpc214x_ep_s *privep) * ****************************************************************************/ -static void lpc214x_rqenqueue(FAR struct lpc214x_ep_s *privep, - FAR struct lpc214x_req_s *req) +static void lpc214x_rqenqueue(struct lpc214x_ep_s *privep, + struct lpc214x_req_s *req) { req->flink = NULL; if (!privep->head) @@ -2079,7 +2076,7 @@ static inline void lpc214x_ep0dataininterrupt(struct lpc214x_usbdev_s *priv) ****************************************************************************/ static int lpc214x_usbinterrupt(int irq, - FAR void *context, FAR void *arg) + void *context, void *arg) { struct lpc214x_usbdev_s *priv = &g_usbdev; struct lpc214x_ep_s *privep ; @@ -2620,11 +2617,11 @@ static void lpc214x_dmadisable(uint8_t epphy) * ****************************************************************************/ -static int lpc214x_epconfigure(FAR struct usbdev_ep_s *ep, - FAR const struct usb_epdesc_s *desc, +static int lpc214x_epconfigure(struct usbdev_ep_s *ep, + const struct usb_epdesc_s *desc, bool last) { - FAR struct lpc214x_ep_s *privep = (FAR struct lpc214x_ep_s *)ep; + struct lpc214x_ep_s *privep = (struct lpc214x_ep_s *)ep; uint32_t inten; usbtrace(TRACE_EPCONFIGURE, privep->epphy); @@ -2671,9 +2668,9 @@ static int lpc214x_epconfigure(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int lpc214x_epdisable(FAR struct usbdev_ep_s *ep) +static int lpc214x_epdisable(struct usbdev_ep_s *ep) { - FAR struct lpc214x_ep_s *privep = (FAR struct lpc214x_ep_s *)ep; + struct lpc214x_ep_s *privep = (struct lpc214x_ep_s *)ep; irqstate_t flags; uint32_t mask = (1 << privep->epphy); uint32_t reg; @@ -2717,10 +2714,9 @@ static int lpc214x_epdisable(FAR struct usbdev_ep_s *ep) * ****************************************************************************/ -static FAR -struct usbdev_req_s *lpc214x_epallocreq(FAR struct usbdev_ep_s *ep) +static struct usbdev_req_s *lpc214x_epallocreq(struct usbdev_ep_s *ep) { - FAR struct lpc214x_req_s *privreq; + struct lpc214x_req_s *privreq; #ifdef CONFIG_DEBUG_FEATURES if (!ep) @@ -2730,9 +2726,9 @@ struct usbdev_req_s *lpc214x_epallocreq(FAR struct usbdev_ep_s *ep) } #endif - usbtrace(TRACE_EPALLOCREQ, ((FAR struct lpc214x_ep_s *)ep)->epphy); + usbtrace(TRACE_EPALLOCREQ, ((struct lpc214x_ep_s *)ep)->epphy); - privreq = (FAR struct lpc214x_req_s *) + privreq = (struct lpc214x_req_s *) kmm_malloc(sizeof(struct lpc214x_req_s)); if (!privreq) { @@ -2752,10 +2748,10 @@ struct usbdev_req_s *lpc214x_epallocreq(FAR struct usbdev_ep_s *ep) * ****************************************************************************/ -static void lpc214x_epfreereq(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static void lpc214x_epfreereq(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct lpc214x_req_s *privreq = (FAR struct lpc214x_req_s *)req; + struct lpc214x_req_s *privreq = (struct lpc214x_req_s *)req; #ifdef CONFIG_DEBUG_FEATURES if (!ep || !req) @@ -2765,7 +2761,7 @@ static void lpc214x_epfreereq(FAR struct usbdev_ep_s *ep, } #endif - usbtrace(TRACE_EPFREEREQ, ((FAR struct lpc214x_ep_s *)ep)->epphy); + usbtrace(TRACE_EPFREEREQ, ((struct lpc214x_ep_s *)ep)->epphy); kmm_free(privreq); } @@ -2779,12 +2775,12 @@ static void lpc214x_epfreereq(FAR struct usbdev_ep_s *ep, ****************************************************************************/ #ifdef CONFIG_LPC214X_USBDEV_DMA -static FAR void *lpc214x_epallocbuffer(FAR struct usbdev_ep_s *ep, - uint16_t nbytes) +static void *lpc214x_epallocbuffer(struct usbdev_ep_s *ep, + uint16_t nbytes) { #ifdef CONFIG_USBDEV_DMA - FAR struct lpc214x_ep_s *privep = (FAR struct lpc214x_ep_s *)ep; + struct lpc214x_ep_s *privep = (struct lpc214x_ep_s *)ep; int descndx; usbtrace(TRACE_EPALLOCBUFFER, privep->epphy); @@ -2822,10 +2818,10 @@ static FAR void *lpc214x_epallocbuffer(FAR struct usbdev_ep_s *ep, #ifdef CONFIG_USBDEV_DMA -static void lpc214x_epfreebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf) +static void lpc214x_epfreebuffer(struct usbdev_ep_s *ep, void *buf) { #ifdef CONFIG_LPC214X_USBDEV_DMA - FAR struct lpc214x_ep_s *privep = (FAR struct lpc214x_ep_s *)ep; + struct lpc214x_ep_s *privep = (struct lpc214x_ep_s *)ep; usbtrace(TRACE_EPFREEBUFFER, privep->epphy); @@ -2861,12 +2857,12 @@ static void lpc214x_epfreebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf) * ****************************************************************************/ -static int lpc214x_epsubmit(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static int lpc214x_epsubmit(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct lpc214x_req_s *privreq = (FAR struct lpc214x_req_s *)req; - FAR struct lpc214x_ep_s *privep = (FAR struct lpc214x_ep_s *)ep; - FAR struct lpc214x_usbdev_s *priv; + struct lpc214x_req_s *privreq = (struct lpc214x_req_s *)req; + struct lpc214x_ep_s *privep = (struct lpc214x_ep_s *)ep; + struct lpc214x_usbdev_s *priv; irqstate_t flags; int ret = OK; @@ -2952,10 +2948,10 @@ static int lpc214x_epsubmit(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int lpc214x_epcancel(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static int lpc214x_epcancel(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct lpc214x_ep_s *privep = (FAR struct lpc214x_ep_s *)ep; + struct lpc214x_ep_s *privep = (struct lpc214x_ep_s *)ep; irqstate_t flags; #ifdef CONFIG_DEBUG_FEATURES @@ -2982,9 +2978,9 @@ static int lpc214x_epcancel(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int lpc214x_epstall(FAR struct usbdev_ep_s *ep, bool resume) +static int lpc214x_epstall(struct usbdev_ep_s *ep, bool resume) { - FAR struct lpc214x_ep_s *privep = (FAR struct lpc214x_ep_s *)ep; + struct lpc214x_ep_s *privep = (struct lpc214x_ep_s *)ep; irqstate_t flags; /* STALL or RESUME the endpoint */ @@ -3026,11 +3022,11 @@ static int lpc214x_epstall(FAR struct usbdev_ep_s *ep, bool resume) * ****************************************************************************/ -static FAR struct usbdev_ep_s *lcp214x_allocep(FAR struct usbdev_s *dev, +static struct usbdev_ep_s *lcp214x_allocep(struct usbdev_s *dev, uint8_t eplog, bool in, uint8_t eptype) { - FAR struct lpc214x_usbdev_s *priv = (FAR struct lpc214x_usbdev_s *)dev; + struct lpc214x_usbdev_s *priv = (struct lpc214x_usbdev_s *)dev; uint32_t epset = LPC214X_EPALLSET & ~LPC214X_EPCTRLSET; irqstate_t flags; int epndx = 0; @@ -3151,11 +3147,11 @@ static FAR struct usbdev_ep_s *lcp214x_allocep(FAR struct usbdev_s *dev, * ****************************************************************************/ -static void lpc214x_freeep(FAR struct usbdev_s *dev, - FAR struct usbdev_ep_s *ep) +static void lpc214x_freeep(struct usbdev_s *dev, + struct usbdev_ep_s *ep) { - FAR struct lpc214x_usbdev_s *priv = (FAR struct lpc214x_usbdev_s *)dev; - FAR struct lpc214x_ep_s *privep = (FAR struct lpc214x_ep_s *)ep; + struct lpc214x_usbdev_s *priv = (struct lpc214x_usbdev_s *)dev; + struct lpc214x_ep_s *privep = (struct lpc214x_ep_s *)ep; irqstate_t flags; usbtrace(TRACE_DEVFREEEP, (uint16_t)privep->epphy); @@ -3181,7 +3177,7 @@ static void lpc214x_freeep(FAR struct usbdev_s *dev, static int lpc214x_getframe(struct usbdev_s *dev) { #ifdef CONFIG_LPC214X_USBDEV_FRAME_INTERRUPT - FAR struct lpc214x_usbdev_s *priv = (FAR struct lpc214x_usbdev_s *)dev; + struct lpc214x_usbdev_s *priv = (struct lpc214x_usbdev_s *)dev; /* Return last valid value of SOF read by the interrupt handler */ @@ -3231,7 +3227,7 @@ static int lpc214x_wakeup(struct usbdev_s *dev) static int lpc214x_selfpowered(struct usbdev_s *dev, bool selfpowered) { - FAR struct lpc214x_usbdev_s *priv = (FAR struct lpc214x_usbdev_s *)dev; + struct lpc214x_usbdev_s *priv = (struct lpc214x_usbdev_s *)dev; usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered); diff --git a/arch/arm/src/lpc2378/lpc23xx_i2c.c b/arch/arm/src/lpc2378/lpc23xx_i2c.c index c13bb0ae73..025135b79c 100644 --- a/arch/arm/src/lpc2378/lpc23xx_i2c.c +++ b/arch/arm/src/lpc2378/lpc23xx_i2c.c @@ -133,7 +133,7 @@ struct lpc2378_i2cdev_s static int lpc2378_i2c_start(struct lpc2378_i2cdev_s *priv); static void lpc2378_i2c_stop(struct lpc2378_i2cdev_s *priv); -static int lpc2378_i2c_interrupt(int irq, FAR void *context, FAR void *arg); +static int lpc2378_i2c_interrupt(int irq, void *context, void *arg); static void lpc2378_i2c_timeout(wdparm_t arg); static void lpc2378_i2c_setfrequency(struct lpc2378_i2cdev_s *priv, uint32_t frequency); @@ -141,10 +141,10 @@ static void lpc2378_stopnext(struct lpc2378_i2cdev_s *priv); /* I2C device operations */ -static int lpc2378_i2c_transfer(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count); +static int lpc2378_i2c_transfer(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count); #ifdef CONFIG_I2C_RESET -static int lpc2378_i2c_reset(FAR struct i2c_master_s * dev); +static int lpc2378_i2c_reset(struct i2c_master_s * dev); #endif /**************************************************************************** @@ -296,7 +296,7 @@ static void lpc2378_stopnext(struct lpc2378_i2cdev_s *priv) * ****************************************************************************/ -static int lpc2378_i2c_interrupt(int irq, FAR void *context, FAR void *arg) +static int lpc2378_i2c_interrupt(int irq, void *context, void *arg) { struct lpc2378_i2cdev_s *priv = (struct lpc2378_i2cdev_s *)arg; struct i2c_msg_s *msg; @@ -394,8 +394,8 @@ static int lpc2378_i2c_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static int lpc2378_i2c_transfer(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count) +static int lpc2378_i2c_transfer(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count) { struct lpc2378_i2cdev_s *priv = (struct lpc2378_i2cdev_s *)dev; int ret; @@ -444,7 +444,7 @@ static int lpc2378_i2c_transfer(FAR struct i2c_master_s *dev, ****************************************************************************/ #ifdef CONFIG_I2C_RESET -static int lpc2378_i2c_reset(FAR struct i2c_master_s * dev) +static int lpc2378_i2c_reset(struct i2c_master_s * dev) { return OK; } @@ -612,7 +612,7 @@ struct i2c_master_s *lpc2378_i2cbus_initialize(int port) * ****************************************************************************/ -int lpc2378_i2cbus_uninitialize(FAR struct i2c_master_s * dev) +int lpc2378_i2cbus_uninitialize(struct i2c_master_s * dev) { struct lpc2378_i2cdev_s *priv = (struct lpc2378_i2cdev_s *) dev; diff --git a/arch/arm/src/lpc2378/lpc23xx_i2c.h b/arch/arm/src/lpc2378/lpc23xx_i2c.h index f9921c008d..e370d84919 100644 --- a/arch/arm/src/lpc2378/lpc23xx_i2c.h +++ b/arch/arm/src/lpc2378/lpc23xx_i2c.h @@ -181,7 +181,7 @@ * ****************************************************************************/ -FAR struct i2c_master_s *lpc2378_i2cbus_initialize(int port); +struct i2c_master_s *lpc2378_i2cbus_initialize(int port); /**************************************************************************** * Name: lpc2378_i2cbus_uninitialize @@ -198,6 +198,6 @@ FAR struct i2c_master_s *lpc2378_i2cbus_initialize(int port); * ****************************************************************************/ -int lpc2378_i2cbus_uninitialize(FAR struct i2c_master_s *dev); +int lpc2378_i2cbus_uninitialize(struct i2c_master_s *dev); #endif /* __ARCH_ARM_SRC_LPC2378_LPC23XX_I2C_H */ diff --git a/arch/arm/src/lpc2378/lpc23xx_spi.c b/arch/arm/src/lpc2378/lpc23xx_spi.c index 187f3b871e..63abd01f3f 100644 --- a/arch/arm/src/lpc2378/lpc23xx_spi.c +++ b/arch/arm/src/lpc2378/lpc23xx_spi.c @@ -116,15 +116,15 @@ struct lpc23xx_spidev_s /* SPI methods */ -static int spi_lock(FAR struct spi_dev_s *dev, bool lock); -static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, +static int spi_lock(struct spi_dev_s *dev, bool lock); +static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency); -static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode); -static void spi_setbits(FAR struct spi_dev_s *dev, int nbits); -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 nwords); -static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, +static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode); +static void spi_setbits(struct spi_dev_s *dev, int nbits); +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 nwords); +static void spi_recvblock(struct spi_dev_s *dev, void *buffer, size_t nwords); /**************************************************************************** @@ -192,9 +192,9 @@ static struct lpc23xx_spidev_s g_spidev = * ****************************************************************************/ -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 lpc23xx_spidev_s *priv = (FAR struct lpc23xx_spidev_s *)dev; + struct lpc23xx_spidev_s *priv = (struct lpc23xx_spidev_s *)dev; int ret; if (lock) @@ -224,10 +224,10 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock) * ****************************************************************************/ -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 lpc23xx_spidev_s *priv = (FAR struct lpc23xx_spidev_s *)dev; + struct lpc23xx_spidev_s *priv = (struct lpc23xx_spidev_s *)dev; uint32_t divisor; uint32_t actual; @@ -296,9 +296,9 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) +static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) { - FAR struct lpc23xx_spidev_s *priv = (FAR struct lpc23xx_spidev_s *)dev; + struct lpc23xx_spidev_s *priv = (struct lpc23xx_spidev_s *)dev; uint32_t regval; /* Has the mode changed? */ @@ -356,9 +356,9 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) * ****************************************************************************/ -static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) +static void spi_setbits(struct spi_dev_s *dev, int nbits) { - FAR struct lpc23xx_spidev_s *priv = (FAR struct lpc23xx_spidev_s *)dev; + struct lpc23xx_spidev_s *priv = (struct lpc23xx_spidev_s *)dev; uint32_t regval; DEBUGASSERT(nbits > 7 && nbits < 17); @@ -400,7 +400,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) * ****************************************************************************/ -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) { /* Write the data to transmitted to the SPI Data Register */ @@ -439,10 +439,10 @@ 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 nwords) +static void spi_sndblock(struct spi_dev_s *dev, + const void *buffer, size_t nwords) { - FAR uint8_t *ptr = (FAR uint8_t *)buffer; + uint8_t *ptr = (uint8_t *)buffer; uint8_t data; spiinfo("nwords: %d\n", nwords); @@ -487,10 +487,10 @@ 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 nwords) { - FAR uint8_t *ptr = (FAR uint8_t *)buffer; + uint8_t *ptr = (uint8_t *)buffer; spiinfo("nwords: %d\n", nwords); while (nwords) @@ -537,9 +537,9 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, * ****************************************************************************/ -FAR struct spi_dev_s *lpc23_spibus_initialize(int port) +struct spi_dev_s *lpc23_spibus_initialize(int port) { - FAR struct lpc23xx_spidev_s *priv = &g_spidev; + struct lpc23xx_spidev_s *priv = &g_spidev; irqstate_t flags; uint32_t regval; @@ -587,7 +587,7 @@ FAR struct spi_dev_s *lpc23_spibus_initialize(int port) /* Select a default frequency of approx. 400KHz */ - spi_setfrequency((FAR struct spi_dev_s *)priv, 400000); + spi_setfrequency((struct spi_dev_s *)priv, 400000); /* Initialize the SPI semaphore that enforces mutually exclusive access */ diff --git a/arch/arm/src/lpc2378/lpc23xx_spi.h b/arch/arm/src/lpc2378/lpc23xx_spi.h index b0abcf69d4..7cb823af29 100644 --- a/arch/arm/src/lpc2378/lpc23xx_spi.h +++ b/arch/arm/src/lpc2378/lpc23xx_spi.h @@ -181,7 +181,7 @@ struct spi_dev_s; /* Forward reference */ * ****************************************************************************/ -FAR struct spi_dev_s *lpc23_spibus_initialize(int port); +struct spi_dev_s *lpc23_spibus_initialize(int port); /**************************************************************************** * These functions must be provided by the board specific logic that has @@ -189,8 +189,8 @@ FAR struct spi_dev_s *lpc23_spibus_initialize(int port); * ****************************************************************************/ -void lpc23xx_spiselect(FAR struct spi_dev_s *dev, +void lpc23xx_spiselect(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t lpc23xx_spistatus(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t lpc23xx_spistatus(struct spi_dev_s *dev, uint32_t devid); #endif /* __ARCH_ARM_SRC_LPC2378_LPC23XX_SPI_H */ diff --git a/arch/arm/src/lpc2378/lpc23xx_timerisr.c b/arch/arm/src/lpc2378/lpc23xx_timerisr.c index bf3036c948..478f9aba2e 100644 --- a/arch/arm/src/lpc2378/lpc23xx_timerisr.c +++ b/arch/arm/src/lpc2378/lpc23xx_timerisr.c @@ -95,7 +95,7 @@ #ifdef CONFIG_VECTORED_INTERRUPTS static int lpc23xx_timerisr(uint32_t * regs) #else -static int lpc23xx_timerisr(int irq, uint32_t * regs, FAR void *arg) +static int lpc23xx_timerisr(int irq, uint32_t * regs, void *arg) #endif { static uint32_t tick; diff --git a/arch/arm/src/lpc31xx/lpc31.h b/arch/arm/src/lpc31xx/lpc31.h index 45f6b336d2..eba1291d49 100644 --- a/arch/arm/src/lpc31xx/lpc31.h +++ b/arch/arm/src/lpc31xx/lpc31.h @@ -170,7 +170,7 @@ void lpc31_clockconfig(void); ****************************************************************************/ struct spi_dev_s; /* Forward reference */ -FAR struct spi_dev_s *lpc31_spibus_initialize(int port); +struct spi_dev_s *lpc31_spibus_initialize(int port); /**************************************************************************** * Name: lpc31_spiselect and lpc31_spistatus @@ -202,11 +202,11 @@ FAR struct spi_dev_s *lpc31_spibus_initialize(int port); * ****************************************************************************/ -void lpc31_spiselect(FAR struct spi_dev_s *dev, +void lpc31_spiselect(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t lpc31_spistatus(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t lpc31_spistatus(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int lpc31_spicmddata(FAR struct spi_dev_s *dev, +int lpc31_spicmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif @@ -224,7 +224,7 @@ int lpc31_spicmddata(FAR struct spi_dev_s *dev, #if defined(CONFIG_LPC31_USBOTG) && defined(CONFIG_USBDEV) struct usbdev_s; -int lpc31_usbpullup(FAR struct usbdev_s *dev, bool enable); +int lpc31_usbpullup(struct usbdev_s *dev, bool enable); #endif /**************************************************************************** @@ -240,7 +240,7 @@ int lpc31_usbpullup(FAR struct usbdev_s *dev, bool enable); #if defined(CONFIG_LPC31_USBOTG) && defined(CONFIG_USBDEV) struct usbdev_s; -void lpc31_usbsuspend(FAR struct usbdev_s *dev, bool resume); +void lpc31_usbsuspend(struct usbdev_s *dev, bool resume); #endif /**************************************************************************** @@ -270,7 +270,7 @@ void lpc31_usbsuspend(FAR struct usbdev_s *dev, bool resume); #if defined(CONFIG_LPC31_USBOTG) && defined(CONFIG_USBHOST) struct usbhost_connection_s; -FAR struct usbhost_connection_s *lpc31_ehci_initialize(int controller); +struct usbhost_connection_s *lpc31_ehci_initialize(int controller); #endif /**************************************************************************** @@ -311,7 +311,7 @@ void lpc31_usbhost_vbusdrive(int rhport, bool enable); ****************************************************************************/ struct sdio_dev_s; /* See include/nuttx/sdio.h */ -FAR struct sdio_dev_s *sdio_initialize(int slotno); +struct sdio_dev_s *sdio_initialize(int slotno); /**************************************************************************** * Name: sdio_mediachange @@ -332,7 +332,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno); * ****************************************************************************/ -void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot); +void sdio_mediachange(struct sdio_dev_s *dev, bool cardinslot); /**************************************************************************** * Name: sdio_wrprotect @@ -350,7 +350,7 @@ void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot); * ****************************************************************************/ -void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect); +void sdio_wrprotect(struct sdio_dev_s *dev, bool wrprotect); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/lpc31xx/lpc31_allocateheap.c b/arch/arm/src/lpc31xx/lpc31_allocateheap.c index 514dc37576..11f7d91530 100644 --- a/arch/arm/src/lpc31xx/lpc31_allocateheap.c +++ b/arch/arm/src/lpc31xx/lpc31_allocateheap.c @@ -176,10 +176,10 @@ * ****************************************************************************/ -void up_allocate_heap(FAR void **heap_start, size_t *heap_size) +void up_allocate_heap(void **heap_start, size_t *heap_size) { board_autoled_on(LED_HEAPALLOCATE); - *heap_start = (FAR void *)g_idle_topstack; + *heap_start = (void *)g_idle_topstack; *heap_size = LPC31_HEAP_VEND - g_idle_topstack; } @@ -196,17 +196,17 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) void arm_addregion(void) { #if defined(CONFIG_LPC31_EXTSRAM0) && defined(CONFIG_LPC31_EXTSRAM0HEAP) - MM_ADDREGION((FAR void *)LPC31_EXTSRAM0_VSECTION, + MM_ADDREGION((void *)LPC31_EXTSRAM0_VSECTION, CONFIG_LPC31_EXTSRAM0SIZE); #endif #if defined(CONFIG_LPC31_EXTSRAM1) && defined(CONFIG_LPC31_EXTSRAM1HEAP) - MM_ADDREGION((FAR void *)LPC31_EXTSRAM1_VSECTION, + MM_ADDREGION((void *)LPC31_EXTSRAM1_VSECTION, CONFIG_LPC31_EXTSRAM1SIZE); #endif #if defined(CONFIG_LPC31_EXTDRAM) && defined(CONFIG_LPC31_EXTDRAMHEAP) - MM_ADDREGION((FAR void *)LPC31_EXTSDRAM_VSECTION, + MM_ADDREGION((void *)LPC31_EXTSDRAM_VSECTION, CONFIG_LPC31_EXTDRAMSIZE); #endif } diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c index 504e71200f..14dacb7d38 100644 --- a/arch/arm/src/lpc31xx/lpc31_ehci.c +++ b/arch/arm/src/lpc31xx/lpc31_ehci.c @@ -378,7 +378,7 @@ struct lpc31_ehci_trace_s uint16_t id; bool fmt2; #endif - FAR const char *string; + const char *string; }; #endif /* HAVE_USBHOST_TRACE */ @@ -493,7 +493,7 @@ static ssize_t lpc31_transfer_wait(struct lpc31_epinfo_s *epinfo); #ifdef CONFIG_USBHOST_ASYNCH static inline int lpc31_ioc_async_setup(struct lpc31_rhport_s *rhport, struct lpc31_epinfo_s *epinfo, usbhost_asynch_t callback, - FAR void *arg); + void *arg); static void lpc31_asynch_completion(struct lpc31_epinfo_s *epinfo); #endif @@ -512,51 +512,51 @@ static inline void lpc31_ioc_bottomhalf(void); static inline void lpc31_portsc_bottomhalf(void); static inline void lpc31_syserr_bottomhalf(void); static inline void lpc31_async_advance_bottomhalf(void); -static void lpc31_ehci_bottomhalf(FAR void *arg); -static int lpc31_ehci_interrupt(int irq, FAR void *context, FAR void *arg); +static void lpc31_ehci_bottomhalf(void *arg); +static int lpc31_ehci_interrupt(int irq, void *context, void *arg); /* USB Host Controller Operations *******************************************/ -static int lpc31_wait(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s **hport); -static int lpc31_rh_enumerate(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport); -static int lpc31_enumerate(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport); +static int lpc31_wait(struct usbhost_connection_s *conn, + struct usbhost_hubport_s **hport); +static int lpc31_rh_enumerate(struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport); +static int lpc31_enumerate(struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport); -static int lpc31_ep0configure(FAR struct usbhost_driver_s *drvr, +static int lpc31_ep0configure(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, uint8_t funcaddr, uint8_t speed, uint16_t maxpacketsize); -static int lpc31_epalloc(FAR struct usbhost_driver_s *drvr, - FAR const struct usbhost_epdesc_s *epdesc, - FAR usbhost_ep_t *ep); -static int lpc31_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep); -static int lpc31_alloc(FAR struct usbhost_driver_s *drvr, - FAR uint8_t **buffer, FAR size_t *maxlen); -static int lpc31_free(FAR struct usbhost_driver_s *drvr, - FAR uint8_t *buffer); -static int lpc31_ioalloc(FAR struct usbhost_driver_s *drvr, - FAR uint8_t **buffer, size_t buflen); -static int lpc31_iofree(FAR struct usbhost_driver_s *drvr, - FAR uint8_t *buffer); -static int lpc31_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, - FAR const struct usb_ctrlreq_s *req, FAR uint8_t *buffer); -static int lpc31_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, - FAR const struct usb_ctrlreq_s *req, FAR const uint8_t *buffer); -static ssize_t lpc31_transfer(FAR struct usbhost_driver_s *drvr, - usbhost_ep_t ep, FAR uint8_t *buffer, size_t buflen); +static int lpc31_epalloc(struct usbhost_driver_s *drvr, + const struct usbhost_epdesc_s *epdesc, + usbhost_ep_t *ep); +static int lpc31_epfree(struct usbhost_driver_s *drvr, usbhost_ep_t ep); +static int lpc31_alloc(struct usbhost_driver_s *drvr, + uint8_t **buffer, size_t *maxlen); +static int lpc31_free(struct usbhost_driver_s *drvr, + uint8_t *buffer); +static int lpc31_ioalloc(struct usbhost_driver_s *drvr, + uint8_t **buffer, size_t buflen); +static int lpc31_iofree(struct usbhost_driver_s *drvr, + uint8_t *buffer); +static int lpc31_ctrlin(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, + const struct usb_ctrlreq_s *req, uint8_t *buffer); +static int lpc31_ctrlout(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, + const struct usb_ctrlreq_s *req, const uint8_t *buffer); +static ssize_t lpc31_transfer(struct usbhost_driver_s *drvr, + usbhost_ep_t ep, uint8_t *buffer, size_t buflen); #ifdef CONFIG_USBHOST_ASYNCH -static int lpc31_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, - FAR uint8_t *buffer, size_t buflen, usbhost_asynch_t callback, - FAR void *arg); +static int lpc31_asynch(struct usbhost_driver_s *drvr, usbhost_ep_t ep, + uint8_t *buffer, size_t buflen, usbhost_asynch_t callback, + void *arg); #endif -static int lpc31_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep); +static int lpc31_cancel(struct usbhost_driver_s *drvr, usbhost_ep_t ep); #ifdef CONFIG_USBHOST_HUB -static int lpc31_connect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport, bool connected); +static int lpc31_connect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport, bool connected); #endif -static void lpc31_disconnect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport); +static void lpc31_disconnect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport); /* Initialization ***********************************************************/ @@ -2646,7 +2646,7 @@ static ssize_t lpc31_transfer_wait(struct lpc31_epinfo_s *epinfo) static inline int lpc31_ioc_async_setup(struct lpc31_rhport_s *rhport, struct lpc31_epinfo_s *epinfo, usbhost_asynch_t callback, - FAR void *arg) + void *arg) { irqstate_t flags; int ret = -ENODEV; @@ -3318,7 +3318,7 @@ static inline void lpc31_async_advance_bottomhalf(void) * ****************************************************************************/ -static void lpc31_ehci_bottomhalf(FAR void *arg) +static void lpc31_ehci_bottomhalf(void *arg) { uint32_t pending = (uint32_t)arg; @@ -3454,7 +3454,7 @@ static void lpc31_ehci_bottomhalf(FAR void *arg) * ****************************************************************************/ -static int lpc31_ehci_interrupt(int irq, FAR void *context, FAR void *arg) +static int lpc31_ehci_interrupt(int irq, void *context, void *arg) { uint32_t usbsts; uint32_t pending; @@ -3486,7 +3486,7 @@ static int lpc31_ehci_interrupt(int irq, FAR void *context, FAR void *arg) DEBUGASSERT(work_available(&g_ehci.work)); DEBUGVERIFY(work_queue(HPWORK, &g_ehci.work, lpc31_ehci_bottomhalf, - (FAR void *)pending, 0)); + (void *)pending, 0)); /* Disable further EHCI interrupts so that we do not overrun the work * queue. @@ -3529,8 +3529,8 @@ static int lpc31_ehci_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static int lpc31_wait(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s **hport) +static int lpc31_wait(struct usbhost_connection_s *conn, + struct usbhost_hubport_s **hport) { irqstate_t flags; int rhpndx; @@ -3632,8 +3632,8 @@ static int lpc31_wait(FAR struct usbhost_connection_s *conn, * ****************************************************************************/ -static int lpc31_rh_enumerate(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport) +static int lpc31_rh_enumerate(struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport) { struct lpc31_rhport_s *rhport; volatile uint32_t *regaddr; @@ -3874,8 +3874,8 @@ static int lpc31_rh_enumerate(FAR struct usbhost_connection_s *conn, return OK; } -static int lpc31_enumerate(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport) +static int lpc31_enumerate(struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport) { int ret; @@ -3944,7 +3944,7 @@ static int lpc31_enumerate(FAR struct usbhost_connection_s *conn, * ****************************************************************************/ -static int lpc31_ep0configure(FAR struct usbhost_driver_s *drvr, +static int lpc31_ep0configure(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, uint8_t funcaddr, uint8_t speed, uint16_t maxpacketsize) { @@ -3992,9 +3992,9 @@ static int lpc31_ep0configure(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int lpc31_epalloc(FAR struct usbhost_driver_s *drvr, - FAR const struct usbhost_epdesc_s *epdesc, - FAR usbhost_ep_t *ep) +static int lpc31_epalloc(struct usbhost_driver_s *drvr, + const struct usbhost_epdesc_s *epdesc, + usbhost_ep_t *ep) { struct lpc31_epinfo_s *epinfo; struct usbhost_hubport_s *hport; @@ -4078,7 +4078,7 @@ static int lpc31_epalloc(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int lpc31_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) +static int lpc31_epfree(struct usbhost_driver_s *drvr, usbhost_ep_t ep) { struct lpc31_epinfo_s *epinfo = (struct lpc31_epinfo_s *)ep; @@ -4125,8 +4125,8 @@ static int lpc31_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) * ****************************************************************************/ -static int lpc31_alloc(FAR struct usbhost_driver_s *drvr, - FAR uint8_t **buffer, FAR size_t *maxlen) +static int lpc31_alloc(struct usbhost_driver_s *drvr, + uint8_t **buffer, size_t *maxlen) { int ret = -ENOMEM; DEBUGASSERT(drvr && buffer && maxlen); @@ -4136,7 +4136,7 @@ static int lpc31_alloc(FAR struct usbhost_driver_s *drvr, * multiple of the cache line size in length. */ - *buffer = (FAR uint8_t *) + *buffer = (uint8_t *) kmm_memalign(ARM_DCACHE_LINESIZE, LPC31_EHCI_BUFSIZE); if (*buffer) { @@ -4171,8 +4171,8 @@ static int lpc31_alloc(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int lpc31_free(FAR struct usbhost_driver_s *drvr, - FAR uint8_t *buffer) +static int lpc31_free(struct usbhost_driver_s *drvr, + uint8_t *buffer) { DEBUGASSERT(drvr && buffer); @@ -4213,8 +4213,8 @@ static int lpc31_free(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int lpc31_ioalloc(FAR struct usbhost_driver_s *drvr, - FAR uint8_t **buffer, size_t buflen) +static int lpc31_ioalloc(struct usbhost_driver_s *drvr, + uint8_t **buffer, size_t buflen) { DEBUGASSERT(drvr && buffer && buflen > 0); @@ -4225,7 +4225,7 @@ static int lpc31_ioalloc(FAR struct usbhost_driver_s *drvr, */ buflen = (buflen + DCACHE_LINEMASK) & ~DCACHE_LINEMASK; - *buffer = (FAR uint8_t *)kumm_memalign(ARM_DCACHE_LINESIZE, buflen); + *buffer = (uint8_t *)kumm_memalign(ARM_DCACHE_LINESIZE, buflen); return *buffer ? OK : -ENOMEM; } @@ -4252,8 +4252,8 @@ static int lpc31_ioalloc(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int lpc31_iofree(FAR struct usbhost_driver_s *drvr, - FAR uint8_t *buffer) +static int lpc31_iofree(struct usbhost_driver_s *drvr, + uint8_t *buffer) { DEBUGASSERT(drvr && buffer); @@ -4299,9 +4299,9 @@ static int lpc31_iofree(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int lpc31_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, - FAR const struct usb_ctrlreq_s *req, - FAR uint8_t *buffer) +static int lpc31_ctrlin(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, + const struct usb_ctrlreq_s *req, + uint8_t *buffer) { struct lpc31_rhport_s *rhport = (struct lpc31_rhport_s *)drvr; struct lpc31_epinfo_s *ep0info = (struct lpc31_epinfo_s *)ep0; @@ -4367,9 +4367,9 @@ errout_with_sem: return ret; } -static int lpc31_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, - FAR const struct usb_ctrlreq_s *req, - FAR const uint8_t *buffer) +static int lpc31_ctrlout(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, + const struct usb_ctrlreq_s *req, + const uint8_t *buffer) { /* lpc31_ctrlin can handle both directions. We just need to work around * the differences in the function signatures. @@ -4417,8 +4417,8 @@ static int lpc31_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, * ****************************************************************************/ -static ssize_t lpc31_transfer(FAR struct usbhost_driver_s *drvr, - usbhost_ep_t ep, FAR uint8_t *buffer, +static ssize_t lpc31_transfer(struct usbhost_driver_s *drvr, + usbhost_ep_t ep, uint8_t *buffer, size_t buflen) { struct lpc31_rhport_s *rhport = (struct lpc31_rhport_s *)drvr; @@ -4531,9 +4531,9 @@ errout_with_sem: ****************************************************************************/ #ifdef CONFIG_USBHOST_ASYNCH -static int lpc31_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, - FAR uint8_t *buffer, size_t buflen, - usbhost_asynch_t callback, FAR void *arg) +static int lpc31_asynch(struct usbhost_driver_s *drvr, usbhost_ep_t ep, + uint8_t *buffer, size_t buflen, + usbhost_asynch_t callback, void *arg) { struct lpc31_rhport_s *rhport = (struct lpc31_rhport_s *)drvr; struct lpc31_epinfo_s *epinfo = (struct lpc31_epinfo_s *)ep; @@ -4627,7 +4627,7 @@ errout_with_sem: * ****************************************************************************/ -static int lpc31_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) +static int lpc31_cancel(struct usbhost_driver_s *drvr, usbhost_ep_t ep) { struct lpc31_epinfo_s *epinfo = (struct lpc31_epinfo_s *)ep; struct lpc31_qh_s *qh; @@ -4832,8 +4832,8 @@ errout_with_sem: ****************************************************************************/ #ifdef CONFIG_USBHOST_HUB -static int lpc31_connect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport, +static int lpc31_connect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport, bool connected) { irqstate_t flags; @@ -4887,8 +4887,8 @@ static int lpc31_connect(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static void lpc31_disconnect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport) +static void lpc31_disconnect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport) { DEBUGASSERT(hport != NULL); hport->devclass = NULL; @@ -5042,9 +5042,9 @@ static int lpc31_reset(void) * ****************************************************************************/ -FAR struct usbhost_connection_s *lpc31_ehci_initialize(int controller) +struct usbhost_connection_s *lpc31_ehci_initialize(int controller) { - FAR struct usbhost_hubport_s *hport; + struct usbhost_hubport_s *hport; uint32_t regval; #if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_ASSERTIONS) uint16_t regval16; @@ -5533,7 +5533,7 @@ FAR struct usbhost_connection_s *lpc31_ehci_initialize(int controller) ****************************************************************************/ #ifdef HAVE_USBHOST_TRACE -FAR const char *usbhost_trformat1(uint16_t id) +const char *usbhost_trformat1(uint16_t id) { int ndx = TRACE1_INDEX(id); @@ -5545,7 +5545,7 @@ FAR const char *usbhost_trformat1(uint16_t id) return NULL; } -FAR const char *usbhost_trformat2(uint16_t id) +const char *usbhost_trformat2(uint16_t id) { int ndx = TRACE2_INDEX(id); diff --git a/arch/arm/src/lpc31xx/lpc31_i2c.c b/arch/arm/src/lpc31xx/lpc31_i2c.c index 906d84df18..9fb22b1f36 100644 --- a/arch/arm/src/lpc31xx/lpc31_i2c.c +++ b/arch/arm/src/lpc31xx/lpc31_i2c.c @@ -95,16 +95,16 @@ static struct lpc31_i2cdev_s i2cdevices[2]; * Private Function Prototypes ****************************************************************************/ -static int i2c_interrupt(int irq, FAR void *context, FAR void *arg); +static int i2c_interrupt(int irq, void *context, void *arg); static void i2c_progress(struct lpc31_i2cdev_s *priv); static void i2c_timeout(wdparm_t arg); static void i2c_hwreset(struct lpc31_i2cdev_s *priv); static void i2c_setfrequency(struct lpc31_i2cdev_s *priv, uint32_t frequency); -static int i2c_transfer(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count); +static int i2c_transfer(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count); #ifdef CONFIG_I2C_RESET -static int i2c_reset(FAR struct i2c_master_s * dev); +static int i2c_reset(struct i2c_master_s * dev); #endif /**************************************************************************** @@ -168,7 +168,7 @@ static void i2c_setfrequency(struct lpc31_i2cdev_s *priv, uint32_t frequency) * ****************************************************************************/ -static int i2c_interrupt(int irq, FAR void *context, FAR void *arg) +static int i2c_interrupt(int irq, void *context, void *arg) { struct lpc31_i2cdev_s *priv = (struct lpc31_i2cdev_s *)arg; @@ -464,8 +464,8 @@ static void i2c_hwreset(struct lpc31_i2cdev_s *priv) * ****************************************************************************/ -static int i2c_transfer(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count) +static int i2c_transfer(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count) { struct lpc31_i2cdev_s *priv = (struct lpc31_i2cdev_s *) dev; irqstate_t flags; @@ -528,7 +528,7 @@ static int i2c_transfer(FAR struct i2c_master_s *dev, ****************************************************************************/ #ifdef CONFIG_I2C_RESET -static int i2c_reset(FAR struct i2c_master_s * dev) +static int i2c_reset(struct i2c_master_s * dev) { return OK; } @@ -600,7 +600,7 @@ struct i2c_master_s *lpc31_i2cbus_initialize(int port) * ****************************************************************************/ -int lpc31_i2cbus_uninitialize(FAR struct i2c_master_s *dev) +int lpc31_i2cbus_uninitialize(struct i2c_master_s *dev) { struct lpc31_i2cdev_s *priv = (struct lpc31_i2cdev_s *)dev; diff --git a/arch/arm/src/lpc31xx/lpc31_i2c.h b/arch/arm/src/lpc31xx/lpc31_i2c.h index c1cfe8c5d3..280cf021ac 100644 --- a/arch/arm/src/lpc31xx/lpc31_i2c.h +++ b/arch/arm/src/lpc31xx/lpc31_i2c.h @@ -222,7 +222,7 @@ * ****************************************************************************/ -FAR struct i2c_master_s *lpc31_i2cbus_initialize(int port); +struct i2c_master_s *lpc31_i2cbus_initialize(int port); /**************************************************************************** * Name: lpc31_i2cbus_uninitialize @@ -239,6 +239,6 @@ FAR struct i2c_master_s *lpc31_i2cbus_initialize(int port); * ****************************************************************************/ -int lpc31_i2cbus_uninitialize(FAR struct i2c_master_s *dev); +int lpc31_i2cbus_uninitialize(struct i2c_master_s *dev); #endif /* __ARCH_ARM_SRC_LPC31XX_LPC31_I2C_H */ diff --git a/arch/arm/src/lpc31xx/lpc31_serial.c b/arch/arm/src/lpc31xx/lpc31_serial.c index 55dcd52bf7..71b4b07e47 100644 --- a/arch/arm/src/lpc31xx/lpc31_serial.c +++ b/arch/arm/src/lpc31xx/lpc31_serial.c @@ -70,7 +70,7 @@ static int up_setup(struct uart_dev_s *dev); static void up_shutdown(struct uart_dev_s *dev); static int up_attach(struct uart_dev_s *dev); static void up_detach(struct uart_dev_s *dev); -static int up_interrupt(int irq, void *context, FAR void *arg); +static int up_interrupt(int irq, void *context, void *arg); static int up_ioctl(struct file *filep, int cmd, unsigned long arg); static int up_receive(struct uart_dev_s *dev, unsigned int *status); static void up_rxint(struct uart_dev_s *dev, bool enable); @@ -467,7 +467,7 @@ static void up_detach(struct uart_dev_s *dev) * ****************************************************************************/ -static int up_interrupt(int irq, void *context, FAR void *arg) +static int up_interrupt(int irq, void *context, void *arg) { struct uart_dev_s *dev = (struct uart_dev_s *)arg; uint8_t status; diff --git a/arch/arm/src/lpc31xx/lpc31_spi.c b/arch/arm/src/lpc31xx/lpc31_spi.c index d651beb326..2aa2dcfa19 100644 --- a/arch/arm/src/lpc31xx/lpc31_spi.c +++ b/arch/arm/src/lpc31xx/lpc31_spi.c @@ -95,32 +95,32 @@ static uint32_t spi_getreg(uint32_t address); # define spi_getreg(a) getreg32(a) #endif -static inline void spi_drive_cs(FAR struct lpc31_spidev_s *priv, +static inline void spi_drive_cs(struct lpc31_spidev_s *priv, uint8_t slave, uint8_t val); -static inline void spi_select_slave(FAR struct lpc31_spidev_s *priv, +static inline void spi_select_slave(struct lpc31_spidev_s *priv, uint8_t slave); -static inline uint32_t spi_readword(FAR struct lpc31_spidev_s *priv); -static inline void spi_writeword(FAR struct lpc31_spidev_s *priv, +static inline uint32_t spi_readword(struct lpc31_spidev_s *priv); +static inline void spi_writeword(struct lpc31_spidev_s *priv, uint32_t word); -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, +static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency); -static void spi_setmode(FAR struct spi_dev_s *dev, +static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode); -static void spi_setbits(FAR struct spi_dev_s *dev, int nbits); -static uint8_t spi_status(FAR struct spi_dev_s *dev, uint32_t devid); -static uint32_t spi_send(FAR struct spi_dev_s *dev, uint32_t word); -static void spi_exchange(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, FAR void *rxbuffer, +static void spi_setbits(struct spi_dev_s *dev, int nbits); +static uint8_t spi_status(struct spi_dev_s *dev, uint32_t devid); +static uint32_t spi_send(struct spi_dev_s *dev, uint32_t word); +static void spi_exchange(struct spi_dev_s *dev, + const void *txbuffer, void *rxbuffer, size_t nwords); #ifndef CONFIG_SPI_EXCHANGE -static void spi_sndblock(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, size_t nwords); -static void spi_recvblock(FAR struct spi_dev_s *dev, - FAR void *rxbuffer, size_t nwords); +static void spi_sndblock(struct spi_dev_s *dev, + const void *txbuffer, size_t nwords); +static void spi_recvblock(struct spi_dev_s *dev, + void *rxbuffer, size_t nwords); #endif /**************************************************************************** @@ -285,7 +285,7 @@ static uint32_t spi_getreg(uint32_t address) * ****************************************************************************/ -static inline void spi_drive_cs(FAR struct lpc31_spidev_s *priv, +static inline void spi_drive_cs(struct lpc31_spidev_s *priv, uint8_t slave, uint8_t val) { switch (slave) @@ -352,7 +352,7 @@ static inline void spi_drive_cs(FAR struct lpc31_spidev_s *priv, * ****************************************************************************/ -static inline void spi_select_slave(FAR struct lpc31_spidev_s *priv, +static inline void spi_select_slave(struct lpc31_spidev_s *priv, uint8_t slave) { switch (slave) @@ -391,7 +391,7 @@ static inline void spi_select_slave(FAR struct lpc31_spidev_s *priv, * ****************************************************************************/ -static inline uint32_t spi_readword(FAR struct lpc31_spidev_s *priv) +static inline uint32_t spi_readword(struct lpc31_spidev_s *priv) { /* Wait until the RX FIFO is not empty */ @@ -417,7 +417,7 @@ static inline uint32_t spi_readword(FAR struct lpc31_spidev_s *priv) * ****************************************************************************/ -static inline void spi_writeword(FAR struct lpc31_spidev_s *priv, +static inline void spi_writeword(struct lpc31_spidev_s *priv, uint32_t word) { /* Wait until the TX FIFO is not full */ @@ -450,9 +450,9 @@ static inline void spi_writeword(FAR struct lpc31_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 lpc31_spidev_s *priv = (FAR struct lpc31_spidev_s *)dev; + struct lpc31_spidev_s *priv = (struct lpc31_spidev_s *)dev; int ret; if (lock) @@ -485,7 +485,7 @@ 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) { struct lpc31_spidev_s *priv = (struct lpc31_spidev_s *) dev; @@ -559,10 +559,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 lpc31_spidev_s *priv = (FAR struct lpc31_spidev_s *)dev; + struct lpc31_spidev_s *priv = (struct lpc31_spidev_s *)dev; uint32_t spi_clk; uint32_t div; uint32_t div1; @@ -619,9 +619,9 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) +static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) { - FAR struct lpc31_spidev_s *priv = (FAR struct lpc31_spidev_s *)dev; + struct lpc31_spidev_s *priv = (struct lpc31_spidev_s *)dev; uint16_t setbits; uint16_t clrbits; @@ -677,9 +677,9 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) * ****************************************************************************/ -static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) +static void spi_setbits(struct spi_dev_s *dev, int nbits) { - FAR struct lpc31_spidev_s *priv = (FAR struct lpc31_spidev_s *)dev; + struct lpc31_spidev_s *priv = (struct lpc31_spidev_s *)dev; /* Has the number of bits changed? */ @@ -706,7 +706,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) * ****************************************************************************/ -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) { /* FIXME: is there anyway to determine this * it should probably be board dependent anyway @@ -731,9 +731,9 @@ static uint8_t spi_status(FAR struct spi_dev_s *dev, uint32_t devid) * ****************************************************************************/ -static uint32_t spi_send(FAR struct spi_dev_s *dev, uint32_t word) +static uint32_t spi_send(struct spi_dev_s *dev, uint32_t word) { - FAR struct lpc31_spidev_s *priv = (FAR struct lpc31_spidev_s *)dev; + struct lpc31_spidev_s *priv = (struct lpc31_spidev_s *)dev; DEBUGASSERT(priv); spi_writeword(priv, word); @@ -761,10 +761,10 @@ static uint32_t spi_send(FAR struct spi_dev_s *dev, uint32_t word) * ****************************************************************************/ -static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, - FAR void *rxbuffer, size_t nwords) +static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, + void *rxbuffer, size_t nwords) { - FAR struct lpc31_spidev_s *priv = (FAR struct lpc31_spidev_s *)dev; + struct lpc31_spidev_s *priv = (struct lpc31_spidev_s *)dev; unsigned int maxtx; unsigned int ntx; @@ -877,8 +877,8 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, ****************************************************************************/ #ifndef CONFIG_SPI_EXCHANGE -static void spi_sndblock(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, size_t nwords) +static void spi_sndblock(struct spi_dev_s *dev, + const void *txbuffer, size_t nwords) { return spi_exchange(dev, txbuffer, NULL, nwords); } @@ -905,7 +905,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, ****************************************************************************/ #ifndef CONFIG_SPI_EXCHANGE -static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *rxbuffer, +static void spi_recvblock(struct spi_dev_s *dev, void *rxbuffer, size_t nwords) { return spi_exchange(dev, NULL, rxbuffer, nwords); @@ -930,9 +930,9 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *rxbuffer, * ****************************************************************************/ -FAR struct spi_dev_s *lpc31_spibus_initialize(int port) +struct spi_dev_s *lpc31_spibus_initialize(int port) { - FAR struct lpc31_spidev_s *priv = &g_spidev; + struct lpc31_spidev_s *priv = &g_spidev; /* Only the SPI0 interface is supported */ @@ -992,5 +992,5 @@ FAR struct spi_dev_s *lpc31_spibus_initialize(int port) priv->frequency = 0; spi_setfrequency(&priv->spidev, 400000); - return (FAR struct spi_dev_s *)priv; + return (struct spi_dev_s *)priv; } diff --git a/arch/arm/src/lpc31xx/lpc31_usbdev.c b/arch/arm/src/lpc31xx/lpc31_usbdev.c index d8ecc85a82..7667339166 100644 --- a/arch/arm/src/lpc31xx/lpc31_usbdev.c +++ b/arch/arm/src/lpc31xx/lpc31_usbdev.c @@ -351,10 +351,9 @@ static inline void lpc31_chgbits(uint32_t mask, uint32_t val, /* Request queue operations *************************************************/ -static FAR -struct lpc31_req_s *lpc31_rqdequeue(FAR struct lpc31_ep_s *privep); -static bool lpc31_rqenqueue(FAR struct lpc31_ep_s *privep, - FAR struct lpc31_req_s *req); +static struct lpc31_req_s *lpc31_rqdequeue(struct lpc31_ep_s *privep); +static bool lpc31_rqenqueue(struct lpc31_ep_s *privep, + struct lpc31_req_s *req); /* Low level data transfers and request operations **************************/ @@ -402,36 +401,35 @@ static bool lpc31_epcomplete(struct lpc31_usbdev_s *priv, uint8_t epphy); static int lpc31_usbinterrupt(int irq, - FAR void *context, FAR void *arg); + void *context, void *arg); /* Endpoint operations ******************************************************/ /* USB device controller operations *****************************************/ -static int lpc31_epconfigure(FAR struct usbdev_ep_s *ep, +static int lpc31_epconfigure(struct usbdev_ep_s *ep, const struct usb_epdesc_s *desc, bool last); -static int lpc31_epdisable(FAR struct usbdev_ep_s *ep); -static FAR -struct usbdev_req_s *lpc31_epallocreq(FAR struct usbdev_ep_s *ep); -static void lpc31_epfreereq(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *); +static int lpc31_epdisable(struct usbdev_ep_s *ep); +static struct usbdev_req_s *lpc31_epallocreq(struct usbdev_ep_s *ep); +static void lpc31_epfreereq(struct usbdev_ep_s *ep, + struct usbdev_req_s *); #ifdef CONFIG_USBDEV_DMA -static void *lpc31_epallocbuffer(FAR struct usbdev_ep_s *ep, +static void *lpc31_epallocbuffer(struct usbdev_ep_s *ep, unsigned bytes); -static void lpc31_epfreebuffer(FAR struct usbdev_ep_s *ep, - FAR void *buf); +static void lpc31_epfreebuffer(struct usbdev_ep_s *ep, + void *buf); #endif -static int lpc31_epsubmit(FAR struct usbdev_ep_s *ep, +static int lpc31_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req); -static int lpc31_epcancel(FAR struct usbdev_ep_s *ep, +static int lpc31_epcancel(struct usbdev_ep_s *ep, struct usbdev_req_s *req); -static int lpc31_epstall(FAR struct usbdev_ep_s *ep, bool resume); +static int lpc31_epstall(struct usbdev_ep_s *ep, bool resume); -static FAR struct usbdev_ep_s *lpc31_allocep(FAR struct usbdev_s *dev, +static struct usbdev_ep_s *lpc31_allocep(struct usbdev_s *dev, uint8_t epno, bool in, uint8_t eptype); -static void lpc31_freeep(FAR struct usbdev_s *dev, - FAR struct usbdev_ep_s *ep); +static void lpc31_freeep(struct usbdev_s *dev, + struct usbdev_ep_s *ep); static int lpc31_getframe(struct usbdev_s *dev); static int lpc31_wakeup(struct usbdev_s *dev); static int lpc31_selfpowered(struct usbdev_s *dev, bool selfpowered); @@ -623,10 +621,9 @@ static inline void lpc31_chgbits(uint32_t mask, uint32_t val, uint32_t addr) * ****************************************************************************/ -static FAR -struct lpc31_req_s *lpc31_rqdequeue(FAR struct lpc31_ep_s *privep) +static struct lpc31_req_s *lpc31_rqdequeue(struct lpc31_ep_s *privep) { - FAR struct lpc31_req_s *ret = privep->head; + struct lpc31_req_s *ret = privep->head; if (ret) { @@ -650,8 +647,8 @@ struct lpc31_req_s *lpc31_rqdequeue(FAR struct lpc31_ep_s *privep) * ****************************************************************************/ -static bool lpc31_rqenqueue(FAR struct lpc31_ep_s *privep, - FAR struct lpc31_req_s *req) +static bool lpc31_rqenqueue(struct lpc31_ep_s *privep, + struct lpc31_req_s *req) { bool is_empty = !privep->head; @@ -1784,7 +1781,7 @@ bool lpc31_epcomplete(struct lpc31_usbdev_s *priv, uint8_t epphy) * ****************************************************************************/ -static int lpc31_usbinterrupt(int irq, FAR void *context, FAR void *arg) +static int lpc31_usbinterrupt(int irq, void *context, void *arg) { struct lpc31_usbdev_s *priv = &g_usbdev; uint32_t disr; @@ -1979,11 +1976,11 @@ static int lpc31_usbinterrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static int lpc31_epconfigure(FAR struct usbdev_ep_s *ep, - FAR const struct usb_epdesc_s *desc, - bool last) +static int lpc31_epconfigure(struct usbdev_ep_s *ep, + const struct usb_epdesc_s *desc, + bool last) { - FAR struct lpc31_ep_s *privep = (FAR struct lpc31_ep_s *)ep; + struct lpc31_ep_s *privep = (struct lpc31_ep_s *)ep; usbtrace(TRACE_EPCONFIGURE, privep->epphy); DEBUGASSERT(desc->addr == ep->eplog); @@ -2081,9 +2078,9 @@ static int lpc31_epconfigure(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int lpc31_epdisable(FAR struct usbdev_ep_s *ep) +static int lpc31_epdisable(struct usbdev_ep_s *ep) { - FAR struct lpc31_ep_s *privep = (FAR struct lpc31_ep_s *)ep; + struct lpc31_ep_s *privep = (struct lpc31_ep_s *)ep; irqstate_t flags; #ifdef CONFIG_DEBUG_FEATURES @@ -2125,9 +2122,9 @@ static int lpc31_epdisable(FAR struct usbdev_ep_s *ep) * ****************************************************************************/ -static FAR struct usbdev_req_s *lpc31_epallocreq(FAR struct usbdev_ep_s *ep) +static struct usbdev_req_s *lpc31_epallocreq(struct usbdev_ep_s *ep) { - FAR struct lpc31_req_s *privreq; + struct lpc31_req_s *privreq; #ifdef CONFIG_DEBUG_FEATURES if (!ep) @@ -2137,9 +2134,9 @@ static FAR struct usbdev_req_s *lpc31_epallocreq(FAR struct usbdev_ep_s *ep) } #endif - usbtrace(TRACE_EPALLOCREQ, ((FAR struct lpc31_ep_s *)ep)->epphy); + usbtrace(TRACE_EPALLOCREQ, ((struct lpc31_ep_s *)ep)->epphy); - privreq = (FAR struct lpc31_req_s *)kmm_malloc(sizeof(struct lpc31_req_s)); + privreq = (struct lpc31_req_s *)kmm_malloc(sizeof(struct lpc31_req_s)); if (!privreq) { usbtrace(TRACE_DEVERROR(LPC31_TRACEERR_ALLOCFAIL), 0); @@ -2158,10 +2155,10 @@ static FAR struct usbdev_req_s *lpc31_epallocreq(FAR struct usbdev_ep_s *ep) * ****************************************************************************/ -static void lpc31_epfreereq(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static void lpc31_epfreereq(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct lpc31_req_s *privreq = (FAR struct lpc31_req_s *)req; + struct lpc31_req_s *privreq = (struct lpc31_req_s *)req; #ifdef CONFIG_DEBUG_FEATURES if (!ep || !req) @@ -2171,7 +2168,7 @@ static void lpc31_epfreereq(FAR struct usbdev_ep_s *ep, } #endif - usbtrace(TRACE_EPFREEREQ, ((FAR struct lpc31_ep_s *)ep)->epphy); + usbtrace(TRACE_EPFREEREQ, ((struct lpc31_ep_s *)ep)->epphy); kmm_free(privreq); } @@ -2184,7 +2181,7 @@ static void lpc31_epfreereq(FAR struct usbdev_ep_s *ep, ****************************************************************************/ #ifdef CONFIG_USBDEV_DMA -static void *lpc31_epallocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes) +static void *lpc31_epallocbuffer(struct usbdev_ep_s *ep, unsigned bytes) { usbtrace(TRACE_EPALLOCBUFFER, privep->epphy); @@ -2205,8 +2202,8 @@ static void *lpc31_epallocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes) ****************************************************************************/ #ifdef CONFIG_USBDEV_DMA -static void lpc31_epfreebuffer(FAR struct usbdev_ep_s *ep, - FAR void *buf) +static void lpc31_epfreebuffer(struct usbdev_ep_s *ep, + void *buf) { usbtrace(TRACE_EPFREEBUFFER, privep->epphy); @@ -2226,12 +2223,12 @@ static void lpc31_epfreebuffer(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int lpc31_epsubmit(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static int lpc31_epsubmit(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct lpc31_req_s *privreq = (FAR struct lpc31_req_s *)req; - FAR struct lpc31_ep_s *privep = (FAR struct lpc31_ep_s *)ep; - FAR struct lpc31_usbdev_s *priv; + struct lpc31_req_s *privreq = (struct lpc31_req_s *)req; + struct lpc31_ep_s *privep = (struct lpc31_ep_s *)ep; + struct lpc31_usbdev_s *priv; irqstate_t flags; int ret = OK; @@ -2297,10 +2294,10 @@ static int lpc31_epsubmit(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int lpc31_epcancel(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static int lpc31_epcancel(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct lpc31_ep_s *privep = (FAR struct lpc31_ep_s *)ep; + struct lpc31_ep_s *privep = (struct lpc31_ep_s *)ep; irqstate_t flags; #ifdef CONFIG_DEBUG_FEATURES @@ -2334,9 +2331,9 @@ static int lpc31_epcancel(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int lpc31_epstall(FAR struct usbdev_ep_s *ep, bool resume) +static int lpc31_epstall(struct usbdev_ep_s *ep, bool resume) { - FAR struct lpc31_ep_s *privep = (FAR struct lpc31_ep_s *)ep; + struct lpc31_ep_s *privep = (struct lpc31_ep_s *)ep; irqstate_t flags; /* STALL or RESUME the endpoint */ @@ -2390,11 +2387,11 @@ static int lpc31_epstall(FAR struct usbdev_ep_s *ep, bool resume) * ****************************************************************************/ -static FAR struct usbdev_ep_s *lpc31_allocep(FAR struct usbdev_s *dev, - uint8_t eplog, - bool in, uint8_t eptype) +static struct usbdev_ep_s *lpc31_allocep(struct usbdev_s *dev, + uint8_t eplog, + bool in, uint8_t eptype) { - FAR struct lpc31_usbdev_s *priv = (FAR struct lpc31_usbdev_s *)dev; + struct lpc31_usbdev_s *priv = (struct lpc31_usbdev_s *)dev; uint32_t epset = LPC31_EPALLSET & ~LPC31_EPCTRLSET; irqstate_t flags; int epndx = 0; @@ -2516,11 +2513,11 @@ static FAR struct usbdev_ep_s *lpc31_allocep(FAR struct usbdev_s *dev, * ****************************************************************************/ -static void lpc31_freeep(FAR struct usbdev_s *dev, - FAR struct usbdev_ep_s *ep) +static void lpc31_freeep(struct usbdev_s *dev, + struct usbdev_ep_s *ep) { - FAR struct lpc31_usbdev_s *priv = (FAR struct lpc31_usbdev_s *)dev; - FAR struct lpc31_ep_s *privep = (FAR struct lpc31_ep_s *)ep; + struct lpc31_usbdev_s *priv = (struct lpc31_usbdev_s *)dev; + struct lpc31_ep_s *privep = (struct lpc31_ep_s *)ep; irqstate_t flags; usbtrace(TRACE_DEVFREEEP, (uint16_t)privep->epphy); @@ -2546,7 +2543,7 @@ static void lpc31_freeep(FAR struct usbdev_s *dev, static int lpc31_getframe(struct usbdev_s *dev) { #ifdef CONFIG_LPC31_USBDEV_FRAME_INTERRUPT - FAR struct lpc31_usbdev_s *priv = (FAR struct lpc31_usbdev_s *)dev; + struct lpc31_usbdev_s *priv = (struct lpc31_usbdev_s *)dev; /* Return last valid value of SOF read by the interrupt handler */ @@ -2593,7 +2590,7 @@ static int lpc31_wakeup(struct usbdev_s *dev) static int lpc31_selfpowered(struct usbdev_s *dev, bool selfpowered) { - FAR struct lpc31_usbdev_s *priv = (FAR struct lpc31_usbdev_s *)dev; + struct lpc31_usbdev_s *priv = (struct lpc31_usbdev_s *)dev; usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered); diff --git a/arch/arm/src/lpc43xx/lpc43_adc.c b/arch/arm/src/lpc43xx/lpc43_adc.c index 104158ce44..3ddc622664 100644 --- a/arch/arm/src/lpc43xx/lpc43_adc.c +++ b/arch/arm/src/lpc43xx/lpc43_adc.c @@ -116,7 +116,7 @@ struct up_dev_s { - FAR const struct adc_callback_s *cb; + const struct adc_callback_s *cb; uint8_t mask; uint8_t mask_int; uint32_t freq; @@ -131,14 +131,14 @@ struct up_dev_s /* ADC methods */ -static int adc_bind(FAR struct adc_dev_s *dev, - FAR const struct adc_callback_s *callback); -static void adc_reset(FAR struct adc_dev_s *dev); -static int adc_setup(FAR struct adc_dev_s *dev); -static void adc_shutdown(FAR struct adc_dev_s *dev); -static void adc_rxint(FAR struct adc_dev_s *dev, bool enable); -static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg); -static int adc_interrupt(int irq, void *context, FAR void *arg); +static int adc_bind(struct adc_dev_s *dev, + const struct adc_callback_s *callback); +static void adc_reset(struct adc_dev_s *dev); +static int adc_setup(struct adc_dev_s *dev); +static void adc_shutdown(struct adc_dev_s *dev); +static void adc_rxint(struct adc_dev_s *dev, bool enable); +static int adc_ioctl(struct adc_dev_s *dev, int cmd, unsigned long arg); +static int adc_interrupt(int irq, void *context, void *arg); /**************************************************************************** * Private Data @@ -184,10 +184,10 @@ static struct adc_dev_s g_adcdev = * ****************************************************************************/ -static int adc_bind(FAR struct adc_dev_s *dev, - FAR const struct adc_callback_s *callback) +static int adc_bind(struct adc_dev_s *dev, + const struct adc_callback_s *callback) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->ad_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->ad_priv; DEBUGASSERT(priv != NULL); priv->cb = callback; @@ -203,9 +203,9 @@ static int adc_bind(FAR struct adc_dev_s *dev, * ****************************************************************************/ -static void adc_reset(FAR struct adc_dev_s *dev) +static void adc_reset(struct adc_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->ad_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->ad_priv; irqstate_t flags; uint32_t regval; @@ -350,9 +350,9 @@ static void adc_reset(FAR struct adc_dev_s *dev) * ****************************************************************************/ -static int adc_setup(FAR struct adc_dev_s *dev) +static int adc_setup(struct adc_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->ad_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->ad_priv; int ret = irq_attach(priv->irq, adc_interrupt, NULL); if (ret == OK) @@ -372,9 +372,9 @@ static int adc_setup(FAR struct adc_dev_s *dev) * ****************************************************************************/ -static void adc_shutdown(FAR struct adc_dev_s *dev) +static void adc_shutdown(struct adc_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->ad_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->ad_priv; if (priv->timer) { @@ -401,9 +401,9 @@ static void adc_shutdown(FAR struct adc_dev_s *dev) * ****************************************************************************/ -static void adc_rxint(FAR struct adc_dev_s *dev, bool enable) +static void adc_rxint(struct adc_dev_s *dev, bool enable) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->ad_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->ad_priv; if (enable) { @@ -445,7 +445,7 @@ static void adc_rxint(FAR struct adc_dev_s *dev, bool enable) * ****************************************************************************/ -static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg) +static int adc_ioctl(struct adc_dev_s *dev, int cmd, unsigned long arg) { /* No ioctl commands supported */ @@ -460,9 +460,9 @@ static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg) * ****************************************************************************/ -static int adc_interrupt(int irq, void *context, FAR void *arg) +static int adc_interrupt(int irq, void *context, void *arg) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)g_adcdev.ad_priv; + struct up_dev_s *priv = (struct up_dev_s *)g_adcdev.ad_priv; uint32_t regval; int i; @@ -524,7 +524,7 @@ static int adc_interrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -FAR struct adc_dev_s *lpc43_adcinitialize(void) +struct adc_dev_s *lpc43_adcinitialize(void) { return &g_adcdev; } diff --git a/arch/arm/src/lpc43xx/lpc43_adc.h b/arch/arm/src/lpc43xx/lpc43_adc.h index 881a8e7ac3..82b79ed918 100644 --- a/arch/arm/src/lpc43xx/lpc43_adc.h +++ b/arch/arm/src/lpc43xx/lpc43_adc.h @@ -69,7 +69,7 @@ extern "C" * ****************************************************************************/ -FAR struct adc_dev_s *lpc43_adcinitialize(void); +struct adc_dev_s *lpc43_adcinitialize(void); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/lpc43xx/lpc43_aes.c b/arch/arm/src/lpc43xx/lpc43_aes.c index a26b863ff0..1957cb6941 100644 --- a/arch/arm/src/lpc43xx/lpc43_aes.c +++ b/arch/arm/src/lpc43xx/lpc43_aes.c @@ -51,8 +51,8 @@ static struct lpc43_aes_s *g_aes; * Private Functions ****************************************************************************/ -static int aes_init(FAR const void *iv, - FAR const void *key, uint32_t keysize, +static int aes_init(const void *iv, + const void *key, uint32_t keysize, int mode, int encrypt) { unsigned int cmd = 0; @@ -134,8 +134,8 @@ static int aes_init(FAR const void *iv, return 0; } -static int aes_update(FAR const void *out, - uint32_t *outl, FAR const void *in, +static int aes_update(const void *out, + uint32_t *outl, const void *in, uint32_t inl) { if (g_aes == NULL) diff --git a/arch/arm/src/lpc43xx/lpc43_allocateheap.c b/arch/arm/src/lpc43xx/lpc43_allocateheap.c index 0d1fd95c72..e9a59bc7e6 100644 --- a/arch/arm/src/lpc43xx/lpc43_allocateheap.c +++ b/arch/arm/src/lpc43xx/lpc43_allocateheap.c @@ -343,7 +343,7 @@ static uint8_t g_mem_region_next = 0; ****************************************************************************/ #ifdef CONFIG_HEAP_COLORATION -static inline void up_heap_color(FAR void *start, size_t size) +static inline void up_heap_color(void *start, size_t size) { memset(start, HEAP_COLOR, size); } @@ -360,7 +360,7 @@ static inline void up_heap_color(FAR void *start, size_t size) ****************************************************************************/ #ifdef MM_HAVE_REGION -static void mem_addregion(FAR void *region_start, size_t region_size) +static void mem_addregion(void *region_start, size_t region_size) { if (g_mem_region_next <= CONFIG_MM_REGIONS) { @@ -408,7 +408,7 @@ static void mem_addregion(FAR void *region_start, size_t region_size) * ****************************************************************************/ -void up_allocate_heap(FAR void **heap_start, size_t *heap_size) +void up_allocate_heap(void **heap_start, size_t *heap_size) { #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) /* Get the unaligned size and position of the user-space heap. @@ -437,12 +437,12 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) /* Return the user-space heap settings */ board_autoled_on(LED_HEAPALLOCATE); - *heap_start = (FAR void *)ubase; + *heap_start = (void *)ubase; *heap_size = usize; /* Colorize the heap for debug */ - up_heap_color((FAR void *)ubase, usize); + up_heap_color((void *)ubase, usize); /* Allow user-mode access to the user heap memory */ @@ -452,7 +452,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) /* Return the heap settings */ board_autoled_on(LED_HEAPALLOCATE); - *heap_start = (FAR void *)g_idle_topstack; + *heap_start = (void *)g_idle_topstack; *heap_size = CONFIG_RAM_END - g_idle_topstack; /* Colorize the heap for debug */ @@ -477,7 +477,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) ****************************************************************************/ #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) -void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) +void up_allocate_kheap(void **heap_start, size_t *heap_size) { /* Get the unaligned size and position of the user-space heap. * This heap begins after the user-space .bss section at an offset @@ -506,7 +506,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) * that was not dedicated to the user heap). */ - *heap_start = (FAR void *)USERSPACE->us_bssend; + *heap_start = (void *)USERSPACE->us_bssend; *heap_size = usize; } #endif @@ -531,8 +531,8 @@ void arm_addregion(void) #ifdef MM_USE_LOCSRAM_BANK1 /* Add the SRAM to the user heap */ - mem_addregion((FAR void *)LPC43_LOCSRAM_BANK1_BASE, - LPC43_LOCSRAM_BANK1_SIZE); + mem_addregion((void *)LPC43_LOCSRAM_BANK1_BASE, + LPC43_LOCSRAM_BANK1_SIZE); #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) /* Allow user-mode access to the SRAM heap */ @@ -545,8 +545,8 @@ void arm_addregion(void) #ifdef MM_USE_AHBSRAM_BANK0 /* Add the SRAM to the user heap */ - mem_addregion((FAR void *)LPC43_AHBSRAM_BANK0_BASE, - LPC43_AHBSRAM_BANK0_SIZE); + mem_addregion((void *)LPC43_AHBSRAM_BANK0_BASE, + LPC43_AHBSRAM_BANK0_SIZE); #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) /* Allow user-mode access to the SRAM heap */ @@ -559,8 +559,8 @@ void arm_addregion(void) #ifdef MM_USE_AHBSRAM_BANK1 /* Add the SRAM to the user heap */ - mem_addregion((FAR void *)LPC43_AHBSRAM_BANK1_BASE, - LPC43_AHBSRAM_BANK1_SIZE); + mem_addregion((void *)LPC43_AHBSRAM_BANK1_BASE, + LPC43_AHBSRAM_BANK1_SIZE); #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) /* Allow user-mode access to the SRAM heap */ @@ -573,7 +573,7 @@ void arm_addregion(void) #ifdef MM_USE_AHBSRAM_BANK2 /* Add the SRAM heap to the user heap */ - mem_addregion((FAR void *)MM_DMAREGION_BASE, MM_DMAREGION_SIZE); + mem_addregion((void *)MM_DMAREGION_BASE, MM_DMAREGION_SIZE); #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) /* Allow user-mode access to the SRAM heap */ @@ -585,7 +585,7 @@ void arm_addregion(void) #ifdef MM_USE_EXTSDRAM0 /* Add the SDRAM to the user heap */ - mem_addregion((FAR void *)MM_EXTSDRAM0_REGION, MM_EXTSDRAM0_SIZE); + mem_addregion((void *)MM_EXTSDRAM0_REGION, MM_EXTSDRAM0_SIZE); #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) /* Allow user-mode access to the SDRAM heap */ @@ -597,7 +597,7 @@ void arm_addregion(void) #ifdef MM_USE_EXTSDRAM1 /* Add the SDRAM to the user heap */ - mem_addregion((FAR void *)MM_EXTSDRAM1_REGION, MM_EXTSDRAM1_SIZE); + mem_addregion((void *)MM_EXTSDRAM1_REGION, MM_EXTSDRAM1_SIZE); #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) /* Allow user-mode access to the SDRAM heap */ @@ -609,7 +609,7 @@ void arm_addregion(void) #ifdef MM_USE_EXTSDRAM2 /* Add the SDRAM to the user heap */ - mem_addregion((FAR void *)MM_EXTSDRAM2_REGION, MM_EXTSDRAM2_SIZE); + mem_addregion((void *)MM_EXTSDRAM2_REGION, MM_EXTSDRAM2_SIZE); #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) /* Allow user-mode access to the SDRAM heap */ @@ -621,7 +621,7 @@ void arm_addregion(void) #ifdef MM_USE_EXTSDRAM3 /* Add the SDRAM to the user heap */ - mem_addregion((FAR void *)MM_EXTSDRAM3_REGION, MM_EXTSDRAM3_SIZE); + mem_addregion((void *)MM_EXTSDRAM3_REGION, MM_EXTSDRAM3_SIZE); #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) /* Allow user-mode access to the SDRAM heap */ diff --git a/arch/arm/src/lpc43xx/lpc43_can.c b/arch/arm/src/lpc43xx/lpc43_can.c index 249384fc4f..27771be209 100644 --- a/arch/arm/src/lpc43xx/lpc43_can.c +++ b/arch/arm/src/lpc43xx/lpc43_can.c @@ -144,26 +144,26 @@ static void can_putcommon(uint32_t addr, uint32_t value); /* CAN methods */ -static void can_reset(FAR struct can_dev_s *dev); -static int can_setup(FAR struct can_dev_s *dev); -static void can_shutdown(FAR struct can_dev_s *dev); -static void can_rxint(FAR struct can_dev_s *dev, bool enable); -static void can_txint(FAR struct can_dev_s *dev, bool enable); -static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg); -static int can_remoterequest(FAR struct can_dev_s *dev, uint16_t id); -static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg); -static bool candev_txready(FAR struct can_dev_s *dev); -static bool candev_txempty(FAR struct can_dev_s *dev); +static void can_reset(struct can_dev_s *dev); +static int can_setup(struct can_dev_s *dev); +static void can_shutdown(struct can_dev_s *dev); +static void can_rxint(struct can_dev_s *dev, bool enable); +static void can_txint(struct can_dev_s *dev, bool enable); +static int can_ioctl(struct can_dev_s *dev, int cmd, unsigned long arg); +static int can_remoterequest(struct can_dev_s *dev, uint16_t id); +static int can_send(struct can_dev_s *dev, struct can_msg_s *msg); +static bool candev_txready(struct can_dev_s *dev); +static bool candev_txempty(struct can_dev_s *dev); /* CAN interrupts */ #ifdef CONFIG_LPC43_CAN0 -static int can0_interrupt(int irq, void *context, FAR void *arg); +static int can0_interrupt(int irq, void *context, void *arg); #endif #ifdef CONFIG_LPC43_CAN1 -static int can1_interrupt(int irq, void *context, FAR void *arg); +static int can1_interrupt(int irq, void *context, void *arg); #endif -static void can_interrupt(FAR struct can_dev_s *dev); +static void can_interrupt(struct can_dev_s *dev); /* Message Processing */ @@ -438,9 +438,9 @@ static void can_putcommon(uint32_t addr, uint32_t value) * ****************************************************************************/ -static void can_reset(FAR struct can_dev_s *dev) +static void can_reset(struct can_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; uint32_t regval; caninfo("CAN%d reset\n", priv->port); @@ -481,9 +481,9 @@ static void can_reset(FAR struct can_dev_s *dev) * ****************************************************************************/ -static int can_setup(FAR struct can_dev_s *dev) +static int can_setup(struct can_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *) dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; uint32_t regval; uint8_t i; int ret = ERROR; @@ -556,9 +556,9 @@ static int can_setup(FAR struct can_dev_s *dev) * ****************************************************************************/ -static void can_shutdown(FAR struct can_dev_s *dev) +static void can_shutdown(struct can_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *) dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; uint32_t regval; caninfo("CAN%d\n", priv->port); @@ -599,9 +599,9 @@ static void can_shutdown(FAR struct can_dev_s *dev) * ****************************************************************************/ -static void can_rxint(FAR struct can_dev_s *dev, bool enable) +static void can_rxint(struct can_dev_s *dev, bool enable) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *) dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; if (enable == true) { @@ -631,7 +631,7 @@ static void can_rxint(FAR struct can_dev_s *dev, bool enable) * ****************************************************************************/ -static void can_txint(FAR struct can_dev_s *dev, bool enable) +static void can_txint(struct can_dev_s *dev, bool enable) { /* The TX interrupt is automatically enabled in can_send within a * message object. @@ -652,7 +652,7 @@ static void can_txint(FAR struct can_dev_s *dev, bool enable) * ****************************************************************************/ -static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg) +static int can_ioctl(struct can_dev_s *dev, int cmd, unsigned long arg) { caninfo("Fix me:Not Implemented\n"); return 0; @@ -672,7 +672,7 @@ static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg) * ****************************************************************************/ -static int can_remoterequest(FAR struct can_dev_s *dev, uint16_t id) +static int can_remoterequest(struct can_dev_s *dev, uint16_t id) { caninfo("Fix me:Not Implemented\n"); return 0; @@ -701,9 +701,9 @@ static int can_remoterequest(FAR struct can_dev_s *dev, uint16_t id) * ****************************************************************************/ -static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg) +static int can_send(struct can_dev_s *dev, struct can_msg_s *msg) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *) dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; uint32_t regval; uint32_t clz; uint32_t id; @@ -794,9 +794,9 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg) * ****************************************************************************/ -static bool candev_txready(FAR struct can_dev_s *dev) +static bool candev_txready(struct can_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *) dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; if (can_getreg(priv, LPC43_CAN_MSGV2_OFFSET) & 0x8000) { @@ -829,9 +829,9 @@ static bool candev_txready(FAR struct can_dev_s *dev) * ****************************************************************************/ -static bool candev_txempty(FAR struct can_dev_s *dev) +static bool candev_txempty(struct can_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *) dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; return (!((can_getreg(priv, LPC43_CAN_MSGV2_OFFSET)) & 0xffff)); } @@ -851,7 +851,7 @@ static bool candev_txempty(FAR struct can_dev_s *dev) ****************************************************************************/ #ifdef CONFIG_LPC43_CAN0 -static int can0_interrupt(int irq, void *context, FAR void *arg) +static int can0_interrupt(int irq, void *context, void *arg) { can_interrupt(&g_can0dev); return OK; @@ -859,7 +859,7 @@ static int can0_interrupt(int irq, void *context, FAR void *arg) #endif #ifdef CONFIG_LPC43_CAN1 -static int can1_interrupt(int irq, void *context, FAR void *arg) +static int can1_interrupt(int irq, void *context, void *arg) { can_interrupt(&g_can1dev); return OK; @@ -875,9 +875,9 @@ static int can1_interrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -static void can_interrupt(FAR struct can_dev_s *dev) +static void can_interrupt(struct can_dev_s *dev) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *) dev->cd_priv; + struct up_dev_s *priv = (struct up_dev_s *)dev->cd_priv; uint32_t regval = 0; uint32_t msgindex = 0; @@ -1206,9 +1206,9 @@ static int can_bittiming(struct up_dev_s *priv) * ****************************************************************************/ -FAR struct can_dev_s *lpc43_caninitialize(int port) +struct can_dev_s *lpc43_caninitialize(int port) { - FAR struct can_dev_s *candev; + struct can_dev_s *candev; irqstate_t flags; uint32_t regval; diff --git a/arch/arm/src/lpc43xx/lpc43_can.h b/arch/arm/src/lpc43xx/lpc43_can.h index c2c29c2892..8d33be6c4b 100644 --- a/arch/arm/src/lpc43xx/lpc43_can.h +++ b/arch/arm/src/lpc43xx/lpc43_can.h @@ -57,7 +57,7 @@ extern "C" #if defined(CONFIG_CAN) && (defined(CONFIG_LPC43_CAN0) || defined(CONFIG_LPC43_CAN1)) struct can_dev_s; -FAR struct can_dev_s *lpc43_caninitialize(int port); +struct can_dev_s *lpc43_caninitialize(int port); #endif #ifdef __cplusplus diff --git a/arch/arm/src/lpc43xx/lpc43_dac.c b/arch/arm/src/lpc43xx/lpc43_dac.c index 51beb36c71..cea12cb6f6 100644 --- a/arch/arm/src/lpc43xx/lpc43_dac.c +++ b/arch/arm/src/lpc43xx/lpc43_dac.c @@ -80,13 +80,13 @@ /* DAC methods */ -static void dac_reset(FAR struct dac_dev_s *dev); -static int dac_setup(FAR struct dac_dev_s *dev); -static void dac_shutdown(FAR struct dac_dev_s *dev); -static void dac_txint(FAR struct dac_dev_s *dev, bool enable); -static int dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg); -static int dac_ioctl(FAR struct dac_dev_s *dev, int cmd, unsigned long arg); -static int dac_interrupt(int irq, void *context, FAR void *arg); +static void dac_reset(struct dac_dev_s *dev); +static int dac_setup(struct dac_dev_s *dev); +static void dac_shutdown(struct dac_dev_s *dev); +static void dac_txint(struct dac_dev_s *dev, bool enable); +static int dac_send(struct dac_dev_s *dev, struct dac_msg_s *msg); +static int dac_ioctl(struct dac_dev_s *dev, int cmd, unsigned long arg); +static int dac_interrupt(int irq, void *context, void *arg); /**************************************************************************** * Private Data @@ -115,7 +115,7 @@ static struct dac_dev_s g_dacdev = * is called, before ao_setup() and on error conditions. */ -static void dac_reset(FAR struct dac_dev_s *dev) +static void dac_reset(struct dac_dev_s *dev) { irqstate_t flags; uint32_t regval; @@ -140,7 +140,7 @@ static void dac_reset(FAR struct dac_dev_s *dev) * are all disabled upon return. */ -static int dac_setup(FAR struct dac_dev_s *dev) +static int dac_setup(struct dac_dev_s *dev) { return OK; } @@ -149,17 +149,17 @@ static int dac_setup(FAR struct dac_dev_s *dev) * This method reverses the operation the setup method. */ -static void dac_shutdown(FAR struct dac_dev_s *dev) +static void dac_shutdown(struct dac_dev_s *dev) { } /* Call to enable or disable TX interrupts */ -static void dac_txint(FAR struct dac_dev_s *dev, bool enable) +static void dac_txint(struct dac_dev_s *dev, bool enable) { } -static int dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg) +static int dac_send(struct dac_dev_s *dev, struct dac_msg_s *msg) { putreg32((msg->am_data >> 16) & 0xfffff, LPC43_DAC_CR); dac_txdone(&g_dacdev); @@ -168,13 +168,13 @@ static int dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg) /* All ioctl calls will be routed through this method */ -static int dac_ioctl(FAR struct dac_dev_s *dev, int cmd, unsigned long arg) +static int dac_ioctl(struct dac_dev_s *dev, int cmd, unsigned long arg) { aerr("ERROR: Fix me:Not Implemented\n"); return 0; } -static int dac_interrupt(int irq, void *context, FAR void *arg) +static int dac_interrupt(int irq, void *context, void *arg) { } @@ -193,7 +193,7 @@ static int dac_interrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -FAR struct dac_dev_s *lpc43_dacinitialize(void) +struct dac_dev_s *lpc43_dacinitialize(void) { return &g_dacdev; } diff --git a/arch/arm/src/lpc43xx/lpc43_dac.h b/arch/arm/src/lpc43xx/lpc43_dac.h index 16b6aada76..92793c643f 100644 --- a/arch/arm/src/lpc43xx/lpc43_dac.h +++ b/arch/arm/src/lpc43xx/lpc43_dac.h @@ -69,7 +69,7 @@ extern "C" * ****************************************************************************/ -FAR struct dac_dev_s *lpc43_dacinitialize(void); +struct dac_dev_s *lpc43_dacinitialize(void); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/lpc43xx/lpc43_ehci.c b/arch/arm/src/lpc43xx/lpc43_ehci.c index 6e9a80234b..ab8a8375aa 100644 --- a/arch/arm/src/lpc43xx/lpc43_ehci.c +++ b/arch/arm/src/lpc43xx/lpc43_ehci.c @@ -379,7 +379,7 @@ struct lpc43_ehci_trace_s uint16_t id; bool fmt2; #endif - FAR const char *string; + const char *string; }; #endif /* HAVE_USBHOST_TRACE */ @@ -482,7 +482,7 @@ static ssize_t lpc43_transfer_wait(struct lpc43_epinfo_s *epinfo); #ifdef CONFIG_USBHOST_ASYNCH static inline int lpc43_ioc_async_setup(struct lpc43_rhport_s *rhport, struct lpc43_epinfo_s *epinfo, usbhost_asynch_t callback, - FAR void *arg); + void *arg); static void lpc43_asynch_completion(struct lpc43_epinfo_s *epinfo); #endif @@ -501,51 +501,51 @@ static inline void lpc43_ioc_bottomhalf(void); static inline void lpc43_portsc_bottomhalf(void); static inline void lpc43_syserr_bottomhalf(void); static inline void lpc43_async_advance_bottomhalf(void); -static void lpc43_ehci_bottomhalf(FAR void *arg); -static int lpc43_ehci_interrupt(int irq, FAR void *context, FAR void *arg); +static void lpc43_ehci_bottomhalf(void *arg); +static int lpc43_ehci_interrupt(int irq, void *context, void *arg); /* USB Host Controller Operations *******************************************/ -static int lpc43_wait(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s **hport); -static int lpc43_rh_enumerate(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport); -static int lpc43_enumerate(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport); +static int lpc43_wait(struct usbhost_connection_s *conn, + struct usbhost_hubport_s **hport); +static int lpc43_rh_enumerate(struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport); +static int lpc43_enumerate(struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport); -static int lpc43_ep0configure(FAR struct usbhost_driver_s *drvr, +static int lpc43_ep0configure(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, uint8_t funcaddr, uint8_t speed, uint16_t maxpacketsize); -static int lpc43_epalloc(FAR struct usbhost_driver_s *drvr, - FAR const struct usbhost_epdesc_s *epdesc, - FAR usbhost_ep_t *ep); -static int lpc43_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep); -static int lpc43_alloc(FAR struct usbhost_driver_s *drvr, - FAR uint8_t **buffer, FAR size_t *maxlen); -static int lpc43_free(FAR struct usbhost_driver_s *drvr, - FAR uint8_t *buffer); -static int lpc43_ioalloc(FAR struct usbhost_driver_s *drvr, - FAR uint8_t **buffer, size_t buflen); -static int lpc43_iofree(FAR struct usbhost_driver_s *drvr, - FAR uint8_t *buffer); -static int lpc43_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, - FAR const struct usb_ctrlreq_s *req, FAR uint8_t *buffer); -static int lpc43_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, - FAR const struct usb_ctrlreq_s *req, FAR const uint8_t *buffer); -static ssize_t lpc43_transfer(FAR struct usbhost_driver_s *drvr, - usbhost_ep_t ep, FAR uint8_t *buffer, size_t buflen); +static int lpc43_epalloc(struct usbhost_driver_s *drvr, + const struct usbhost_epdesc_s *epdesc, + usbhost_ep_t *ep); +static int lpc43_epfree(struct usbhost_driver_s *drvr, usbhost_ep_t ep); +static int lpc43_alloc(struct usbhost_driver_s *drvr, + uint8_t **buffer, size_t *maxlen); +static int lpc43_free(struct usbhost_driver_s *drvr, + uint8_t *buffer); +static int lpc43_ioalloc(struct usbhost_driver_s *drvr, + uint8_t **buffer, size_t buflen); +static int lpc43_iofree(struct usbhost_driver_s *drvr, + uint8_t *buffer); +static int lpc43_ctrlin(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, + const struct usb_ctrlreq_s *req, uint8_t *buffer); +static int lpc43_ctrlout(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, + const struct usb_ctrlreq_s *req, const uint8_t *buffer); +static ssize_t lpc43_transfer(struct usbhost_driver_s *drvr, + usbhost_ep_t ep, uint8_t *buffer, size_t buflen); #ifdef CONFIG_USBHOST_ASYNCH -static int lpc43_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, - FAR uint8_t *buffer, size_t buflen, usbhost_asynch_t callback, - FAR void *arg); +static int lpc43_asynch(struct usbhost_driver_s *drvr, usbhost_ep_t ep, + uint8_t *buffer, size_t buflen, usbhost_asynch_t callback, + void *arg); #endif -static int lpc43_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep); +static int lpc43_cancel(struct usbhost_driver_s *drvr, usbhost_ep_t ep); #ifdef CONFIG_USBHOST_HUB -static int lpc43_connect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport, bool connected); +static int lpc43_connect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport, bool connected); #endif -static void lpc43_disconnect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport); +static void lpc43_disconnect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport); /* Initialization ***********************************************************/ @@ -2514,7 +2514,7 @@ static ssize_t lpc43_transfer_wait(struct lpc43_epinfo_s *epinfo) static inline int lpc43_ioc_async_setup(struct lpc43_rhport_s *rhport, struct lpc43_epinfo_s *epinfo, usbhost_asynch_t callback, - FAR void *arg) + void *arg) { irqstate_t flags; int ret = -ENODEV; @@ -3155,7 +3155,7 @@ static inline void lpc43_async_advance_bottomhalf(void) * ****************************************************************************/ -static void lpc43_ehci_bottomhalf(FAR void *arg) +static void lpc43_ehci_bottomhalf(void *arg) { uint32_t pending = (uint32_t)arg; @@ -3291,7 +3291,7 @@ static void lpc43_ehci_bottomhalf(FAR void *arg) * ****************************************************************************/ -static int lpc43_ehci_interrupt(int irq, FAR void *context, FAR void *arg) +static int lpc43_ehci_interrupt(int irq, void *context, void *arg) { uint32_t usbsts; uint32_t pending; @@ -3323,7 +3323,7 @@ static int lpc43_ehci_interrupt(int irq, FAR void *context, FAR void *arg) DEBUGASSERT(work_available(&g_ehci.work)); DEBUGVERIFY(work_queue(HPWORK, &g_ehci.work, lpc43_ehci_bottomhalf, - (FAR void *)pending, 0)); + (void *)pending, 0)); /* Disable further EHCI interrupts so that we do not overrun the work * queue. @@ -3366,8 +3366,8 @@ static int lpc43_ehci_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static int lpc43_wait(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s **hport) +static int lpc43_wait(struct usbhost_connection_s *conn, + struct usbhost_hubport_s **hport) { irqstate_t flags; int rhpndx; @@ -3469,8 +3469,8 @@ static int lpc43_wait(FAR struct usbhost_connection_s *conn, * ****************************************************************************/ -static int lpc43_rh_enumerate(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport) +static int lpc43_rh_enumerate(struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport) { struct lpc43_rhport_s *rhport; volatile uint32_t *regaddr; @@ -3711,8 +3711,8 @@ static int lpc43_rh_enumerate(FAR struct usbhost_connection_s *conn, return OK; } -static int lpc43_enumerate(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport) +static int lpc43_enumerate(struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport) { int ret; @@ -3781,7 +3781,7 @@ static int lpc43_enumerate(FAR struct usbhost_connection_s *conn, * ****************************************************************************/ -static int lpc43_ep0configure(FAR struct usbhost_driver_s *drvr, +static int lpc43_ep0configure(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, uint8_t funcaddr, uint8_t speed, uint16_t maxpacketsize) { @@ -3829,9 +3829,9 @@ static int lpc43_ep0configure(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int lpc43_epalloc(FAR struct usbhost_driver_s *drvr, - FAR const struct usbhost_epdesc_s *epdesc, - FAR usbhost_ep_t *ep) +static int lpc43_epalloc(struct usbhost_driver_s *drvr, + const struct usbhost_epdesc_s *epdesc, + usbhost_ep_t *ep) { struct lpc43_epinfo_s *epinfo; struct usbhost_hubport_s *hport; @@ -3915,7 +3915,7 @@ static int lpc43_epalloc(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int lpc43_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) +static int lpc43_epfree(struct usbhost_driver_s *drvr, usbhost_ep_t ep) { struct lpc43_epinfo_s *epinfo = (struct lpc43_epinfo_s *)ep; @@ -3962,15 +3962,15 @@ static int lpc43_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) * ****************************************************************************/ -static int lpc43_alloc(FAR struct usbhost_driver_s *drvr, - FAR uint8_t **buffer, FAR size_t *maxlen) +static int lpc43_alloc(struct usbhost_driver_s *drvr, + uint8_t **buffer, size_t *maxlen) { int ret = -ENOMEM; DEBUGASSERT(drvr && buffer && maxlen); /* There is no special requirements for transfer/descriptor buffers. */ - *buffer = (FAR uint8_t *)kmm_malloc(CONFIG_LPC43_EHCI_BUFSIZE); + *buffer = (uint8_t *)kmm_malloc(CONFIG_LPC43_EHCI_BUFSIZE); if (*buffer) { *maxlen = CONFIG_LPC43_EHCI_BUFSIZE; @@ -4004,7 +4004,7 @@ static int lpc43_alloc(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int lpc43_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer) +static int lpc43_free(struct usbhost_driver_s *drvr, uint8_t *buffer) { DEBUGASSERT(drvr && buffer); @@ -4045,8 +4045,8 @@ static int lpc43_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer) * ****************************************************************************/ -static int lpc43_ioalloc(FAR struct usbhost_driver_s *drvr, - FAR uint8_t **buffer, size_t buflen) +static int lpc43_ioalloc(struct usbhost_driver_s *drvr, + uint8_t **buffer, size_t buflen) { DEBUGASSERT(drvr && buffer && buflen > 0); @@ -4055,7 +4055,7 @@ static int lpc43_ioalloc(FAR struct usbhost_driver_s *drvr, * buffering). */ - *buffer = (FAR uint8_t *)kumm_malloc(buflen); + *buffer = (uint8_t *)kumm_malloc(buflen); return *buffer ? OK : -ENOMEM; } @@ -4082,8 +4082,8 @@ static int lpc43_ioalloc(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int lpc43_iofree(FAR struct usbhost_driver_s *drvr, - FAR uint8_t *buffer) +static int lpc43_iofree(struct usbhost_driver_s *drvr, + uint8_t *buffer) { DEBUGASSERT(drvr && buffer); @@ -4129,9 +4129,9 @@ static int lpc43_iofree(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static int lpc43_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, - FAR const struct usb_ctrlreq_s *req, - FAR uint8_t *buffer) +static int lpc43_ctrlin(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, + const struct usb_ctrlreq_s *req, + uint8_t *buffer) { struct lpc43_rhport_s *rhport = (struct lpc43_rhport_s *)drvr; struct lpc43_epinfo_s *ep0info = (struct lpc43_epinfo_s *)ep0; @@ -4195,9 +4195,9 @@ errout_with_sem: return ret; } -static int lpc43_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, - FAR const struct usb_ctrlreq_s *req, - FAR const uint8_t *buffer) +static int lpc43_ctrlout(struct usbhost_driver_s *drvr, usbhost_ep_t ep0, + const struct usb_ctrlreq_s *req, + const uint8_t *buffer) { /* lpc43_ctrlin can handle both directions. We just need to work around * the differences in the function signatures. @@ -4245,8 +4245,8 @@ static int lpc43_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, * ****************************************************************************/ -static ssize_t lpc43_transfer(FAR struct usbhost_driver_s *drvr, - usbhost_ep_t ep, FAR uint8_t *buffer, +static ssize_t lpc43_transfer(struct usbhost_driver_s *drvr, + usbhost_ep_t ep, uint8_t *buffer, size_t buflen) { struct lpc43_rhport_s *rhport = (struct lpc43_rhport_s *)drvr; @@ -4357,9 +4357,9 @@ errout_with_sem: ****************************************************************************/ #ifdef CONFIG_USBHOST_ASYNCH -static int lpc43_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, - FAR uint8_t *buffer, size_t buflen, - usbhost_asynch_t callback, FAR void *arg) +static int lpc43_asynch(struct usbhost_driver_s *drvr, usbhost_ep_t ep, + uint8_t *buffer, size_t buflen, + usbhost_asynch_t callback, void *arg) { struct lpc43_rhport_s *rhport = (struct lpc43_rhport_s *)drvr; struct lpc43_epinfo_s *epinfo = (struct lpc43_epinfo_s *)ep; @@ -4451,7 +4451,7 @@ errout_with_sem: * ****************************************************************************/ -static int lpc43_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) +static int lpc43_cancel(struct usbhost_driver_s *drvr, usbhost_ep_t ep) { struct lpc43_epinfo_s *epinfo = (struct lpc43_epinfo_s *)ep; struct lpc43_qh_s *qh; @@ -4656,8 +4656,8 @@ errout_with_sem: ****************************************************************************/ #ifdef CONFIG_USBHOST_HUB -static int lpc43_connect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport, +static int lpc43_connect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport, bool connected) { irqstate_t flags; @@ -4711,8 +4711,8 @@ static int lpc43_connect(FAR struct usbhost_driver_s *drvr, * ****************************************************************************/ -static void lpc43_disconnect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport) +static void lpc43_disconnect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport) { DEBUGASSERT(hport != NULL); hport->devclass = NULL; @@ -4866,9 +4866,9 @@ static int lpc43_reset(void) * ****************************************************************************/ -FAR struct usbhost_connection_s *lpc43_ehci_initialize(int controller) +struct usbhost_connection_s *lpc43_ehci_initialize(int controller) { - FAR struct usbhost_hubport_s *hport; + struct usbhost_hubport_s *hport; uint32_t regval; #if defined(CONFIG_DEBUG_USB) && defined(CONFIG_DEBUG_INFO) uint16_t regval16; @@ -5334,7 +5334,7 @@ FAR struct usbhost_connection_s *lpc43_ehci_initialize(int controller) ****************************************************************************/ #ifdef HAVE_USBHOST_TRACE -FAR const char *usbhost_trformat1(uint16_t id) +const char *usbhost_trformat1(uint16_t id) { int ndx = TRACE1_INDEX(id); @@ -5346,7 +5346,7 @@ FAR const char *usbhost_trformat1(uint16_t id) return NULL; } -FAR const char *usbhost_trformat2(uint16_t id) +const char *usbhost_trformat2(uint16_t id) { int ndx = TRACE2_INDEX(id); diff --git a/arch/arm/src/lpc43xx/lpc43_ehci.h b/arch/arm/src/lpc43xx/lpc43_ehci.h index a0fe261e9a..4901fbc3bf 100644 --- a/arch/arm/src/lpc43xx/lpc43_ehci.h +++ b/arch/arm/src/lpc43xx/lpc43_ehci.h @@ -82,7 +82,7 @@ extern "C" #if defined(CONFIG_LPC43_USBOTG) && defined(CONFIG_USBHOST) struct usbhost_connection_s; -FAR struct usbhost_connection_s *lpc43_ehci_initialize(int controller); +struct usbhost_connection_s *lpc43_ehci_initialize(int controller); #endif #undef EXTERN diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c index cfcd1c1d02..410d55a624 100644 --- a/arch/arm/src/lpc43xx/lpc43_ethernet.c +++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c @@ -497,7 +497,7 @@ * header */ -#define BUF ((FAR struct eth_hdr_s *)priv->dev.d_buf) +#define BUF ((struct eth_hdr_s *)priv->dev.d_buf) /**************************************************************************** * Private Types @@ -567,41 +567,41 @@ static void lpc43_checksetup(void); /* Free buffer management */ -static void lpc43_initbuffer(FAR struct lpc43_ethmac_s *priv); -static inline uint8_t *lpc43_allocbuffer(FAR struct lpc43_ethmac_s *priv); -static inline void lpc43_freebuffer(FAR struct lpc43_ethmac_s *priv, +static void lpc43_initbuffer(struct lpc43_ethmac_s *priv); +static inline uint8_t *lpc43_allocbuffer(struct lpc43_ethmac_s *priv); +static inline void lpc43_freebuffer(struct lpc43_ethmac_s *priv, uint8_t *buffer); -static inline bool lpc43_isfreebuffer(FAR struct lpc43_ethmac_s *priv); +static inline bool lpc43_isfreebuffer(struct lpc43_ethmac_s *priv); /* Common TX logic */ -static int lpc43_transmit(FAR struct lpc43_ethmac_s *priv); +static int lpc43_transmit(struct lpc43_ethmac_s *priv); static int lpc43_txpoll(struct net_driver_s *dev); -static void lpc43_dopoll(FAR struct lpc43_ethmac_s *priv); +static void lpc43_dopoll(struct lpc43_ethmac_s *priv); /* Interrupt handling */ -static void lpc43_enableint(FAR struct lpc43_ethmac_s *priv, +static void lpc43_enableint(struct lpc43_ethmac_s *priv, uint32_t ierbit); -static void lpc43_disableint(FAR struct lpc43_ethmac_s *priv, +static void lpc43_disableint(struct lpc43_ethmac_s *priv, uint32_t ierbit); -static void lpc43_freesegment(FAR struct lpc43_ethmac_s *priv, - FAR struct eth_rxdesc_s *rxfirst, int segments); -static int lpc43_recvframe(FAR struct lpc43_ethmac_s *priv); -static void lpc43_receive(FAR struct lpc43_ethmac_s *priv); -static void lpc43_freeframe(FAR struct lpc43_ethmac_s *priv); -static void lpc43_txdone(FAR struct lpc43_ethmac_s *priv); +static void lpc43_freesegment(struct lpc43_ethmac_s *priv, + struct eth_rxdesc_s *rxfirst, int segments); +static int lpc43_recvframe(struct lpc43_ethmac_s *priv); +static void lpc43_receive(struct lpc43_ethmac_s *priv); +static void lpc43_freeframe(struct lpc43_ethmac_s *priv); +static void lpc43_txdone(struct lpc43_ethmac_s *priv); -static void lpc43_interrupt_work(FAR void *arg); -static int lpc43_interrupt(int irq, FAR void *context, FAR void *arg); +static void lpc43_interrupt_work(void *arg); +static int lpc43_interrupt(int irq, void *context, void *arg); /* Watchdog timer expirations */ -static void lpc43_txtimeout_work(FAR void *arg); +static void lpc43_txtimeout_work(void *arg); static void lpc43_txtimeout_expiry(wdparm_t arg); -static void lpc43_poll_work(FAR void *arg); +static void lpc43_poll_work(void *arg); static void lpc43_poll_expiry(wdparm_t arg); /* NuttX callback functions */ @@ -609,14 +609,14 @@ static void lpc43_poll_expiry(wdparm_t arg); static int lpc43_ifup(struct net_driver_s *dev); static int lpc43_ifdown(struct net_driver_s *dev); -static void lpc43_txavail_work(FAR void *arg); +static void lpc43_txavail_work(void *arg); static int lpc43_txavail(struct net_driver_s *dev); #if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6) -static int lpc43_addmac(struct net_driver_s *dev, FAR const uint8_t *mac); +static int lpc43_addmac(struct net_driver_s *dev, const uint8_t *mac); #endif #ifdef CONFIG_NET_MCASTGROUP -static int lpc43_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac); +static int lpc43_rmmac(struct net_driver_s *dev, const uint8_t *mac); #endif #ifdef CONFIG_NETDEV_IOCTL static int lpc43_ioctl(struct net_driver_s *dev, int cmd, @@ -624,21 +624,21 @@ static int lpc43_ioctl(struct net_driver_s *dev, int cmd, #endif /* Descriptor Initialization */ -static void lpc43_txdescinit(FAR struct lpc43_ethmac_s *priv); -static void lpc43_rxdescinit(FAR struct lpc43_ethmac_s *priv); +static void lpc43_txdescinit(struct lpc43_ethmac_s *priv); +static void lpc43_rxdescinit(struct lpc43_ethmac_s *priv); /* PHY Initialization */ #if defined(CONFIG_NETDEV_PHY_IOCTL) && defined(CONFIG_ARCH_PHY_INTERRUPT) -static int lpc43_phyintenable(FAR struct lpc43_ethmac_s *priv); +static int lpc43_phyintenable(struct lpc43_ethmac_s *priv); #endif static int lpc43_phyread(uint16_t phydevaddr, uint16_t phyregaddr, uint16_t *value); static int lpc43_phywrite(uint16_t phydevaddr, uint16_t phyregaddr, uint16_t value); #ifdef CONFIG_ETH0_PHY_DM9161 -static inline int lpc43_dm9161(FAR struct lpc43_ethmac_s *priv); +static inline int lpc43_dm9161(struct lpc43_ethmac_s *priv); #endif -static int lpc43_phyinit(FAR struct lpc43_ethmac_s *priv); +static int lpc43_phyinit(struct lpc43_ethmac_s *priv); /* MAC/DMA Initialization */ @@ -648,15 +648,15 @@ static inline void lpc43_selectmii(void); #ifdef CONFIG_LPC43_RMII static inline void lpc43_selectrmii(void); #endif -static inline void lpc43_ethgpioconfig(FAR struct lpc43_ethmac_s *priv); -static void lpc43_ethreset(FAR struct lpc43_ethmac_s *priv); -static int lpc43_macconfig(FAR struct lpc43_ethmac_s *priv); -static void lpc43_macaddress(FAR struct lpc43_ethmac_s *priv); +static inline void lpc43_ethgpioconfig(struct lpc43_ethmac_s *priv); +static void lpc43_ethreset(struct lpc43_ethmac_s *priv); +static int lpc43_macconfig(struct lpc43_ethmac_s *priv); +static void lpc43_macaddress(struct lpc43_ethmac_s *priv); #ifdef CONFIG_NET_ICMPv6 -static void lpc43_ipv6multicast(FAR struct lpc43_ethmac_s *priv); +static void lpc43_ipv6multicast(struct lpc43_ethmac_s *priv); #endif -static int lpc43_macenable(FAR struct lpc43_ethmac_s *priv); -static int lpc43_ethconfig(FAR struct lpc43_ethmac_s *priv); +static int lpc43_macenable(struct lpc43_ethmac_s *priv); +static int lpc43_ethconfig(struct lpc43_ethmac_s *priv); /**************************************************************************** * Private Functions @@ -801,7 +801,7 @@ static void lpc43_checksetup(void) * ****************************************************************************/ -static void lpc43_initbuffer(FAR struct lpc43_ethmac_s *priv) +static void lpc43_initbuffer(struct lpc43_ethmac_s *priv) { uint8_t *buffer; int i; @@ -816,7 +816,7 @@ static void lpc43_initbuffer(FAR struct lpc43_ethmac_s *priv) i < LPC43_ETH_NFREEBUFFERS; i++, buffer += CONFIG_LPC43_ETH_BUFSIZE) { - sq_addlast((FAR sq_entry_t *)buffer, &priv->freeb); + sq_addlast((sq_entry_t *)buffer, &priv->freeb); } } @@ -839,7 +839,7 @@ static void lpc43_initbuffer(FAR struct lpc43_ethmac_s *priv) * ****************************************************************************/ -static inline uint8_t *lpc43_allocbuffer(FAR struct lpc43_ethmac_s *priv) +static inline uint8_t *lpc43_allocbuffer(struct lpc43_ethmac_s *priv) { /* Allocate a buffer by returning the head of the free buffer list */ @@ -866,12 +866,12 @@ static inline uint8_t *lpc43_allocbuffer(FAR struct lpc43_ethmac_s *priv) * ****************************************************************************/ -static inline void lpc43_freebuffer(FAR struct lpc43_ethmac_s *priv, +static inline void lpc43_freebuffer(struct lpc43_ethmac_s *priv, uint8_t *buffer) { /* Free the buffer by adding it to the end of the free buffer list */ - sq_addlast((FAR sq_entry_t *)buffer, &priv->freeb); + sq_addlast((sq_entry_t *)buffer, &priv->freeb); } /**************************************************************************** @@ -892,7 +892,7 @@ static inline void lpc43_freebuffer(FAR struct lpc43_ethmac_s *priv, * ****************************************************************************/ -static inline bool lpc43_isfreebuffer(FAR struct lpc43_ethmac_s *priv) +static inline bool lpc43_isfreebuffer(struct lpc43_ethmac_s *priv) { /* Return TRUE if the free buffer list is not empty */ @@ -919,7 +919,7 @@ static inline bool lpc43_isfreebuffer(FAR struct lpc43_ethmac_s *priv) * ****************************************************************************/ -static int lpc43_transmit(FAR struct lpc43_ethmac_s *priv) +static int lpc43_transmit(struct lpc43_ethmac_s *priv) { struct eth_txdesc_s *txdesc; struct eth_txdesc_s *txfirst; @@ -1135,8 +1135,8 @@ static int lpc43_transmit(FAR struct lpc43_ethmac_s *priv) static int lpc43_txpoll(struct net_driver_s *dev) { - FAR struct lpc43_ethmac_s *priv = - (FAR struct lpc43_ethmac_s *)dev->d_private; + struct lpc43_ethmac_s *priv = + (struct lpc43_ethmac_s *)dev->d_private; DEBUGASSERT(priv->dev.d_buf != NULL); @@ -1242,9 +1242,9 @@ static int lpc43_txpoll(struct net_driver_s *dev) * ****************************************************************************/ -static void lpc43_dopoll(FAR struct lpc43_ethmac_s *priv) +static void lpc43_dopoll(struct lpc43_ethmac_s *priv) { - FAR struct net_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; /* Check if the next TX descriptor is owned by the Ethernet DMA or * CPU. We cannot perform the TX poll if we are unable to accept @@ -1303,7 +1303,7 @@ static void lpc43_dopoll(FAR struct lpc43_ethmac_s *priv) * ****************************************************************************/ -static void lpc43_enableint(FAR struct lpc43_ethmac_s *priv, +static void lpc43_enableint(struct lpc43_ethmac_s *priv, uint32_t ierbit) { uint32_t regval; @@ -1332,7 +1332,7 @@ static void lpc43_enableint(FAR struct lpc43_ethmac_s *priv, * ****************************************************************************/ -static void lpc43_disableint(FAR struct lpc43_ethmac_s *priv, +static void lpc43_disableint(struct lpc43_ethmac_s *priv, uint32_t ierbit) { uint32_t regval; @@ -1372,8 +1372,8 @@ static void lpc43_disableint(FAR struct lpc43_ethmac_s *priv, * ****************************************************************************/ -static void lpc43_freesegment(FAR struct lpc43_ethmac_s *priv, - FAR struct eth_rxdesc_s *rxfirst, int segments) +static void lpc43_freesegment(struct lpc43_ethmac_s *priv, + struct eth_rxdesc_s *rxfirst, int segments) { struct eth_rxdesc_s *rxdesc; int i; @@ -1429,7 +1429,7 @@ static void lpc43_freesegment(FAR struct lpc43_ethmac_s *priv, * ****************************************************************************/ -static int lpc43_recvframe(FAR struct lpc43_ethmac_s *priv) +static int lpc43_recvframe(struct lpc43_ethmac_s *priv) { struct eth_rxdesc_s *rxdesc; struct eth_rxdesc_s *rxcurr; @@ -1595,7 +1595,7 @@ static int lpc43_recvframe(FAR struct lpc43_ethmac_s *priv) * ****************************************************************************/ -static void lpc43_receive(FAR struct lpc43_ethmac_s *priv) +static void lpc43_receive(struct lpc43_ethmac_s *priv) { struct net_driver_s *dev = &priv->dev; @@ -1773,7 +1773,7 @@ static void lpc43_receive(FAR struct lpc43_ethmac_s *priv) * ****************************************************************************/ -static void lpc43_freeframe(FAR struct lpc43_ethmac_s *priv) +static void lpc43_freeframe(struct lpc43_ethmac_s *priv) { struct eth_txdesc_s *txdesc; int i; @@ -1871,7 +1871,7 @@ static void lpc43_freeframe(FAR struct lpc43_ethmac_s *priv) * ****************************************************************************/ -static void lpc43_txdone(FAR struct lpc43_ethmac_s *priv) +static void lpc43_txdone(struct lpc43_ethmac_s *priv) { DEBUGASSERT(priv->txtail != NULL); @@ -1914,9 +1914,9 @@ static void lpc43_txdone(FAR struct lpc43_ethmac_s *priv) * ****************************************************************************/ -static void lpc43_interrupt_work(FAR void *arg) +static void lpc43_interrupt_work(void *arg) { - FAR struct lpc43_ethmac_s *priv = (FAR struct lpc43_ethmac_s *)arg; + struct lpc43_ethmac_s *priv = (struct lpc43_ethmac_s *)arg; uint32_t dmasr; DEBUGASSERT(priv); @@ -2017,9 +2017,9 @@ static void lpc43_interrupt_work(FAR void *arg) * ****************************************************************************/ -static int lpc43_interrupt(int irq, FAR void *context, FAR void *arg) +static int lpc43_interrupt(int irq, void *context, void *arg) { - FAR struct lpc43_ethmac_s *priv = &g_lpc43ethmac; + struct lpc43_ethmac_s *priv = &g_lpc43ethmac; uint32_t dmasr; /* Get the DMA interrupt status bits (no MAC interrupts are expected) */ @@ -2071,9 +2071,9 @@ static int lpc43_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static void lpc43_txtimeout_work(FAR void *arg) +static void lpc43_txtimeout_work(void *arg) { - FAR struct lpc43_ethmac_s *priv = (FAR struct lpc43_ethmac_s *)arg; + struct lpc43_ethmac_s *priv = (struct lpc43_ethmac_s *)arg; /* Then reset the hardware. Just take the interface down, then back * up again. @@ -2109,7 +2109,7 @@ static void lpc43_txtimeout_work(FAR void *arg) static void lpc43_txtimeout_expiry(wdparm_t arg) { - FAR struct lpc43_ethmac_s *priv = (FAR struct lpc43_ethmac_s *)arg; + struct lpc43_ethmac_s *priv = (struct lpc43_ethmac_s *)arg; ninfo("Timeout!\n"); @@ -2146,10 +2146,10 @@ static void lpc43_txtimeout_expiry(wdparm_t arg) * ****************************************************************************/ -static void lpc43_poll_work(FAR void *arg) +static void lpc43_poll_work(void *arg) { - FAR struct lpc43_ethmac_s *priv = (FAR struct lpc43_ethmac_s *)arg; - FAR struct net_driver_s *dev = &priv->dev; + struct lpc43_ethmac_s *priv = (struct lpc43_ethmac_s *)arg; + struct net_driver_s *dev = &priv->dev; /* Check if the next TX descriptor is owned by the Ethernet DMA or * CPU. We cannot perform the TX poll if we are unable to accept @@ -2220,7 +2220,7 @@ static void lpc43_poll_work(FAR void *arg) static void lpc43_poll_expiry(wdparm_t arg) { - FAR struct lpc43_ethmac_s *priv = (FAR struct lpc43_ethmac_s *)arg; + struct lpc43_ethmac_s *priv = (struct lpc43_ethmac_s *)arg; /* Schedule to perform the interrupt processing on the worker thread. */ @@ -2246,8 +2246,8 @@ static void lpc43_poll_expiry(wdparm_t arg) static int lpc43_ifup(struct net_driver_s *dev) { - FAR struct lpc43_ethmac_s *priv = - (FAR struct lpc43_ethmac_s *)dev->d_private; + struct lpc43_ethmac_s *priv = + (struct lpc43_ethmac_s *)dev->d_private; int ret; #ifdef CONFIG_NET_IPv4 @@ -2304,8 +2304,8 @@ static int lpc43_ifup(struct net_driver_s *dev) static int lpc43_ifdown(struct net_driver_s *dev) { - FAR struct lpc43_ethmac_s *priv = - (FAR struct lpc43_ethmac_s *)dev->d_private; + struct lpc43_ethmac_s *priv = + (struct lpc43_ethmac_s *)dev->d_private; irqstate_t flags; ninfo("Taking the network down\n"); @@ -2351,9 +2351,9 @@ static int lpc43_ifdown(struct net_driver_s *dev) * ****************************************************************************/ -static void lpc43_txavail_work(FAR void *arg) +static void lpc43_txavail_work(void *arg) { - FAR struct lpc43_ethmac_s *priv = (FAR struct lpc43_ethmac_s *)arg; + struct lpc43_ethmac_s *priv = (struct lpc43_ethmac_s *)arg; /* Ignore the notification if the interface is not yet up */ @@ -2390,8 +2390,8 @@ static void lpc43_txavail_work(FAR void *arg) static int lpc43_txavail(struct net_driver_s *dev) { - FAR struct lpc43_ethmac_s *priv = - (FAR struct lpc43_ethmac_s *)dev->d_private; + struct lpc43_ethmac_s *priv = + (struct lpc43_ethmac_s *)dev->d_private; /* Is our single work structure available? It may not be if there are * pending interrupt actions and we will have to ignore the Tx @@ -2474,7 +2474,7 @@ static uint32_t lpc43_calcethcrc(const uint8_t *data, size_t length) ****************************************************************************/ #if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6) -static int lpc43_addmac(struct net_driver_s *dev, FAR const uint8_t *mac) +static int lpc43_addmac(struct net_driver_s *dev, const uint8_t *mac) { uint32_t crc; uint32_t hashindex; @@ -2531,7 +2531,7 @@ static int lpc43_addmac(struct net_driver_s *dev, FAR const uint8_t *mac) ****************************************************************************/ #ifdef CONFIG_NET_MCASTGROUP -static int lpc43_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac) +static int lpc43_rmmac(struct net_driver_s *dev, const uint8_t *mac) { uint32_t crc; uint32_t hashindex; @@ -2591,7 +2591,7 @@ static int lpc43_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac) * ****************************************************************************/ -static void lpc43_txdescinit(FAR struct lpc43_ethmac_s *priv) +static void lpc43_txdescinit(struct lpc43_ethmac_s *priv) { struct eth_txdesc_s *txdesc; int i; @@ -2675,7 +2675,7 @@ static void lpc43_txdescinit(FAR struct lpc43_ethmac_s *priv) * ****************************************************************************/ -static void lpc43_rxdescinit(FAR struct lpc43_ethmac_s *priv) +static void lpc43_rxdescinit(struct lpc43_ethmac_s *priv) { struct eth_rxdesc_s *rxdesc; int i; @@ -2773,8 +2773,8 @@ static void lpc43_rxdescinit(FAR struct lpc43_ethmac_s *priv) static int lpc43_ioctl(struct net_driver_s *dev, int cmd, unsigned long arg) { #if defined(CONFIG_NETDEV_PHY_IOCTL) && defined(CONFIG_ARCH_PHY_INTERRUPT) - FAR struct lpc43_ethmac_s *priv = - (FAR struct lpc43_ethmac_s *)dev->d_private; + struct lpc43_ethmac_s *priv = + (struct lpc43_ethmac_s *)dev->d_private; #endif int ret; @@ -3001,7 +3001,7 @@ static int lpc43_phywrite(uint16_t phydevaddr, ****************************************************************************/ #ifdef CONFIG_ETH0_PHY_DM9161 -static inline int lpc43_dm9161(FAR struct lpc43_ethmac_s *priv) +static inline int lpc43_dm9161(struct lpc43_ethmac_s *priv) { uint16_t phyval; int ret; @@ -3066,7 +3066,7 @@ static inline int lpc43_dm9161(FAR struct lpc43_ethmac_s *priv) * ****************************************************************************/ -static int lpc43_phyinit(FAR struct lpc43_ethmac_s *priv) +static int lpc43_phyinit(struct lpc43_ethmac_s *priv) { volatile uint32_t timeout; uint32_t regval; @@ -3363,7 +3363,7 @@ static inline void lpc43_selectrmii(void) * ****************************************************************************/ -static inline void lpc43_ethgpioconfig(FAR struct lpc43_ethmac_s *priv) +static inline void lpc43_ethgpioconfig(struct lpc43_ethmac_s *priv) { /* Configure GPIO pins to support Ethernet */ @@ -3452,7 +3452,7 @@ static inline void lpc43_ethgpioconfig(FAR struct lpc43_ethmac_s *priv) * ****************************************************************************/ -static void lpc43_ethreset(FAR struct lpc43_ethmac_s *priv) +static void lpc43_ethreset(struct lpc43_ethmac_s *priv) { uint32_t regval; @@ -3490,7 +3490,7 @@ static void lpc43_ethreset(FAR struct lpc43_ethmac_s *priv) * ****************************************************************************/ -static int lpc43_macconfig(FAR struct lpc43_ethmac_s *priv) +static int lpc43_macconfig(struct lpc43_ethmac_s *priv) { uint32_t regval; @@ -3574,9 +3574,9 @@ static int lpc43_macconfig(FAR struct lpc43_ethmac_s *priv) * ****************************************************************************/ -static void lpc43_macaddress(FAR struct lpc43_ethmac_s *priv) +static void lpc43_macaddress(struct lpc43_ethmac_s *priv) { - FAR struct net_driver_s *dev = &priv->dev; + struct net_driver_s *dev = &priv->dev; uint32_t regval; ninfo("%s MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", @@ -3620,7 +3620,7 @@ static void lpc43_macaddress(FAR struct lpc43_ethmac_s *priv) ****************************************************************************/ #ifdef CONFIG_NET_ICMPv6 -static void lpc43_ipv6multicast(FAR struct lpc43_ethmac_s *priv) +static void lpc43_ipv6multicast(struct lpc43_ethmac_s *priv) { struct net_driver_s *dev; uint16_t tmp16; @@ -3692,7 +3692,7 @@ static void lpc43_ipv6multicast(FAR struct lpc43_ethmac_s *priv) * ****************************************************************************/ -static int lpc43_macenable(FAR struct lpc43_ethmac_s *priv) +static int lpc43_macenable(struct lpc43_ethmac_s *priv) { uint32_t regval; @@ -3779,7 +3779,7 @@ static int lpc43_macenable(FAR struct lpc43_ethmac_s *priv) * ****************************************************************************/ -static int lpc43_ethconfig(FAR struct lpc43_ethmac_s *priv) +static int lpc43_ethconfig(struct lpc43_ethmac_s *priv) { int ret; diff --git a/arch/arm/src/lpc43xx/lpc43_gpdma.c b/arch/arm/src/lpc43xx/lpc43_gpdma.c index a604dc640a..cb6cd3df40 100644 --- a/arch/arm/src/lpc43xx/lpc43_gpdma.c +++ b/arch/arm/src/lpc43xx/lpc43_gpdma.c @@ -174,7 +174,7 @@ static void lpc43_dmadone(struct lpc43_dmach_s *dmach) * ****************************************************************************/ -static int gpdma_interrupt(int irq, FAR void *context, FAR void *arg) +static int gpdma_interrupt(int irq, void *context, void *arg) { struct lpc43_dmach_s *dmach; uint32_t regval; diff --git a/arch/arm/src/lpc43xx/lpc43_gpdma.h b/arch/arm/src/lpc43xx/lpc43_gpdma.h index ebd925961f..8fcbecaf02 100644 --- a/arch/arm/src/lpc43xx/lpc43_gpdma.h +++ b/arch/arm/src/lpc43xx/lpc43_gpdma.h @@ -40,7 +40,7 @@ #ifndef __ASSEMBLY__ -typedef FAR void *DMA_HANDLE; +typedef void *DMA_HANDLE; typedef void (*dma_callback_t)(DMA_HANDLE handle, void *arg, int result); /* The following is used for sampling DMA registers when diff --git a/arch/arm/src/lpc43xx/lpc43_i2c.c b/arch/arm/src/lpc43xx/lpc43_i2c.c index b181205fdf..c77b0cdddf 100644 --- a/arch/arm/src/lpc43xx/lpc43_i2c.c +++ b/arch/arm/src/lpc43xx/lpc43_i2c.c @@ -129,14 +129,14 @@ static struct lpc43_i2cdev_s g_i2c1dev; static int lpc43_i2c_start(struct lpc43_i2cdev_s *priv); static void lpc43_i2c_stop(struct lpc43_i2cdev_s *priv); -static int lpc43_i2c_interrupt(int irq, FAR void *context, FAR void *arg); +static int lpc43_i2c_interrupt(int irq, void *context, void *arg); static void lpc43_i2c_timeout(wdparm_t arg); static void lpc43_i2c_setfrequency(struct lpc43_i2cdev_s *priv, uint32_t frequency); -static int lpc43_i2c_transfer(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count); +static int lpc43_i2c_transfer(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count); #ifdef CONFIG_I2C_RESET -static int lpc43_i2c_reset(FAR struct i2c_master_s * dev); +static int lpc43_i2c_reset(struct i2c_master_s * dev); #endif /**************************************************************************** @@ -277,7 +277,7 @@ void lpc32_i2c_nextmsg(struct lpc43_i2cdev_s *priv) * ****************************************************************************/ -static int lpc43_i2c_interrupt(int irq, FAR void *context, FAR void *arg) +static int lpc43_i2c_interrupt(int irq, void *context, void *arg) { struct lpc43_i2cdev_s *priv = (struct lpc43_i2cdev_s *)arg; struct i2c_msg_s *msg; @@ -377,8 +377,8 @@ static int lpc43_i2c_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static int lpc43_i2c_transfer(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count) +static int lpc43_i2c_transfer(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count) { struct lpc43_i2cdev_s *priv = (struct lpc43_i2cdev_s *)dev; int ret; @@ -427,7 +427,7 @@ static int lpc43_i2c_transfer(FAR struct i2c_master_s *dev, ****************************************************************************/ #ifdef CONFIG_I2C_RESET -static int lpc43_i2c_reset(FAR struct i2c_master_s * dev) +static int lpc43_i2c_reset(struct i2c_master_s * dev) { return OK; } @@ -560,7 +560,7 @@ struct i2c_master_s *lpc43_i2cbus_initialize(int port) * ****************************************************************************/ -int lpc43_i2cbus_uninitialize(FAR struct i2c_master_s * dev) +int lpc43_i2cbus_uninitialize(struct i2c_master_s * dev) { struct lpc43_i2cdev_s *priv = (struct lpc43_i2cdev_s *) dev; diff --git a/arch/arm/src/lpc43xx/lpc43_i2c.h b/arch/arm/src/lpc43xx/lpc43_i2c.h index 75b2ff9436..061a659465 100644 --- a/arch/arm/src/lpc43xx/lpc43_i2c.h +++ b/arch/arm/src/lpc43xx/lpc43_i2c.h @@ -50,7 +50,7 @@ * ****************************************************************************/ -FAR struct i2c_master_s *lpc43_i2cbus_initialize(int port); +struct i2c_master_s *lpc43_i2cbus_initialize(int port); /**************************************************************************** * Name: lpc43_i2cbus_uninitialize @@ -67,6 +67,6 @@ FAR struct i2c_master_s *lpc43_i2cbus_initialize(int port); * ****************************************************************************/ -int lpc43_i2cbus_uninitialize(FAR struct i2c_master_s *dev); +int lpc43_i2cbus_uninitialize(struct i2c_master_s *dev); #endif /* __ARCH_ARM_SRC_LPC43XX_LPC43_I2C_H */ diff --git a/arch/arm/src/lpc43xx/lpc43_irq.c b/arch/arm/src/lpc43xx/lpc43_irq.c index 67116770aa..f4fd374558 100644 --- a/arch/arm/src/lpc43xx/lpc43_irq.c +++ b/arch/arm/src/lpc43xx/lpc43_irq.c @@ -151,7 +151,7 @@ static void lpc43_dumpnvic(const char *msg, int irq) ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -static int lpc43_nmi(int irq, FAR void *context, FAR void *arg) +static int lpc43_nmi(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! NMI received\n"); @@ -159,7 +159,7 @@ static int lpc43_nmi(int irq, FAR void *context, FAR void *arg) return 0; } -static int lpc43_busfault(int irq, FAR void *context, FAR void *arg) +static int lpc43_busfault(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Bus fault received\n"); @@ -167,7 +167,7 @@ static int lpc43_busfault(int irq, FAR void *context, FAR void *arg) return 0; } -static int lpc43_usagefault(int irq, FAR void *context, FAR void *arg) +static int lpc43_usagefault(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Usage fault received\n"); @@ -175,7 +175,7 @@ static int lpc43_usagefault(int irq, FAR void *context, FAR void *arg) return 0; } -static int lpc43_pendsv(int irq, FAR void *context, FAR void *arg) +static int lpc43_pendsv(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! PendSV received\n"); @@ -183,7 +183,7 @@ static int lpc43_pendsv(int irq, FAR void *context, FAR void *arg) return 0; } -static int lpc43_dbgmonitor(int irq, FAR void *context, FAR void *arg) +static int lpc43_dbgmonitor(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Debug Monitor received\n"); @@ -191,7 +191,7 @@ static int lpc43_dbgmonitor(int irq, FAR void *context, FAR void *arg) return 0; } -static int lpc43_reserved(int irq, FAR void *context, FAR void *arg) +static int lpc43_reserved(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Reserved interrupt\n"); diff --git a/arch/arm/src/lpc43xx/lpc43_rit.c b/arch/arm/src/lpc43xx/lpc43_rit.c index eeb44d39a6..3bbede3927 100644 --- a/arch/arm/src/lpc43xx/lpc43_rit.c +++ b/arch/arm/src/lpc43xx/lpc43_rit.c @@ -72,7 +72,7 @@ struct timespec g_ts; * Private Functions ****************************************************************************/ -static int lpc43_rit_isr(int irq, FAR void *context, FAR void *arg) +static int lpc43_rit_isr(int irq, void *context, void *arg) { irqstate_t flags; @@ -206,7 +206,7 @@ void up_timer_initialize(void) lpc43_rit_timer_start(); } -int up_timer_gettime(FAR struct timespec *ts) +int up_timer_gettime(struct timespec *ts) { ts->tv_sec = (uint32_t)(g_internal_timer / 1000000000); ts->tv_nsec = (uint32_t)(g_internal_timer % 1000000000); @@ -214,7 +214,7 @@ int up_timer_gettime(FAR struct timespec *ts) return OK; } -int up_alarm_cancel(FAR struct timespec *ts) +int up_alarm_cancel(struct timespec *ts) { ts->tv_sec = (uint32_t)(g_internal_timer / 1000000000); ts->tv_nsec = (uint32_t)(g_internal_timer % 1000000000); @@ -222,7 +222,7 @@ int up_alarm_cancel(FAR struct timespec *ts) return OK; } -int up_alarm_start(FAR const struct timespec *ts) +int up_alarm_start(const struct timespec *ts) { /* According to the docs, this version should expect to receive the time * in the future when the alarm should expire. So that's the way it's @@ -234,7 +234,7 @@ int up_alarm_start(FAR const struct timespec *ts) return OK; } -int up_timer_cancel(FAR struct timespec *ts) +int up_timer_cancel(struct timespec *ts) { /* Currently this is just an alarm and both are implemented. This is *NOT* * how it is supposed to be and will be corrected, but for now, this is a @@ -245,7 +245,7 @@ int up_timer_cancel(FAR struct timespec *ts) return up_alarm_cancel(ts); } -int up_timer_start(FAR const struct timespec *ts) +int up_timer_start(const struct timespec *ts) { /* According to the docs, this version should basically compute the time * in the future when an alarm should go off. That is the way it could diff --git a/arch/arm/src/lpc43xx/lpc43_rit.h b/arch/arm/src/lpc43xx/lpc43_rit.h index 855f44f81b..25ed36d1ff 100644 --- a/arch/arm/src/lpc43xx/lpc43_rit.h +++ b/arch/arm/src/lpc43xx/lpc43_rit.h @@ -43,9 +43,9 @@ * Public Functions Prototypes ****************************************************************************/ -int up_alarm_cancel(FAR struct timespec *ts); -int up_alarm_start(FAR const struct timespec *ts); -int up_timer_cancel(FAR struct timespec *ts); -int up_timer_start(FAR const struct timespec *ts); +int up_alarm_cancel(struct timespec *ts); +int up_alarm_start(const struct timespec *ts); +int up_timer_cancel(struct timespec *ts); +int up_timer_start(const struct timespec *ts); #endif /* __ARCH_ARM_SRC_LPC43XX_LPC43_RIT_H */ diff --git a/arch/arm/src/lpc43xx/lpc43_rtc.c b/arch/arm/src/lpc43xx/lpc43_rtc.c index b6b3c33449..f3db9f8598 100644 --- a/arch/arm/src/lpc43xx/lpc43_rtc.c +++ b/arch/arm/src/lpc43xx/lpc43_rtc.c @@ -95,7 +95,7 @@ volatile bool g_rtc_enabled = false; ****************************************************************************/ #ifdef CONFIG_DEBUG_RTC_INFO -static void rtc_dumpregs(FAR const char *msg) +static void rtc_dumpregs(const char *msg) { rtcinfo("%s:\n", msg); rtcinfo(" DOM : %08x\n", (getreg32(LPC43_RTC_DOM) & RTC_DOM_MASK)); @@ -120,7 +120,7 @@ static void rtc_dumpregs(FAR const char *msg) ****************************************************************************/ #ifdef CONFIG_DEBUG_RTC_INFO -static void rtc_dumptime(FAR struct tm *tp, FAR const char *msg) +static void rtc_dumptime(struct tm *tp, const char *msg) { rtcinfo("%s:\n", msg); rtcinfo(" tm_sec: %08x\n", tp->tm_sec); @@ -279,7 +279,7 @@ int up_rtc_initialize(void) * ****************************************************************************/ -int up_rtc_getdatetime(FAR struct tm *tp) +int up_rtc_getdatetime(struct tm *tp) { rtc_dumpregs("Reading Time"); @@ -316,9 +316,9 @@ int up_rtc_getdatetime(FAR struct tm *tp) * ****************************************************************************/ -int up_rtc_settime(FAR const struct timespec *tp) +int up_rtc_settime(const struct timespec *tp) { - FAR struct tm newtime; + struct tm newtime; /* Break out the time values * (not that the time is set only to units of seconds) @@ -358,7 +358,7 @@ int up_rtc_settime(FAR const struct timespec *tp) ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -int lpc43_rtc_setalarm(FAR const struct timespec *tp, alarmcb_t callback) +int lpc43_rtc_setalarm(const struct timespec *tp, alarmcb_t callback) { int ret = -EBUSY; diff --git a/arch/arm/src/lpc43xx/lpc43_sdmmc.c b/arch/arm/src/lpc43xx/lpc43_sdmmc.c index 7076638bfd..aba9a5f08d 100644 --- a/arch/arm/src/lpc43xx/lpc43_sdmmc.c +++ b/arch/arm/src/lpc43xx/lpc43_sdmmc.c @@ -277,68 +277,68 @@ static void lpc43_endtransfer(struct lpc43_dev_s *priv, /* Interrupt Handling *******************************************************/ -static int lpc43_sdmmc_interrupt(int irq, void *context, FAR void *arg); +static int lpc43_sdmmc_interrupt(int irq, void *context, void *arg); /* SD Card Interface Methods ************************************************/ /* Mutual exclusion */ #ifdef CONFIG_SDIO_MUXBUS -static int lpc43_lock(FAR struct sdio_dev_s *dev, bool lock); +static int lpc43_lock(struct sdio_dev_s *dev, bool lock); #endif /* Initialization/setup */ -static void lpc43_reset(FAR struct sdio_dev_s *dev); -static sdio_capset_t lpc43_capabilities(FAR struct sdio_dev_s *dev); -static uint8_t lpc43_status(FAR struct sdio_dev_s *dev); -static void lpc43_widebus(FAR struct sdio_dev_s *dev, bool enable); -static void lpc43_clock(FAR struct sdio_dev_s *dev, +static void lpc43_reset(struct sdio_dev_s *dev); +static sdio_capset_t lpc43_capabilities(struct sdio_dev_s *dev); +static uint8_t lpc43_status(struct sdio_dev_s *dev); +static void lpc43_widebus(struct sdio_dev_s *dev, bool enable); +static void lpc43_clock(struct sdio_dev_s *dev, enum sdio_clock_e rate); -static int lpc43_attach(FAR struct sdio_dev_s *dev); +static int lpc43_attach(struct sdio_dev_s *dev); /* Command/Status/Data Transfer */ -static int lpc43_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc43_sendcmd(struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg); #ifdef CONFIG_SDIO_BLOCKSETUP -static void lpc43_blocksetup(FAR struct sdio_dev_s *dev, +static void lpc43_blocksetup(struct sdio_dev_s *dev, unsigned int blocklen, unsigned int nblocks); #endif -static int lpc43_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, +static int lpc43_recvsetup(struct sdio_dev_s *dev, uint8_t *buffer, size_t nbytes); -static int lpc43_sendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, uint32_t nbytes); -static int lpc43_cancel(FAR struct sdio_dev_s *dev); +static int lpc43_sendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, uint32_t nbytes); +static int lpc43_cancel(struct sdio_dev_s *dev); -static int lpc43_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd); -static int lpc43_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc43_waitresponse(struct sdio_dev_s *dev, uint32_t cmd); +static int lpc43_recvshortcrc(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort); -static int lpc43_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc43_recvlong(struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong[4]); -static int lpc43_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc43_recvshort(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort); -static int lpc43_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc43_recvnotimpl(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rnotimpl); /* EVENT handler */ -static void lpc43_waitenable(FAR struct sdio_dev_s *dev, +static void lpc43_waitenable(struct sdio_dev_s *dev, sdio_eventset_t eventset, uint32_t timeout); -static sdio_eventset_t lpc43_eventwait(FAR struct sdio_dev_s *dev); -static void lpc43_callbackenable(FAR struct sdio_dev_s *dev, +static sdio_eventset_t lpc43_eventwait(struct sdio_dev_s *dev); +static void lpc43_callbackenable(struct sdio_dev_s *dev, sdio_eventset_t eventset); static void lpc43_callback(struct lpc43_dev_s *priv); -static int lpc43_registercallback(FAR struct sdio_dev_s *dev, +static int lpc43_registercallback(struct sdio_dev_s *dev, worker_t callback, void *arg); #ifdef CONFIG_LPC43_SDMMC_DMA /* DMA */ -static int lpc43_dmarecvsetup(FAR struct sdio_dev_s *dev, - FAR uint8_t *buffer, size_t buflen); -static int lpc43_dmasendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, size_t buflen); +static int lpc43_dmarecvsetup(struct sdio_dev_s *dev, + uint8_t *buffer, size_t buflen); +static int lpc43_dmasendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t buflen); #endif /**************************************************************************** @@ -933,7 +933,7 @@ static void lpc43_endtransfer(struct lpc43_dev_s *priv, * ****************************************************************************/ -static int lpc43_sdmmc_interrupt(int irq, void *context, FAR void *arg) +static int lpc43_sdmmc_interrupt(int irq, void *context, void *arg) { struct lpc43_dev_s *priv = &g_scard_dev; uint32_t enabled; @@ -1217,7 +1217,7 @@ static int lpc43_sdmmc_interrupt(int irq, void *context, FAR void *arg) ****************************************************************************/ #ifdef CONFIG_SDIO_MUXBUS -static int lpc43_lock(FAR struct sdio_dev_s *dev, bool lock) +static int lpc43_lock(struct sdio_dev_s *dev, bool lock) { /* Single SD card instance so there is only one possibility. The multiplex * bus is part of board support package. @@ -1242,9 +1242,9 @@ static int lpc43_lock(FAR struct sdio_dev_s *dev, bool lock) * ****************************************************************************/ -static void lpc43_reset(FAR struct sdio_dev_s *dev) +static void lpc43_reset(struct sdio_dev_s *dev) { - FAR struct lpc43_dev_s *priv = (FAR struct lpc43_dev_s *)dev; + struct lpc43_dev_s *priv = (struct lpc43_dev_s *)dev; irqstate_t flags; uint32_t regval; @@ -1350,7 +1350,7 @@ static void lpc43_reset(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static sdio_capset_t lpc43_capabilities(FAR struct sdio_dev_s *dev) +static sdio_capset_t lpc43_capabilities(struct sdio_dev_s *dev) { sdio_capset_t caps = 0; @@ -1380,7 +1380,7 @@ static sdio_capset_t lpc43_capabilities(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static sdio_statset_t lpc43_status(FAR struct sdio_dev_s *dev) +static sdio_statset_t lpc43_status(struct sdio_dev_s *dev) { struct lpc43_dev_s *priv = (struct lpc43_dev_s *)dev; @@ -1417,7 +1417,7 @@ static sdio_statset_t lpc43_status(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static void lpc43_widebus(FAR struct sdio_dev_s *dev, bool wide) +static void lpc43_widebus(struct sdio_dev_s *dev, bool wide) { mcinfo("wide=%d\n", wide); } @@ -1437,7 +1437,7 @@ static void lpc43_widebus(FAR struct sdio_dev_s *dev, bool wide) * ****************************************************************************/ -static void lpc43_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate) +static void lpc43_clock(struct sdio_dev_s *dev, enum sdio_clock_e rate) { struct lpc43_dev_s *priv = (struct lpc43_dev_s *)dev; uint8_t clkdiv; @@ -1527,7 +1527,7 @@ static void lpc43_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate) * ****************************************************************************/ -static int lpc43_attach(FAR struct sdio_dev_s *dev) +static int lpc43_attach(struct sdio_dev_s *dev) { int ret; uint32_t regval; @@ -1582,7 +1582,7 @@ static int lpc43_attach(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static int lpc43_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc43_sendcmd(struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg) { uint32_t regval = 0; @@ -1666,7 +1666,7 @@ static int lpc43_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, ****************************************************************************/ #ifdef CONFIG_SDIO_BLOCKSETUP -static void lpc43_blocksetup(FAR struct sdio_dev_s *dev, +static void lpc43_blocksetup(struct sdio_dev_s *dev, unsigned int blocklen, unsigned int nblocks) { mcinfo("blocklen=%ld, total transfer=%ld (%ld blocks)\n", @@ -1701,7 +1701,7 @@ static void lpc43_blocksetup(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static int lpc43_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, +static int lpc43_recvsetup(struct sdio_dev_s *dev, uint8_t *buffer, size_t nbytes) { struct lpc43_dev_s *priv = (struct lpc43_dev_s *)dev; @@ -1770,8 +1770,8 @@ static int lpc43_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, * ****************************************************************************/ -static int lpc43_sendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, size_t nbytes) +static int lpc43_sendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t nbytes) { struct lpc43_dev_s *priv = (struct lpc43_dev_s *)dev; #ifdef CONFIG_LPC43_SDMMC_DMA @@ -1836,7 +1836,7 @@ static int lpc43_sendsetup(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static int lpc43_cancel(FAR struct sdio_dev_s *dev) +static int lpc43_cancel(struct sdio_dev_s *dev) { struct lpc43_dev_s *priv = (struct lpc43_dev_s *)dev; @@ -1877,7 +1877,7 @@ static int lpc43_cancel(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static int lpc43_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd) +static int lpc43_waitresponse(struct sdio_dev_s *dev, uint32_t cmd) { volatile int32_t timeout; clock_t watchtime; @@ -1969,7 +1969,7 @@ static int lpc43_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd) * ****************************************************************************/ -static int lpc43_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc43_recvshortcrc(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort) { uint32_t regval; @@ -2046,7 +2046,7 @@ static int lpc43_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, return ret; } -static int lpc43_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc43_recvlong(struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong[4]) { uint32_t regval; @@ -2104,7 +2104,7 @@ static int lpc43_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, return ret; } -static int lpc43_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc43_recvshort(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort) { uint32_t regval; @@ -2157,7 +2157,7 @@ static int lpc43_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, /* MMC responses not supported */ -static int lpc43_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc43_recvnotimpl(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rnotimpl) { mcinfo("cmd=%04x\n", cmd); @@ -2191,7 +2191,7 @@ static int lpc43_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd, * ****************************************************************************/ -static void lpc43_waitenable(FAR struct sdio_dev_s *dev, +static void lpc43_waitenable(struct sdio_dev_s *dev, sdio_eventset_t eventset, uint32_t timeout) { struct lpc43_dev_s *priv = (struct lpc43_dev_s *)dev; @@ -2278,7 +2278,7 @@ static void lpc43_waitenable(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static sdio_eventset_t lpc43_eventwait(FAR struct sdio_dev_s *dev) +static sdio_eventset_t lpc43_eventwait(struct sdio_dev_s *dev) { struct lpc43_dev_s *priv = (struct lpc43_dev_s *)dev; sdio_eventset_t wkupevent = 0; @@ -2367,7 +2367,7 @@ errout: * ****************************************************************************/ -static void lpc43_callbackenable(FAR struct sdio_dev_s *dev, +static void lpc43_callbackenable(struct sdio_dev_s *dev, sdio_eventset_t eventset) { struct lpc43_dev_s *priv = (struct lpc43_dev_s *)dev; @@ -2401,7 +2401,7 @@ static void lpc43_callbackenable(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static int lpc43_registercallback(FAR struct sdio_dev_s *dev, +static int lpc43_registercallback(struct sdio_dev_s *dev, worker_t callback, void *arg) { struct lpc43_dev_s *priv = (struct lpc43_dev_s *)dev; @@ -2439,8 +2439,8 @@ static int lpc43_registercallback(FAR struct sdio_dev_s *dev, ****************************************************************************/ #ifdef CONFIG_LPC43_SDMMC_DMA -static int lpc43_dmarecvsetup(FAR struct sdio_dev_s *dev, - FAR uint8_t *buffer, size_t buflen) +static int lpc43_dmarecvsetup(struct sdio_dev_s *dev, + uint8_t *buffer, size_t buflen) { struct lpc43_dev_s *priv = (struct lpc43_dev_s *)dev; uint32_t regval; @@ -2591,8 +2591,8 @@ static int lpc43_dmarecvsetup(FAR struct sdio_dev_s *dev, ****************************************************************************/ #ifdef CONFIG_LPC43_SDMMC_DMA -static int lpc43_dmasendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, size_t buflen) +static int lpc43_dmasendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t buflen) { struct lpc43_dev_s *priv = (struct lpc43_dev_s *)dev; uint32_t regval; @@ -2819,7 +2819,7 @@ static void lpc43_callback(struct lpc43_dev_s *priv) * ****************************************************************************/ -FAR struct sdio_dev_s *lpc43_sdmmc_initialize(int slotno) +struct sdio_dev_s *lpc43_sdmmc_initialize(int slotno) { struct lpc43_dev_s *priv = &g_scard_dev; irqstate_t flags; diff --git a/arch/arm/src/lpc43xx/lpc43_sdmmc.h b/arch/arm/src/lpc43xx/lpc43_sdmmc.h index af634ff3d1..cc6e1ac49f 100644 --- a/arch/arm/src/lpc43xx/lpc43_sdmmc.h +++ b/arch/arm/src/lpc43xx/lpc43_sdmmc.h @@ -63,7 +63,7 @@ extern "C" ****************************************************************************/ struct lpc43_sdmmc_dev_s; /* See include/nuttx/sdio.h */ -FAR struct sdio_dev_s *lpc43_sdmmc_initialize(int slotno); +struct sdio_dev_s *lpc43_sdmmc_initialize(int slotno); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/lpc43xx/lpc43_spi.c b/arch/arm/src/lpc43xx/lpc43_spi.c index 7280f63d6b..da099eabab 100644 --- a/arch/arm/src/lpc43xx/lpc43_spi.c +++ b/arch/arm/src/lpc43xx/lpc43_spi.c @@ -86,17 +86,17 @@ struct lpc43_spidev_s /* 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, +static uint32_t spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency); -static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode); -static void spi_setbits(FAR struct spi_dev_s *dev, int nbits); -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 nwords); -static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, +static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode); +static void spi_setbits(struct spi_dev_s *dev, int nbits); +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 nwords); +static void spi_recvblock(struct spi_dev_s *dev, void *buffer, size_t nwords); /**************************************************************************** @@ -164,9 +164,9 @@ static struct lpc43_spidev_s g_spidev = * ****************************************************************************/ -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 lpc43_spidev_s *priv = (FAR struct lpc43_spidev_s *)dev; + struct lpc43_spidev_s *priv = (struct lpc43_spidev_s *)dev; int ret; if (lock) @@ -196,10 +196,10 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock) * ****************************************************************************/ -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 lpc43_spidev_s *priv = (FAR struct lpc43_spidev_s *)dev; + struct lpc43_spidev_s *priv = (struct lpc43_spidev_s *)dev; uint32_t divisor; uint32_t actual; @@ -267,9 +267,9 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) +static void spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) { - FAR struct lpc43_spidev_s *priv = (FAR struct lpc43_spidev_s *)dev; + struct lpc43_spidev_s *priv = (struct lpc43_spidev_s *)dev; uint32_t regval; /* Has the mode changed? */ @@ -326,9 +326,9 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) * ****************************************************************************/ -static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) +static void spi_setbits(struct spi_dev_s *dev, int nbits) { - FAR struct lpc43_spidev_s *priv = (FAR struct lpc43_spidev_s *)dev; + struct lpc43_spidev_s *priv = (struct lpc43_spidev_s *)dev; uint32_t regval; /* Has the number of bits changed? */ @@ -369,7 +369,7 @@ static void spi_setbits(FAR struct spi_dev_s *dev, int nbits) * ****************************************************************************/ -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) { /* Write the data to transmitted to the SPI Data Register */ @@ -408,10 +408,10 @@ 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, +static void spi_sndblock(struct spi_dev_s *dev, const void *buffer, size_t nwords) { - FAR uint8_t *ptr = (FAR uint8_t *)buffer; + uint8_t *ptr = (uint8_t *)buffer; uint8_t data; spiinfo("nwords: %d\n", nwords); @@ -456,10 +456,10 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, * ****************************************************************************/ -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 nwords) { - FAR uint8_t *ptr = (FAR uint8_t *)buffer; + uint8_t *ptr = (uint8_t *)buffer; spiinfo("nwords: %d\n", nwords); while (nwords) @@ -502,9 +502,9 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, * ****************************************************************************/ -static FAR struct spi_dev_s *lpc43_spiport_initialize(int port) +static struct spi_dev_s *lpc43_spiport_initialize(int port) { - FAR struct lpc43_spidev_s *priv = &g_spidev; + struct lpc43_spidev_s *priv = &g_spidev; /* Configure multiplexed pins as connected on the board. Chip select * pins must be configured by board-specific logic. All SPI pins and @@ -531,7 +531,7 @@ static FAR struct spi_dev_s *lpc43_spiport_initialize(int port) /* Select a default frequency of approx. 400KHz */ - spi_setfrequency((FAR struct spi_dev_s *)priv, 400000); + spi_setfrequency((struct spi_dev_s *)priv, 400000); /* Initialize the SPI semaphore that enforces mutually exclusive access */ @@ -561,7 +561,7 @@ static FAR struct spi_dev_s *lpc43_spiport_initialize(int port) * ****************************************************************************/ -FAR struct spi_dev_s *lpc43_spibus_initialize(int port) +struct spi_dev_s *lpc43_spibus_initialize(int port) { if (port) { diff --git a/arch/arm/src/lpc43xx/lpc43_spi.h b/arch/arm/src/lpc43xx/lpc43_spi.h index 334eb9c6f0..dcb534fffd 100644 --- a/arch/arm/src/lpc43xx/lpc43_spi.h +++ b/arch/arm/src/lpc43xx/lpc43_spi.h @@ -95,7 +95,7 @@ extern "C" * ****************************************************************************/ -FAR struct spi_dev_s *lpc43_spibus_initialize(int port); +struct spi_dev_s *lpc43_spibus_initialize(int port); /**************************************************************************** * Name: lpc43_spiselect, lpc43_spistatus, and lpc43_spicmddata @@ -113,12 +113,12 @@ FAR struct spi_dev_s *lpc43_spibus_initialize(int port); * ****************************************************************************/ -void lpc43_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, +void lpc43_spiselect(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t lpc43_spistatus(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t lpc43_spistatus(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int lpc43_spicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int lpc43_spicmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif /**************************************************************************** @@ -137,7 +137,7 @@ int lpc43_spicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); * ****************************************************************************/ -void spi_flush(FAR struct spi_dev_s *dev); +void spi_flush(struct spi_dev_s *dev); /**************************************************************************** * Name: lpc43_spi/spiregister @@ -160,7 +160,7 @@ void spi_flush(FAR struct spi_dev_s *dev); ****************************************************************************/ #ifdef CONFIG_SPI_CALLBACK -int lpc43_spiregister(FAR struct spi_dev_s *dev, +int lpc43_spiregister(struct spi_dev_s *dev, spi_mediachange_t callback, void *arg); #endif diff --git a/arch/arm/src/lpc43xx/lpc43_spifi.c b/arch/arm/src/lpc43xx/lpc43_spifi.c index 4f0dffad74..20f51b1a60 100644 --- a/arch/arm/src/lpc43xx/lpc43_spifi.c +++ b/arch/arm/src/lpc43xx/lpc43_spifi.c @@ -85,7 +85,7 @@ /* This is where the LPC43xx address where random-access reads begin */ #define SPIFI_BASE \ - (FAR uint8_t *)(LPC43_SPIFI_DATA_BASE + CONFIG_SPIFI_OFFSET) + (uint8_t *)(LPC43_SPIFI_DATA_BASE + CONFIG_SPIFI_OFFSET) /* Check if we are using a hard-coded block size */ @@ -273,9 +273,9 @@ struct lpc43_dev_s { struct mtd_dev_s mtd; /* MTD interface */ #ifndef CONFIG_SPIFI_LIBRARY - FAR struct spifi_driver_s *spifi; /* Pointer to ROM driver table */ + struct spifi_driver_s *spifi; /* Pointer to ROM driver table */ #endif - FAR struct spifi_dev_s rom; /* Needed for communication with ROM driver */ + struct spifi_dev_s rom; /* Needed for communication with ROM driver */ struct spifi_operands_s operands; /* Needed for program and erase ROM calls */ uint16_t nblocks; /* Number of blocks of size blksize */ #ifndef CONFIG_SPIFI_BLKSIZE @@ -286,7 +286,7 @@ struct lpc43_dev_s #if defined(CONFIG_SPIFI_SECTOR512) && !defined(CONFIG_SPIFI_READONLY) uint8_t flags; /* Buffered sector flags */ uint16_t blkno; /* Erase block number in the cache */ - FAR uint8_t *cache; /* Allocated sector data */ + uint8_t *cache; /* Allocated sector data */ #endif }; @@ -296,40 +296,40 @@ struct lpc43_dev_s /* Helpers */ -static void lpc43_blockerase(FAR struct lpc43_dev_s *priv, off_t offset); -static inline int lpc43_chiperase(FAR struct lpc43_dev_s *priv); -static inline void lpc43_pageread(FAR struct lpc43_dev_s *priv, - FAR uint8_t *dest, FAR const uint8_t *src, +static void lpc43_blockerase(struct lpc43_dev_s *priv, off_t offset); +static inline int lpc43_chiperase(struct lpc43_dev_s *priv); +static inline void lpc43_pageread(struct lpc43_dev_s *priv, + uint8_t *dest, const uint8_t *src, size_t nbytes); #ifndef CONFIG_SPIFI_READONLY #ifdef CONFIG_SPIFI_VERIFY -static int lpc43_verify(FAR struct lpc43_dev_s *priv, FAR uint8_t *dest, - FAR const uint8_t *src, size_t nbytes); +static int lpc43_verify(struct lpc43_dev_s *priv, uint8_t *dest, + const uint8_t *src, size_t nbytes); #endif -static int lpc43_pagewrite(FAR struct lpc43_dev_s *priv, FAR uint8_t *dest, - FAR const uint8_t *src, size_t nbytes); +static int lpc43_pagewrite(struct lpc43_dev_s *priv, uint8_t *dest, + const uint8_t *src, size_t nbytes); #ifdef CONFIG_SPIFI_SECTOR512 static void lpc43_cacheflush(struct lpc43_dev_s *priv); -static FAR uint8_t *lpc43_cacheread(struct lpc43_dev_s *priv, off_t sector); +static uint8_t *lpc43_cacheread(struct lpc43_dev_s *priv, off_t sector); static void lpc43_cacheerase(struct lpc43_dev_s *priv, off_t sector); -static void lpc43_cachewrite(FAR struct lpc43_dev_s *priv, - FAR const uint8_t *buffer, +static void lpc43_cachewrite(struct lpc43_dev_s *priv, + const uint8_t *buffer, off_t sector, size_t nsectors); #endif #endif /* MTD driver methods */ -static int lpc43_erase(FAR struct mtd_dev_s *dev, +static int lpc43_erase(struct mtd_dev_s *dev, off_t startblock, size_t nblocks); -static ssize_t lpc43_bread(FAR struct mtd_dev_s *dev, off_t startblock, - size_t nblocks, FAR uint8_t *buf); -static ssize_t lpc43_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, - size_t nblocks, FAR const uint8_t *buf); -static ssize_t lpc43_read(FAR struct mtd_dev_s *dev, +static ssize_t lpc43_bread(struct mtd_dev_s *dev, off_t startblock, + size_t nblocks, uint8_t *buf); +static ssize_t lpc43_bwrite(struct mtd_dev_s *dev, off_t startblock, + size_t nblocks, const uint8_t *buf); +static ssize_t lpc43_read(struct mtd_dev_s *dev, off_t offset, size_t nbytes, - FAR uint8_t *buffer); -static int lpc43_ioctl(FAR struct mtd_dev_s *dev, + uint8_t *buffer); +static int lpc43_ioctl(struct mtd_dev_s *dev, int cmd, unsigned long arg); /* Initialization */ @@ -340,7 +340,7 @@ static inline void lpc43_idiv_clkconfig(void); static inline void lpc43_spifi_clkconfig(void); static inline void lpc43_spifi_pinconfig(void); -static inline int lpc43_rominit(FAR struct lpc43_dev_s *priv); +static inline int lpc43_rominit(struct lpc43_dev_s *priv); /**************************************************************************** * Private Data @@ -422,8 +422,8 @@ static inline int lpc43_chiperase(struct lpc43_dev_s *priv) ****************************************************************************/ #if !defined(CONFIG_SPIFI_READONLY) && defined(CONFIG_SPIFI_VERIFY) -static int lpc43_verify(FAR struct lpc43_dev_s *priv, FAR uint8_t *dest, - FAR const uint8_t *src, size_t nbytes) +static int lpc43_verify(struct lpc43_dev_s *priv, uint8_t *dest, + const uint8_t *src, size_t nbytes) { return memcmp(src, dest, nbytes) != 0 ? -EIO : OK; } @@ -434,8 +434,8 @@ static int lpc43_verify(FAR struct lpc43_dev_s *priv, FAR uint8_t *dest, ****************************************************************************/ #ifndef CONFIG_SPIFI_READONLY -static int lpc43_pagewrite(FAR struct lpc43_dev_s *priv, FAR uint8_t *dest, - FAR const uint8_t *src, size_t nbytes) +static int lpc43_pagewrite(struct lpc43_dev_s *priv, uint8_t *dest, + const uint8_t *src, size_t nbytes) { int result; @@ -482,8 +482,8 @@ static int lpc43_pagewrite(FAR struct lpc43_dev_s *priv, FAR uint8_t *dest, * Name: lpc43_pageread ****************************************************************************/ -static inline void lpc43_pageread(FAR struct lpc43_dev_s *priv, - FAR uint8_t *dest, FAR const uint8_t *src, +static inline void lpc43_pageread(struct lpc43_dev_s *priv, + uint8_t *dest, const uint8_t *src, size_t nbytes) { finfo("src=%p dest=%p length=%d\n", src, dest, nbytes); @@ -497,7 +497,7 @@ static inline void lpc43_pageread(FAR struct lpc43_dev_s *priv, #if defined(CONFIG_SPIFI_SECTOR512) && !defined(CONFIG_SPIFI_READONLY) static void lpc43_cacheflush(struct lpc43_dev_s *priv) { - FAR uint8_t *dest; + uint8_t *dest; int ret; /* If the cached is dirty (meaning that it no longer matches the old @@ -533,9 +533,9 @@ static void lpc43_cacheflush(struct lpc43_dev_s *priv) ****************************************************************************/ #if defined(CONFIG_SPIFI_SECTOR512) && !defined(CONFIG_SPIFI_READONLY) -static FAR uint8_t *lpc43_cacheread(struct lpc43_dev_s *priv, off_t sector) +static uint8_t *lpc43_cacheread(struct lpc43_dev_s *priv, off_t sector) { - FAR const uint8_t *src; + const uint8_t *src; off_t blkno; int index; @@ -594,7 +594,7 @@ static FAR uint8_t *lpc43_cacheread(struct lpc43_dev_s *priv, off_t sector) #if defined(CONFIG_SPIFI_SECTOR512) && !defined(CONFIG_SPIFI_READONLY) static void lpc43_cacheerase(struct lpc43_dev_s *priv, off_t sector) { - FAR uint8_t *dest; + uint8_t *dest; /* First, make sure that the erase block containing the 512 byte sector is * in the cache. @@ -631,11 +631,11 @@ static void lpc43_cacheerase(struct lpc43_dev_s *priv, off_t sector) ****************************************************************************/ #if defined(CONFIG_SPIFI_SECTOR512) && !defined(CONFIG_SPIFI_READONLY) -static void lpc43_cachewrite(FAR struct lpc43_dev_s *priv, - FAR const uint8_t *buffer, +static void lpc43_cachewrite(struct lpc43_dev_s *priv, + const uint8_t *buffer, off_t sector, size_t nsectors) { - FAR uint8_t *dest; + uint8_t *dest; for (; nsectors > 0; nsectors--) { @@ -683,13 +683,13 @@ static void lpc43_cachewrite(FAR struct lpc43_dev_s *priv, * Name: lpc43_erase ****************************************************************************/ -static int lpc43_erase(FAR struct mtd_dev_s *dev, +static int lpc43_erase(struct mtd_dev_s *dev, off_t startblock, size_t nblocks) { #ifdef CONFIG_SPIFI_READONLY return -EACESS #else - FAR struct lpc43_dev_s *priv = (FAR struct lpc43_dev_s *)dev; + struct lpc43_dev_s *priv = (struct lpc43_dev_s *)dev; size_t blocksleft = nblocks; finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); @@ -720,9 +720,9 @@ static int lpc43_erase(FAR struct mtd_dev_s *dev, * Name: lpc43_bread ****************************************************************************/ -static ssize_t lpc43_bread(FAR struct mtd_dev_s *dev, +static ssize_t lpc43_bread(struct mtd_dev_s *dev, off_t startblock, size_t nblocks, - FAR uint8_t *buffer) + uint8_t *buffer) { #ifdef CONFIG_SPIFI_SECTOR512 ssize_t nbytes; @@ -743,7 +743,7 @@ static ssize_t lpc43_bread(FAR struct mtd_dev_s *dev, return (int)nbytes; #else - FAR struct lpc43_dev_s *priv = (FAR struct lpc43_dev_s *)dev; + struct lpc43_dev_s *priv = (struct lpc43_dev_s *)dev; ssize_t nbytes; finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); @@ -768,9 +768,9 @@ static ssize_t lpc43_bread(FAR struct mtd_dev_s *dev, * Name: lpc43_bwrite ****************************************************************************/ -static ssize_t lpc43_bwrite(FAR struct mtd_dev_s *dev, +static ssize_t lpc43_bwrite(struct mtd_dev_s *dev, off_t startblock, size_t nblocks, - FAR const uint8_t *buffer) + const uint8_t *buffer) { #if defined(CONFIG_SPIFI_READONLY) @@ -778,7 +778,7 @@ static ssize_t lpc43_bwrite(FAR struct mtd_dev_s *dev, #elif defined(CONFIG_SPIFI_SECTOR512) - FAR struct lpc43_dev_s *priv = (FAR struct lpc43_dev_s *)dev; + struct lpc43_dev_s *priv = (struct lpc43_dev_s *)dev; finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); @@ -789,8 +789,8 @@ static ssize_t lpc43_bwrite(FAR struct mtd_dev_s *dev, #else - FAR struct lpc43_dev_s *priv = (FAR struct lpc43_dev_s *)dev; - FAR uint8_t *dest; + struct lpc43_dev_s *priv = (struct lpc43_dev_s *)dev; + uint8_t *dest; int ret; finfo("startblock: %08lx nblocks: %d\n", (long)startblock, (int)nblocks); @@ -818,12 +818,12 @@ static ssize_t lpc43_bwrite(FAR struct mtd_dev_s *dev, * Name: lpc43_read ****************************************************************************/ -static ssize_t lpc43_read(FAR struct mtd_dev_s *dev, +static ssize_t lpc43_read(struct mtd_dev_s *dev, off_t offset, size_t nbytes, - FAR uint8_t *buffer) + uint8_t *buffer) { - FAR struct lpc43_dev_s *priv = (FAR struct lpc43_dev_s *)dev; - FAR const uint8_t *src; + struct lpc43_dev_s *priv = (struct lpc43_dev_s *)dev; + const uint8_t *src; finfo("offset: %08lx nbytes: %d\n", (long)offset, (int)nbytes); @@ -843,9 +843,9 @@ static ssize_t lpc43_read(FAR struct mtd_dev_s *dev, * Name: lpc43_ioctl ****************************************************************************/ -static int lpc43_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) +static int lpc43_ioctl(struct mtd_dev_s *dev, int cmd, unsigned long arg) { - FAR struct lpc43_dev_s *priv = (FAR struct lpc43_dev_s *)dev; + struct lpc43_dev_s *priv = (struct lpc43_dev_s *)dev; int ret = -EINVAL; /* Assume good command with bad parameters */ finfo("cmd: %d\n", cmd); @@ -854,8 +854,8 @@ static int lpc43_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) { case MTDIOC_GEOMETRY: { - FAR struct mtd_geometry_s *geo = - (FAR struct mtd_geometry_s *)((uintptr_t)arg); + struct mtd_geometry_s *geo = + (struct mtd_geometry_s *)((uintptr_t)arg); if (geo) { /* Populate the geometry structure with information need to @@ -888,8 +888,8 @@ static int lpc43_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) case BIOC_PARTINFO: { - FAR struct partition_info_s *info = - (FAR struct partition_info_s *)arg; + struct partition_info_s *info = + (struct partition_info_s *)arg; if (info != NULL) { #ifdef CONFIG_SPIFI_SECTOR512 @@ -917,7 +917,7 @@ static int lpc43_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg) case MTDIOC_ERASESTATE: { - FAR uint8_t *result = (FAR uint8_t *)arg; + uint8_t *result = (uint8_t *)arg; *result = SPIFI_ERASED_STATE; ret = OK; @@ -1025,10 +1025,10 @@ static inline void lpc43_spifi_pinconfig(void) * ****************************************************************************/ -static inline int lpc43_rominit(FAR struct lpc43_dev_s *priv) +static inline int lpc43_rominit(struct lpc43_dev_s *priv) { #ifndef CONFIG_SPIFI_BLKSIZE - FAR struct spfi_desc_s *desc; + struct spfi_desc_s *desc; uint16_t sectors; uint8_t log2; #endif @@ -1179,11 +1179,11 @@ static inline int lpc43_rominit(FAR struct lpc43_dev_s *priv) * ****************************************************************************/ -FAR struct mtd_dev_s *lpc43_spifi_initialize(void) +struct mtd_dev_s *lpc43_spifi_initialize(void) { /* At present, only a single instance of the SPIFI driver is supported */ - FAR struct lpc43_dev_s *priv = &g_spifi; + struct lpc43_dev_s *priv = &g_spifi; irqstate_t flags; int ret; @@ -1236,7 +1236,7 @@ FAR struct mtd_dev_s *lpc43_spifi_initialize(void) /* Allocate a buffer for the erase block cache */ - priv->cache = (FAR uint8_t *)kmm_malloc(SPIFI_BLKSIZE); + priv->cache = (uint8_t *)kmm_malloc(SPIFI_BLKSIZE); if (!priv->cache) { /* Allocation failed! @@ -1251,7 +1251,7 @@ FAR struct mtd_dev_s *lpc43_spifi_initialize(void) /* Return the implementation-specific state structure as the MTD device */ finfo("Return %p\n", priv); - return (FAR struct mtd_dev_s *)priv; + return (struct mtd_dev_s *)priv; } /**************************************************************************** diff --git a/arch/arm/src/lpc43xx/lpc43_spifi.h b/arch/arm/src/lpc43xx/lpc43_spifi.h index e0ea6a6591..8ba15fc02d 100644 --- a/arch/arm/src/lpc43xx/lpc43_spifi.h +++ b/arch/arm/src/lpc43xx/lpc43_spifi.h @@ -107,7 +107,7 @@ extern "C" * ****************************************************************************/ -FAR struct mtd_dev_s *lpc43_spifi_initialize(void); +struct mtd_dev_s *lpc43_spifi_initialize(void); #undef EXTERN #ifdef __cplusplus diff --git a/arch/arm/src/lpc43xx/lpc43_ssp.c b/arch/arm/src/lpc43xx/lpc43_ssp.c index c8845f39de..3d630b3355 100644 --- a/arch/arm/src/lpc43xx/lpc43_ssp.c +++ b/arch/arm/src/lpc43xx/lpc43_ssp.c @@ -76,36 +76,36 @@ struct lpc43_sspdev_s /* Helpers */ -static inline uint32_t ssp_getreg(FAR struct lpc43_sspdev_s *priv, +static inline uint32_t ssp_getreg(struct lpc43_sspdev_s *priv, uint8_t offset); -static inline void ssp_putreg(FAR struct lpc43_sspdev_s *priv, +static inline void ssp_putreg(struct lpc43_sspdev_s *priv, uint8_t offset, uint32_t value); /* SPI methods */ -static int ssp_lock(FAR struct spi_dev_s *dev, bool lock); -static uint32_t ssp_setfrequency(FAR struct spi_dev_s *dev, +static int ssp_lock(struct spi_dev_s *dev, bool lock); +static uint32_t ssp_setfrequency(struct spi_dev_s *dev, uint32_t frequency); -static void ssp_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode); -static void ssp_setbits(FAR struct spi_dev_s *dev, int nbits); -static uint32_t ssp_send(FAR struct spi_dev_s *dev, uint32_t wd); -static void ssp_exchange(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, FAR void *rxbuffer, +static void ssp_setmode(struct spi_dev_s *dev, enum spi_mode_e mode); +static void ssp_setbits(struct spi_dev_s *dev, int nbits); +static uint32_t ssp_send(struct spi_dev_s *dev, uint32_t wd); +static void ssp_exchange(struct spi_dev_s *dev, + const void *txbuffer, void *rxbuffer, size_t nwords); #ifndef CONFIG_SPI_EXCHANGE -static void ssp_sndblock(FAR struct spi_dev_s *dev, - FAR const void *buffer, size_t nwords); -static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, +static void ssp_sndblock(struct spi_dev_s *dev, + const void *buffer, size_t nwords); +static void ssp_recvblock(struct spi_dev_s *dev, void *buffer, size_t nwords); #endif /* Initialization */ #ifdef CONFIG_LPC43_SSP0 -static inline FAR struct lpc43_sspdev_s *lpc43_ssp0initialize(void); +static inline struct lpc43_sspdev_s *lpc43_ssp0initialize(void); #endif #ifdef CONFIG_LPC43_SSP1 -static inline FAR struct lpc43_sspdev_s *lpc43_ssp1initialize(void); +static inline struct lpc43_sspdev_s *lpc43_ssp1initialize(void); #endif /**************************************************************************** @@ -218,7 +218,7 @@ static struct lpc43_sspdev_s g_ssp1dev = * ****************************************************************************/ -static inline uint32_t ssp_getreg(FAR struct lpc43_sspdev_s *priv, +static inline uint32_t ssp_getreg(struct lpc43_sspdev_s *priv, uint8_t offset) { return getreg32(priv->sspbase + (uint32_t)offset); @@ -240,7 +240,7 @@ static inline uint32_t ssp_getreg(FAR struct lpc43_sspdev_s *priv, * ****************************************************************************/ -static inline void ssp_putreg(FAR struct lpc43_sspdev_s *priv, +static inline void ssp_putreg(struct lpc43_sspdev_s *priv, uint8_t offset, uint32_t value) { putreg32(value, priv->sspbase + (uint32_t)offset); @@ -267,9 +267,9 @@ static inline void ssp_putreg(FAR struct lpc43_sspdev_s *priv, * ****************************************************************************/ -static int ssp_lock(FAR struct spi_dev_s *dev, bool lock) +static int ssp_lock(struct spi_dev_s *dev, bool lock) { - FAR struct lpc43_sspdev_s *priv = (FAR struct lpc43_sspdev_s *)dev; + struct lpc43_sspdev_s *priv = (struct lpc43_sspdev_s *)dev; int ret; if (lock) @@ -299,10 +299,10 @@ static int ssp_lock(FAR struct spi_dev_s *dev, bool lock) * ****************************************************************************/ -static uint32_t ssp_setfrequency(FAR struct spi_dev_s *dev, +static uint32_t ssp_setfrequency(struct spi_dev_s *dev, uint32_t frequency) { - FAR struct lpc43_sspdev_s *priv = (FAR struct lpc43_sspdev_s *)dev; + struct lpc43_sspdev_s *priv = (struct lpc43_sspdev_s *)dev; uint32_t divisor; uint32_t actual; @@ -362,9 +362,9 @@ static uint32_t ssp_setfrequency(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void ssp_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) +static void ssp_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) { - FAR struct lpc43_sspdev_s *priv = (FAR struct lpc43_sspdev_s *)dev; + struct lpc43_sspdev_s *priv = (struct lpc43_sspdev_s *)dev; uint32_t regval; /* Has the mode changed? */ @@ -424,9 +424,9 @@ static void ssp_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode) * ****************************************************************************/ -static void ssp_setbits(FAR struct spi_dev_s *dev, int nbits) +static void ssp_setbits(struct spi_dev_s *dev, int nbits) { - FAR struct lpc43_sspdev_s *priv = (FAR struct lpc43_sspdev_s *)dev; + struct lpc43_sspdev_s *priv = (struct lpc43_sspdev_s *)dev; uint32_t regval; /* Has the number of bits changed? */ @@ -470,9 +470,9 @@ static void ssp_setbits(FAR struct spi_dev_s *dev, int nbits) * ****************************************************************************/ -static uint32_t ssp_send(FAR struct spi_dev_s *dev, uint32_t wd) +static uint32_t ssp_send(struct spi_dev_s *dev, uint32_t wd) { - FAR struct lpc43_sspdev_s *priv = (FAR struct lpc43_sspdev_s *)dev; + struct lpc43_sspdev_s *priv = (struct lpc43_sspdev_s *)dev; register uint32_t regval; /* Wait while the TX FIFO is full */ @@ -515,22 +515,22 @@ static uint32_t ssp_send(FAR struct spi_dev_s *dev, uint32_t wd) * ****************************************************************************/ -static void ssp_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, - FAR void *rxbuffer, size_t nwords) +static void ssp_exchange(struct spi_dev_s *dev, const void *txbuffer, + void *rxbuffer, size_t nwords) { - FAR struct lpc43_sspdev_s *priv = (FAR struct lpc43_sspdev_s *)dev; + struct lpc43_sspdev_s *priv = (struct lpc43_sspdev_s *)dev; union { - FAR const uint8_t *p8; - FAR const uint16_t *p16; - FAR const void *pv; + const uint8_t *p8; + const uint16_t *p16; + const void *pv; } tx; union { - FAR uint8_t *p8; - FAR uint16_t *p16; - FAR void *pv; + uint8_t *p8; + uint16_t *p16; + void *pv; } rx; uint32_t data; @@ -620,7 +620,7 @@ static void ssp_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, ****************************************************************************/ #ifndef CONFIG_SPI_EXCHANGE -static void ssp_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, +static void ssp_sndblock(struct spi_dev_s *dev, const void *buffer, size_t nwords) { return ssp_exchange(dev, buffer, NULL, nwords); @@ -646,7 +646,7 @@ static void ssp_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, * ****************************************************************************/ -static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, +static void ssp_recvblock(struct spi_dev_s *dev, void *buffer, size_t nwords) { return ssp_exchange(dev, NULL, buffer, nwords); @@ -668,7 +668,7 @@ static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, ****************************************************************************/ #ifdef CONFIG_LPC43_SSP0 -static inline FAR struct lpc43_sspdev_s *lpc43_ssp0initialize(void) +static inline struct lpc43_sspdev_s *lpc43_ssp0initialize(void) { irqstate_t flags; uint32_t regval; @@ -721,7 +721,7 @@ static inline FAR struct lpc43_sspdev_s *lpc43_ssp0initialize(void) ****************************************************************************/ #ifdef CONFIG_LPC43_SSP1 -static inline FAR struct lpc43_sspdev_s *lpc43_ssp1initialize(void) +static inline struct lpc43_sspdev_s *lpc43_ssp1initialize(void) { irqstate_t flags; uint32_t regval; @@ -782,9 +782,9 @@ static inline FAR struct lpc43_sspdev_s *lpc43_ssp1initialize(void) * ****************************************************************************/ -FAR struct spi_dev_s *lpc43_sspbus_initialize(int port) +struct spi_dev_s *lpc43_sspbus_initialize(int port) { - FAR struct lpc43_sspdev_s *priv; + struct lpc43_sspdev_s *priv; uint32_t regval; int i; @@ -825,7 +825,7 @@ FAR struct spi_dev_s *lpc43_sspbus_initialize(int port) /* Select a default frequency of approx. 400KHz */ - ssp_setfrequency((FAR struct spi_dev_s *)priv, 400000); + ssp_setfrequency((struct spi_dev_s *)priv, 400000); /* Initialize the SPI semaphore that enforces mutually exclusive access */ @@ -858,9 +858,9 @@ FAR struct spi_dev_s *lpc43_sspbus_initialize(int port) * ****************************************************************************/ -void ssp_flush(FAR struct spi_dev_s *dev) +void ssp_flush(struct spi_dev_s *dev) { - FAR struct lpc43_sspdev_s *priv = (FAR struct lpc43_sspdev_s *)dev; + struct lpc43_sspdev_s *priv = (struct lpc43_sspdev_s *)dev; /* Wait for the TX FIFO not full indication */ diff --git a/arch/arm/src/lpc43xx/lpc43_ssp.h b/arch/arm/src/lpc43xx/lpc43_ssp.h index d6b308e736..b47dfafd18 100644 --- a/arch/arm/src/lpc43xx/lpc43_ssp.h +++ b/arch/arm/src/lpc43xx/lpc43_ssp.h @@ -92,7 +92,7 @@ extern "C" * ****************************************************************************/ -FAR struct spi_dev_s *lpc43_sspbus_initialize(int port); +struct spi_dev_s *lpc43_sspbus_initialize(int port); /**************************************************************************** * Name: lpc43_ssp0/1select, lpc43_ssp0/1status, and lpc43_ssp0/1cmddata @@ -111,20 +111,20 @@ FAR struct spi_dev_s *lpc43_sspbus_initialize(int port); ****************************************************************************/ #ifdef CONFIG_LPC43_SSP0 -void lpc43_ssp0select(FAR struct spi_dev_s *dev, +void lpc43_ssp0select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t lpc43_ssp0status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t lpc43_ssp0status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int lpc43_ssp0cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int lpc43_ssp0cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_LPC43_SSP1 -void lpc43_ssp1select(FAR struct spi_dev_s *dev, +void lpc43_ssp1select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t lpc43_ssp1status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t lpc43_ssp1status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int lpc43_ssp1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int lpc43_ssp1cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif @@ -145,7 +145,7 @@ int lpc43_ssp1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); ****************************************************************************/ #if defined(CONFIG_LPC43_SSP0) || defined(CONFIG_LPC43_SSP1) -void ssp_flush(FAR struct spi_dev_s *dev); +void ssp_flush(struct spi_dev_s *dev); #endif /**************************************************************************** @@ -170,13 +170,13 @@ void ssp_flush(FAR struct spi_dev_s *dev); #ifdef CONFIG_SPI_CALLBACK #ifdef CONFIG_LPC43_SSP0 -int lpc43_ssp0register(FAR struct spi_dev_s *dev, spi_mediachange_t callback, - FAR void *arg); +int lpc43_ssp0register(struct spi_dev_s *dev, spi_mediachange_t callback, + void *arg); #endif #ifdef CONFIG_LPC43_SSP1 -int lpc43_ssp1register(FAR struct spi_dev_s *dev, spi_mediachange_t callback, - FAR void *arg); +int lpc43_ssp1register(struct spi_dev_s *dev, spi_mediachange_t callback, + void *arg); #endif #endif diff --git a/arch/arm/src/lpc43xx/lpc43_tickless_rit.c b/arch/arm/src/lpc43xx/lpc43_tickless_rit.c index 02c6091dcf..6910459b1f 100644 --- a/arch/arm/src/lpc43xx/lpc43_tickless_rit.c +++ b/arch/arm/src/lpc43xx/lpc43_tickless_rit.c @@ -195,9 +195,9 @@ static uint32_t common_dev(uint32_t a, uint32_t b) return a; } -static void lpc43_tl_add(FAR const struct timespec *ts1, - FAR const struct timespec *ts2, - FAR struct timespec *ts3) +static void lpc43_tl_add(const struct timespec *ts1, + const struct timespec *ts2, + struct timespec *ts3) { time_t sec = ts1->tv_sec + ts2->tv_sec; long nsec = ts1->tv_nsec + ts2->tv_nsec; @@ -212,9 +212,9 @@ static void lpc43_tl_add(FAR const struct timespec *ts1, ts3->tv_nsec = nsec; } -static void lpc43_tl_sub(FAR const struct timespec *ts1, - FAR const struct timespec *ts2, - FAR struct timespec *ts3) +static void lpc43_tl_sub(const struct timespec *ts1, + const struct timespec *ts2, + struct timespec *ts3) { time_t sec; long nsec; @@ -247,12 +247,12 @@ static void lpc43_tl_sub(FAR const struct timespec *ts1, ts3->tv_nsec = nsec; } -static inline uint32_t lpc43_tl_ts2tick(FAR const struct timespec *ts) +static inline uint32_t lpc43_tl_ts2tick(const struct timespec *ts) { return (ts->tv_sec * LPC43_CCLK + (ts->tv_nsec / MIN_NSEC * MIN_TICKS)); } -static uint32_t lpc43_tl_tick2ts(uint32_t ticks, FAR struct timespec *ts, +static uint32_t lpc43_tl_tick2ts(uint32_t ticks, struct timespec *ts, bool with_rest) { uint32_t ticks_whole; @@ -521,7 +521,7 @@ static inline void lpc43_tl_alarm(uint32_t curr) /* Interrupt handler */ -static int lpc43_tl_isr(int irq, FAR void *context, FAR void *arg) +static int lpc43_tl_isr(int irq, void *context, void *arg) { lpc43_tl_sync_up(); @@ -623,7 +623,7 @@ void up_timer_initialize(void) /* No reg changes, only processing */ -int up_timer_gettime(FAR struct timespec *ts) +int up_timer_gettime(struct timespec *ts) { lpc43_tl_sync_up(); @@ -664,7 +664,7 @@ int up_timer_gettime(FAR struct timespec *ts) return OK; } -int up_alarm_cancel(FAR struct timespec *ts) +int up_alarm_cancel(struct timespec *ts) { lpc43_tl_sync_up(); @@ -683,7 +683,7 @@ int up_alarm_cancel(FAR struct timespec *ts) return OK; } -int up_alarm_start(FAR const struct timespec *ts) +int up_alarm_start(const struct timespec *ts) { lpc43_tl_sync_up(); @@ -727,7 +727,7 @@ int up_alarm_start(FAR const struct timespec *ts) } #ifndef CONFIG_SCHED_TICKLESS_ALARM -int up_timer_cancel(FAR struct timespec *ts) +int up_timer_cancel(struct timespec *ts) { lpc43_tl_sync_up(); @@ -744,7 +744,7 @@ int up_timer_cancel(FAR struct timespec *ts) return OK; } -int up_timer_start(FAR const struct timespec *ts) +int up_timer_start(const struct timespec *ts) { lpc43_tl_sync_up(); diff --git a/arch/arm/src/lpc43xx/lpc43_timer.c b/arch/arm/src/lpc43xx/lpc43_timer.c index e1471942c9..95e2ec656f 100644 --- a/arch/arm/src/lpc43xx/lpc43_timer.c +++ b/arch/arm/src/lpc43xx/lpc43_timer.c @@ -72,18 +72,18 @@ struct lpc43_lowerhalf_s { - FAR const struct timer_ops_s *ops; /* Lower half operations */ + const struct timer_ops_s *ops; /* Lower half operations */ /* Private data */ - uint32_t base; /* Base address of the timer */ - tccb_t callback; /* Current user interrupt callback */ - FAR void *arg; /* Argument passed to the callback function */ - uint32_t timeout; /* The current timeout value (us) */ - uint32_t adjustment; /* time lost due to clock resolution truncation (us) */ - uint32_t clkticks; /* actual clock ticks for current interval */ - bool started; /* The timer has been started */ - uint16_t tmrid; /* Timer id */ + uint32_t base; /* Base address of the timer */ + tccb_t callback; /* Current user interrupt callback */ + void *arg; /* Argument passed to the callback function */ + uint32_t timeout; /* The current timeout value (us) */ + uint32_t adjustment; /* time lost due to clock resolution truncation (us) */ + uint32_t clkticks; /* actual clock ticks for current interval */ + bool started; /* The timer has been started */ + uint16_t tmrid; /* Timer id */ }; /**************************************************************************** @@ -102,19 +102,19 @@ static void lpc43_putreg(uint32_t val, uint32_t addr); /* Interrupt handling *******************************************************/ -static int lpc43_interrupt(int irq, FAR void *context, FAR void *arg); +static int lpc43_interrupt(int irq, void *context, void *arg); /* "Lower half" driver methods **********************************************/ -static int lpc43_start(FAR struct timer_lowerhalf_s *lower); -static int lpc43_stop(FAR struct timer_lowerhalf_s *lower); -static int lpc43_getstatus(FAR struct timer_lowerhalf_s *lower, - FAR struct timer_status_s *status); -static int lpc43_settimeout(FAR struct timer_lowerhalf_s *lower, +static int lpc43_start(struct timer_lowerhalf_s *lower); +static int lpc43_stop(struct timer_lowerhalf_s *lower); +static int lpc43_getstatus(struct timer_lowerhalf_s *lower, + struct timer_status_s *status); +static int lpc43_settimeout(struct timer_lowerhalf_s *lower, uint32_t timeout); -static void lpc43_setcallback(FAR struct timer_lowerhalf_s *lower, - tccb_t callback, FAR void *arg); -static int lpc43_ioctl(FAR struct timer_lowerhalf_s *lower, int cmd, +static void lpc43_setcallback(struct timer_lowerhalf_s *lower, + tccb_t callback, void *arg); +static int lpc43_ioctl(struct timer_lowerhalf_s *lower, int cmd, unsigned long arg); /**************************************************************************** @@ -325,10 +325,10 @@ void tmr_clk_disable(uint16_t tmrid) * ****************************************************************************/ -static int lpc43_interrupt(int irq, FAR void *context, FAR void *arg) +static int lpc43_interrupt(int irq, void *context, void *arg) { uint8_t chan_int = 0x0f; - FAR struct lpc43_lowerhalf_s *priv = &g_tmrdevs[irq - LPC43M4_IRQ_TIMER0]; + struct lpc43_lowerhalf_s *priv = &g_tmrdevs[irq - LPC43M4_IRQ_TIMER0]; tmrinfo("Entry\n"); DEBUGASSERT((irq >= LPC43M4_IRQ_TIMER0) && (irq <= LPC43M4_IRQ_TIMER3)); @@ -368,7 +368,7 @@ static int lpc43_interrupt(int irq, FAR void *context, FAR void *arg) { /* No callback or the callback returned false.. stop the timer */ - lpc43_stop((FAR struct timer_lowerhalf_s *)priv); + lpc43_stop((struct timer_lowerhalf_s *)priv); tmrinfo("Stopped\n"); } @@ -395,9 +395,9 @@ static int lpc43_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static int lpc43_start(FAR struct timer_lowerhalf_s *lower) +static int lpc43_start(struct timer_lowerhalf_s *lower) { - FAR struct lpc43_lowerhalf_s *priv = (FAR struct lpc43_lowerhalf_s *)lower; + struct lpc43_lowerhalf_s *priv = (struct lpc43_lowerhalf_s *)lower; uint32_t presc_val; tmrinfo("Entry\n"); @@ -459,9 +459,9 @@ static int lpc43_start(FAR struct timer_lowerhalf_s *lower) * ****************************************************************************/ -static int lpc43_stop(FAR struct timer_lowerhalf_s *lower) +static int lpc43_stop(struct timer_lowerhalf_s *lower) { - FAR struct lpc43_lowerhalf_s *priv = (FAR struct lpc43_lowerhalf_s *)lower; + struct lpc43_lowerhalf_s *priv = (struct lpc43_lowerhalf_s *)lower; tmrinfo("Entry\n"); DEBUGASSERT(priv); @@ -503,10 +503,10 @@ static int lpc43_stop(FAR struct timer_lowerhalf_s *lower) * ****************************************************************************/ -static int lpc43_getstatus(FAR struct timer_lowerhalf_s *lower, - FAR struct timer_status_s *status) +static int lpc43_getstatus(struct timer_lowerhalf_s *lower, + struct timer_status_s *status) { - FAR struct lpc43_lowerhalf_s *priv = (FAR struct lpc43_lowerhalf_s *)lower; + struct lpc43_lowerhalf_s *priv = (struct lpc43_lowerhalf_s *)lower; uint32_t elapsed; tmrinfo("Entry\n"); @@ -559,10 +559,10 @@ static int lpc43_getstatus(FAR struct timer_lowerhalf_s *lower, * ****************************************************************************/ -static int lpc43_settimeout(FAR struct timer_lowerhalf_s *lower, +static int lpc43_settimeout(struct timer_lowerhalf_s *lower, uint32_t timeout) { - FAR struct lpc43_lowerhalf_s *priv = (FAR struct lpc43_lowerhalf_s *)lower; + struct lpc43_lowerhalf_s *priv = (struct lpc43_lowerhalf_s *)lower; DEBUGASSERT(priv); @@ -624,10 +624,10 @@ static int lpc43_settimeout(FAR struct timer_lowerhalf_s *lower, * ****************************************************************************/ -static void lpc43_setcallback(FAR struct timer_lowerhalf_s *lower, - tccb_t callback, FAR void *arg) +static void lpc43_setcallback(struct timer_lowerhalf_s *lower, + tccb_t callback, void *arg) { - FAR struct lpc43_lowerhalf_s *priv = (FAR struct lpc43_lowerhalf_s *)lower; + struct lpc43_lowerhalf_s *priv = (struct lpc43_lowerhalf_s *)lower; irqstate_t flags; flags = enter_critical_section(); @@ -663,10 +663,10 @@ static void lpc43_setcallback(FAR struct timer_lowerhalf_s *lower, * ****************************************************************************/ -static int lpc43_ioctl(FAR struct timer_lowerhalf_s *lower, int cmd, - unsigned long arg) +static int lpc43_ioctl(struct timer_lowerhalf_s *lower, int cmd, + unsigned long arg) { - FAR struct lpc43_lowerhalf_s *priv = (FAR struct lpc43_lowerhalf_s *)lower; + struct lpc43_lowerhalf_s *priv = (struct lpc43_lowerhalf_s *)lower; int ret = -ENOTTY; DEBUGASSERT(priv); @@ -696,9 +696,9 @@ static int lpc43_ioctl(FAR struct timer_lowerhalf_s *lower, int cmd, * ****************************************************************************/ -void lpc43_tmrinitialize(FAR const char *devpath, int irq) +void lpc43_tmrinitialize(const char *devpath, int irq) { - FAR struct lpc43_lowerhalf_s *priv = &g_tmrdevs[irq - LPC43M4_IRQ_TIMER0]; + struct lpc43_lowerhalf_s *priv = &g_tmrdevs[irq - LPC43M4_IRQ_TIMER0]; tmrinfo("Entry: devpath=%s\n", devpath); DEBUGASSERT((irq >= LPC43M4_IRQ_TIMER0) && (irq <= LPC43M4_IRQ_TIMER3)); @@ -756,7 +756,7 @@ void lpc43_tmrinitialize(FAR const char *devpath, int irq) /* Register the timer driver as /dev/timerX */ - timer_register(devpath, (FAR struct timer_lowerhalf_s *)priv); + timer_register(devpath, (struct timer_lowerhalf_s *)priv); } #endif /* CONFIG_TIMER && CONFIG_LPC43_TMRx */ diff --git a/arch/arm/src/lpc43xx/lpc43_timer.h b/arch/arm/src/lpc43xx/lpc43_timer.h index 1cdd80ca81..fc5313a66e 100644 --- a/arch/arm/src/lpc43xx/lpc43_timer.h +++ b/arch/arm/src/lpc43xx/lpc43_timer.h @@ -71,7 +71,7 @@ extern "C" #if defined(CONFIG_LPC43_TMR0) || defined(CONFIG_LPC43_TMR1) || \ defined(CONFIG_LPC43_TMR2) || defined(CONFIG_LPC43_TMR3) -void lpc43_tmrinitialize(FAR const char *devpath, int irq); +void lpc43_tmrinitialize(const char *devpath, int irq); #endif #undef EXTERN diff --git a/arch/arm/src/lpc43xx/lpc43_usb0dev.c b/arch/arm/src/lpc43xx/lpc43_usb0dev.c index 62e9c8e995..80b85a6902 100644 --- a/arch/arm/src/lpc43xx/lpc43_usb0dev.c +++ b/arch/arm/src/lpc43xx/lpc43_usb0dev.c @@ -355,10 +355,10 @@ static inline void lpc43_chgbits(uint32_t mask, /* Request queue operations *************************************************/ -static FAR struct -lpc43_req_s *lpc43_rqdequeue(FAR struct lpc43_ep_s *privep); -static bool lpc43_rqenqueue(FAR struct lpc43_ep_s *privep, - FAR struct lpc43_req_s *req); +static struct +lpc43_req_s *lpc43_rqdequeue(struct lpc43_ep_s *privep); +static bool lpc43_rqenqueue(struct lpc43_ep_s *privep, + struct lpc43_req_s *req); /* Low level data transfers and request operations **************************/ @@ -405,34 +405,34 @@ static bool lpc43_epcomplete(struct lpc43_usbdev_s *priv, uint8_t epphy); static int lpc43_usbinterrupt(int irq, - FAR void *context, FAR void *arg); + void *context, void *arg); /* Endpoint operations ******************************************************/ /* USB device controller operations *****************************************/ -static int lpc43_epconfigure(FAR struct usbdev_ep_s *ep, +static int lpc43_epconfigure(struct usbdev_ep_s *ep, const struct usb_epdesc_s *desc, bool last); -static int lpc43_epdisable(FAR struct usbdev_ep_s *ep); -static FAR struct usbdev_req_s *lpc43_epallocreq(FAR struct usbdev_ep_s *ep); -static void lpc43_epfreereq(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *); +static int lpc43_epdisable(struct usbdev_ep_s *ep); +static struct usbdev_req_s *lpc43_epallocreq(struct usbdev_ep_s *ep); +static void lpc43_epfreereq(struct usbdev_ep_s *ep, + struct usbdev_req_s *); #ifdef CONFIG_USBDEV_DMA -static void *lpc43_epallocbuffer(FAR struct usbdev_ep_s *ep, +static void *lpc43_epallocbuffer(struct usbdev_ep_s *ep, unsigned bytes); -static void lpc43_epfreebuffer(FAR struct usbdev_ep_s *ep, - FAR void *buf); +static void lpc43_epfreebuffer(struct usbdev_ep_s *ep, + void *buf); #endif -static int lpc43_epsubmit(FAR struct usbdev_ep_s *ep, +static int lpc43_epsubmit(struct usbdev_ep_s *ep, struct usbdev_req_s *req); -static int lpc43_epcancel(FAR struct usbdev_ep_s *ep, +static int lpc43_epcancel(struct usbdev_ep_s *ep, struct usbdev_req_s *req); -static int lpc43_epstall(FAR struct usbdev_ep_s *ep, bool resume); +static int lpc43_epstall(struct usbdev_ep_s *ep, bool resume); -static FAR struct usbdev_ep_s *lpc43_allocep(FAR struct usbdev_s *dev, +static struct usbdev_ep_s *lpc43_allocep(struct usbdev_s *dev, uint8_t epno, bool in, uint8_t eptype); -static void lpc43_freeep(FAR struct usbdev_s *dev, - FAR struct usbdev_ep_s *ep); +static void lpc43_freeep(struct usbdev_s *dev, + struct usbdev_ep_s *ep); static int lpc43_getframe(struct usbdev_s *dev); static int lpc43_wakeup(struct usbdev_s *dev); static int lpc43_selfpowered(struct usbdev_s *dev, @@ -625,9 +625,9 @@ static inline void lpc43_chgbits(uint32_t mask, uint32_t val, uint32_t addr) * ****************************************************************************/ -static FAR struct lpc43_req_s *lpc43_rqdequeue(FAR struct lpc43_ep_s *privep) +static struct lpc43_req_s *lpc43_rqdequeue(struct lpc43_ep_s *privep) { - FAR struct lpc43_req_s *ret = privep->head; + struct lpc43_req_s *ret = privep->head; if (ret) { @@ -651,8 +651,8 @@ static FAR struct lpc43_req_s *lpc43_rqdequeue(FAR struct lpc43_ep_s *privep) * ****************************************************************************/ -static bool lpc43_rqenqueue(FAR struct lpc43_ep_s *privep, - FAR struct lpc43_req_s *req) +static bool lpc43_rqenqueue(struct lpc43_ep_s *privep, + struct lpc43_req_s *req) { bool is_empty = !privep->head; @@ -1832,7 +1832,7 @@ bool lpc43_epcomplete(struct lpc43_usbdev_s *priv, uint8_t epphy) * ****************************************************************************/ -static int lpc43_usbinterrupt(int irq, FAR void *context, FAR void *arg) +static int lpc43_usbinterrupt(int irq, void *context, void *arg) { struct lpc43_usbdev_s *priv = &g_usbdev; uint32_t disr; @@ -2037,11 +2037,11 @@ static int lpc43_usbinterrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static int lpc43_epconfigure(FAR struct usbdev_ep_s *ep, - FAR const struct usb_epdesc_s *desc, - bool last) +static int lpc43_epconfigure(struct usbdev_ep_s *ep, + const struct usb_epdesc_s *desc, + bool last) { - FAR struct lpc43_ep_s *privep = (FAR struct lpc43_ep_s *)ep; + struct lpc43_ep_s *privep = (struct lpc43_ep_s *)ep; usbtrace(TRACE_EPCONFIGURE, privep->epphy); DEBUGASSERT(desc->addr == ep->eplog); @@ -2143,9 +2143,9 @@ static int lpc43_epconfigure(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int lpc43_epdisable(FAR struct usbdev_ep_s *ep) +static int lpc43_epdisable(struct usbdev_ep_s *ep) { - FAR struct lpc43_ep_s *privep = (FAR struct lpc43_ep_s *)ep; + struct lpc43_ep_s *privep = (struct lpc43_ep_s *)ep; irqstate_t flags; #ifdef CONFIG_DEBUG_FEATURES @@ -2191,10 +2191,10 @@ static int lpc43_epdisable(FAR struct usbdev_ep_s *ep) * ****************************************************************************/ -static FAR struct -usbdev_req_s *lpc43_epallocreq(FAR struct usbdev_ep_s *ep) +static struct +usbdev_req_s *lpc43_epallocreq(struct usbdev_ep_s *ep) { - FAR struct lpc43_req_s *privreq; + struct lpc43_req_s *privreq; #ifdef CONFIG_DEBUG_FEATURES if (!ep) @@ -2204,9 +2204,9 @@ usbdev_req_s *lpc43_epallocreq(FAR struct usbdev_ep_s *ep) } #endif - usbtrace(TRACE_EPALLOCREQ, ((FAR struct lpc43_ep_s *)ep)->epphy); + usbtrace(TRACE_EPALLOCREQ, ((struct lpc43_ep_s *)ep)->epphy); - privreq = (FAR struct lpc43_req_s *)kmm_malloc(sizeof(struct lpc43_req_s)); + privreq = (struct lpc43_req_s *)kmm_malloc(sizeof(struct lpc43_req_s)); if (!privreq) { usbtrace(TRACE_DEVERROR(LPC43_TRACEERR_ALLOCFAIL), 0); @@ -2225,10 +2225,10 @@ usbdev_req_s *lpc43_epallocreq(FAR struct usbdev_ep_s *ep) * ****************************************************************************/ -static void lpc43_epfreereq(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static void lpc43_epfreereq(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct lpc43_req_s *privreq = (FAR struct lpc43_req_s *)req; + struct lpc43_req_s *privreq = (struct lpc43_req_s *)req; #ifdef CONFIG_DEBUG_FEATURES if (!ep || !req) @@ -2238,7 +2238,7 @@ static void lpc43_epfreereq(FAR struct usbdev_ep_s *ep, } #endif - usbtrace(TRACE_EPFREEREQ, ((FAR struct lpc43_ep_s *)ep)->epphy); + usbtrace(TRACE_EPFREEREQ, ((struct lpc43_ep_s *)ep)->epphy); kmm_free(privreq); } @@ -2251,7 +2251,7 @@ static void lpc43_epfreereq(FAR struct usbdev_ep_s *ep, ****************************************************************************/ #ifdef CONFIG_USBDEV_DMA -static void *lpc43_epallocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes) +static void *lpc43_epallocbuffer(struct usbdev_ep_s *ep, unsigned bytes) { usbtrace(TRACE_EPALLOCBUFFER, privep->epphy); @@ -2272,7 +2272,7 @@ static void *lpc43_epallocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes) ****************************************************************************/ #ifdef CONFIG_USBDEV_DMA -static void lpc43_epfreebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf) +static void lpc43_epfreebuffer(struct usbdev_ep_s *ep, void *buf) { usbtrace(TRACE_EPFREEBUFFER, privep->epphy); @@ -2292,12 +2292,12 @@ static void lpc43_epfreebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf) * ****************************************************************************/ -static int lpc43_epsubmit(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static int lpc43_epsubmit(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct lpc43_req_s *privreq = (FAR struct lpc43_req_s *)req; - FAR struct lpc43_ep_s *privep = (FAR struct lpc43_ep_s *)ep; - FAR struct lpc43_usbdev_s *priv; + struct lpc43_req_s *privreq = (struct lpc43_req_s *)req; + struct lpc43_ep_s *privep = (struct lpc43_ep_s *)ep; + struct lpc43_usbdev_s *priv; irqstate_t flags; int ret = OK; @@ -2367,10 +2367,10 @@ static int lpc43_epsubmit(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int lpc43_epcancel(FAR struct usbdev_ep_s *ep, - FAR struct usbdev_req_s *req) +static int lpc43_epcancel(struct usbdev_ep_s *ep, + struct usbdev_req_s *req) { - FAR struct lpc43_ep_s *privep = (FAR struct lpc43_ep_s *)ep; + struct lpc43_ep_s *privep = (struct lpc43_ep_s *)ep; irqstate_t flags; #ifdef CONFIG_DEBUG_FEATURES @@ -2404,9 +2404,9 @@ static int lpc43_epcancel(FAR struct usbdev_ep_s *ep, * ****************************************************************************/ -static int lpc43_epstall(FAR struct usbdev_ep_s *ep, bool resume) +static int lpc43_epstall(struct usbdev_ep_s *ep, bool resume) { - FAR struct lpc43_ep_s *privep = (FAR struct lpc43_ep_s *)ep; + struct lpc43_ep_s *privep = (struct lpc43_ep_s *)ep; irqstate_t flags; /* STALL or RESUME the endpoint */ @@ -2461,11 +2461,11 @@ static int lpc43_epstall(FAR struct usbdev_ep_s *ep, bool resume) * ****************************************************************************/ -static FAR struct usbdev_ep_s *lpc43_allocep(FAR struct usbdev_s *dev, - uint8_t eplog, - bool in, uint8_t eptype) +static struct usbdev_ep_s *lpc43_allocep(struct usbdev_s *dev, + uint8_t eplog, + bool in, uint8_t eptype) { - FAR struct lpc43_usbdev_s *priv = (FAR struct lpc43_usbdev_s *)dev; + struct lpc43_usbdev_s *priv = (struct lpc43_usbdev_s *)dev; uint32_t epset = LPC43_EPALLSET & ~LPC43_EPCTRLSET; irqstate_t flags; int epndx = 0; @@ -2585,11 +2585,11 @@ static FAR struct usbdev_ep_s *lpc43_allocep(FAR struct usbdev_s *dev, * ****************************************************************************/ -static void lpc43_freeep(FAR struct usbdev_s *dev, - FAR struct usbdev_ep_s *ep) +static void lpc43_freeep(struct usbdev_s *dev, + struct usbdev_ep_s *ep) { - FAR struct lpc43_usbdev_s *priv = (FAR struct lpc43_usbdev_s *)dev; - FAR struct lpc43_ep_s *privep = (FAR struct lpc43_ep_s *)ep; + struct lpc43_usbdev_s *priv = (struct lpc43_usbdev_s *)dev; + struct lpc43_ep_s *privep = (struct lpc43_ep_s *)ep; irqstate_t flags; usbtrace(TRACE_DEVFREEEP, (uint16_t)privep->epphy); @@ -2615,7 +2615,7 @@ static void lpc43_freeep(FAR struct usbdev_s *dev, static int lpc43_getframe(struct usbdev_s *dev) { #ifdef CONFIG_LPC43_USBDEV_FRAME_INTERRUPT - FAR struct lpc43_usbdev_s *priv = (FAR struct lpc43_usbdev_s *)dev; + struct lpc43_usbdev_s *priv = (struct lpc43_usbdev_s *)dev; /* Return last valid value of SOF read by the interrupt handler */ @@ -2662,7 +2662,7 @@ static int lpc43_wakeup(struct usbdev_s *dev) static int lpc43_selfpowered(struct usbdev_s *dev, bool selfpowered) { - FAR struct lpc43_usbdev_s *priv = (FAR struct lpc43_usbdev_s *)dev; + struct lpc43_usbdev_s *priv = (struct lpc43_usbdev_s *)dev; usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered); diff --git a/arch/arm/src/lpc43xx/lpc43_usb0dev.h b/arch/arm/src/lpc43xx/lpc43_usb0dev.h index 4a9989d2b5..0e31c2f266 100644 --- a/arch/arm/src/lpc43xx/lpc43_usb0dev.h +++ b/arch/arm/src/lpc43xx/lpc43_usb0dev.h @@ -59,7 +59,7 @@ extern "C" * ****************************************************************************/ -int lpc43_usbpullup(FAR struct usbdev_s *dev, bool enable); +int lpc43_usbpullup(struct usbdev_s *dev, bool enable); /**************************************************************************** * Name: lpc43_usbsuspend @@ -72,7 +72,7 @@ int lpc43_usbpullup(FAR struct usbdev_s *dev, bool enable); * ****************************************************************************/ -void lpc43_usbsuspend(FAR struct usbdev_s *dev, bool resume); +void lpc43_usbsuspend(struct usbdev_s *dev, bool resume); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/lpc43xx/lpc43_wdt.h b/arch/arm/src/lpc43xx/lpc43_wdt.h index d839b51148..b622aef587 100644 --- a/arch/arm/src/lpc43xx/lpc43_wdt.h +++ b/arch/arm/src/lpc43xx/lpc43_wdt.h @@ -69,7 +69,7 @@ extern "C" ****************************************************************************/ #ifdef CONFIG_LPC43_WWDT -void lpc43_wwdtinitialize(FAR const char *devpath); +void lpc43_wwdtinitialize(const char *devpath); #endif #undef EXTERN diff --git a/arch/arm/src/lpc43xx/lpc43_wwdt.c b/arch/arm/src/lpc43xx/lpc43_wwdt.c index 8f9a738041..41d6ff49e5 100644 --- a/arch/arm/src/lpc43xx/lpc43_wwdt.c +++ b/arch/arm/src/lpc43xx/lpc43_wwdt.c @@ -72,7 +72,7 @@ struct lpc43_lowerhalf_wwdt_s { - FAR const struct watchdog_ops_s *ops; /* Lower half operations */ + const struct watchdog_ops_s *ops; /* Lower half operations */ xcpt_t handler; /* Current watchdog interrupt handler */ uint32_t timeout; /* The actual timeout value */ @@ -89,20 +89,20 @@ static void lpc43_setwarning(uint32_t warning); /* Interrupt handling *******************************************************/ -static int lpc43_interrupt(int irq, FAR void *context, FAR void *arg); +static int lpc43_interrupt(int irq, void *context, void *arg); /* "Lower half" driver methods **********************************************/ -static int lpc43_start(FAR struct watchdog_lowerhalf_s *lower); -static int lpc43_stop(FAR struct watchdog_lowerhalf_s *lower); -static int lpc43_keepalive(FAR struct watchdog_lowerhalf_s *lower); -static int lpc43_getstatus(FAR struct watchdog_lowerhalf_s *lower, - FAR struct watchdog_status_s *status); -static int lpc43_settimeout(FAR struct watchdog_lowerhalf_s *lower, +static int lpc43_start(struct watchdog_lowerhalf_s *lower); +static int lpc43_stop(struct watchdog_lowerhalf_s *lower); +static int lpc43_keepalive(struct watchdog_lowerhalf_s *lower); +static int lpc43_getstatus(struct watchdog_lowerhalf_s *lower, + struct watchdog_status_s *status); +static int lpc43_settimeout(struct watchdog_lowerhalf_s *lower, uint32_t timeout); -static xcpt_t lpc43_capture(FAR struct watchdog_lowerhalf_s *lower, +static xcpt_t lpc43_capture(struct watchdog_lowerhalf_s *lower, xcpt_t handler); -static int lpc43_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd, +static int lpc43_ioctl(struct watchdog_lowerhalf_s *lower, int cmd, unsigned long arg); /**************************************************************************** @@ -199,9 +199,9 @@ static void lpc43_setwarning(uint32_t warning) * ****************************************************************************/ -static int lpc43_interrupt(int irq, FAR void *context, FAR void *arg) +static int lpc43_interrupt(int irq, void *context, void *arg) { - FAR struct lpc43_lowerhalf_wwdt_s *priv = &g_wdgdev; + struct lpc43_lowerhalf_wwdt_s *priv = &g_wdgdev; uint32_t regval; /* Check if the watchdog warning interrupt is really pending */ @@ -247,10 +247,10 @@ static int lpc43_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static int lpc43_start(FAR struct watchdog_lowerhalf_s *lower) +static int lpc43_start(struct watchdog_lowerhalf_s *lower) { - FAR struct lpc43_lowerhalf_wwdt_s *priv = - (FAR struct lpc43_lowerhalf_wwdt_s *)lower; + struct lpc43_lowerhalf_wwdt_s *priv = + (struct lpc43_lowerhalf_wwdt_s *)lower; wdinfo("Entry\n"); DEBUGASSERT(priv); @@ -288,7 +288,7 @@ static int lpc43_start(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int lpc43_stop(FAR struct watchdog_lowerhalf_s *lower) +static int lpc43_stop(struct watchdog_lowerhalf_s *lower) { /* The watchdog is always disabled after a reset. It is enabled by setting * the WDEN bit in the WDMOD register, then it cannot be disabled again @@ -321,10 +321,10 @@ static int lpc43_stop(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int lpc43_keepalive(FAR struct watchdog_lowerhalf_s *lower) +static int lpc43_keepalive(struct watchdog_lowerhalf_s *lower) { - FAR struct lpc43_lowerhalf_wwdt_s *priv = - (FAR struct lpc43_lowerhalf_wwdt_s *)lower; + struct lpc43_lowerhalf_wwdt_s *priv = + (struct lpc43_lowerhalf_wwdt_s *)lower; wdinfo("Entry\n"); DEBUGASSERT(priv); @@ -353,11 +353,11 @@ static int lpc43_keepalive(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int lpc43_getstatus(FAR struct watchdog_lowerhalf_s *lower, - FAR struct watchdog_status_s *status) +static int lpc43_getstatus(struct watchdog_lowerhalf_s *lower, + struct watchdog_status_s *status) { - FAR struct lpc43_lowerhalf_wwdt_s *priv = - (FAR struct lpc43_lowerhalf_wwdt_s *)lower; + struct lpc43_lowerhalf_wwdt_s *priv = + (struct lpc43_lowerhalf_wwdt_s *)lower; uint32_t elapsed; uint32_t reload; @@ -410,11 +410,11 @@ static int lpc43_getstatus(FAR struct watchdog_lowerhalf_s *lower, * ****************************************************************************/ -static int lpc43_settimeout(FAR struct watchdog_lowerhalf_s *lower, +static int lpc43_settimeout(struct watchdog_lowerhalf_s *lower, uint32_t timeout) { - FAR struct lpc43_lowerhalf_wwdt_s *priv = - (FAR struct lpc43_lowerhalf_wwdt_s *)lower; + struct lpc43_lowerhalf_wwdt_s *priv = + (struct lpc43_lowerhalf_wwdt_s *)lower; uint32_t reload; uint32_t regval; @@ -487,11 +487,11 @@ static int lpc43_settimeout(FAR struct watchdog_lowerhalf_s *lower, * ****************************************************************************/ -static xcpt_t lpc43_capture(FAR struct watchdog_lowerhalf_s *lower, +static xcpt_t lpc43_capture(struct watchdog_lowerhalf_s *lower, xcpt_t handler) { - FAR struct lpc43_lowerhalf_wwdt_s *priv = - (FAR struct lpc43_lowerhalf_wwdt_s *)lower; + struct lpc43_lowerhalf_wwdt_s *priv = + (struct lpc43_lowerhalf_wwdt_s *)lower; irqstate_t flags; xcpt_t oldhandler; uint16_t regval; @@ -554,11 +554,11 @@ static xcpt_t lpc43_capture(FAR struct watchdog_lowerhalf_s *lower, * ****************************************************************************/ -static int lpc43_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd, +static int lpc43_ioctl(struct watchdog_lowerhalf_s *lower, int cmd, unsigned long arg) { - FAR struct lpc43_lowerhalf_wwdt_s *priv = - (FAR struct lpc43_lowerhalf_wwdt_s *)lower; + struct lpc43_lowerhalf_wwdt_s *priv = + (struct lpc43_lowerhalf_wwdt_s *)lower; int ret = -ENOTTY; DEBUGASSERT(priv); @@ -611,9 +611,9 @@ static int lpc43_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd, * ****************************************************************************/ -void lpc43_wwdtinitialize(FAR const char *devpath) +void lpc43_wwdtinitialize(const char *devpath) { - FAR struct lpc43_lowerhalf_wwdt_s *priv = &g_wdgdev; + struct lpc43_lowerhalf_wwdt_s *priv = &g_wdgdev; wdinfo("Entry: devpath=%s\n", devpath); @@ -637,12 +637,12 @@ void lpc43_wwdtinitialize(FAR const char *devpath) * device option bits, the watchdog is automatically enabled at power-on. */ - lpc43_settimeout((FAR struct watchdog_lowerhalf_s *)priv, + lpc43_settimeout((struct watchdog_lowerhalf_s *)priv, CONFIG_LPC43_WWDT_DEFTIMOUT); /* Register the watchdog driver as /dev/watchdog0 */ - watchdog_register(devpath, (FAR struct watchdog_lowerhalf_s *)priv); + watchdog_register(devpath, (struct watchdog_lowerhalf_s *)priv); } #endif /* CONFIG_WATCHDOG && CONFIG_LPC43_WWDT */ diff --git a/arch/arm/src/lpc54xx/hardware/lpc54_rom.h b/arch/arm/src/lpc54xx/hardware/lpc54_rom.h index 3a0cc1b35d..e4e4f10cfc 100644 --- a/arch/arm/src/lpc54xx/hardware/lpc54_rom.h +++ b/arch/arm/src/lpc54xx/hardware/lpc54_rom.h @@ -95,7 +95,7 @@ * ****************************************************************************/ -typedef CODE unsigned int (*rng_read_t)(void); +typedef unsigned int (*rng_read_t)(void); #define LPC54_RNG_READ ((rng_read_t)(lpc54_otg_vtable[LPC54_OTP_API_RNGREAD_OFFSET >> 2])) diff --git a/arch/arm/src/lpc54xx/lpc54_allocateheap.c b/arch/arm/src/lpc54xx/lpc54_allocateheap.c index 907e48b695..5ff35e2978 100644 --- a/arch/arm/src/lpc54xx/lpc54_allocateheap.c +++ b/arch/arm/src/lpc54xx/lpc54_allocateheap.c @@ -173,9 +173,9 @@ const uintptr_t g_idle_topstack = (uintptr_t)&_ebss + ****************************************************************************/ #ifdef CONFIG_BUILD_KERNEL -void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) +void up_allocate_kheap(void **heap_start, size_t *heap_size) #else -void up_allocate_heap(FAR void **heap_start, size_t *heap_size) +void up_allocate_heap(void **heap_start, size_t *heap_size) #endif { #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) @@ -193,14 +193,14 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) /* Return the user-space heap settings */ board_autoled_on(LED_HEAPALLOCATE); - *heap_start = (FAR void *)ubase; + *heap_start = (void *)ubase; *heap_size = usize; #else /* Return the heap settings */ board_autoled_on(LED_HEAPALLOCATE); - *heap_start = (FAR void *)g_idle_topstack; + *heap_start = (void *)g_idle_topstack; *heap_size = CONFIG_RAM_END - g_idle_topstack; #endif } @@ -217,7 +217,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) ****************************************************************************/ #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) -void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) +void up_allocate_kheap(void **heap_start, size_t *heap_size) { /* Get the unaligned size and position of the user-space heap. * This heap begins after the user-space .bss section at an offset @@ -232,7 +232,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) * that was not dedicated to the user heap). */ - *heap_start = (FAR void *)USERSPACE->us_bssend; + *heap_start = (void *)USERSPACE->us_bssend; *heap_size = ubase - (uintptr_t)USERSPACE->us_bssend; } #endif @@ -250,7 +250,7 @@ void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) void arm_addregion(void) { int remaining = CONFIG_MM_REGIONS; - FAR void *heapstart; + void *heapstart; size_t heapsize; #ifdef HAVE_STATIC_CS0 @@ -258,8 +258,8 @@ void arm_addregion(void) { /* Add the SRAM to the user heap */ - heapstart = (FAR void *)(LPC54_SRAMCS0_BASE + - CONFIG_LPC54_EMC_STATIC_CS0_OFFSET); + heapstart = (void *)(LPC54_SRAMCS0_BASE + + CONFIG_LPC54_EMC_STATIC_CS0_OFFSET); heapsize = CONFIG_LPC54_EMC_STATIC_CS0_SIZE; kumm_addregion(heapstart, heapsize); @@ -277,8 +277,8 @@ void arm_addregion(void) { /* Add the SRAM to the user heap */ - heapstart = (FAR void *)(LPC54_SRAMCS1_BASE + - CONFIG_LPC54_EMC_STATIC_CS1_OFFSET); + heapstart = (void *)(LPC54_SRAMCS1_BASE + + CONFIG_LPC54_EMC_STATIC_CS1_OFFSET); heapsize = CONFIG_LPC54_EMC_STATIC_CS1_SIZE; kumm_addregion(heapstart, heapsize); @@ -296,8 +296,8 @@ void arm_addregion(void) { /* Add the SRAM to the user heap */ - heapstart = (FAR void *)(LPC54_SRAMCS2_BASE + - CONFIG_LPC54_EMC_STATIC_CS2_OFFSET); + heapstart = (void *)(LPC54_SRAMCS2_BASE + + CONFIG_LPC54_EMC_STATIC_CS2_OFFSET); heapsize = CONFIG_LPC54_EMC_STATIC_CS2_SIZE; kumm_addregion(heapstart, heapsize); @@ -315,8 +315,8 @@ void arm_addregion(void) { /* Add the SRAM to the user heap */ - heapstart = (FAR void *)(LPC54_SRAMCS3_BASE + - CONFIG_LPC54_EMC_STATIC_CS3_OFFSET); + heapstart = (void *)(LPC54_SRAMCS3_BASE + + CONFIG_LPC54_EMC_STATIC_CS3_OFFSET); heapsize = CONFIG_LPC54_EMC_STATIC_CS3_SIZE; kumm_addregion(heapstart, heapsize); @@ -334,8 +334,8 @@ void arm_addregion(void) { /* Add the SDRAM to the user heap */ - heapstart = (FAR void *)(LPC54_DRAMCS0_BASE + - CONFIG_LPC54_EMC_DYNAMIC_CS0_OFFSET); + heapstart = (void *)(LPC54_DRAMCS0_BASE + + CONFIG_LPC54_EMC_DYNAMIC_CS0_OFFSET); heapsize = CONFIG_LPC54_EMC_DYNAMIC_CS0_SIZE; kumm_addregion(heapstart, heapsize); @@ -353,8 +353,8 @@ void arm_addregion(void) { /* Add the SDRAM to the user heap */ - heapstart = (FAR void *)(LPC54_DRAMCS1_BASE + - CONFIG_LPC54_EMC_DYNAMIC_CS1_OFFSET); + heapstart = (void *)(LPC54_DRAMCS1_BASE + + CONFIG_LPC54_EMC_DYNAMIC_CS1_OFFSET); heapsize = CONFIG_LPC54_EMC_DYNAMIC_CS1_SIZE; kumm_addregion(heapstart, heapsize); @@ -372,8 +372,8 @@ void arm_addregion(void) { /* Add the SDRAM to the user heap */ - heapstart = (FAR void *)(LPC54_DRAMCS2_BASE + - CONFIG_LPC54_EMC_DYNAMIC_CS2_OFFSET); + heapstart = (void *)(LPC54_DRAMCS2_BASE + + CONFIG_LPC54_EMC_DYNAMIC_CS2_OFFSET); heapsize = CONFIG_LPC54_EMC_DYNAMIC_CS2_SIZE; kumm_addregion(heapstart, heapsize); @@ -391,8 +391,8 @@ void arm_addregion(void) { /* Add the SDRAM to the user heap */ - heapstart = (FAR void *)(LPC54_DRAMCS3_BASE + - CONFIG_LPC54_EMC_DYNAMIC_CS3_OFFSET); + heapstart = (void *)(LPC54_DRAMCS3_BASE + + CONFIG_LPC54_EMC_DYNAMIC_CS3_OFFSET); heapsize = CONFIG_LPC54_EMC_DYNAMIC_CS3_SIZE; kumm_addregion(heapstart, heapsize); diff --git a/arch/arm/src/lpc54xx/lpc54_clockconfig.c b/arch/arm/src/lpc54xx/lpc54_clockconfig.c index 0907d4de5d..a3636c5355 100644 --- a/arch/arm/src/lpc54xx/lpc54_clockconfig.c +++ b/arch/arm/src/lpc54xx/lpc54_clockconfig.c @@ -172,7 +172,7 @@ static void lpc54_set_flash_waitstates(uint32_t freq) * ****************************************************************************/ -static void lpc54_configure_pll(FAR const struct pll_setup_s *pllsetup) +static void lpc54_configure_pll(const struct pll_setup_s *pllsetup) { uint32_t regval; @@ -280,7 +280,7 @@ static void lpc54_configure_pll(FAR const struct pll_setup_s *pllsetup) * ****************************************************************************/ -void lpc54_clockconfig(FAR const struct pll_setup_s *pllsetup) +void lpc54_clockconfig(const struct pll_setup_s *pllsetup) { uint32_t regval; diff --git a/arch/arm/src/lpc54xx/lpc54_clockconfig.h b/arch/arm/src/lpc54xx/lpc54_clockconfig.h index 01ce1aff7f..6a9ac919e2 100644 --- a/arch/arm/src/lpc54xx/lpc54_clockconfig.h +++ b/arch/arm/src/lpc54xx/lpc54_clockconfig.h @@ -128,7 +128,7 @@ extern "C" * ****************************************************************************/ -void lpc54_clockconfig(FAR const struct pll_setup_s *pllsetup); +void lpc54_clockconfig(const struct pll_setup_s *pllsetup); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/lpc54xx/lpc54_dma.c b/arch/arm/src/lpc54xx/lpc54_dma.c index dc88c86beb..50b1e4fbc0 100644 --- a/arch/arm/src/lpc54xx/lpc54_dma.c +++ b/arch/arm/src/lpc54xx/lpc54_dma.c @@ -128,7 +128,7 @@ static void lpc54_dma_dispatch(int ch, int result) * ****************************************************************************/ -static int lpc54_dma_interrupt(int irq, FAR void *context, FAR void *arg) +static int lpc54_dma_interrupt(int irq, void *context, void *arg) { uint32_t pending; uint32_t bitmask; diff --git a/arch/arm/src/lpc54xx/lpc54_emc.c b/arch/arm/src/lpc54xx/lpc54_emc.c index cdf5152613..85b6183f5c 100644 --- a/arch/arm/src/lpc54xx/lpc54_emc.c +++ b/arch/arm/src/lpc54xx/lpc54_emc.c @@ -236,7 +236,7 @@ static uint32_t lpc54_emc_modeoffset(uint32_t addrmap) * ****************************************************************************/ -void lpc54_emc_initialize(FAR const struct emc_config_s *config) +void lpc54_emc_initialize(const struct emc_config_s *config) { uint32_t regval; @@ -290,11 +290,11 @@ void lpc54_emc_initialize(FAR const struct emc_config_s *config) #ifdef CONFIG_LPC54_EMC_DYNAMIC void lpc54_emc_sdram_initialize( - FAR const struct emc_dynamic_timing_config_s *timing, - FAR const struct emc_dynamic_chip_config_s *chconfig, + const struct emc_dynamic_timing_config_s *timing, + const struct emc_dynamic_chip_config_s *chconfig, unsigned int nchips) { - FAR const struct emc_dynamic_chip_config_s *config; + const struct emc_dynamic_chip_config_s *config; uintptr_t addr; uint32_t regval; uint32_t offset; @@ -491,11 +491,11 @@ void lpc54_emc_sdram_initialize( ****************************************************************************/ #ifdef CONFIG_LPC54_EMC_STATIC -void lpc54_emc_sram_initialize(FAR uint32_t *extwait, - FAR const struct emc_static_chip_config_s *statconfig, +void lpc54_emc_sram_initialize(uint32_t *extwait, + const struct emc_static_chip_config_s *statconfig, uint32_t nchips) { - FAR const struct emc_static_chip_config_s *config; + const struct emc_static_chip_config_s *config; uint32_t regval; unsigned int i; diff --git a/arch/arm/src/lpc54xx/lpc54_emc.h b/arch/arm/src/lpc54xx/lpc54_emc.h index ae1c44c0ad..265e8e8e15 100644 --- a/arch/arm/src/lpc54xx/lpc54_emc.h +++ b/arch/arm/src/lpc54xx/lpc54_emc.h @@ -197,7 +197,7 @@ struct emc_static_chip_config_s * ****************************************************************************/ -void lpc54_emc_initialize(FAR const struct emc_config_s *config); +void lpc54_emc_initialize(const struct emc_config_s *config); /**************************************************************************** * Name: lpc54_emc_sdram_initialize @@ -222,8 +222,8 @@ void lpc54_emc_initialize(FAR const struct emc_config_s *config); #ifdef CONFIG_LPC54_EMC_DYNAMIC void lpc54_emc_sdram_initialize( - FAR const struct emc_dynamic_timing_config_s *timing, - FAR const struct emc_dynamic_chip_config_s *chconfig, + const struct emc_dynamic_timing_config_s *timing, + const struct emc_dynamic_chip_config_s *chconfig, unsigned int nchips); #endif /* CONFIG_LPC54_EMC_DYNAMIC */ @@ -247,8 +247,8 @@ void lpc54_emc_sdram_initialize( ****************************************************************************/ #ifdef CONFIG_LPC54_EMC_STATIC -void lpc54_emc_sram_initialize(FAR uint32_t *extwait, - FAR const struct emc_static_chip_config_s *statconfig, +void lpc54_emc_sram_initialize(uint32_t *extwait, + const struct emc_static_chip_config_s *statconfig, uint32_t nchips); #endif /* CONFIG_LPC54_EMC_STATIC */ diff --git a/arch/arm/src/lpc54xx/lpc54_ethernet.c b/arch/arm/src/lpc54xx/lpc54_ethernet.c index 3caf281a95..d67881735b 100644 --- a/arch/arm/src/lpc54xx/lpc54_ethernet.c +++ b/arch/arm/src/lpc54xx/lpc54_ethernet.c @@ -257,8 +257,8 @@ * header. */ -#define ETHBUF ((FAR struct eth_hdr_s *)priv->eth_dev.d_buf) -#define ETH8021QWBUF ((FAR struct eth_8021qhdr_s *)priv->eth_dev.d_buf) +#define ETHBUF ((struct eth_hdr_s *)priv->eth_dev.d_buf) +#define ETH8021QWBUF ((struct eth_8021qhdr_s *)priv->eth_dev.d_buf) /**************************************************************************** * Private Types diff --git a/arch/arm/src/lpc54xx/lpc54_i2c_master.c b/arch/arm/src/lpc54xx/lpc54_i2c_master.c index 1e0447cdff..b33366af37 100644 --- a/arch/arm/src/lpc54xx/lpc54_i2c_master.c +++ b/arch/arm/src/lpc54xx/lpc54_i2c_master.c @@ -161,14 +161,14 @@ static void lpc54_i2c_xfrsetup(struct lpc54_i2cdev_s *priv); static bool lpc54_i2c_nextmsg(struct lpc54_i2cdev_s *priv); static bool lpc54_i2c_statemachine(struct lpc54_i2cdev_s *priv); #ifndef CONFIG_I2C_POLLED -static int lpc54_i2c_interrupt(int irq, FAR void *context, FAR void *arg); +static int lpc54_i2c_interrupt(int irq, void *context, void *arg); #else static int lpc54_i2c_poll(struct lpc54_i2cdev_s *priv); #endif -static int lpc54_i2c_transfer(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count); +static int lpc54_i2c_transfer(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count); #ifdef CONFIG_I2C_RESET -static int lpc54_i2c_reset(FAR struct i2c_master_s * dev); +static int lpc54_i2c_reset(struct i2c_master_s * dev); #endif /**************************************************************************** @@ -712,7 +712,7 @@ static bool lpc54_i2c_statemachine(struct lpc54_i2cdev_s *priv) ****************************************************************************/ #ifndef CONFIG_I2C_POLLED -static int lpc54_i2c_interrupt(int irq, FAR void *context, FAR void *arg) +static int lpc54_i2c_interrupt(int irq, void *context, void *arg) { struct lpc54_i2cdev_s *priv = (struct lpc54_i2cdev_s *)arg; bool done; @@ -745,8 +745,8 @@ static int lpc54_i2c_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static int lpc54_i2c_transfer(FAR struct i2c_master_s *dev, - FAR struct i2c_msg_s *msgs, int count) +static int lpc54_i2c_transfer(struct i2c_master_s *dev, + struct i2c_msg_s *msgs, int count) { struct lpc54_i2cdev_s *priv = (struct lpc54_i2cdev_s *)dev; int ret; @@ -808,7 +808,7 @@ static int lpc54_i2c_transfer(FAR struct i2c_master_s *dev, ****************************************************************************/ #ifdef CONFIG_I2C_RESET -static int lpc54_i2c_reset(FAR struct i2c_master_s * dev) +static int lpc54_i2c_reset(struct i2c_master_s * dev) { #warning Missing logic return OK; @@ -1245,7 +1245,7 @@ struct i2c_master_s *lpc54_i2cbus_initialize(int port) * ****************************************************************************/ -int lpc54_i2cbus_uninitialize(FAR struct i2c_master_s * dev) +int lpc54_i2cbus_uninitialize(struct i2c_master_s * dev) { struct lpc54_i2cdev_s *priv = (struct lpc54_i2cdev_s *) dev; uint32_t regval; diff --git a/arch/arm/src/lpc54xx/lpc54_i2c_master.h b/arch/arm/src/lpc54xx/lpc54_i2c_master.h index bb8fc952d0..f5885f45cb 100644 --- a/arch/arm/src/lpc54xx/lpc54_i2c_master.h +++ b/arch/arm/src/lpc54xx/lpc54_i2c_master.h @@ -50,7 +50,7 @@ * ****************************************************************************/ -FAR struct i2c_master_s *lpc54_i2cbus_initialize(int port); +struct i2c_master_s *lpc54_i2cbus_initialize(int port); /**************************************************************************** * Name: lpc54_i2cbus_uninitialize @@ -67,6 +67,6 @@ FAR struct i2c_master_s *lpc54_i2cbus_initialize(int port); * ****************************************************************************/ -int lpc54_i2cbus_uninitialize(FAR struct i2c_master_s *dev); +int lpc54_i2cbus_uninitialize(struct i2c_master_s *dev); #endif /* __ARCH_ARM_SRC_LPC54XX_LPC54_I2C_MASTER_H */ diff --git a/arch/arm/src/lpc54xx/lpc54_irq.c b/arch/arm/src/lpc54xx/lpc54_irq.c index 5ec1cb5f18..f3e5c9699c 100644 --- a/arch/arm/src/lpc54xx/lpc54_irq.c +++ b/arch/arm/src/lpc54xx/lpc54_irq.c @@ -150,7 +150,7 @@ static void lpc54_dumpnvic(const char *msg, int irq) ****************************************************************************/ #ifdef CONFIG_DEBUG_FEATURES -static int lpc54_nmi(int irq, FAR void *context, FAR void *arg) +static int lpc54_nmi(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! NMI received\n"); @@ -158,7 +158,7 @@ static int lpc54_nmi(int irq, FAR void *context, FAR void *arg) return 0; } -static int lpc54_busfault(int irq, FAR void *context, FAR void *arg) +static int lpc54_busfault(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Bus fault received\n"); @@ -166,7 +166,7 @@ static int lpc54_busfault(int irq, FAR void *context, FAR void *arg) return 0; } -static int lpc54_usagefault(int irq, FAR void *context, FAR void *arg) +static int lpc54_usagefault(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Usage fault received\n"); @@ -174,7 +174,7 @@ static int lpc54_usagefault(int irq, FAR void *context, FAR void *arg) return 0; } -static int lpc54_pendsv(int irq, FAR void *context, FAR void *arg) +static int lpc54_pendsv(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! PendSV received\n"); @@ -182,7 +182,7 @@ static int lpc54_pendsv(int irq, FAR void *context, FAR void *arg) return 0; } -static int lpc54_dbgmonitor(int irq, FAR void *context, FAR void *arg) +static int lpc54_dbgmonitor(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Debug Monitor received\n"); @@ -190,7 +190,7 @@ static int lpc54_dbgmonitor(int irq, FAR void *context, FAR void *arg) return 0; } -static int lpc54_reserved(int irq, FAR void *context, FAR void *arg) +static int lpc54_reserved(int irq, void *context, void *arg) { up_irq_save(); _err("PANIC!!! Reserved interrupt\n"); diff --git a/arch/arm/src/lpc54xx/lpc54_lcd.c b/arch/arm/src/lpc54xx/lpc54_lcd.c index 1468da8d11..085258d720 100644 --- a/arch/arm/src/lpc54xx/lpc54_lcd.c +++ b/arch/arm/src/lpc54xx/lpc54_lcd.c @@ -79,20 +79,20 @@ * configuration of each color plane. */ -static int lpc54_getvideoinfo(FAR struct fb_vtable_s *vtable, - FAR struct fb_videoinfo_s *vinfo); -static int lpc54_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno, - FAR struct fb_planeinfo_s *pinfo); +static int lpc54_getvideoinfo(struct fb_vtable_s *vtable, + struct fb_videoinfo_s *vinfo); +static int lpc54_getplaneinfo(struct fb_vtable_s *vtable, int planeno, + struct fb_planeinfo_s *pinfo); /* The following is provided only if the video hardware supports RGB color * mapping */ #ifdef CONFIG_FB_CMAP -static int lpc54_getcmap(FAR struct fb_vtable_s *vtable, - FAR struct fb_cmap_s *cmap); -static int lpc54_putcmap(FAR struct fb_vtable_s *vtable, - FAR const struct fb_cmap_s *cmap); +static int lpc54_getcmap(struct fb_vtable_s *vtable, + struct fb_cmap_s *cmap); +static int lpc54_putcmap(struct fb_vtable_s *vtable, + const struct fb_cmap_s *cmap); #endif /* The following is provided only if the video hardware supports a hardware @@ -100,10 +100,10 @@ static int lpc54_putcmap(FAR struct fb_vtable_s *vtable, */ #ifdef CONFIG_FB_HWCURSOR -static int lpc54_getcursor(FAR struct fb_vtable_s *vtable, - FAR struct fb_cursorattrib_s *attrib); -static int lpc54_setcursor(FAR struct fb_vtable_s *vtable, - FAR struct fb_setcursor_s *settings); +static int lpc54_getcursor(struct fb_vtable_s *vtable, + struct fb_cursorattrib_s *attrib); +static int lpc54_setcursor(struct fb_vtable_s *vtable, + struct fb_setcursor_s *settings); #endif /**************************************************************************** @@ -124,7 +124,7 @@ static const struct fb_videoinfo_s g_videoinfo = static const struct fb_planeinfo_s g_planeinfo = { - .fbmem = (FAR void *)CONFIG_LPC54_LCD_VRAMBASE, + .fbmem = (void *)CONFIG_LPC54_LCD_VRAMBASE, .fblen = LPC54_FBSIZE, .stride = LPC54_STRIDE, .display = 0, @@ -169,8 +169,8 @@ struct fb_vtable_s g_fbobject = * Name: lpc54_getvideoinfo ****************************************************************************/ -static int lpc54_getvideoinfo(FAR struct fb_vtable_s *vtable, - FAR struct fb_videoinfo_s *vinfo) +static int lpc54_getvideoinfo(struct fb_vtable_s *vtable, + struct fb_videoinfo_s *vinfo) { lcdinfo("vtable=%p vinfo=%p\n", vtable, vinfo); if (vtable && vinfo) @@ -187,8 +187,8 @@ static int lpc54_getvideoinfo(FAR struct fb_vtable_s *vtable, * Name: lpc54_getplaneinfo ****************************************************************************/ -static int lpc54_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno, - FAR struct fb_planeinfo_s *pinfo) +static int lpc54_getplaneinfo(struct fb_vtable_s *vtable, int planeno, + struct fb_planeinfo_s *pinfo) { lcdinfo("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo); if (vtable && planeno == 0 && pinfo) @@ -206,8 +206,8 @@ static int lpc54_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno, ****************************************************************************/ #ifdef CONFIG_FB_CMAP -static int lpc54_getcmap(FAR struct fb_vtable_s *vtable, - FAR struct fb_cmap_s *cmap) +static int lpc54_getcmap(struct fb_vtable_s *vtable, + struct fb_cmap_s *cmap) { uint32_t *pal; uint32_t rgb; @@ -280,8 +280,8 @@ static int lpc54_getcmap(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifdef CONFIG_FB_CMAP -static int lpc54_putcmap(FAR struct fb_vtable_s *vtable, - FAR const struct fb_cmap_s *cmap) +static int lpc54_putcmap(struct fb_vtable_s *vtable, + const struct fb_cmap_s *cmap) { uint32_t *pal; uint32_t rgb0; @@ -352,8 +352,8 @@ static int lpc54_putcmap(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifdef CONFIG_FB_HWCURSOR -static int lpc54_getcursor(FAR struct fb_vtable_s *vtable, - FAR struct fb_cursorattrib_s *attrib) +static int lpc54_getcursor(struct fb_vtable_s *vtable, + struct fb_cursorattrib_s *attrib) { lcdinfo("vtable=%p attrib=%p\n", vtable, attrib); if (vtable && attrib) @@ -385,8 +385,8 @@ static int lpc54_getcursor(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifdef CONFIG_FB_HWCURSOR -static int lpc54_setcursor(FAR struct fb_vtable_s *vtable, - FAR struct fb_setcursor_s *settings) +static int lpc54_setcursor(struct fb_vtable_s *vtable, + struct fb_setcursor_s *settings) { lcdinfo("vtable=%p settings=%p\n", vtable, settings); if (vtable && settings) @@ -807,7 +807,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) { lcdinfo("vplane: %d\n", vplane); if (vplane == 0) diff --git a/arch/arm/src/lpc54xx/lpc54_lowputc.c b/arch/arm/src/lpc54xx/lpc54_lowputc.c index 149d3a524a..c859665d7e 100644 --- a/arch/arm/src/lpc54xx/lpc54_lowputc.c +++ b/arch/arm/src/lpc54xx/lpc54_lowputc.c @@ -278,7 +278,7 @@ static const struct uart_config_s g_console_config = #ifdef HAVE_USART_DEVICE static void lpc54_setbaud(uintptr_t base, - FAR const struct uart_config_s *config) + const struct uart_config_s *config) { uint32_t bestdiff = (uint32_t)-1; uint32_t bestosr = 15; @@ -669,7 +669,7 @@ void lpc54_lowsetup(void) #ifdef HAVE_USART_DEVICE void lpc54_usart_configure(uintptr_t base, - FAR const struct uart_config_s *config) + const struct uart_config_s *config) { uint32_t regval; diff --git a/arch/arm/src/lpc54xx/lpc54_lowputc.h b/arch/arm/src/lpc54xx/lpc54_lowputc.h index 6c4f7d4c32..aeafcfd19b 100644 --- a/arch/arm/src/lpc54xx/lpc54_lowputc.h +++ b/arch/arm/src/lpc54xx/lpc54_lowputc.h @@ -82,7 +82,7 @@ void lpc54_lowsetup(void); #ifdef HAVE_USART_DEVICE void lpc54_usart_configure(uintptr_t base, - FAR const struct uart_config_s *config); + const struct uart_config_s *config); #endif /**************************************************************************** diff --git a/arch/arm/src/lpc54xx/lpc54_rtc.c b/arch/arm/src/lpc54xx/lpc54_rtc.c index df226a2cc9..123106b9e5 100644 --- a/arch/arm/src/lpc54xx/lpc54_rtc.c +++ b/arch/arm/src/lpc54xx/lpc54_rtc.c @@ -90,7 +90,7 @@ volatile bool g_rtc_enabled = false; ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -static int lpc54_rtc_interrupt(int irq, void *context, FAR void *arg) +static int lpc54_rtc_interrupt(int irq, void *context, void *arg) { uint32_t status = getreg16(LPC54_RTC_CTRL); @@ -191,7 +191,7 @@ time_t up_rtc_time(void) * ****************************************************************************/ -int up_rtc_settime(FAR const struct timespec *tp) +int up_rtc_settime(const struct timespec *tp) { irqstate_t flags; uint32_t regval; @@ -245,7 +245,7 @@ int up_rtc_settime(FAR const struct timespec *tp) ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -int lpc54_rtc_setalarm(FAR const struct timespec *tp, alarmcb_t callback) +int lpc54_rtc_setalarm(const struct timespec *tp, alarmcb_t callback) { irqstate_t flags; uint32_t regval; @@ -304,7 +304,7 @@ int lpc54_rtc_setalarm(FAR const struct timespec *tp, alarmcb_t callback) ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -int lpc54_rtc_rdalarm(FAR struct tm *time) +int lpc54_rtc_rdalarm(struct tm *time) { uint32_t match; diff --git a/arch/arm/src/lpc54xx/lpc54_rtc.h b/arch/arm/src/lpc54xx/lpc54_rtc.h index 3a72c2a72c..4956bd78f3 100644 --- a/arch/arm/src/lpc54xx/lpc54_rtc.h +++ b/arch/arm/src/lpc54xx/lpc54_rtc.h @@ -45,7 +45,7 @@ #ifdef CONFIG_RTC_ALARM /* The form of an alarm callback */ -typedef CODE void (*alarmcb_t)(void); +typedef void (*alarmcb_t)(void); #endif /**************************************************************************** @@ -82,7 +82,7 @@ extern "C" #ifdef CONFIG_RTC_ALARM struct timespec; -int lpc54_rtc_setalarm(FAR const struct timespec *tp, alarmcb_t callback); +int lpc54_rtc_setalarm(const struct timespec *tp, alarmcb_t callback); #endif /**************************************************************************** @@ -101,7 +101,7 @@ int lpc54_rtc_setalarm(FAR const struct timespec *tp, alarmcb_t callback); #ifdef CONFIG_RTC_ALARM struct tm; -int lpc54_rtc_rdalarm(FAR struct tm *time); +int lpc54_rtc_rdalarm(struct tm *time); #endif /**************************************************************************** @@ -146,7 +146,7 @@ int lpc54_rtc_cancelalarm(void); #ifdef CONFIG_RTC_DRIVER struct rtc_lowerhalf_s; -FAR struct rtc_lowerhalf_s *lpc54_rtc_lowerhalf(void); +struct rtc_lowerhalf_s *lpc54_rtc_lowerhalf(void); #endif #undef EXTERN diff --git a/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c b/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c index 3d2f57d34b..fa0c78896b 100644 --- a/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c +++ b/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c @@ -46,8 +46,8 @@ #ifdef CONFIG_RTC_ALARM struct lpc54_cbinfo_s { - volatile rtc_alarm_callback_t cb; /* Callback when the alarm expires */ - volatile FAR void *priv; /* Private argument to accompany callback */ + volatile rtc_alarm_callback_t cb; /* Callback when the alarm expires */ + volatile void *priv; /* Private argument to accompany callback */ }; #endif @@ -61,7 +61,7 @@ struct lpc54_lowerhalf_s * operations vtable (which may lie in FLASH or ROM) */ - FAR const struct rtc_ops_s *ops; + const struct rtc_ops_s *ops; /* Data following is private to this driver and not visible outside of * this file. @@ -88,27 +88,27 @@ struct lpc54_lowerhalf_s /* Prototypes for static methods in struct rtc_ops_s */ -static int lpc54_rdtime(FAR struct rtc_lowerhalf_s *lower, - FAR struct rtc_time *rtctime); -static int lpc54_settime(FAR struct rtc_lowerhalf_s *lower, - FAR const struct rtc_time *rtctime); -static bool lpc54_havesettime(FAR struct rtc_lowerhalf_s *lower); +static int lpc54_rdtime(struct rtc_lowerhalf_s *lower, + struct rtc_time *rtctime); +static int lpc54_settime(struct rtc_lowerhalf_s *lower, + const struct rtc_time *rtctime); +static bool lpc54_havesettime(struct rtc_lowerhalf_s *lower); #ifdef CONFIG_RTC_ALARM -static int lpc54_setalarm(FAR struct rtc_lowerhalf_s *lower, - FAR const struct lower_setalarm_s *alarminfo); -static int lpc54_setrelative(FAR struct rtc_lowerhalf_s *lower, - FAR const struct lower_setrelative_s *alarminfo); -static int lpc54_cancelalarm(FAR struct rtc_lowerhalf_s *lower, +static int lpc54_setalarm(struct rtc_lowerhalf_s *lower, + const struct lower_setalarm_s *alarminfo); +static int lpc54_setrelative(struct rtc_lowerhalf_s *lower, + const struct lower_setrelative_s *alarminfo); +static int lpc54_cancelalarm(struct rtc_lowerhalf_s *lower, int alarmid); -static int lpc54_rdalarm(FAR struct rtc_lowerhalf_s *lower, - FAR struct lower_rdalarm_s *alarminfo); +static int lpc54_rdalarm(struct rtc_lowerhalf_s *lower, + struct lower_rdalarm_s *alarminfo); #endif #ifdef CONFIG_RTC_PERIODIC -static int lpc54_setperiodic(FAR struct rtc_lowerhalf_s *lower, - FAR const struct lower_setperiodic_s *alarminfo); -static int lpc54_cancelperiodic(FAR struct rtc_lowerhalf_s *lower, int id); +static int lpc54_setperiodic(struct rtc_lowerhalf_s *lower, + const struct lower_setperiodic_s *alarminfo); +static int lpc54_cancelperiodic(struct rtc_lowerhalf_s *lower, int id); #endif /**************************************************************************** @@ -169,14 +169,14 @@ static struct lpc54_lowerhalf_s g_rtc_lowerhalf = #ifdef CONFIG_RTC_ALARM static void lpc54_alarm_callback(void) { - FAR struct lpc54_cbinfo_s *cbinfo = &g_rtc_lowerhalf.cbinfo; + struct lpc54_cbinfo_s *cbinfo = &g_rtc_lowerhalf.cbinfo; /* Sample and clear the callback information to minimize the window in * time in which race conditions can occur. */ rtc_alarm_callback_t cb = (rtc_alarm_callback_t)cbinfo->cb; - FAR void *arg = (FAR void *)cbinfo->priv; + void *arg = (void *)cbinfo->priv; cbinfo->cb = NULL; cbinfo->priv = NULL; @@ -206,8 +206,8 @@ static void lpc54_alarm_callback(void) * ****************************************************************************/ -static int lpc54_rdtime(FAR struct rtc_lowerhalf_s *lower, - FAR struct rtc_time *rtctime) +static int lpc54_rdtime(struct rtc_lowerhalf_s *lower, + struct rtc_time *rtctime) { time_t timer; @@ -217,7 +217,7 @@ static int lpc54_rdtime(FAR struct rtc_lowerhalf_s *lower, /* Convert the one second epoch time to a struct tm */ - if (!gmtime_r(&timer, (FAR struct tm *)rtctime)) + if (!gmtime_r(&timer, (struct tm *)rtctime)) { int errcode = get_errno(); DEBUGASSERT(errcode > 0); @@ -243,8 +243,8 @@ static int lpc54_rdtime(FAR struct rtc_lowerhalf_s *lower, * ****************************************************************************/ -static int lpc54_settime(FAR struct rtc_lowerhalf_s *lower, - FAR const struct rtc_time *rtctime) +static int lpc54_settime(struct rtc_lowerhalf_s *lower, + const struct rtc_time *rtctime) { struct timespec ts; @@ -252,7 +252,7 @@ static int lpc54_settime(FAR struct rtc_lowerhalf_s *lower, * rtc_time is cast compatible with struct tm. */ - ts.tv_sec = timegm((FAR struct tm *)rtctime); + ts.tv_sec = timegm((struct tm *)rtctime); ts.tv_nsec = 0; /* Now set the time (to one second accuracy) */ @@ -274,7 +274,7 @@ static int lpc54_settime(FAR struct rtc_lowerhalf_s *lower, * ****************************************************************************/ -static bool lpc54_havesettime(FAR struct rtc_lowerhalf_s *lower) +static bool lpc54_havesettime(struct rtc_lowerhalf_s *lower) { return getreg32(RTC_MAGIC_REG) == RTC_MAGIC; } @@ -297,15 +297,15 @@ static bool lpc54_havesettime(FAR struct rtc_lowerhalf_s *lower) ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -static int lpc54_setalarm(FAR struct rtc_lowerhalf_s *lower, - FAR const struct lower_setalarm_s *alarminfo) +static int lpc54_setalarm(struct rtc_lowerhalf_s *lower, + const struct lower_setalarm_s *alarminfo) { - FAR struct lpc54_lowerhalf_s *priv; - FAR struct lpc54_cbinfo_s *cbinfo; + struct lpc54_lowerhalf_s *priv; + struct lpc54_cbinfo_s *cbinfo; int ret; DEBUGASSERT(lower != NULL && alarminfo != NULL && alarminfo->id == 0); - priv = (FAR struct lpc54_lowerhalf_s *)lower; + priv = (struct lpc54_lowerhalf_s *)lower; ret = nxsem_wait(&priv->devsem); if (ret < 0) @@ -320,7 +320,7 @@ static int lpc54_setalarm(FAR struct rtc_lowerhalf_s *lower, /* Convert the RTC time to a timespec (1 second accuracy) */ - ts.tv_sec = timegm((FAR struct tm *)&alarminfo->time); + ts.tv_sec = timegm((struct tm *)&alarminfo->time); ts.tv_nsec = 0; /* Remember the callback information */ @@ -362,16 +362,16 @@ static int lpc54_setalarm(FAR struct rtc_lowerhalf_s *lower, ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -static int lpc54_setrelative(FAR struct rtc_lowerhalf_s *lower, - FAR const struct lower_setrelative_s *alarminfo) +static int lpc54_setrelative(struct rtc_lowerhalf_s *lower, + const struct lower_setrelative_s *alarminfo) { - FAR struct lpc54_lowerhalf_s *priv; - FAR struct lpc54_cbinfo_s *cbinfo; - FAR struct timespec ts; + struct lpc54_lowerhalf_s *priv; + struct lpc54_cbinfo_s *cbinfo; + struct timespec ts; int ret = -EINVAL; DEBUGASSERT(lower != NULL && alarminfo != NULL && alarminfo->id == 0); - priv = (FAR struct lpc54_lowerhalf_s *)lower; + priv = (struct lpc54_lowerhalf_s *)lower; if (alarminfo->id == 0 && alarminfo->reltime > 0) { @@ -432,14 +432,14 @@ static int lpc54_setrelative(FAR struct rtc_lowerhalf_s *lower, ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -static int lpc54_cancelalarm(FAR struct rtc_lowerhalf_s *lower, int alarmid) +static int lpc54_cancelalarm(struct rtc_lowerhalf_s *lower, int alarmid) { - FAR struct lpc54_lowerhalf_s *priv; - FAR struct lpc54_cbinfo_s *cbinfo; + struct lpc54_lowerhalf_s *priv; + struct lpc54_cbinfo_s *cbinfo; DEBUGASSERT(lower != NULL); DEBUGASSERT(alarmid == 0); - priv = (FAR struct lpc54_lowerhalf_s *)lower; + priv = (struct lpc54_lowerhalf_s *)lower; /* Nullify callback information to reduce window for race conditions */ @@ -470,8 +470,8 @@ static int lpc54_cancelalarm(FAR struct rtc_lowerhalf_s *lower, int alarmid) ****************************************************************************/ #ifdef CONFIG_RTC_ALARM -static int lpc54_rdalarm(FAR struct rtc_lowerhalf_s *lower, - FAR struct lower_rdalarm_s *alarminfo) +static int lpc54_rdalarm(struct rtc_lowerhalf_s *lower, + struct lower_rdalarm_s *alarminfo) { int ret = -EINVAL; @@ -480,7 +480,7 @@ static int lpc54_rdalarm(FAR struct rtc_lowerhalf_s *lower, if (alarminfo->id == 0) { - ret = lpc54_rtc_rdalarm((FAR struct tm *)alarminfo->time); + ret = lpc54_rtc_rdalarm((struct tm *)alarminfo->time); } return ret; @@ -506,16 +506,16 @@ static int lpc54_rdalarm(FAR struct rtc_lowerhalf_s *lower, #ifdef CONFIG_RTC_PERIODIC static int lpc54_periodic_callback(void) { - FAR struct lpc54_lowerhalf_s *lower; + struct lpc54_lowerhalf_s *lower; struct lower_setperiodic_s *cbinfo; rtc_wakeup_callback_t cb; - FAR void *priv; + void *priv; - lower = (FAR struct lpc54_lowerhalf_s *)&g_rtc_lowerhalf; + lower = (struct lpc54_lowerhalf_s *)&g_rtc_lowerhalf; cbinfo = &lower->periodic; cb = (rtc_wakeup_callback_t)cbinfo->cb; - priv = (FAR void *)cbinfo->priv; + priv = (void *)cbinfo->priv; /* Perform the callback */ @@ -547,14 +547,14 @@ static int lpc54_periodic_callback(void) ****************************************************************************/ #ifdef CONFIG_RTC_PERIODIC -static int lpc54_setperiodic(FAR struct rtc_lowerhalf_s *lower, - FAR const struct lower_setperiodic_s *alarminfo) +static int lpc54_setperiodic(struct rtc_lowerhalf_s *lower, + const struct lower_setperiodic_s *alarminfo) { - FAR struct lpc54_lowerhalf_s *priv; + struct lpc54_lowerhalf_s *priv; int ret; DEBUGASSERT(lower != NULL && alarminfo != NULL); - priv = (FAR struct lpc54_lowerhalf_s *)lower; + priv = (struct lpc54_lowerhalf_s *)lower; ret = nxsem_wait(&priv->devsem); if (ret < 0) @@ -588,13 +588,13 @@ static int lpc54_setperiodic(FAR struct rtc_lowerhalf_s *lower, ****************************************************************************/ #ifdef CONFIG_RTC_PERIODIC -static int lpc54_cancelperiodic(FAR struct rtc_lowerhalf_s *lower, int id) +static int lpc54_cancelperiodic(struct rtc_lowerhalf_s *lower, int id) { - FAR struct lpc54_lowerhalf_s *priv; + struct lpc54_lowerhalf_s *priv; int ret; DEBUGASSERT(lower != NULL); - priv = (FAR struct lpc54_lowerhalf_s *)lower; + priv = (struct lpc54_lowerhalf_s *)lower; DEBUGASSERT(id == 0); @@ -637,11 +637,11 @@ static int lpc54_cancelperiodic(FAR struct rtc_lowerhalf_s *lower, int id) * ****************************************************************************/ -FAR struct rtc_lowerhalf_s *lpc54_rtc_lowerhalf(void) +struct rtc_lowerhalf_s *lpc54_rtc_lowerhalf(void) { nxsem_init(&g_rtc_lowerhalf.devsem, 0, 1); - return (FAR struct rtc_lowerhalf_s *)&g_rtc_lowerhalf; + return (struct rtc_lowerhalf_s *)&g_rtc_lowerhalf; } #endif /* CONFIG_RTC_DRIVER */ diff --git a/arch/arm/src/lpc54xx/lpc54_sdmmc.c b/arch/arm/src/lpc54xx/lpc54_sdmmc.c index fe608c5056..429e906c89 100644 --- a/arch/arm/src/lpc54xx/lpc54_sdmmc.c +++ b/arch/arm/src/lpc54xx/lpc54_sdmmc.c @@ -277,68 +277,68 @@ static void lpc54_endtransfer(struct lpc54_dev_s *priv, /* Interrupt Handling *******************************************************/ -static int lpc54_sdmmc_interrupt(int irq, void *context, FAR void *arg); +static int lpc54_sdmmc_interrupt(int irq, void *context, void *arg); /* SD Card Interface Methods ************************************************/ /* Mutual exclusion */ #ifdef CONFIG_SDIO_MUXBUS -static int lpc54_lock(FAR struct sdio_dev_s *dev, bool lock); +static int lpc54_lock(struct sdio_dev_s *dev, bool lock); #endif /* Initialization/setup */ -static void lpc54_reset(FAR struct sdio_dev_s *dev); -static sdio_capset_t lpc54_capabilities(FAR struct sdio_dev_s *dev); -static uint8_t lpc54_status(FAR struct sdio_dev_s *dev); -static void lpc54_widebus(FAR struct sdio_dev_s *dev, bool enable); -static void lpc54_clock(FAR struct sdio_dev_s *dev, +static void lpc54_reset(struct sdio_dev_s *dev); +static sdio_capset_t lpc54_capabilities(struct sdio_dev_s *dev); +static uint8_t lpc54_status(struct sdio_dev_s *dev); +static void lpc54_widebus(struct sdio_dev_s *dev, bool enable); +static void lpc54_clock(struct sdio_dev_s *dev, enum sdio_clock_e rate); -static int lpc54_attach(FAR struct sdio_dev_s *dev); +static int lpc54_attach(struct sdio_dev_s *dev); /* Command/Status/Data Transfer */ -static int lpc54_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc54_sendcmd(struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg); #ifdef CONFIG_SDIO_BLOCKSETUP -static void lpc54_blocksetup(FAR struct sdio_dev_s *dev, +static void lpc54_blocksetup(struct sdio_dev_s *dev, unsigned int blocklen, unsigned int nblocks); #endif -static int lpc54_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, +static int lpc54_recvsetup(struct sdio_dev_s *dev, uint8_t *buffer, size_t nbytes); -static int lpc54_sendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, uint32_t nbytes); -static int lpc54_cancel(FAR struct sdio_dev_s *dev); +static int lpc54_sendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, uint32_t nbytes); +static int lpc54_cancel(struct sdio_dev_s *dev); -static int lpc54_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd); -static int lpc54_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc54_waitresponse(struct sdio_dev_s *dev, uint32_t cmd); +static int lpc54_recvshortcrc(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort); -static int lpc54_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc54_recvlong(struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong[4]); -static int lpc54_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc54_recvshort(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort); -static int lpc54_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc54_recvnotimpl(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rnotimpl); /* EVENT handler */ -static void lpc54_waitenable(FAR struct sdio_dev_s *dev, +static void lpc54_waitenable(struct sdio_dev_s *dev, sdio_eventset_t eventset, uint32_t timeout); -static sdio_eventset_t lpc54_eventwait(FAR struct sdio_dev_s *dev); -static void lpc54_callbackenable(FAR struct sdio_dev_s *dev, +static sdio_eventset_t lpc54_eventwait(struct sdio_dev_s *dev); +static void lpc54_callbackenable(struct sdio_dev_s *dev, sdio_eventset_t eventset); static void lpc54_callback(struct lpc54_dev_s *priv); -static int lpc54_registercallback(FAR struct sdio_dev_s *dev, +static int lpc54_registercallback(struct sdio_dev_s *dev, worker_t callback, void *arg); #ifdef CONFIG_LPC54_SDMMC_DMA /* DMA */ -static int lpc54_dmarecvsetup(FAR struct sdio_dev_s *dev, - FAR uint8_t *buffer, size_t buflen); -static int lpc54_dmasendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, size_t buflen); +static int lpc54_dmarecvsetup(struct sdio_dev_s *dev, + uint8_t *buffer, size_t buflen); +static int lpc54_dmasendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t buflen); #endif /**************************************************************************** @@ -929,7 +929,7 @@ static void lpc54_endtransfer(struct lpc54_dev_s *priv, * ****************************************************************************/ -static int lpc54_sdmmc_interrupt(int irq, void *context, FAR void *arg) +static int lpc54_sdmmc_interrupt(int irq, void *context, void *arg) { struct lpc54_dev_s *priv = &g_scard_dev; uint32_t enabled; @@ -1213,7 +1213,7 @@ static int lpc54_sdmmc_interrupt(int irq, void *context, FAR void *arg) ****************************************************************************/ #ifdef CONFIG_SDIO_MUXBUS -static int lpc54_lock(FAR struct sdio_dev_s *dev, bool lock) +static int lpc54_lock(struct sdio_dev_s *dev, bool lock) { /* Single SD card instance so there is only one possibility. The multiplex * bus is part of board support package. @@ -1238,9 +1238,9 @@ static int lpc54_lock(FAR struct sdio_dev_s *dev, bool lock) * ****************************************************************************/ -static void lpc54_reset(FAR struct sdio_dev_s *dev) +static void lpc54_reset(struct sdio_dev_s *dev) { - FAR struct lpc54_dev_s *priv = (FAR struct lpc54_dev_s *)dev; + struct lpc54_dev_s *priv = (struct lpc54_dev_s *)dev; irqstate_t flags; uint32_t regval; @@ -1346,7 +1346,7 @@ static void lpc54_reset(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static sdio_capset_t lpc54_capabilities(FAR struct sdio_dev_s *dev) +static sdio_capset_t lpc54_capabilities(struct sdio_dev_s *dev) { sdio_capset_t caps = 0; @@ -1376,7 +1376,7 @@ static sdio_capset_t lpc54_capabilities(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static sdio_statset_t lpc54_status(FAR struct sdio_dev_s *dev) +static sdio_statset_t lpc54_status(struct sdio_dev_s *dev) { struct lpc54_dev_s *priv = (struct lpc54_dev_s *)dev; @@ -1413,7 +1413,7 @@ static sdio_statset_t lpc54_status(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static void lpc54_widebus(FAR struct sdio_dev_s *dev, bool wide) +static void lpc54_widebus(struct sdio_dev_s *dev, bool wide) { mcinfo("wide=%d\n", wide); } @@ -1433,7 +1433,7 @@ static void lpc54_widebus(FAR struct sdio_dev_s *dev, bool wide) * ****************************************************************************/ -static void lpc54_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate) +static void lpc54_clock(struct sdio_dev_s *dev, enum sdio_clock_e rate) { struct lpc54_dev_s *priv = (struct lpc54_dev_s *)dev; uint8_t clkdiv; @@ -1523,7 +1523,7 @@ static void lpc54_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate) * ****************************************************************************/ -static int lpc54_attach(FAR struct sdio_dev_s *dev) +static int lpc54_attach(struct sdio_dev_s *dev) { int ret; uint32_t regval; @@ -1578,7 +1578,7 @@ static int lpc54_attach(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static int lpc54_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc54_sendcmd(struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg) { uint32_t regval = 0; @@ -1662,7 +1662,7 @@ static int lpc54_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, ****************************************************************************/ #ifdef CONFIG_SDIO_BLOCKSETUP -static void lpc54_blocksetup(FAR struct sdio_dev_s *dev, +static void lpc54_blocksetup(struct sdio_dev_s *dev, unsigned int blocklen, unsigned int nblocks) { mcinfo("blocklen=%ld, total transfer=%ld (%ld blocks)\n", @@ -1697,7 +1697,7 @@ static void lpc54_blocksetup(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static int lpc54_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, +static int lpc54_recvsetup(struct sdio_dev_s *dev, uint8_t *buffer, size_t nbytes) { struct lpc54_dev_s *priv = (struct lpc54_dev_s *)dev; @@ -1766,8 +1766,8 @@ static int lpc54_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, * ****************************************************************************/ -static int lpc54_sendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, size_t nbytes) +static int lpc54_sendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t nbytes) { struct lpc54_dev_s *priv = (struct lpc54_dev_s *)dev; #ifdef CONFIG_LPC54_SDMMC_DMA @@ -1832,7 +1832,7 @@ static int lpc54_sendsetup(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static int lpc54_cancel(FAR struct sdio_dev_s *dev) +static int lpc54_cancel(struct sdio_dev_s *dev) { struct lpc54_dev_s *priv = (struct lpc54_dev_s *)dev; @@ -1873,7 +1873,7 @@ static int lpc54_cancel(FAR struct sdio_dev_s *dev) * ****************************************************************************/ -static int lpc54_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd) +static int lpc54_waitresponse(struct sdio_dev_s *dev, uint32_t cmd) { volatile int32_t timeout; clock_t watchtime; @@ -1965,7 +1965,7 @@ static int lpc54_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd) * ****************************************************************************/ -static int lpc54_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc54_recvshortcrc(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort) { uint32_t regval; @@ -2042,7 +2042,7 @@ static int lpc54_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, return ret; } -static int lpc54_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc54_recvlong(struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong[4]) { uint32_t regval; @@ -2100,7 +2100,7 @@ static int lpc54_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, return ret; } -static int lpc54_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc54_recvshort(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort) { uint32_t regval; @@ -2153,7 +2153,7 @@ static int lpc54_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, /* MMC responses not supported */ -static int lpc54_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd, +static int lpc54_recvnotimpl(struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rnotimpl) { mcinfo("cmd=%04x\n", cmd); @@ -2187,7 +2187,7 @@ static int lpc54_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd, * ****************************************************************************/ -static void lpc54_waitenable(FAR struct sdio_dev_s *dev, +static void lpc54_waitenable(struct sdio_dev_s *dev, sdio_eventset_t eventset, uint32_t timeout) { struct lpc54_dev_s *priv = (struct lpc54_dev_s *)dev; @@ -2274,7 +2274,7 @@ static void lpc54_waitenable(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static sdio_eventset_t lpc54_eventwait(FAR struct sdio_dev_s *dev) +static sdio_eventset_t lpc54_eventwait(struct sdio_dev_s *dev) { struct lpc54_dev_s *priv = (struct lpc54_dev_s *)dev; sdio_eventset_t wkupevent = 0; @@ -2363,7 +2363,7 @@ errout: * ****************************************************************************/ -static void lpc54_callbackenable(FAR struct sdio_dev_s *dev, +static void lpc54_callbackenable(struct sdio_dev_s *dev, sdio_eventset_t eventset) { struct lpc54_dev_s *priv = (struct lpc54_dev_s *)dev; @@ -2397,7 +2397,7 @@ static void lpc54_callbackenable(FAR struct sdio_dev_s *dev, * ****************************************************************************/ -static int lpc54_registercallback(FAR struct sdio_dev_s *dev, +static int lpc54_registercallback(struct sdio_dev_s *dev, worker_t callback, void *arg) { struct lpc54_dev_s *priv = (struct lpc54_dev_s *)dev; @@ -2435,8 +2435,8 @@ static int lpc54_registercallback(FAR struct sdio_dev_s *dev, ****************************************************************************/ #ifdef CONFIG_LPC54_SDMMC_DMA -static int lpc54_dmarecvsetup(FAR struct sdio_dev_s *dev, - FAR uint8_t *buffer, size_t buflen) +static int lpc54_dmarecvsetup(struct sdio_dev_s *dev, + uint8_t *buffer, size_t buflen) { struct lpc54_dev_s *priv = (struct lpc54_dev_s *)dev; uint32_t regval; @@ -2587,8 +2587,8 @@ static int lpc54_dmarecvsetup(FAR struct sdio_dev_s *dev, ****************************************************************************/ #ifdef CONFIG_LPC54_SDMMC_DMA -static int lpc54_dmasendsetup(FAR struct sdio_dev_s *dev, - FAR const uint8_t *buffer, size_t buflen) +static int lpc54_dmasendsetup(struct sdio_dev_s *dev, + const uint8_t *buffer, size_t buflen) { struct lpc54_dev_s *priv = (struct lpc54_dev_s *)dev; uint32_t regval; @@ -2815,7 +2815,7 @@ static void lpc54_callback(struct lpc54_dev_s *priv) * ****************************************************************************/ -FAR struct sdio_dev_s *lpc54_sdmmc_initialize(int slotno) +struct sdio_dev_s *lpc54_sdmmc_initialize(int slotno) { struct lpc54_dev_s *priv = &g_scard_dev; irqstate_t flags; diff --git a/arch/arm/src/lpc54xx/lpc54_sdmmc.h b/arch/arm/src/lpc54xx/lpc54_sdmmc.h index 051dc3aadb..5124b073e1 100644 --- a/arch/arm/src/lpc54xx/lpc54_sdmmc.h +++ b/arch/arm/src/lpc54xx/lpc54_sdmmc.h @@ -63,7 +63,7 @@ extern "C" ****************************************************************************/ struct lpc54_sdmmc_dev_s; /* See include/nuttx/sdio.h */ -FAR struct sdio_dev_s *lpc54_sdmmc_initialize(int slotno); +struct sdio_dev_s *lpc54_sdmmc_initialize(int slotno); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/lpc54xx/lpc54_serial.c b/arch/arm/src/lpc54xx/lpc54_serial.c index 93680b22c4..5c0de41abf 100644 --- a/arch/arm/src/lpc54xx/lpc54_serial.c +++ b/arch/arm/src/lpc54xx/lpc54_serial.c @@ -389,7 +389,7 @@ static int lpc54_setup(struct uart_dev_s *dev); static void lpc54_shutdown(struct uart_dev_s *dev); static int lpc54_attach(struct uart_dev_s *dev); static void lpc54_detach(struct uart_dev_s *dev); -static int lpc54_interrupt(int irq, void *context, FAR void *arg); +static int lpc54_interrupt(int irq, void *context, void *arg); static int lpc54_ioctl(struct file *filep, int cmd, unsigned long arg); static int lpc54_receive(struct uart_dev_s *dev, unsigned int *status); static void lpc54_rxint(struct uart_dev_s *dev, bool enable); @@ -1071,7 +1071,7 @@ static void lpc54_detach(struct uart_dev_s *dev) * ****************************************************************************/ -static int lpc54_interrupt(int irq, void *context, FAR void *arg) +static int lpc54_interrupt(int irq, void *context, void *arg) { struct uart_dev_s *dev = (struct uart_dev_s *)arg; struct lpc54_dev_s *priv; @@ -1148,7 +1148,7 @@ static int lpc54_ioctl(struct file *filep, int cmd, unsigned long arg) struct inode *inode; struct uart_dev_s *dev; struct lpc54_dev_s *priv; - int ret = OK; + int ret = OK; DEBUGASSERT(filep, filep->f_inode); inode = filep->f_inode; diff --git a/arch/arm/src/lpc54xx/lpc54_spi_master.c b/arch/arm/src/lpc54xx/lpc54_spi_master.c index 264f34280a..139011b4fc 100644 --- a/arch/arm/src/lpc54xx/lpc54_spi_master.c +++ b/arch/arm/src/lpc54xx/lpc54_spi_master.c @@ -97,17 +97,17 @@ struct lpc54_spidev_s struct lpc54_rxtransfer8_s { - FAR uint8_t *rxptr; /* Pointer into receive buffer */ - unsigned int remaining; /* Bytes remaining in the receive buffer */ - unsigned int expected; /* Bytes expected to be received */ + uint8_t *rxptr; /* Pointer into receive buffer */ + unsigned int remaining; /* Bytes remaining in the receive buffer */ + unsigned int expected; /* Bytes expected to be received */ }; #ifdef CONFIG_LPC54_SPI_WIDEDATA struct lpc54_rxtransfer16_s { - FAR uint16_t *rxptr; /* Pointer into receive buffer */ - unsigned int remaining; /* Hwords remaining in the receive buffer */ - unsigned int expected; /* Hwords expected to be received */ + uint16_t *rxptr; /* Pointer into receive buffer */ + unsigned int remaining; /* Hwords remaining in the receive buffer */ + unsigned int expected; /* Hwords expected to be received */ }; #endif @@ -117,24 +117,24 @@ struct lpc54_rxtransfer16_s struct lpc54_txtransfer8_s { - uint32_t txctrl; /* Tx control bits */ - FAR const uint8_t *txptr; /* Pointer into transmit buffer */ - unsigned int remaining; /* Bytes remaining in the transmit buffer */ + uint32_t txctrl; /* Tx control bits */ + const uint8_t *txptr; /* Pointer into transmit buffer */ + unsigned int remaining; /* Bytes remaining in the transmit buffer */ }; #ifdef CONFIG_LPC54_SPI_WIDEDATA struct lpc54_txtransfer16_s { - uint32_t txctrl; /* Tx control bits */ - FAR const uint16_t *txptr; /* Pointer into transmit buffer */ - unsigned int remaining; /* Hwords remaining in the transmit buffer */ + uint32_t txctrl; /* Tx control bits */ + const uint16_t *txptr; /* Pointer into transmit buffer */ + unsigned int remaining; /* Hwords remaining in the transmit buffer */ }; #endif struct lpc54_txdummy_s { - uint32_t txctrl; /* Tx control bits */ - unsigned int remaining; /* Bytes remaining in the transmit buffer */ + uint32_t txctrl; /* Tx control bits */ + unsigned int remaining; /* Bytes remaining in the transmit buffer */ }; /**************************************************************************** @@ -143,66 +143,66 @@ struct lpc54_txdummy_s /* Transfer helpers */ -static inline size_t lpc54_spi_fifodepth(FAR struct lpc54_spidev_s *priv); -static inline bool lpc54_spi_txavailable(FAR struct lpc54_spidev_s *priv); -static inline bool lpc54_spi_rxavailable(FAR struct lpc54_spidev_s *priv); +static inline size_t lpc54_spi_fifodepth(struct lpc54_spidev_s *priv); +static inline bool lpc54_spi_txavailable(struct lpc54_spidev_s *priv); +static inline bool lpc54_spi_rxavailable(struct lpc54_spidev_s *priv); -static void lpc54_spi_resetfifos(FAR struct lpc54_spidev_s *priv); -static void lpc54_spi_rxtransfer8(FAR struct lpc54_spidev_s *priv, - FAR struct lpc54_rxtransfer8_s *xfr); +static void lpc54_spi_resetfifos(struct lpc54_spidev_s *priv); +static void lpc54_spi_rxtransfer8(struct lpc54_spidev_s *priv, + struct lpc54_rxtransfer8_s *xfr); #ifdef CONFIG_LPC54_SPI_WIDEDATA -static void lpc54_spi_rxtransfer16(FAR struct lpc54_spidev_s *priv, - FAR struct lpc54_rxtransfer16_s *xfr); +static void lpc54_spi_rxtransfer16(struct lpc54_spidev_s *priv, + struct lpc54_rxtransfer16_s *xfr); #endif -static bool lpc54_spi_txtransfer8(FAR struct lpc54_spidev_s *priv, - FAR struct lpc54_txtransfer8_s *xfr); +static bool lpc54_spi_txtransfer8(struct lpc54_spidev_s *priv, + struct lpc54_txtransfer8_s *xfr); #ifdef CONFIG_LPC54_SPI_WIDEDATA -static bool lpc54_spi_txtransfer16(FAR struct lpc54_spidev_s *priv, - FAR struct lpc54_txtransfer16_s *xfr); +static bool lpc54_spi_txtransfer16(struct lpc54_spidev_s *priv, + struct lpc54_txtransfer16_s *xfr); #endif -static bool lpc54_spi_txdummy(FAR struct lpc54_spidev_s *priv, - FAR struct lpc54_txdummy_s *xfr); +static bool lpc54_spi_txdummy(struct lpc54_spidev_s *priv, + struct lpc54_txdummy_s *xfr); #ifdef CONFIG_SPI_EXCHANGE -static void lpc54_spi_exchange8(FAR struct lpc54_spidev_s *priv, - FAR const void *txbuffer, FAR void *rxbuffer, +static void lpc54_spi_exchange8(struct lpc54_spidev_s *priv, + const void *txbuffer, void *rxbuffer, size_t nwords); #ifdef CONFIG_LPC54_SPI_WIDEDATA -static void lpc54_spi_exchange16(FAR struct lpc54_spidev_s *priv, - FAR const void *txbuffer, FAR void *rxbuffer, +static void lpc54_spi_exchange16(struct lpc54_spidev_s *priv, + const void *txbuffer, void *rxbuffer, size_t nwords); #endif #endif -static void lpc54_spi_sndblock8(FAR struct lpc54_spidev_s *priv, - FAR const void *buffer, size_t nwords); +static void lpc54_spi_sndblock8(struct lpc54_spidev_s *priv, + const void *buffer, size_t nwords); #ifdef CONFIG_LPC54_SPI_WIDEDATA -static void lpc54_spi_sndblock16(FAR struct lpc54_spidev_s *priv, - FAR const void *buffer, size_t nwords); +static void lpc54_spi_sndblock16(struct lpc54_spidev_s *priv, + const void *buffer, size_t nwords); #endif -static void lpc54_spi_recvblock8(FAR struct lpc54_spidev_s *priv, - FAR void *buffer, size_t nwords); +static void lpc54_spi_recvblock8(struct lpc54_spidev_s *priv, + void *buffer, size_t nwords); #ifdef CONFIG_LPC54_SPI_WIDEDATA -static void lpc54_spi_recvblock16(FAR struct lpc54_spidev_s *priv, - FAR void *buffer, size_t nwords); +static void lpc54_spi_recvblock16(struct lpc54_spidev_s *priv, + void *buffer, size_t nwords); #endif /* SPI methods */ -static int lpc54_spi_lock(FAR struct spi_dev_s *dev, bool lock); -static uint32_t lpc54_spi_setfrequency(FAR struct spi_dev_s *dev, +static int lpc54_spi_lock(struct spi_dev_s *dev, bool lock); +static uint32_t lpc54_spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency); -static void lpc54_spi_setmode(FAR struct spi_dev_s *dev, +static void lpc54_spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode); -static void lpc54_spi_setbits(FAR struct spi_dev_s *dev, int nbits); -static uint32_t lpc54_spi_send(FAR struct spi_dev_s *dev, uint32_t wd); +static void lpc54_spi_setbits(struct spi_dev_s *dev, int nbits); +static uint32_t lpc54_spi_send(struct spi_dev_s *dev, uint32_t wd); #ifdef CONFIG_SPI_EXCHANGE -static void lpc54_spi_exchange(FAR struct spi_dev_s *dev, - FAR const void *txbuffer, FAR void *rxbuffer, +static void lpc54_spi_exchange(struct spi_dev_s *dev, + const void *txbuffer, void *rxbuffer, size_t nwords); #endif -static void lpc54_spi_sndblock(FAR struct spi_dev_s *dev, - FAR const void *buffer, size_t nwords); -static void lpc54_spi_recvblock(FAR struct spi_dev_s *dev, - FAR void *buffer, size_t nwords); +static void lpc54_spi_sndblock(struct spi_dev_s *dev, + const void *buffer, size_t nwords); +static void lpc54_spi_recvblock(struct spi_dev_s *dev, + void *buffer, size_t nwords); /**************************************************************************** * Private Data @@ -575,7 +575,7 @@ static inline uint32_t lpc54_spi_getreg(struct lpc54_spidev_s *priv, * ****************************************************************************/ -static inline size_t lpc54_spi_fifodepth(FAR struct lpc54_spidev_s *priv) +static inline size_t lpc54_spi_fifodepth(struct lpc54_spidev_s *priv) { uint32_t regval = lpc54_spi_getreg(priv, LPC54_SPI_FIFOCFG_OFFSET); return ((regval & SPI_FIFOCFG_SIZE_MASK) >> SPI_FIFOCFG_SIZE_SHIFT) << 3; @@ -595,7 +595,7 @@ static inline size_t lpc54_spi_fifodepth(FAR struct lpc54_spidev_s *priv) * ****************************************************************************/ -static inline bool lpc54_spi_txavailable(FAR struct lpc54_spidev_s *priv) +static inline bool lpc54_spi_txavailable(struct lpc54_spidev_s *priv) { uint32_t regval = lpc54_spi_getreg(priv, LPC54_SPI_FIFOSTAT_OFFSET); return ((regval & SPI_FIFOSTAT_TXNOTFULL) != 0); @@ -615,7 +615,7 @@ static inline bool lpc54_spi_txavailable(FAR struct lpc54_spidev_s *priv) * ****************************************************************************/ -static inline bool lpc54_spi_rxavailable(FAR struct lpc54_spidev_s *priv) +static inline bool lpc54_spi_rxavailable(struct lpc54_spidev_s *priv) { uint32_t regval = lpc54_spi_getreg(priv, LPC54_SPI_FIFOSTAT_OFFSET); return ((regval & SPI_FIFOSTAT_RXNOTEMPTY) != 0); @@ -635,7 +635,7 @@ static inline bool lpc54_spi_rxavailable(FAR struct lpc54_spidev_s *priv) * ****************************************************************************/ -static void lpc54_spi_rxdiscard(FAR struct lpc54_spidev_s *priv) +static void lpc54_spi_rxdiscard(struct lpc54_spidev_s *priv) { while (lpc54_spi_rxavailable(priv)) { @@ -657,7 +657,7 @@ static void lpc54_spi_rxdiscard(FAR struct lpc54_spidev_s *priv) * ****************************************************************************/ -static void lpc54_spi_resetfifos(FAR struct lpc54_spidev_s *priv) +static void lpc54_spi_resetfifos(struct lpc54_spidev_s *priv) { uint32_t regval; @@ -687,8 +687,8 @@ static void lpc54_spi_resetfifos(FAR struct lpc54_spidev_s *priv) * ****************************************************************************/ -static void lpc54_spi_rxtransfer8(FAR struct lpc54_spidev_s *priv, - FAR struct lpc54_rxtransfer8_s *xfr) +static void lpc54_spi_rxtransfer8(struct lpc54_spidev_s *priv, + struct lpc54_rxtransfer8_s *xfr) { /* Read one byte if available and expected */ @@ -723,8 +723,8 @@ static void lpc54_spi_rxtransfer8(FAR struct lpc54_spidev_s *priv, } #ifdef CONFIG_LPC54_SPI_WIDEDATA -static void lpc54_spi_rxtransfer16(FAR struct lpc54_spidev_s *priv, - FAR struct lpc54_rxtransfer16_s *xfr) +static void lpc54_spi_rxtransfer16(struct lpc54_spidev_s *priv, + struct lpc54_rxtransfer16_s *xfr) { /* Read one HWord if available and expected */ @@ -774,8 +774,8 @@ static void lpc54_spi_rxtransfer16(FAR struct lpc54_spidev_s *priv, * ****************************************************************************/ -static bool lpc54_spi_txtransfer8(FAR struct lpc54_spidev_s *priv, - FAR struct lpc54_txtransfer8_s *xfr) +static bool lpc54_spi_txtransfer8(struct lpc54_spidev_s *priv, + struct lpc54_txtransfer8_s *xfr) { uint32_t regval; @@ -804,8 +804,8 @@ static bool lpc54_spi_txtransfer8(FAR struct lpc54_spidev_s *priv, } #ifdef CONFIG_LPC54_SPI_WIDEDATA -static bool lpc54_spi_txtransfer16(FAR struct lpc54_spidev_s *priv, - FAR struct lpc54_txtransfer16_s *xfr) +static bool lpc54_spi_txtransfer16(struct lpc54_spidev_s *priv, + struct lpc54_txtransfer16_s *xfr) { uint32_t regval; @@ -849,8 +849,8 @@ static bool lpc54_spi_txtransfer16(FAR struct lpc54_spidev_s *priv, * ****************************************************************************/ -static bool lpc54_spi_txdummy(FAR struct lpc54_spidev_s *priv, - FAR struct lpc54_txdummy_s *xfr) +static bool lpc54_spi_txdummy(struct lpc54_spidev_s *priv, + struct lpc54_txdummy_s *xfr) { /* Transmit if txFIFO is not full and there is more Tx data to be sent */ @@ -892,8 +892,8 @@ static bool lpc54_spi_txdummy(FAR struct lpc54_spidev_s *priv, ****************************************************************************/ #ifdef CONFIG_SPI_EXCHANGE -static void lpc54_spi_exchange8(FAR struct lpc54_spidev_s *priv, - FAR const void *txbuffer, FAR void *rxbuffer, +static void lpc54_spi_exchange8(struct lpc54_spidev_s *priv, + const void *txbuffer, void *rxbuffer, size_t nwords) { struct lpc54_rxtransfer8_s rxtransfer; @@ -909,9 +909,9 @@ static void lpc54_spi_exchange8(FAR struct lpc54_spidev_s *priv, /* Set up the transfer data */ txtransfer.txctrl = SPI_FIFOWR_LEN(priv->nbits) | SPI_FIFOWR_TXSSELN_ALL; - txtransfer.txptr = (FAR uint8_t *)txbuffer; + txtransfer.txptr = (uint8_t *)txbuffer; txtransfer.remaining = nwords; - rxtransfer.rxptr = (FAR uint8_t *)rxbuffer; + rxtransfer.rxptr = (uint8_t *)rxbuffer; rxtransfer.remaining = nwords; rxtransfer.expected = 0; @@ -951,9 +951,9 @@ static void lpc54_spi_exchange8(FAR struct lpc54_spidev_s *priv, #endif /* CONFIG_SPI_EXCHANGE */ #if defined(CONFIG_SPI_EXCHANGE) && defined(CONFIG_LPC54_SPI_WIDEDATA) -static void lpc54_spi_exchange16(FAR struct lpc54_spidev_s *priv, - FAR const void *txbuffer, - FAR void *rxbuffer, +static void lpc54_spi_exchange16(struct lpc54_spidev_s *priv, + const void *txbuffer, + void *rxbuffer, size_t nwords) { struct lpc54_rxtransfer16_s rxtransfer; @@ -971,9 +971,9 @@ static void lpc54_spi_exchange16(FAR struct lpc54_spidev_s *priv, /* Set up the transfer data */ txtransfer.txctrl = SPI_FIFOWR_LEN(priv->nbits) | SPI_FIFOWR_TXSSELN_ALL; - txtransfer.txptr = (FAR uint16_t *)txbuffer; + txtransfer.txptr = (uint16_t *)txbuffer; txtransfer.remaining = nwords; - rxtransfer.rxptr = (FAR uint16_t *)rxbuffer; + rxtransfer.rxptr = (uint16_t *)rxbuffer; rxtransfer.remaining = nwords; rxtransfer.expected = 0; @@ -1031,8 +1031,8 @@ static void lpc54_spi_exchange16(FAR struct lpc54_spidev_s *priv, * ****************************************************************************/ -static void lpc54_spi_sndblock8(FAR struct lpc54_spidev_s *priv, - FAR const void *buffer, size_t nwords) +static void lpc54_spi_sndblock8(struct lpc54_spidev_s *priv, + const void *buffer, size_t nwords) { struct lpc54_txtransfer8_s txtransfer; @@ -1042,7 +1042,7 @@ static void lpc54_spi_sndblock8(FAR struct lpc54_spidev_s *priv, txtransfer.txctrl = SPI_FIFOWR_RXIGNORE | SPI_FIFOWR_LEN(priv->nbits) | SPI_FIFOWR_TXSSELN_ALL; - txtransfer.txptr = (FAR uint8_t *)buffer; + txtransfer.txptr = (uint8_t *)buffer; txtransfer.remaining = nwords; /* Clear Tx/Rx errors and empty FIFOs */ @@ -1062,8 +1062,8 @@ static void lpc54_spi_sndblock8(FAR struct lpc54_spidev_s *priv, } #ifdef CONFIG_LPC54_SPI_WIDEDATA -static void lpc54_spi_sndblock16(FAR struct lpc54_spidev_s *priv, - FAR const void *buffer, size_t nwords) +static void lpc54_spi_sndblock16(struct lpc54_spidev_s *priv, + const void *buffer, size_t nwords) { struct lpc54_txtransfer16_s txtransfer; @@ -1073,7 +1073,7 @@ static void lpc54_spi_sndblock16(FAR struct lpc54_spidev_s *priv, txtransfer.txctrl = SPI_FIFOWR_RXIGNORE | SPI_FIFOWR_LEN(priv->nbits) | SPI_FIFOWR_TXSSELN_ALL; - txtransfer.txptr = (FAR uint16_t *)buffer; + txtransfer.txptr = (uint16_t *)buffer; txtransfer.remaining = nwords; /* Clear Tx/Rx errors and empty FIFOs */ @@ -1116,8 +1116,8 @@ static void lpc54_spi_sndblock16(FAR struct lpc54_spidev_s *priv, * ****************************************************************************/ -static void lpc54_spi_recvblock8(FAR struct lpc54_spidev_s *priv, - FAR void *buffer, size_t nwords) +static void lpc54_spi_recvblock8(struct lpc54_spidev_s *priv, + void *buffer, size_t nwords) { struct lpc54_rxtransfer8_s rxtransfer; struct lpc54_txdummy_s txtransfer; @@ -1134,7 +1134,7 @@ static void lpc54_spi_recvblock8(FAR struct lpc54_spidev_s *priv, txtransfer.txctrl = SPI_DUMMYDATA8 | SPI_FIFOWR_LEN(priv->nbits) | SPI_FIFOWR_TXSSELN_ALL; txtransfer.remaining = nwords; - rxtransfer.rxptr = (FAR uint8_t *)buffer; + rxtransfer.rxptr = (uint8_t *)buffer; rxtransfer.remaining = nwords; rxtransfer.expected = 0; @@ -1171,8 +1171,8 @@ static void lpc54_spi_recvblock8(FAR struct lpc54_spidev_s *priv, } #ifdef CONFIG_LPC54_SPI_WIDEDATA -static void lpc54_spi_recvblock16(FAR struct lpc54_spidev_s *priv, - FAR void *buffer, size_t nwords) +static void lpc54_spi_recvblock16(struct lpc54_spidev_s *priv, + void *buffer, size_t nwords) { struct lpc54_rxtransfer16_s rxtransfer; struct lpc54_txdummy_s txtransfer; @@ -1189,7 +1189,7 @@ static void lpc54_spi_recvblock16(FAR struct lpc54_spidev_s *priv, txtransfer.txctrl = SPI_DUMMYDATA16 | SPI_FIFOWR_LEN(priv->nbits) | SPI_FIFOWR_TXSSELN_ALL; txtransfer.remaining = nwords; - rxtransfer.rxptr = (FAR uint16_t *)rxbuffer; + rxtransfer.rxptr = (uint16_t *)rxbuffer; rxtransfer.remaining = nwords; rxtransfer.expected = 0; @@ -1247,9 +1247,9 @@ static void lpc54_spi_recvblock16(FAR struct lpc54_spidev_s *priv, * ****************************************************************************/ -static int lpc54_spi_lock(FAR struct spi_dev_s *dev, bool lock) +static int lpc54_spi_lock(struct spi_dev_s *dev, bool lock) { - FAR struct lpc54_spidev_s *priv = (FAR struct lpc54_spidev_s *)dev; + struct lpc54_spidev_s *priv = (struct lpc54_spidev_s *)dev; int ret; if (lock) @@ -1279,10 +1279,10 @@ static int lpc54_spi_lock(FAR struct spi_dev_s *dev, bool lock) * ****************************************************************************/ -static uint32_t lpc54_spi_setfrequency(FAR struct spi_dev_s *dev, +static uint32_t lpc54_spi_setfrequency(struct spi_dev_s *dev, uint32_t frequency) { - FAR struct lpc54_spidev_s *priv = (FAR struct lpc54_spidev_s *)dev; + struct lpc54_spidev_s *priv = (struct lpc54_spidev_s *)dev; uint32_t divider; uint32_t actual; uint32_t regval; @@ -1341,10 +1341,10 @@ static uint32_t lpc54_spi_setfrequency(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void lpc54_spi_setmode(FAR struct spi_dev_s *dev, +static void lpc54_spi_setmode(struct spi_dev_s *dev, enum spi_mode_e mode) { - FAR struct lpc54_spidev_s *priv = (FAR struct lpc54_spidev_s *)dev; + struct lpc54_spidev_s *priv = (struct lpc54_spidev_s *)dev; uint32_t regval; /* Has the mode changed? */ @@ -1401,9 +1401,9 @@ static void lpc54_spi_setmode(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void lpc54_spi_setbits(FAR struct spi_dev_s *dev, int nbits) +static void lpc54_spi_setbits(struct spi_dev_s *dev, int nbits) { - FAR struct lpc54_spidev_s *priv = (FAR struct lpc54_spidev_s *)dev; + struct lpc54_spidev_s *priv = (struct lpc54_spidev_s *)dev; /* The valid range of bit selections is SPI_MINWIDTH through SPI_MAXWIDTH */ @@ -1434,9 +1434,9 @@ static void lpc54_spi_setbits(FAR struct spi_dev_s *dev, int nbits) * ****************************************************************************/ -static uint32_t lpc54_spi_send(FAR struct spi_dev_s *dev, uint32_t wd) +static uint32_t lpc54_spi_send(struct spi_dev_s *dev, uint32_t wd) { - FAR struct lpc54_spidev_s *priv = (FAR struct lpc54_spidev_s *)dev; + struct lpc54_spidev_s *priv = (struct lpc54_spidev_s *)dev; uint32_t regval; DEBUGASSERT(priv != NULL); @@ -1487,11 +1487,11 @@ static uint32_t lpc54_spi_send(FAR struct spi_dev_s *dev, uint32_t wd) ****************************************************************************/ #ifdef CONFIG_SPI_EXCHANGE -static void lpc54_spi_exchange(FAR struct lpc54_spidev_s *priv, - FAR const void *txbuffer, FAR void *rxbuffer, +static void lpc54_spi_exchange(struct lpc54_spidev_s *priv, + const void *txbuffer, void *rxbuffer, size_t nwords) { - FAR struct lpc54_spidev_s *priv = (FAR struct lpc54_spidev_s *)dev; + struct lpc54_spidev_s *priv = (struct lpc54_spidev_s *)dev; DEBUGASSERT(priv != NULL); @@ -1553,10 +1553,10 @@ static void lpc54_spi_exchange(FAR struct lpc54_spidev_s *priv, * ****************************************************************************/ -static void lpc54_spi_sndblock(FAR struct spi_dev_s *dev, - FAR const void *buffer, size_t nwords) +static void lpc54_spi_sndblock(struct spi_dev_s *dev, + const void *buffer, size_t nwords) { - FAR struct lpc54_spidev_s *priv = (FAR struct lpc54_spidev_s *)dev; + struct lpc54_spidev_s *priv = (struct lpc54_spidev_s *)dev; spiinfo("buffer=%p nwords=%d\n", buffer, nwords); DEBUGASSERT(priv != NULL && buffer != NULL); @@ -1600,10 +1600,10 @@ static void lpc54_spi_sndblock(FAR struct spi_dev_s *dev, * ****************************************************************************/ -static void lpc54_spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, +static void lpc54_spi_recvblock(struct spi_dev_s *dev, void *buffer, size_t nwords) { - FAR struct lpc54_spidev_s *priv = (FAR struct lpc54_spidev_s *)dev; + struct lpc54_spidev_s *priv = (struct lpc54_spidev_s *)dev; spiinfo("buffer=%p nwords=%d\n", buffer, nwords); DEBUGASSERT(priv != NULL && buffer != NULL); @@ -1649,7 +1649,7 @@ static void lpc54_spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, * ****************************************************************************/ -FAR struct spi_dev_s *lpc54_spibus_initialize(int port) +struct spi_dev_s *lpc54_spibus_initialize(int port) { struct lpc54_spidev_s *priv; irqstate_t flags; @@ -2065,7 +2065,7 @@ FAR struct spi_dev_s *lpc54_spibus_initialize(int port) /* Select a default frequency of approx. 400KHz */ - lpc54_spi_setfrequency((FAR struct spi_dev_s *)priv, 400000); + lpc54_spi_setfrequency((struct spi_dev_s *)priv, 400000); /* Enable the SPI peripheral */ diff --git a/arch/arm/src/lpc54xx/lpc54_spi_master.h b/arch/arm/src/lpc54xx/lpc54_spi_master.h index cf70aefaf1..c9ec18cb51 100644 --- a/arch/arm/src/lpc54xx/lpc54_spi_master.h +++ b/arch/arm/src/lpc54xx/lpc54_spi_master.h @@ -95,7 +95,7 @@ extern "C" * ****************************************************************************/ -FAR struct spi_dev_s *lpc54_spibus_initialize(int port); +struct spi_dev_s *lpc54_spibus_initialize(int port); /**************************************************************************** * Name: lpc54_spiN_select, lpc54_spiN_status, and lpc54_spiN_cmddata @@ -114,102 +114,102 @@ FAR struct spi_dev_s *lpc54_spibus_initialize(int port); ****************************************************************************/ #ifdef CONFIG_LPC54_SPI0_MASTER -void lpc54_spi0_select(FAR struct spi_dev_s *dev, +void lpc54_spi0_select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t lpc54_spi0_status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t lpc54_spi0_status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int lpc54_spi0_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int lpc54_spi0_cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_LPC54_SPI1_MASTER -void lpc54_spi1_select(FAR struct spi_dev_s *dev, +void lpc54_spi1_select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t lpc54_spi1_status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t lpc54_spi1_status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int lpc54_spi1_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int lpc54_spi1_cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_LPC54_SPI2_MASTER -void lpc54_spi2_select(FAR struct spi_dev_s *dev, +void lpc54_spi2_select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t lpc54_spi2_status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t lpc54_spi2_status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int lpc54_spi2_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int lpc54_spi2_cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_LPC54_SPI3_MASTER -void lpc54_spi3_select(FAR struct spi_dev_s *dev, +void lpc54_spi3_select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t lpc54_spi3_status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t lpc54_spi3_status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int lpc54_spi3_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int lpc54_spi3_cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_LPC54_SPI4_MASTER -void lpc54_spi4_select(FAR struct spi_dev_s *dev, +void lpc54_spi4_select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t lpc54_spi4_status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t lpc54_spi4_status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int lpc54_spi4_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int lpc54_spi4_cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_LPC54_SPI5_MASTER -void lpc54_spi5_select(FAR struct spi_dev_s *dev, +void lpc54_spi5_select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t lpc54_spi5_status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t lpc54_spi5_status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int lpc54_spi5_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int lpc54_spi5_cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_LPC54_SPI6_MASTER -void lpc54_spi6_select(FAR struct spi_dev_s *dev, +void lpc54_spi6_select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t lpc54_spi6_status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t lpc54_spi6_status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int lpc54_spi6_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int lpc54_spi6_cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_LPC54_SPI7_MASTER -void lpc54_spi7_select(FAR struct spi_dev_s *dev, +void lpc54_spi7_select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t lpc54_spi7_status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t lpc54_spi7_status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int lpc54_spi7_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int lpc54_spi7_cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_LPC54_SPI8_MASTER -void lpc54_spi8_select(FAR struct spi_dev_s *dev, +void lpc54_spi8_select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t lpc54_spi8_status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t lpc54_spi8_status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int lpc54_spi8_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int lpc54_spi8_cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif #ifdef CONFIG_LPC54_SPI9_MASTER -void lpc54_spi9_select(FAR struct spi_dev_s *dev, +void lpc54_spi9_select(struct spi_dev_s *dev, uint32_t devid, bool selected); -uint8_t lpc54_spi9_status(FAR struct spi_dev_s *dev, uint32_t devid); +uint8_t lpc54_spi9_status(struct spi_dev_s *dev, uint32_t devid); #ifdef CONFIG_SPI_CMDDATA -int lpc54_spi9_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); +int lpc54_spi9_cmddata(struct spi_dev_s *dev, uint32_t devid, bool cmd); #endif #endif @@ -236,43 +236,43 @@ int lpc54_spi9_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd); #ifdef CONFIG_SPI_CALLBACK #ifdef CONFIG_LPC54_SPI0_MASTER -int lpc54_spi0_register(FAR struct spi_dev_s *dev, +int lpc54_spi0_register(struct spi_dev_s *dev, spi_mediachange_t callback, void *arg); #endif #ifdef CONFIG_LPC54_SPI1_MASTER -int lpc54_spi1_register(FAR struct spi_dev_s *dev, +int lpc54_spi1_register(struct spi_dev_s *dev, spi_mediachange_t callback, void *arg); #endif #ifdef CONFIG_LPC54_SPI2_MASTER -int lpc54_spi2_register(FAR struct spi_dev_s *dev, +int lpc54_spi2_register(struct spi_dev_s *dev, spi_mediachange_t callback, void *arg); #endif #ifdef CONFIG_LPC54_SPI3_MASTER -int lpc54_spi3_register(FAR struct spi_dev_s *dev, +int lpc54_spi3_register(struct spi_dev_s *dev, spi_mediachange_t callback, void *arg); #endif #ifdef CONFIG_LPC54_SPI4_MASTER -int lpc54_spi4_register(FAR struct spi_dev_s *dev, +int lpc54_spi4_register(struct spi_dev_s *dev, spi_mediachange_t callback, void *arg); #endif #ifdef CONFIG_LPC54_SPI5_MASTER -int lpc54_spi5_register(FAR struct spi_dev_s *dev, +int lpc54_spi5_register(struct spi_dev_s *dev, spi_mediachange_t callback, void *arg); #endif #ifdef CONFIG_LPC54_SPI6_MASTER -int lpc54_spi6_register(FAR struct spi_dev_s *dev, +int lpc54_spi6_register(struct spi_dev_s *dev, spi_mediachange_t callback, void *arg); #endif #ifdef CONFIG_LPC54_SPI7_MASTER -int lpc54_spi7_register(FAR struct spi_dev_s *dev, +int lpc54_spi7_register(struct spi_dev_s *dev, spi_mediachange_t callback, void *arg); #endif #ifdef CONFIG_LPC54_SPI8_MASTER -int lpc54_spi8_register(FAR struct spi_dev_s *dev, +int lpc54_spi8_register(struct spi_dev_s *dev, spi_mediachange_t callback, void *arg); #endif #ifdef CONFIG_LPC54_SPI9_MASTER -int lpc54_spi9_register(FAR struct spi_dev_s *dev, +int lpc54_spi9_register(struct spi_dev_s *dev, spi_mediachange_t callback, void *arg); #endif #endif /* CONFIG_SPI_CALLBACK */ diff --git a/arch/arm/src/lpc54xx/lpc54_tickless.c b/arch/arm/src/lpc54xx/lpc54_tickless.c index e59df7ab81..bd6278b85e 100644 --- a/arch/arm/src/lpc54xx/lpc54_tickless.c +++ b/arch/arm/src/lpc54xx/lpc54_tickless.c @@ -219,9 +219,9 @@ static uint32_t common_div(uint32_t a, uint32_t b) return a; } -static void lpc54_ts_add(FAR const struct timespec *ts1, - FAR const struct timespec *ts2, - FAR struct timespec *ts3) +static void lpc54_ts_add(const struct timespec *ts1, + const struct timespec *ts2, + struct timespec *ts3) { time_t sec = ts1->tv_sec + ts2->tv_sec; long nsec = ts1->tv_nsec + ts2->tv_nsec; @@ -236,9 +236,9 @@ static void lpc54_ts_add(FAR const struct timespec *ts1, ts3->tv_nsec = nsec; } -static void lpc54_ts_sub(FAR const struct timespec *ts1, - FAR const struct timespec *ts2, - FAR struct timespec *ts3) +static void lpc54_ts_sub(const struct timespec *ts1, + const struct timespec *ts2, + struct timespec *ts3) { time_t sec; long nsec; @@ -271,13 +271,13 @@ static void lpc54_ts_sub(FAR const struct timespec *ts1, ts3->tv_nsec = nsec; } -static inline uint64_t lpc54_ts2tick(FAR const struct timespec *ts) +static inline uint64_t lpc54_ts2tick(const struct timespec *ts) { return ((uint64_t)ts->tv_sec * LPC54_CCLK + ((uint64_t)ts->tv_nsec / g_min_nsec * g_min_ticks)); } -static uint64_t lpc54_tick2ts(uint64_t ticks, FAR struct timespec *ts, +static uint64_t lpc54_tick2ts(uint64_t ticks, struct timespec *ts, bool with_rest) { uint64_t ticks_whole; @@ -550,7 +550,7 @@ static inline void lpc54_tl_alarm(uint64_t curr) /* Interrupt handler */ -static int lpc54_tl_isr(int irq, FAR void *context, FAR void *arg) +static int lpc54_tl_isr(int irq, void *context, void *arg) { uint64_t curr; @@ -649,7 +649,7 @@ void up_timer_initialize(void) /* No reg changes, only processing */ -int up_timer_gettime(FAR struct timespec *ts) +int up_timer_gettime(struct timespec *ts) { struct timespec count_ts; uint64_t count; @@ -691,7 +691,7 @@ int up_timer_gettime(FAR struct timespec *ts) return OK; } -int up_alarm_cancel(FAR struct timespec *ts) +int up_alarm_cancel(struct timespec *ts) { lpc54_sync_up(); @@ -710,7 +710,7 @@ int up_alarm_cancel(FAR struct timespec *ts) return OK; } -int up_alarm_start(FAR const struct timespec *ts) +int up_alarm_start(const struct timespec *ts) { uint64_t toset; uint64_t curr; @@ -754,7 +754,7 @@ int up_alarm_start(FAR const struct timespec *ts) } #ifndef CONFIG_SCHED_TICKLESS_ALARM -int up_timer_cancel(FAR struct timespec *ts) +int up_timer_cancel(struct timespec *ts) { lpc54_sync_up(); @@ -770,7 +770,7 @@ int up_timer_cancel(FAR struct timespec *ts) return OK; } -int up_timer_start(FAR const struct timespec *ts) +int up_timer_start(const struct timespec *ts) { lpc54_sync_up(); diff --git a/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c b/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c index f4ba8be2ec..5e9a04c720 100644 --- a/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c +++ b/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c @@ -434,7 +434,7 @@ static int lpc54_ctrltd(struct lpc54_usbhost_s *priv, struct lpc54_ed_s *ed, /* Interrupt handling *******************************************************/ -static int lpc54_usbinterrupt(int irq, void *context, FAR void *arg); +static int lpc54_usbinterrupt(int irq, void *context, void *arg); /* USB host controller operations *******************************************/ @@ -480,14 +480,14 @@ static ssize_t lpc54_transfer(struct usbhost_driver_s *drvr, usbhost_ep_t ep, #ifdef CONFIG_OHCI_ASYNCH static void lpc54_asynch_completion(struct lpc54_usbhost_s *priv, struct lpc54_ed_s *ed); -static int lpc54_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, - FAR uint8_t *buffer, size_t buflen, - usbhost_asynch_t callback, FAR void *arg); +static int lpc54_asynch(struct usbhost_driver_s *drvr, usbhost_ep_t ep, + uint8_t *buffer, size_t buflen, + usbhost_asynch_t callback, void *arg); #endif -static int lpc54_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep); +static int lpc54_cancel(struct usbhost_driver_s *drvr, usbhost_ep_t ep); #ifdef CONFIG_OHCI_HUB -static int lpc54_connect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport, +static int lpc54_connect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport, bool connected); #endif static void lpc54_disconnect(struct usbhost_driver_s *drvr, @@ -1781,7 +1781,7 @@ errout_with_xfrinfo: * ****************************************************************************/ -static int lpc54_usbinterrupt(int irq, void *context, FAR void *arg) +static int lpc54_usbinterrupt(int irq, void *context, void *arg) { struct lpc54_usbhost_s *priv = &g_usbhost; struct lpc54_ed_s *ed; @@ -2237,8 +2237,8 @@ static int lpc54_rh_enumerate(struct usbhost_connection_s *conn, return OK; } -static int lpc54_enumerate(FAR struct usbhost_connection_s *conn, - FAR struct usbhost_hubport_s *hport) +static int lpc54_enumerate(struct usbhost_connection_s *conn, + struct usbhost_hubport_s *hport) { int ret; @@ -3543,7 +3543,7 @@ errout_with_sem: * ****************************************************************************/ -static int lpc54_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) +static int lpc54_cancel(struct usbhost_driver_s *drvr, usbhost_ep_t ep) { #ifdef CONFIG_OHCI_ASYNCH struct lpc54_usbhost_s *priv = (struct lpc54_usbhost_s *)drvr; @@ -3697,8 +3697,8 @@ static int lpc54_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) ****************************************************************************/ #ifdef CONFIG_OHCI_HUB -static int lpc54_connect(FAR struct usbhost_driver_s *drvr, - FAR struct usbhost_hubport_s *hport, +static int lpc54_connect(struct usbhost_driver_s *drvr, + struct usbhost_hubport_s *hport, bool connected) { struct lpc54_usbhost_s *priv = (struct lpc54_usbhost_s *)drvr; diff --git a/arch/arm/src/lpc54xx/lpc54_usb0_ohci.h b/arch/arm/src/lpc54xx/lpc54_usb0_ohci.h index bb88ba9e78..e3b9f216c3 100644 --- a/arch/arm/src/lpc54xx/lpc54_usb0_ohci.h +++ b/arch/arm/src/lpc54xx/lpc54_usb0_ohci.h @@ -69,7 +69,7 @@ extern "C" #ifdef CONFIG_USBHOST struct usbhost_connection_s; -FAR struct usbhost_connection_s *lpc54_usbhost_initialize(int controller); +struct usbhost_connection_s *lpc54_usbhost_initialize(int controller); #endif #undef EXTERN diff --git a/arch/arm/src/lpc54xx/lpc54_wwdt.c b/arch/arm/src/lpc54xx/lpc54_wwdt.c index f8a896854d..ad8fa668f6 100644 --- a/arch/arm/src/lpc54xx/lpc54_wwdt.c +++ b/arch/arm/src/lpc54xx/lpc54_wwdt.c @@ -73,7 +73,7 @@ struct lpc54_lowerhalf_wwdt_s { - FAR const struct watchdog_ops_s *ops; /* Lower half operations */ + const struct watchdog_ops_s *ops; /* Lower half operations */ xcpt_t handler; /* Current watchdog interrupt handler */ uint32_t timeout; /* The actual timeout value */ @@ -90,20 +90,20 @@ static void lpc54_setwarning(uint32_t warning); /* Interrupt handling *******************************************************/ -static int lpc54_wwdt_interrupt(int irq, FAR void *context); +static int lpc54_wwdt_interrupt(int irq, void *context); /* "Lower half" driver methods **********************************************/ -static int lpc54_start(FAR struct watchdog_lowerhalf_s *lower); -static int lpc54_stop(FAR struct watchdog_lowerhalf_s *lower); -static int lpc54_keepalive(FAR struct watchdog_lowerhalf_s *lower); -static int lpc54_getstatus(FAR struct watchdog_lowerhalf_s *lower, - FAR struct watchdog_status_s *status); -static int lpc54_settimeout(FAR struct watchdog_lowerhalf_s *lower, +static int lpc54_start(struct watchdog_lowerhalf_s *lower); +static int lpc54_stop(struct watchdog_lowerhalf_s *lower); +static int lpc54_keepalive(struct watchdog_lowerhalf_s *lower); +static int lpc54_getstatus(struct watchdog_lowerhalf_s *lower, + struct watchdog_status_s *status); +static int lpc54_settimeout(struct watchdog_lowerhalf_s *lower, uint32_t timeout); -static xcpt_t lpc54_capture(FAR struct watchdog_lowerhalf_s *lower, +static xcpt_t lpc54_capture(struct watchdog_lowerhalf_s *lower, xcpt_t handler); -static int lpc54_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd, +static int lpc54_ioctl(struct watchdog_lowerhalf_s *lower, int cmd, unsigned long arg); /**************************************************************************** @@ -200,9 +200,9 @@ static void lpc54_setwarning(uint32_t warning) * ****************************************************************************/ -static int lpc54_wwdt_interrupt(int irq, FAR void *context) +static int lpc54_wwdt_interrupt(int irq, void *context) { - FAR struct lpc54_lowerhalf_wwdt_s *priv = &g_wdgdev; + struct lpc54_lowerhalf_wwdt_s *priv = &g_wdgdev; uint32_t regval; /* Check if the watchdog warning interrupt is really pending */ @@ -248,10 +248,10 @@ static int lpc54_wwdt_interrupt(int irq, FAR void *context) * ****************************************************************************/ -static int lpc54_start(FAR struct watchdog_lowerhalf_s *lower) +static int lpc54_start(struct watchdog_lowerhalf_s *lower) { - FAR struct lpc54_lowerhalf_wwdt_s *priv = - (FAR struct lpc54_lowerhalf_wwdt_s *)lower; + struct lpc54_lowerhalf_wwdt_s *priv = + (struct lpc54_lowerhalf_wwdt_s *)lower; wdinfo("Entry\n"); DEBUGASSERT(priv); @@ -289,7 +289,7 @@ static int lpc54_start(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int lpc54_stop(FAR struct watchdog_lowerhalf_s *lower) +static int lpc54_stop(struct watchdog_lowerhalf_s *lower) { /* The watchdog is always disabled after a reset. It is enabled by setting * the WDEN bit in the WDMOD register, then it cannot be disabled again @@ -322,10 +322,10 @@ static int lpc54_stop(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int lpc54_keepalive(FAR struct watchdog_lowerhalf_s *lower) +static int lpc54_keepalive(struct watchdog_lowerhalf_s *lower) { - FAR struct lpc54_lowerhalf_wwdt_s *priv = - (FAR struct lpc54_lowerhalf_wwdt_s *)lower; + struct lpc54_lowerhalf_wwdt_s *priv = + (struct lpc54_lowerhalf_wwdt_s *)lower; wdinfo("Entry\n"); DEBUGASSERT(priv); @@ -354,11 +354,11 @@ static int lpc54_keepalive(FAR struct watchdog_lowerhalf_s *lower) * ****************************************************************************/ -static int lpc54_getstatus(FAR struct watchdog_lowerhalf_s *lower, - FAR struct watchdog_status_s *status) +static int lpc54_getstatus(struct watchdog_lowerhalf_s *lower, + struct watchdog_status_s *status) { - FAR struct lpc54_lowerhalf_wwdt_s *priv = - (FAR struct lpc54_lowerhalf_wwdt_s *)lower; + struct lpc54_lowerhalf_wwdt_s *priv = + (struct lpc54_lowerhalf_wwdt_s *)lower; uint32_t elapsed; uint32_t reload; @@ -411,11 +411,11 @@ static int lpc54_getstatus(FAR struct watchdog_lowerhalf_s *lower, * ****************************************************************************/ -static int lpc54_settimeout(FAR struct watchdog_lowerhalf_s *lower, +static int lpc54_settimeout(struct watchdog_lowerhalf_s *lower, uint32_t timeout) { - FAR struct lpc54_lowerhalf_wwdt_s *priv = - (FAR struct lpc54_lowerhalf_wwdt_s *)lower; + struct lpc54_lowerhalf_wwdt_s *priv = + (struct lpc54_lowerhalf_wwdt_s *)lower; uint32_t reload; uint32_t regval; @@ -488,11 +488,11 @@ static int lpc54_settimeout(FAR struct watchdog_lowerhalf_s *lower, * ****************************************************************************/ -static xcpt_t lpc54_capture(FAR struct watchdog_lowerhalf_s *lower, +static xcpt_t lpc54_capture(struct watchdog_lowerhalf_s *lower, xcpt_t handler) { - FAR struct lpc54_lowerhalf_wwdt_s *priv = - (FAR struct lpc54_lowerhalf_wwdt_s *)lower; + struct lpc54_lowerhalf_wwdt_s *priv = + (struct lpc54_lowerhalf_wwdt_s *)lower; irqstate_t flags; xcpt_t oldhandler; uint16_t regval; @@ -555,11 +555,11 @@ static xcpt_t lpc54_capture(FAR struct watchdog_lowerhalf_s *lower, * ****************************************************************************/ -static int lpc54_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd, +static int lpc54_ioctl(struct watchdog_lowerhalf_s *lower, int cmd, unsigned long arg) { - FAR struct lpc54_lowerhalf_wwdt_s *priv = - (FAR struct lpc54_lowerhalf_wwdt_s *)lower; + struct lpc54_lowerhalf_wwdt_s *priv = + (struct lpc54_lowerhalf_wwdt_s *)lower; int ret = -ENOTTY; DEBUGASSERT(priv); @@ -612,9 +612,9 @@ static int lpc54_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd, * ****************************************************************************/ -void lpc54_wwdt_initialize(FAR const char *devpath) +void lpc54_wwdt_initialize(const char *devpath) { - FAR struct lpc54_lowerhalf_wwdt_s *priv = &g_wdgdev; + struct lpc54_lowerhalf_wwdt_s *priv = &g_wdgdev; wdinfo("Entry: devpath=%s\n", devpath); @@ -656,12 +656,12 @@ void lpc54_wwdt_initialize(FAR const char *devpath) * device option bits, the watchdog is automatically enabled at power-on. */ - lpc54_settimeout((FAR struct watchdog_lowerhalf_s *)priv, + lpc54_settimeout((struct watchdog_lowerhalf_s *)priv, CONFIG_LPC54_WWDT_DEFTIMOUT); /* Register the watchdog driver as /dev/watchdog0 */ - watchdog_register(devpath, (FAR struct watchdog_lowerhalf_s *)priv); + watchdog_register(devpath, (struct watchdog_lowerhalf_s *)priv); } #endif /* CONFIG_WATCHDOG && CONFIG_LPC54_WWDT */ diff --git a/arch/arm/src/lpc54xx/lpc54_wwdt.h b/arch/arm/src/lpc54xx/lpc54_wwdt.h index 61d18b0911..360a3366f8 100644 --- a/arch/arm/src/lpc54xx/lpc54_wwdt.h +++ b/arch/arm/src/lpc54xx/lpc54_wwdt.h @@ -69,7 +69,7 @@ extern "C" ****************************************************************************/ #ifdef CONFIG_LPC54_WWDT -void lpc54_wwdt_initialize(FAR const char *devpath); +void lpc54_wwdt_initialize(const char *devpath); #endif #undef EXTERN