From bb491b8a3f59d12f156afef68389e4101b53f10c Mon Sep 17 00:00:00 2001
From: Brian Webb <webbbn@gmail.com>
Date: Mon, 14 May 2012 06:57:16 -0700
Subject: [PATCH] Fixed bootloader on PipX.

---
 flight/Bootloaders/PipXtreme/Makefile     |  4 +-
 flight/Bootloaders/PipXtreme/pios_board.c | 90 +----------------------
 2 files changed, 3 insertions(+), 91 deletions(-)

diff --git a/flight/Bootloaders/PipXtreme/Makefile b/flight/Bootloaders/PipXtreme/Makefile
index e682d00bd..f90b635a8 100644
--- a/flight/Bootloaders/PipXtreme/Makefile
+++ b/flight/Bootloaders/PipXtreme/Makefile
@@ -86,6 +86,7 @@ RTOSDIR = $(APPLIBDIR)/FreeRTOS
 RTOSSRCDIR = $(RTOSDIR)/Source
 RTOSINCDIR = $(RTOSSRCDIR)/include
 DOXYGENDIR = ../Doc/Doxygen
+HWDEFSINC = ../../board_hw_defs/$(BOARD_NAME)
 
 # List C source files here. (C dependencies are automatically generated.)
 # use file-extension c for "c-only"-files
@@ -198,8 +199,7 @@ EXTRAINCDIRS  += $(MSDDIR)
 EXTRAINCDIRS  += $(RTOSINCDIR)
 EXTRAINCDIRS  += $(APPLIBDIR)
 EXTRAINCDIRS  += $(RTOSSRCDIR)/portable/GCC/ARM_CM3
-
-
+EXTRAINCDIRS  += $(HWDEFSINC)
 
 # List any extra directories to look for library files here.
 # Also add directories where the linker should search for
diff --git a/flight/Bootloaders/PipXtreme/pios_board.c b/flight/Bootloaders/PipXtreme/pios_board.c
index 29d7aa2a3..893dc35f9 100644
--- a/flight/Bootloaders/PipXtreme/pios_board.c
+++ b/flight/Bootloaders/PipXtreme/pios_board.c
@@ -23,97 +23,9 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#include "board_hw_defs.c"
 #include <pios.h>
 
-#if defined(PIOS_INCLUDE_LED)
-
-#include <pios_led_priv.h>
-static const struct pios_led pios_leds[] = {
-	[PIOS_LED_USB] = {
-		.pin = {
-			.gpio = GPIOA,
-			.init = {
-				.GPIO_Pin   = GPIO_Pin_3,
-				.GPIO_Mode  = GPIO_Mode_Out_PP,
-				.GPIO_Speed = GPIO_Speed_50MHz,
-			},
-		},
-	},
-	[PIOS_LED_LINK] = {
-		.pin = {
-			.gpio = GPIOB,
-			.init = {
-				.GPIO_Pin   = GPIO_Pin_5,
-				.GPIO_Mode  = GPIO_Mode_Out_PP,
-				.GPIO_Speed = GPIO_Speed_50MHz,
-			},
-		},
-	},
-	[PIOS_LED_RX] = {
-		.pin = {
-			.gpio = GPIOB,
-			.init = {
-				.GPIO_Pin   = GPIO_Pin_6,
-				.GPIO_Mode  = GPIO_Mode_Out_PP,
-				.GPIO_Speed = GPIO_Speed_50MHz,
-			},
-		},
-	},
-	[PIOS_LED_TX] = {
-		.pin = {
-			.gpio = GPIOB,
-			.init = {
-				.GPIO_Pin   = GPIO_Pin_7,
-				.GPIO_Mode  = GPIO_Mode_Out_PP,
-				.GPIO_Speed = GPIO_Speed_50MHz,
-			},
-		},
-	},
-};
-
-static const struct pios_led_cfg pios_led_cfg = {
-	.leds     = pios_leds,
-	.num_leds = NELEMENTS(pios_leds),
-};
-
-#endif	/* PIOS_INCLUDE_LED */
-
-#if defined(PIOS_INCLUDE_COM_MSG)
-
-#include <pios_com_msg_priv.h>
-
-#endif /* PIOS_INCLUDE_COM_MSG */
-
-#if defined(PIOS_INCLUDE_USB)
-#include "pios_usb_priv.h"
-
-static const struct pios_usb_cfg pios_usb_main_cfg = {
-  .irq = {
-    .init    = {
-      .NVIC_IRQChannel                   = USB_LP_CAN1_RX0_IRQn,
-      .NVIC_IRQChannelPreemptionPriority = PIOS_IRQ_PRIO_LOW,
-      .NVIC_IRQChannelSubPriority        = 0,
-      .NVIC_IRQChannelCmd                = ENABLE,
-    },
-  },
-};
-
-#include "pios_usb_board_data_priv.h"
-#include "pios_usb_desc_hid_only_priv.h"
-
-#endif	/* PIOS_INCLUDE_USB */
-
-#if defined(PIOS_INCLUDE_USB_HID)
-#include <pios_usb_hid_priv.h>
-
-const struct pios_usb_hid_cfg pios_usb_hid_cfg = {
-	.data_if = 0,
-	.data_rx_ep = 1,
-	.data_tx_ep = 1,
-};
-
-#endif	/* PIOS_INCLUDE_USB_HID */
-
 uint32_t pios_com_telem_usb_id;
 
 /**