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

3 files changed, 15 insertions, 9 deletions

diff --git a/demos/ARM7-AT91SAM7X-GCC/Makefile b/demos/ARM7-AT91SAM7X-GCC/Makefile
index 4622e181f..34f5ff8b2 100644
--- a/demos/ARM7-AT91SAM7X-GCC/Makefile
+++ b/demos/ARM7-AT91SAM7X-GCC/Makefile
@@ -53,8 +53,9 @@ CSRC = ${PORTSRC} \
        ${KERNSRC} \

        ${TESTSRC} \

        ../../os/io/pal.c \

-       ../../os/ports/GCC/ARM7/AT91SAM7X/pal_lld.c \

-       ../../os/ports/GCC/ARM7/AT91SAM7X/sam7x_serial.c \

+       ../../os/io/serial.c \

+       ../../os/io/platforms/AT91SAM7X/pal_lld.c \

+       ../../os/io/platforms/AT91SAM7X/serial_lld.c \

        at91lib/aic.c \

        board.c main.c

 

@@ -88,8 +89,9 @@ ASMSRC = $(PORTASM) \
 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

          ../../os/io \

-         ../../os/ports/GCC/ARM7/AT91SAM7X \

-         ../../os/various

+         ../../os/io/platforms/AT91SAM7X \

+         ../../os/various \

+         ../../os/ports/GCC/ARM7/AT91SAM7X

 

 #

 # Project, sources and paths

diff --git a/demos/ARM7-AT91SAM7X-GCC/board.c b/demos/ARM7-AT91SAM7X-GCC/board.c
index aac51cf0c..fb52c8f3b 100644
--- a/demos/ARM7-AT91SAM7X-GCC/board.c
+++ b/demos/ARM7-AT91SAM7X-GCC/board.c
@@ -19,12 +19,11 @@
 

 #include <ch.h>

 #include <pal.h>

+#include <serial.h>

 

 #include "board.h"

 #include "at91lib/aic.h"

 

-#include <sam7x_serial.h>

-

 /*

  * FIQ Handler weak symbol defined in vectors.s.
  */

@@ -169,7 +168,7 @@ void hwinit1(void) {
   /*

    * Serial driver initialization, RTS/CTS pins enabled for USART0 only.

    */

-  serial_init(AT91C_AIC_PRIOR_HIGHEST - 2, AT91C_AIC_PRIOR_HIGHEST - 2);

+  sdInit();

   AT91C_BASE_PIOA->PIO_PDR   = AT91C_PA3_RTS0 | AT91C_PA4_CTS0;

   AT91C_BASE_PIOA->PIO_ASR   = AT91C_PIO_PA3 | AT91C_PIO_PA4;

   AT91C_BASE_PIOA->PIO_PPUDR = AT91C_PIO_PA3 | AT91C_PIO_PA4;

diff --git a/demos/ARM7-AT91SAM7X-GCC/main.c b/demos/ARM7-AT91SAM7X-GCC/main.c
index 614b649cd..d1ca61cc7 100644
--- a/demos/ARM7-AT91SAM7X-GCC/main.c
+++ b/demos/ARM7-AT91SAM7X-GCC/main.c
@@ -19,10 +19,10 @@
 

 #include <ch.h>

 #include <pal.h>

+#include <serial.h>

 #include <test.h>

 

 #include "board.h"

-#include <sam7x_serial.h>

 

 static WORKING_AREA(waThread1, 64);

 static msg_t Thread1(void *arg) {

@@ -43,6 +43,11 @@ static msg_t Thread1(void *arg) {
 int main(int argc, char **argv) {

 

   /*

+   * Activates the communication port 1 using the driver default configuration.

+   */

+  sdStart(&COM1, NULL);

+

+  /*

    * Creates the blinker thread.

    */

   chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);

@@ -53,7 +58,7 @@ int main(int argc, char **argv) {
   while (TRUE) {

     chThdSleepMilliseconds(500);

     if (!palReadPad(IOPORT_B, PIOB_SW1))

-      chFDDWrite(&COM1, (uint8_t *)"Hello World!\r\n", 14);

+      sdWrite(&COM1, (uint8_t *)"Hello World!\r\n", 14);

     if (!palReadPad(IOPORT_B, PIOB_SW2))

       TestThread(&COM1);

   }