Bring back HardwareSerial.

To make this happen, we need to have <board/board.h> tell us whether
or not it's got each of the USARTs. Do that with BOARD_HAVE_USARTn,
for n = 1,...,6. This lets us define HardwareSerial instances only
when appropriate, and gets rid of some board-specific hacks we'd
accumulated.

The new <libmaple/usart.h> now has a convenience function for
determining the bus rate by using the appropriate STM32_PCLKx macro,
so we can shave a uint32 per instance, which is nice given that
they're all going to be in memory. This changes the constructor
arguments, but the API only specifies the semantics of the predefined
instances, so this is still backwards-compatible. (We should look into
storing the instances in Flash -- they don't change, after all.)

We don't actually need struct usart_dev's definition in
HardwareSerial.h, so replace it with a forward declaration and include
<libmaple/usart.h> it in HardwareSerial.cpp instead.

Assert some copyrights.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>

1 files changed, 19 insertions, 7 deletions

diff --git a/wirish/include/wirish/HardwareSerial.h b/wirish/include/wirish/HardwareSerial.h
index 1eaacb6..2b1e747 100644
--- a/wirish/include/wirish/HardwareSerial.h
+++ b/wirish/include/wirish/HardwareSerial.h
@@ -2,6 +2,7 @@
  * The MIT License
  *
  * Copyright (c) 2010 Perry Hung.
+ * Copyright (c) 2011, 2012 LeafLabs, LLC.
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -33,9 +34,9 @@
 #define _WIRISH_HARDWARESERIAL_H_
 
 #include <libmaple/libmaple_types.h>
-#include <libmaple/usart.h>
 
 #include <wirish/Print.h>
+#include <wirish/boards.h>
 
 /*
  * IMPORTANT:
@@ -47,12 +48,13 @@
  * the documentation accordingly.
  */
 
+struct usart_dev;
+
 class HardwareSerial : public Print {
 public:
-    HardwareSerial(usart_dev *usart_device,
+    HardwareSerial(struct usart_dev *usart_device,
                    uint8 tx_pin,
-                   uint8 rx_pin,
-                   uint32 clock_speed);
+                   uint8 rx_pin);
 
     /* Set up/tear down */
     void begin(uint32 baud);
@@ -69,18 +71,28 @@ public:
     int txPin(void) { return this->tx_pin; }
     int rxPin(void) { return this->rx_pin; }
 private:
-    usart_dev *usart_device;
+    struct usart_dev *usart_device;
     uint8 tx_pin;
     uint8 rx_pin;
-    uint32 clock_speed;
 };
 
+#if BOARD_HAVE_USART1
 extern HardwareSerial Serial1;
+#endif
+#if BOARD_HAVE_USART2
 extern HardwareSerial Serial2;
+#endif
+#if BOARD_HAVE_USART3
 extern HardwareSerial Serial3;
-#if defined(STM32_HIGH_DENSITY) && !defined(BOARD_maple_RET6)
+#endif
+#if BOARD_HAVE_UART4
 extern HardwareSerial Serial4;
+#endif
+#if BOARD_HAVE_UART5
 extern HardwareSerial Serial5;
 #endif
+#if BOARD_HAVE_USART6
+extern HardwareSerial Serial6;
+#endif
 
 #endif