USART refactor.

2 files changed, 75 insertions, 61 deletions

diff --git a/wirish/comm/HardwareSerial.cpp b/wirish/comm/HardwareSerial.cpp
index 8398878..aa8855b 100644
--- a/wirish/comm/HardwareSerial.cpp
+++ b/wirish/comm/HardwareSerial.cpp
@@ -24,69 +24,85 @@
 
 /**
  * @file HardwareSerial.cpp
- *
- * @brief Wiring-like serial api
+ * @brief Wirish serial port implementation.
  */
 
-#include "wirish.h"
+#include "gpio.h"
+#include "timer.h"
+
 #include "HardwareSerial.h"
-#include "usart.h"
-
-// FIXME: High density device ports, usages of BOARD_USARTx_yX_PIN
-// instead of holding onto a gpio_dev, tx_pin, rx_pin, timer_dev, and
-// channel_num -- that stuff is all in the PIN_MAP.
-HardwareSerial Serial1(USART1, 4500000UL, GPIOA,  9, 10, TIMER1, 2);
-HardwareSerial Serial2(USART2, 2250000UL, GPIOA,  2,  3, TIMER2, 3);
-HardwareSerial Serial3(USART3, 2250000UL, GPIOB, 10, 11,   NULL, 0);
-
-HardwareSerial::HardwareSerial(uint8 usart_num,
-                               uint32 max_baud,
-                               gpio_dev *gpio_device,
+#include "boards.h"
+
+#define TX1 BOARD_USART1_TX_PIN
+#define RX1 BOARD_USART1_RX_PIN
+#define TX2 BOARD_USART2_TX_PIN
+#define RX2 BOARD_USART2_RX_PIN
+#define TX3 BOARD_USART3_TX_PIN
+#define RX3 BOARD_USART3_RX_PIN
+#if defined STM32_HIGH_DENSITY && !defined(BOARD_maple_RET6)
+#define TX4 BOARD_UART4_TX_PIN
+#define RX4 BOARD_UART4_RX_PIN
+#define TX5 BOARD_UART5_TX_PIN
+#define RX5 BOARD_UART5_RX_PIN
+#endif
+
+HardwareSerial Serial1(USART1, TX1, RX1);
+HardwareSerial Serial2(USART2, TX2, RX2);
+HardwareSerial Serial3(USART3, TX3, RX3);
+#if defined(STM32_HIGH_DENSITY) && !defined(BOARD_maple_RET6)
+HardwareSerial Serial4(UART4,  TX4, RX4);
+HardwareSerial Serial5(UART5,  TX5, RX5);
+#endif
+
+HardwareSerial::HardwareSerial(usart_dev *usart_device,
                                uint8 tx_pin,
-                               uint8 rx_pin,
-                               timer_dev *timer_device,
-                               uint8 channel_num) {
-    this->usart_num = usart_num;
-    this->max_baud = max_baud;
-    this->gpio_device = gpio_device;
+                               uint8 rx_pin) {
+    this->usart_device = usart_device;
     this->tx_pin = tx_pin;
     this->rx_pin = rx_pin;
-    this->timer_device = timer_device;
-    this->channel_num = channel_num;
 }
 
 uint8 HardwareSerial::read(void) {
-    return usart_getc(usart_num);
+    return usart_getc(usart_device);
 }
 
 uint32 HardwareSerial::available(void) {
-    return usart_data_available(usart_num);
+    return usart_data_available(usart_device);
 }
 
 void HardwareSerial::write(unsigned char ch) {
-    usart_putc(usart_num, ch);
+    usart_putc(usart_device, ch);
 }
 
 void HardwareSerial::begin(uint32 baud) {
-    if (baud > max_baud) {
+    ASSERT(baud <= usart_device->max_baud);
+
+    if (baud > usart_device->max_baud) {
         return;
     }
 
-    gpio_set_mode(gpio_device, tx_pin, GPIO_AF_OUTPUT_PP);
-    gpio_set_mode(gpio_device, rx_pin, GPIO_INPUT_FLOATING);
+    const stm32_pin_info *txi = &PIN_MAP[tx_pin];
+    const stm32_pin_info *rxi = &PIN_MAP[rx_pin];
+
+    gpio_set_mode(txi->gpio_device, txi->gpio_bit, GPIO_AF_OUTPUT_PP);
+    gpio_set_mode(rxi->gpio_device, rxi->gpio_bit, GPIO_INPUT_FLOATING);
 
-    if (timer_device != NULL) {
-        /* turn off any pwm if there's a conflict on this usart */
-        timer_set_mode(timer_device, channel_num, TIMER_DISABLED);
+    if (txi->timer_device != NULL) {
+        /* Turn off any PWM if there's a conflict on this GPIO bit. */
+        timer_set_mode(txi->timer_device, txi->timer_channel, TIMER_DISABLED);
     }
 
-    usart_init(usart_num, baud);
+    usart_init(usart_device);
+    usart_set_baud_rate(usart_device,
+                        CYCLES_PER_MICROSECOND * 1000000UL,
+                        baud);
+    usart_enable(usart_device);
 }
 
 void HardwareSerial::end(void) {
-    usart_disable(usart_num);
+    usart_disable(usart_device);
 }
 
 void HardwareSerial::flush(void) {
-    usart_reset_rx(usart_num);
+    usart_reset_rx(usart_device);
 }
diff --git a/wirish/comm/HardwareSerial.h b/wirish/comm/HardwareSerial.h
index 7852d51..5e86f79 100644
--- a/wirish/comm/HardwareSerial.h
+++ b/wirish/comm/HardwareSerial.h
@@ -24,43 +24,33 @@
 
 /**
  * @file HardwareSerial.h
- *
- * @brief Wirish interface to hardware serial communications.
+ * @brief Wirish serial port interface.
  */
 
 #ifndef _HARDWARESERIAL_H_
 #define _HARDWARESERIAL_H_
 
 #include "libmaple_types.h"
-#include "gpio.h"
-#include "timer.h"
+#include "usart.h"
 
 #include "Print.h"
 
-/* NB: this class documented "by hand" (i.e., not using Doxygen) in:
-
-     libmaple/docs/source/lang/serial.rst
-
-   If you alter the public HardwareSerial interface, you must update
-   the documentation accordingly. */
+/*
+ * IMPORTANT:
+ *
+ * This class documented "by hand" (i.e., not using Doxygen) in:
+ *
+ *   libmaple/docs/source/lang/api/serial.rst
+ *
+ * If you alter the public HardwareSerial interface, you MUST update
+ * the documentation accordingly.
+ */
 
 class HardwareSerial : public Print {
- private:
-    uint8 usart_num;
-    uint32 max_baud;
-    gpio_dev *gpio_device;
-    uint8 tx_pin;
-    uint8 rx_pin;
-    timer_dev *timer_device;
-    uint8 channel_num;
- public:
-    HardwareSerial(uint8 usart_num,
-                   uint32 max_baud,
-                   gpio_dev *gpio_device,
+public:
+    HardwareSerial(usart_dev *usart_device,
                    uint8 tx_pin,
-                   uint8 rx_pin,
-                   timer_dev *timer_device,
-                   uint8 channel_num);
+                   uint8 rx_pin);
     void begin(uint32 baud);
     void end(void);
     uint32 available(void);
@@ -68,10 +58,18 @@ class HardwareSerial : public Print {
     void flush(void);
     virtual void write(unsigned char);
     using Print::write;
+private:
+    usart_dev *usart_device;
+    uint8 tx_pin;
+    uint8 rx_pin;
 };
+
 extern HardwareSerial Serial1;
 extern HardwareSerial Serial2;
 extern HardwareSerial Serial3;
-// TODO: high density device ports
+#if defined(STM32_HIGH_DENSITY) && !defined(BOARD_maple_RET6)
+extern HardwareSerial Serial4;
+extern HardwareSerial Serial5;
 #endif
 
+#endif