<div dir="ltr">Given that Trac generates release reports from tickets and this <div>seems important, could you file a ticket explaining what this is,</div><div>source URL, etc.</div><div><br></div><div>FWIW I think we all have to be more conscious of helping Trac</div><div>help us in this way. :)</div><div><br></div><div>--joel</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jan 15, 2016 at 7:44 AM, Sebastian Huber <span dir="ltr"><<a href="mailto:sebastian.huber@embedded-brains.de" target="_blank">sebastian.huber@embedded-brains.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">---<br>
.../libbsp/arm/atsam/libraries/libboard/board.h | 3 ++<br>
.../arm/atsam/libraries/libboard/board_v71_xult.h | 4 +++<br>
.../libboard/resources_v71/system_samv71.c | 16 +++++++++--<br>
.../libraries/libboard/source/board_lowlevel.c | 5 ++++<br>
.../libraries/libboard/source/board_memories.c | 11 ++++++++<br>
.../atsam/libraries/libboard/source/dbg_console.c | 19 +++++++++++++<br>
.../libbsp/arm/atsam/libraries/libchip/compiler.h | 33 ++++++++++++++++++++--<br>
.../arm/atsam/libraries/libchip/include/chip.h | 1 +<br>
.../arm/atsam/libraries/libchip/include/qspi_dma.h | 2 ++<br>
.../libraries/libchip/include/same70/same70j19.h | 2 ++<br>
.../libraries/libchip/include/same70/same70j20.h | 2 ++<br>
.../libraries/libchip/include/same70/same70j21.h | 2 ++<br>
.../libraries/libchip/include/same70/same70n19.h | 2 ++<br>
.../libraries/libchip/include/same70/same70n20.h | 2 ++<br>
.../libraries/libchip/include/same70/same70n21.h | 2 ++<br>
.../libraries/libchip/include/same70/same70q19.h | 2 ++<br>
.../libraries/libchip/include/same70/same70q20.h | 2 ++<br>
.../libraries/libchip/include/same70/same70q21.h | 2 ++<br>
.../libraries/libchip/include/sams70/sams70j19.h | 2 ++<br>
.../libraries/libchip/include/sams70/sams70j20.h | 2 ++<br>
.../libraries/libchip/include/sams70/sams70j21.h | 2 ++<br>
.../libraries/libchip/include/sams70/sams70n19.h | 2 ++<br>
.../libraries/libchip/include/sams70/sams70n20.h | 2 ++<br>
.../libraries/libchip/include/sams70/sams70n21.h | 2 ++<br>
.../libraries/libchip/include/sams70/sams70q19.h | 2 ++<br>
.../libraries/libchip/include/sams70/sams70q20.h | 2 ++<br>
.../libraries/libchip/include/sams70/sams70q21.h | 2 ++<br>
.../libraries/libchip/include/samv71/samv71.h | 3 ++<br>
.../libraries/libchip/include/samv71/samv71j19.h | 2 ++<br>
.../libraries/libchip/include/samv71/samv71j20.h | 2 ++<br>
.../libraries/libchip/include/samv71/samv71j21.h | 2 ++<br>
.../libraries/libchip/include/samv71/samv71n19.h | 2 ++<br>
.../libraries/libchip/include/samv71/samv71n20.h | 2 ++<br>
.../libraries/libchip/include/samv71/samv71n21.h | 2 ++<br>
.../libraries/libchip/include/samv71/samv71q19.h | 2 ++<br>
.../libraries/libchip/include/samv71/samv71q20.h | 2 ++<br>
.../libraries/libchip/include/samv71/samv71q21.h | 2 ++<br>
.../arm/atsam/libraries/libchip/include/xdmac.h | 2 ++<br>
.../arm/atsam/libraries/libchip/source/mcan.c | 8 ++++++<br>
.../libbsp/arm/atsam/libraries/libchip/source/tc.c | 4 +++<br>
40 files changed, 161 insertions(+), 4 deletions(-)<br>
create mode 100644 c/src/lib/libbsp/arm/atsam/libraries/libchip/include/chip.h<br>
<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libboard/board.h b/c/src/lib/libbsp/arm/atsam/libraries/libboard/board.h<br>
index a77409d..d69d212 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libboard/board.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libboard/board.h<br>
@@ -30,6 +30,9 @@<br>
#ifndef _BOARD_H_<br>
#define _BOARD_H_<br>
<br>
+#ifdef __rtems__<br>
+#include <bspopts.h><br>
+#endif /* __rtems__ */<br>
#if defined(BOARD_SAMV71_XULT)<br>
#include "board_v71_xult.h"<br>
#elif defined(BOARD_SAME70_XPLD)<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libboard/board_v71_xult.h b/c/src/lib/libbsp/arm/atsam/libraries/libboard/board_v71_xult.h<br>
index c98dbd2..be0c0f2 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libboard/board_v71_xult.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libboard/board_v71_xult.h<br>
@@ -110,9 +110,11 @@<br>
#include "include/image_sensor_inf.h"<br>
#include "include/iso7816_4.h"<br>
<br>
+#ifndef __rtems__<br>
#if defined (__GNUC__)<br>
#include "include/syscalls.h"<br>
#endif<br>
+#endif /* __rtems__ */<br>
/*----------------------------------------------------------------------------<br>
* Definitions<br>
*----------------------------------------------------------------------------*/<br>
@@ -129,6 +131,7 @@<br>
/** Name of the board */<br>
#define BOARD_NAME "SAM V71 Xplained Ultra"<br>
#define NO_PUSHBUTTON<br>
+#ifndef __rtems__<br>
/*----------------------------------------------------------------------------*/<br>
/**<br>
* \page samv7_Xplained_ultra_opfreq "SAM V71 Xplained Ultra - Operating frequencies"<br>
@@ -150,6 +153,7 @@<br>
#else<br>
#define BOARD_MCK 150000000<br>
#endif<br>
+#endif /* __rtems__ */<br>
<br>
#if (BOARD_MCK==123000000)<br>
<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libboard/resources_v71/system_samv71.c b/c/src/lib/libbsp/arm/atsam/libraries/libboard/resources_v71/system_samv71.c<br>
index 0dfcc95..9b4bd93 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libboard/resources_v71/system_samv71.c<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libboard/resources_v71/system_samv71.c<br>
@@ -27,7 +27,11 @@<br>
/* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */<br>
/* ---------------------------------------------------------------------------- */<br>
<br>
+#ifndef __rtems__<br>
#include "samv71.h"<br>
+#else /* __rtems__ */<br>
+#include <chip.h><br>
+#endif /* __rtems__ */<br>
<br>
/* @cond 0 */<br>
/**INDENT-OFF**/<br>
@@ -41,7 +45,7 @@ extern "C" {<br>
/* Clock Settings (600MHz PLL VDDIO 3.3V and VDDCORE 1.2V) */<br>
/* Clock Settings (300MHz HCLK, 150MHz MCK)=> PRESC = 2, MDIV = 2 */<br>
#define SYS_BOARD_OSCOUNT (CKGR_MOR_MOSCXTST(0x8U))<br>
-#ifdef MCK_123MHZ<br>
+#if BOARD_MCK == 123000000<br>
/* For example usb_video, PLLA/HCLK/MCK clock is set to 492/246/123MHz to achieve<br>
the maximum performance, for other examples the clock is set to 300/300/150MHz */<br>
#define SYS_BOARD_PLLAR (CKGR_PLLAR_ONE | CKGR_PLLAR_MULA(0x28U) | \<br>
@@ -50,16 +54,20 @@ extern "C" {<br>
#define SYS_BOARD_MCKR_MDIV (PMC_MCKR_MDIV_PCK_DIV2)<br>
#define SYS_BOARD_MCKR (PMC_MCKR_PRES_CLK_2 | PMC_MCKR_CSS_PLLA_CLK \<br>
| SYS_BOARD_MCKR_MDIV)<br>
-#else<br>
+#elif BOARD_MCK == 150000000<br>
#define SYS_BOARD_PLLAR (CKGR_PLLAR_ONE | CKGR_PLLAR_MULA(0x18U) | \<br>
CKGR_PLLAR_PLLACOUNT(0x3fU) | CKGR_PLLAR_DIVA(0x1U))<br>
<br>
#define SYS_BOARD_MCKR_MDIV (PMC_MCKR_MDIV_PCK_DIV2)<br>
#define SYS_BOARD_MCKR (PMC_MCKR_PRES_CLK_1 | PMC_MCKR_CSS_PLLA_CLK \<br>
| SYS_BOARD_MCKR_MDIV)<br>
+#else<br>
+ #error "unexpected Main Clock (MCK) frequency"<br>
#endif<br>
<br>
+#ifndef __rtems__<br>
uint32_t SystemCoreClock = CHIP_FREQ_MAINCK_RC_4MHZ;<br>
+#endif /* __rtems__ */<br>
#define USBCLK_DIV 10<br>
<br>
/**<br>
@@ -131,9 +139,12 @@ extern "C" {<br>
while (!(PMC->PMC_SR & PMC_SR_MCKRDY)) {<br>
}<br>
<br>
+#ifndef __rtems__<br>
SystemCoreClock = CHIP_FREQ_CPU_MAX;<br>
+#endif /* __rtems__ */<br>
}<br>
<br>
+#ifndef __rtems__<br>
void SystemCoreClockUpdate(void)<br>
{<br>
/* Determine clock frequency according to clock register values */<br>
@@ -213,6 +224,7 @@ void SystemCoreClockUpdate(void)<br>
else<br>
SystemCoreClock >>= ((PMC->PMC_MCKR & PMC_MCKR_PRES_Msk) >> PMC_MCKR_PRES_Pos);<br>
}<br>
+#endif /* __rtems__ */<br>
/**<br>
* Initialize flash.<br>
*/<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libboard/source/board_lowlevel.c b/c/src/lib/libbsp/arm/atsam/libraries/libboard/source/board_lowlevel.c<br>
index a731ba4..254e529 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libboard/source/board_lowlevel.c<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libboard/source/board_lowlevel.c<br>
@@ -37,7 +37,12 @@<br>
* Headers<br>
*----------------------------------------------------------------------------*/<br>
<br>
+#ifndef __rtems__<br>
#include "board.h"<br>
+#else /* __rtems__ */<br>
+#include <chip.h><br>
+#include <include/board_lowlevel.h><br>
+#endif /* __rtems__ */<br>
<br>
<br>
#if defined(ENABLE_TCM) && defined(__GNUC__)<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libboard/source/board_memories.c b/c/src/lib/libbsp/arm/atsam/libraries/libboard/source/board_memories.c<br>
index e2a1097..01ecd8e 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libboard/source/board_memories.c<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libboard/source/board_memories.c<br>
@@ -37,7 +37,12 @@<br>
/*----------------------------------------------------------------------------<br>
* Headers<br>
*----------------------------------------------------------------------------*/<br>
+#ifndef __rtems__<br>
#include "board.h"<br>
+#else /* __rtems__ */<br>
+#include <chip.h><br>
+#include <include/board_memories.h><br>
+#endif /* __rtems__ */<br>
<br>
/*----------------------------------------------------------------------------<br>
* Exported functions<br>
@@ -47,6 +52,7 @@<br>
#define SDRAM_BA1 (1 << 21)<br>
<br>
<br>
+#ifndef __rtems__<br>
uint32_t BOARD_SdramValidation(uint32_t baseAddr, uint32_t size)<br>
{<br>
uint32_t i;<br>
@@ -135,6 +141,7 @@ uint32_t BOARD_SdramValidation(uint32_t baseAddr, uint32_t size)<br>
<br>
return ret;<br>
}<br>
+#endif /* __rtems__ */<br>
<br>
<br>
/**<br>
@@ -144,12 +151,16 @@ uint32_t BOARD_SdramValidation(uint32_t baseAddr, uint32_t size)<br>
<br>
void BOARD_ConfigureSdram(void)<br>
{<br>
+#ifndef __rtems__<br>
const Pin pinsSdram[] = {BOARD_SDRAM_PINS};<br>
+#endif /* __rtems__ */<br>
volatile uint32_t i;<br>
volatile uint8_t *pSdram = (uint8_t *) SDRAM_CS_ADDR;<br>
<br>
/* Configure PIO */<br>
+#ifndef __rtems__<br>
PIO_Configure(pinsSdram, PIO_LISTSIZE(pinsSdram));<br>
+#endif /* __rtems__ */<br>
PMC_EnablePeripheral(ID_SDRAMC);<br>
MATRIX->CCFG_SMCNFCS = CCFG_SMCNFCS_SDRAMEN;<br>
<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libboard/source/dbg_console.c b/c/src/lib/libbsp/arm/atsam/libraries/libboard/source/dbg_console.c<br>
index a31dad1..7538054 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libboard/source/dbg_console.c<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libboard/source/dbg_console.c<br>
@@ -38,7 +38,12 @@<br>
* Headers<br>
*----------------------------------------------------------------------------*/<br>
<br>
+#ifndef __rtems__<br>
#include "board.h"<br>
+#else /* __rtems__ */<br>
+#include <chip.h><br>
+#include <include/dbg_console.h><br>
+#endif /* __rtems__ */<br>
<br>
#include <stdio.h><br>
#include <stdint.h><br>
@@ -108,8 +113,12 @@<br>
* Variables<br>
*----------------------------------------------------------------------------*/<br>
<br>
+#ifndef __rtems__<br>
/** Is Console Initialized. */<br>
static uint8_t _ucIsConsoleInitialized = 0;<br>
+#else /* __rtems__ */<br>
+#define _ucIsConsoleInitialized 1<br>
+#endif /* __rtems__ */<br>
<br>
/**<br>
* \brief Configures an USART peripheral with the specified parameters.<br>
@@ -120,11 +129,15 @@ static uint8_t _ucIsConsoleInitialized = 0;<br>
extern void DBG_Configure(uint32_t baudrate, uint32_t masterClock)<br>
{<br>
<br>
+#ifndef __rtems__<br>
const Pin pPins[] = CONSOLE_PINS;<br>
+#endif /* __rtems__ */<br>
#if defined CONSOLE_ON_UART<br>
Uart *pUart = CONSOLE_UART;<br>
/* Configure PIO */<br>
+#ifndef __rtems__<br>
PIO_Configure(pPins, PIO_LISTSIZE(pPins));<br>
+#endif /* __rtems__ */<br>
<br>
// Reset & disable receiver and transmitter, disable interrupts<br>
pUart->UART_CR = UART_CR_RSTRX | UART_CR_RSTTX | UART_CR_RSTSTA;<br>
@@ -142,10 +155,12 @@ extern void DBG_Configure(uint32_t baudrate, uint32_t masterClock)<br>
#if defined CONSOLE_ON_USART<br>
Usart *pUsart = CONSOLE_Usart;<br>
// Disable the MATRIX registers write protection<br>
+#ifndef __rtems__<br>
MATRIX->MATRIX_WPMR = MATRIX_WPMR_WPKEY_PASSWD;<br>
MATRIX->CCFG_SYSIO |= CCFG_SYSIO_SYSIO4;<br>
<br>
PIO_Configure(pPins, PIO_LISTSIZE(pPins));<br>
+#endif /* __rtems__ */<br>
<br>
// Reset & disable receiver and transmitter, disable interrupts<br>
pUsart->US_CR = US_CR_RSTRX | US_CR_RSTTX | US_CR_RSTSTA;<br>
@@ -161,12 +176,14 @@ extern void DBG_Configure(uint32_t baudrate, uint32_t masterClock)<br>
// Enable receiver and transmitter<br>
pUsart->US_CR = US_CR_RXEN | US_CR_TXEN;<br>
#endif<br>
+#ifndef __rtems__<br>
_ucIsConsoleInitialized = 1;<br>
<br>
/* Disable buffering for printf(). */<br>
#if (defined (__GNUC__) && !defined (__SAMBA__))<br>
setvbuf(stdout, (char *)NULL, _IONBF, 0);<br>
#endif<br>
+#endif /* __rtems__ */<br>
}<br>
<br>
/**<br>
@@ -269,6 +286,7 @@ extern uint32_t DBG_IsRxReady(void)<br>
#endif<br>
}<br>
<br>
+#ifndef __rtems__<br>
/**<br>
* Displays the content of the given frame on the UART0.<br>
*<br>
@@ -502,3 +520,4 @@ extern WEAK char *gets(char *ptr)<br>
}<br>
<br>
<br>
+#endif /* __rtems__ */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/compiler.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/compiler.h<br>
index 874ecae..f36013a 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/compiler.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/compiler.h<br>
@@ -30,12 +30,41 @@<br>
#ifndef _COMPILER_H_<br>
#define _COMPILER_H_<br>
<br>
+#ifdef __rtems__<br>
+#include <bspopts.h><br>
+#endif /* __rtems__ */<br>
/*<br>
* Peripherals registers definitions<br>
*/<br>
-#if defined(__SAMV71Q21__)<br>
+#if defined __SAMV71J19__ \<br>
+ || defined __SAMV71J20__ \<br>
+ || defined __SAMV71J21__ \<br>
+ || defined __SAMV71N19__ \<br>
+ || defined __SAMV71N20__ \<br>
+ || defined __SAMV71N21__ \<br>
+ || defined __SAMV71Q19__ \<br>
+ || defined __SAMV71Q20__ \<br>
+ || defined __SAMV71Q21__<br>
#include "include/samv71/samv71.h"<br>
-#elif defined(__SAME70Q21__)<br>
+#elif defined __SAMS70J19__ \<br>
+ || defined __SAMS70J20__ \<br>
+ || defined __SAMS70J21__ \<br>
+ || defined __SAMS70N19__ \<br>
+ || defined __SAMS70N20__ \<br>
+ || defined __SAMS70N21__ \<br>
+ || defined __SAMS70Q19__ \<br>
+ || defined __SAMS70Q20__ \<br>
+ || defined __SAMS70Q21__<br>
+ #include "include/sams70/sams70.h"<br>
+#elif defined __SAME70J19__ \<br>
+ || defined __SAME70J20__ \<br>
+ || defined __SAME70J21__ \<br>
+ || defined __SAME70N19__ \<br>
+ || defined __SAME70N20__ \<br>
+ || defined __SAME70N21__ \<br>
+ || defined __SAME70Q19__ \<br>
+ || defined __SAME70Q20__ \<br>
+ || defined __SAME70Q21__<br>
#include "include/same70/same70.h"<br>
#else<br>
#error "please define correct macro for the chip first!"<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/chip.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/chip.h<br>
new file mode 100644<br>
index 0000000..a9f1f01<br>
--- /dev/null<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/chip.h<br>
@@ -0,0 +1 @@<br>
+#include "../chip.h"<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/qspi_dma.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/qspi_dma.h<br>
index b51c58e..8ee274e 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/qspi_dma.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/qspi_dma.h<br>
@@ -42,7 +42,9 @@<br>
*----------------------------------------------------------------------------*/<br>
<br>
#include "chip.h"<br>
+#ifndef __rtems__<br>
#include "../../../../utils/utility.h"<br>
+#endif /* __rtems__ */<br>
<br>
/*----------------------------------------------------------------------------<br>
* Definitions<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j19.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j19.h<br>
index 602621f..a82d7c1 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j19.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j19.h<br>
@@ -333,6 +333,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAME70J19 */<br>
/* ************************************************************************** */<br>
@@ -386,6 +387,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAME70J19 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j20.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j20.h<br>
index 89af94b..a877891 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j20.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j20.h<br>
@@ -336,6 +336,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAME70J20 */<br>
/* ************************************************************************** */<br>
@@ -390,6 +391,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAME70J20 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j21.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j21.h<br>
index 88bad12..812c28c 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j21.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70j21.h<br>
@@ -336,6 +336,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAME70J21 */<br>
/* ************************************************************************** */<br>
@@ -390,6 +391,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAME70J21 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n19.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n19.h<br>
index 0afe214..ed565d4 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n19.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n19.h<br>
@@ -338,6 +338,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAME70N19 */<br>
/* ************************************************************************** */<br>
@@ -393,6 +394,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAME70N19 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n20.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n20.h<br>
index 1b0ac6a..84b1265 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n20.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n20.h<br>
@@ -338,6 +338,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAME70N20 */<br>
/* ************************************************************************** */<br>
@@ -393,6 +394,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAME70N20 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n21.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n21.h<br>
index f3889a5..ceaeef3 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n21.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70n21.h<br>
@@ -338,6 +338,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAME70N21 */<br>
/* ************************************************************************** */<br>
@@ -393,6 +394,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAME70N21 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q19.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q19.h<br>
index 2fb2e85..136ac0e 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q19.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q19.h<br>
@@ -358,6 +358,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAME70Q19 */<br>
/* ************************************************************************** */<br>
@@ -419,6 +420,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAME70Q19 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q20.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q20.h<br>
index 2310461..dc5858c 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q20.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q20.h<br>
@@ -358,6 +358,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAME70Q20 */<br>
/* ************************************************************************** */<br>
@@ -419,6 +420,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAME70Q20 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q21.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q21.h<br>
index 06adb73..3cd174e 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q21.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/same70/same70q21.h<br>
@@ -362,6 +362,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAME70Q21 */<br>
/* ************************************************************************** */<br>
@@ -423,6 +424,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAME70Q21 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j19.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j19.h<br>
index fe9c2b8..82e2d7f 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j19.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j19.h<br>
@@ -328,6 +328,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAMS70J19 */<br>
/* ************************************************************************** */<br>
@@ -379,6 +380,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAMS70J19 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j20.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j20.h<br>
index 8aa106a..e9f40dd 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j20.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j20.h<br>
@@ -328,6 +328,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAMS70J20 */<br>
/* ************************************************************************** */<br>
@@ -379,6 +380,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAMS70J20 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j21.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j21.h<br>
index 30720a2..db2dbb9 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j21.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70j21.h<br>
@@ -328,6 +328,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAMS70J21 */<br>
/* ************************************************************************** */<br>
@@ -379,6 +380,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAMS70J21 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n19.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n19.h<br>
index 3da562a..8a810f1 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n19.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n19.h<br>
@@ -330,6 +330,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAMS70N19 */<br>
/* ************************************************************************** */<br>
@@ -382,6 +383,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAMS70N19 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n20.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n20.h<br>
index 716cb4b..f95b970 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n20.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n20.h<br>
@@ -330,6 +330,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAMS70N20 */<br>
/* ************************************************************************** */<br>
@@ -382,6 +383,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAMS70N20 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n21.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n21.h<br>
index e53bfeb..61170b4 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n21.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70n21.h<br>
@@ -330,6 +330,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAMS70N21 */<br>
/* ************************************************************************** */<br>
@@ -382,6 +383,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAMS70N21 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q19.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q19.h<br>
index 160fcf9..67d465f 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q19.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q19.h<br>
@@ -350,6 +350,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAMS70Q19 */<br>
/* ************************************************************************** */<br>
@@ -408,6 +409,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAMS70Q19 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q20.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q20.h<br>
index f88973a..46c034c 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q20.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q20.h<br>
@@ -350,6 +350,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAMS70Q20 */<br>
/* ************************************************************************** */<br>
@@ -408,6 +409,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAMS70Q20 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q21.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q21.h<br>
index f59404f..1528f41 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q21.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/sams70/sams70q21.h<br>
@@ -350,6 +350,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAMS70Q21 */<br>
/* ************************************************************************** */<br>
@@ -408,6 +409,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAMS70Q21 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71.h<br>
index 892a020..4bdbce5 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71.h<br>
@@ -30,6 +30,9 @@<br>
#ifndef _SAMV71_<br>
#define _SAMV71_<br>
<br>
+#ifdef __rtems__<br>
+#include <bspopts.h><br>
+#endif /* __rtems__ */<br>
#if defined __SAMV71J19__<br>
#include "samv71j19.h"<br>
#elif defined __SAMV71J20__<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j19.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j19.h<br>
index 0707f5f..ad3c38f 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j19.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j19.h<br>
@@ -339,6 +339,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAMV71J19 */<br>
/* ************************************************************************** */<br>
@@ -394,6 +395,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAMV71J19 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j20.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j20.h<br>
index 86e5b8f..9df556c 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j20.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j20.h<br>
@@ -339,6 +339,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAMV71J20 */<br>
/* ************************************************************************** */<br>
@@ -394,6 +395,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAMV71J20 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j21.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j21.h<br>
index 1c01571..4c306b8 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j21.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71j21.h<br>
@@ -339,6 +339,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAMV71J21 */<br>
/* ************************************************************************** */<br>
@@ -394,6 +395,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAMV71J21 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n19.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n19.h<br>
index 09d62a5..8f2c0b9 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n19.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n19.h<br>
@@ -341,6 +341,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAMV71N19 */<br>
/* ************************************************************************** */<br>
@@ -397,6 +398,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAMV71N19 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n20.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n20.h<br>
index 2a010bc..e709e5f 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n20.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n20.h<br>
@@ -341,6 +341,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAMV71N20 */<br>
/* ************************************************************************** */<br>
@@ -397,6 +398,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAMV71N20 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n21.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n21.h<br>
index 619f602..dc1ef6e 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n21.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71n21.h<br>
@@ -341,6 +341,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAMV71N21 */<br>
/* ************************************************************************** */<br>
@@ -397,6 +398,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAMV71N21 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q19.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q19.h<br>
index 14c0930..e42381c 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q19.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q19.h<br>
@@ -361,6 +361,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAMV71Q19 */<br>
/* ************************************************************************** */<br>
@@ -423,6 +424,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAMV71Q19 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q20.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q20.h<br>
index 57a2f43..cfc1780 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q20.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q20.h<br>
@@ -361,6 +361,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAMV71Q20 */<br>
/* ************************************************************************** */<br>
@@ -423,6 +424,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAMV71Q20 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q21.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q21.h<br>
index 77bebbd..401ee9b 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q21.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/samv71/samv71q21.h<br>
@@ -365,6 +365,7 @@ void XDMAC_Handler ( void );<br>
#include "component/component_xdmac.h"<br>
/*@}*/<br>
<br>
+#ifndef __rtems__<br>
/* ************************************************************************** */<br>
/* REGISTER ACCESS DEFINITIONS FOR SAMV71Q21 */<br>
/* ************************************************************************** */<br>
@@ -427,6 +428,7 @@ void XDMAC_Handler ( void );<br>
#include "instance/instance_uart3.h"<br>
#include "instance/instance_uart4.h"<br>
/*@}*/<br>
+#endif /* __rtems__ */<br>
<br>
/* ************************************************************************** */<br>
/* PERIPHERAL ID DEFINITIONS FOR SAMV71Q21 */<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/xdmac.h b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/xdmac.h<br>
index 1761358..34d4faa 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/xdmac.h<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/include/xdmac.h<br>
@@ -74,7 +74,9 @@<br>
<br>
#include "chip.h"<br>
<br>
+#ifndef __rtems__<br>
#include <../../../../utils/utility.h><br>
+#endif /* __rtems__ */<br>
#include <stdint.h><br>
<br>
/*------------------------------------------------------------------------------<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/source/mcan.c b/c/src/lib/libbsp/arm/atsam/libraries/libchip/source/mcan.c<br>
index 70ae12b..e91f73e 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/source/mcan.c<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/source/mcan.c<br>
@@ -38,7 +38,9 @@<br>
/*----------------------------------------------------------------------------<br>
* Headers<br>
*----------------------------------------------------------------------------*/<br>
+#ifndef __rtems__<br>
#include "board.h"<br>
+#endif /* __rtems__ */<br>
#include "chip.h"<br>
#include "mcan_config.h"<br>
#include <assert.h><br>
@@ -422,8 +424,10 @@<br>
* Internal variables<br>
*---------------------------------------------------------------------------*/<br>
<br>
+#ifndef __rtems__<br>
static const Pin pinsMcan0[] = {PIN_MCAN0_TXD, PIN_MCAN0_RXD };<br>
static const Pin pinsMcan1[] = {PIN_MCAN1_TXD, PIN_MCAN1_RXD };<br>
+#endif /* __rtems__ */<br>
<br>
static uint32_t can0MsgRam[MCAN0_STD_FLTS_WRDS +<br>
MCAN0_EXT_FLTS_WRDS +<br>
@@ -548,7 +552,9 @@ void MCAN_Init(const MCan_ConfigType *mcanConfig)<br>
PMC->PMC_SCER = PMC_SCER_PCK5;<br>
<br>
if (MCAN0 == mcan) {<br>
+#ifndef __rtems__<br>
PIO_Configure(pinsMcan0, PIO_LISTSIZE(pinsMcan0));<br>
+#endif /* __rtems__ */<br>
// Enable MCAN peripheral clock<br>
PMC_EnablePeripheral(ID_MCAN0);<br>
// Configure Message RAM Base Address<br>
@@ -557,7 +563,9 @@ void MCAN_Init(const MCan_ConfigType *mcanConfig)<br>
((uint32_t) mcanConfig->msgRam.pStdFilts & 0xFFFF0000);<br>
mCanLine0Irq = MCAN0_IRQn;<br>
} else if (MCAN1 == mcan) {<br>
+#ifndef __rtems__<br>
PIO_Configure(pinsMcan1, PIO_LISTSIZE(pinsMcan1));<br>
+#endif /* __rtems__ */<br>
// Enable MCAN peripheral clock<br>
PMC_EnablePeripheral(ID_MCAN1);<br>
// Configure Message RAM Base Address<br>
diff --git a/c/src/lib/libbsp/arm/atsam/libraries/libchip/source/tc.c b/c/src/lib/libbsp/arm/atsam/libraries/libchip/source/tc.c<br>
index 1263a81..4ef9bd9 100644<br>
--- a/c/src/lib/libbsp/arm/atsam/libraries/libchip/source/tc.c<br>
+++ b/c/src/lib/libbsp/arm/atsam/libraries/libchip/source/tc.c<br>
@@ -70,7 +70,11 @@<br>
* Headers<br>
*-----------------------------------------------------------------------------*/<br>
<br>
+#ifndef __rtems__<br>
#include "board.h"<br>
+#else /* __rtems__ */<br>
+#include <chip.h><br>
+#endif /* __rtems__ */<br>
<br>
#include <assert.h><br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
1.8.4.5<br>
<br>
<br>
<br>
_______________________________________________<br>
devel mailing list<br>
<a href="mailto:devel@rtems.org">devel@rtems.org</a><br>
<a href="http://lists.rtems.org/mailman/listinfo/devel" rel="noreferrer" target="_blank">http://lists.rtems.org/mailman/listinfo/devel</a><br>
</font></span></blockquote></div><br></div>