This is an automated email from the ASF dual-hosted git repository.
archer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 60fb917eda Remove FAR from 32/64bit arch
60fb917eda is described below
commit 60fb917eda52787f9e542af0fd80ab80493893c0
Author: Xiang Xiao <[email protected]>
AuthorDate: Wed Dec 4 23:59:03 2024 +0800
Remove FAR from 32/64bit arch
since these arch doesn't distinguish between near and far pointers
Signed-off-by: Xiang Xiao <[email protected]>
---
.../platforms/arm/goldfish/goldfish_timer.rst | 26 +++++++++++-----------
arch/arm/src/arm/arm_syscall.c | 2 +-
arch/arm/src/armv7-r/arm_syscall.c | 2 +-
arch/arm/src/armv8-r/arm_syscall.c | 2 +-
arch/arm/src/goldfish/goldfish_timer.c | 2 +-
arch/arm/src/moxart/moxart_16550.c | 2 +-
arch/arm/src/s32k1xx/s32k1xx_flexio_i2c.c | 2 +-
arch/arm/src/samv7/sam_lin_sock.c | 2 +-
arch/arm64/src/goldfish/goldfish_rtc.c | 2 +-
.../src/common/espressif/esp_temperature_sensor.c | 4 ++--
arch/risc-v/src/common/espressif/esp_timer.c | 2 +-
arch/sim/src/sim/sim_heap.c | 2 +-
.../src/common/espressif/esp_temperature_sensor.c | 4 ++--
arch/xtensa/src/esp32/esp32_spiram.c | 4 ++--
arch/xtensa/src/esp32s3/esp32s3_spiram.c | 4 ++--
boards/arm/mps/mps3-an547/src/mps3_bringup.c | 2 +-
boards/arm/rp23xx/common/src/rp23xx_uniqueid.c | 2 +-
libs/libc/machine/arm64/arch_elf.c | 4 ++--
libs/libc/machine/sim/arch_elf64.c | 4 ++--
19 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/Documentation/platforms/arm/goldfish/goldfish_timer.rst
b/Documentation/platforms/arm/goldfish/goldfish_timer.rst
index cdce13be73..0ac445642a 100644
--- a/Documentation/platforms/arm/goldfish/goldfish_timer.rst
+++ b/Documentation/platforms/arm/goldfish/goldfish_timer.rst
@@ -26,11 +26,11 @@ To read the current time, the kernel must execute an
IO_READ(TIME_LOW), which re
::
- static int goldfish_timer_current(FAR struct oneshot_lowerhalf_s *lower_,
- FAR struct timespec *ts)
+ static int goldfish_timer_current(struct oneshot_lowerhalf_s *lower_,
+ struct timespec *ts)
{
- FAR struct goldfish_timer_lowerhalf_s *lower =
- (FAR struct goldfish_timer_lowerhalf_s *)lower_;
+ struct goldfish_timer_lowerhalf_s *lower =
+ (struct goldfish_timer_lowerhalf_s *)lower_;
irqstate_t flags;
uint32_t l32;
uint32_t h32;
@@ -65,13 +65,13 @@ When the corresponding value is reached, the device will
raise its IRQ. Note tha
::
- static int goldfish_timer_start(FAR struct oneshot_lowerhalf_s *lower_,
- FAR oneshot_callback_t callback,
- FAR void *arg,
- FAR const struct timespec *ts)
+ static int goldfish_timer_start(struct oneshot_lowerhalf_s *lower_,
+ oneshot_callback_t callback,
+ void *arg,
+ const struct timespec *ts)
{
- FAR struct goldfish_timer_lowerhalf_s *lower =
- (FAR struct goldfish_timer_lowerhalf_s *)lower_;
+ struct goldfish_timer_lowerhalf_s *lower =
+ (struct goldfish_timer_lowerhalf_s *)lower_;
irqstate_t flags;
uint64_t nsec;
uint32_t l32;
@@ -108,10 +108,10 @@ Note: Currently, the alarm is used only on ARM-based
systems. On MIPS-based syst
::
static int goldfish_timer_interrupt(int irq,
- FAR void *context,
- FAR void *arg)
+ void *context,
+ void *arg)
{
- FAR struct goldfish_timer_lowerhalf_s *lower = arg;
+ struct goldfish_timer_lowerhalf_s *lower = arg;
oneshot_callback_t callback = NULL;
irqstate_t flags;
void *cbarg;
diff --git a/arch/arm/src/arm/arm_syscall.c b/arch/arm/src/arm/arm_syscall.c
index 3903159bfd..faf7a606ac 100644
--- a/arch/arm/src/arm/arm_syscall.c
+++ b/arch/arm/src/arm/arm_syscall.c
@@ -56,7 +56,7 @@ uint32_t *arm_syscall(uint32_t *regs)
{
int cpu = this_cpu();
struct tcb_s **running_task = &g_running_tasks[cpu];
- FAR struct tcb_s *tcb = this_task();
+ struct tcb_s *tcb = this_task();
uint32_t cmd;
/* Nested interrupts are not supported */
diff --git a/arch/arm/src/armv7-r/arm_syscall.c
b/arch/arm/src/armv7-r/arm_syscall.c
index 179b27baae..565f744a6d 100644
--- a/arch/arm/src/armv7-r/arm_syscall.c
+++ b/arch/arm/src/armv7-r/arm_syscall.c
@@ -158,7 +158,7 @@ uint32_t *arm_syscall(uint32_t *regs)
{
int cpu = this_cpu();
struct tcb_s **running_task = &g_running_tasks[cpu];
- FAR struct tcb_s *tcb = this_task();
+ struct tcb_s *tcb = this_task();
uint32_t cmd;
#ifdef CONFIG_BUILD_PROTECTED
uint32_t cpsr;
diff --git a/arch/arm/src/armv8-r/arm_syscall.c
b/arch/arm/src/armv8-r/arm_syscall.c
index d003166840..7878766641 100644
--- a/arch/arm/src/armv8-r/arm_syscall.c
+++ b/arch/arm/src/armv8-r/arm_syscall.c
@@ -158,7 +158,7 @@ uint32_t *arm_syscall(uint32_t *regs)
{
int cpu = this_cpu();
struct tcb_s **running_task = &g_running_tasks[cpu];
- FAR struct tcb_s *tcb = this_task();
+ struct tcb_s *tcb = this_task();
uint32_t cmd;
#ifdef CONFIG_BUILD_PROTECTED
uint32_t cpsr;
diff --git a/arch/arm/src/goldfish/goldfish_timer.c
b/arch/arm/src/goldfish/goldfish_timer.c
index f04f2629fd..314ac91cbe 100644
--- a/arch/arm/src/goldfish/goldfish_timer.c
+++ b/arch/arm/src/goldfish/goldfish_timer.c
@@ -36,7 +36,7 @@
void up_timer_initialize(void)
{
#if defined(CONFIG_GOLDFISH_TIMER) && defined(CONFIG_LIBC_FDT)
- FAR struct oneshot_lowerhalf_s *lower;
+ struct oneshot_lowerhalf_s *lower;
const void *fdt = fdt_get();
DEBUGASSERT(fdt != NULL);
diff --git a/arch/arm/src/moxart/moxart_16550.c
b/arch/arm/src/moxart/moxart_16550.c
index 9b679dd210..1f77e63754 100644
--- a/arch/arm/src/moxart/moxart_16550.c
+++ b/arch/arm/src/moxart/moxart_16550.c
@@ -69,7 +69,7 @@ void uart_decodeirq(int irq, void *context)
}
#ifdef CONFIG_SERIAL_UART_ARCH_IOCTL
-int uart_ioctl(FAR struct u16550_s *priv, int cmd, unsigned long arg)
+int uart_ioctl(struct u16550_s *priv, int cmd, unsigned long arg)
{
int ret = -ENOTTY;
uint32_t vmode;
diff --git a/arch/arm/src/s32k1xx/s32k1xx_flexio_i2c.c
b/arch/arm/src/s32k1xx/s32k1xx_flexio_i2c.c
index 9574bca811..f66ba918a4 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_flexio_i2c.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_flexio_i2c.c
@@ -421,7 +421,7 @@ static int s32k1xx_flexio_i2c_interrupt(int irq, void
*context, void *arg)
return OK;
}
-static int set_expiretime(int expire_time, FAR struct timespec *set_time)
+static int set_expiretime(int expire_time, struct timespec *set_time)
{
struct timespec curr_time;
diff --git a/arch/arm/src/samv7/sam_lin_sock.c
b/arch/arm/src/samv7/sam_lin_sock.c
index e6cf30816c..442113ccf6 100644
--- a/arch/arm/src/samv7/sam_lin_sock.c
+++ b/arch/arm/src/samv7/sam_lin_sock.c
@@ -796,7 +796,7 @@ static int sam_lin_netdev_ioctl(struct net_driver_s *dev,
int cmd,
}
#endif /* CONFIG_NETDEV_IOCTL */
-static int sam_interrupt(int irq, void *context, FAR void *arg)
+static int sam_interrupt(int irq, void *context, void *arg)
{
struct sam_lin_s *priv = (struct sam_lin_s *)arg;
uint32_t pending;
diff --git a/arch/arm64/src/goldfish/goldfish_rtc.c
b/arch/arm64/src/goldfish/goldfish_rtc.c
index 23bbc1ff21..3bac09a295 100644
--- a/arch/arm64/src/goldfish/goldfish_rtc.c
+++ b/arch/arm64/src/goldfish/goldfish_rtc.c
@@ -35,7 +35,7 @@
int up_rtc_initialize(void)
{
- FAR struct rtc_lowerhalf_s *rtc_lowerhalf =
+ struct rtc_lowerhalf_s *rtc_lowerhalf =
pl031_initialize(CONFIG_GOLDFISH_RTC_PL031_BASE,
CONFIG_GOLDFISH_RTC_PL031_IRQ);
diff --git a/arch/risc-v/src/common/espressif/esp_temperature_sensor.c
b/arch/risc-v/src/common/espressif/esp_temperature_sensor.c
index 2d0389d2c1..f256055e8c 100644
--- a/arch/risc-v/src/common/espressif/esp_temperature_sensor.c
+++ b/arch/risc-v/src/common/espressif/esp_temperature_sensor.c
@@ -613,7 +613,7 @@ static int esp_temperature_sensor_fetch(struct
sensor_lowerhalf_s *lower,
*
****************************************************************************/
-static int esp_temperature_sensor_thread(int argc, FAR char **argv)
+static int esp_temperature_sensor_thread(int argc, char **argv)
{
struct esp_temp_priv_s *priv =
(struct esp_temp_priv_s *)((uintptr_t)strtoul(argv[1], NULL, 16));
@@ -784,7 +784,7 @@ int esp_temperature_sensor_initialize(struct
esp_temp_sensor_config_t cfg)
int ret = 0;
struct esp_temp_priv_s *priv = &esp_temp_priv;
#ifdef CONFIG_ESPRESSIF_TEMP_UORB_POLL
- FAR char *argv[2];
+ char *argv[2];
char arg1[32];
#endif
diff --git a/arch/risc-v/src/common/espressif/esp_timer.c
b/arch/risc-v/src/common/espressif/esp_timer.c
index 65776aabb4..e39d9c40e9 100644
--- a/arch/risc-v/src/common/espressif/esp_timer.c
+++ b/arch/risc-v/src/common/espressif/esp_timer.c
@@ -511,7 +511,7 @@ IRAM_ATTR static int esp_timer_isr(int irq, void *context,
void *arg)
int esp_timer_initialize(uint32_t timer_id)
{
struct esp_timer_lowerhalf_s *lower = NULL;
- FAR char *devpath;
+ char *devpath;
uint32_t group_num;
uint32_t timer_num;
diff --git a/arch/sim/src/sim/sim_heap.c b/arch/sim/src/sim/sim_heap.c
index 87db535d8d..1fd215a826 100644
--- a/arch/sim/src/sim/sim_heap.c
+++ b/arch/sim/src/sim/sim_heap.c
@@ -675,7 +675,7 @@ size_t mm_heapfree(struct mm_heap_s *heap)
*
****************************************************************************/
-size_t mm_heapfree_largest(FAR struct mm_heap_s *heap)
+size_t mm_heapfree_largest(struct mm_heap_s *heap)
{
return SIZE_MAX;
}
diff --git a/arch/xtensa/src/common/espressif/esp_temperature_sensor.c
b/arch/xtensa/src/common/espressif/esp_temperature_sensor.c
index 6bf580640a..5cf6d62358 100644
--- a/arch/xtensa/src/common/espressif/esp_temperature_sensor.c
+++ b/arch/xtensa/src/common/espressif/esp_temperature_sensor.c
@@ -612,7 +612,7 @@ static int esp_temperature_sensor_fetch(struct
sensor_lowerhalf_s *lower,
*
****************************************************************************/
-static int esp_temperature_sensor_thread(int argc, FAR char **argv)
+static int esp_temperature_sensor_thread(int argc, char **argv)
{
struct esp_temp_priv_s *priv =
(struct esp_temp_priv_s *)((uintptr_t)strtoul(argv[1], NULL, 16));
@@ -783,7 +783,7 @@ int esp_temperature_sensor_initialize(struct
esp_temp_sensor_config_t cfg)
int ret = 0;
struct esp_temp_priv_s *priv = &esp_temp_priv;
#ifdef CONFIG_ESPRESSIF_TEMP_UORB_POLL
- FAR char *argv[2];
+ char *argv[2];
char arg1[32];
#endif
diff --git a/arch/xtensa/src/esp32/esp32_spiram.c
b/arch/xtensa/src/esp32/esp32_spiram.c
index 8aa47eb2dd..7f4ead9c1f 100644
--- a/arch/xtensa/src/esp32/esp32_spiram.c
+++ b/arch/xtensa/src/esp32/esp32_spiram.c
@@ -75,7 +75,7 @@
static bool spiram_inited = false;
#ifdef CONFIG_SMP
-static int pause_cpu_handler(FAR void *cookie);
+static int pause_cpu_handler(void *cookie);
static struct smp_call_data_s g_call_data =
SMP_CALL_INITIALIZER(pause_cpu_handler, NULL);
#endif
@@ -91,7 +91,7 @@ SMP_CALL_INITIALIZER(pause_cpu_handler, NULL);
#ifdef CONFIG_SMP
static volatile bool g_cpu_wait = true;
static volatile bool g_cpu_pause = false;
-static int pause_cpu_handler(FAR void *cookie)
+static int pause_cpu_handler(void *cookie)
{
g_cpu_pause = true;
while (g_cpu_wait);
diff --git a/arch/xtensa/src/esp32s3/esp32s3_spiram.c
b/arch/xtensa/src/esp32s3/esp32s3_spiram.c
index db07eb419b..72f8c321bf 100644
--- a/arch/xtensa/src/esp32s3/esp32s3_spiram.c
+++ b/arch/xtensa/src/esp32s3/esp32s3_spiram.c
@@ -118,7 +118,7 @@ static uint32_t page0_page = INVALID_PHY_PAGE;
#endif
#ifdef CONFIG_SMP
-static int pause_cpu_handler(FAR void *cookie);
+static int pause_cpu_handler(void *cookie);
static struct smp_call_data_s g_call_data =
SMP_CALL_INITIALIZER(pause_cpu_handler, NULL);
#endif
@@ -289,7 +289,7 @@ static int IRAM_ATTR esp_mmu_map_region(uint32_t vaddr,
uint32_t paddr,
#ifdef CONFIG_SMP
static volatile bool g_cpu_wait = true;
static volatile bool g_cpu_pause = false;
-static int pause_cpu_handler(FAR void *cookie)
+static int pause_cpu_handler(void *cookie)
{
g_cpu_pause = true;
while (g_cpu_wait);
diff --git a/boards/arm/mps/mps3-an547/src/mps3_bringup.c
b/boards/arm/mps/mps3-an547/src/mps3_bringup.c
index 7001b75e7c..731c65f486 100644
--- a/boards/arm/mps/mps3-an547/src/mps3_bringup.c
+++ b/boards/arm/mps/mps3-an547/src/mps3_bringup.c
@@ -105,7 +105,7 @@ static int mps3_bringup(void)
#ifdef CONFIG_BOARDCTL_BOOT_IMAGE
-int board_boot_image(FAR const char *path, uint32_t hdr_size)
+int board_boot_image(const char *path, uint32_t hdr_size)
{
struct mod_loadinfo_s loadinfo;
struct module_s mod;
diff --git a/boards/arm/rp23xx/common/src/rp23xx_uniqueid.c
b/boards/arm/rp23xx/common/src/rp23xx_uniqueid.c
index 491f7acf80..afc8d6f315 100644
--- a/boards/arm/rp23xx/common/src/rp23xx_uniqueid.c
+++ b/boards/arm/rp23xx/common/src/rp23xx_uniqueid.c
@@ -134,7 +134,7 @@ void rp23xx_uniqueid_initialize(void)
*
****************************************************************************/
-int board_uniqueid(FAR uint8_t *uniqueid)
+int board_uniqueid(uint8_t *uniqueid)
{
memcpy(uniqueid, g_uniqueid, CONFIG_BOARDCTL_UNIQUEID_SIZE);
return OK;
diff --git a/libs/libc/machine/arm64/arch_elf.c
b/libs/libc/machine/arm64/arch_elf.c
index c17f9b151d..681012a442 100644
--- a/libs/libc/machine/arm64/arch_elf.c
+++ b/libs/libc/machine/arm64/arch_elf.c
@@ -184,8 +184,8 @@ aarch64_insn_encode_immediate(enum insn_imm_type_e type,
static uint64_t do_reloc(enum reloc_op_e op,
uintptr_t place, uint64_t val)
{
- val = (uint64_t)kasan_reset_tag((FAR const void *)val);
- place = (uint64_t)kasan_reset_tag((FAR const void *)place);
+ val = (uint64_t)kasan_reset_tag((const void *)val);
+ place = (uint64_t)kasan_reset_tag((const void *)place);
switch (op)
{
diff --git a/libs/libc/machine/sim/arch_elf64.c
b/libs/libc/machine/sim/arch_elf64.c
index 6159be9fdb..47b0a4b9d7 100644
--- a/libs/libc/machine/sim/arch_elf64.c
+++ b/libs/libc/machine/sim/arch_elf64.c
@@ -143,14 +143,14 @@ bool up_checkarch(const Elf64_Ehdr *ehdr)
****************************************************************************/
int up_relocate(const Elf64_Rel *rel, const Elf64_Sym *sym, uintptr_t addr,
- FAR void *arch_data)
+ void *arch_data)
{
berr("Not implemented\n");
return -ENOSYS;
}
int up_relocateadd(const Elf64_Rela *rel, const Elf64_Sym *sym,
- uintptr_t addr, FAR void *arch_data)
+ uintptr_t addr, void *arch_data)
{
unsigned int relotype;
uint64_t value;
