You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/04/17 15:42:51 UTC
[incubator-nuttx] 06/08: arch/misoc: Remove FAR from chip folder
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 1ce592e8b5da19363cc2163329dc10b2c771d7e1
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Apr 17 20:47:35 2022 +0800
arch/misoc: Remove FAR from chip folder
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/misoc/src/common/misoc_net.c | 114 +++++++++++++-------------
arch/misoc/src/common/misoc_serial.c | 4 +-
arch/misoc/src/lm32/lm32.h | 2 +-
arch/misoc/src/lm32/lm32_allocateheap.c | 4 +-
arch/misoc/src/lm32/lm32_assert.c | 4 +-
arch/misoc/src/lm32/lm32_createstack.c | 2 +-
arch/misoc/src/lm32/lm32_dumpstate.c | 2 +-
arch/misoc/src/lm32/lm32_exit.c | 4 +-
arch/misoc/src/lm32/lm32_releasestack.c | 2 +-
arch/misoc/src/lm32/lm32_stackframe.c | 6 +-
arch/misoc/src/lm32/lm32_swint.c | 4 +-
arch/misoc/src/minerva/minerva.h | 2 +-
arch/misoc/src/minerva/minerva_allocateheap.c | 4 +-
arch/misoc/src/minerva/minerva_assert.c | 4 +-
arch/misoc/src/minerva/minerva_createstack.c | 2 +-
arch/misoc/src/minerva/minerva_dumpstate.c | 2 +-
arch/misoc/src/minerva/minerva_exit.c | 4 +-
arch/misoc/src/minerva/minerva_releasestack.c | 2 +-
arch/misoc/src/minerva/minerva_stackframe.c | 6 +-
arch/misoc/src/minerva/minerva_swint.c | 4 +-
20 files changed, 89 insertions(+), 89 deletions(-)
diff --git a/arch/misoc/src/common/misoc_net.c b/arch/misoc/src/common/misoc_net.c
index d715e2c728..832b98c9bc 100644
--- a/arch/misoc/src/common/misoc_net.c
+++ b/arch/misoc/src/common/misoc_net.c
@@ -88,7 +88,7 @@
/* This is a helper pointer for accessing the contents of Ethernet header */
-#define BUF ((FAR struct eth_hdr_s *)priv->misoc_net_dev.d_buf)
+#define BUF ((struct eth_hdr_s *)priv->misoc_net_dev.d_buf)
/****************************************************************************
* Private Types
@@ -135,42 +135,42 @@ static struct misoc_net_driver_s g_misoc_net[CONFIG_MISOC_NET_NINTERFACES];
/* Common TX logic */
-static int misoc_net_transmit(FAR struct misoc_net_driver_s *priv);
-static int misoc_net_txpoll(FAR struct net_driver_s *dev);
+static int misoc_net_transmit(struct misoc_net_driver_s *priv);
+static int misoc_net_txpoll(struct net_driver_s *dev);
/* Interrupt handling */
-static void misoc_net_receive(FAR struct misoc_net_driver_s *priv);
-static void misoc_net_txdone(FAR struct misoc_net_driver_s *priv);
+static void misoc_net_receive(struct misoc_net_driver_s *priv);
+static void misoc_net_txdone(struct misoc_net_driver_s *priv);
-static void misoc_net_interrupt_work(FAR void *arg);
-static int misoc_net_interrupt(int irq, FAR void *context, FAR void *arg);
+static void misoc_net_interrupt_work(void *arg);
+static int misoc_net_interrupt(int irq, void *context, void *arg);
/* Watchdog timer expirations */
-static void misoc_net_txtimeout_work(FAR void *arg);
+static void misoc_net_txtimeout_work(void *arg);
static void misoc_net_txtimeout_expiry(wdparm_t arg);
-static void misoc_net_poll_work(FAR void *arg);
+static void misoc_net_poll_work(void *arg);
static void misoc_net_poll_expiry(wdparm_t arg);
/* NuttX callback functions */
-static int misoc_net_ifup(FAR struct net_driver_s *dev);
-static int misoc_net_ifdown(FAR struct net_driver_s *dev);
+static int misoc_net_ifup(struct net_driver_s *dev);
+static int misoc_net_ifdown(struct net_driver_s *dev);
-static void misoc_net_txavail_work(FAR void *arg);
-static int misoc_net_txavail(FAR struct net_driver_s *dev);
+static void misoc_net_txavail_work(void *arg);
+static int misoc_net_txavail(struct net_driver_s *dev);
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
-static int misoc_net_addmac(FAR struct net_driver_s *dev,
- FAR const uint8_t *mac);
+static int misoc_net_addmac(struct net_driver_s *dev,
+ const uint8_t *mac);
#ifdef CONFIG_NET_MCASTGROUP
-static int misoc_net_rmmac(FAR struct net_driver_s *dev,
- FAR const uint8_t *mac);
+static int misoc_net_rmmac(struct net_driver_s *dev,
+ const uint8_t *mac);
#endif
#ifdef CONFIG_NET_ICMPv6
-static void misoc_net_ipv6multicast(FAR struct misoc_net_driver_s *priv);
+static void misoc_net_ipv6multicast(struct misoc_net_driver_s *priv);
#endif
#endif
@@ -197,7 +197,7 @@ static void misoc_net_ipv6multicast(FAR struct misoc_net_driver_s *priv);
*
****************************************************************************/
-static int misoc_net_transmit(FAR struct misoc_net_driver_s *priv)
+static int misoc_net_transmit(struct misoc_net_driver_s *priv)
{
/* Verify that the hardware is ready to send another packet. If we get
* here, then we are committed to sending a packet; Higher level logic
@@ -286,10 +286,10 @@ static int misoc_net_transmit(FAR struct misoc_net_driver_s *priv)
*
****************************************************************************/
-static int misoc_net_txpoll(FAR struct net_driver_s *dev)
+static int misoc_net_txpoll(struct net_driver_s *dev)
{
- FAR struct misoc_net_driver_s *priv =
- (FAR struct misoc_net_driver_s *)dev->d_private;
+ struct misoc_net_driver_s *priv =
+ (struct misoc_net_driver_s *)dev->d_private;
/* If the polling resulted in data that should be sent out on the network,
* the field d_len is set to a value > 0.
@@ -355,7 +355,7 @@ static int misoc_net_txpoll(FAR struct net_driver_s *dev)
*
****************************************************************************/
-static void misoc_net_receive(FAR struct misoc_net_driver_s *priv)
+static void misoc_net_receive(struct misoc_net_driver_s *priv)
{
uint8_t rxslot;
uint32_t rxlen;
@@ -529,7 +529,7 @@ static void misoc_net_receive(FAR struct misoc_net_driver_s *priv)
*
****************************************************************************/
-static void misoc_net_txdone(FAR struct misoc_net_driver_s *priv)
+static void misoc_net_txdone(struct misoc_net_driver_s *priv)
{
/* Check for errors and update statistics */
@@ -569,9 +569,9 @@ static void misoc_net_txdone(FAR struct misoc_net_driver_s *priv)
*
****************************************************************************/
-static void misoc_net_interrupt_work(FAR void *arg)
+static void misoc_net_interrupt_work(void *arg)
{
- FAR struct misoc_net_driver_s *priv = (FAR struct misoc_net_driver_s *)arg;
+ struct misoc_net_driver_s *priv = (struct misoc_net_driver_s *)arg;
/* Process pending Ethernet interrupts */
@@ -624,9 +624,9 @@ static void misoc_net_interrupt_work(FAR void *arg)
*
****************************************************************************/
-static int misoc_net_interrupt(int irq, FAR void *context, FAR void *arg)
+static int misoc_net_interrupt(int irq, void *context, void *arg)
{
- FAR struct misoc_net_driver_s *priv = &g_misoc_net[0];
+ struct misoc_net_driver_s *priv = &g_misoc_net[0];
/* Disable further Ethernet interrupts. Because Ethernet interrupts are
* also disabled if the TX timeout event occurs, there can be no race
@@ -672,9 +672,9 @@ static int misoc_net_interrupt(int irq, FAR void *context, FAR void *arg)
*
****************************************************************************/
-static void misoc_net_txtimeout_work(FAR void *arg)
+static void misoc_net_txtimeout_work(void *arg)
{
- FAR struct misoc_net_driver_s *priv = (FAR struct misoc_net_driver_s *)arg;
+ struct misoc_net_driver_s *priv = (struct misoc_net_driver_s *)arg;
/* Increment statistics and dump debug info */
@@ -709,7 +709,7 @@ static void misoc_net_txtimeout_work(FAR void *arg)
static void misoc_net_txtimeout_expiry(wdparm_t arg)
{
- FAR struct misoc_net_driver_s *priv = (FAR struct misoc_net_driver_s *)arg;
+ struct misoc_net_driver_s *priv = (struct misoc_net_driver_s *)arg;
#if 0 /* REVISIT */
/* Disable further Ethernet interrupts. This will prevent some race
@@ -743,9 +743,9 @@ static void misoc_net_txtimeout_expiry(wdparm_t arg)
*
****************************************************************************/
-static void misoc_net_poll_work(FAR void *arg)
+static void misoc_net_poll_work(void *arg)
{
- FAR struct misoc_net_driver_s *priv = (FAR struct misoc_net_driver_s *)arg;
+ struct misoc_net_driver_s *priv = (struct misoc_net_driver_s *)arg;
/* Perform the poll */
@@ -789,7 +789,7 @@ static void misoc_net_poll_work(FAR void *arg)
static void misoc_net_poll_expiry(wdparm_t arg)
{
- FAR struct misoc_net_driver_s *priv = (FAR struct misoc_net_driver_s *)arg;
+ struct misoc_net_driver_s *priv = (struct misoc_net_driver_s *)arg;
/* Schedule to perform the interrupt processing on the worker thread. */
@@ -814,11 +814,11 @@ static void misoc_net_poll_expiry(wdparm_t arg)
*
****************************************************************************/
-static int misoc_net_ifup(FAR struct net_driver_s *dev)
+static int misoc_net_ifup(struct net_driver_s *dev)
{
irqstate_t flags;
- FAR struct misoc_net_driver_s *priv =
- (FAR struct misoc_net_driver_s *)dev->d_private;
+ struct misoc_net_driver_s *priv =
+ (struct misoc_net_driver_s *)dev->d_private;
#ifdef CONFIG_NET_IPv4
ninfo("Bringing up: %d.%d.%d.%d\n",
@@ -877,10 +877,10 @@ static int misoc_net_ifup(FAR struct net_driver_s *dev)
*
****************************************************************************/
-static int misoc_net_ifdown(FAR struct net_driver_s *dev)
+static int misoc_net_ifdown(struct net_driver_s *dev)
{
- FAR struct misoc_net_driver_s *priv =
- (FAR struct misoc_net_driver_s *)dev->d_private;
+ struct misoc_net_driver_s *priv =
+ (struct misoc_net_driver_s *)dev->d_private;
irqstate_t flags;
/* Disable the Ethernet interrupt */
@@ -925,10 +925,10 @@ static int misoc_net_ifdown(FAR struct net_driver_s *dev)
*
****************************************************************************/
-static void misoc_net_txavail_work(FAR void *arg)
+static void misoc_net_txavail_work(void *arg)
{
- FAR struct misoc_net_driver_s *priv =
- (FAR struct misoc_net_driver_s *)arg;
+ struct misoc_net_driver_s *priv =
+ (struct misoc_net_driver_s *)arg;
/* Ignore the notification if the interface is not yet up */
@@ -967,10 +967,10 @@ static void misoc_net_txavail_work(FAR void *arg)
*
****************************************************************************/
-static int misoc_net_txavail(FAR struct net_driver_s *dev)
+static int misoc_net_txavail(struct net_driver_s *dev)
{
- FAR struct misoc_net_driver_s *priv =
- (FAR struct misoc_net_driver_s *)dev->d_private;
+ struct misoc_net_driver_s *priv =
+ (struct misoc_net_driver_s *)dev->d_private;
/* Is our single work structure available? It may not be if there are
* pending interrupt actions and we will have to ignore the Tx
@@ -1007,11 +1007,11 @@ static int misoc_net_txavail(FAR struct net_driver_s *dev)
****************************************************************************/
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
-static int misoc_net_addmac(FAR struct net_driver_s *dev,
- FAR const uint8_t *mac)
+static int misoc_net_addmac(struct net_driver_s *dev,
+ const uint8_t *mac)
{
- FAR struct misoc_net_driver_s *priv =
- (FAR struct misoc_net_driver_s *)dev->d_private;
+ struct misoc_net_driver_s *priv =
+ (struct misoc_net_driver_s *)dev->d_private;
/* Add the MAC address to the hardware multicast routing table */
@@ -1038,11 +1038,11 @@ static int misoc_net_addmac(FAR struct net_driver_s *dev,
****************************************************************************/
#ifdef CONFIG_NET_MCASTGROUP
-static int misoc_net_rmmac(FAR struct net_driver_s *dev,
- FAR const uint8_t *mac)
+static int misoc_net_rmmac(struct net_driver_s *dev,
+ const uint8_t *mac)
{
- FAR struct misoc_net_driver_s *priv =
- (FAR struct misoc_net_driver_s *)dev->d_private;
+ struct misoc_net_driver_s *priv =
+ (struct misoc_net_driver_s *)dev->d_private;
/* Add the MAC address to the hardware multicast routing table */
@@ -1067,9 +1067,9 @@ static int misoc_net_rmmac(FAR struct net_driver_s *dev,
****************************************************************************/
#ifdef CONFIG_NET_ICMPv6
-static void misoc_net_ipv6multicast(FAR struct misoc_net_driver_s *priv)
+static void misoc_net_ipv6multicast(struct misoc_net_driver_s *priv)
{
- FAR struct net_driver_s *dev;
+ struct net_driver_s *dev;
uint16_t tmp16;
uint8_t mac[6];
@@ -1146,7 +1146,7 @@ static void misoc_net_ipv6multicast(FAR struct misoc_net_driver_s *priv)
int misoc_net_initialize(int intf)
{
- FAR struct misoc_net_driver_s *priv;
+ struct misoc_net_driver_s *priv;
/* Get the interface structure associated with this interface number. */
diff --git a/arch/misoc/src/common/misoc_serial.c b/arch/misoc/src/common/misoc_serial.c
index 7db014df2c..632e209bc4 100644
--- a/arch/misoc/src/common/misoc_serial.c
+++ b/arch/misoc/src/common/misoc_serial.c
@@ -141,7 +141,7 @@ static int misoc_setup(struct uart_dev_s *dev);
static void misoc_shutdown(struct uart_dev_s *dev);
static int misoc_attach(struct uart_dev_s *dev);
static void misoc_detach(struct uart_dev_s *dev);
-static int misoc_uart_interrupt(int irq, void *context, FAR void *arg);
+static int misoc_uart_interrupt(int irq, void *context, void *arg);
static int misoc_ioctl(struct file *filep, int cmd, unsigned long arg);
static int misoc_receive(struct uart_dev_s *dev, uint32_t *status);
static void misoc_rxint(struct uart_dev_s *dev, bool enable);
@@ -335,7 +335,7 @@ static void misoc_detach(struct uart_dev_s *dev)
*
****************************************************************************/
-static int misoc_uart_interrupt(int irq, void *context, FAR void *arg)
+static int misoc_uart_interrupt(int irq, void *context, void *arg)
{
struct uart_dev_s *dev = (struct uart_dev_s *)arg;
uint32_t stat;
diff --git a/arch/misoc/src/lm32/lm32.h b/arch/misoc/src/lm32/lm32.h
index e21b6515a9..9d5439fe00 100644
--- a/arch/misoc/src/lm32/lm32.h
+++ b/arch/misoc/src/lm32/lm32.h
@@ -115,7 +115,7 @@ uint32_t *lm32_doirq(int irq, uint32_t *regs);
/* Software interrupts ******************************************************/
-int lm32_swint(int irq, FAR void *context, FAR void *arg);
+int lm32_swint(int irq, void *context, void *arg);
/* Signal handling **********************************************************/
diff --git a/arch/misoc/src/lm32/lm32_allocateheap.c b/arch/misoc/src/lm32/lm32_allocateheap.c
index 84b4e0494c..8356351808 100644
--- a/arch/misoc/src/lm32/lm32_allocateheap.c
+++ b/arch/misoc/src/lm32/lm32_allocateheap.c
@@ -64,9 +64,9 @@
*
****************************************************************************/
-void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
+void up_allocate_heap(void **heap_start, size_t *heap_size)
{
board_autoled_on(LED_HEAPALLOCATE);
- *heap_start = (FAR void *)g_idle_topstack;
+ *heap_start = (void *)g_idle_topstack;
*heap_size = CONFIG_RAM_END - g_idle_topstack;
}
diff --git a/arch/misoc/src/lm32/lm32_assert.c b/arch/misoc/src/lm32/lm32_assert.c
index 93eab92fe5..f0e8c6c279 100644
--- a/arch/misoc/src/lm32/lm32_assert.c
+++ b/arch/misoc/src/lm32/lm32_assert.c
@@ -104,7 +104,7 @@ static void _up_assert(void)
****************************************************************************/
#ifdef CONFIG_ARCH_USBDUMP
-static int usbtrace_syslog(FAR const char *fmt, ...)
+static int usbtrace_syslog(const char *fmt, ...)
{
va_list ap;
@@ -116,7 +116,7 @@ static int usbtrace_syslog(FAR const char *fmt, ...)
return OK;
}
-static int assert_tracecallback(FAR struct usbtrace_s *trace, FAR void *arg)
+static int assert_tracecallback(struct usbtrace_s *trace, void *arg)
{
usbtrace_trprintf(usbtrace_syslog, trace->event, trace->value);
return 0;
diff --git a/arch/misoc/src/lm32/lm32_createstack.c b/arch/misoc/src/lm32/lm32_createstack.c
index f8c674b940..a1024437b3 100644
--- a/arch/misoc/src/lm32/lm32_createstack.c
+++ b/arch/misoc/src/lm32/lm32_createstack.c
@@ -79,7 +79,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)
{
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
diff --git a/arch/misoc/src/lm32/lm32_dumpstate.c b/arch/misoc/src/lm32/lm32_dumpstate.c
index a303490742..520e9f396f 100644
--- a/arch/misoc/src/lm32/lm32_dumpstate.c
+++ b/arch/misoc/src/lm32/lm32_dumpstate.c
@@ -114,7 +114,7 @@ static inline void lm32_registerdump(void)
void lm32_dumpstate(void)
{
- FAR struct tcb_s *rtcb = running_task();
+ struct tcb_s *rtcb = running_task();
uint32_t sp = up_getsp();
uint32_t ustackbase;
uint32_t ustacksize;
diff --git a/arch/misoc/src/lm32/lm32_exit.c b/arch/misoc/src/lm32/lm32_exit.c
index fb75de94d3..8bbcb4addb 100644
--- a/arch/misoc/src/lm32/lm32_exit.c
+++ b/arch/misoc/src/lm32/lm32_exit.c
@@ -55,9 +55,9 @@
****************************************************************************/
#ifdef CONFIG_DUMP_ON_EXIT
-static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
+static void _up_dumponexit(struct tcb_s *tcb, void *arg)
{
- FAR struct filelist *filelist;
+ struct filelist *filelist;
int i;
int j;
diff --git a/arch/misoc/src/lm32/lm32_releasestack.c b/arch/misoc/src/lm32/lm32_releasestack.c
index 64af00eb34..31489d7814 100644
--- a/arch/misoc/src/lm32/lm32_releasestack.c
+++ b/arch/misoc/src/lm32/lm32_releasestack.c
@@ -67,7 +67,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/misoc/src/lm32/lm32_stackframe.c b/arch/misoc/src/lm32/lm32_stackframe.c
index bbcceb0432..cbc2a51593 100644
--- a/arch/misoc/src/lm32/lm32_stackframe.c
+++ b/arch/misoc/src/lm32/lm32_stackframe.c
@@ -68,9 +68,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 */
@@ -88,7 +88,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 the pointer to the allocated region */
diff --git a/arch/misoc/src/lm32/lm32_swint.c b/arch/misoc/src/lm32/lm32_swint.c
index 1d7454c7bd..3c0b403048 100644
--- a/arch/misoc/src/lm32/lm32_swint.c
+++ b/arch/misoc/src/lm32/lm32_swint.c
@@ -127,7 +127,7 @@ static void dispatch_syscall(void)
*
****************************************************************************/
-int lm32_swint(int irq, FAR void *context, FAR void *arg)
+int lm32_swint(int irq, void *context, void *arg)
{
uint32_t *regs = (uint32_t *)context;
@@ -244,7 +244,7 @@ int lm32_swint(int irq, FAR void *context, FAR void *arg)
default:
{
#ifdef CONFIG_BUILD_KERNEL
- FAR struct tcb_s *rtcb = nxsched_self();
+ struct tcb_s *rtcb = nxsched_self();
int index = rtcb->xcp.nsyscalls;
/* Verify that the SYS call number is within range */
diff --git a/arch/misoc/src/minerva/minerva.h b/arch/misoc/src/minerva/minerva.h
index ad17d2d36f..e310ccc783 100644
--- a/arch/misoc/src/minerva/minerva.h
+++ b/arch/misoc/src/minerva/minerva.h
@@ -115,7 +115,7 @@ uint32_t *minerva_doirq(int irq, uint32_t * regs);
/* Software interrupts ******************************************************/
-int minerva_swint(int irq, FAR void *context, FAR void *arg);
+int minerva_swint(int irq, void *context, void *arg);
/* Signal handling **********************************************************/
diff --git a/arch/misoc/src/minerva/minerva_allocateheap.c b/arch/misoc/src/minerva/minerva_allocateheap.c
index b33040386f..433e8317e9 100644
--- a/arch/misoc/src/minerva/minerva_allocateheap.c
+++ b/arch/misoc/src/minerva/minerva_allocateheap.c
@@ -52,9 +52,9 @@
*
****************************************************************************/
-void up_allocate_heap(FAR void **heap_start, size_t * heap_size)
+void up_allocate_heap(void **heap_start, size_t * heap_size)
{
board_autoled_on(LED_HEAPALLOCATE);
- *heap_start = (FAR void *)g_idle_topstack;
+ *heap_start = (void *)g_idle_topstack;
*heap_size = CONFIG_RAM_END - g_idle_topstack;
}
diff --git a/arch/misoc/src/minerva/minerva_assert.c b/arch/misoc/src/minerva/minerva_assert.c
index 5055332830..3e713305a2 100644
--- a/arch/misoc/src/minerva/minerva_assert.c
+++ b/arch/misoc/src/minerva/minerva_assert.c
@@ -104,7 +104,7 @@ static void _up_assert(void)
****************************************************************************/
#ifdef CONFIG_ARCH_USBDUMP
-static int usbtrace_syslog(FAR const char *fmt, ...)
+static int usbtrace_syslog(const char *fmt, ...)
{
va_list ap;
@@ -116,7 +116,7 @@ static int usbtrace_syslog(FAR const char *fmt, ...)
return OK;
}
-static int assert_tracecallback(FAR struct usbtrace_s *trace, FAR void *arg)
+static int assert_tracecallback(struct usbtrace_s *trace, void *arg)
{
usbtrace_trprintf(usbtrace_syslog, trace->event, trace->value);
return 0;
diff --git a/arch/misoc/src/minerva/minerva_createstack.c b/arch/misoc/src/minerva/minerva_createstack.c
index 6121fc0704..d92b57640e 100644
--- a/arch/misoc/src/minerva/minerva_createstack.c
+++ b/arch/misoc/src/minerva/minerva_createstack.c
@@ -79,7 +79,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)
{
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
diff --git a/arch/misoc/src/minerva/minerva_dumpstate.c b/arch/misoc/src/minerva/minerva_dumpstate.c
index 7f90cb5d2f..0750733b3d 100644
--- a/arch/misoc/src/minerva/minerva_dumpstate.c
+++ b/arch/misoc/src/minerva/minerva_dumpstate.c
@@ -113,7 +113,7 @@ static inline void mineva_registerdump(void)
void minerva_dumpstate(void)
{
- FAR struct tcb_s *rtcb = running_task();
+ struct tcb_s *rtcb = running_task();
uint32_t sp = up_getsp();
uint32_t ustackbase;
uint32_t ustacksize;
diff --git a/arch/misoc/src/minerva/minerva_exit.c b/arch/misoc/src/minerva/minerva_exit.c
index 0be779b84b..4e8b1f3ad7 100644
--- a/arch/misoc/src/minerva/minerva_exit.c
+++ b/arch/misoc/src/minerva/minerva_exit.c
@@ -55,9 +55,9 @@
****************************************************************************/
#ifdef CONFIG_DUMP_ON_EXIT
-static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
+static void _up_dumponexit(struct tcb_s *tcb, void *arg)
{
- FAR struct filelist *filelist;
+ struct filelist *filelist;
int i;
int j;
diff --git a/arch/misoc/src/minerva/minerva_releasestack.c b/arch/misoc/src/minerva/minerva_releasestack.c
index d43f76efc4..e99d8c143e 100644
--- a/arch/misoc/src/minerva/minerva_releasestack.c
+++ b/arch/misoc/src/minerva/minerva_releasestack.c
@@ -67,7 +67,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/misoc/src/minerva/minerva_stackframe.c b/arch/misoc/src/minerva/minerva_stackframe.c
index f11472fec7..dc379a305f 100644
--- a/arch/misoc/src/minerva/minerva_stackframe.c
+++ b/arch/misoc/src/minerva/minerva_stackframe.c
@@ -68,9 +68,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 */
@@ -88,7 +88,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 the pointer to the allocated region */
diff --git a/arch/misoc/src/minerva/minerva_swint.c b/arch/misoc/src/minerva/minerva_swint.c
index d6c5b19ae4..af82f30d60 100644
--- a/arch/misoc/src/minerva/minerva_swint.c
+++ b/arch/misoc/src/minerva/minerva_swint.c
@@ -124,7 +124,7 @@ static void dispatch_syscall(void) naked_function;
*
****************************************************************************/
-int minerva_swint(int irq, FAR void *context, FAR void *arg)
+int minerva_swint(int irq, void *context, void *arg)
{
uint32_t *regs = (uint32_t *) context;
@@ -220,7 +220,7 @@ int minerva_swint(int irq, FAR void *context, FAR void *arg)
default:
{
#ifdef CONFIG_BUILD_KERNEL
- FAR struct tcb_s *rtcb = nxsched_self();
+ struct tcb_s *rtcb = nxsched_self();
int index = rtcb->xcp.nsyscalls;
/* Verify that the SYS call number is within range */