From 45937b8179d364df1a186fadac7c4665db33836a Mon Sep 17 00:00:00 2001 From: edolomb Date: Fri, 16 Mar 2018 15:05:28 +0000 Subject: - Minor changes git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11780 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- os/hal/boards/ATSAMA5D2_XULT/board.c | 5 +++++ os/hal/boards/ATSAMA5D2_XULT/board.h | 4 ++-- os/hal/ports/SAMA/LLD/RTCv1/hal_rtc_lld.h | 2 +- os/hal/ports/SAMA/SAMA5D2x/hal_tc_lld.c | 4 +--- os/hal/ports/SAMA/SAMA5D2x/hal_tc_lld.h | 2 ++ 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/os/hal/boards/ATSAMA5D2_XULT/board.c b/os/hal/boards/ATSAMA5D2_XULT/board.c index f6138bcd5..a91a1d60b 100644 --- a/os/hal/boards/ATSAMA5D2_XULT/board.c +++ b/os/hal/boards/ATSAMA5D2_XULT/board.c @@ -84,6 +84,11 @@ static const sama_pio_init_t sama_inits[] = { SAMA_PIN_N(PIOB_USER_PB), SAMA_PIO_FUNC_GPIO | SAMA_PIO_DIR_INPUT | SAMA_PIO_PUEN | SAMA_PIO_SCHMITT, SAMA_PIO_HIGH}, + /* UART1 */ + {SAMA_PIOD, + SAMA_PIN_N(PIOD_URXD1) | SAMA_PIN_N(PIOD_UTXD1), + SAMA_PIO_FUNC_PERIPH_A, + SAMA_PIO_HIGH}, /* list terminated*/ {-1, 0, 0, 0} }; diff --git a/os/hal/boards/ATSAMA5D2_XULT/board.h b/os/hal/boards/ATSAMA5D2_XULT/board.h index f8f737466..44ee1b99d 100644 --- a/os/hal/boards/ATSAMA5D2_XULT/board.h +++ b/os/hal/boards/ATSAMA5D2_XULT/board.h @@ -181,8 +181,8 @@ #define PIOD_PIO0 0U #define PIOD_PIN1 1U -#define PIOD_PIN2 2U -#define PIOD_PIN3 3U +#define PIOD_URXD1 2U +#define PIOD_UTXD1 3U #define PIOD_PIN4 4U #define PIOD_PIN5 5U #define PIOD_PIN6 6U diff --git a/os/hal/ports/SAMA/LLD/RTCv1/hal_rtc_lld.h b/os/hal/ports/SAMA/LLD/RTCv1/hal_rtc_lld.h index a5105382f..25a5b6883 100644 --- a/os/hal/ports/SAMA/LLD/RTCv1/hal_rtc_lld.h +++ b/os/hal/ports/SAMA/LLD/RTCv1/hal_rtc_lld.h @@ -68,7 +68,7 @@ /* * RTC driver system settings. */ -#define SAMA_RTC_IRQ_PRIORITY 7 +#define SAMA_RTC_IRQ_PRIORITY 7 /** @} */ /*===========================================================================*/ diff --git a/os/hal/ports/SAMA/SAMA5D2x/hal_tc_lld.c b/os/hal/ports/SAMA/SAMA5D2x/hal_tc_lld.c index c4b73d6ea..26874472f 100644 --- a/os/hal/ports/SAMA/SAMA5D2x/hal_tc_lld.c +++ b/os/hal/ports/SAMA/SAMA5D2x/hal_tc_lld.c @@ -16,7 +16,7 @@ /** * @file SAMA5D2x/hal_tc_lld.c - * @brief SAMA TC subsystem low level driver header. + * @brief SAMA TC support code. * * @addtogroup TC * @{ @@ -384,8 +384,6 @@ void tcChangeChannelFrequency(TCDriver *tcp, } /** * @brief TC Driver initialization. - * @note This function is implicitly invoked by @p halInit(), there is - * no need to explicitly initialize the driver. * * @init */ diff --git a/os/hal/ports/SAMA/SAMA5D2x/hal_tc_lld.h b/os/hal/ports/SAMA/SAMA5D2x/hal_tc_lld.h index efa0621fe..ec161b49c 100644 --- a/os/hal/ports/SAMA/SAMA5D2x/hal_tc_lld.h +++ b/os/hal/ports/SAMA/SAMA5D2x/hal_tc_lld.h @@ -353,3 +353,5 @@ extern "C" { #endif /* HAL_USE_TC */ #endif /* HAL_TC_LLD_H */ + +/** @} */ -- cgit v1.2.3