forked from nuttx/nuttx-update
Add 8052 IRQ test; Fix places where IDLE task could try to wait on semaphores
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@61 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
parent
613f809f5d
commit
5be8e1a2f4
7 changed files with 300 additions and 10 deletions
|
|
@ -837,15 +837,19 @@ static ssize_t up_write(struct file *filep, const char *buffer, size_t buflen)
|
|||
ssize_t ret = buflen;
|
||||
|
||||
/* We may receive console writes through this path from
|
||||
* interrupt handlers! In this case, we will need to do
|
||||
* things a little differently.
|
||||
* interrupt handlers and from debug output in the IDLE task!
|
||||
* In these cases, we will need to do things a little
|
||||
* differently.
|
||||
*/
|
||||
|
||||
if (up_interrupt_context())
|
||||
if (up_interrupt_context() || getpid() == 0)
|
||||
{
|
||||
if (dev->isconsole)
|
||||
{
|
||||
return up_irqwrite(dev, buffer, buflen);
|
||||
irqstate_t flags = irqsave();
|
||||
ret = up_irqwrite(dev, buffer, buflen);
|
||||
irqrestore(flags);
|
||||
return ret;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -68,10 +68,10 @@ CONFIG_ARCH_LEDS=y
|
|||
CONFIG_8052_TIMER2=y
|
||||
|
||||
CONFIG_ARCH_BRINGUP=y
|
||||
CONFIG_FRAME_DUMP=y
|
||||
CONFIG_FRAME_DUMP=n
|
||||
CONFIG_FRAME_DUMP_SHORT=n
|
||||
CONFIG_SUPPRESS_INTERRUPTS=y
|
||||
CONFIG_SWITCH_FRAME_DUMP=y
|
||||
CONFIG_SWITCH_FRAME_DUMP=n
|
||||
CONFIG_INTERRUPT_FRAME_DUMP=n
|
||||
CONFIG_LED_DEBUG=n
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,11 @@
|
|||
*/
|
||||
|
||||
#define IRAM_BASE 0x0000
|
||||
#define IRAM_SIZE 0x0100
|
||||
#ifdef CONFIG_ARCH_8052
|
||||
# define IRAM_SIZE 0x0100
|
||||
#else
|
||||
# define IRAM_SIZE 0x0080
|
||||
#endif
|
||||
|
||||
#define STACK_BASE 0x0024
|
||||
#define STACK_SIZE (IRAM_SIZE - STACK_BASE)
|
||||
|
|
|
|||
|
|
@ -65,6 +65,11 @@ LINKLIBS =
|
|||
LDPATHES = $(addprefix -L$(TOPDIR)/,$(dir $(LINKLIBS)))
|
||||
LDLIBS = $(addprefix -l,$(notdir $(LINKLIBS)))
|
||||
|
||||
TESTSRCS = up_irqtest.c
|
||||
TESTOBJS = $(TESTSRCS:.c=$(OBJEXT))
|
||||
TESTLINKOBJS = up_head$(OBJEXT)
|
||||
TESTEXTRAOBJS = up_savecontext$(OBJEXT) up_restorecontext$(OBJEXT)
|
||||
|
||||
IRAM_SIZE = 0x100
|
||||
DEF_STACK_BASE = 0x24
|
||||
LDFLAGS = --model-large --nostdlib \
|
||||
|
|
@ -108,7 +113,7 @@ $(ASRCS) $(LINKASRCS): %$(ASMEXT): %.S
|
|||
$(AOBJS) $(LINKOBJS): $(ASRCS) $(LINKASRCS)
|
||||
$(AS) $(ASFLAGS) $<
|
||||
|
||||
$(COBJS): %$(OBJEXT): %.c
|
||||
$(COBJS) $(TESTOBJS): %$(OBJEXT): %.c
|
||||
$(CC) -c $(CFLAGS) $< -o $@
|
||||
|
||||
# Create a header file that contains addressing information needed by the code
|
||||
|
|
@ -174,6 +179,15 @@ nuttx$(EXEEXT): pass1.ihx nuttx.ihx
|
|||
packihx nuttx.ihx > $(TOPDIR)/nuttx$(EXEEXT)
|
||||
@cp -f nuttx.map $(TOPDIR)/.
|
||||
|
||||
# This target builds a test program to verify interrupt context switching. irqtest is
|
||||
# a PHONY target that just sets upt the up_irqtest build correctly
|
||||
|
||||
up_irqtest.ihx: $(TESTOBJS)
|
||||
$(CC) $(LDFLAGS) -L. $(SDCCPATH) $(TESTLINKOBJS) $(TESTOBJS) $(TESTEXTRAOBJS) $(SDCCLIBS) -o $@
|
||||
|
||||
irqtest:
|
||||
$(MAKE) TOPDIR=../../.. up_irqtest.ihx
|
||||
|
||||
# Build dependencies
|
||||
|
||||
.depend: Makefile up_mem.h $(DEPSRCS)
|
||||
|
|
|
|||
269
arch/pjrc-8051/src/up_irqtest.c
Normal file
269
arch/pjrc-8051/src/up_irqtest.c
Normal file
|
|
@ -0,0 +1,269 @@
|
|||
/************************************************************
|
||||
* up_putc.c
|
||||
*
|
||||
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
* 3. Neither the name Gregory Nutt nor the names of its contributors may be
|
||||
* used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
************************************************************/
|
||||
|
||||
/************************************************************
|
||||
* Included Files
|
||||
************************************************************/
|
||||
|
||||
#include <nuttx/config.h>
|
||||
#include <sys/types.h>
|
||||
#include <nuttx/arch.h>
|
||||
#include <8052.h>
|
||||
#include "up_internal.h"
|
||||
|
||||
/************************************************************
|
||||
* Definitions
|
||||
************************************************************/
|
||||
|
||||
#define up_extint0 ((vector_t)PM2_VECTOR_EXTINT0)
|
||||
#define up_timer0 ((vector_t)PM2_VECTOR_TIMER0)
|
||||
#define up_extint1 ((vector_t)PM2_VECTOR_EXTINT1)
|
||||
#define up_timer1 ((vector_t)PM2_VECTOR_TIMER1)
|
||||
#define up_uart ((vector_t)PM2_VECTOR_UART)
|
||||
#define up_timer2 ((vector_t)PM2_VECTOR_TIMER2)
|
||||
|
||||
/************************************************************
|
||||
* Private Types
|
||||
************************************************************/
|
||||
|
||||
typedef void (*vector_t)(void);
|
||||
|
||||
/************************************************************
|
||||
* Public Variables
|
||||
************************************************************/
|
||||
|
||||
boolean g_irqtest;
|
||||
ubyte g_irqtos;
|
||||
ubyte g_irqregs[REGS_SIZE];
|
||||
int g_nirqs;
|
||||
FAR struct xcptcontext *g_irqcontext;
|
||||
|
||||
/************************************************************
|
||||
* Private Functions
|
||||
************************************************************/
|
||||
|
||||
/************************************************************
|
||||
* Name: utility functions
|
||||
************************************************************/
|
||||
|
||||
static void _up_putc(ubyte ch) __naked
|
||||
{
|
||||
ch; /* To avoid unreferenced argument warning */
|
||||
_asm
|
||||
mov a, dpl
|
||||
ljmp PM2_ENTRY_COUT
|
||||
_endasm;
|
||||
}
|
||||
|
||||
void _up_puthex(ubyte hex) __naked
|
||||
{
|
||||
hex; /* To avoid unreferenced argument warning */
|
||||
_asm
|
||||
mov a, dpl
|
||||
ljmp PM2_ENTRY_PHEX
|
||||
_endasm;
|
||||
}
|
||||
|
||||
void _up_puthex16(int hex) __naked
|
||||
{
|
||||
hex; /* To avoid unreferenced argument warning */
|
||||
_asm
|
||||
ljmp PM2_ENTRY_PHEX16
|
||||
_endasm;
|
||||
}
|
||||
|
||||
void _up_putnl(void) __naked
|
||||
{
|
||||
_asm
|
||||
ljmp PM2_ENTRY_NEWLINE
|
||||
_endasm;
|
||||
}
|
||||
|
||||
void _up_puts(__code char *ptr)
|
||||
{
|
||||
for (; *ptr; ptr++)
|
||||
{
|
||||
_up_putc(*ptr);
|
||||
}
|
||||
}
|
||||
|
||||
void _up_delay(ubyte milliseconds) __naked
|
||||
{
|
||||
_asm
|
||||
mov r0, dpl
|
||||
00001$: mov r1, #230
|
||||
00002$: nop
|
||||
nop
|
||||
nop
|
||||
nop
|
||||
nop
|
||||
nop
|
||||
djnz r1, 00002$
|
||||
djnz r0, 00001$
|
||||
ret
|
||||
_endasm;
|
||||
}
|
||||
|
||||
/************************************************************
|
||||
* Public Functions
|
||||
************************************************************/
|
||||
|
||||
/************************************************************
|
||||
* Name: os_start
|
||||
*
|
||||
* Description:
|
||||
* "Fake" OS entry point.
|
||||
*
|
||||
************************************************************/
|
||||
|
||||
void os_start(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
/* Disable all interrupts */
|
||||
|
||||
IE = 0;
|
||||
|
||||
/* Then verify all of the interrupt */
|
||||
|
||||
g_irqtest = FALSE;
|
||||
|
||||
up_extint0();
|
||||
up_timer0();
|
||||
#ifndef CONFIG_8052_TIMER2
|
||||
up_timer0();
|
||||
#endif
|
||||
up_extint1();
|
||||
up_timer1();
|
||||
up_uart();
|
||||
up_timer2();
|
||||
|
||||
/* Now a real interrupt ... */
|
||||
|
||||
/* Configure timer 0 */
|
||||
|
||||
TR0 = 0; /* Make sure timer 0 is stopped */
|
||||
TF0 = 0; /* Clear the overflow flag */
|
||||
TMOD &= 0xF0; /* Set to mode 0 (without changing timer1) */
|
||||
TL0 = 0; /* Clear timer 0 value */
|
||||
TH0 = 0;
|
||||
TR0 = 1; /* Start the timer */
|
||||
|
||||
/* Start timer interrupts */
|
||||
|
||||
g_irqtest = TRUE;
|
||||
g_nirqs = 0;
|
||||
IE = 0x82; /* Enable interrupts */
|
||||
|
||||
/* Wait a about 500 MS */
|
||||
|
||||
_up_delay(500);
|
||||
|
||||
/* Disable the timer */
|
||||
|
||||
TR0 = 0; /* Stop timer 0 */
|
||||
IE = 0; /* Disable interrupts */
|
||||
|
||||
_up_puts("IRQs in 500 MS=");
|
||||
_up_puthex16(g_nirqs);
|
||||
_up_putnl();
|
||||
|
||||
/* end of test */
|
||||
|
||||
_up_puts("Test complete");
|
||||
_up_putnl();
|
||||
for(;;);
|
||||
}
|
||||
|
||||
/************************************************************
|
||||
* Name: irq_dispatch
|
||||
*
|
||||
* Description:
|
||||
* "Fake" IRQ dispatcher
|
||||
*
|
||||
***********************************************************/
|
||||
|
||||
void irq_dispatch(int irq, FAR void *context)
|
||||
{
|
||||
context;
|
||||
if (g_irqtest)
|
||||
{
|
||||
g_nirqs++;
|
||||
}
|
||||
else
|
||||
{
|
||||
_up_puts("Dispatch IRQ=");
|
||||
_up_puthex(irq);
|
||||
_up_putnl();
|
||||
}
|
||||
}
|
||||
|
||||
/************************************************************
|
||||
* Name: up_dumpstack / up_dumpframe
|
||||
*
|
||||
* Description:
|
||||
* "Fake" debug routines if needed.
|
||||
*
|
||||
************************************************************/
|
||||
|
||||
void up_dumpstack(void)
|
||||
{
|
||||
}
|
||||
|
||||
void up_dumpframe(FAR struct xcptcontext *context)
|
||||
{
|
||||
}
|
||||
|
||||
/************************************************************
|
||||
* Name: up_ledinit, up_ledon, up_ledoff
|
||||
*
|
||||
* Description:
|
||||
* "Fake" LED routines if needed
|
||||
*
|
||||
************************************************************/
|
||||
|
||||
void up_ledinit(void)
|
||||
{
|
||||
}
|
||||
|
||||
void up_ledon(ubyte led)
|
||||
{
|
||||
led;
|
||||
}
|
||||
|
||||
void up_ledoff(ubyte led)
|
||||
{
|
||||
led;
|
||||
}
|
||||
|
|
@ -274,7 +274,7 @@ ubyte up_savecontext(FAR struct xcptcontext *context) _naked
|
|||
|
||||
/* Push the top of frame stack pointer. We need to
|
||||
* decrement the current SP value by three to account
|
||||
* for dpst+IE on the stack above the end of the frame.
|
||||
* for dptr+IE on the stack above the end of the frame.
|
||||
*/
|
||||
|
||||
mov a, sp
|
||||
|
|
|
|||
|
|
@ -139,7 +139,6 @@ void up_timerinit(void)
|
|||
TR0 = 1; /* Start the timer */
|
||||
up_enable_irq(TIMER0_IRQ);
|
||||
|
||||
# warning "No support for timer 0 as the system timer"
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue