summaryrefslogtreecommitdiff
path: root/nuttx/arch/z80/include
diff options
context:
space:
mode:
Diffstat (limited to 'nuttx/arch/z80/include')
-rw-r--r--nuttx/arch/z80/include/types.h2
-rw-r--r--nuttx/arch/z80/include/z80/irq.h7
2 files changed, 5 insertions, 4 deletions
diff --git a/nuttx/arch/z80/include/types.h b/nuttx/arch/z80/include/types.h
index d650e5a01..ade00123a 100644
--- a/nuttx/arch/z80/include/types.h
+++ b/nuttx/arch/z80/include/types.h
@@ -76,7 +76,7 @@ typedef unsigned long uint32;
* irqsave()
*/
-typedef unsigned char irqstate_t;
+typedef uint16 irqstate_t;
#endif /* __ASSEMBLY__ */
diff --git a/nuttx/arch/z80/include/z80/irq.h b/nuttx/arch/z80/include/z80/irq.h
index c68dd76f9..059bf0486 100644
--- a/nuttx/arch/z80/include/z80/irq.h
+++ b/nuttx/arch/z80/include/z80/irq.h
@@ -77,13 +77,14 @@
* Public Types
****************************************************************************/
+#ifndef __ASSEMBLY__
+
/* This is the the type of the register save array */
typedef uint16 chipreg_t;
/* This struct defines the way the registers are stored. */
-#ifndef __ASSEMBLY__
struct xcptcontext
{
/* Register save area */
@@ -120,8 +121,8 @@ extern "C" {
#define EXTERN extern
#endif
-EXTERN irqstate_t irqsave(void);
-EXTERN void irqrestore(irqstate_t flags);
+EXTERN irqstate_t irqsave(void) __naked;
+EXTERN void irqrestore(irqstate_t flags) __naked;
#undef EXTERN
#ifdef __cplusplus