From: Michal Sojka Date: Sun, 30 Dec 2012 22:30:13 +0000 (+0100) Subject: lpceurobot board builds without errors X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sysless.git/commitdiff_plain/a3f81d25ca1c1a3a892d791fa846e775ede2140d lpceurobot board builds without errors Not checked with the hardware. --- diff --git a/arch/arm/mach-lpc21xx/libs/Makefile.omk b/arch/arm/mach-lpc21xx/libs/Makefile.omk index 95a8bff..bbdf176 100644 --- a/arch/arm/mach-lpc21xx/libs/Makefile.omk +++ b/arch/arm/mach-lpc21xx/libs/Makefile.omk @@ -1,4 +1,6 @@ # -*- makefile -*- -SUBDIRS = hal iap +ifneq ($(BOARD),lpceurobot) +SUBDIRS = hal iap +endif SUBDIRS += boot can lpcan lpcanvca pll pwm uart_zen uart-nozen ldscripts diff --git a/arch/arm/mach-lpc21xx/test/armtest_leds/main.c b/arch/arm/mach-lpc21xx/test/armtest_leds/main.c index ad92588..18b251d 100644 --- a/arch/arm/mach-lpc21xx/test/armtest_leds/main.c +++ b/arch/arm/mach-lpc21xx/test/armtest_leds/main.c @@ -44,9 +44,9 @@ static void lowInit(void) { PLLFEED = 0x55; // MUST occur in sequence. // setup the parallel port pin - IOCLR = PIO_ZERO_BITS; // clear the ZEROs output - IOSET = PIO_ONE_BITS; // set the ONEs output - IODIR = PIO_OUTPUT_BITS; // set the output bit direction + IO0CLR = PIO_ZERO_BITS; // clear the ZEROs output + IO0SET = PIO_ONE_BITS; // set the ONEs output + IO0DIR = PIO_OUTPUT_BITS; // set the output bit direction // wait for PLL lock while (!(PLLSTAT & PLLSTAT_LOCK)) @@ -119,8 +119,8 @@ static int All_leds = 0xF0000; */ static void ledInit() { - IODIR |= 0x000F0000; /*leds connected to P0.16 17 18 & 19 should blink*/ - IOSET = 0x000F0000; /* all leds are switched on */ + IO0DIR |= 0x000F0000; /*leds connected to P0.16 17 18 & 19 should blink*/ + IO0SET = 0x000F0000; /* all leds are switched on */ } /** @@ -129,7 +129,7 @@ ledInit() { */ static void /* Ioclr.i =1 => IOset.i cleared */ ledOff(int led) { - IOCLR = led; + IO0CLR = led; } /** @@ -138,7 +138,7 @@ ledOff(int led) { */ static void /* Ioset.i = 1 => P0.i = 1 */ ledOn(int led) { - IOSET = led; + IO0SET = led; } /** diff --git a/arch/arm/mach-lpc21xx/test/interrupt_t0_test/interrupt_t0_test.c b/arch/arm/mach-lpc21xx/test/interrupt_t0_test/interrupt_t0_test.c index 843647b..444c874 100644 --- a/arch/arm/mach-lpc21xx/test/interrupt_t0_test/interrupt_t0_test.c +++ b/arch/arm/mach-lpc21xx/test/interrupt_t0_test/interrupt_t0_test.c @@ -50,9 +50,9 @@ static void lowInit(void) PLLFEED = 0x55; // MUST occur in sequence. // setup the parallel port pin - IOCLR = PIO_ZERO_BITS; // clear the ZEROs output - IOSET = PIO_ONE_BITS; // set the ONEs output - IODIR = PIO_OUTPUT_BITS; // set the output bit direction + IO0CLR = PIO_ZERO_BITS; // clear the ZEROs output + IO0SET = PIO_ONE_BITS; // set the ONEs output + IO0DIR = PIO_OUTPUT_BITS; // set the output bit direction // wait for PLL lock while (!(PLLSTAT & PLLSTAT_LOCK)) @@ -105,8 +105,8 @@ static void sysInit(void) */ static void ledInit() { - IODIR |= 0x000F0000; /*leds connected to P0.16 17 18 & 19 should blink*/ - IOSET = 0x00000000; /* all leds are switched off */ + IO0DIR |= 0x000F0000; /*leds connected to P0.16 17 18 & 19 should blink*/ + IO0SET = 0x00000000; /* all leds are switched off */ } /** @@ -115,7 +115,7 @@ static void ledInit() */ static void ledOff(int led) /* Ioclr.i =1 => IOset.i cleared */ { - IOCLR = led; + IO0CLR = led; } /** @@ -124,7 +124,7 @@ static void ledOff(int led) /* Ioclr.i =1 => IOset.i cleared */ */ static void ledOn(int led) /* Ioset.i = 1 => P0.i = 1 */ { - IOSET = led; + IO0SET = led; } diff --git a/arch/arm/mach-lpc21xx/test/test_ARMBoard_pwm/test_ARMBoard_pwm.c b/arch/arm/mach-lpc21xx/test/test_ARMBoard_pwm/test_ARMBoard_pwm.c index f143602..0ee0859 100644 --- a/arch/arm/mach-lpc21xx/test/test_ARMBoard_pwm/test_ARMBoard_pwm.c +++ b/arch/arm/mach-lpc21xx/test/test_ARMBoard_pwm/test_ARMBoard_pwm.c @@ -45,9 +45,9 @@ PLLFEED = 0x55; // MUST occur in sequence. // setup the parallel port pin - IOCLR = PIO_ZERO_BITS; // clear the ZEROs output - IOSET = PIO_ONE_BITS; // set the ONEs output - IODIR = PIO_OUTPUT_BITS; // set the output bit direction + IO0CLR = PIO_ZERO_BITS; // clear the ZEROs output + IO0SET = PIO_ONE_BITS; // set the ONEs output + IO0DIR = PIO_OUTPUT_BITS; // set the output bit direction // wait for PLL lock while (!(PLLSTAT & PLLSTAT_LOCK)) diff --git a/arch/arm/mach-lpc21xx/test/test_uart/uart_test.c b/arch/arm/mach-lpc21xx/test/test_uart/uart_test.c index 8b3785a..b1d75ee 100644 --- a/arch/arm/mach-lpc21xx/test/test_uart/uart_test.c +++ b/arch/arm/mach-lpc21xx/test/test_uart/uart_test.c @@ -30,9 +30,9 @@ static void lowInit(void) PLLFEED = 0x55; // MUST occur in sequence. // setup the parallel port pin - IOCLR = PIO_ZERO_BITS; // clear the ZEROs output - IOSET = PIO_ONE_BITS; // set the ONEs output - IODIR = PIO_OUTPUT_BITS; // set the output bit direction + IO0CLR = PIO_ZERO_BITS; // clear the ZEROs output + IO0SET = PIO_ONE_BITS; // set the ONEs output + IO0DIR = PIO_OUTPUT_BITS; // set the output bit direction // wait for PLL lock while (!(PLLSTAT & PLLSTAT_LOCK)) @@ -105,8 +105,8 @@ static int leds[] = { 0x10000, 0x20000, 0x40000, 0x80000 }; */ static void ledInit() { - IODIR |= 0x000F0000; /*leds connected to P0.16 17 18 & 19 should blink*/ - IOSET = 0x00000000; /* all leds are switched off */ + IO0DIR |= 0x000F0000; /*leds connected to P0.16 17 18 & 19 should blink*/ + IO0SET = 0x00000000; /* all leds are switched off */ } /** @@ -115,7 +115,7 @@ static void ledInit() */ static void ledOff(int led) /* Ioclr.i =1 => IOset.i cleared */ { - IOCLR = led; + IO0CLR = led; } /** @@ -124,7 +124,7 @@ static void ledOff(int led) /* Ioclr.i =1 => IOset.i cleared */ */ static void ledOn(int led) /* Ioset.i = 1 => P0.i = 1 */ { - IOSET = led; + IO0SET = led; } diff --git a/arch/generic/defines/Makefile.omk b/arch/generic/defines/Makefile.omk index 637d63c..cac8383 100644 --- a/arch/generic/defines/Makefile.omk +++ b/arch/generic/defines/Makefile.omk @@ -1,4 +1,5 @@ # -*- makefile -*- +include_HEADERS += deb_led.h include_HEADERS += byteswap.h endian.h lt_timer.h lt_timer_types.h keyval_id_his.h ads1x46.h irq_generic.h #include_HEADERS = $(notdir $(wildcard $(SOURCES_DIR)/*.h))