Merge branch 'master' of https://github.com/RT-Thread/rt-thread

bsp/lm3s8962/drivers/luminaryif.c

@@ -424,6 +424,10 @@ struct pbuf * luminaryif_rx(rt_device_t dev)
         lwip_stats.link.memerr++;
         lwip_stats.link.drop++;
 #endif
+        // 
+        // Enable Ethernet RX Interrupt. 
+        // 
+        EthernetIntEnable(ETH_BASE, ETH_INT_RX); 
     }
 	
     return(p);

bsp/lm3s9b9x/drivers/luminaryif.c

@@ -423,6 +423,10 @@ struct pbuf * luminaryif_rx(rt_device_t dev)
         lwip_stats.link.memerr++;
         lwip_stats.link.drop++;
 #endif
+        // 
+        // Enable Ethernet RX Interrupt. 
+        // 
+        EthernetIntEnable(ETH_BASE, ETH_INT_RX); 
     }
 
     return(p);

documentation/doxygen/mainpage.h

@@ -5,7 +5,7 @@
 /**
  * @mainpage Introduction
  * @author RT-Thread Development Team
- * @version 1.1.0
+ * @version 1.2.0
  *
  * RT-Thread RTOS is an open source embedded real-time operating system and is
  * designed specifically for small memory footprint platforms. The real-time and

examples/kernel/semaphore_static.c

@@ -114,7 +114,7 @@ int _tc_semaphore_static(void)
 {
 	/* 设置TestCase清理回调函数 */
 	tc_cleanup(_tc_cleanup);
-	semaphore_static_init(void);
+	semaphore_static_init();
 
 	/* 返回TestCase运行的最长时间 */
 	return 100;
@@ -125,7 +125,7 @@ FINSH_FUNCTION_EXPORT(_tc_semaphore_static, a static semaphore example);
 /* 用户应用入口 */
 int rt_application_init(void)
 {
-	semaphore_static_init(void);
+	semaphore_static_init();
 
 	return 0;
 }

libcpu/arm/at91sam926x/mmu.c

@@ -471,7 +471,7 @@ void rt_hw_mmu_init(void)
 	mmu_setmtt(0x00000000, 0xFFFFFFFF, 0x00000000, RW_NCNB); /* None cached for 4G memory */
   	mmu_setmtt(0x20000000, 0x24000000-1, 0x20000000, RW_CB); /* 64M cached SDRAM memory */
 	mmu_setmtt(0x00000000, 0x100000, 0x20000000, RW_CB); /* isr vector table */
-	mmu_setmtt(0x90000000, 0x100000, 0x00000000, RW_CB); /* 4K cached internal memory */
+	mmu_setmtt(0x90000000, 0x90400000 - 1, 0x00200000, RW_NCNB); /* 4K SRAM0 + 4k SRAM1 */
 	mmu_setmtt(0xA0000000, 0xA4000000-1, 0x20000000, RW_NCNB); /* 64M none-cached SDRAM memory */
 
 	/* set MMU table address */

libcpu/arm/sep4020/interrupt.c

@@ -31,10 +31,9 @@ rt_uint32_t rt_thread_switch_interrupt_flag;
  */
 /*@{*/
 
-rt_isr_handler_t rt_hw_interrupt_handle(rt_uint32_t vector)
+static void rt_hw_interrupt_handle(int vector, void *param)
 {
 	rt_kprintf("Unhandled interrupt %d occured!!!\n", vector);
-	return RT_NULL;
 }
 
 /**
@@ -85,7 +84,7 @@ void rt_hw_interrupt_init(void)
  * This function will mask a interrupt.
  * @param vector the interrupt number
  */
-void rt_hw_interrupt_mask(rt_uint32_t vector)
+void rt_hw_interrupt_mask(int vector)
 {
 	*(RP)(INTC_IMR) |= 1 << vector;
 }
@@ -94,7 +93,7 @@ void rt_hw_interrupt_mask(rt_uint32_t vector)
  * This function will un-mask a interrupt.
  * @param vector the interrupt number
  */
-void rt_hw_interrupt_umask(rt_uint32_t vector)
+void rt_hw_interrupt_umask(int vector)
 {
 	if(vector == 16)
 	{

libcpu/arm/sep4020/trap.c

@@ -152,7 +152,7 @@ void rt_hw_trap_irq(void)
     }
 
     /* get interrupt service routine */
-    isr_func = isr_table[irq].isr_handle;
+    isr_func = isr_table[irq].handler;
     param = isr_table[irq].param;
 
     /* turn to interrupt service routine */

src/kservice.c

@@ -501,7 +501,7 @@ void rt_show_version(void)
     rt_kprintf("- RT -     Thread Operating System\n");
     rt_kprintf(" / | \\     %d.%d.%d build %s\n",
                RT_VERSION, RT_SUBVERSION, RT_REVISION, __DATE__);
-    rt_kprintf(" 2006 - 2012 Copyright by rt-thread team\n");
+    rt_kprintf(" 2006 - 2013 Copyright by rt-thread team\n");
 }
 RTM_EXPORT(rt_show_version);