This is an automated email from the ASF dual-hosted git repository. pkarashchenko pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit af00e016e9c7c67538ecb7f2658fb6c356ba907f Author: Xiang Xiao <[email protected]> AuthorDate: Sun Apr 17 20:41:53 2022 +0800 arch/sim: Remove FAR from chip and board folder Signed-off-by: Xiang Xiao <[email protected]> --- arch/sim/src/sim/up_ajoystick.c | 26 +++--- arch/sim/src/sim/up_alsa.c | 4 +- arch/sim/src/sim/up_assert.c | 2 +- arch/sim/src/sim/up_blockdevice.c | 2 +- arch/sim/src/sim/up_blocktask.c | 2 +- arch/sim/src/sim/up_checkstack.c | 14 +-- arch/sim/src/sim/up_cpuidlestack.c | 2 +- arch/sim/src/sim/up_createstack.c | 4 +- arch/sim/src/sim/up_exit.c | 2 +- arch/sim/src/sim/up_framebuffer.c | 54 ++++++------ arch/sim/src/sim/up_hcisocket.c | 46 +++++----- arch/sim/src/sim/up_heap.c | 50 +++++------ arch/sim/src/sim/up_initialize.c | 8 +- arch/sim/src/sim/up_keyboard.c | 4 +- arch/sim/src/sim/up_lcd.c | 34 ++++---- arch/sim/src/sim/up_netdriver.c | 38 ++++---- arch/sim/src/sim/up_oneshot.c | 64 +++++++------- arch/sim/src/sim/up_releasepending.c | 2 +- arch/sim/src/sim/up_releasestack.c | 2 +- arch/sim/src/sim/up_reprioritizertr.c | 2 +- arch/sim/src/sim/up_romgetc.c | 2 +- arch/sim/src/sim/up_rtc.c | 26 +++--- arch/sim/src/sim/up_smpsignal.c | 6 +- arch/sim/src/sim/up_stackframe.c | 6 +- arch/sim/src/sim/up_touchscreen.c | 6 +- arch/sim/src/sim/up_uart.c | 54 ++++++------ arch/sim/src/sim/up_unblocktask.c | 4 +- arch/sim/src/sim/up_usestack.c | 2 +- arch/sim/src/sim/up_usrsock.c | 148 ++++++++++++++++---------------- boards/sim/sim/sim/src/sim_bringup.c | 14 +-- boards/sim/sim/sim/src/sim_buttons.c | 4 +- boards/sim/sim/sim/src/sim_foc.c | 2 +- boards/sim/sim/sim/src/sim_gpio.c | 26 +++--- boards/sim/sim/sim/src/sim_ioexpander.c | 18 ++-- 34 files changed, 340 insertions(+), 340 deletions(-) diff --git a/arch/sim/src/sim/up_ajoystick.c b/arch/sim/src/sim/up_ajoystick.c index 3b4851cf27..574111e664 100644 --- a/arch/sim/src/sim/up_ajoystick.c +++ b/arch/sim/src/sim/up_ajoystick.c @@ -47,14 +47,14 @@ ****************************************************************************/ static ajoy_buttonset_t ajoy_supported( - FAR const struct ajoy_lowerhalf_s *lower); -static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, - FAR struct ajoy_sample_s *sample); + const struct ajoy_lowerhalf_s *lower); +static int ajoy_sample(const struct ajoy_lowerhalf_s *lower, + struct ajoy_sample_s *sample); static ajoy_buttonset_t ajoy_buttons( - FAR const struct ajoy_lowerhalf_s *lower); -static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower, - ajoy_buttonset_t press, ajoy_buttonset_t release, - ajoy_handler_t handler, FAR void *arg); + const struct ajoy_lowerhalf_s *lower); +static void ajoy_enable(const struct ajoy_lowerhalf_s *lower, + ajoy_buttonset_t press, ajoy_buttonset_t release, + ajoy_handler_t handler, void *arg); /**************************************************************************** * Private Data @@ -95,7 +95,7 @@ static ajoy_buttonset_t g_ajoy_rset; /* Set of releases waited for */ ****************************************************************************/ static ajoy_buttonset_t ajoy_supported( - FAR const struct ajoy_lowerhalf_s *lower) + const struct ajoy_lowerhalf_s *lower) { return (ajoy_buttonset_t)AJOY_SUPPORTED; } @@ -108,8 +108,8 @@ static ajoy_buttonset_t ajoy_supported( * ****************************************************************************/ -static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, - FAR struct ajoy_sample_s *sample) +static int ajoy_sample(const struct ajoy_lowerhalf_s *lower, + struct ajoy_sample_s *sample) { memcpy(sample, &g_ajoy_sample, sizeof(struct ajoy_sample_s)); g_ajoy_buttons = g_ajoy_sample.as_buttons; @@ -126,7 +126,7 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower, ****************************************************************************/ static ajoy_buttonset_t ajoy_buttons( - FAR const struct ajoy_lowerhalf_s *lower) + const struct ajoy_lowerhalf_s *lower) { g_ajoy_valid = false; g_ajoy_buttons = g_ajoy_sample.as_buttons; @@ -142,9 +142,9 @@ static ajoy_buttonset_t ajoy_buttons( * ****************************************************************************/ -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_handler_t handler, FAR void *arg) + ajoy_handler_t handler, void *arg) { g_ajoy_handler = NULL; g_ajoy_pset = press; diff --git a/arch/sim/src/sim/up_alsa.c b/arch/sim/src/sim/up_alsa.c index 5f45b346bd..d5cbabf161 100644 --- a/arch/sim/src/sim/up_alsa.c +++ b/arch/sim/src/sim/up_alsa.c @@ -71,7 +71,7 @@ static int sim_audio_getcaps(struct audio_lowerhalf_s *dev, int type, struct audio_caps_s *caps); #ifdef CONFIG_AUDIO_MULTI_SESSION static int sim_audio_configure(struct audio_lowerhalf_s *dev, - FAR void *session, + void *session, const struct audio_caps_s *caps); #else static int sim_audio_configure(struct audio_lowerhalf_s *dev, @@ -362,7 +362,7 @@ static int sim_audio_getcaps(struct audio_lowerhalf_s *dev, int type, #ifdef CONFIG_AUDIO_MULTI_SESSION static int sim_audio_configure(struct audio_lowerhalf_s *dev, - FAR void *session, + void *session, const struct audio_caps_s *caps) #else static int sim_audio_configure(struct audio_lowerhalf_s *dev, diff --git a/arch/sim/src/sim/up_assert.c b/arch/sim/src/sim/up_assert.c index ed96ace282..30e62aeba6 100644 --- a/arch/sim/src/sim/up_assert.c +++ b/arch/sim/src/sim/up_assert.c @@ -73,7 +73,7 @@ void up_assert(const char *filename, int lineno) { - FAR struct tcb_s *rtcb = running_task(); + struct tcb_s *rtcb = running_task(); /* Flush any buffered SYSLOG data (prior to the assertion) */ diff --git a/arch/sim/src/sim/up_blockdevice.c b/arch/sim/src/sim/up_blockdevice.c index bff6adafd2..4e5b76bbcf 100644 --- a/arch/sim/src/sim/up_blockdevice.c +++ b/arch/sim/src/sim/up_blockdevice.c @@ -53,6 +53,6 @@ void up_registerblockdevice(void) { - ramdisk_register(0, (FAR uint8_t *)up_deviceimage(), NSECTORS, + ramdisk_register(0, (uint8_t *)up_deviceimage(), NSECTORS, LOGICAL_SECTOR_SIZE, RDFLAG_WRENABLED | RDFLAG_FUNLINK); } diff --git a/arch/sim/src/sim/up_blocktask.c b/arch/sim/src/sim/up_blocktask.c index 2924c4c4db..5463099c7a 100644 --- a/arch/sim/src/sim/up_blocktask.c +++ b/arch/sim/src/sim/up_blocktask.c @@ -60,7 +60,7 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) { - FAR struct tcb_s *rtcb = this_task(); + struct tcb_s *rtcb = this_task(); bool switch_needed; /* Verify that the context switch can be performed */ diff --git a/arch/sim/src/sim/up_checkstack.c b/arch/sim/src/sim/up_checkstack.c index f9456eef2e..407717f8fe 100644 --- a/arch/sim/src/sim/up_checkstack.c +++ b/arch/sim/src/sim/up_checkstack.c @@ -61,9 +61,9 @@ static size_t do_stackcheck(uintptr_t alloc, size_t size); static size_t do_stackcheck(uintptr_t alloc, size_t size) { - FAR uintptr_t start; - FAR uintptr_t end; - FAR uint32_t *ptr; + uintptr_t start; + uintptr_t end; + uint32_t *ptr; size_t mark; if (size == 0) @@ -86,7 +86,7 @@ static size_t do_stackcheck(uintptr_t alloc, size_t size) * that does not have the magic value is the high water mark. */ - for (ptr = (FAR uint32_t *)start, mark = (size >> 2); + for (ptr = (uint32_t *)start, mark = (size >> 2); *ptr == STACK_COLOR && mark > 0; ptr++, mark--); @@ -106,7 +106,7 @@ static size_t do_stackcheck(uintptr_t alloc, size_t size) int i; int j; - ptr = (FAR uint32_t *)start; + ptr = (uint32_t *)start; for (i = 0; i < size; i += 4 * 64) { for (j = 0; j < 64; j++) @@ -154,12 +154,12 @@ static size_t do_stackcheck(uintptr_t alloc, size_t size) * ****************************************************************************/ -size_t up_check_tcbstack(FAR struct tcb_s *tcb) +size_t up_check_tcbstack(struct tcb_s *tcb) { return do_stackcheck((uintptr_t)tcb->stack_base_ptr, tcb->adj_stack_size); } -ssize_t up_check_tcbstack_remain(FAR struct tcb_s *tcb) +ssize_t up_check_tcbstack_remain(struct tcb_s *tcb) { return tcb->adj_stack_size - up_check_tcbstack(tcb); } diff --git a/arch/sim/src/sim/up_cpuidlestack.c b/arch/sim/src/sim/up_cpuidlestack.c index c9effa79f4..94ac4395f3 100644 --- a/arch/sim/src/sim/up_cpuidlestack.c +++ b/arch/sim/src/sim/up_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) { return up_create_stack(tcb, stack_size, TCB_FLAG_TTYPE_KERNEL); } diff --git a/arch/sim/src/sim/up_createstack.c b/arch/sim/src/sim/up_createstack.c index a079abab68..6661dafa37 100644 --- a/arch/sim/src/sim/up_createstack.c +++ b/arch/sim/src/sim/up_createstack.c @@ -71,7 +71,7 @@ * ****************************************************************************/ -int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype) +int up_create_stack(struct tcb_s *tcb, size_t stack_size, uint8_t ttype) { stack_size += CONFIG_SIM_STACKSIZE_ADJUSTMENT; @@ -156,7 +156,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype) ****************************************************************************/ #ifdef CONFIG_STACK_COLORATION -void nostackprotect_function up_stack_color(FAR void *stackbase, +void nostackprotect_function up_stack_color(void *stackbase, size_t nbytes) { uint32_t *stkptr; diff --git a/arch/sim/src/sim/up_exit.c b/arch/sim/src/sim/up_exit.c index ca15be3aef..3ea743a151 100644 --- a/arch/sim/src/sim/up_exit.c +++ b/arch/sim/src/sim/up_exit.c @@ -49,7 +49,7 @@ void up_exit(int status) { - FAR struct tcb_s *tcb; + struct tcb_s *tcb; /* Make sure that we are in a critical section with local interrupts. * The IRQ state will be restored when the next task is started. diff --git a/arch/sim/src/sim/up_framebuffer.c b/arch/sim/src/sim/up_framebuffer.c index 8552c68915..84285c3f06 100644 --- a/arch/sim/src/sim/up_framebuffer.c +++ b/arch/sim/src/sim/up_framebuffer.c @@ -69,30 +69,30 @@ * configuration of each color plane. */ -static int up_getvideoinfo(FAR struct fb_vtable_s *vtable, - FAR struct fb_videoinfo_s *vinfo); -static int up_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno, - FAR struct fb_planeinfo_s *pinfo); +static int up_getvideoinfo(struct fb_vtable_s *vtable, + struct fb_videoinfo_s *vinfo); +static int up_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 up_getcmap(FAR struct fb_vtable_s *vtable, - FAR struct fb_cmap_s *cmap); -static int up_putcmap(FAR struct fb_vtable_s *vtable, - FAR const struct fb_cmap_s *cmap); +static int up_getcmap(struct fb_vtable_s *vtable, + struct fb_cmap_s *cmap); +static int up_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 cursor */ #ifdef CONFIG_FB_HWCURSOR -static int up_getcursor(FAR struct fb_vtable_s *vtable, - FAR struct fb_cursorattrib_s *attrib); -static int up_setcursor(FAR struct fb_vtable_s *vtable, - FAR struct fb_setcursor_s *settings); +static int up_getcursor(struct fb_vtable_s *vtable, + struct fb_cursorattrib_s *attrib); +static int up_setcursor(struct fb_vtable_s *vtable, + struct fb_setcursor_s *settings); #endif /**************************************************************************** @@ -120,7 +120,7 @@ static const struct fb_videoinfo_s g_videoinfo = static const struct fb_planeinfo_s g_planeinfo = { - .fbmem = (FAR void *)&g_fb, + .fbmem = (void *)&g_fb, .fblen = FB_SIZE, .stride = FB_WIDTH, .display = 0, @@ -172,8 +172,8 @@ struct fb_vtable_s g_fbobject = * Name: up_getvideoinfo ****************************************************************************/ -static int up_getvideoinfo(FAR struct fb_vtable_s *vtable, - FAR struct fb_videoinfo_s *vinfo) +static int up_getvideoinfo(struct fb_vtable_s *vtable, + struct fb_videoinfo_s *vinfo) { ginfo("vtable=%p vinfo=%p\n", vtable, vinfo); if (vtable && vinfo) @@ -190,8 +190,8 @@ static int up_getvideoinfo(FAR struct fb_vtable_s *vtable, * Name: up_getplaneinfo ****************************************************************************/ -static int up_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno, - FAR struct fb_planeinfo_s *pinfo) +static int up_getplaneinfo(struct fb_vtable_s *vtable, int planeno, + struct fb_planeinfo_s *pinfo) { ginfo("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo); if (vtable && planeno == 0 && pinfo) @@ -209,8 +209,8 @@ static int up_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno, ****************************************************************************/ #ifdef CONFIG_FB_CMAP -static int up_getcmap(FAR struct fb_vtable_s *vtable, - FAR struct fb_cmap_s *cmap) +static int up_getcmap(struct fb_vtable_s *vtable, + struct fb_cmap_s *cmap) { int len; int i; @@ -242,8 +242,8 @@ static int up_getcmap(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifdef CONFIG_FB_CMAP -static int up_putcmap(FAR struct fb_vtable_s *vtable, - FAR const struct fb_cmap_s *cmap) +static int up_putcmap(struct fb_vtable_s *vtable, + const struct fb_cmap_s *cmap) { #ifdef CONFIG_SIM_X11FB return up_x11cmap(cmap->first, cmap->len, cmap->red, cmap->green, @@ -266,8 +266,8 @@ static int up_putcmap(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifdef CONFIG_FB_HWCURSOR -static int up_getcursor(FAR struct fb_vtable_s *vtable, - FAR struct fb_cursorattrib_s *attrib) +static int up_getcursor(struct fb_vtable_s *vtable, + struct fb_cursorattrib_s *attrib) { ginfo("vtable=%p attrib=%p\n", vtable, attrib); if (vtable && attrib) @@ -296,8 +296,8 @@ static int up_getcursor(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifdef CONFIG_FB_HWCURSOR -static int up_setcursor(FAR struct fb_vtable_s *vtable, - FAR struct fb_setcursor_s *settings) +static int up_setcursor(struct fb_vtable_s *vtable, + struct fb_setcursor_s *settings) { ginfo("vtable=%p settings=%p\n", vtable, settings); if (vtable && settings) @@ -339,7 +339,7 @@ static int up_setcursor(FAR struct fb_vtable_s *vtable, ****************************************************************************/ #ifdef CONFIG_SIM_X11FB -static void up_updatework(FAR void *arg) +static void up_updatework(void *arg) { work_queue(LPWORK, &g_updatework, up_updatework, NULL, MSEC2TICK(33)); up_x11update(); @@ -402,7 +402,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) { if (vplane == 0) { diff --git a/arch/sim/src/sim/up_hcisocket.c b/arch/sim/src/sim/up_hcisocket.c index 9159fe248f..794c77db97 100644 --- a/arch/sim/src/sim/up_hcisocket.c +++ b/arch/sim/src/sim/up_hcisocket.c @@ -57,7 +57,7 @@ struct bthcisock_s { - FAR struct bt_driver_s drv; + struct bt_driver_s drv; int id; int fd; sq_entry_t link; @@ -67,12 +67,12 @@ struct bthcisock_s * Private Function Prototypes ****************************************************************************/ -static int bthcisock_send(FAR struct bt_driver_s *drv, +static int bthcisock_send(struct bt_driver_s *drv, enum bt_buf_type_e type, - FAR void *data, size_t len); -static int bthcisock_open(FAR struct bt_driver_s *drv); -static void bthcisock_close(FAR struct bt_driver_s *drv); -static int bthcisock_receive(FAR struct bt_driver_s *drv); + void *data, size_t len); +static int bthcisock_open(struct bt_driver_s *drv); +static void bthcisock_close(struct bt_driver_s *drv); +static int bthcisock_receive(struct bt_driver_s *drv); /**************************************************************************** * Private Data @@ -84,12 +84,12 @@ static sq_queue_t g_bthcisock_list; * Private Functions ****************************************************************************/ -static int bthcisock_send(FAR struct bt_driver_s *drv, +static int bthcisock_send(struct bt_driver_s *drv, enum bt_buf_type_e type, - FAR void *data, size_t len) + void *data, size_t len) { - FAR struct bthcisock_s *dev = (FAR struct bthcisock_s *)drv; - FAR char *hdr = (FAR char *)data - drv->head_reserve; + struct bthcisock_s *dev = (struct bthcisock_s *)drv; + char *hdr = (char *)data - drv->head_reserve; int ret; if (type == BT_CMD) @@ -114,17 +114,17 @@ static int bthcisock_send(FAR struct bt_driver_s *drv, return ret < 0 ? ret : len; } -static void bthcisock_close(FAR struct bt_driver_s *drv) +static void bthcisock_close(struct bt_driver_s *drv) { - FAR struct bthcisock_s *dev = (FAR struct bthcisock_s *)drv; + struct bthcisock_s *dev = (struct bthcisock_s *)drv; bthcisock_host_close(dev->fd); dev->fd = -1; } -static int bthcisock_receive(FAR struct bt_driver_s *drv) +static int bthcisock_receive(struct bt_driver_s *drv) { - FAR struct bthcisock_s *dev = (FAR struct bthcisock_s *)drv; + struct bthcisock_s *dev = (struct bthcisock_s *)drv; char data[BLUETOOTH_RX_FRAMELEN]; enum bt_buf_type_e type; int ret; @@ -157,9 +157,9 @@ static int bthcisock_receive(FAR struct bt_driver_s *drv) ret - H4_HEADER_SIZE); } -static int bthcisock_open(FAR struct bt_driver_s *drv) +static int bthcisock_open(struct bt_driver_s *drv) { - FAR struct bthcisock_s *dev = (FAR struct bthcisock_s *)drv; + struct bthcisock_s *dev = (struct bthcisock_s *)drv; int fd; fd = bthcisock_host_open(dev->id); @@ -174,14 +174,14 @@ static int bthcisock_open(FAR struct bt_driver_s *drv) return OK; } -static FAR struct bthcisock_s *bthcisock_alloc(int dev_id) +static struct bthcisock_s *bthcisock_alloc(int dev_id) { /* Register the driver with the Bluetooth stack */ - FAR struct bthcisock_s *dev; - FAR struct bt_driver_s *drv; + struct bthcisock_s *dev; + struct bt_driver_s *drv; - dev = (FAR struct bthcisock_s *)kmm_zalloc(sizeof(*dev)); + dev = (struct bthcisock_s *)kmm_zalloc(sizeof(*dev)); if (dev == NULL) { return NULL; @@ -221,7 +221,7 @@ static FAR struct bthcisock_s *bthcisock_alloc(int dev_id) int bthcisock_register(int dev_id) { - FAR struct bthcisock_s *dev; + struct bthcisock_s *dev; #if defined(CONFIG_UART_BTH4) char name[32]; #endif @@ -264,8 +264,8 @@ int bthcisock_register(int dev_id) int bthcisock_loop(void) { - FAR struct bthcisock_s *dev; - FAR sq_entry_t *entry; + struct bthcisock_s *dev; + sq_entry_t *entry; for (entry = sq_peek(&g_bthcisock_list); entry; entry = sq_next(entry)) { diff --git a/arch/sim/src/sim/up_heap.c b/arch/sim/src/sim/up_heap.c index 4ed5fd2c4b..3c71a3009a 100644 --- a/arch/sim/src/sim/up_heap.c +++ b/arch/sim/src/sim/up_heap.c @@ -45,7 +45,7 @@ struct mm_delaynode_s { - FAR struct mm_delaynode_s *flink; + struct mm_delaynode_s *flink; }; struct mm_heap_s @@ -61,10 +61,10 @@ struct mm_heap_s * Private Functions ****************************************************************************/ -static void mm_add_delaylist(FAR struct mm_heap_s *heap, FAR void *mem) +static void mm_add_delaylist(struct mm_heap_s *heap, void *mem) { #if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__) - FAR struct mm_delaynode_s *tmp = mem; + struct mm_delaynode_s *tmp = mem; irqstate_t flags; /* Delay the deallocation until a more appropriate time. */ @@ -78,10 +78,10 @@ static void mm_add_delaylist(FAR struct mm_heap_s *heap, FAR void *mem) #endif } -static void mm_free_delaylist(FAR struct mm_heap_s *heap) +static void mm_free_delaylist(struct mm_heap_s *heap) { #if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__) - FAR struct mm_delaynode_s *tmp; + struct mm_delaynode_s *tmp; irqstate_t flags; /* Move the delay list to local */ @@ -97,7 +97,7 @@ static void mm_free_delaylist(FAR struct mm_heap_s *heap) while (tmp) { - FAR void *address; + void *address; /* Get the first delayed deallocation */ @@ -136,12 +136,12 @@ static void mm_free_delaylist(FAR struct mm_heap_s *heap) * ****************************************************************************/ -FAR struct mm_heap_s *mm_initialize(FAR const char *name, - FAR void *heap_start, size_t heap_size) +struct mm_heap_s *mm_initialize(const char *name, + void *heap_start, size_t heap_size) { - FAR struct mm_heap_s *heap; + struct mm_heap_s *heap; - heap = host_memalign(sizeof(FAR void *), sizeof(*heap)); + heap = host_memalign(sizeof(void *), sizeof(*heap)); DEBUGASSERT(heap); memset(heap, 0, sizeof(struct mm_heap_s)); @@ -173,7 +173,7 @@ FAR struct mm_heap_s *mm_initialize(FAR const char *name, * ****************************************************************************/ -void mm_addregion(FAR struct mm_heap_s *heap, FAR void *heapstart, +void mm_addregion(struct mm_heap_s *heap, void *heapstart, size_t heapsize) { } @@ -189,7 +189,7 @@ void mm_addregion(FAR struct mm_heap_s *heap, FAR void *heapstart, * ****************************************************************************/ -FAR void *mm_malloc(FAR struct mm_heap_s *heap, size_t size) +void *mm_malloc(struct mm_heap_s *heap, size_t size) { return mm_realloc(heap, NULL, size); } @@ -203,7 +203,7 @@ FAR void *mm_malloc(FAR struct mm_heap_s *heap, size_t size) * ****************************************************************************/ -FAR void mm_free(FAR struct mm_heap_s *heap, FAR void *mem) +void mm_free(struct mm_heap_s *heap, void *mem) { #if defined(CONFIG_BUILD_FLAT) || defined(__KERNEL__) /* Check current environment */ @@ -255,7 +255,7 @@ FAR void mm_free(FAR struct mm_heap_s *heap, FAR void *mem) * ****************************************************************************/ -FAR void *mm_realloc(FAR struct mm_heap_s *heap, FAR void *oldmem, +void *mm_realloc(struct mm_heap_s *heap, void *oldmem, size_t size) { mm_free_delaylist(heap); @@ -270,7 +270,7 @@ FAR void *mm_realloc(FAR struct mm_heap_s *heap, FAR void *oldmem, * ****************************************************************************/ -FAR void *mm_calloc(FAR struct mm_heap_s *heap, size_t n, size_t elem_size) +void *mm_calloc(struct mm_heap_s *heap, size_t n, size_t elem_size) { size_t size = n * elem_size; @@ -290,9 +290,9 @@ FAR void *mm_calloc(FAR struct mm_heap_s *heap, size_t n, size_t elem_size) * ****************************************************************************/ -FAR void *mm_zalloc(FAR struct mm_heap_s *heap, size_t size) +void *mm_zalloc(struct mm_heap_s *heap, size_t size) { - FAR void *ptr; + void *ptr; ptr = mm_malloc(heap, size); if (ptr != NULL) @@ -316,7 +316,7 @@ FAR void *mm_zalloc(FAR struct mm_heap_s *heap, size_t size) * ****************************************************************************/ -FAR void *mm_memalign(FAR struct mm_heap_s *heap, size_t alignment, +void *mm_memalign(struct mm_heap_s *heap, size_t alignment, size_t size) { mm_free_delaylist(heap); @@ -340,7 +340,7 @@ FAR void *mm_memalign(FAR struct mm_heap_s *heap, size_t alignment, * ****************************************************************************/ -bool mm_heapmember(FAR struct mm_heap_s *heap, FAR void *mem) +bool mm_heapmember(struct mm_heap_s *heap, void *mem) { return true; } @@ -354,7 +354,7 @@ bool mm_heapmember(FAR struct mm_heap_s *heap, FAR void *mem) * ****************************************************************************/ -FAR void *mm_brkaddr(FAR struct mm_heap_s *heap, int region) +void *mm_brkaddr(struct mm_heap_s *heap, int region) { return NULL; } @@ -368,7 +368,7 @@ FAR void *mm_brkaddr(FAR struct mm_heap_s *heap, int region) * ****************************************************************************/ -void mm_extend(FAR struct mm_heap_s *heap, FAR void *mem, size_t size, +void mm_extend(struct mm_heap_s *heap, void *mem, size_t size, int region) { } @@ -381,7 +381,7 @@ void mm_extend(FAR struct mm_heap_s *heap, FAR void *mem, size_t size, * ****************************************************************************/ -int mm_mallinfo(FAR struct mm_heap_s *heap, FAR struct mallinfo *info) +int mm_mallinfo(struct mm_heap_s *heap, struct mallinfo *info) { memset(info, 0, sizeof(struct mallinfo)); host_mallinfo(&info->aordblks, &info->uordblks); @@ -396,7 +396,7 @@ int mm_mallinfo(FAR struct mm_heap_s *heap, FAR struct mallinfo *info) * ****************************************************************************/ -void mm_memdump(FAR struct mm_heap_s *heap, pid_t pid) +void mm_memdump(struct mm_heap_s *heap, pid_t pid) { } @@ -410,7 +410,7 @@ void mm_memdump(FAR struct mm_heap_s *heap, pid_t pid) * ****************************************************************************/ -void mm_checkcorruption(FAR struct mm_heap_s *heap) +void mm_checkcorruption(struct mm_heap_s *heap) { } @@ -420,7 +420,7 @@ void mm_checkcorruption(FAR struct mm_heap_s *heap) * Name: malloc_size ****************************************************************************/ -size_t mm_malloc_size(FAR void *mem) +size_t mm_malloc_size(void *mem) { return host_malloc_size(mem); } diff --git a/arch/sim/src/sim/up_initialize.c b/arch/sim/src/sim/up_initialize.c index 7b64098aba..55db76c153 100644 --- a/arch/sim/src/sim/up_initialize.c +++ b/arch/sim/src/sim/up_initialize.c @@ -50,12 +50,12 @@ static void up_init_smartfs(void) { #if defined(CONFIG_MTD_M25P) || defined(CONFIG_MTD_W25) || defined(CONFIG_MTD_SST26) - FAR struct mtd_dev_s *mtd; - FAR struct spi_dev_s *spi; + struct mtd_dev_s *mtd; + struct spi_dev_s *spi; int minor = 0; #endif #ifdef CONFIG_MTD_N25QXXX - FAR struct qspi_dev_s *qspi; + struct qspi_dev_s *qspi; #endif #ifdef CONFIG_SPI_FLASH @@ -138,7 +138,7 @@ static void up_init_smartfs(void) } #endif -static int up_loop_task(int argc, FAR char **argv) +static int up_loop_task(int argc, char **argv) { while (1) { diff --git a/arch/sim/src/sim/up_keyboard.c b/arch/sim/src/sim/up_keyboard.c index bc2636840c..413b124dfe 100644 --- a/arch/sim/src/sim/up_keyboard.c +++ b/arch/sim/src/sim/up_keyboard.c @@ -70,7 +70,7 @@ static struct up_dev_s g_simkeyboard; int sim_kbd_initialize(void) { int ret; - FAR struct up_dev_s *priv = &g_simkeyboard; + struct up_dev_s *priv = &g_simkeyboard; memset(priv, 0, sizeof(*priv)); @@ -96,7 +96,7 @@ int sim_kbd_initialize(void) void up_kbdevent(uint32_t key, bool is_press) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *) &g_simkeyboard; + struct up_dev_s *priv = (struct up_dev_s *) &g_simkeyboard; uint32_t types[2] = { KEYBOARD_RELEASE, KEYBOARD_PRESS diff --git a/arch/sim/src/sim/up_lcd.c b/arch/sim/src/sim/up_lcd.c index 812dfadd50..fa4cca758d 100644 --- a/arch/sim/src/sim/up_lcd.c +++ b/arch/sim/src/sim/up_lcd.c @@ -103,19 +103,19 @@ struct sim_dev_s /* LCD Data Transfer Methods */ static int sim_putrun(fb_coord_t row, fb_coord_t col, - FAR const uint8_t *buffer, size_t npixels); + const uint8_t *buffer, size_t npixels); static int sim_putarea(fb_coord_t row_start, fb_coord_t row_end, fb_coord_t col_start, fb_coord_t col_end, - FAR const uint8_t *buffer); -static int sim_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, + const uint8_t *buffer); +static int sim_getrun(fb_coord_t row, fb_coord_t col, uint8_t *buffer, size_t npixels); /* LCD Configuration */ -static int sim_getvideoinfo(FAR struct lcd_dev_s *dev, - FAR struct fb_videoinfo_s *vinfo); -static int sim_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, - FAR struct lcd_planeinfo_s *pinfo); +static int sim_getvideoinfo(struct lcd_dev_s *dev, + struct fb_videoinfo_s *vinfo); +static int sim_getplaneinfo(struct lcd_dev_s *dev, unsigned int planeno, + struct lcd_planeinfo_s *pinfo); /* LCD RGB Mapping */ @@ -178,7 +178,7 @@ static struct lcd_planeinfo_s g_planeinfo = .putarea = sim_putarea, /* Put a rectangular area to LCD */ .getrun = sim_getrun, /* Get a run from LCD memory */ #ifndef CONFIG_SIM_X11FB - .buffer = (FAR uint8_t *)g_runbuffer, /* Run scratch buffer */ + .buffer = (uint8_t *)g_runbuffer, /* Run scratch buffer */ #endif .bpp = CONFIG_SIM_FBBPP, /* Bits-per-pixel */ }; @@ -226,7 +226,7 @@ static struct sim_dev_s g_lcddev = ****************************************************************************/ static int sim_putrun(fb_coord_t row, fb_coord_t col, - FAR const uint8_t *buffer, size_t npixels) + const uint8_t *buffer, size_t npixels) { lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); @@ -255,7 +255,7 @@ static int sim_putrun(fb_coord_t row, fb_coord_t col, static int sim_putarea(fb_coord_t row_start, fb_coord_t row_end, fb_coord_t col_start, fb_coord_t col_end, - FAR const uint8_t *buffer) + const uint8_t *buffer) { fb_coord_t row; size_t rows; @@ -309,7 +309,7 @@ static int sim_putarea(fb_coord_t row_start, fb_coord_t row_end, * ****************************************************************************/ -static int sim_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, +static int sim_getrun(fb_coord_t row, fb_coord_t col, uint8_t *buffer, size_t npixels) { lcdinfo("row: %d col: %d npixels: %d\n", row, col, npixels); @@ -324,8 +324,8 @@ static int sim_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, * ****************************************************************************/ -static int sim_getvideoinfo(FAR struct lcd_dev_s *dev, - FAR struct fb_videoinfo_s *vinfo) +static int sim_getvideoinfo(struct lcd_dev_s *dev, + struct fb_videoinfo_s *vinfo) { DEBUGASSERT(dev && vinfo); ginfo("fmt: %d xres: %d yres: %d nplanes: %d\n", @@ -344,8 +344,8 @@ static int sim_getvideoinfo(FAR struct lcd_dev_s *dev, * ****************************************************************************/ -static int sim_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, - FAR struct lcd_planeinfo_s *pinfo) +static int sim_getplaneinfo(struct lcd_dev_s *dev, unsigned int planeno, + struct lcd_planeinfo_s *pinfo) { DEBUGASSERT(dev && pinfo && planeno == 0); ginfo("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); @@ -423,7 +423,7 @@ static int sim_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) ****************************************************************************/ #ifdef CONFIG_SIM_X11FB -static void up_updatework(FAR void *arg) +static void up_updatework(void *arg) { work_queue(LPWORK, &g_updatework, up_updatework, NULL, MSEC2TICK(33)); up_x11update(); @@ -474,7 +474,7 @@ int board_lcd_initialize(void) * ****************************************************************************/ -FAR struct lcd_dev_s *board_lcd_getdev(int lcddev) +struct lcd_dev_s *board_lcd_getdev(int lcddev) { DEBUGASSERT(lcddev == 0); return &g_lcddev.dev; diff --git a/arch/sim/src/sim/up_netdriver.c b/arch/sim/src/sim/up_netdriver.c index ac7df12b7a..728bd6a479 100644 --- a/arch/sim/src/sim/up_netdriver.c +++ b/arch/sim/src/sim/up_netdriver.c @@ -89,7 +89,7 @@ static struct net_driver_s g_sim_dev; * Private Functions ****************************************************************************/ -static void netdriver_reply(FAR struct net_driver_s *dev) +static void netdriver_reply(struct net_driver_s *dev) { /* If the receiving resulted in data that should be sent out on * the network, the field d_len is set to a value > 0. @@ -127,10 +127,10 @@ static void netdriver_reply(FAR struct net_driver_s *dev) } } -static void netdriver_recv_work(FAR void *arg) +static void netdriver_recv_work(void *arg) { - FAR struct net_driver_s *dev = arg; - FAR struct eth_hdr_s *eth; + struct net_driver_s *dev = arg; + struct eth_hdr_s *eth; net_lock(); @@ -144,7 +144,7 @@ static void netdriver_recv_work(FAR void *arg) * on a data received event */ - dev->d_len = netdev_read((FAR unsigned char *)dev->d_buf, + dev->d_len = netdev_read((unsigned char *)dev->d_buf, dev->d_pktsize); if (dev->d_len > 0) { @@ -154,7 +154,7 @@ static void netdriver_recv_work(FAR void *arg) * destination == our MAC address */ - eth = (FAR struct eth_hdr_s *)dev->d_buf; + eth = (struct eth_hdr_s *)dev->d_buf; if (dev->d_len > ETH_HDRLEN) { #ifdef CONFIG_NET_PKT @@ -240,7 +240,7 @@ static void netdriver_recv_work(FAR void *arg) net_unlock(); } -static int netdriver_txpoll(FAR struct net_driver_s *dev) +static int netdriver_txpoll(struct net_driver_s *dev) { /* If the polling resulted in data that should be sent out on the network, * the field d_len is set to a value > 0. @@ -287,9 +287,9 @@ static int netdriver_txpoll(FAR struct net_driver_s *dev) return 0; } -static void netdriver_timer_work(FAR void *arg) +static void netdriver_timer_work(void *arg) { - FAR struct net_driver_s *dev = arg; + struct net_driver_s *dev = arg; net_lock(); if (IFF_IS_UP(dev->d_flags)) @@ -301,7 +301,7 @@ static void netdriver_timer_work(FAR void *arg) net_unlock(); } -static int netdriver_ifup(FAR struct net_driver_s *dev) +static int netdriver_ifup(struct net_driver_s *dev) { netdev_ifup(dev->d_ipaddr); work_queue(LPWORK, &g_timer_work, netdriver_timer_work, dev, CLK_TCK); @@ -309,7 +309,7 @@ static int netdriver_ifup(FAR struct net_driver_s *dev) return OK; } -static int netdriver_ifdown(FAR struct net_driver_s *dev) +static int netdriver_ifdown(struct net_driver_s *dev) { netdev_carrier_off(dev); work_cancel(LPWORK, &g_timer_work); @@ -317,9 +317,9 @@ static int netdriver_ifdown(FAR struct net_driver_s *dev) return OK; } -static void netdriver_txavail_work(FAR void *arg) +static void netdriver_txavail_work(void *arg) { - FAR struct net_driver_s *dev = arg; + struct net_driver_s *dev = arg; net_lock(); if (IFF_IS_UP(dev->d_flags)) @@ -330,7 +330,7 @@ static void netdriver_txavail_work(FAR void *arg) net_unlock(); } -static int netdriver_txavail(FAR struct net_driver_s *dev) +static int netdriver_txavail(struct net_driver_s *dev) { if (work_available(&g_avail_work)) { @@ -340,20 +340,20 @@ static int netdriver_txavail(FAR struct net_driver_s *dev) return OK; } -static void netdriver_txdone_interrupt(FAR void *priv) +static void netdriver_txdone_interrupt(void *priv) { if (work_available(&g_avail_work)) { - FAR struct net_driver_s *dev = (FAR struct net_driver_s *)priv; + struct net_driver_s *dev = (struct net_driver_s *)priv; work_queue(LPWORK, &g_avail_work, netdriver_txavail_work, dev, 0); } } -static void netdriver_rxready_interrupt(FAR void *priv) +static void netdriver_rxready_interrupt(void *priv) { if (work_available(&g_recv_work)) { - FAR struct net_driver_s *dev = (FAR struct net_driver_s *)priv; + struct net_driver_s *dev = (struct net_driver_s *)priv; work_queue(LPWORK, &g_recv_work, netdriver_recv_work, dev, 0); } } @@ -364,7 +364,7 @@ static void netdriver_rxready_interrupt(FAR void *priv) int netdriver_init(void) { - FAR struct net_driver_s *dev = &g_sim_dev; + struct net_driver_s *dev = &g_sim_dev; void *pktbuf; int pktsize; diff --git a/arch/sim/src/sim/up_oneshot.c b/arch/sim/src/sim/up_oneshot.c index c0a8f2f5fd..c0dfbd84b7 100644 --- a/arch/sim/src/sim/up_oneshot.c +++ b/arch/sim/src/sim/up_oneshot.c @@ -61,8 +61,8 @@ struct sim_oneshot_lowerhalf_s sq_entry_t link; struct timespec alarm; - oneshot_callback_t callback; /* internal handler that receives callback */ - FAR void *arg; /* Argument that is passed to the handler */ + oneshot_callback_t callback; /* internal handler that receives callback */ + void *arg; /* Argument that is passed to the handler */ }; /**************************************************************************** @@ -71,15 +71,15 @@ struct sim_oneshot_lowerhalf_s static void sim_process_tick(sq_entry_t *entry); -static int sim_max_delay(FAR struct oneshot_lowerhalf_s *lower, - FAR struct timespec *ts); -static int sim_start(FAR struct oneshot_lowerhalf_s *lower, - oneshot_callback_t callback, FAR void *arg, - FAR const struct timespec *ts); -static int sim_cancel(FAR struct oneshot_lowerhalf_s *lower, - FAR struct timespec *ts); -static int sim_current(FAR struct oneshot_lowerhalf_s *lower, - FAR struct timespec *ts); +static int sim_max_delay(struct oneshot_lowerhalf_s *lower, + struct timespec *ts); +static int sim_start(struct oneshot_lowerhalf_s *lower, + oneshot_callback_t callback, void *arg, + const struct timespec *ts); +static int sim_cancel(struct oneshot_lowerhalf_s *lower, + struct timespec *ts); +static int sim_current(struct oneshot_lowerhalf_s *lower, + struct timespec *ts); /**************************************************************************** * Private Data @@ -109,7 +109,7 @@ static const struct oneshot_operations_s g_oneshot_ops = * ****************************************************************************/ -static inline void sim_timer_current(FAR struct timespec *ts) +static inline void sim_timer_current(struct timespec *ts) { uint64_t nsec; time_t sec; @@ -133,7 +133,7 @@ static inline void sim_timer_current(FAR struct timespec *ts) static void sim_timer_update(void) { - FAR sq_entry_t *entry; + sq_entry_t *entry; for (entry = sq_peek(&g_oneshot_list); entry; entry = sq_next(entry)) { @@ -157,10 +157,10 @@ static void sim_timer_update(void) static void sim_process_tick(sq_entry_t *entry) { - FAR struct sim_oneshot_lowerhalf_s *priv = + struct sim_oneshot_lowerhalf_s *priv = container_of(entry, struct sim_oneshot_lowerhalf_s, link); oneshot_callback_t callback; - FAR void *cbarg; + void *cbarg; DEBUGASSERT(priv != NULL); @@ -207,8 +207,8 @@ static void sim_process_tick(sq_entry_t *entry) * ****************************************************************************/ -static int sim_max_delay(FAR struct oneshot_lowerhalf_s *lower, - FAR struct timespec *ts) +static int sim_max_delay(struct oneshot_lowerhalf_s *lower, + struct timespec *ts) { DEBUGASSERT(ts != NULL); @@ -237,12 +237,12 @@ static int sim_max_delay(FAR struct oneshot_lowerhalf_s *lower, * ****************************************************************************/ -static int sim_start(FAR struct oneshot_lowerhalf_s *lower, - oneshot_callback_t callback, FAR void *arg, - FAR const struct timespec *ts) +static int sim_start(struct oneshot_lowerhalf_s *lower, + oneshot_callback_t callback, void *arg, + const struct timespec *ts) { - FAR struct sim_oneshot_lowerhalf_s *priv = - (FAR struct sim_oneshot_lowerhalf_s *)lower; + struct sim_oneshot_lowerhalf_s *priv = + (struct sim_oneshot_lowerhalf_s *)lower; struct timespec current; DEBUGASSERT(priv != NULL && callback != NULL && ts != NULL); @@ -280,11 +280,11 @@ static int sim_start(FAR struct oneshot_lowerhalf_s *lower, * ****************************************************************************/ -static int sim_cancel(FAR struct oneshot_lowerhalf_s *lower, - FAR struct timespec *ts) +static int sim_cancel(struct oneshot_lowerhalf_s *lower, + struct timespec *ts) { - FAR struct sim_oneshot_lowerhalf_s *priv = - (FAR struct sim_oneshot_lowerhalf_s *)lower; + struct sim_oneshot_lowerhalf_s *priv = + (struct sim_oneshot_lowerhalf_s *)lower; struct timespec current; DEBUGASSERT(priv != NULL && ts != NULL); @@ -317,8 +317,8 @@ static int sim_cancel(FAR struct oneshot_lowerhalf_s *lower, * ****************************************************************************/ -static int sim_current(FAR struct oneshot_lowerhalf_s *lower, - FAR struct timespec *ts) +static int sim_current(struct oneshot_lowerhalf_s *lower, + struct timespec *ts) { DEBUGASSERT(ts != NULL); @@ -342,7 +342,7 @@ static int sim_current(FAR struct oneshot_lowerhalf_s *lower, * ****************************************************************************/ -static int sim_alarm_handler(int irq, FAR void *context, FAR void *arg) +static int sim_alarm_handler(int irq, void *context, void *arg) { sim_timer_update(); return OK; @@ -372,14 +372,14 @@ static int sim_alarm_handler(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -FAR struct oneshot_lowerhalf_s *oneshot_initialize(int chan, +struct oneshot_lowerhalf_s *oneshot_initialize(int chan, uint16_t resolution) { - FAR struct sim_oneshot_lowerhalf_s *priv; + struct sim_oneshot_lowerhalf_s *priv; /* Allocate an instance of the lower half driver */ - priv = (FAR struct sim_oneshot_lowerhalf_s *) + priv = (struct sim_oneshot_lowerhalf_s *) kmm_zalloc(sizeof(struct sim_oneshot_lowerhalf_s)); if (priv == NULL) diff --git a/arch/sim/src/sim/up_releasepending.c b/arch/sim/src/sim/up_releasepending.c index 3f0ca8ec64..1e1352d514 100644 --- a/arch/sim/src/sim/up_releasepending.c +++ b/arch/sim/src/sim/up_releasepending.c @@ -50,7 +50,7 @@ void up_release_pending(void) { - FAR struct tcb_s *rtcb = this_task(); + struct tcb_s *rtcb = this_task(); sinfo("From TCB=%p\n", rtcb); diff --git a/arch/sim/src/sim/up_releasestack.c b/arch/sim/src/sim/up_releasestack.c index 1210e390c5..749cdd514b 100644 --- a/arch/sim/src/sim/up_releasestack.c +++ b/arch/sim/src/sim/up_releasestack.c @@ -58,7 +58,7 @@ * ****************************************************************************/ -void up_release_stack(FAR struct tcb_s *dtcb, uint8_t ttype) +void up_release_stack(struct tcb_s *dtcb, uint8_t ttype) { /* Is there a stack allocated? */ diff --git a/arch/sim/src/sim/up_reprioritizertr.c b/arch/sim/src/sim/up_reprioritizertr.c index 5b3a23228a..ca8858a0be 100644 --- a/arch/sim/src/sim/up_reprioritizertr.c +++ b/arch/sim/src/sim/up_reprioritizertr.c @@ -77,7 +77,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority) } else { - FAR struct tcb_s *rtcb = this_task(); + struct tcb_s *rtcb = this_task(); bool switch_needed; sinfo("TCB=%p PRI=%d\n", tcb, priority); diff --git a/arch/sim/src/sim/up_romgetc.c b/arch/sim/src/sim/up_romgetc.c index 01af4de2eb..c4cc3b5070 100644 --- a/arch/sim/src/sim/up_romgetc.c +++ b/arch/sim/src/sim/up_romgetc.c @@ -63,7 +63,7 @@ * ****************************************************************************/ -char up_romgetc(FAR const char *ptr) +char up_romgetc(const char *ptr) { /* This is basically a No-Op if enabled in the simulation environment */ diff --git a/arch/sim/src/sim/up_rtc.c b/arch/sim/src/sim/up_rtc.c index ac60b7f12e..15723086e0 100644 --- a/arch/sim/src/sim/up_rtc.c +++ b/arch/sim/src/sim/up_rtc.c @@ -35,11 +35,11 @@ * Private Function Prototypes ****************************************************************************/ -static int sim_rtc_rdtime(FAR struct rtc_lowerhalf_s *lower, - FAR struct rtc_time *rtctime); -static int sim_rtc_settime(FAR struct rtc_lowerhalf_s *lower, - FAR const struct rtc_time *rtctime); -static bool sim_rtc_havesettime(FAR struct rtc_lowerhalf_s *lower); +static int sim_rtc_rdtime(struct rtc_lowerhalf_s *lower, + struct rtc_time *rtctime); +static int sim_rtc_settime(struct rtc_lowerhalf_s *lower, + const struct rtc_time *rtctime); +static bool sim_rtc_havesettime(struct rtc_lowerhalf_s *lower); /**************************************************************************** * Private Data @@ -63,8 +63,8 @@ static int64_t g_sim_delta; * Private Functions ****************************************************************************/ -static int sim_rtc_rdtime(FAR struct rtc_lowerhalf_s *lower, - FAR struct rtc_time *rtctime) +static int sim_rtc_rdtime(struct rtc_lowerhalf_s *lower, + struct rtc_time *rtctime) { uint64_t nsec; time_t sec; @@ -74,16 +74,16 @@ static int sim_rtc_rdtime(FAR struct rtc_lowerhalf_s *lower, sec = nsec / NSEC_PER_SEC; nsec -= sec * NSEC_PER_SEC; - gmtime_r(&sec, (FAR struct tm *)rtctime); + gmtime_r(&sec, (struct tm *)rtctime); rtctime->tm_nsec = nsec; return OK; } -static int sim_rtc_settime(FAR struct rtc_lowerhalf_s *lower, - FAR const struct rtc_time *rtctime) +static int sim_rtc_settime(struct rtc_lowerhalf_s *lower, + const struct rtc_time *rtctime) { - g_sim_delta = timegm((FAR struct tm *)rtctime); + g_sim_delta = timegm((struct tm *)rtctime); g_sim_delta *= NSEC_PER_SEC; g_sim_delta += rtctime->tm_nsec; g_sim_delta -= host_gettime(true); @@ -91,7 +91,7 @@ static int sim_rtc_settime(FAR struct rtc_lowerhalf_s *lower, return OK; } -static bool sim_rtc_havesettime(FAR struct rtc_lowerhalf_s *lower) +static bool sim_rtc_havesettime(struct rtc_lowerhalf_s *lower) { return true; } @@ -123,7 +123,7 @@ static bool sim_rtc_havesettime(FAR struct rtc_lowerhalf_s *lower) int up_rtc_initialize(void) { - FAR struct rtc_lowerhalf_s *rtc = &g_sim_rtc; + struct rtc_lowerhalf_s *rtc = &g_sim_rtc; bool sync = true; #ifdef CONFIG_RTC_RPMSG_SERVER diff --git a/arch/sim/src/sim/up_smpsignal.c b/arch/sim/src/sim/up_smpsignal.c index ad12730336..42c39b3a66 100644 --- a/arch/sim/src/sim/up_smpsignal.c +++ b/arch/sim/src/sim/up_smpsignal.c @@ -71,7 +71,7 @@ static volatile spinlock_t g_cpu_paused[CONFIG_SMP_NCPUS]; * ****************************************************************************/ -static int sim_cpupause_handler(int irq, FAR void *context, FAR void *arg) +static int sim_cpupause_handler(int irq, void *context, void *arg) { int cpu = this_cpu(); @@ -221,7 +221,7 @@ __attribute__ ((visibility("default"))) void up_cpu_started(void) { #ifdef CONFIG_SCHED_INSTRUMENTATION - FAR struct tcb_s *tcb = this_task(); + struct tcb_s *tcb = this_task(); /* Notify that this CPU has started */ @@ -262,7 +262,7 @@ void up_cpu_started(void) int up_cpu_start(int cpu) { - FAR struct tcb_s *tcb = current_task(cpu); + struct tcb_s *tcb = current_task(cpu); #ifdef CONFIG_SCHED_INSTRUMENTATION /* Notify of the start event */ diff --git a/arch/sim/src/sim/up_stackframe.c b/arch/sim/src/sim/up_stackframe.c index 2640f16436..850bfc9690 100644 --- a/arch/sim/src/sim/up_stackframe.c +++ b/arch/sim/src/sim/up_stackframe.c @@ -69,9 +69,9 @@ * ****************************************************************************/ -FAR void *up_stack_frame(FAR struct tcb_s *tcb, size_t frame_size) +void *up_stack_frame(struct tcb_s *tcb, size_t frame_size) { - FAR void *ret; + void *ret; /* Align the frame_size */ @@ -89,7 +89,7 @@ FAR void *up_stack_frame(FAR struct tcb_s *tcb, size_t frame_size) /* Save the adjusted stack values in the struct tcb_s */ - tcb->stack_base_ptr = (FAR uint8_t *)tcb->stack_base_ptr + frame_size; + tcb->stack_base_ptr = (uint8_t *)tcb->stack_base_ptr + frame_size; tcb->adj_stack_size -= frame_size; /* And return a pointer to the allocated memory */ diff --git a/arch/sim/src/sim/up_touchscreen.c b/arch/sim/src/sim/up_touchscreen.c index df78612b85..c271d309ee 100644 --- a/arch/sim/src/sim/up_touchscreen.c +++ b/arch/sim/src/sim/up_touchscreen.c @@ -96,7 +96,7 @@ static struct up_dev_s g_simtouchscreen; int sim_tsc_initialize(int minor) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)&g_simtouchscreen; + struct up_dev_s *priv = (struct up_dev_s *)&g_simtouchscreen; char devname[DEV_NAMELEN]; int ret; @@ -150,7 +150,7 @@ int sim_tsc_initialize(int minor) int sim_tsc_uninitialize(void) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)&g_simtouchscreen; + struct up_dev_s *priv = (struct up_dev_s *)&g_simtouchscreen; char devname[DEV_NAMELEN]; /* Stop the event loop (Hmm.. the caller must be sure that there are no @@ -176,7 +176,7 @@ int sim_tsc_uninitialize(void) void up_buttonevent(int x, int y, int buttons) { - FAR struct up_dev_s *priv = (FAR struct up_dev_s *)&g_simtouchscreen; + struct up_dev_s *priv = (struct up_dev_s *)&g_simtouchscreen; struct touch_sample_s sample; /* Sampled touch point data */ bool pendown; /* true: pen is down */ diff --git a/arch/sim/src/sim/up_uart.c b/arch/sim/src/sim/up_uart.c index 7b8d773d05..545e49a6e3 100644 --- a/arch/sim/src/sim/up_uart.c +++ b/arch/sim/src/sim/up_uart.c @@ -48,7 +48,7 @@ struct tty_priv_s { /* tty-port path name */ - FAR const char *path; + const char *path; /* The file descriptor. It is returned by open */ @@ -59,21 +59,21 @@ struct tty_priv_s * Private Function Prototypes ****************************************************************************/ -static int tty_setup(FAR struct uart_dev_s *dev); -static void tty_shutdown(FAR struct uart_dev_s *dev); -static int tty_attach(FAR struct uart_dev_s *dev); -static void tty_detach(FAR struct uart_dev_s *dev); -static int tty_ioctl(FAR struct file *filep, int cmd, +static int tty_setup(struct uart_dev_s *dev); +static void tty_shutdown(struct uart_dev_s *dev); +static int tty_attach(struct uart_dev_s *dev); +static void tty_detach(struct uart_dev_s *dev); +static int tty_ioctl(struct file *filep, int cmd, unsigned long arg); -static int tty_receive(FAR struct uart_dev_s *dev, uint32_t *status); -static void tty_rxint(FAR struct uart_dev_s *dev, bool enable); -static bool tty_rxavailable(FAR struct uart_dev_s *dev); -static bool tty_rxflowcontrol(FAR struct uart_dev_s *dev, +static int tty_receive(struct uart_dev_s *dev, uint32_t *status); +static void tty_rxint(struct uart_dev_s *dev, bool enable); +static bool tty_rxavailable(struct uart_dev_s *dev); +static bool tty_rxflowcontrol(struct uart_dev_s *dev, unsigned int nbuffered, bool upper); -static void tty_send(FAR struct uart_dev_s *dev, int ch); -static void tty_txint(FAR struct uart_dev_s *dev, bool enable); -static bool tty_txready(FAR struct uart_dev_s *dev); -static bool tty_txempty(FAR struct uart_dev_s *dev); +static void tty_send(struct uart_dev_s *dev, int ch); +static void tty_txint(struct uart_dev_s *dev, bool enable); +static bool tty_txready(struct uart_dev_s *dev); +static bool tty_txempty(struct uart_dev_s *dev); /**************************************************************************** * Private Data @@ -251,9 +251,9 @@ static struct uart_dev_s g_tty3_dev = * ****************************************************************************/ -static int tty_setup(FAR struct uart_dev_s *dev) +static int tty_setup(struct uart_dev_s *dev) { - FAR struct tty_priv_s *priv = dev->priv; + struct tty_priv_s *priv = dev->priv; if (!dev->isconsole && priv->fd < 0) { @@ -278,7 +278,7 @@ static int tty_setup(FAR struct uart_dev_s *dev) static void tty_shutdown(struct uart_dev_s *dev) { - FAR struct tty_priv_s *priv = dev->priv; + struct tty_priv_s *priv = dev->priv; if (!dev->isconsole && priv->fd >= 0) { @@ -320,7 +320,7 @@ static int tty_attach(struct uart_dev_s *dev) * ****************************************************************************/ -static void tty_detach(FAR struct uart_dev_s *dev) +static void tty_detach(struct uart_dev_s *dev) { } @@ -335,10 +335,10 @@ static void tty_detach(FAR struct uart_dev_s *dev) static int tty_ioctl(struct file *filep, int cmd, unsigned long arg) { #ifdef CONFIG_SERIAL_TERMIOS - FAR struct inode *inode = filep->f_inode; - FAR struct uart_dev_s *dev = inode->i_private; - FAR struct tty_priv_s *priv = dev->priv; - FAR struct termios *termiosp = (FAR struct termios *)(uintptr_t)arg; + struct inode *inode = filep->f_inode; + struct uart_dev_s *dev = inode->i_private; + struct tty_priv_s *priv = dev->priv; + struct termios *termiosp = (struct termios *)(uintptr_t)arg; if (!termiosp) { @@ -372,7 +372,7 @@ static int tty_ioctl(struct file *filep, int cmd, unsigned long arg) static int tty_receive(struct uart_dev_s *dev, uint32_t *status) { - FAR struct tty_priv_s *priv = dev->priv; + struct tty_priv_s *priv = dev->priv; *status = 0; return simuart_getc(dev->isconsole ? 0 : priv->fd); @@ -400,7 +400,7 @@ static void tty_rxint(struct uart_dev_s *dev, bool enable) static bool tty_rxavailable(struct uart_dev_s *dev) { - FAR struct tty_priv_s *priv = dev->priv; + struct tty_priv_s *priv = dev->priv; return simuart_checkc(dev->isconsole ? 0 : priv->fd); } @@ -414,10 +414,10 @@ static bool tty_rxavailable(struct uart_dev_s *dev) * ****************************************************************************/ -static bool tty_rxflowcontrol(FAR struct uart_dev_s *dev, +static bool tty_rxflowcontrol(struct uart_dev_s *dev, unsigned int nbuffered, bool upper) { - FAR struct uart_buffer_s *rxbuf = &dev->recv; + struct uart_buffer_s *rxbuf = &dev->recv; if (nbuffered == rxbuf->size) { @@ -437,7 +437,7 @@ static bool tty_rxflowcontrol(FAR struct uart_dev_s *dev, static void tty_send(struct uart_dev_s *dev, int ch) { - FAR struct tty_priv_s *priv = dev->priv; + struct tty_priv_s *priv = dev->priv; /* For console device */ diff --git a/arch/sim/src/sim/up_unblocktask.c b/arch/sim/src/sim/up_unblocktask.c index 1c903b957a..7f5474e23c 100644 --- a/arch/sim/src/sim/up_unblocktask.c +++ b/arch/sim/src/sim/up_unblocktask.c @@ -54,9 +54,9 @@ * ****************************************************************************/ -void up_unblock_task(FAR struct tcb_s *tcb) +void up_unblock_task(struct tcb_s *tcb) { - FAR struct tcb_s *rtcb = this_task(); + struct tcb_s *rtcb = this_task(); /* Verify that the context switch can be performed */ diff --git a/arch/sim/src/sim/up_usestack.c b/arch/sim/src/sim/up_usestack.c index 1c23d4719a..8d3ffa8889 100644 --- a/arch/sim/src/sim/up_usestack.c +++ b/arch/sim/src/sim/up_usestack.c @@ -66,7 +66,7 @@ * ****************************************************************************/ -int up_use_stack(FAR struct tcb_s *tcb, FAR void *stack, size_t stack_size) +int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size) { #if CONFIG_SIM_STACKSIZE_ADJUSTMENT == 0 uintptr_t top_of_stack; diff --git a/arch/sim/src/sim/up_usrsock.c b/arch/sim/src/sim/up_usrsock.c index 6381d77e2b..846f8f1d70 100644 --- a/arch/sim/src/sim/up_usrsock.c +++ b/arch/sim/src/sim/up_usrsock.c @@ -56,8 +56,8 @@ struct usrsock_s * Private Function Prototypes ****************************************************************************/ -typedef int (*usrsock_handler_t)(FAR struct usrsock_s *usrsock, - FAR const void *data, size_t len); +typedef int (*usrsock_handler_t)(struct usrsock_s *usrsock, + const void *data, size_t len); /**************************************************************************** * Private Data @@ -69,10 +69,10 @@ static struct usrsock_s g_usrsock; * Private Functions ****************************************************************************/ -static int usrsock_send(FAR struct usrsock_s *usrsock, - FAR const void *buf, size_t len) +static int usrsock_send(struct usrsock_s *usrsock, + const void *buf, size_t len) { - FAR uint8_t *data = (FAR uint8_t *)buf; + uint8_t *data = (uint8_t *)buf; ssize_t ret; while (len > 0) @@ -90,7 +90,7 @@ static int usrsock_send(FAR struct usrsock_s *usrsock, return 0; } -static int usrsock_send_ack(FAR struct usrsock_s *usrsock, +static int usrsock_send_ack(struct usrsock_s *usrsock, uint64_t xid, int32_t result) { struct usrsock_message_req_ack_s ack; @@ -104,8 +104,8 @@ static int usrsock_send_ack(FAR struct usrsock_s *usrsock, return usrsock_send(usrsock, &ack, sizeof(ack)); } -static int usrsock_send_dack(FAR struct usrsock_s *usrsock, - FAR struct usrsock_message_datareq_ack_s *ack, +static int usrsock_send_dack(struct usrsock_s *usrsock, + struct usrsock_message_datareq_ack_s *ack, uint64_t xid, int32_t result, uint16_t valuelen, uint16_t valuelen_nontrunc) @@ -133,7 +133,7 @@ static int usrsock_send_dack(FAR struct usrsock_s *usrsock, return usrsock_send(usrsock, ack, sizeof(*ack) + valuelen + result); } -static int usrsock_send_event(FAR struct usrsock_s *usrsock, +static int usrsock_send_event(struct usrsock_s *usrsock, int16_t usockid, uint16_t events) { struct usrsock_message_socket_event_s event; @@ -147,10 +147,10 @@ static int usrsock_send_event(FAR struct usrsock_s *usrsock, return usrsock_send(usrsock, &event, sizeof(event)); } -static int usrsock_socket_handler(FAR struct usrsock_s *usrsock, - FAR const void *data, size_t len) +static int usrsock_socket_handler(struct usrsock_s *usrsock, + const void *data, size_t len) { - FAR const struct usrsock_request_socket_s *req = data; + const struct usrsock_request_socket_s *req = data; int fd = usrsock_host_socket(req->domain, req->type, req->protocol); int ret = usrsock_send_ack(usrsock, req->head.xid, fd); @@ -162,35 +162,35 @@ static int usrsock_socket_handler(FAR struct usrsock_s *usrsock, return ret; } -static int usrsock_close_handler(FAR struct usrsock_s *usrsock, - FAR const void *data, size_t len) +static int usrsock_close_handler(struct usrsock_s *usrsock, + const void *data, size_t len) { - FAR const struct usrsock_request_close_s *req = data; + const struct usrsock_request_close_s *req = data; int ret = usrsock_host_close(req->usockid); return usrsock_send_ack(usrsock, req->head.xid, ret); } -static int usrsock_connect_handler(FAR struct usrsock_s *usrsock, - FAR const void *data, size_t len) +static int usrsock_connect_handler(struct usrsock_s *usrsock, + const void *data, size_t len) { - FAR const struct usrsock_request_connect_s *req = data; + const struct usrsock_request_connect_s *req = data; int ret = usrsock_host_connect(req->usockid, - (FAR const struct sockaddr *)(req + 1), + (const struct sockaddr *)(req + 1), req->addrlen); return usrsock_send_ack(usrsock, req->head.xid, ret); } -static int usrsock_sendto_handler(FAR struct usrsock_s *usrsock, - FAR const void *data, size_t len) +static int usrsock_sendto_handler(struct usrsock_s *usrsock, + const void *data, size_t len) { - FAR const struct usrsock_request_sendto_s *req = data; + const struct usrsock_request_sendto_s *req = data; int ret = usrsock_host_sendto(req->usockid, - (FAR const void *)(req + 1) + req->addrlen, + (const void *)(req + 1) + req->addrlen, req->buflen, req->flags, req->addrlen ? - (FAR const struct sockaddr *)(req + 1) : + (const struct sockaddr *)(req + 1) : NULL, req->addrlen); bool sent = (ret > 0); @@ -204,11 +204,11 @@ static int usrsock_sendto_handler(FAR struct usrsock_s *usrsock, return ret; } -static int usrsock_recvfrom_handler(FAR struct usrsock_s *usrsock, - FAR const void *data, size_t len) +static int usrsock_recvfrom_handler(struct usrsock_s *usrsock, + const void *data, size_t len) { - FAR const struct usrsock_request_recvfrom_s *req = data; - FAR struct usrsock_message_datareq_ack_s *ack; + const struct usrsock_request_recvfrom_s *req = data; + struct usrsock_message_datareq_ack_s *ack; socklen_t outaddrlen = req->max_addrlen; socklen_t inaddrlen = req->max_addrlen; size_t buflen = req->max_buflen; @@ -221,40 +221,40 @@ static int usrsock_recvfrom_handler(FAR struct usrsock_s *usrsock, } ret = usrsock_host_recvfrom(req->usockid, - (FAR void *)(ack + 1) + inaddrlen, + (void *)(ack + 1) + inaddrlen, buflen, req->flags, outaddrlen ? - (FAR struct sockaddr *)(ack + 1) : NULL, + (struct sockaddr *)(ack + 1) : NULL, outaddrlen ? &outaddrlen : NULL); if (ret > 0 && outaddrlen < inaddrlen) { - memcpy((FAR void *)(ack + 1) + outaddrlen, - (FAR void *)(ack + 1) + inaddrlen, ret); + memcpy((void *)(ack + 1) + outaddrlen, + (void *)(ack + 1) + inaddrlen, ret); } return usrsock_send_dack(usrsock, ack, req->head.xid, ret, inaddrlen, outaddrlen); } -static int usrsock_setsockopt_handler(FAR struct usrsock_s *usrsock, - FAR const void *data, size_t len) +static int usrsock_setsockopt_handler(struct usrsock_s *usrsock, + const void *data, size_t len) { - FAR const struct usrsock_request_setsockopt_s *req = data; + const struct usrsock_request_setsockopt_s *req = data; int ret = usrsock_host_setsockopt(req->usockid, req->level, req->option, req + 1, req->valuelen); return usrsock_send_ack(usrsock, req->head.xid, ret); } -static int usrsock_getsockopt_handler(FAR struct usrsock_s *usrsock, - FAR const void *data, size_t len) +static int usrsock_getsockopt_handler(struct usrsock_s *usrsock, + const void *data, size_t len) { - FAR const struct usrsock_request_getsockopt_s *req = data; - FAR struct usrsock_message_datareq_ack_s *ack; + const struct usrsock_request_getsockopt_s *req = data; + struct usrsock_message_datareq_ack_s *ack; socklen_t optlen = req->max_valuelen; int ret; - ack = (FAR struct usrsock_message_datareq_ack_s *)usrsock->out; + ack = (struct usrsock_message_datareq_ack_s *)usrsock->out; ret = usrsock_host_getsockopt(req->usockid, req->level, req->option, ack + 1, &optlen); @@ -263,74 +263,74 @@ static int usrsock_getsockopt_handler(FAR struct usrsock_s *usrsock, ret, optlen, optlen); } -static int usrsock_getsockname_handler(FAR struct usrsock_s *usrsock, - FAR const void *data, size_t len) +static int usrsock_getsockname_handler(struct usrsock_s *usrsock, + const void *data, size_t len) { - FAR const struct usrsock_request_getsockname_s *req = data; - FAR struct usrsock_message_datareq_ack_s *ack; + const struct usrsock_request_getsockname_s *req = data; + struct usrsock_message_datareq_ack_s *ack; socklen_t outaddrlen = req->max_addrlen; socklen_t inaddrlen = req->max_addrlen; int ret; - ack = (FAR struct usrsock_message_datareq_ack_s *)usrsock->out; + ack = (struct usrsock_message_datareq_ack_s *)usrsock->out; ret = usrsock_host_getsockname(req->usockid, - (FAR struct sockaddr *)(ack + 1), &outaddrlen); + (struct sockaddr *)(ack + 1), &outaddrlen); return usrsock_send_dack(usrsock, ack, req->head.xid, ret, inaddrlen, outaddrlen); } -static int usrsock_getpeername_handler(FAR struct usrsock_s *usrsock, - FAR const void *data, size_t len) +static int usrsock_getpeername_handler(struct usrsock_s *usrsock, + const void *data, size_t len) { - FAR const struct usrsock_request_getpeername_s *req = data; - FAR struct usrsock_message_datareq_ack_s *ack; + const struct usrsock_request_getpeername_s *req = data; + struct usrsock_message_datareq_ack_s *ack; socklen_t outaddrlen = req->max_addrlen; socklen_t inaddrlen = req->max_addrlen; int ret; - ack = (FAR struct usrsock_message_datareq_ack_s *)usrsock->out; + ack = (struct usrsock_message_datareq_ack_s *)usrsock->out; ret = usrsock_host_getpeername(req->usockid, - (FAR struct sockaddr *)(ack + 1), &outaddrlen); + (struct sockaddr *)(ack + 1), &outaddrlen); return usrsock_send_dack(usrsock, ack, req->head.xid, ret, inaddrlen, outaddrlen); } -static int usrsock_bind_handler(FAR struct usrsock_s *usrsock, - FAR const void *data, size_t len) +static int usrsock_bind_handler(struct usrsock_s *usrsock, + const void *data, size_t len) { - FAR const struct usrsock_request_bind_s *req = data; + const struct usrsock_request_bind_s *req = data; int ret = usrsock_host_bind(req->usockid, - (FAR const struct sockaddr *)(req + 1), + (const struct sockaddr *)(req + 1), req->addrlen); return usrsock_send_ack(usrsock, req->head.xid, ret); } -static int usrsock_listen_handler(FAR struct usrsock_s *usrsock, - FAR const void *data, size_t len) +static int usrsock_listen_handler(struct usrsock_s *usrsock, + const void *data, size_t len) { - FAR const struct usrsock_request_listen_s *req = data; + const struct usrsock_request_listen_s *req = data; int ret = usrsock_host_listen(req->usockid, req->backlog); return usrsock_send_ack(usrsock, req->head.xid, ret); } -static int usrsock_accept_handler(FAR struct usrsock_s *usrsock, - FAR const void *data, size_t len) +static int usrsock_accept_handler(struct usrsock_s *usrsock, + const void *data, size_t len) { - FAR const struct usrsock_request_accept_s *req = data; - FAR struct usrsock_message_datareq_ack_s *ack; + const struct usrsock_request_accept_s *req = data; + struct usrsock_message_datareq_ack_s *ack; socklen_t outaddrlen = req->max_addrlen; socklen_t inaddrlen = req->max_addrlen; int sockfd; int ret; - ack = (FAR struct usrsock_message_datareq_ack_s *)usrsock->out; + ack = (struct usrsock_message_datareq_ack_s *)usrsock->out; sockfd = usrsock_host_accept(req->usockid, outaddrlen ? - (FAR struct sockaddr *)(ack + 1) : NULL, + (struct sockaddr *)(ack + 1) : NULL, outaddrlen ? &outaddrlen : NULL); if (sockfd >= 0) { @@ -338,11 +338,11 @@ static int usrsock_accept_handler(FAR struct usrsock_s *usrsock, if (outaddrlen <= inaddrlen) { - *(FAR int16_t *)((FAR void *)(ack + 1) + outaddrlen) = sockfd; + *(int16_t *)((void *)(ack + 1) + outaddrlen) = sockfd; } else { - *(FAR int16_t *)((FAR void *)(ack + 1) + inaddrlen) = sockfd; + *(int16_t *)((void *)(ack + 1) + inaddrlen) = sockfd; } ret = sizeof(int16_t); /* Return usockid size */ @@ -362,14 +362,14 @@ static int usrsock_accept_handler(FAR struct usrsock_s *usrsock, return ret; } -static int usrsock_ioctl_handler(FAR struct usrsock_s *usrsock, - FAR const void *data, size_t len) +static int usrsock_ioctl_handler(struct usrsock_s *usrsock, + const void *data, size_t len) { - FAR const struct usrsock_request_ioctl_s *req = data; - FAR struct usrsock_message_datareq_ack_s *ack; + const struct usrsock_request_ioctl_s *req = data; + struct usrsock_message_datareq_ack_s *ack; int ret; - ack = (FAR struct usrsock_message_datareq_ack_s *)usrsock->out; + ack = (struct usrsock_message_datareq_ack_s *)usrsock->out; memcpy(ack + 1, req + 1, req->arglen); ret = usrsock_host_ioctl(req->usockid, req->cmd, (unsigned long)(ack + 1)); @@ -412,7 +412,7 @@ int usrsock_init(void) void usrsock_loop(void) { - FAR struct usrsock_request_common_s *common; + struct usrsock_request_common_s *common; int ret; struct pollfd pfd = { @@ -426,7 +426,7 @@ void usrsock_loop(void) ret = file_read(&g_usrsock.usock, g_usrsock.in, sizeof(g_usrsock.in)); if (ret > 0) { - common = (FAR struct usrsock_request_common_s *)g_usrsock.in; + common = (struct usrsock_request_common_s *)g_usrsock.in; if (common->reqid >= 0 && common->reqid < USRSOCK_REQUEST__MAX) diff --git a/boards/sim/sim/sim/src/sim_bringup.c b/boards/sim/sim/sim/src/sim_bringup.c index 4e3a044918..0643277664 100644 --- a/boards/sim/sim/sim/src/sim_bringup.c +++ b/boards/sim/sim/sim/src/sim_bringup.c @@ -89,19 +89,19 @@ void rpmsg_serialinit(void) int sim_bringup(void) { #ifdef CONFIG_ONESHOT - FAR struct oneshot_lowerhalf_s *oneshot; + struct oneshot_lowerhalf_s *oneshot; #endif #ifdef CONFIG_RAMMTD - FAR uint8_t *ramstart; + uint8_t *ramstart; #endif #ifdef CONFIG_SIM_I2CBUS - FAR struct i2c_master_s *i2cbus; + struct i2c_master_s *i2cbus; #endif #ifdef CONFIG_MPU60X0_I2C - FAR struct mpu_config_s *mpu_config; + struct mpu_config_s *mpu_config; #endif #ifdef CONFIG_SIM_SPI - FAR struct spi_dev_s *spidev; + struct spi_dev_s *spidev; #endif int ret = OK; @@ -152,7 +152,7 @@ int sim_bringup(void) #ifdef CONFIG_RAMMTD /* Create a RAM MTD device if configured */ - ramstart = (FAR uint8_t *)kmm_malloc(128 * 1024); + ramstart = (uint8_t *)kmm_malloc(128 * 1024); if (ramstart == NULL) { syslog(LOG_ERR, "ERROR: Allocation for RAM MTD failed\n"); @@ -161,7 +161,7 @@ int sim_bringup(void) { /* Initialized the RAM MTD */ - FAR struct mtd_dev_s *mtd = rammtd_initialize(ramstart, 128 * 1024); + struct mtd_dev_s *mtd = rammtd_initialize(ramstart, 128 * 1024); if (mtd == NULL) { syslog(LOG_ERR, "ERROR: rammtd_initialize failed\n"); diff --git a/boards/sim/sim/sim/src/sim_buttons.c b/boards/sim/sim/sim/src/sim_buttons.c index d59303d484..478f8e7d6f 100644 --- a/boards/sim/sim/sim/src/sim_buttons.c +++ b/boards/sim/sim/sim/src/sim_buttons.c @@ -46,7 +46,7 @@ uint32_t g_buttons = 0; xcpt_t g_handler = NULL; -FAR void *g_arg = 0; +void *g_arg = 0; /**************************************************************************** * Public Data @@ -111,7 +111,7 @@ uint32_t board_buttons(void) ****************************************************************************/ #ifdef CONFIG_ARCH_IRQBUTTONS -int board_button_irq(int id, xcpt_t irqhandler, FAR void *arg) +int board_button_irq(int id, xcpt_t irqhandler, void *arg) { int ret = -EINVAL; diff --git a/boards/sim/sim/sim/src/sim_foc.c b/boards/sim/sim/sim/src/sim_foc.c index 36080555f4..bc3c820321 100644 --- a/boards/sim/sim/sim/src/sim_foc.c +++ b/boards/sim/sim/sim/src/sim_foc.c @@ -56,7 +56,7 @@ int sim_foc_setup(void) { - FAR struct foc_dev_s *foc[CONFIG_MOTOR_FOC_INST]; + struct foc_dev_s *foc[CONFIG_MOTOR_FOC_INST]; static bool initialized = false; int ret = OK; int i = 0; diff --git a/boards/sim/sim/sim/src/sim_gpio.c b/boards/sim/sim/sim/src/sim_gpio.c index 4cdb76ad64..dd0a3dfe0a 100644 --- a/boards/sim/sim/sim/src/sim_gpio.c +++ b/boards/sim/sim/sim/src/sim_gpio.c @@ -58,11 +58,11 @@ struct simgpint_dev_s * Private Function Prototypes ****************************************************************************/ -static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value); -static int gpout_write(FAR struct gpio_dev_s *dev, bool value); -static int gpint_attach(FAR struct gpio_dev_s *dev, +static int gpin_read(struct gpio_dev_s *dev, bool *value); +static int gpout_write(struct gpio_dev_s *dev, bool value); +static int gpint_attach(struct gpio_dev_s *dev, pin_interrupt_t callback); -static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable); +static int gpint_enable(struct gpio_dev_s *dev, bool enable); /**************************************************************************** * Private Data @@ -131,7 +131,7 @@ static struct simgpint_dev_s g_gpint = static int sim_interrupt(wdparm_t arg) { - FAR struct simgpint_dev_s *simgpint = (FAR struct simgpint_dev_s *)arg; + struct simgpint_dev_s *simgpint = (struct simgpint_dev_s *)arg; DEBUGASSERT(simgpint != NULL && simgpint->callback != NULL); gpioinfo("Interrupt! callback=%p\n", simgpint->callback); @@ -140,9 +140,9 @@ static int sim_interrupt(wdparm_t arg) return OK; } -static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value) +static int gpin_read(struct gpio_dev_s *dev, bool *value) { - FAR struct simgpio_dev_s *simgpio = (FAR struct simgpio_dev_s *)dev; + struct simgpio_dev_s *simgpio = (struct simgpio_dev_s *)dev; DEBUGASSERT(simgpio != NULL && value != NULL); gpioinfo("Reading %d (next=%d)\n", @@ -153,9 +153,9 @@ static int gpin_read(FAR struct gpio_dev_s *dev, FAR bool *value) return OK; } -static int gpout_write(FAR struct gpio_dev_s *dev, bool value) +static int gpout_write(struct gpio_dev_s *dev, bool value) { - FAR struct simgpio_dev_s *simgpio = (FAR struct simgpio_dev_s *)dev; + struct simgpio_dev_s *simgpio = (struct simgpio_dev_s *)dev; DEBUGASSERT(simgpio != NULL); gpioinfo("Writing %d\n", (int)value); @@ -164,10 +164,10 @@ static int gpout_write(FAR struct gpio_dev_s *dev, bool value) return OK; } -static int gpint_attach(FAR struct gpio_dev_s *dev, +static int gpint_attach(struct gpio_dev_s *dev, pin_interrupt_t callback) { - FAR struct simgpint_dev_s *simgpint = (FAR struct simgpint_dev_s *)dev; + struct simgpint_dev_s *simgpint = (struct simgpint_dev_s *)dev; gpioinfo("Cancel 1 second timer\n"); wd_cancel(&simgpint->wdog); @@ -177,9 +177,9 @@ static int gpint_attach(FAR struct gpio_dev_s *dev, return OK; } -static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable) +static int gpint_enable(struct gpio_dev_s *dev, bool enable) { - FAR struct simgpint_dev_s *simgpint = (FAR struct simgpint_dev_s *)dev; + struct simgpint_dev_s *simgpint = (struct simgpint_dev_s *)dev; if (enable) { diff --git a/boards/sim/sim/sim/src/sim_ioexpander.c b/boards/sim/sim/sim/src/sim_ioexpander.c index 4014597f37..ad71041305 100644 --- a/boards/sim/sim/sim/src/sim_ioexpander.c +++ b/boards/sim/sim/sim/src/sim_ioexpander.c @@ -50,7 +50,7 @@ int sim_gpio_initialize(void) { /* Get an instance of the simulated I/O expander */ - FAR struct ioexpander_dev_s *ioe = ioe_dummy_initialize(); + struct ioexpander_dev_s *ioe = ioe_dummy_initialize(); if (ioe == NULL) { gpioerr("ERROR: ioe_dummy_initialize failed\n"); @@ -63,36 +63,36 @@ int sim_gpio_initialize(void) IOEXP_SETDIRECTION(ioe, 0, IOEXPANDER_DIRECTION_IN); IOEXP_SETOPTION(ioe, 0, IOEXPANDER_OPTION_INVERT, - (FAR void *)IOEXPANDER_VAL_NORMAL); + (void *)IOEXPANDER_VAL_NORMAL); IOEXP_SETOPTION(ioe, 0, IOEXPANDER_OPTION_INTCFG, - (FAR void *)IOEXPANDER_VAL_DISABLE); + (void *)IOEXPANDER_VAL_DISABLE); gpio_lower_half(ioe, 0, GPIO_INPUT_PIN, 0); /* Pin 1: an non-inverted, output pin */ IOEXP_SETDIRECTION(ioe, 1, IOEXPANDER_DIRECTION_OUT); IOEXP_SETOPTION(ioe, 1, IOEXPANDER_OPTION_INVERT, - (FAR void *)IOEXPANDER_VAL_NORMAL); + (void *)IOEXPANDER_VAL_NORMAL); IOEXP_SETOPTION(ioe, 2, IOEXPANDER_OPTION_INTCFG, - (FAR void *)IOEXPANDER_VAL_DISABLE); + (void *)IOEXPANDER_VAL_DISABLE); gpio_lower_half(ioe, 1, GPIO_OUTPUT_PIN, 1); /* Pin 2: an non-inverted, edge interrupting pin */ IOEXP_SETDIRECTION(ioe, 2, IOEXPANDER_DIRECTION_IN); IOEXP_SETOPTION(ioe, 2, IOEXPANDER_OPTION_INVERT, - (FAR void *)IOEXPANDER_VAL_NORMAL); + (void *)IOEXPANDER_VAL_NORMAL); IOEXP_SETOPTION(ioe, 2, IOEXPANDER_OPTION_INTCFG, - (FAR void *)IOEXPANDER_VAL_BOTH); + (void *)IOEXPANDER_VAL_BOTH); gpio_lower_half(ioe, 2, GPIO_INTERRUPT_PIN, 2); /* Pin 3: a non-inverted, level interrupting pin */ IOEXP_SETDIRECTION(ioe, 3, IOEXPANDER_DIRECTION_IN); IOEXP_SETOPTION(ioe, 3, IOEXPANDER_OPTION_INVERT, - (FAR void *)IOEXPANDER_VAL_NORMAL); + (void *)IOEXPANDER_VAL_NORMAL); IOEXP_SETOPTION(ioe, 3, IOEXPANDER_OPTION_INTCFG, - (FAR void *)IOEXPANDER_VAL_HIGH); + (void *)IOEXPANDER_VAL_HIGH); gpio_lower_half(ioe, 3, GPIO_INTERRUPT_PIN, 3); return 0;
