Move public headers to include directories; related cleanups.

Move libmaple/*.h to (new) libmaple/include/libmaple/. The new
accepted way to include a libmaple header foo.h is with:

    #include <libmaple/foo.h>

This is more polite in terms of the include namespace. It also allows
us to e.g. implement the Arduino SPI library at all (which has header
SPI.h; providing it was previously impossible on case-insensitive
filesystems due to libmaple's spi.h).

Similarly for Wirish.

The old include style (#include "header.h") is now deprecated.

libmaple/*.h:

- Change include guard #defines from _FOO_H_ to _LIBMAPLE_FOO_H_.
- Add license headers where they're missing
- Add conditional extern "C" { ... } blocks where they're missing
  (they aren't always necessary, but we might was well do it against
  the future, while we're at it.).
- Change includes from #include "foo.h" to #include <libmaple/foo.h>.
- Move includes after extern "C".
- Remove extra trailing newlines

Note that this doesn't include the headers under libmaple/usb/ or
libmaple/usb/usb_lib. These will get fixed later.

libmaple/*.c:

- Change includes from #include "foo.h" to #include <libmaple/foo.h>.

Makefile:

- Add I$(LIBMAPLE_PATH)/include/libmaple to GLOBAL_FLAGS.  This allows
  for users (including Wirish) to migrate their code, but should go
  away ASAP, since it slows down compilation.

Wirish:

- Move wirish/**/*.h to (new) wirish/include/wirish/.  This ignores
  the USB headers, which, as usual, are getting handled after
  everything else.

- Similarly generify wirish/boards/ structure. For each supported
  board "foo", move wirish/boards/foo.h and wirish/boards/foo.cpp to
  wirish/boards/foo/include/board/board.h and
  wirish/boards/foo/board.cpp, respectively. Also remove the #ifdef
  hacks around the .cpp files.

- wirish/rules.mk: put wirish/boards/foo/include in the include path
  (and add wirish/boards/foo/board.cpp to the list of sources to be
  compiled). This allows saying:

      #include <board/board.h>

  instead of the hack currently in place. We can allow the user to
  override this setting later to make adding custom board definitions
  easier.

- Disable -Werror in libmaple/rules.mk, as the current USB warnings
  don't let the olimex_stm32_h103 board compile. We can re-enable
  -Werror once we've moved the board-specific bits out of libmaple
  proper.

libraries, examples:

- Update includes accordingly.
- Miscellaneous cosmetic fixups.

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

1 files changed, 0 insertions, 106 deletions

diff --git a/wirish/boards/maple_mini.cpp b/wirish/boards/maple_mini.cpp
deleted file mode 100644
index f111a14..0000000
--- a/wirish/boards/maple_mini.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/******************************************************************************
- * The MIT License
- *
- * Copyright (c) 2011 LeafLabs, LLC.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *****************************************************************************/
-
-/**
- * @file   maple_mini.cpp
- * @author Marti Bolivar <mbolivar@leaflabs.com>
- * @brief  Maple Mini board file.
- */
-
-#ifdef BOARD_maple_mini
-
-#include "maple_mini.h"
-
-#include "gpio.h"
-#include "timer.h"
-#include "wirish_debug.h"
-#include "wirish_types.h"
-
-/* Since we want the Serial Wire/JTAG pins as GPIOs, disable both SW
- * and JTAG debug support */
-void boardInit(void) {
-    disableDebugPorts();
-}
-
-extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
-
-    /* Top header */
-
-    {GPIOB,   NULL, NULL, 11, 0, ADCx}, /* D0/PB11 */
-    {GPIOB,   NULL, NULL, 10, 0, ADCx}, /* D1/PB10 */
-    {GPIOB,   NULL, NULL,  2, 0, ADCx}, /* D2/PB2 */
-    {GPIOB, TIMER3, ADC1,  0, 3,    8}, /* D3/PB0 */
-    {GPIOA, TIMER3, ADC1,  7, 2,    7}, /* D4/PA7 */
-    {GPIOA, TIMER3, ADC1,  6, 1,    6}, /* D5/PA6 */
-    {GPIOA,   NULL, ADC1,  5, 0,    5}, /* D6/PA5 */
-    {GPIOA,   NULL, ADC1,  4, 0,    4}, /* D7/PA4 */
-    {GPIOA, TIMER2, ADC1,  3, 4,    3}, /* D8/PA3 */
-    {GPIOA, TIMER2, ADC1,  2, 3,    2}, /* D9/PA2 */
-    {GPIOA, TIMER2, ADC1,  1, 2,    1}, /* D10/PA1 */
-    {GPIOA, TIMER2, ADC1,  0, 1,    0}, /* D11/PA0 */
-    {GPIOC,   NULL, NULL, 15, 0, ADCx}, /* D12/PC15 */
-    {GPIOC,   NULL, NULL, 14, 0, ADCx}, /* D13/PC14 */
-    {GPIOC,   NULL, NULL, 13, 0, ADCx}, /* D14/PC13 */
-
-    /* Bottom header */
-
-    {GPIOB, TIMER4, NULL,  7, 2, ADCx}, /* D15/PB7 */
-    {GPIOB, TIMER4, NULL,  6, 1, ADCx}, /* D16/PB6 */
-    {GPIOB,   NULL, NULL,  5, 0, ADCx}, /* D17/PB5 */
-    {GPIOB,   NULL, NULL,  4, 0, ADCx}, /* D18/PB4 */
-    {GPIOB,   NULL, NULL,  3, 0, ADCx}, /* D19/PB3 */
-    {GPIOA,   NULL, NULL, 15, 0, ADCx}, /* D20/PA15 */
-    {GPIOA,   NULL, NULL, 14, 0, ADCx}, /* D21/PA14 */
-    {GPIOA,   NULL, NULL, 13, 0, ADCx}, /* D22/PA13 */
-    {GPIOA,   NULL, NULL, 12, 0, ADCx}, /* D23/PA12 */
-    {GPIOA, TIMER1, NULL, 11, 4, ADCx}, /* D24/PA11 */
-    {GPIOA, TIMER1, NULL, 10, 3, ADCx}, /* D25/PA10 */
-    {GPIOA, TIMER1, NULL,  9, 2, ADCx}, /* D26/PA9 */
-    {GPIOA, TIMER1, NULL,  8, 1, ADCx}, /* D27/PA8 */
-    {GPIOB,   NULL, NULL, 15, 0, ADCx}, /* D28/PB15 */
-    {GPIOB,   NULL, NULL, 14, 0, ADCx}, /* D29/PB14 */
-    {GPIOB,   NULL, NULL, 13, 0, ADCx}, /* D30/PB13 */
-    {GPIOB,   NULL, NULL, 12, 0, ADCx}, /* D31/PB12 */
-    {GPIOB, TIMER4, NULL,  8, 3, ADCx}, /* D32/PB8 */
-    {GPIOB, TIMER3, ADC1,  1, 4,    9}, /* D33/PB1 */
-};
-
-extern const uint8 boardPWMPins[BOARD_NR_PWM_PINS] __FLASH__ = {
-    3, 4, 5, 8, 9, 10, 11, 15, 16, 25, 26, 27
-};
-
-extern const uint8 boardADCPins[BOARD_NR_ADC_PINS] __FLASH__ = {
-    3, 4, 5, 6, 7, 8, 9, 10, 11
-};
-
-#define USB_DP 23
-#define USB_DM 24
-
-extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = {
-    BOARD_LED_PIN, BOARD_BUTTON_PIN, USB_DP, USB_DM
-};
-
-#endif