summaryrefslogtreecommitdiff
path: root/nuttx/arch/x86
diff options
context:
space:
mode:
Diffstat (limited to 'nuttx/arch/x86')
-rw-r--r--nuttx/arch/x86/src/common/up_allocateheap.c2
-rw-r--r--nuttx/arch/x86/src/common/up_assert.c6
-rw-r--r--nuttx/arch/x86/src/common/up_initialize.c2
-rw-r--r--nuttx/arch/x86/src/common/up_internal.h12
-rw-r--r--nuttx/arch/x86/src/i486/up_createstack.c2
-rw-r--r--nuttx/arch/x86/src/i486/up_sigdeliver.c4
-rw-r--r--nuttx/arch/x86/src/qemu/qemu_handlers.c14
7 files changed, 21 insertions, 21 deletions
diff --git a/nuttx/arch/x86/src/common/up_allocateheap.c b/nuttx/arch/x86/src/common/up_allocateheap.c
index aff355d30..c51e3d855 100644
--- a/nuttx/arch/x86/src/common/up_allocateheap.c
+++ b/nuttx/arch/x86/src/common/up_allocateheap.c
@@ -81,7 +81,7 @@
void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
{
- up_ledon(LED_HEAPALLOCATE);
+ board_led_on(LED_HEAPALLOCATE);
*heap_start = (FAR void*)g_idle_topstack;
*heap_size = CONFIG_RAM_END - g_idle_topstack;
}
diff --git a/nuttx/arch/x86/src/common/up_assert.c b/nuttx/arch/x86/src/common/up_assert.c
index 7db69d884..1cb2d682f 100644
--- a/nuttx/arch/x86/src/common/up_assert.c
+++ b/nuttx/arch/x86/src/common/up_assert.c
@@ -220,9 +220,9 @@ static void _up_assert(int errorcode)
for(;;)
{
#ifdef CONFIG_ARCH_LEDS
- up_ledon(LED_PANIC);
+ board_led_on(LED_PANIC);
up_mdelay(250);
- up_ledoff(LED_PANIC);
+ board_led_off(LED_PANIC);
up_mdelay(250);
#endif
}
@@ -247,7 +247,7 @@ void up_assert(const uint8_t *filename, int lineno)
struct tcb_s *rtcb = (struct tcb_s*)g_readytorun.head;
#endif
- up_ledon(LED_ASSERTION);
+ board_led_on(LED_ASSERTION);
#ifdef CONFIG_PRINT_TASKNAME
lldbg("Assertion failed at file:%s line: %d task: %s\n",
diff --git a/nuttx/arch/x86/src/common/up_initialize.c b/nuttx/arch/x86/src/common/up_initialize.c
index cb8fe79ca..4e25ae415 100644
--- a/nuttx/arch/x86/src/common/up_initialize.c
+++ b/nuttx/arch/x86/src/common/up_initialize.c
@@ -191,5 +191,5 @@ void up_initialize(void)
/* Initialize USB -- device and/or host */
up_usbinitialize();
- up_ledon(LED_IRQSENABLED);
+ board_led_on(LED_IRQSENABLED);
}
diff --git a/nuttx/arch/x86/src/common/up_internal.h b/nuttx/arch/x86/src/common/up_internal.h
index 173883280..4d6852fc2 100644
--- a/nuttx/arch/x86/src/common/up_internal.h
+++ b/nuttx/arch/x86/src/common/up_internal.h
@@ -241,13 +241,13 @@ extern void up_maskack_irq(int irq);
/* Defined in board/up_leds.c */
#ifdef CONFIG_ARCH_LEDS
-extern void up_ledinit(void);
-extern void up_ledon(int led);
-extern void up_ledoff(int led);
+extern void board_led_initialize(void);
+extern void board_led_on(int led);
+extern void board_led_off(int led);
#else
-# define up_ledinit()
-# define up_ledon(led)
-# define up_ledoff(led)
+# define board_led_initialize()
+# define board_led_on(led)
+# define board_led_off(led)
#endif
/* Defined in board/up_network.c */
diff --git a/nuttx/arch/x86/src/i486/up_createstack.c b/nuttx/arch/x86/src/i486/up_createstack.c
index ae394dea6..a619ed19b 100644
--- a/nuttx/arch/x86/src/i486/up_createstack.c
+++ b/nuttx/arch/x86/src/i486/up_createstack.c
@@ -192,7 +192,7 @@ int up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
tcb->adj_stack_ptr = (uint32_t*)top_of_stack;
tcb->adj_stack_size = size_of_stack;
- up_ledon(LED_STACKCREATED);
+ board_led_on(LED_STACKCREATED);
return OK;
}
diff --git a/nuttx/arch/x86/src/i486/up_sigdeliver.c b/nuttx/arch/x86/src/i486/up_sigdeliver.c
index 0f2082a20..1e87e78c6 100644
--- a/nuttx/arch/x86/src/i486/up_sigdeliver.c
+++ b/nuttx/arch/x86/src/i486/up_sigdeliver.c
@@ -92,7 +92,7 @@ void up_sigdeliver(void)
int saved_errno = rtcb->pterrno;
- up_ledon(LED_SIGNAL);
+ board_led_on(LED_SIGNAL);
sdbg("rtcb=%p sigdeliver=%p sigpendactionq.head=%p\n",
rtcb, rtcb->xcp.sigdeliver, rtcb->sigpendactionq.head);
@@ -131,7 +131,7 @@ void up_sigdeliver(void)
/* Then restore the correct state for this thread of execution. */
- up_ledoff(LED_SIGNAL);
+ board_led_off(LED_SIGNAL);
up_fullcontextrestore(regs);
}
diff --git a/nuttx/arch/x86/src/qemu/qemu_handlers.c b/nuttx/arch/x86/src/qemu/qemu_handlers.c
index ae889a63f..53b9ff582 100644
--- a/nuttx/arch/x86/src/qemu/qemu_handlers.c
+++ b/nuttx/arch/x86/src/qemu/qemu_handlers.c
@@ -89,7 +89,7 @@ static uint32_t *common_handler(int irq, uint32_t *regs)
{
uint32_t *savestate;
- up_ledon(LED_INIRQ);
+ board_led_on(LED_INIRQ);
/* Nested interrupts are not supported in this implementation. If you want
* implemented nested interrupts, you would have to (1) change the way that
@@ -141,7 +141,7 @@ static uint32_t *common_handler(int irq, uint32_t *regs)
uint32_t *isr_handler(uint32_t *regs)
{
#ifdef CONFIG_SUPPRESS_INTERRUPTS
- up_ledon(LED_INIRQ);
+ board_led_on(LED_INIRQ);
PANIC(); /* Doesn't return */
return regs; /* To keep the compiler happy */
#else
@@ -149,9 +149,9 @@ uint32_t *isr_handler(uint32_t *regs)
/* Dispatch the interrupt */
- up_ledon(LED_INIRQ);
+ board_led_on(LED_INIRQ);
ret = common_handler((int)regs[REG_IRQNO], regs);
- up_ledoff(LED_INIRQ);
+ board_led_off(LED_INIRQ);
return ret;
#endif
}
@@ -167,14 +167,14 @@ uint32_t *isr_handler(uint32_t *regs)
uint32_t *irq_handler(uint32_t *regs)
{
#ifdef CONFIG_SUPPRESS_INTERRUPTS
- up_ledon(LED_INIRQ);
+ board_led_on(LED_INIRQ);
PANIC(); /* Doesn't return */
return regs; /* To keep the compiler happy */
#else
uint32_t *ret;
int irq;
- up_ledon(LED_INIRQ);
+ board_led_on(LED_INIRQ);
/* Get the IRQ number */
@@ -198,7 +198,7 @@ uint32_t *irq_handler(uint32_t *regs)
/* Dispatch the interrupt */
ret = common_handler(irq, regs);
- up_ledoff(LED_INIRQ);
+ board_led_off(LED_INIRQ);
return ret;
#endif
}