[rtems commit] gumstix/include/bsp.h: Do not include libchip/
Joel Sherrill
joel at rtems.org
Fri Oct 10 15:08:38 UTC 2014
serial to avoid conflicts when building libchip/rtc
User-Agent: Heirloom mailx 12.4 7/29/08
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Module: rtems
Branch: master
Commit: ab31e8e19717745728902525353f7fd6ff7de680
Changeset: http://git.rtems.org/rtems/commit/?id=ab31e8e19717745728902525353f7fd6ff7de680
Author: Joel Sherrill <joel.sherrill at oarcorp.com>
Date: Thu Oct 9 12:55:52 2014 -0500
gumstix/include/bsp.h: Do not include libchip/serial to avoid conflicts when building libchip/rtc
---
c/src/lib/libbsp/arm/gumstix/include/bsp.h | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/c/src/lib/libbsp/arm/gumstix/include/bsp.h b/c/src/lib/libbsp/arm/gumstix/include/bsp.h
index 15ef4b5..fec1ebb 100644
--- a/c/src/lib/libbsp/arm/gumstix/include/bsp.h
+++ b/c/src/lib/libbsp/arm/gumstix/include/bsp.h
@@ -25,7 +25,6 @@ extern "C" {
#include <rtems.h>
#include <rtems/console.h>
#include <rtems/clockdrv.h>
-#include <libchip/serial.h>
/**
* @defgroup arm_gumstix Gumstix Support
@@ -45,7 +44,13 @@ extern "C" {
/** @brief What is the last interrupt */
#define BSP_MAX_INT AT91RM9200_MAX_INT
+/*
+ * forward reference the type to avoid conflicts between libchip serial
+ * and libchip rtc get and set register types.
+ */
+typedef struct _console_tbl console_tbl;
console_tbl *BSP_get_uart_from_minor(int minor);
+
static inline int32_t BSP_get_baud(void) {return 115200;}
/** @brief How big should the interrupt stack be? */
More information about the vc
mailing list