add net_radio_sch; chage bsp/stm32 CAN --> CAN1

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@30 bbd45198-f89e-11dd-88c7-29a3b14d5316

4 files changed, 119 insertions, 119 deletions

diff --git a/bsp/stm32/stm32f10x_it.c b/bsp/stm32/stm32f10x_it.c
index bb5f38cda8..c250f9d098 100644
--- a/bsp/stm32/stm32f10x_it.c
+++ b/bsp/stm32/stm32f10x_it.c
@@ -49,11 +49,11 @@ void NMIException(void)
 *******************************************************************************/

 void HardFaultException(void)

 {

-  /* Go to infinite loop when Hard Fault exception occurs */

-  rt_kprintf("hard fault exception\n");

-  while (1)

-  {

-  }

+    /* Go to infinite loop when Hard Fault exception occurs */

+    rt_kprintf("hard fault exception\n");

+    while (1)

+    {

+    }

 }

 

 /*******************************************************************************

@@ -65,11 +65,11 @@ void HardFaultException(void)
 *******************************************************************************/

 void MemManageException(void)

 {

-  /* Go to infinite loop when Memory Manage exception occurs */

-  rt_kprintf("memory manage exception\n");

-  while (1)

-  {

-  }

+    /* Go to infinite loop when Memory Manage exception occurs */

+    rt_kprintf("memory manage exception\n");

+    while (1)

+    {

+    }

 }

 

 /*******************************************************************************

@@ -81,11 +81,11 @@ void MemManageException(void)
 *******************************************************************************/

 void BusFaultException(void)

 {

-  /* Go to infinite loop when Bus Fault exception occurs */

-  rt_kprintf("bus fault exception\n");

-  while (1)

-  {

-  }

+    /* Go to infinite loop when Bus Fault exception occurs */

+    rt_kprintf("bus fault exception\n");

+    while (1)

+    {

+    }

 }

 

 /*******************************************************************************

@@ -97,11 +97,11 @@ void BusFaultException(void)
 *******************************************************************************/

 void UsageFaultException(void)

 {

-  /* Go to infinite loop when Usage Fault exception occurs */

-  rt_kprintf("usage fault exception\n");

-  while (1)

-  {

-  }

+    /* Go to infinite loop when Usage Fault exception occurs */

+    rt_kprintf("usage fault exception\n");

+    while (1)

+    {

+    }

 }

 

 /*******************************************************************************

@@ -135,8 +135,8 @@ void SVCHandler(void)
 *******************************************************************************/

 void SysTickHandler(void)

 {

-  /* handle os tick */

-  rt_hw_timer_handler();

+    /* handle os tick */

+    rt_hw_timer_handler();

 }

 

 /*******************************************************************************

@@ -181,22 +181,22 @@ void TAMPER_IRQHandler(void)
 *******************************************************************************/

 void RTC_IRQHandler(void)

 {

-  if (RTC_GetITStatus(RTC_IT_SEC) != RESET)

-  {

-    /* Clear the RTC Second interrupt */

-    RTC_ClearITPendingBit(RTC_IT_SEC);

+    if (RTC_GetITStatus(RTC_IT_SEC) != RESET)

+    {

+        /* Clear the RTC Second interrupt */

+        RTC_ClearITPendingBit(RTC_IT_SEC);

 

-    /* Wait until last write operation on RTC registers has finished */

-    RTC_WaitForLastTask();

+        /* Wait until last write operation on RTC registers has finished */

+        RTC_WaitForLastTask();

 

-    /* Reset RTC Counter when Time is 23:59:59 */

-    if (RTC_GetCounter() == 0x00015180)

-    {

-      RTC_SetCounter(0x0);

-      /* Wait until last write operation on RTC registers has finished */

-      RTC_WaitForLastTask();

+        /* Reset RTC Counter when Time is 23:59:59 */

+        if (RTC_GetCounter() == 0x00015180)

+        {

+            RTC_SetCounter(0x0);

+            /* Wait until last write operation on RTC registers has finished */

+            RTC_WaitForLastTask();

+        }

     }

-  }

 }

 

 /*******************************************************************************

@@ -230,19 +230,19 @@ void RCC_IRQHandler(void)
 *******************************************************************************/

 void EXTI0_IRQHandler(void)

 {

-	extern void enc28j60_isr(void);

+    extern void enc28j60_isr(void);

 

-	/* enter interrupt */

-	rt_interrupt_enter();

+    /* enter interrupt */

+    rt_interrupt_enter();

 

-	enc28j60_isr();

-	

-	/* Clear the Key Button EXTI line pending bit */

-	EXTI_ClearITPendingBit(EXTI_Line0);

+    enc28j60_isr();

 

-	/* leave interrupt */

-	rt_interrupt_leave();

-	rt_hw_interrupt_thread_switch();

+    /* Clear the Key Button EXTI line pending bit */

+    EXTI_ClearITPendingBit(EXTI_Line0);

+

+    /* leave interrupt */

+    rt_interrupt_leave();

+    rt_hw_interrupt_thread_switch();

 }

 

 /*******************************************************************************

@@ -310,23 +310,23 @@ void DMA1_Channel1_IRQHandler(void)
 void DMA1_Channel2_IRQHandler(void)

 {

 #ifdef RT_USING_UART3

-	extern struct rt_device uart3_device;

+    extern struct rt_device uart3_device;

+

+    /* enter interrupt */

+    rt_interrupt_enter();

+

+    if (DMA_GetITStatus(DMA1_IT_TC2))

+    {

+        /* transmission complete, invoke serial dma tx isr */

+        rt_hw_serial_dma_tx_isr(&uart3_device);

+    }

 

-	/* enter interrupt */

-	rt_interrupt_enter();

+    /* clear DMA flag */

+    DMA_ClearFlag(DMA1_FLAG_TC2 | DMA1_FLAG_TE2);

 

-	if (DMA_GetITStatus(DMA1_IT_TC2))

-	{

-		/* transmission complete, invoke serial dma tx isr */

-		rt_hw_serial_dma_tx_isr(&uart3_device);

-	}

-	

-	/* clear DMA flag */

-	DMA_ClearFlag(DMA1_FLAG_TC2 | DMA1_FLAG_TE2);

-	

-	/* leave interrupt */

-	rt_interrupt_leave();

-	rt_hw_interrupt_thread_switch();

+    /* leave interrupt */

+    rt_interrupt_leave();

+    rt_hw_interrupt_thread_switch();

 #endif

 }

 

@@ -373,18 +373,18 @@ void DMA1_Channel5_IRQHandler(void)
 void DMA1_Channel6_IRQHandler(void)

 {

 #ifdef RT_USING_UART2

-	extern struct rt_device uart2_device;

+    extern struct rt_device uart2_device;

 

-	/* enter interrupt */

-	rt_interrupt_enter();

+    /* enter interrupt */

+    rt_interrupt_enter();

 

-	/* clear DMA flag */

-	DMA_ClearFlag(DMA1_FLAG_TC6 | DMA1_FLAG_TE6);

-	rt_hw_serial_dma_rx_isr(&uart2_device);

+    /* clear DMA flag */

+    DMA_ClearFlag(DMA1_FLAG_TC6 | DMA1_FLAG_TE6);

+    rt_hw_serial_dma_rx_isr(&uart2_device);

 

-	/* leave interrupt */

-	rt_interrupt_leave();

-	rt_hw_interrupt_thread_switch();

+    /* leave interrupt */

+    rt_interrupt_leave();

+    rt_hw_interrupt_thread_switch();

 #endif

 }

 

@@ -411,48 +411,48 @@ void ADC1_2_IRQHandler(void)
 }

 

 /*******************************************************************************

-* Function Name  : USB_HP_CAN_TX_IRQHandler

+* Function Name  : USB_HP_CAN1_TX_IRQHandler

 * Description    : This function handles USB High Priority or CAN TX interrupts

 *                  requests.

 * Input          : None

 * Output         : None

 * Return         : None

 *******************************************************************************/

-void USB_HP_CAN_TX_IRQHandler(void)

+void USB_HP_CAN1_TX_IRQHandler(void)

 {

 }

 

 /*******************************************************************************

-* Function Name  : USB_LP_CAN_RX0_IRQHandler

+* Function Name  : USB_LP_CAN1_RX0_IRQHandler

 * Description    : This function handles USB Low Priority or CAN RX0 interrupts

 *                  requests.

 * Input          : None

 * Output         : None

 * Return         : None

 *******************************************************************************/

-void USB_LP_CAN_RX0_IRQHandler(void)

+void USB_LP_CAN1_RX0_IRQHandler(void)

 {

 }

 

 /*******************************************************************************

-* Function Name  : CAN_RX1_IRQHandler

+* Function Name  : CAN1_RX1_IRQHandler

 * Description    : This function handles CAN RX1 interrupt request.

 * Input          : None

 * Output         : None

 * Return         : None

 *******************************************************************************/

-void CAN_RX1_IRQHandler(void)

+void CAN1_RX1_IRQHandler(void)

 {

 }

 

 /*******************************************************************************

-* Function Name  : CAN_SCE_IRQHandler

+* Function Name  : CAN1_SCE_IRQHandler

 * Description    : This function handles CAN SCE interrupt request.

 * Input          : None

 * Output         : None

 * Return         : None

 *******************************************************************************/

-void CAN_SCE_IRQHandler(void)

+void CAN1_SCE_IRQHandler(void)

 {

 }

 

@@ -622,15 +622,15 @@ void SPI2_IRQHandler(void)
 void USART1_IRQHandler(void)

 {

 #ifdef RT_USING_UART1

-	extern struct rt_device uart1_device;

-	/* enter interrupt */

-	rt_interrupt_enter();

+    extern struct rt_device uart1_device;

+    /* enter interrupt */

+    rt_interrupt_enter();

 

-	rt_hw_serial_isr(&uart1_device);

+    rt_hw_serial_isr(&uart1_device);

 

-	/* leave interrupt */

-	rt_interrupt_leave();

-	rt_hw_interrupt_thread_switch();

+    /* leave interrupt */

+    rt_interrupt_leave();

+    rt_hw_interrupt_thread_switch();

 #endif

 }

 

@@ -644,16 +644,16 @@ void USART1_IRQHandler(void)
 void USART2_IRQHandler(void)

 {

 #ifdef RT_USING_UART2

-	extern struct rt_device uart2_device;

+    extern struct rt_device uart2_device;

 

-	/* enter interrupt */

-	rt_interrupt_enter();

+    /* enter interrupt */

+    rt_interrupt_enter();

 

-	rt_hw_serial_isr(&uart2_device);

+    rt_hw_serial_isr(&uart2_device);

 

-	/* leave interrupt */

-	rt_interrupt_leave();

-	rt_hw_interrupt_thread_switch();

+    /* leave interrupt */

+    rt_interrupt_leave();

+    rt_hw_interrupt_thread_switch();

 #endif

 }

 

@@ -667,16 +667,16 @@ void USART2_IRQHandler(void)
 void USART3_IRQHandler(void)

 {

 #ifdef RT_USING_UART3

-	extern struct rt_device uart3_device;

+    extern struct rt_device uart3_device;

 

-	/* enter interrupt */

-	rt_interrupt_enter();

+    /* enter interrupt */

+    rt_interrupt_enter();

 

-	rt_hw_serial_isr(&uart3_device);

+    rt_hw_serial_isr(&uart3_device);

 

-	/* leave interrupt */

-	rt_interrupt_leave();

-	rt_hw_interrupt_thread_switch();

+    /* leave interrupt */

+    rt_interrupt_leave();

+    rt_hw_interrupt_thread_switch();

 #endif

 }

 

@@ -791,17 +791,17 @@ void FSMC_IRQHandler(void)
 void SDIO_IRQHandler(void)

 {

 #ifdef RT_USING_DFS

-	extern int SD_ProcessIRQSrc(void);

+    extern int SD_ProcessIRQSrc(void);

 

-	/* enter interrupt */

-	rt_interrupt_enter();

+    /* enter interrupt */

+    rt_interrupt_enter();

 

-	/* Process All SDIO Interrupt Sources */

-	SD_ProcessIRQSrc();

+    /* Process All SDIO Interrupt Sources */

+    SD_ProcessIRQSrc();

 

-	/* leave interrupt */

-	rt_interrupt_leave();

-	rt_hw_interrupt_thread_switch();

+    /* leave interrupt */

+    rt_interrupt_leave();

+    rt_hw_interrupt_thread_switch();

 #endif

 }

 

diff --git a/bsp/stm32/stm32f10x_it.h b/bsp/stm32/stm32f10x_it.h
index 11740669fa..293f2803e3 100644
--- a/bsp/stm32/stm32f10x_it.h
+++ b/bsp/stm32/stm32f10x_it.h
@@ -53,10 +53,10 @@ void DMA1_Channel5_IRQHandler(void);
 void DMA1_Channel6_IRQHandler(void);

 void DMA1_Channel7_IRQHandler(void);

 void ADC1_2_IRQHandler(void);

-void USB_HP_CAN_TX_IRQHandler(void);

-void USB_LP_CAN_RX0_IRQHandler(void);

-void CAN_RX1_IRQHandler(void);

-void CAN_SCE_IRQHandler(void);

+void USB_HP_CAN1_TX_IRQHandler(void);

+void USB_LP_CAN1_RX0_IRQHandler(void);

+void CAN1_RX1_IRQHandler(void);

+void CAN1_SCE_IRQHandler(void);

 void EXTI9_5_IRQHandler(void);

 void TIM1_BRK_IRQHandler(void);

 void TIM1_UP_IRQHandler(void);

@@ -94,7 +94,7 @@ void DMA2_Channel1_IRQHandler(void);
 void DMA2_Channel2_IRQHandler(void);

 void DMA2_Channel3_IRQHandler(void);

 void DMA2_Channel4_5_IRQHandler(void);

-					 

+

 #endif /* __STM32F10x_IT_H */

 

 /******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/

diff --git a/bsp/stm32_radio/sch/sch_rev0.01.pdf b/bsp/stm32_radio/sch/sch_rev0.01.pdf
new file mode 100644
index 0000000000..966e47a71f
--- /dev/null
+++ b/bsp/stm32_radio/sch/sch_rev0.01.pdf
diff --git a/libcpu/arm/stm32/start_rvds.s b/libcpu/arm/stm32/start_rvds.s
index ec9419fe07..d4c00c7876 100644
--- a/libcpu/arm/stm32/start_rvds.s
+++ b/libcpu/arm/stm32/start_rvds.s
@@ -85,10 +85,10 @@ __heap_limit
     IMPORT  DMA1_Channel6_IRQHandler

     IMPORT  DMA1_Channel7_IRQHandler

     IMPORT  ADC1_2_IRQHandler

-    IMPORT  USB_HP_CAN_TX_IRQHandler

-    IMPORT  USB_LP_CAN_RX0_IRQHandler

-    IMPORT  CAN_RX1_IRQHandler

-    IMPORT  CAN_SCE_IRQHandler

+    IMPORT  USB_HP_CAN1_TX_IRQHandler

+    IMPORT  USB_LP_CAN1_RX0_IRQHandler

+    IMPORT  CAN1_RX1_IRQHandler

+    IMPORT  CAN1_SCE_IRQHandler

     IMPORT  EXTI9_5_IRQHandler

     IMPORT  TIM1_BRK_IRQHandler

     IMPORT  TIM1_UP_IRQHandler

@@ -168,10 +168,10 @@ __Vectors        DCD  __initial_sp              ; Top of Stack
     DCD  DMA1_Channel6_IRQHandler

     DCD  DMA1_Channel7_IRQHandler

     DCD  ADC1_2_IRQHandler

-    DCD  USB_HP_CAN_TX_IRQHandler

-    DCD  USB_LP_CAN_RX0_IRQHandler

-    DCD  CAN_RX1_IRQHandler

-    DCD  CAN_SCE_IRQHandler

+    DCD  USB_HP_CAN1_TX_IRQHandler

+    DCD  USB_LP_CAN1_RX0_IRQHandler

+    DCD  CAN1_RX1_IRQHandler

+    DCD  CAN1_SCE_IRQHandler

     DCD  EXTI9_5_IRQHandler

     DCD  TIM1_BRK_IRQHandler

     DCD  TIM1_UP_IRQHandler