10 files changed, 15 insertions, 69 deletions
diff --git a/nuttx/configs/p112/include/board.h b/nuttx/configs/p112/include/board.h
index 55077709d..35a8011c1 100644
--- a/nuttx/configs/p112/include/board.h
+++ b/nuttx/configs/p112/include/board.h
@@ -41,8 +41,14 @@
  ************************************************************/
 
 /************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************/
+/* The Z180 is driven by a 16MHz crystal.  The system clock
+ * is equal to the crystal frequency.
+ */
+
+#define Z180_BOARD_XTAL  16000000        /* 16 MHz */
+#define Z180_SYSCLOCK    Z180_BOARD_XTAL /* 16 MHz */
 
 /************************************************************
  * Public Functions
diff --git a/nuttx/configs/p112/ostest/defconfig b/nuttx/configs/p112/ostest/defconfig
index eb02fe6bc..c30adcf22 100644
--- a/nuttx/configs/p112/ostest/defconfig
+++ b/nuttx/configs/p112/ostest/defconfig
@@ -140,7 +140,7 @@ CONFIG_Z180_PHYSHEAP_END=0x100000
 # CONFIG_Z180_UART1 is not set
 CONFIG_Z180_ESCCA=y
 # CONFIG_Z180_ESCCB is not set
-# CONFIG_Z180_TMR1 is not set
+# CONFIG_Z180_PRT1 is not set
 # CONFIG_Z180_PORTA is not set
 # CONFIG_Z180_PORTB is not set
 # CONFIG_Z180_MIMIC is not set
@@ -159,7 +159,7 @@ CONFIG_Z180_ESCCA_2STOP=0
 #
 # Architecture Options
 #
-# CONFIG_ARCH_NOINTC is not set
+CONFIG_ARCH_NOINTC=y
 # CONFIG_ARCH_DMA is not set
 # CONFIG_ARCH_IRQPRIO is not set
 # CONFIG_CUSTOM_STACK is not set
diff --git a/nuttx/configs/xtrs/nsh/defconfig b/nuttx/configs/xtrs/nsh/defconfig
index cc3d4da2f..8730ebab7 100644
--- a/nuttx/configs/xtrs/nsh/defconfig
+++ b/nuttx/configs/xtrs/nsh/defconfig
@@ -79,7 +79,7 @@ CONFIG_LINKER_ROM_AT_0000=y
 #
 # Architecture Options
 #
-# CONFIG_ARCH_NOINTC is not set
+CONFIG_ARCH_NOINTC=y
 # CONFIG_ARCH_DMA is not set
 # CONFIG_ARCH_IRQPRIO is not set
 # CONFIG_ARCH_STACKDUMP is not set
diff --git a/nuttx/configs/xtrs/ostest/defconfig b/nuttx/configs/xtrs/ostest/defconfig
index cf87886a2..a0a100bcf 100644
--- a/nuttx/configs/xtrs/ostest/defconfig
+++ b/nuttx/configs/xtrs/ostest/defconfig
@@ -79,7 +79,7 @@ CONFIG_LINKER_ROM_AT_0000=y
 #
 # Architecture Options
 #
-# CONFIG_ARCH_NOINTC is not set
+CONFIG_ARCH_NOINTC=y
 # CONFIG_ARCH_DMA is not set
 # CONFIG_ARCH_IRQPRIO is not set
 # CONFIG_ARCH_STACKDUMP is not set
diff --git a/nuttx/configs/xtrs/pashello/defconfig b/nuttx/configs/xtrs/pashello/defconfig
index d0b5d8245..d23c50716 100644
--- a/nuttx/configs/xtrs/pashello/defconfig
+++ b/nuttx/configs/xtrs/pashello/defconfig
@@ -80,7 +80,7 @@ CONFIG_LINKER_ROM_AT_0000=y
 #
 # Architecture Options
 #
-# CONFIG_ARCH_NOINTC is not set
+CONFIG_ARCH_NOINTC=y
 # CONFIG_ARCH_DMA is not set
 # CONFIG_ARCH_IRQPRIO is not set
 # CONFIG_ARCH_STACKDUMP is not set
diff --git a/nuttx/configs/xtrs/src/xtr_irq.c b/nuttx/configs/xtrs/src/xtr_irq.c
index e72c0be3b..1180149cd 100644
--- a/nuttx/configs/xtrs/src/xtr_irq.c
+++ b/nuttx/configs/xtrs/src/xtr_irq.c
@@ -88,33 +88,3 @@ void up_irqinitialize(void)
   irqrestore(Z80_C_FLAG);
 #endif
 }
-
-/****************************************************************************
- * Name: up_disable_irq
- *
- * Description:
- *   Disable the IRQ specified by 'irq'
- *
- ****************************************************************************/
-
-#ifndef CONFIG_ARCH_NOINTC
-void up_disable_irq(int irq)
-{
-  irqrestore(0);
-}
-#endif
-
-/****************************************************************************
- * Name: up_enable_irq
- *
- * Description:
- *   Enable the IRQ specified by 'irq'
- *
- ****************************************************************************/
-
-#ifndef CONFIG_ARCH_NOINTC
-void up_enable_irq(int irq)
-{
- irqrestore(Z80_C_FLAG);
-}
-#endif
diff --git a/nuttx/configs/z80sim/nsh/defconfig b/nuttx/configs/z80sim/nsh/defconfig
index 1f8edacb1..fb9fac546 100644
--- a/nuttx/configs/z80sim/nsh/defconfig
+++ b/nuttx/configs/z80sim/nsh/defconfig
@@ -79,7 +79,7 @@ CONFIG_LINKER_DATA_AREA=0x8000
 #
 # Architecture Options
 #
-# CONFIG_ARCH_NOINTC is not set
+CONFIG_ARCH_NOINTC=y
 # CONFIG_ARCH_DMA is not set
 # CONFIG_ARCH_IRQPRIO is not set
 # CONFIG_ARCH_STACKDUMP is not set
diff --git a/nuttx/configs/z80sim/ostest/defconfig b/nuttx/configs/z80sim/ostest/defconfig
index a961d550d..d3410d52d 100644
--- a/nuttx/configs/z80sim/ostest/defconfig
+++ b/nuttx/configs/z80sim/ostest/defconfig
@@ -79,7 +79,7 @@ CONFIG_LINKER_DATA_AREA=0x8000
 #
 # Architecture Options
 #
-# CONFIG_ARCH_NOINTC is not set
+CONFIG_ARCH_NOINTC=y
 # CONFIG_ARCH_DMA is not set
 # CONFIG_ARCH_IRQPRIO is not set
 # CONFIG_ARCH_STACKDUMP is not set
diff --git a/nuttx/configs/z80sim/pashello/defconfig b/nuttx/configs/z80sim/pashello/defconfig
index a8d565ce2..e7dee626c 100644
--- a/nuttx/configs/z80sim/pashello/defconfig
+++ b/nuttx/configs/z80sim/pashello/defconfig
@@ -79,7 +79,7 @@ CONFIG_LINKER_DATA_AREA=0x8000
 #
 # Architecture Options
 #
-# CONFIG_ARCH_NOINTC is not set
+CONFIG_ARCH_NOINTC=y
 # CONFIG_ARCH_DMA is not set
 # CONFIG_ARCH_IRQPRIO is not set
 # CONFIG_ARCH_STACKDUMP is not set
diff --git a/nuttx/configs/z80sim/src/z80_irq.c b/nuttx/configs/z80sim/src/z80_irq.c
index c7566f6d3..7611dc29e 100644
--- a/nuttx/configs/z80sim/src/z80_irq.c
+++ b/nuttx/configs/z80sim/src/z80_irq.c
@@ -88,33 +88,3 @@ void up_irqinitialize(void)
   irqrestore(Z80_C_FLAG);
 #endif
 }
-
-/****************************************************************************
- * Name: up_disable_irq
- *
- * Description:
- *   Disable the IRQ specified by 'irq'
- *
- ****************************************************************************/
-
-#ifndef CONFIG_ARCH_NOINTC
-void up_disable_irq(int irq)
-{
-  irqrestore(0);
-}
-#endif
-
-/****************************************************************************
- * Name: up_enable_irq
- *
- * Description:
- *   Enable the IRQ specified by 'irq'
- *
- ****************************************************************************/
-
-#ifndef CONFIG_ARCH_NOINTC
-void up_enable_irq(int irq)
-{
- irqrestore(Z80_C_FLAG);
-}
-#endif