From 6dfa752b3e76a1ae793b5d40429963364d8ab4b7 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sun, 29 Nov 2009 16:39:54 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1359 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/ARM7-AT91SAM7X-UIP-GCC/Makefile | 17 ++--- demos/ARM7-AT91SAM7X-UIP-GCC/board.c | 93 ++-------------------------- demos/ARM7-AT91SAM7X-UIP-GCC/main.c | 9 +-- demos/ARM7-AT91SAM7X-UIP-GCC/web/webthread.c | 16 ++--- 4 files changed, 22 insertions(+), 113 deletions(-) (limited to 'demos/ARM7-AT91SAM7X-UIP-GCC') diff --git a/demos/ARM7-AT91SAM7X-UIP-GCC/Makefile b/demos/ARM7-AT91SAM7X-UIP-GCC/Makefile index dcd6cecd5..575a758af 100644 --- a/demos/ARM7-AT91SAM7X-UIP-GCC/Makefile +++ b/demos/ARM7-AT91SAM7X-UIP-GCC/Makefile @@ -44,6 +44,8 @@ LDSCRIPT= ch.ld # Imported source files CHIBIOS = ../.. +include ${CHIBIOS}/os/hal/hal.mk +include ${CHIBIOS}/os/hal/platforms/AT91SAM7/platform.mk include ${CHIBIOS}/os/ports/GCC/ARM7/port.mk include ${CHIBIOS}/os/kernel/kernel.mk include ${CHIBIOS}/test/test.mk @@ -62,16 +64,9 @@ USRC = ${CHIBIOS}/ext/uip-1.0/uip/uip_arp.c \ CSRC = ${PORTSRC} \ ${KERNSRC} \ ${TESTSRC} \ + ${HALSRC} \ + ${PLATFORMSRC} \ ${USRC} \ - ${CHIBIOS}/os/io/pal.c \ - ${CHIBIOS}/os/io/serial.c \ - ${CHIBIOS}/os/io/mii.c \ - ${CHIBIOS}/os/io/mac.c \ - ${CHIBIOS}/os/io/platforms/AT91SAM7/pal_lld.c \ - ${CHIBIOS}/os/io/platforms/AT91SAM7/serial_lld.c \ - ${CHIBIOS}/os/io/platforms/AT91SAM7/mii_lld.c \ - ${CHIBIOS}/os/io/platforms/AT91SAM7/mac_lld.c \ - ${CHIBIOS}/os/io/platforms/AT91SAM7/at91lib/aic.c \ ${CHIBIOS}/os/various/syscalls.c \ ${CHIBIOS}/os/various/evtimer.c \ web/webthread.c \ @@ -106,9 +101,7 @@ TCPPSRC = ASMSRC = $(PORTASM) \ ${CHIBIOS}/os/ports/GCC/ARM7/AT91SAM7/vectors.s -INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \ - ${CHIBIOS}/os/io \ - ${CHIBIOS}/os/io/platforms/AT91SAM7 \ +INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) $(HALINC) $(PLATFORMINC) $(LWINC) \ ${CHIBIOS}/os/various \ ${CHIBIOS}/os/ports/GCC/ARM7/AT91SAM7 \ ./web ${CHIBIOS}/ext/uip-1.0/uip ${CHIBIOS}/ext/uip-1.0/apps/webserver diff --git a/demos/ARM7-AT91SAM7X-UIP-GCC/board.c b/demos/ARM7-AT91SAM7X-UIP-GCC/board.c index 9d0ed6e22..b9704971c 100644 --- a/demos/ARM7-AT91SAM7X-UIP-GCC/board.c +++ b/demos/ARM7-AT91SAM7X-UIP-GCC/board.c @@ -17,28 +17,8 @@ along with this program. If not, see . */ -#include -#include -#include -#include - -#include "board.h" -#include "at91lib/aic.h" - - -/* - * FIQ Handler weak symbol defined in vectors.s. - */ -void FiqHandler(void); - -static CH_IRQ_HANDLER(SpuriousHandler) { - - CH_IRQ_PROLOGUE(); - - AT91C_BASE_AIC->AIC_EOICR = 0; - - CH_IRQ_EPILOGUE(); -} +#include "ch.h" +#include "hal.h" /* * SYS IRQ handling here. @@ -58,61 +38,14 @@ static CH_IRQ_HANDLER(SYSIrqHandler) { CH_IRQ_EPILOGUE(); } -/* - * Digital I/O ports static configuration as defined in @p board.h. - */ -static const AT91SAM7PIOConfig config = -{ - {VAL_PIOA_ODSR, VAL_PIOA_OSR, VAL_PIOA_PUSR}, -#if defined(SAM7X128) || defined(SAM7X256) || defined(SAM7X512) - {VAL_PIOB_ODSR, VAL_PIOB_OSR, VAL_PIOB_PUSR} -#endif -}; - /* * Early initialization code. * This initialization is performed just after reset before BSS and DATA * segments initialization. */ void hwinit0(void) { - /* - * Flash Memory: 1 wait state, about 50 cycles in a microsecond. - */ - AT91C_BASE_MC->MC_FMR = (AT91C_MC_FMCN & (50 << 16)) | AT91C_MC_FWS_1FWS; - /* - * Watchdog disabled. - */ - AT91C_BASE_WDTC->WDTC_WDMR = AT91C_WDTC_WDDIS; - - /* - * Enables the main oscillator and waits 56 slow cycles as startup time. - */ - AT91C_BASE_PMC->PMC_MOR = (AT91C_CKGR_OSCOUNT & (7 << 8)) | AT91C_CKGR_MOSCEN; - while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MOSCS)) - ; - - /* - * PLL setup: DIV = 14, MUL = 72, PLLCOUNT = 10 - * PLLfreq = 96109714 Hz (rounded) - */ - AT91C_BASE_PMC->PMC_PLLR = (AT91C_CKGR_DIV & 14) | - (AT91C_CKGR_PLLCOUNT & (10 << 8)) | - (AT91C_CKGR_MUL & (72 << 16)); - while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_LOCK)) - ; - - /* - * Master clock = PLLfreq / 2 = 48054858 Hz (rounded) - */ - AT91C_BASE_PMC->PMC_MCKR = AT91C_PMC_CSS_PLL_CLK | AT91C_PMC_PRES_CLK_2; - while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MCKRDY)) - ; - - /* - * PIO initialization. - */ - palInit(&config); + at91sam7_clock_init(); } /* @@ -121,19 +54,11 @@ void hwinit0(void) { * and before invoking the main() function. */ void hwinit1(void) { - int i; /* - * Default AIC setup, the device drivers will modify it as needed. + * HAL initialization. */ - AT91C_BASE_AIC->AIC_ICCR = 0xFFFFFFFF; - AT91C_BASE_AIC->AIC_IDCR = 0xFFFFFFFF; - AT91C_BASE_AIC->AIC_SVR[0] = (AT91_REG)FiqHandler; - for (i = 1; i < 31; i++) { - AT91C_BASE_AIC->AIC_SVR[i] = (AT91_REG)NULL; - AT91C_BASE_AIC->AIC_EOICR = (AT91_REG)i; - } - AT91C_BASE_AIC->AIC_SPU = (AT91_REG)SpuriousHandler; + halInit(); /* * LCD pins setup. @@ -171,18 +96,12 @@ void hwinit1(void) { AT91C_BASE_PITC->PITC_PIMR |= AT91C_PITC_PITEN | AT91C_PITC_PITIEN; /* - * Serial driver initialization, RTS/CTS pins enabled for USART0 only. + * RTS/CTS pins enabled for USART0 only. */ - 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; - /* - * EMAC driver initialization. - */ - macInit(); - /* * ChibiOS/RT initialization. */ diff --git a/demos/ARM7-AT91SAM7X-UIP-GCC/main.c b/demos/ARM7-AT91SAM7X-UIP-GCC/main.c index 03435d98b..283e01168 100644 --- a/demos/ARM7-AT91SAM7X-UIP-GCC/main.c +++ b/demos/ARM7-AT91SAM7X-UIP-GCC/main.c @@ -17,12 +17,9 @@ along with this program. If not, see . */ -#include -#include -#include -#include - -#include "board.h" +#include "ch.h" +#include "hal.h" +#include "test.h" #include "web/webthread.h" diff --git a/demos/ARM7-AT91SAM7X-UIP-GCC/web/webthread.c b/demos/ARM7-AT91SAM7X-UIP-GCC/web/webthread.c index 1be4df645..1235696d8 100644 --- a/demos/ARM7-AT91SAM7X-UIP-GCC/web/webthread.c +++ b/demos/ARM7-AT91SAM7X-UIP-GCC/web/webthread.c @@ -19,14 +19,14 @@ #include -#include -#include -#include - -#include -#include -#include -#include +#include "ch.h" +#include "hal.h" +#include "evtimer.h" + +#include "uip.h" +#include "uip_arp.h" +#include "httpd.h" +#include "clock-arch.h" #define IPADDR0 192 #define IPADDR1 168 -- cgit v1.2.3