diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-08-20 08:26:28 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-08-20 08:26:28 +0000 |
| commit | 24fc474ac69372d242b32830c981639492bba63a (patch) | |
| tree | 434f821c44668c3e1ba05d9adedefa9572cd4378 /os | |
| parent | 45a6b7dc5a1758cb2bc49b0d76effa381043d297 (diff) | |
| download | ChibiOS-24fc474ac69372d242b32830c981639492bba63a.tar.gz ChibiOS-24fc474ac69372d242b32830c981639492bba63a.tar.bz2 ChibiOS-24fc474ac69372d242b32830c981639492bba63a.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1083 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/io/serial.c | 12 | ||||
| -rw-r--r-- | os/io/serial.h | 3 | ||||
| -rw-r--r-- | os/io/templates/pal_lld.c | 30 | ||||
| -rw-r--r-- | os/io/templates/pal_lld.h | 6 | ||||
| -rw-r--r-- | os/ports/GCC/ARMCM3/STM32F103/serial_lld.c | 6 |
5 files changed, 48 insertions, 9 deletions
diff --git a/os/io/serial.c b/os/io/serial.c index 05d258841..30a17ed48 100644 --- a/os/io/serial.c +++ b/os/io/serial.c @@ -68,7 +68,15 @@ static const struct SerialDriverVMT vmt = { };
/**
- * @brief Initializes a generic full duplex driver.
+ * @brief Serial Driver initialization. + */
+void sdInit(void) {
+
+ sd_lld_init();
+}
+
+/**
+ * @brief Initializes a generic full duplex driver object.
* @details The HW dependent part of the initialization has to be performed
* outside, usually in the hardware initialization code.
*
@@ -84,7 +92,7 @@ static const struct SerialDriverVMT vmt = { * some data is written in the Queue. The value can be
* @p NULL.
*/
-void sdInit(SerialDriver *sdp, qnotify_t inotify, qnotify_t onotify) {
+void sdObjectInit(SerialDriver *sdp, qnotify_t inotify, qnotify_t onotify) {
sdp->vmt = &vmt;
chEvtInit(&sdp->d1.ievent);
diff --git a/os/io/serial.h b/os/io/serial.h index acfb2500f..a70dcf7c4 100644 --- a/os/io/serial.h +++ b/os/io/serial.h @@ -99,7 +99,8 @@ struct _SerialDriver { #ifdef __cplusplus
extern "C" {
#endif
- void sdInit(SerialDriver *sdp, qnotify_t inotify, qnotify_t onotify);
+ void sdInit(void);
+ void sdObjectInit(SerialDriver *sdp, qnotify_t inotify, qnotify_t onotify);
void sdStart(SerialDriver *sdp, const SerialDriverConfig *config);
void sdStop(SerialDriver *sdp);
void sdIncomingDataI(SerialDriver *sdp, uint8_t b);
diff --git a/os/io/templates/pal_lld.c b/os/io/templates/pal_lld.c new file mode 100644 index 000000000..b830de338 --- /dev/null +++ b/os/io/templates/pal_lld.c @@ -0,0 +1,30 @@ +/*
+ ChibiOS/RT - Copyright (C) 2006-2007 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 <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * @file os/io/templates/pal_lld.c
+ * @brief PAL subsystem low level driver template
+ * @addtogroup PAL_LLD
+ * @{
+ */
+
+#include <ch.h>
+#include <pal.h>
+
+/** @} */
diff --git a/os/io/templates/pal_lld.h b/os/io/templates/pal_lld.h index f594dd143..cd68f605d 100644 --- a/os/io/templates/pal_lld.h +++ b/os/io/templates/pal_lld.h @@ -18,8 +18,8 @@ */
/**
- * @file src/templates/pal_lld.h
- * @brief PAL subsystem low level driver template
+ * @file os/io/templates/pal_lld.h
+ * @brief PAL subsystem low level driver header template
* @addtogroup PAL_LLD
* @{
*/
@@ -91,7 +91,7 @@ typedef uint32_t ioportid_t; /*===========================================================================*/
/* Implementation, some of the following macros could be implemented as */
-/* functions, if so please put them in a file named pal_lld.c. */
+/* functions, if so please put them in pal_lld.c. */
/*===========================================================================*/
/**
diff --git a/os/ports/GCC/ARMCM3/STM32F103/serial_lld.c b/os/ports/GCC/ARMCM3/STM32F103/serial_lld.c index bf06195be..f58f7aad0 100644 --- a/os/ports/GCC/ARMCM3/STM32F103/serial_lld.c +++ b/os/ports/GCC/ARMCM3/STM32F103/serial_lld.c @@ -212,17 +212,17 @@ CH_IRQ_HANDLER(VectorDC) { void sd_lld_init(void) {
#if USE_STM32_USART1
- sdInit(&COM1, NULL, notify1);
+ sdObjectInit(&COM1, NULL, notify1);
GPIOA->CRH = (GPIOA->CRH & 0xFFFFF00F) | 0x000004B0;
#endif
#if USE_STM32_USART2
- sdInit(&COM2, NULL, notify2);
+ sdObjectInit(&COM2, NULL, notify2);
GPIOA->CRL = (GPIOA->CRL & 0xFFFF00FF) | 0x00004B00;
#endif
#if USE_STM32_USART3
- sdInit(&COM3, NULL, notify3);
+ sdObjectInit(&COM3, NULL, notify3);
GPIOB->CRH = (GPIOB->CRH & 0xFFFF00FF) | 0x00004B00;
#endif
}
|