board/arch: Remove FAR decorator

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2023-01-25 01:06:00 +08:00
committed by Petro Karashchenko
parent d23bd35dd3
commit d7ee492fc4
21 changed files with 61 additions and 67 deletions
+1 -1
View File
@@ -386,7 +386,7 @@ static int a64_wait_dsi_transmit(void)
ssize_t a64_mipi_dsi_write(uint8_t channel, ssize_t a64_mipi_dsi_write(uint8_t channel,
enum mipi_dsi_e cmd, enum mipi_dsi_e cmd,
FAR const uint8_t *txbuf, const uint8_t *txbuf,
size_t txlen) size_t txlen)
{ {
int ret; int ret;
+1 -1
View File
@@ -80,7 +80,7 @@ int a64_mipi_dsi_enable(void);
ssize_t a64_mipi_dsi_write(uint8_t channel, ssize_t a64_mipi_dsi_write(uint8_t channel,
enum mipi_dsi_e cmd, enum mipi_dsi_e cmd,
FAR const uint8_t *txbuf, const uint8_t *txbuf,
size_t txlen); size_t txlen);
/**************************************************************************** /****************************************************************************
+1 -1
View File
@@ -435,7 +435,7 @@ void mm_checkcorruption(struct mm_heap_s *heap)
* Name: malloc_size * Name: malloc_size
****************************************************************************/ ****************************************************************************/
size_t mm_malloc_size(FAR struct mm_heap_s *heap, FAR void *mem) size_t mm_malloc_size(struct mm_heap_s *heap, void *mem)
{ {
return host_mallocsize(mem); return host_mallocsize(mem);
} }
+2 -2
View File
@@ -289,8 +289,8 @@ static int wlan_ioctl(struct net_driver_s *dev, int cmd,
static void wlan_ipv6multicast(struct wlan_priv_s *priv); static void wlan_ipv6multicast(struct wlan_priv_s *priv);
#endif #endif
static struct wlan_pktbuf *wlan_recvframe(FAR struct wlan_priv_s *priv); static struct wlan_pktbuf *wlan_recvframe(struct wlan_priv_s *priv);
static struct wlan_pktbuf *wlan_txframe(FAR struct wlan_priv_s *priv); static struct wlan_pktbuf *wlan_txframe(struct wlan_priv_s *priv);
static inline void wlan_free_buffer(struct wlan_priv_s *priv, static inline void wlan_free_buffer(struct wlan_priv_s *priv,
uint8_t *buffer); uint8_t *buffer);
@@ -85,18 +85,16 @@
* Private Function Prototypes * Private Function Prototypes
****************************************************************************/ ****************************************************************************/
static ajoy_buttonset_t ajoy_supported(FAR const struct ajoy_lowerhalf_s static ajoy_buttonset_t ajoy_supported(const struct ajoy_lowerhalf_s *lower);
*lower); static int ajoy_sample(const struct ajoy_lowerhalf_s *lower,
static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, struct ajoy_sample_s *sample);
FAR struct ajoy_sample_s *sample); static ajoy_buttonset_t ajoy_buttons(const struct ajoy_lowerhalf_s *lower);
static ajoy_buttonset_t ajoy_buttons(FAR const struct ajoy_lowerhalf_s static void ajoy_enable(const struct ajoy_lowerhalf_s *lower,
*lower); ajoy_buttonset_t press, ajoy_buttonset_t release,
static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower, ajoy_handler_t handler, void *arg);
ajoy_buttonset_t press, ajoy_buttonset_t release,
ajoy_handler_t handler, FAR void *arg);
static void ajoy_disable(void); static void ajoy_disable(void);
static int ajoy_interrupt(int irq, FAR void *context, FAR void *arg); static int ajoy_interrupt(int irq, void *context, void *arg);
/**************************************************************************** /****************************************************************************
* Private Data * Private Data
@@ -135,7 +133,7 @@ static struct file g_adcfile;
/* Current interrupt handler and argument */ /* Current interrupt handler and argument */
static ajoy_handler_t g_ajoyhandler; static ajoy_handler_t g_ajoyhandler;
static FAR void *g_ajoyarg; static void *g_ajoyarg;
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
@@ -149,8 +147,7 @@ static FAR void *g_ajoyarg;
* *
****************************************************************************/ ****************************************************************************/
static ajoy_buttonset_t ajoy_supported(FAR const struct ajoy_lowerhalf_s static ajoy_buttonset_t ajoy_supported(const struct ajoy_lowerhalf_s *lower)
*lower)
{ {
iinfo("Supported: %02x\n", AJOY_SUPPORTED); iinfo("Supported: %02x\n", AJOY_SUPPORTED);
return (ajoy_buttonset_t)AJOY_SUPPORTED; return (ajoy_buttonset_t)AJOY_SUPPORTED;
@@ -164,11 +161,11 @@ static ajoy_buttonset_t ajoy_supported(FAR const struct ajoy_lowerhalf_s
* *
****************************************************************************/ ****************************************************************************/
static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, static int ajoy_sample(const struct ajoy_lowerhalf_s *lower,
FAR struct ajoy_sample_s *sample) struct ajoy_sample_s *sample)
{ {
struct adc_msg_s adcmsg[SAM_ADC_NCHANNELS]; struct adc_msg_s adcmsg[SAM_ADC_NCHANNELS];
FAR struct adc_msg_s *ptr; struct adc_msg_s *ptr;
ssize_t nread; ssize_t nread;
ssize_t offset; ssize_t offset;
int have; int have;
@@ -245,8 +242,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower,
* *
****************************************************************************/ ****************************************************************************/
static ajoy_buttonset_t ajoy_buttons(FAR const struct ajoy_lowerhalf_s static ajoy_buttonset_t ajoy_buttons(const struct ajoy_lowerhalf_s *lower)
*lower)
{ {
ajoy_buttonset_t ret = 0; ajoy_buttonset_t ret = 0;
int i; int i;
@@ -278,9 +274,9 @@ static ajoy_buttonset_t ajoy_buttons(FAR const struct ajoy_lowerhalf_s
* *
****************************************************************************/ ****************************************************************************/
static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower, static void ajoy_enable(const struct ajoy_lowerhalf_s *lower,
ajoy_buttonset_t press, ajoy_buttonset_t release, ajoy_buttonset_t press, ajoy_buttonset_t release,
ajoy_handler_t handler, FAR void *arg) ajoy_handler_t handler, void *arg)
{ {
irqstate_t flags; irqstate_t flags;
ajoy_buttonset_t either = press | release; ajoy_buttonset_t either = press | release;
@@ -367,7 +363,7 @@ static void ajoy_disable(void)
* *
****************************************************************************/ ****************************************************************************/
static int ajoy_interrupt(int irq, FAR void *context, FAR void *arg) static int ajoy_interrupt(int irq, void *context, void *arg)
{ {
DEBUGASSERT(g_ajoyhandler); DEBUGASSERT(g_ajoyhandler);
if (g_ajoyhandler) if (g_ajoyhandler)
+2 -2
View File
@@ -57,8 +57,8 @@
int sam_at25_automount(int minor) int sam_at25_automount(int minor)
{ {
FAR struct spi_dev_s *spi; struct spi_dev_s *spi;
FAR struct mtd_dev_s *mtd; struct mtd_dev_s *mtd;
static bool initialized = false; static bool initialized = false;
int ret; int ret;
@@ -84,7 +84,7 @@
#ifdef HAVE_I2CTOOL #ifdef HAVE_I2CTOOL
static void sam_i2c_register(int bus) static void sam_i2c_register(int bus)
{ {
FAR struct i2c_master_s *i2c; struct i2c_master_s *i2c;
int ret; int ret;
i2c = sam_i2cbus_initialize(bus); i2c = sam_i2cbus_initialize(bus);
@@ -104,7 +104,7 @@ uint32_t board_buttons(void)
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_SAMA5_PIOB_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS) #if defined(CONFIG_SAMA5_PIOB_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS)
int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) int board_button_irq(int id, xcpt_t irqhandler, void *arg)
{ {
int ret = -EINVAL; int ret = -EINVAL;
@@ -241,7 +241,7 @@ void weak_function sam_netinitialize(void)
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_SAMA5_PIOE_IRQ #ifdef CONFIG_SAMA5_PIOE_IRQ
int arch_phy_irq(FAR const char *intf, xcpt_t handler, void *arg, int arch_phy_irq(const char *intf, xcpt_t handler, void *arg,
phy_enable_t *enable) phy_enable_t *enable)
{ {
irqstate_t flags; irqstate_t flags;
@@ -151,7 +151,7 @@ int board_nandflash_config(int cs)
#ifdef HAVE_NAND #ifdef HAVE_NAND
int sam_nand_automount(int minor) int sam_nand_automount(int minor)
{ {
FAR struct mtd_dev_s *mtd; struct mtd_dev_s *mtd;
static bool initialized = false; static bool initialized = false;
int ret; int ret;
@@ -71,7 +71,7 @@ static uint32_t g_saveregs[XCPTCONTEXT_REGS];
* return the current FPU registers. * return the current FPU registers.
*/ */
void arch_getfpu(FAR uint32_t *fpusave) void arch_getfpu(uint32_t *fpusave)
{ {
irqstate_t flags; irqstate_t flags;
@@ -90,7 +90,7 @@ void arch_getfpu(FAR uint32_t *fpusave)
* will compare them and return true if they are identical. * will compare them and return true if they are identical.
*/ */
bool arch_cmpfpu(FAR const uint32_t *fpusave1, FAR const uint32_t *fpusave2) bool arch_cmpfpu(const uint32_t *fpusave1, const uint32_t *fpusave2)
{ {
return memcmp(fpusave1, fpusave2, (4*FPU_CONTEXT_REGS)) == 0; return memcmp(fpusave1, fpusave2, (4*FPU_CONTEXT_REGS)) == 0;
} }
@@ -98,7 +98,7 @@ struct sam_sdmmc_state_s
/* SDMMC device state */ /* SDMMC device state */
#ifdef CONFIG_SAMA5_SDMMC0 #ifdef CONFIG_SAMA5_SDMMC0
static int sam_sdmmc0_cardetect(int irq, void *regs, FAR void *arg); static int sam_sdmmc0_cardetect(int irq, void *regs, void *arg);
static struct sam_sdmmc_state_s g_sdmmc0 = static struct sam_sdmmc_state_s g_sdmmc0 =
{ {
@@ -110,7 +110,7 @@ static struct sam_sdmmc_state_s g_sdmmc0 =
#endif #endif
#ifdef CONFIG_SAMA5_SDMMC1 #ifdef CONFIG_SAMA5_SDMMC1
static int sam_sdmmc1_cardetect(int irq, void *regs, FAR void *arg); static int sam_sdmmc1_cardetect(int irq, void *regs, void *arg);
static struct sam_sdmmc_state_s g_sdmmc1 = static struct sam_sdmmc_state_s g_sdmmc1 =
{ {
@@ -175,14 +175,14 @@ static int sam_sdmmc_cardetect(struct sam_sdmmc_state_s *state)
} }
#ifdef CONFIG_SAMA5_SDMMC0 #ifdef CONFIG_SAMA5_SDMMC0
static int sam_sdmmc0_cardetect(int irq, void *regs, FAR void *arg) static int sam_sdmmc0_cardetect(int irq, void *regs, void *arg)
{ {
return sam_sdmmc_cardetect(&g_sdmmc0); return sam_sdmmc_cardetect(&g_sdmmc0);
} }
#endif #endif
#ifdef CONFIG_SAMA5_SDMMC1 #ifdef CONFIG_SAMA5_SDMMC1
static int sam_sdmmc1_cardetect(int irq, void *regs, FAR void *arg) static int sam_sdmmc1_cardetect(int irq, void *regs, void *arg)
{ {
return sam_sdmmc_cardetect(&g_sdmmc1); return sam_sdmmc_cardetect(&g_sdmmc1);
} }
+2 -2
View File
@@ -162,14 +162,14 @@ void sam_spi1select(uint32_t devid, bool selected)
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_SAMA5_SPI0 #ifdef CONFIG_SAMA5_SPI0
uint8_t sam_spi0status(FAR struct spi_dev_s *dev, uint32_t devid) uint8_t sam_spi0status(struct spi_dev_s *dev, uint32_t devid)
{ {
return 0; return 0;
} }
#endif #endif
#ifdef CONFIG_SAMA5_SPI0 #ifdef CONFIG_SAMA5_SPI0
uint8_t sam_spi1status(FAR struct spi_dev_s *dev, uint32_t devid) uint8_t sam_spi1status(struct spi_dev_s *dev, uint32_t devid)
{ {
return 0; return 0;
} }
+3 -3
View File
@@ -340,7 +340,7 @@ int sam_usbhost_initialize(void)
pid = kthread_create("OHCI Monitor", CONFIG_JUPITERNANO_USBHOST_PRIO, pid = kthread_create("OHCI Monitor", CONFIG_JUPITERNANO_USBHOST_PRIO,
CONFIG_JUPITERNANO_USBHOST_STACKSIZE, CONFIG_JUPITERNANO_USBHOST_STACKSIZE,
(main_t)ohci_waiter, (FAR char * const *)NULL); (main_t)ohci_waiter, (char * const *)NULL);
if (pid < 0) if (pid < 0)
{ {
uerr("ERROR: Failed to create ohci_waiter task: %d\n", ret); uerr("ERROR: Failed to create ohci_waiter task: %d\n", ret);
@@ -362,7 +362,7 @@ int sam_usbhost_initialize(void)
pid = kthread_create("EHCI Monitor", CONFIG_JUPITERNANO_USBHOST_PRIO, pid = kthread_create("EHCI Monitor", CONFIG_JUPITERNANO_USBHOST_PRIO,
CONFIG_JUPITERNANO_USBHOST_STACKSIZE, CONFIG_JUPITERNANO_USBHOST_STACKSIZE,
(main_t)ehci_waiter, (FAR char * const *)NULL); (main_t)ehci_waiter, (char * const *)NULL);
if (pid < 0) if (pid < 0)
{ {
uerr("ERROR: Failed to create ehci_waiter task: %d\n", ret); uerr("ERROR: Failed to create ehci_waiter task: %d\n", ret);
@@ -518,7 +518,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler)
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_USBDEV #ifdef CONFIG_USBDEV
void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume) void sam_usbsuspend(struct usbdev_s *dev, bool resume)
{ {
uinfo("resume: %d\n", resume); uinfo("resume: %d\n", resume);
} }
@@ -57,8 +57,7 @@
****************************************************************************/ ****************************************************************************/
static int pinephone_gt9xx_irq_attach(const struct gt9xx_board_s *state, static int pinephone_gt9xx_irq_attach(const struct gt9xx_board_s *state,
xcpt_t isr, xcpt_t isr, void *arg);
FAR void *arg);
static void pinephone_gt9xx_irq_enable(const struct gt9xx_board_s *state, static void pinephone_gt9xx_irq_enable(const struct gt9xx_board_s *state,
bool enable); bool enable);
static int pinephone_gt9xx_set_power(const struct gt9xx_board_s *state, static int pinephone_gt9xx_set_power(const struct gt9xx_board_s *state,
@@ -98,8 +97,7 @@ static const struct gt9xx_board_s g_pinephone_gt9xx =
****************************************************************************/ ****************************************************************************/
static int pinephone_gt9xx_irq_attach(const struct gt9xx_board_s *state, static int pinephone_gt9xx_irq_attach(const struct gt9xx_board_s *state,
xcpt_t isr, xcpt_t isr, void *arg)
FAR void *arg)
{ {
int ret; int ret;
@@ -311,7 +311,7 @@ static void rx65n_rspi_initialize(void)
#ifdef HAVE_RTC_DRIVER #ifdef HAVE_RTC_DRIVER
static int rtc_driver_initialize(void) static int rtc_driver_initialize(void)
{ {
FAR struct rtc_lowerhalf_s *lower; struct rtc_lowerhalf_s *lower;
int ret; int ret;
/* Instantiate the rx65n lower-half RTC driver */ /* Instantiate the rx65n lower-half RTC driver */
@@ -412,7 +412,7 @@ int rx65n_bringup(void)
#endif /* CONFIG_CDCACM & !CONFIG_CDCACM_CONSOLE */ #endif /* CONFIG_CDCACM & !CONFIG_CDCACM_CONSOLE */
#ifdef HAVE_RIIC_DRIVER #ifdef HAVE_RIIC_DRIVER
FAR struct i2c_master_s *i2c; struct i2c_master_s *i2c;
/* Get the I2C lower half instance */ /* Get the I2C lower half instance */
#ifdef CONFIG_RX65N_RIIC0 #ifdef CONFIG_RX65N_RIIC0
@@ -229,7 +229,7 @@ extern int istack;
static int hardfault_get_desc(struct sbramd_s *desc) static int hardfault_get_desc(struct sbramd_s *desc)
{ {
FAR struct file filestruct; struct file filestruct;
int ret; int ret;
ret = file_open(&filestruct, HARDFAULT_PATH, O_RDONLY); ret = file_open(&filestruct, HARDFAULT_PATH, O_RDONLY);
@@ -332,17 +332,17 @@ int rx65n_sbram_int(void)
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_RX65N_SAVE_CRASHDUMP) #if defined(CONFIG_RX65N_SAVE_CRASHDUMP)
void board_crashdump(uintptr_t currentsp, FAR void *tcb, void board_crashdump(uintptr_t currentsp, void *tcb,
FAR const char *filename, int lineno) const char *filename, int lineno)
{ {
struct fullcontext *pdump ; struct fullcontext *pdump ;
pdump = (struct fullcontext *)&g_sdata; pdump = (struct fullcontext *)&g_sdata;
FAR struct tcb_s *rtcb; struct tcb_s *rtcb;
int rv; int rv;
enter_critical_section(); enter_critical_section();
rtcb = (FAR struct tcb_s *)tcb; rtcb = (struct tcb_s *)tcb;
/* Zero out everything */ /* Zero out everything */
@@ -306,7 +306,7 @@ static void rx65n_rspi_initialize(void)
#ifdef HAVE_RTC_DRIVER #ifdef HAVE_RTC_DRIVER
static int rtc_driver_initialize(void) static int rtc_driver_initialize(void)
{ {
FAR struct rtc_lowerhalf_s *lower; struct rtc_lowerhalf_s *lower;
int ret; int ret;
/* Instantiate the rx65n lower-half RTC driver */ /* Instantiate the rx65n lower-half RTC driver */
@@ -408,7 +408,7 @@ int rx65n_bringup(void)
#endif /* CONFIG_CDCACM & !CONFIG_CDCACM_CONSOLE */ #endif /* CONFIG_CDCACM & !CONFIG_CDCACM_CONSOLE */
#ifdef HAVE_RIIC_DRIVER #ifdef HAVE_RIIC_DRIVER
FAR struct i2c_master_s *i2c; struct i2c_master_s *i2c;
/* Get the I2C lower half instance */ /* Get the I2C lower half instance */
@@ -227,7 +227,7 @@ extern int istack;
static int hardfault_get_desc(struct sbramd_s *desc) static int hardfault_get_desc(struct sbramd_s *desc)
{ {
FAR struct file filestruct; struct file filestruct;
int ret; int ret;
ret = file_open(&filestruct, HARDFAULT_PATH, O_RDONLY); ret = file_open(&filestruct, HARDFAULT_PATH, O_RDONLY);
@@ -330,17 +330,17 @@ int rx65n_sbram_int(void)
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_RX65N_SAVE_CRASHDUMP) #if defined(CONFIG_RX65N_SAVE_CRASHDUMP)
void board_crashdump(uintptr_t currentsp, FAR void *tcb, void board_crashdump(uintptr_t currentsp, void *tcb,
FAR const char *filename, int lineno) const char *filename, int lineno)
{ {
struct fullcontext *pdump ; struct fullcontext *pdump ;
pdump = (struct fullcontext *)&g_sdata; pdump = (struct fullcontext *)&g_sdata;
FAR struct tcb_s *rtcb; struct tcb_s *rtcb;
int rv; int rv;
enter_critical_section(); enter_critical_section();
rtcb = (FAR struct tcb_s *)tcb; rtcb = (struct tcb_s *)tcb;
/* Zero out everything */ /* Zero out everything */
@@ -84,7 +84,7 @@ struct esp32c3gpint_dev_s
#if BOARD_NGPIOOUT > 0 #if BOARD_NGPIOOUT > 0
static int gpout_read(struct gpio_dev_s *dev, bool *value); static int gpout_read(struct gpio_dev_s *dev, bool *value);
static int gpout_write(struct gpio_dev_s *dev, bool value); static int gpout_write(struct gpio_dev_s *dev, bool value);
static int gpout_setpintype(FAR struct gpio_dev_s *dev, static int gpout_setpintype(struct gpio_dev_s *dev,
enum gpio_pintype_e pintype); enum gpio_pintype_e pintype);
#endif #endif
@@ -93,7 +93,7 @@ static int gpint_read(struct gpio_dev_s *dev, bool *value);
static int gpint_attach(struct gpio_dev_s *dev, static int gpint_attach(struct gpio_dev_s *dev,
pin_interrupt_t callback); pin_interrupt_t callback);
static int gpint_enable(struct gpio_dev_s *dev, bool enable); static int gpint_enable(struct gpio_dev_s *dev, bool enable);
static int gpint_setpintype(FAR struct gpio_dev_s *dev, static int gpint_setpintype(struct gpio_dev_s *dev,
enum gpio_pintype_e pintype); enum gpio_pintype_e pintype);
#endif #endif
@@ -184,7 +184,7 @@ static int gpout_write(struct gpio_dev_s *dev, bool value)
* Name: gpout_setpintype * Name: gpout_setpintype
****************************************************************************/ ****************************************************************************/
static int gpout_setpintype(FAR struct gpio_dev_s *dev, static int gpout_setpintype(struct gpio_dev_s *dev,
enum gpio_pintype_e pintype) enum gpio_pintype_e pintype)
{ {
struct esp32c3gpio_dev_s *esp32c3gpio = struct esp32c3gpio_dev_s *esp32c3gpio =
@@ -324,7 +324,7 @@ static int gpint_enable(struct gpio_dev_s *dev, bool enable)
* Name: gpint_setpintype * Name: gpint_setpintype
****************************************************************************/ ****************************************************************************/
static int gpint_setpintype(FAR struct gpio_dev_s *dev, static int gpint_setpintype(struct gpio_dev_s *dev,
enum gpio_pintype_e pintype) enum gpio_pintype_e pintype)
{ {
struct esp32c3gpint_dev_s *esp32c3gpint = struct esp32c3gpint_dev_s *esp32c3gpint =
@@ -138,7 +138,7 @@ int esp32_es8388_initialize(int i2c_port, uint8_t i2c_addr, int i2c_freq,
* will return an audio interface. * will return an audio interface.
*/ */
lower = (FAR struct es8388_lower_s *) lower = (struct es8388_lower_s *)
kmm_zalloc(sizeof(struct es8388_lower_s)); kmm_zalloc(sizeof(struct es8388_lower_s));
lower->address = i2c_addr, lower->address = i2c_addr,