4 files changed, 16 insertions, 17 deletions
diff --git a/demos/AVR-ATmega128-GCC/Makefile b/demos/AVR-ATmega128-GCC/Makefile
index c13d60ef9..4af1c53db 100644
--- a/demos/AVR-ATmega128-GCC/Makefile
+++ b/demos/AVR-ATmega128-GCC/Makefile
@@ -89,9 +89,10 @@ include ../../test/test.mk
 SRC = ${PORTSRC} \
       ${KERNSRC} \
       ${TESTSRC} \
-      ../../os/ports/GCC/AVR/avr_serial.c \
+      ../../os/io/serial.c \
+      ../../os/io/platforms/AVR/serial_lld.c \
       ../../os/various/evtimer.c \
-      board.c lcd.c main.c
+      board.c main.c
 
 
 # List C++ source files here. (C dependencies are automatically generated.)
@@ -125,7 +126,10 @@ 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)e ../../os/various
+EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) \
+               ../../os/io \
+               ../../os/io/platforms/AVR \
+               ../../os/various
 
 
 # Compiler flag to set the C Standard level.
diff --git a/demos/AVR-ATmega128-GCC/board.c b/demos/AVR-ATmega128-GCC/board.c
index 490dd0362..84e1565cb 100644
--- a/demos/AVR-ATmega128-GCC/board.c
+++ b/demos/AVR-ATmega128-GCC/board.c
@@ -18,9 +18,9 @@
 */
 
 #include <ch.h>
+#include <serial.h>
 
 #include "board.h"
-#include "avr_serial.h"
 
 CH_IRQ_HANDLER(TIMER0_COMP_vect) {
 
@@ -82,5 +82,5 @@ void hwinit(void) {
   /*
    * Other initializations.
    */
-  serial_init();
+  sdInit();
 }
diff --git a/demos/AVR-ATmega128-GCC/chconf.h b/demos/AVR-ATmega128-GCC/chconf.h
index 717a0ce09..cb7da16d3 100644
--- a/demos/AVR-ATmega128-GCC/chconf.h
+++ b/demos/AVR-ATmega128-GCC/chconf.h
@@ -233,16 +233,6 @@
 #endif
 
 /**
- * If specified then the full duplex serial driver APIs are included in the
- * kernel.
- * @note The default is @p TRUE.
- * @note Requires @p CH_USE_QUEUES.
- */
-#if !defined(CH_USE_SERIAL_FULLDUPLEX) || defined(__DOXYGEN__)
-#define CH_USE_SERIAL_FULLDUPLEX        TRUE
-#endif
-
-/**
  * If specified then the memory heap allocator APIs are included in the kernel.
  * @note The default is @p TRUE.
  * @note Requires @p CH_USE_MUTEXES or @p CH_USE_SEMAPHORES.
diff --git a/demos/AVR-ATmega128-GCC/main.c b/demos/AVR-ATmega128-GCC/main.c
index 405770d00..dc3fd33c3 100644
--- a/demos/AVR-ATmega128-GCC/main.c
+++ b/demos/AVR-ATmega128-GCC/main.c
@@ -18,8 +18,8 @@
 */
 
 #include <ch.h>
+#include <serial.h>
 #include <evtimer.h>
-#include <avr_serial.h>
 
 #include <avr/io.h>
 
@@ -43,7 +43,7 @@ static void TimerHandler(eventid_t id) {
   msg_t TestThread(void *p);
 
   if (!(PINA & PORTA_BUTTON1))
-    TestThread(&SER2);
+    TestThread(&SD2);
 }
 
 int main(int argc, char **argv) {
@@ -62,6 +62,11 @@ int main(int argc, char **argv) {
   chSysInit();
 
   /*
+   * Activates the serial driver 2 using the driver default configuration.
+   */
+  sdStart(&SD2, NULL);
+
+  /*
    * This initialization requires the OS already active because it uses delay
    * APIs inside.
    */