From f5d55ccbc39fc7054ae5759dbea0c496ce0711a7 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sun, 17 Feb 2013 14:10:10 +0000 Subject: [PATCH] Fixed bug 3605058. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5227 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- boards/ATMEL_SAM4L_EK/board.c | 94 -------------------------------- boards/ATMEL_SAM4L_EK/board.h | 55 ------------------- boards/ATMEL_SAM4L_EK/board.mk | 5 -- boards/OLIMEX_SAM7_EX256/board.c | 9 +-- readme.txt | 1 + 5 files changed, 6 insertions(+), 158 deletions(-) delete mode 100644 boards/ATMEL_SAM4L_EK/board.c delete mode 100644 boards/ATMEL_SAM4L_EK/board.h delete mode 100644 boards/ATMEL_SAM4L_EK/board.mk diff --git a/boards/ATMEL_SAM4L_EK/board.c b/boards/ATMEL_SAM4L_EK/board.c deleted file mode 100644 index f982d00f9..000000000 --- a/boards/ATMEL_SAM4L_EK/board.c +++ /dev/null @@ -1,94 +0,0 @@ -/* - ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010, - 2011,2012,2013 Giovanni Di Sirio. - - This file is part of ChibiOS/RT. - - ChibiOS/RT is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - ChibiOS/RT is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#include "ch.h" -#include "hal.h" - -#if HAL_USE_PAL || defined(__DOXYGEN__) -/** - * @brief PAL setup. - * @details Digital I/O ports static configuration as defined in @p board.h. - * This variable is used by the HAL when initializing the PAL driver. - */ -const PALConfig pal_default_config = -{ -}; -#endif - -/** - * @brief Early initialization code. - * @details This initialization must be performed just after stack setup - * and before any other initialization. - */ -void __early_init(void) { - - sam_clock_init(); -} - -#if HAL_USE_SDC || defined(__DOXYGEN__) -/** - * @brief SDC card detection. - */ -bool_t sdc_lld_is_card_inserted(SDCDriver *sdcp) { - - (void)sdcp; - /* TODO: Fill the implementation.*/ - return TRUE; -} - -/** - * @brief SDC card write protection detection. - */ -bool_t sdc_lld_is_write_protected(SDCDriver *sdcp) { - - (void)sdcp; - /* TODO: Fill the implementation.*/ - return FALSE; -} -#endif /* HAL_USE_SDC */ - -#if HAL_USE_MMC_SPI || defined(__DOXYGEN__) -/** - * @brief MMC_SPI card detection. - */ -bool_t mmc_lld_is_card_inserted(MMCDriver *mmcp) { - - (void)mmcp; - /* TODO: Fill the implementation.*/ - return TRUE; -} - -/** - * @brief MMC_SPI card write protection detection. - */ -bool_t mmc_lld_is_write_protected(MMCDriver *mmcp) { - - (void)mmcp; - /* TODO: Fill the implementation.*/ - return FALSE; -} -#endif - -/** - * @brief Board-specific initialization code. - * @todo Add your board-specific code, if any. - */ -void boardInit(void) { -} diff --git a/boards/ATMEL_SAM4L_EK/board.h b/boards/ATMEL_SAM4L_EK/board.h deleted file mode 100644 index d207ab571..000000000 --- a/boards/ATMEL_SAM4L_EK/board.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010, - 2011,2012,2013 Giovanni Di Sirio. - - This file is part of ChibiOS/RT. - - ChibiOS/RT is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - ChibiOS/RT is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#ifndef _BOARD_H_ -#define _BOARD_H_ - -/* - * Setup for Atmel SAM4L-EK board. - */ - -/* - * Board identifier. - */ -#define BOARD_ATMEL_SAM4L_EK -#define BOARD_NAME "Atmel SAM4L-EK" - -/* - * Clock sources. - */ -#define SAM_OSC32K_CLK 32768 -#define SAM_OSC0_CLK 12000000 - -/* - * Device identifier. - */ -#define __ATSAM4LC4C__ - -#if !defined(_FROM_ASM_) -#ifdef __cplusplus -extern "C" { -#endif - void boardInit(void); -#ifdef __cplusplus -} -#endif -#endif /* _FROM_ASM_ */ - -#endif /* _BOARD_H_ */ diff --git a/boards/ATMEL_SAM4L_EK/board.mk b/boards/ATMEL_SAM4L_EK/board.mk deleted file mode 100644 index 39df5b55d..000000000 --- a/boards/ATMEL_SAM4L_EK/board.mk +++ /dev/null @@ -1,5 +0,0 @@ -# List of all the board related files. -BOARDSRC = ${CHIBIOS}/boards/ATMEL_SAM4L_EK/board.c - -# Required include directories -BOARDINC = ${CHIBIOS}/boards/ATMEL_SAM4L_EK diff --git a/boards/OLIMEX_SAM7_EX256/board.c b/boards/OLIMEX_SAM7_EX256/board.c index b244c4412..7366590c1 100644 --- a/boards/OLIMEX_SAM7_EX256/board.c +++ b/boards/OLIMEX_SAM7_EX256/board.c @@ -52,11 +52,12 @@ static CH_IRQ_HANDLER(SYSIrqHandler) { } #if USE_SAM7_DBGU_UART - if (AT91C_BASE_DBGU->DBGU_CSR & - (AT91C_US_RXRDY | AT91C_US_TXRDY | AT91C_US_PARE | AT91C_US_FRAME | AT91C_US_OVRE | AT91C_US_RXBRK)) { - sd_lld_serve_interrupt(&SD3); + if (AT91C_BASE_DBGU->DBGU_CSR & + (AT91C_US_RXRDY | AT91C_US_TXRDY | AT91C_US_PARE | AT91C_US_FRAME | + AT91C_US_OVRE | AT91C_US_RXBRK)) { + sd_lld_serve_interrupt(&SDDBG); } -#endif +#endif AT91C_BASE_AIC->AIC_EOICR = 0; CH_IRQ_EPILOGUE(); } diff --git a/readme.txt b/readme.txt index ad82294cf..c422ac777 100644 --- a/readme.txt +++ b/readme.txt @@ -85,6 +85,7 @@ ***************************************************************************** *** 2.5.2 *** +- FIX: Fixed compile Error OLIMEX_SAM7_EX256/board.c (bug 3605058). - FIX: Fixed bug prevents calling adcStartConversionI() within ISR (bug 3605053)(backported to 2.4.4). - FIX: Fixed typo in platforms/STM32/can_lld.c (bug 3604657)(backported