HAL support for AVR.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1394 35acf78f-673a-0410-8e92-d51de3d6d3f4

5 files changed, 121 insertions, 26 deletions

diff --git a/demos/AVR-ATmega128-GCC/Makefile b/demos/AVR-ATmega128-GCC/Makefile
index dcc7f7beb..1ae0a672a 100644
--- a/demos/AVR-ATmega128-GCC/Makefile
+++ b/demos/AVR-ATmega128-GCC/Makefile
@@ -81,6 +81,8 @@ OBJDIR = .
 

 # Imported source files

 CHIBIOS = ../..

+include ${CHIBIOS}/os/hal/hal.mk

+include ${CHIBIOS}/os/hal/platforms/AVR/platform.mk

 include ${CHIBIOS}/os/ports/GCC/AVR/port.mk

 include ${CHIBIOS}/os/kernel/kernel.mk

 include ${CHIBIOS}/test/test.mk

@@ -90,8 +92,8 @@ include ${CHIBIOS}/test/test.mk
 SRC = ${PORTSRC} \

       ${KERNSRC} \

       ${TESTSRC} \

-      ${CHIBIOS}/os/io/serial.c \

-      ${CHIBIOS}/os/io/platforms/AVR/serial_lld.c \

+      ${HALSRC} \

+      ${PLATFORMSRC} \

       ${CHIBIOS}/os/various/evtimer.c \

       lcd.c board.c main.c

 

@@ -127,9 +129,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.

 #     Use forward slashes for directory separators.

 #     For a directory that has spaces, enclose it in quotes.

-EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) \

-               ${CHIBIOS}/os/io \

-               ${CHIBIOS}/os/io/platforms/AVR \

+EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) $(HALINC) $(PLATFORMINC) \

                ${CHIBIOS}/os/various

 

 

diff --git a/demos/AVR-ATmega128-GCC/board.c b/demos/AVR-ATmega128-GCC/board.c
index 84e1565cb..8a9a69309 100644
--- a/demos/AVR-ATmega128-GCC/board.c
+++ b/demos/AVR-ATmega128-GCC/board.c
@@ -17,10 +17,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include <ch.h>

-#include <serial.h>

-

-#include "board.h"

+#include "ch.h"

+#include "hal.h"

 

 CH_IRQ_HANDLER(TIMER0_COMP_vect) {

 

@@ -71,16 +69,16 @@ void hwinit(void) {
   /*

    * Timer 0 setup.

    */

-  TCCR0  = (1 << WGM01) | (0 << WGM00) |                // CTC mode.

-           (0 << COM01) | (0 << COM00) |                // OC0A disabled (normal I/O).

-           (1 << CS02)  | (0 << CS01)  | (0 << CS00);   // CLK/64 clock source.

+  TCCR0  = (1 << WGM01) | (0 << WGM00) |                /* CTC mode.        */

+           (0 << COM01) | (0 << COM00) |                /* OC0A disabled.   */

+           (1 << CS02)  | (0 << CS01)  | (0 << CS00);   /* CLK/64 clock.    */

   OCR0   = F_CPU / 64 / CH_FREQUENCY - 1;

-  TCNT0  = 0;                                           // Reset counter.

-  TIFR   = (1 << OCF0);                                 // Reset pending (if any).

-  TIMSK  = (1 << OCIE0);                                // Interrupt on compare.

+  TCNT0  = 0;                                           /* Reset counter.   */

+  TIFR   = (1 << OCF0);                                 /* Reset pending.   */

+  TIMSK  = (1 << OCIE0);                                /* IRQ on compare.  */

 

   /*

-   * Other initializations.

+   * HAL initialization.

    */

-  sdInit();

+  halInit();

 }

diff --git a/demos/AVR-ATmega128-GCC/board.h b/demos/AVR-ATmega128-GCC/board.h
index 97b9c684d..97da17097 100644
--- a/demos/AVR-ATmega128-GCC/board.h
+++ b/demos/AVR-ATmega128-GCC/board.h
@@ -105,6 +105,12 @@
 #define PORTE_BUZZ1             (1 << 4)

 #define PORTE_BUZZ2             (1 << 5)

 

-void hwinit(void);

+#ifdef __cplusplus

+extern "C" {

+#endif

+  void hwinit(void);

+#ifdef __cplusplus

+}

+#endif

 

 #endif /* _BOARD_H_ */

diff --git a/demos/AVR-ATmega128-GCC/halconf.h b/demos/AVR-ATmega128-GCC/halconf.h
new file mode 100644
index 000000000..a3d17a3c9
--- /dev/null
+++ b/demos/AVR-ATmega128-GCC/halconf.h
@@ -0,0 +1,96 @@
+/*

+    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 templates/halconf.h

+ * @brief HAL configuration header.

+ * @addtogroup HAL_CONF

+ * @{

+ */

+

+/*

+ * HAL configuration file, this file allows to enable or disable the various

+ * device drivers from your application. You may also use this file in order

+ * to change the device drivers settings found in the low level drivers

+ * headers, just define here the new settings and those will override the

+ * defaults defined in the LLD headers.
+ */

+

+#ifndef _HALCONF_H_

+#define _HALCONF_H_

+

+/**

+ * @brief Enables the PAL subsystem.
+ */

+#if !defined(CH_HAL_USE_PAL) || defined(__DOXYGEN__)

+#define CH_HAL_USE_PAL                  FALSE

+#endif

+

+/**

+ * @brief Enables the ADC subsystem.

+ */

+#if !defined(CH_HAL_USE_ADC) || defined(__DOXYGEN__)

+#define CH_HAL_USE_ADC                  FALSE

+#endif

+

+/**

+ * @brief Enables the CAN subsystem.

+ */

+#if !defined(CH_HAL_USE_CAN) || defined(__DOXYGEN__)

+#define CH_HAL_USE_CAN                  FALSE

+#endif

+

+/**

+ * @brief Enables the MAC subsystem.

+ */

+#if !defined(CH_HAL_USE_MAC) || defined(__DOXYGEN__)

+#define CH_HAL_USE_MAC                  FALSE

+#endif

+

+/**

+ * @brief Enables the PWM subsystem.

+ */

+#if !defined(CH_HAL_USE_PWM) || defined(__DOXYGEN__)

+#define CH_HAL_USE_PWM                  FALSE

+#endif

+

+/**

+ * @brief Enables the SERIAL subsystem.

+ */

+#if !defined(CH_HAL_USE_SERIAL) || defined(__DOXYGEN__)

+#define CH_HAL_USE_SERIAL               TRUE

+#endif

+

+/**

+ * @brief Enables the SPI subsystem.

+ */

+#if !defined(CH_HAL_USE_SPI) || defined(__DOXYGEN__)

+#define CH_HAL_USE_SPI                  FALSE

+#endif

+

+/**

+ * @brief Enables the MMC_SPI subsystem.

+ */

+#if !defined(CH_HAL_USE_MMC_SPI) || defined(__DOXYGEN__)

+#define CH_HAL_USE_MMC_SPI              FALSE

+#endif

+

+#endif /* _HALCONF_H_ */

+

+/** @} */

diff --git a/demos/AVR-ATmega128-GCC/main.c b/demos/AVR-ATmega128-GCC/main.c
index dc3fd33c3..28d3f1cef 100644
--- a/demos/AVR-ATmega128-GCC/main.c
+++ b/demos/AVR-ATmega128-GCC/main.c
@@ -17,17 +17,12 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include <ch.h>

-#include <serial.h>

-#include <evtimer.h>

+#include "ch.h"

+#include "hal.h"

+#include "evtimer.h"

 

-#include <avr/io.h>

-

-#include "board.h"

 #include "lcd.h"

 

-void hwinit(void);

-

 static WORKING_AREA(waThread1, 32);

 static msg_t Thread1(void *arg) {