summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nuttx/ChangeLog3
-rw-r--r--nuttx/Documentation/NuttX.html4
-rwxr-xr-xnuttx/arch/hc/include/m9s12/irq.h (renamed from nuttx/arch/hc/include/mc9s12ne64/irq.h)10
-rwxr-xr-xnuttx/arch/hc/src/m9s12/Make.defs (renamed from nuttx/arch/hc/src/mc9s12ne64/Make.defs)10
-rwxr-xr-xnuttx/arch/hc/src/m9s12/chip.h (renamed from nuttx/arch/hc/src/mc9s12ne64/chip.h)8
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_atd.h (renamed from nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_atd10b8cv3.h)9
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_crg.h (renamed from nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_crgv4.h)10
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_emac.h (renamed from nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_emacv1.h)8
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_flash.h (renamed from nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_flash.h)12
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_iic.h (renamed from nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_iicv2.h)8
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_int.h (renamed from nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_intv1.h)10
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_internal.h (renamed from nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_internal.h)13
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_irq.c129
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_lowputc.S (renamed from nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_lowputc.S)8
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_mebi.h (renamed from nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_mebiv3.h)10
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_mmc.h (renamed from nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_mmcv4.h)10
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_phy.h (renamed from nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_phyv2.h)8
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_pim.h (renamed from nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_pim.h)10
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_sci.h (renamed from nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_sciv3.h)10
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_serial.c (renamed from nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_serial.c)4
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_spi.h (renamed from nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_spiv3.h)10
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_start.S (renamed from nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_start.S)16
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_tim.h (renamed from nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_tim16b4cv1.h)10
-rwxr-xr-xnuttx/arch/hc/src/m9s12/m9s12_vectors.S (renamed from nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_vectors.S)6
-rwxr-xr-xnuttx/configs/demo9s12ne64/include/board.h2
-rwxr-xr-xnuttx/configs/demo9s12ne64/ostest/defconfig2
-rwxr-xr-xnuttx/tools/zipme.sh4
27 files changed, 240 insertions, 104 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index eac1fe190..28ccdcdab 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -1455,3 +1455,6 @@
* examplex/wlan, configs/olimex-lpc1766stk/wlan, drivers/usbhost/usbhost_rtl8187.c,
Add infrastructure to support RTL18187 wireless USB.
* configs/nucleus2g -- backed out USB host changes... wrong board.
+ * Renamed arc/hc/include/mc9s12ne64 and src/mc9s12ne64 -- m9s12. That name is
+ shorter and more general.
+
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index d9e9cca0e..34120e36c 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -8,7 +8,7 @@
<tr align="center" bgcolor="#e4e4e4">
<td>
<h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
- <p>Last Updated: February 11, 2011</p>
+ <p>Last Updated: February 13, 2011</p>
</td>
</tr>
</table>
@@ -2032,6 +2032,8 @@ nuttx-5.18 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
* examplex/wlan, configs/olimex-lpc1766stk/wlan, drivers/usbhost/usbhost_rtl8187.c,
Add infrastructure to support RTL18187 wireless USB.
* configs/nucleus2g -- backed out USB host changes... wrong board.
+ * Renamed arc/hc/include/mc9s12ne64 and src/mc9s12ne64 -- m9s12. That name is
+ shorter and more general.
pascal-2.1 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
diff --git a/nuttx/arch/hc/include/mc9s12ne64/irq.h b/nuttx/arch/hc/include/m9s12/irq.h
index 8462a8dd3..9df447b14 100755
--- a/nuttx/arch/hc/include/mc9s12ne64/irq.h
+++ b/nuttx/arch/hc/include/m9s12/irq.h
@@ -1,7 +1,7 @@
/************************************************************************************
- * arch/hc/include/mc9s12ne64/irq.h
+ * arch/hc/include/m9s12/irq.h
*
- * Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -37,8 +37,8 @@
* only indirectly through nuttx/irq.h
*/
-#ifndef __ARCH_HC_INCLUDE_MC9S12NE64_IRQ_H
-#define __ARCH_HC_INCLUDE_MC9S12NE64_IRQ_H
+#ifndef __ARCH_HC_INCLUDE_M9S12_IRQ_H
+#define __ARCH_HC_INCLUDE_M9S12_IRQ_H
/************************************************************************************
* Included Files
@@ -126,4 +126,4 @@ extern "C" {
#endif
#endif
-#endif /* __ARCH_HC_INCLUDE_MC9S12NE64_IRQ_H */
+#endif /* __ARCH_HC_INCLUDE_M9S12_IRQ_H */
diff --git a/nuttx/arch/hc/src/mc9s12ne64/Make.defs b/nuttx/arch/hc/src/m9s12/Make.defs
index 46330eb5b..3f5a7ddd6 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/Make.defs
+++ b/nuttx/arch/hc/src/m9s12/Make.defs
@@ -1,7 +1,7 @@
############################################################################
-# arch/arm/src/stm32/Make.defs
+# arch/arm/src/m9s12/Make.defs
#
-# Copyright (C) 2009 Gregory Nutt. All rights reserved.
+# Copyright (C) 2009,2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
#
# Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,7 @@
#
############################################################################
-HEAD_ASRC = mc9s12ne64_vectors.S
+HEAD_ASRC = m9s12_vectors.S
CMN_ASRCS =
CMN_CSRCS = up_allocateheap.c up_createstack.c up_idle.c up_initialize.c \
@@ -41,5 +41,5 @@ CMN_CSRCS = up_allocateheap.c up_createstack.c up_idle.c up_initialize.c \
up_modifyreg32.c up_modifyreg8.c up_puts.c up_releasestack.c \
up_udelay.c up_usestack.c
-CHIP_ASRCS = mc9s12ne64_start.S mc9s12ne64_lowputc.S
-CHIP_CSRCS = mc9s12ne64_serial.c
+CHIP_ASRCS = m9s12_start.S m9s12_lowputc.S
+CHIP_CSRCS = m9s12_serial.c m9s12_irq.c
diff --git a/nuttx/arch/hc/src/mc9s12ne64/chip.h b/nuttx/arch/hc/src/m9s12/chip.h
index a2128880c..422d6978c 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/chip.h
+++ b/nuttx/arch/hc/src/m9s12/chip.h
@@ -1,5 +1,5 @@
/************************************************************************************
- * arch/hc/src/mc9s12ne64/chip.h
+ * arch/hc/src/m9s12/chip.h
*
* Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_HC_SRC_MC9S12NE64_CHIP_H
-#define __ARCH_HC_SRC_MC9S12NE64_CHIP_H
+#ifndef __ARCH_HC_SRC_M9S12_CHIP_H
+#define __ARCH_HC_SRC_M9S12_CHIP_H
/************************************************************************************
* Included Files
@@ -99,4 +99,4 @@
* Public Functions
************************************************************************************/
-#endif /* __ARCH_HC_SRC_MC9S12NE64_CHIP_H */
+#endif /* __ARCH_HC_SRC_M9S12_CHIP_H */
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_atd10b8cv3.h b/nuttx/arch/hc/src/m9s12/m9s12_atd.h
index 23c99883d..e79f028ae 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_atd10b8cv3.h
+++ b/nuttx/arch/hc/src/m9s12/m9s12_atd.h
@@ -1,5 +1,6 @@
/************************************************************************************
- * arch/hc/src/mc9s12ne64/mc9s12ne64_atd10b8cv3.h
+ * arch/hc/src/m9s12/m9s12_atd.h
+ * Defintions for ATD10b8c v3
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -33,8 +34,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_ATD10B8CV3_H
-#define __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_ATD10B8CV3_H
+#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_ATD_H
+#define __ARCH_ARM_HC_SRC_M9S12_M9S12_ATD_H
/************************************************************************************
* Included Files
@@ -319,4 +320,4 @@
* Public Functions
************************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_ATD10B8CV3_H */
+#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_ATD_H */
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_crgv4.h b/nuttx/arch/hc/src/m9s12/m9s12_crg.h
index 0d8a91717..0c71cee5a 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_crgv4.h
+++ b/nuttx/arch/hc/src/m9s12/m9s12_crg.h
@@ -1,7 +1,7 @@
/************************************************************************************
- * arch/hc/src/mc9s12ne64/mc9s12ne64_crgv4.h
+ * arch/hc/src/m9s12/m9s12_crg.h
*
- * Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_CRGV4_H
-#define __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_CRGV4_H
+#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_CRG_H
+#define __ARCH_ARM_HC_SRC_M9S12_M9S12_CRG_H
/************************************************************************************
* Included Files
@@ -137,4 +137,4 @@
* Public Functions
************************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_CRGV4_H */
+#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_CRG_H */
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_emacv1.h b/nuttx/arch/hc/src/m9s12/m9s12_emac.h
index 8869b83e9..b12f238b5 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_emacv1.h
+++ b/nuttx/arch/hc/src/m9s12/m9s12_emac.h
@@ -1,5 +1,5 @@
/************************************************************************************
- * arch/hc/src/mc9s12ne64/mc9s12ne64_emacv1.h
+ * arch/hc/src/m9s12/m9s12_emac.h
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_EMACV1_H
-#define __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_EMACV1_H
+#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_EMAC_H
+#define __ARCH_ARM_HC_SRC_M9S12_M9S12_EMAC_H
/************************************************************************************
* Included Files
@@ -245,4 +245,4 @@
* Public Functions
************************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_EMACV1_H */
+#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_EMAC_H */
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_flash.h b/nuttx/arch/hc/src/m9s12/m9s12_flash.h
index 410ae3997..8761c328f 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_flash.h
+++ b/nuttx/arch/hc/src/m9s12/m9s12_flash.h
@@ -1,7 +1,7 @@
/************************************************************************************
- * arch/hc/src/mc9s12ne64/mc9s12ne64_flash.h
+ * arch/hc/src/m9s12/m9s12_flash.h
*
- * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_FLASH_H
-#define __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_FLASH_H
+#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_FLASH_H
+#define __ARCH_ARM_HC_SRC_M9S12_M9S12_FLASH_H
/************************************************************************************
* Included Files
@@ -54,7 +54,7 @@
* 0xc000-0xffff: 16Kb Fixed FLASH EEPROM (Page 3f)
* (see chip.h)
*
- * The MC9S12NE64 implements 6 bits of the PPAGE register which gives it a
+ * The M9S12 implements 6 bits of the PPAGE register which gives it a
* 1 Mbyte program memory address space that is accessed through the PPAGE
* window. The lower 768K portion of the address space, accessed with PPAGE
* values $00 through $2F, is reserved for external memory when the part is
@@ -206,4 +206,4 @@
* Public Functions
************************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_FLASH_H */
+#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_FLASH_H */
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_iicv2.h b/nuttx/arch/hc/src/m9s12/m9s12_iic.h
index f767487c4..5d26391a0 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_iicv2.h
+++ b/nuttx/arch/hc/src/m9s12/m9s12_iic.h
@@ -1,5 +1,5 @@
/************************************************************************************
- * arch/hc/src/mc9s12ne64/mc9s12ne64_iicv2.h
+ * arch/hc/src/m9s12/m9s12_iic.h (v2)
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_IICV2_H
-#define __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_IICV2_H
+#ifndef __ARCH_ARM_HC_SRC_M9S124_M9S124_IIC_H
+#define __ARCH_ARM_HC_SRC_M9S124_M9S124_IIC_H
/************************************************************************************
* Included Files
@@ -105,4 +105,4 @@
* Public Functions
************************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_IICV2_H */
+#endif /* __ARCH_ARM_HC_SRC_M9S124_M9S124_IIC_H */
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_intv1.h b/nuttx/arch/hc/src/m9s12/m9s12_int.h
index 7aa6b996f..1794e0b73 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_intv1.h
+++ b/nuttx/arch/hc/src/m9s12/m9s12_int.h
@@ -1,7 +1,7 @@
/************************************************************************************
- * arch/hc/src/mc9s12ne64/mc9s12ne64_intv1.h
+ * arch/hc/src/m9s12/m9s12_int.h (v1)
*
- * Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_INTV1_H
-#define __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_INTV1_H
+#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_INT_H
+#define __ARCH_ARM_HC_SRC_M9S12_M9S12_INT_H
/************************************************************************************
* Included Files
@@ -100,4 +100,4 @@
* Public Functions
************************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_INTV1_H */
+#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_INT_H */
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_internal.h b/nuttx/arch/hc/src/m9s12/m9s12_internal.h
index 550580bda..43d4188f2 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_internal.h
+++ b/nuttx/arch/hc/src/m9s12/m9s12_internal.h
@@ -1,7 +1,7 @@
/************************************************************************************
- * arch/hc/src/mc9s12ne64/mc9x12ne64_internal.h
+ * arch/hc/src/m9s12/m9s12_internal.h
*
- * Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_HC_SRC_MC9S12NE64_MC9S12NE64_INTERNAL_H
-#define __ARCH_HC_SRC_MC9S12NE64_MC9S12NE64_INTERNAL_H
+#ifndef __ARCH_HC_SRC_M9S12_M9S12_INTERNAL_H
+#define __ARCH_HC_SRC_M9S12_M9S12_INTERNAL_H
/************************************************************************************
* Included Files
@@ -45,6 +45,7 @@
#ifndef __ASSEMBLY__
# include <stdint.h>
# include <stdbool.h>
+# include <nuttx/spi.h>
#endif
#include "up_internal.h"
@@ -126,8 +127,6 @@ EXTERN int hcs12_ethinitialize(int intf);
*
************************************************************************************/
-struct spi_dev_s;
-enum spi_dev_e;
EXTERN void hcs12_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
EXTERN uint8_t hcs12_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
@@ -137,4 +136,4 @@ EXTERN uint8_t hcs12_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_HC_SRC_MC9S12NE64_MC9S12NE64_INTERNAL_H */
+#endif /* __ARCH_HC_SRC_M9S12_M9S12_INTERNAL_H */
diff --git a/nuttx/arch/hc/src/m9s12/m9s12_irq.c b/nuttx/arch/hc/src/m9s12/m9s12_irq.c
new file mode 100755
index 000000000..73c5ef801
--- /dev/null
+++ b/nuttx/arch/hc/src/m9s12/m9s12_irq.c
@@ -0,0 +1,129 @@
+/****************************************************************************
+ * arch/arm/src/m9s12/m9s12_irq.c
+ * arch/arm/src/chip/m9s12_irq.c
+ *
+ * Copyright (C) 2011 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 NuttX 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 <stdint.h>
+#include <debug.h>
+
+#include <nuttx/irq.h>
+#include <nuttx/arch.h>
+#include <arch/irq.h>
+
+#include "up_arch.h"
+#include "os_internal.h"
+#include "up_internal.h"
+#include "m9s12_internal.h"
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+uint16_t *current_regs;
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: up_irqinitialize
+ ****************************************************************************/
+
+void up_irqinitialize(void)
+{
+ /* Disable all interrupts */
+#warning "Missing Logic"
+
+ /* currents_regs is non-NULL only while processing an interrupt */
+
+ current_regs = NULL;
+
+}
+
+/****************************************************************************
+ * Name: up_disable_irq
+ *
+ * Description:
+ * Disable the IRQ specified by 'irq'
+ *
+ ****************************************************************************/
+
+void up_disable_irq(int irq)
+{
+#warning "Missing Logic"
+}
+
+/****************************************************************************
+ * Name: up_enable_irq
+ *
+ * Description:
+ * Enable the IRQ specified by 'irq'
+ *
+ ****************************************************************************/
+
+void up_enable_irq(int irq)
+{
+#warning "Missing Logic"
+}
+
+/****************************************************************************
+ * Name: up_maskack_irq
+ *
+ * Description:
+ * Mask the IRQ and acknowledge it
+ *
+ ****************************************************************************/
+
+void up_maskack_irq(int irq)
+{
+#warning "Missing Logic"
+}
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_lowputc.S b/nuttx/arch/hc/src/m9s12/m9s12_lowputc.S
index 3a42f2de0..e4bc7858c 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_lowputc.S
+++ b/nuttx/arch/hc/src/m9s12/m9s12_lowputc.S
@@ -1,7 +1,7 @@
/**************************************************************************
- * arch/arm/src/mc9s12ne64/mc9s12ne64_lowputc.S
+ * arch/arm/src/m9s12/m9s12_lowputc.S
*
- * Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -40,8 +40,8 @@
#include <nuttx/config.h>
#include "up_internal.h"
-#include "mc9s12ne64_internal.h"
-#include "mc9s12ne64_flash.h"
+#include "m9s12_internal.h"
+#include "m9s12_flash.h"
/**************************************************************************
* Private Definitions
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_mebiv3.h b/nuttx/arch/hc/src/m9s12/m9s12_mebi.h
index e1bc6cddd..7db814b65 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_mebiv3.h
+++ b/nuttx/arch/hc/src/m9s12/m9s12_mebi.h
@@ -1,7 +1,7 @@
/************************************************************************************
- * arch/hc/src/mc9s12ne64/mc9s12ne64_mebiv3.h
+ * arch/hc/src/m9s12/m9s12_mebi.h (v3)
*
- * Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_MEBIV3_H
-#define __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_MEBIV3_H
+#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_MEBI_H
+#define __ARCH_ARM_HC_SRC_M9S12_M9S12_MEBI_H
/************************************************************************************
* Included Files
@@ -163,4 +163,4 @@
* Public Functions
************************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_MEBIV3_H */
+#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_MEBI_H */
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_mmcv4.h b/nuttx/arch/hc/src/m9s12/m9s12_mmc.h
index 495307663..2dadd5be8 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_mmcv4.h
+++ b/nuttx/arch/hc/src/m9s12/m9s12_mmc.h
@@ -1,7 +1,7 @@
/************************************************************************************
- * arch/hc/src/mc9s12ne64/mc9s12ne64_mmcv4.h
+ * arch/hc/src/m9s12/m9s12_mmcv4.h (v4)
*
- * Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_MMCV4_H
-#define __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_MMCV4_H
+#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_MMC_H
+#define __ARCH_ARM_HC_SRC_M9S12_M9S12_MMC_H
/************************************************************************************
* Included Files
@@ -165,4 +165,4 @@
* Public Functions
************************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_MMCV4_H */
+#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_MMC_H */
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_phyv2.h b/nuttx/arch/hc/src/m9s12/m9s12_phy.h
index 78c388dc1..635036b46 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_phyv2.h
+++ b/nuttx/arch/hc/src/m9s12/m9s12_phy.h
@@ -1,5 +1,5 @@
/************************************************************************************
- * arch/hc/src/mc9s12ne64/mc9s12ne64_phyv2.h
+ * arch/hc/src/m9s12/m9s12_phyv2.h (v2)
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_PHYV2_H
-#define __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_PHYV2_H
+#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_PHY_H
+#define __ARCH_ARM_HC_SRC_M9S12_M9S12_PHY_H
/************************************************************************************
* Included Files
@@ -94,4 +94,4 @@
* Public Functions
************************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_PHYV2_H */
+#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_PHY_H */
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_pim.h b/nuttx/arch/hc/src/m9s12/m9s12_pim.h
index 62bc5f0fa..8b857fdb6 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_pim.h
+++ b/nuttx/arch/hc/src/m9s12/m9s12_pim.h
@@ -1,7 +1,7 @@
/************************************************************************************
- * arch/hc/src/mc9s12ne64/mc9s12ne64_pim.h
+ * arch/hc/src/m9s12/m9s12_pim.h
*
- * Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_PIM_H
-#define __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_PIM_H
+#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_PIM_H
+#define __ARCH_ARM_HC_SRC_M9S12_M9S12_PIM_H
/************************************************************************************
* Included Files
@@ -244,4 +244,4 @@
* Public Functions
************************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_PIM_H */
+#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_PIM_H */
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_sciv3.h b/nuttx/arch/hc/src/m9s12/m9s12_sci.h
index fdcae5415..9f798aae4 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_sciv3.h
+++ b/nuttx/arch/hc/src/m9s12/m9s12_sci.h
@@ -1,7 +1,7 @@
/************************************************************************************
- * arch/hc/src/mc9s12ne64/mc9s12ne64_sciv3.h
+ * arch/hc/src/m9s12/m9s12_sci.h (v3)
*
- * Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_SCIV3_H
-#define __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_SCIV3_H
+#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_SCI_H
+#define __ARCH_ARM_HC_SRC_M9S12_M9S12_SCI_H
/************************************************************************************
* Included Files
@@ -153,4 +153,4 @@
* Public Functions
************************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_SCIV3_H */
+#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_SCI_H */
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_serial.c b/nuttx/arch/hc/src/m9s12/m9s12_serial.c
index ed8914a9d..1fddec3d9 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_serial.c
+++ b/nuttx/arch/hc/src/m9s12/m9s12_serial.c
@@ -1,7 +1,7 @@
/****************************************************************************
- * arch/hc/src/mc9s12ne64/mc9s12ne64_serial.c
+ * arch/hc/src/m9s12/m9s12_serial.c
*
- * Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_spiv3.h b/nuttx/arch/hc/src/m9s12/m9s12_spi.h
index 6469c4d8f..fe3e3cddf 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_spiv3.h
+++ b/nuttx/arch/hc/src/m9s12/m9s12_spi.h
@@ -1,7 +1,7 @@
/************************************************************************************
- * arch/hc/src/mc9s12ne64/mc9s12ne64_spiv3.h
+ * arch/hc/src/m9s12/m9s12_spi.h (v3)
*
- * Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_SPIV3_H
-#define __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_SPIV3_H
+#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_SPI_H
+#define __ARCH_ARM_HC_SRC_M9S12_M9S12_SPI_H
/************************************************************************************
* Included Files
@@ -111,4 +111,4 @@
* Public Functions
************************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_SPIV3_H */
+#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_SPI_H */
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_start.S b/nuttx/arch/hc/src/m9s12/m9s12_start.S
index f39792ccb..b7585d75b 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_start.S
+++ b/nuttx/arch/hc/src/m9s12/m9s12_start.S
@@ -1,8 +1,8 @@
/****************************************************************************
- * arch/hc/src/mc9s12ne64/mc9s12ne64_start.S
- * arch/hc/src/chip/mc9s12ne64_start.S
+ * arch/hc/src/m9s12/m9s12_start.S
+ * arch/hc/src/chip/m9s12_start.S
*
- * Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -40,10 +40,10 @@
#include <nuttx/config.h>
-#include "mc9s12ne64_internal.h"
-#include "mc9s12ne64_mmcv4.h"
-#include "mc9s12ne64_crgv4.h"
-#include "mc9s12ne64_flash.h"
+#include "m9s12_internal.h"
+#include "m9s12_mmc.h"
+#include "m9s12_crg.h"
+#include "m9s12_flash.h"
/****************************************************************************
* Private Definitions
@@ -59,7 +59,7 @@
.globl __start
.globl os_start
- .file "mc9s12ne64_start.S"
+ .file "m9s12_start.S"
/****************************************************************************
* Macros
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_tim16b4cv1.h b/nuttx/arch/hc/src/m9s12/m9s12_tim.h
index 29d0fcd74..820e069f1 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_tim16b4cv1.h
+++ b/nuttx/arch/hc/src/m9s12/m9s12_tim.h
@@ -1,7 +1,7 @@
/************************************************************************************
- * arch/hc/src/mc9s12ne64/mc9s12ne64_tim16b4cv1.h
+ * arch/hc/src/m9s12/m9s12_tim.h (TIM16b4c v1)
*
- * Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_TIM16B4V1_H
-#define __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_TIM16B4V1_H
+#ifndef __ARCH_ARM_HC_SRC_M9S12_M9S12_TIM_H
+#define __ARCH_ARM_HC_SRC_M9S12_M9S12_TIM_H
/************************************************************************************
* Included Files
@@ -243,4 +243,4 @@
* Public Functions
************************************************************************************/
-#endif /* __ARCH_ARM_HC_SRC_MC9S12NE64_MC9S12NE64_TIM16B4V1_H */
+#endif /* __ARCH_ARM_HC_SRC_M9S12_M9S12_TIM_H */
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_vectors.S b/nuttx/arch/hc/src/m9s12/m9s12_vectors.S
index b21f53b62..147f92926 100755
--- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_vectors.S
+++ b/nuttx/arch/hc/src/m9s12/m9s12_vectors.S
@@ -1,6 +1,6 @@
/************************************************************************************
- * arch/hc/src/mc9s12ne64/mc9s12ne64_vectors.S
- * arch/hc/src/chip/mc9s12ne64_vectors.S
+ * arch/hc/src/m9s12/m9s12_vectors.S
+ * arch/hc/src/chip/m9s12_vectors.S
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -50,7 +50,7 @@
************************************************************************************/
.globl __start
- .file "mc9s12ne64_vectors.S"
+ .file "m9s12_vectors.S"
/************************************************************************************
* Macros
diff --git a/nuttx/configs/demo9s12ne64/include/board.h b/nuttx/configs/demo9s12ne64/include/board.h
index 5cc401461..d4c30013c 100755
--- a/nuttx/configs/demo9s12ne64/include/board.h
+++ b/nuttx/configs/demo9s12ne64/include/board.h
@@ -2,7 +2,7 @@
* configs/demo9s12ne64/include/board.h
* include/arch/board/board.h
*
- * Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/configs/demo9s12ne64/ostest/defconfig b/nuttx/configs/demo9s12ne64/ostest/defconfig
index e1f564223..fc52adf26 100755
--- a/nuttx/configs/demo9s12ne64/ostest/defconfig
+++ b/nuttx/configs/demo9s12ne64/ostest/defconfig
@@ -72,7 +72,7 @@
CONFIG_ARCH=hc
CONFIG_ARCH_HC=y
CONFIG_ARCH_HCS12=y
-CONFIG_ARCH_CHIP=mc9s12ne64
+CONFIG_ARCH_CHIP=m9s12
CONFIG_ARCH_CHIP_MCS92S12NEC64=y
CONFIG_ARCH_BOARD=demo9s12ne64
CONFIG_ARCH_BOARD_DEMOS92S12NEC64=y
diff --git a/nuttx/tools/zipme.sh b/nuttx/tools/zipme.sh
index 2897490b1..1d125e2e8 100755
--- a/nuttx/tools/zipme.sh
+++ b/nuttx/tools/zipme.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# zipme.sh
#
-# Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+# Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
#
# Redistribution and use in source and binary forms, with or without
@@ -54,6 +54,8 @@ GARBAGEDIRS="\
arch/dm320\
arch/avr/include/at91uc3\
arch/avr/src/at91uc3\
+ arch/hc/include/mc9s12ne64\
+ arch/hc/src/mc9s12ne64\
netutils/thttpd/extras
"
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-25 00:43:05 +0000