From 61d969f1b9762a9a81ad821edd375e1164f75787 Mon Sep 17 00:00:00 2001
From: dzzxzz <dzzxzz@gmail.com>
Date: Thu, 1 Sep 2011 08:05:21 +0000
Subject: [PATCH] merge stack.c and interrupt.c into cpuport.c

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1687 bbd45198-f89e-11dd-88c7-29a3b14d5316
---
 bsp/m16c62p/application.c           |  4 +-
 bsp/m16c62p/board.c                 |  4 +-
 bsp/m16c62p/bsp.c                   |  4 +-
 bsp/m16c62p/interrupts.asm          |  4 +-
 bsp/m16c62p/rtt2m16c.ewp            |  7 +--
 bsp/m16c62p/startup.c               | 12 +++--
 bsp/m16c62p/uart.c                  |  6 +--
 bsp/m16c62p/vectors.asm             |  4 +-
 libcpu/m16c/m16c62p/context_iar.asm |  2 +-
 libcpu/m16c/m16c62p/cpuport.c       | 73 +++++++++++++++++++++++++++++
 libcpu/m16c/m16c62p/interrupt.c     | 22 ---------
 libcpu/m16c/m16c62p/stack.c         | 59 -----------------------
 12 files changed, 97 insertions(+), 104 deletions(-)
 create mode 100644 libcpu/m16c/m16c62p/cpuport.c
 delete mode 100644 libcpu/m16c/m16c62p/interrupt.c
 delete mode 100644 libcpu/m16c/m16c62p/stack.c

diff --git a/bsp/m16c62p/application.c b/bsp/m16c62p/application.c
index 455104c15f..e0849eb372 100644
--- a/bsp/m16c62p/application.c
+++ b/bsp/m16c62p/application.c
@@ -14,7 +14,7 @@
  *
  * For       : Renesas M16C
  * Toolchain : IAR's EW for M16C v3.401
-*/
+ */
 
 #include <rtthread.h>
 #include "bsp.h"
@@ -40,7 +40,7 @@ static void rt_thread_entry_led(void* parameter)
 int rt_application_init(void)
 {
     /* create led thread */
-	rt_thread_init(&led,
+    rt_thread_init(&led,
 		"led",
 		rt_thread_entry_led, RT_NULL,
 		&led_stack[0], sizeof(led_stack),
diff --git a/bsp/m16c62p/board.c b/bsp/m16c62p/board.c
index 644010079b..95ada9df98 100644
--- a/bsp/m16c62p/board.c
+++ b/bsp/m16c62p/board.c
@@ -9,11 +9,11 @@
  *
  * Change Logs:
  * Date           Author       Notes
- * 2010-04-09     fify      the first version
+ * 2010-04-09     fify         the first version
  *
  * For       : Renesas M16C
  * Toolchain : IAR's EW for M16C v3.401
-*/
+ */
 
 #include <rthw.h>
 #include <rtthread.h>
diff --git a/bsp/m16c62p/bsp.c b/bsp/m16c62p/bsp.c
index 32b73a6f18..83b32f8305 100644
--- a/bsp/m16c62p/bsp.c
+++ b/bsp/m16c62p/bsp.c
@@ -9,11 +9,11 @@
  *
  * Change Logs:
  * Date           Author       Notes
- * 2010-04-09     fify      the first version
+ * 2010-04-09     fify         the first version
  *
  * For       : Renesas M16C
  * Toolchain : IAR's EW for M16C v3.401
-*/
+ */
 
 #include "iom16c62p.h"
 #include "bsp.h"
diff --git a/bsp/m16c62p/interrupts.asm b/bsp/m16c62p/interrupts.asm
index d2f0bec954..20340612e2 100644
--- a/bsp/m16c62p/interrupts.asm
+++ b/bsp/m16c62p/interrupts.asm
@@ -9,11 +9,11 @@
  *
  * Change Logs:
  * Date           Author       Notes
- * 2010-04-20     fify      the first version
+ * 2010-04-20     fify         the first version
  *
  * For       : Renesas M16C
  * Toolchain : IAR's EW for M16C v3.401
-*/
+ */
 
         PUBLIC  rt_hw_timer_handler
         PUBLIC  rt_hw_uart0_receive_handler
diff --git a/bsp/m16c62p/rtt2m16c.ewp b/bsp/m16c62p/rtt2m16c.ewp
index cb161849a4..847186dd7e 100644
--- a/bsp/m16c62p/rtt2m16c.ewp
+++ b/bsp/m16c62p/rtt2m16c.ewp
@@ -207,7 +207,7 @@
         </option>
         <option>
           <name>CCDiagSuppress</name>
-          <state></state>
+          <state>Pa050</state>
         </option>
         <option>
           <name>CCDiagRemark</name>
@@ -1945,10 +1945,7 @@
           <name>$PROJ_DIR$\..\..\libcpu\m16c\m16c62p\context_iar.asm</name>
         </file>
         <file>
-          <name>$PROJ_DIR$\..\..\libcpu\m16c\m16c62p\interrupt.c</name>
-        </file>
-        <file>
-          <name>$PROJ_DIR$\..\..\libcpu\m16c\m16c62p\stack.c</name>
+          <name>$PROJ_DIR$\..\..\libcpu\m16c\m16c62p\cpuport.c</name>
         </file>
       </group>
     </group>
diff --git a/bsp/m16c62p/startup.c b/bsp/m16c62p/startup.c
index b3b4fbff93..9e74b0027c 100644
--- a/bsp/m16c62p/startup.c
+++ b/bsp/m16c62p/startup.c
@@ -20,6 +20,7 @@
 #include "board.h"
 #include "bsp.h"
 
+extern void rt_hw_interrupt_init(void);
 extern int  rt_application_init(void);
 #ifdef RT_USING_FINSH
 extern void finsh_system_init(void);
@@ -37,6 +38,9 @@ extern void finsh_set_device(const char* device);
  */
 void rtthread_startup(void)
 {
+	/* init hardware interrupt */
+	rt_hw_interrupt_init();
+        
 	/* init board */
 	rt_hw_board_init();
 
@@ -54,7 +58,7 @@ void rtthread_startup(void)
     
 #ifdef RT_USING_HEAP
 #ifdef __ICCM16C__
-    rt_system_heap_init(__segment_begin("DATA16_HEAP"),__segment_end("DATA16_HEAP"));
+	rt_system_heap_init(__segment_begin("DATA16_HEAP"), __segment_end("DATA16_HEAP"));
 #endif
 #endif
 
@@ -75,8 +79,8 @@ void rtthread_startup(void)
 	finsh_set_device("uart0");
 #endif
 
-    /* init timer thread */
-    rt_system_timer_thread_init();
+	/* init timer thread */
+	rt_system_timer_thread_init();
     
 	/* init idle thread */
 	rt_thread_idle_init();
@@ -94,7 +98,7 @@ int main(void)
 	rt_hw_interrupt_disable();
 
 	/* init system setting */
-    system_init();
+	system_init();
     
 	/* startup RT-Thread RTOS */
 	rtthread_startup();
diff --git a/bsp/m16c62p/uart.c b/bsp/m16c62p/uart.c
index bff75724d5..9050e77670 100644
--- a/bsp/m16c62p/uart.c
+++ b/bsp/m16c62p/uart.c
@@ -8,10 +8,10 @@
  * http://www.rt-thread.org/license/LICENSE
  *
  * Change Logs:
- * Date                Author       Notes
+ * Date           Author       Notes
  * 2010-03-08     Bernard      The first version for LPC17xx
- * 2010-04-10     fify             Modified for M16C
-*/
+ * 2010-04-10     fify         Modified for M16C
+ */
 
 #include <rthw.h>
 #include <rtthread.h>
diff --git a/bsp/m16c62p/vectors.asm b/bsp/m16c62p/vectors.asm
index 1594485c0d..ecf40689b0 100644
--- a/bsp/m16c62p/vectors.asm
+++ b/bsp/m16c62p/vectors.asm
@@ -9,11 +9,11 @@
  *
  * Change Logs:
  * Date           Author       Notes
- * 2010-04-09     fify      the first version
+ * 2010-04-09     fify         the first version
  *
  * For       : Renesas M16C
  * Toolchain : IAR's EW for M16C v3.401
-*/
+ */
 
 ;********************************************************************************************************
 ;                                 RELOCATABLE EXCEPTION VECTOR TABLE
diff --git a/libcpu/m16c/m16c62p/context_iar.asm b/libcpu/m16c/m16c62p/context_iar.asm
index 29c8656ba7..52dea18cae 100644
--- a/libcpu/m16c/m16c62p/context_iar.asm
+++ b/libcpu/m16c/m16c62p/context_iar.asm
@@ -15,7 +15,7 @@
  *
  * For       : Renesas M16C
  * Toolchain : IAR's EW for M16C v3.401
-*/
+ */
 
     RSEG        CSTACK
 
diff --git a/libcpu/m16c/m16c62p/cpuport.c b/libcpu/m16c/m16c62p/cpuport.c
new file mode 100644
index 0000000000..bab2ab5a22
--- /dev/null
+++ b/libcpu/m16c/m16c62p/cpuport.c
@@ -0,0 +1,73 @@
+/*
+ * File      : cpuport.c
+ * This file is part of RT-Thread RTOS
+ * COPYRIGHT (C) 2009 - 2011, RT-Thread Development Team
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rt-thread.org/license/LICENSE
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2011-02-23     Bernard      the first version
+ */
+
+#include <rtthread.h>
+
+extern volatile rt_uint8_t rt_interrupt_nest;
+
+/* switch flag on interrupt and thread pointer to save switch record */
+rt_uint32_t rt_interrupt_from_thread;
+rt_uint32_t rt_interrupt_to_thread;
+rt_uint32_t rt_thread_switch_interrput_flag;
+
+/**
+ * This function will initialize hardware interrupt
+ */
+void rt_hw_interrupt_init(void)
+{
+    /* init interrupt nest, and context in thread sp */
+    rt_interrupt_nest = 0;
+    rt_interrupt_from_thread = 0;
+    rt_interrupt_to_thread = 0;
+    rt_thread_switch_interrput_flag = 0;
+}
+
+/**
+ * This function will initialize thread stack
+ *
+ * @param tentry the entry of thread
+ * @param parameter the parameter of entry
+ * @param stack_addr the beginning stack address
+ * @param texit the function will be called when thread exit
+ *
+ * @return stack address
+ */
+rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter, rt_uint8_t *stack_addr, void *texit)
+{
+    rt_uint16_t  *pstk16;
+    rt_uint16_t   flag;
+
+    flag       = 0x0040;
+    pstk16     = (rt_uint16_t *)stack_addr;
+    pstk16--;
+
+    /* Simulate ISR entry */
+    *pstk16--  = (flag&0x00FF)                                  /* ... The lowest byte of the FLAG register     */
+               | (((rt_uint32_t)tentry>>8)&0x00000F00)          /* ... The highest nibble of the PC register    */
+               | ((flag<<4)&0xF000);                            /* ... The highest nibble of the FLAG register  */
+    *pstk16--  = (((rt_uint32_t)tentry)&0x0000FFFF);            /* ... The lowest bytes of the PC register      */
+    
+    /* Save registers onto stack frame */
+    *pstk16--  = (rt_uint16_t)0xFBFB;                           /* ... FB register                              */
+    *pstk16--  = (rt_uint16_t)0x3B3B;                           /* ... SB register                              */
+    *pstk16--  = (rt_uint16_t)0xA1A1;                           /* ... A1 register                              */
+    *pstk16--  = (rt_uint16_t)0xA0A0;                           /* ... A0 register                              */
+    *pstk16--  = (rt_uint16_t)0x3333;                           /* ... R3 register                              */
+    *pstk16--  = (rt_uint32_t)parameter >> 16L;                 /* ... Pass argument in R2 register             */
+    *pstk16--  = (rt_uint32_t)parameter & 0x0000FFFFL;          /* ... Pass argument in R1 register             */
+    *pstk16    = (rt_uint16_t)0x0000;                           /* ... R0 register                              */
+
+    /* return task's current stack address */
+    return (rt_uint8_t *)pstk16;
+}
diff --git a/libcpu/m16c/m16c62p/interrupt.c b/libcpu/m16c/m16c62p/interrupt.c
deleted file mode 100644
index 5c9003007e..0000000000
--- a/libcpu/m16c/m16c62p/interrupt.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * File      : interrupt.c
- * This file is part of RT-Thread RTOS
- * COPYRIGHT (C) 2009, RT-Thread Development Team
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rt-thread.org/license/LICENSE
- *
- * Change Logs:
- * Date           Author       Notes
- * 2010-04-09     fify         the first version
- *
- * For       : Renesas M16C
- * Toolchain : IAR's EW for M16C v3.401
-*/
-
-#include <rtthread.h>
-
-rt_uint16_t rt_interrupt_from_thread;
-rt_uint16_t rt_interrupt_to_thread;
-rt_uint16_t rt_thread_switch_interrput_flag;
\ No newline at end of file
diff --git a/libcpu/m16c/m16c62p/stack.c b/libcpu/m16c/m16c62p/stack.c
deleted file mode 100644
index ae6bc8aa40..0000000000
--- a/libcpu/m16c/m16c62p/stack.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * File      : stack.c
- * This file is part of RT-Thread RTOS
- * COPYRIGHT (C) 2009, RT-Thread Development Team
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rt-thread.org/license/LICENSE
- *
- * Change Logs:
- * Date           Author       Notes
- * 2010-04-09     fify         the first version
- *
- * For       : Renesas M16C
- * Toolchain : IAR's EW for M16C v3.401
-*/
-
-#include <rtthread.h>
-
-/**
- * This function will initialize thread stack
- *
- * @param tentry the entry of thread
- * @param parameter the parameter of entry
- * @param stack_addr the beginning stack address
- * @param texit the function will be called when thread exit
- *
- * @return stack address
- */
-rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,
-	rt_uint8_t *stack_addr, void *texit)
-{
-    rt_uint16_t  *pstk16;
-    rt_uint16_t   flag;
-
-
-    flag       = 0x0040;
-    pstk16     = (rt_uint16_t *)stack_addr;
-    pstk16--;
-
-                                                                /* Simulate ISR entry                                       */
-    *pstk16--  = (flag                 &     0x00FF)            /* ... The lowest  byte   of the FLAG register              */
-               | (((rt_uint32_t)tentry >>  8) & 0x00000F00)            /* ... The highest nibble of the PC   register              */
-               | ((flag         <<  4) &     0xF000);           /* ... The highest nibble of the FLAG register              */
-    *pstk16--  = (((rt_uint32_t)tentry      ) & 0x0000FFFF);           /* ... The lowest  bytes  of the PC   register              */
-
-                                                                /* Save registers onto stack frame                          */
-    *pstk16--  = (rt_uint16_t)0xFBFB;				                /* ... FB register                                          */
-    *pstk16--  = (rt_uint16_t)0x3B3B;                                /* ... SB register                                          */
-    *pstk16--  = (rt_uint16_t)0xA1A1;				                /* ... A1 register                                          */
-    *pstk16--  = (rt_uint16_t)0xA0A0;				                /* ... A0 register                                          */
-    *pstk16--  = (rt_uint16_t)0x3333;				                /* ... R3 register                                          */
-    *pstk16--  = (rt_uint32_t)parameter >> 16L;				            /* ... Pass argument in R2 register                         */
-    *pstk16--  = (rt_uint32_t)parameter & 0x0000FFFFL;				    /* ... Pass argument in R1 register                         */
-    *pstk16    = (rt_uint16_t)0x0000;				                /* ... R0 register                                          */
-
-	/* return task's current stack address */
-	return (rt_uint8_t *)pstk16;
-}