diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-28 15:53:42 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-28 15:53:42 +0000 |
commit | 73198560b5abd3c9a467a28367c8560cb3cb787e (patch) | |
tree | e93e4cbd7523605da696b19298815451fbb8949e /nuttx/arch | |
parent | 0db70c6895320b8a835d544e5583f6c8714a9675 (diff) | |
download | px4-nuttx-73198560b5abd3c9a467a28367c8560cb3cb787e.tar.gz px4-nuttx-73198560b5abd3c9a467a28367c8560cb3cb787e.tar.bz2 px4-nuttx-73198560b5abd3c9a467a28367c8560cb3cb787e.zip |
Verify that z8 targets still build (under Cygwin)
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5396 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch')
-rw-r--r-- | nuttx/arch/arm/src/calypso/calypso_keypad.c | 1 | ||||
-rw-r--r-- | nuttx/arch/z80/src/common/up_doirq.c | 3 | ||||
-rw-r--r-- | nuttx/arch/z80/src/ez80/switch.h | 5 | ||||
-rw-r--r-- | nuttx/arch/z80/src/z8/switch.h | 8 | ||||
-rw-r--r-- | nuttx/arch/z80/src/z80/switch.h | 5 |
5 files changed, 13 insertions, 9 deletions
diff --git a/nuttx/arch/arm/src/calypso/calypso_keypad.c b/nuttx/arch/arm/src/calypso/calypso_keypad.c index aeb16eb4d..d7f8ec780 100644 --- a/nuttx/arch/arm/src/calypso/calypso_keypad.c +++ b/nuttx/arch/arm/src/calypso/calypso_keypad.c @@ -203,6 +203,7 @@ static int keypad_open(file_t * filep) register uint16_t reg; /* Unmask keypad interrupt */ + reg = readw(ARMIO_REG(KBD_GPIO_MASKIT)); writew(reg & ~KBD_INT, ARMIO_REG(KBD_GPIO_MASKIT)); diff --git a/nuttx/arch/z80/src/common/up_doirq.c b/nuttx/arch/z80/src/common/up_doirq.c index fd871e246..a4bb830fd 100644 --- a/nuttx/arch/z80/src/common/up_doirq.c +++ b/nuttx/arch/z80/src/common/up_doirq.c @@ -84,7 +84,7 @@ FAR chipreg_t *up_doirq(uint8_t irq, FAR chipreg_t *regs) #else if (irq < NR_IRQS) { - FAR chipreg_t *savestate; + DECL_SAVESTATE(); /* Indicate that we have entered IRQ processing logic */ @@ -106,4 +106,3 @@ FAR chipreg_t *up_doirq(uint8_t irq, FAR chipreg_t *regs) return regs; #endif } - diff --git a/nuttx/arch/z80/src/ez80/switch.h b/nuttx/arch/z80/src/ez80/switch.h index de6506490..0bac6aed1 100644 --- a/nuttx/arch/z80/src/ez80/switch.h +++ b/nuttx/arch/z80/src/ez80/switch.h @@ -2,7 +2,7 @@ * arch/z80/src/ez80/switch.h * arch/z80/src/chip/switch.h * - * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -69,6 +69,9 @@ /* The following macro is used when the system enters interrupt handling logic */ +#define DECL_SAVESTATE() \ + FAR chipreg_t *savestate + #define IRQ_ENTER(irq, regs) \ do { \ savestate = (FAR chipreg_t *)current_regs; \ diff --git a/nuttx/arch/z80/src/z8/switch.h b/nuttx/arch/z80/src/z8/switch.h index 7738f2436..45089947c 100644 --- a/nuttx/arch/z80/src/z8/switch.h +++ b/nuttx/arch/z80/src/z8/switch.h @@ -2,7 +2,7 @@ * arch/z80/src/z8/switch.h * arch/z80/src/chip/switch.h * - * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -114,10 +114,8 @@ /* The following macro is used when the system enters interrupt handling logic */ -#define IRQ_SAVE(irq, regs) savestate = (FAR chipreg_t *)current_regs; -#define IRQ_ENTER(irq, regs) current_regs = (regs) - -/* The following macro is used when the system exits interrupt handling logic */ +#define DECL_SAVESTATE() \ + struct z8_irqstate_s savestate #define IRQ_ENTER(irq, regs) \ do { \ diff --git a/nuttx/arch/z80/src/z80/switch.h b/nuttx/arch/z80/src/z80/switch.h index e7f705cfd..3732a32a3 100644 --- a/nuttx/arch/z80/src/z80/switch.h +++ b/nuttx/arch/z80/src/z80/switch.h @@ -2,7 +2,7 @@ * arch/z80/src/z80/switch.h * arch/z80/src/chip/switch.h * - * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -68,6 +68,9 @@ /* The following macro is used when the system enters interrupt handling logic */ +#define DECL_SAVESTATE() \ + FAR chipreg_t *savestate + #define IRQ_ENTER(irq, regs) \ do { \ savestate = (FAR chipreg_t *)current_regs; \ |