diff options
Diffstat (limited to 'nuttx/arch/mips/src')
| -rw-r--r-- | nuttx/arch/mips/src/common/up_initialize.c | 2 | ||||
| -rwxr-xr-x | nuttx/arch/mips/src/common/up_internal.h | 10 | ||||
| -rw-r--r-- | nuttx/arch/mips/src/mips32/up_swint0.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/mips/src/mips32/up_syscall0.S | 24 |
4 files changed, 32 insertions, 6 deletions
diff --git a/nuttx/arch/mips/src/common/up_initialize.c b/nuttx/arch/mips/src/common/up_initialize.c index b51319175..15e242a6e 100644 --- a/nuttx/arch/mips/src/common/up_initialize.c +++ b/nuttx/arch/mips/src/common/up_initialize.c @@ -2,7 +2,7 @@ * arch/mips/src/common/up_initialize.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/nuttx/arch/mips/src/common/up_internal.h b/nuttx/arch/mips/src/common/up_internal.h index 8da7e9605..bca7656b8 100755 --- a/nuttx/arch/mips/src/common/up_internal.h +++ b/nuttx/arch/mips/src/common/up_internal.h @@ -2,7 +2,7 @@ * arch/mips/common/up_internal.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -169,6 +169,14 @@ extern void up_copystate(uint32_t *dest, uint32_t *src); extern void up_puts(const char *str); extern void up_lowputs(const char *str); +/* Defined in drivers/lowconsole.c */ + +#ifdef CONFIG_DEV_LOWCONSOLE +extern void lowconsole_init(void); +#else +# define lowconsole_init() +#endif + /* Debug */ #ifdef CONFIG_ARCH_STACKDUMP diff --git a/nuttx/arch/mips/src/mips32/up_swint0.c b/nuttx/arch/mips/src/mips32/up_swint0.c index 6929d0b12..0e2270caa 100644 --- a/nuttx/arch/mips/src/mips32/up_swint0.c +++ b/nuttx/arch/mips/src/mips32/up_swint0.c @@ -2,7 +2,7 @@ * arch/mips/src/mips32/up_swint0.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/nuttx/arch/mips/src/mips32/up_syscall0.S b/nuttx/arch/mips/src/mips32/up_syscall0.S index 241fd7aa7..b5a0e5213 100644 --- a/nuttx/arch/mips/src/mips32/up_syscall0.S +++ b/nuttx/arch/mips/src/mips32/up_syscall0.S @@ -2,7 +2,7 @@ * arch/mips/src/mips32/up_syscall0.S * * Copyright (C) 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -73,6 +73,9 @@ * up_syscall2 - System call SYS_ argument and two additional parameters. * up_syscall3 - System call SYS_ argument and three additional parameters. * + * Assumption: + * All interrupts are disabled except for the software interrupts. + * ****************************************************************************/ .text @@ -85,10 +88,25 @@ sys_call3: /* r4 holds the syscall number, arguments in r5, r6, and r7 */ .set push .set noat + + /* Set Bit 8 to request the software interrupt */ + mfc0 t3, MIPS32_CP0_CAUSE /* t3 = CP0 cause register */ ori t3, (1 << 8) /* Bit 8: Request software interrupt 0 */ .set noreorder mtc0 t3, MIPS32_CP0_CAUSE /* Trigger the software interrupt */ - nop /* Delay slot */ - j ra /* Return with result in v0 */ + + /* The actual interrupt will not a occur for a few more cycles. Let's + * put a few nop's here in hope that the SW interrupt occurs during + * the sequence of nops. + */ + + nop + nop + nop + nop + + /* Then return with the result of the software interrupt in v0 */ + + j ra .end sys_call0 |