git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@730 35acf78f-673a-0410-8e92-d51de3d6d3f4

5 files changed, 32 insertions, 27 deletions

diff --git a/ports/ARM7-AT91SAM7X/sam7x_serial.c b/ports/ARM7-AT91SAM7X/sam7x_serial.c
index c2d2f01a7..146d73f1b 100644
--- a/ports/ARM7-AT91SAM7X/sam7x_serial.c
+++ b/ports/ARM7-AT91SAM7X/sam7x_serial.c
@@ -129,11 +129,11 @@ static void OutNotify2(void) {
  * @brief UART setup.

  * @param[in] u pointer to an UART I/O block

  * @param[in] speed serial port speed in bits per second

- * @param[in] mode mode flags

+ * @param[in] mr the value for the @p MR register

  * @note Must be invoked with interrupts disabled.

  * @note Does not reset the I/O queues.

  */

-void SetUSART(AT91PS_USART u, int speed, int mode) {

+void sam7x_set_usart(AT91PS_USART u, int speed, int mr) {

 

   /* Disables IRQ sources and stop operations.*/

   u->US_IDR = 0xFFFFFFFF;

@@ -184,11 +184,12 @@ void sam7x_serial_init(int prio0, int prio1) {
   AIC_EnableIT(AT91C_ID_US0);

 

   /* Default parameters.*/

-  SetUSART(AT91C_BASE_US0, SAM7X_USART_BITRATE, AT91C_US_USMODE_NORMAL |

-                                                AT91C_US_CLKS_CLOCK |

-                                                AT91C_US_CHRL_8_BITS |

-                                                AT91C_US_PAR_NONE |

-                                                AT91C_US_NBSTOP_1_BIT);

+  sam7x_set_usart(AT91C_BASE_US0, SAM7X_USART_BITRATE,

+                  AT91C_US_USMODE_NORMAL |

+                  AT91C_US_CLKS_CLOCK |

+                  AT91C_US_CHRL_8_BITS |

+                  AT91C_US_PAR_NONE |

+                  AT91C_US_NBSTOP_1_BIT);

 #endif

 

 #if USE_SAM7X_USART1 || defined(__DOXYGEN__)

@@ -211,11 +212,12 @@ void sam7x_serial_init(int prio0, int prio1) {
   AIC_EnableIT(AT91C_ID_US1);

 

   /* Default parameters.*/

-  SetUSART(AT91C_BASE_US1, SAM7X_USART_BITRATE, AT91C_US_USMODE_NORMAL |

-                                                AT91C_US_CLKS_CLOCK |

-                                                AT91C_US_CHRL_8_BITS |

-                                                AT91C_US_PAR_NONE |

-                                                AT91C_US_NBSTOP_1_BIT);

+  sam7x_set_usart(AT91C_BASE_US1, SAM7X_USART_BITRATE,

+                  AT91C_US_USMODE_NORMAL |

+                  AT91C_US_CLKS_CLOCK |

+                  AT91C_US_CHRL_8_BITS |

+                  AT91C_US_PAR_NONE |

+                  AT91C_US_NBSTOP_1_BIT);

 #endif

 }

 

diff --git a/ports/ARM7-AT91SAM7X/sam7x_serial.h b/ports/ARM7-AT91SAM7X/sam7x_serial.h
index d103a8a1e..397fc9d3f 100644
--- a/ports/ARM7-AT91SAM7X/sam7x_serial.h
+++ b/ports/ARM7-AT91SAM7X/sam7x_serial.h
@@ -70,7 +70,7 @@
 extern "C" {

 #endif

   void sam7x_serial_init(int prio0, int prio1);

-  void SetUSART(AT91PS_USART u, int speed, int mode);

+  void sam7x_set_usart(AT91PS_USART u, int speed, int mode);

   CH_IRQ_HANDLER(UART0IrqHandler);

   CH_IRQ_HANDLER(UART1IrqHandler);

 #ifdef __cplusplus

diff --git a/ports/ARM7-LPC214x/lpc214x_serial.c b/ports/ARM7-LPC214x/lpc214x_serial.c
index 1e5ac97db..1e56739e5 100644
--- a/ports/ARM7-LPC214x/lpc214x_serial.c
+++ b/ports/ARM7-LPC214x/lpc214x_serial.c
@@ -218,7 +218,7 @@ static void OutNotify2(void) {
  * @note Must be invoked with interrupts disabled.

  * @note Does not reset the I/O queues.

  */

-void SetUART(UART *u, int speed, int lcr, int fcr) {

+void lpc2148x_set_uart(UART *u, int speed, int lcr, int fcr) {

 

   int div = PCLK / (speed << 4);

   u->UART_LCR = lcr | LCR_DLAB;

@@ -246,10 +246,10 @@ void lpc2148x_serial_init(int vector1, int vector2) {
   SetVICVector(UART0IrqHandler, vector1, SOURCE_UART0);

   PCONP = (PCONP & PCALL) | PCUART0;

   chFDDInit(&COM1, ib1, sizeof ib1, NULL, ob1, sizeof ob1, OutNotify1);

-  SetUART(U0Base,

-          LPC214x_UART_BITRATE,

-          LCR_WL8 | LCR_STOP1 | LCR_NOPARITY,

-          FCR_TRIGGER0);

+  lpc2148x_set_uart(U0Base,

+                    LPC214x_UART_BITRATE,

+                    LCR_WL8 | LCR_STOP1 | LCR_NOPARITY,

+                    FCR_TRIGGER0);

   VICIntEnable = INTMASK(SOURCE_UART0);

 #endif

 

@@ -257,10 +257,10 @@ void lpc2148x_serial_init(int vector1, int vector2) {
   SetVICVector(UART1IrqHandler, vector2, SOURCE_UART1);

   PCONP = (PCONP & PCALL) | PCUART1;

   chFDDInit(&COM2, ib2, sizeof ib2, NULL, ob2, sizeof ob2, OutNotify2);

-  SetUART(U1Base,

-          LPC214x_UART_BITRATE,

-          LCR_WL8 | LCR_STOP1 | LCR_NOPARITY,

-          FCR_TRIGGER0);

+  lpc2148x_set_uart(U1Base,

+                    LPC214x_UART_BITRATE,

+                    LCR_WL8 | LCR_STOP1 | LCR_NOPARITY,

+                    FCR_TRIGGER0);

   VICIntEnable = INTMASK(SOURCE_UART0) | INTMASK(SOURCE_UART1);

 #endif

 }

diff --git a/ports/ARMCM3-STM32F103/stm32_serial.c b/ports/ARMCM3-STM32F103/stm32_serial.c
index 37ffd1234..d39cf8b27 100644
--- a/ports/ARMCM3-STM32F103/stm32_serial.c
+++ b/ports/ARMCM3-STM32F103/stm32_serial.c
@@ -194,7 +194,8 @@ void stm32_serial_init(uint32_t prio1, uint32_t prio2, uint32_t prio3) {
 #if USE_STM32_USART1
   chFDDInit(&COM1, ib1, sizeof ib1, NULL, ob1, sizeof ob1, OutNotify1);
   RCC->APB2ENR |= 0x00004000;
-  SetUSART(USART1, STM32_USART_BITRATE, 0, CR2_STOP1_BITS | CR2_LINEN, 0);
+  stm32_set_usart(USART1, STM32_USART_BITRATE, 0,
+                  CR2_STOP1_BITS | CR2_LINEN, 0);
   GPIOA->CRH = (GPIOA->CRH & 0xFFFFF00F) | 0x000004B0;
   NVICEnableVector(USART1_IRQChannel, prio1);
 #endif
@@ -202,7 +203,8 @@ void stm32_serial_init(uint32_t prio1, uint32_t prio2, uint32_t prio3) {
 #if USE_STM32_USART2
   chFDDInit(&COM2, ib2, sizeof ib2, NULL, ob2, sizeof ob2, OutNotify2);
   RCC->APB1ENR |= 0x00020000;
-  SetUSART(USART2, STM32_USART_BITRATE, 0, CR2_STOP1_BITS | CR2_LINEN, 0);
+  stm32_set_usart(USART2, STM32_USART_BITRATE, 0,
+                  CR2_STOP1_BITS | CR2_LINEN, 0);
   GPIOA->CRL = (GPIOA->CRL & 0xFFFF00FF) | 0x00004B00;
   NVICEnableVector(USART2_IRQChannel, prio2);
 #endif
@@ -210,7 +212,8 @@ void stm32_serial_init(uint32_t prio1, uint32_t prio2, uint32_t prio3) {
 #if USE_STM32_USART3
   chFDDInit(&COM3, ib3, sizeof ib3, NULL, ob3, sizeof ob3, OutNotify3);
   RCC->APB1ENR |= 0x00040000;
-  SetUSART(USART3, STM32_USART_BITRATE, 0, CR2_STOP1_BITS | CR2_LINEN, 0);
+  stm32_set_usart(USART3, STM32_USART_BITRATE, 0,
+                  CR2_STOP1_BITS | CR2_LINEN, 0);
   GPIOB->CRH = (GPIOB->CRH & 0xFFFF00FF) | 0x00004B00;
   NVICEnableVector(USART3_IRQChannel, prio3);
 #endif
diff --git a/ports/ARMCM3-STM32F103/stm32_serial.h b/ports/ARMCM3-STM32F103/stm32_serial.h
index 7393f718c..f7b79c8d5 100644
--- a/ports/ARMCM3-STM32F103/stm32_serial.h
+++ b/ports/ARMCM3-STM32F103/stm32_serial.h
@@ -146,8 +146,8 @@ extern FullDuplexDriver COM3;
 extern "C" {

 #endif

   void stm32_serial_init(uint32_t prio1, uint32_t prio2, uint32_t prio3);

-  void SetUSART(USART_TypeDef *u, uint32_t speed, uint16_t cr1,

-                uint16_t cr2, uint16_t cr3);

+  void stm32_set_usart(USART_TypeDef *u, uint32_t speed, uint16_t cr1,

+                       uint16_t cr2, uint16_t cr3);

 #ifdef __cplusplus

 }

 #endif