diff options
-rw-r--r-- | src/target/firmware/apps/compal_dsp_dump/main.c | 16 | ||||
-rw-r--r-- | src/target/firmware/apps/compal_dump/main.c | 16 | ||||
-rw-r--r-- | src/target/firmware/apps/hello_world/main.c | 16 | ||||
-rw-r--r-- | src/target/firmware/apps/l1test/main.c | 16 | ||||
-rw-r--r-- | src/target/firmware/apps/layer1/main.c | 16 | ||||
-rw-r--r-- | src/target/firmware/apps/loader/main.c | 16 | ||||
-rw-r--r-- | src/target/firmware/calypso/Makefile | 2 | ||||
-rw-r--r-- | src/target/firmware/calypso/delay.c | 16 |
8 files changed, 23 insertions, 91 deletions
diff --git a/src/target/firmware/apps/compal_dsp_dump/main.c b/src/target/firmware/apps/compal_dsp_dump/main.c index 282bce28..f3ce3650 100644 --- a/src/target/firmware/apps/compal_dsp_dump/main.c +++ b/src/target/firmware/apps/compal_dsp_dump/main.c @@ -22,6 +22,7 @@ */ #include <memory.h> +#include <delay.h> #include <stdio.h> #include <stdint.h> #include <rffe.h> @@ -37,21 +38,6 @@ #include <calypso/misc.h> #include <comm/timer.h> -/* FIXME: We need proper calibrated delay loops at some point! */ -void delay_us(unsigned int us) -{ - volatile unsigned int i; - - for (i= 0; i < us*4; i++) { i; } -} - -void delay_ms(unsigned int ms) -{ - volatile unsigned int i; - - for (i= 0; i < ms*1300; i++) { i; } -} - /* Main Program */ const char *hr = "======================================================================\n"; diff --git a/src/target/firmware/apps/compal_dump/main.c b/src/target/firmware/apps/compal_dump/main.c index 0eaf9b79..288b60c7 100644 --- a/src/target/firmware/apps/compal_dump/main.c +++ b/src/target/firmware/apps/compal_dump/main.c @@ -21,6 +21,7 @@ */ #include <memory.h> +#include <delay.h> #include <stdio.h> #include <stdint.h> #include <cfi_flash.h> @@ -30,21 +31,6 @@ #include <calypso/misc.h> #include <comm/timer.h> -/* FIXME: We need proper calibrated delay loops at some point! */ -void delay_us(unsigned int us) -{ - volatile unsigned int i; - - for (i= 0; i < us*4; i++) { i; } -} - -void delay_ms(unsigned int ms) -{ - volatile unsigned int i; - - for (i= 0; i < ms*1300; i++) { i; } -} - #define KBIT 1024 #define MBIT (1024*KBIT) diff --git a/src/target/firmware/apps/hello_world/main.c b/src/target/firmware/apps/hello_world/main.c index effbc90a..846bc556 100644 --- a/src/target/firmware/apps/hello_world/main.c +++ b/src/target/firmware/apps/hello_world/main.c @@ -26,6 +26,7 @@ #include <debug.h> #include <memory.h> +#include <delay.h> #include <rffe.h> #include <keypad.h> #include <board.h> @@ -41,21 +42,6 @@ #include <comm/sercomm.h> #include <comm/timer.h> -/* FIXME: We need proper calibrated delay loops at some point! */ -void delay_us(unsigned int us) -{ - volatile unsigned int i; - - for (i= 0; i < us*4; i++) { i; } -} - -void delay_ms(unsigned int ms) -{ - volatile unsigned int i; - - for (i= 0; i < ms*1300; i++) { i; } -} - /* Main Program */ const char *hr = "======================================================================\n"; diff --git a/src/target/firmware/apps/l1test/main.c b/src/target/firmware/apps/l1test/main.c index 6e78f9c9..d533bdac 100644 --- a/src/target/firmware/apps/l1test/main.c +++ b/src/target/firmware/apps/l1test/main.c @@ -25,6 +25,7 @@ #include <debug.h> #include <memory.h> +#include <delay.h> #include <rffe.h> #include <keypad.h> #include <board.h> @@ -55,21 +56,6 @@ #define BASE_ARFCN 871 #endif -/* FIXME: We need proper calibrated delay loops at some point! */ -void delay_us(unsigned int us) -{ - volatile unsigned int i; - - for (i= 0; i < us*4; i++) { i; } -} - -void delay_ms(unsigned int ms) -{ - volatile unsigned int i; - - for (i= 0; i < ms*1300; i++) { i; } -} - /* Main Program */ const char *hr = "======================================================================\n"; diff --git a/src/target/firmware/apps/layer1/main.c b/src/target/firmware/apps/layer1/main.c index cf45d7fd..e3dc2811 100644 --- a/src/target/firmware/apps/layer1/main.c +++ b/src/target/firmware/apps/layer1/main.c @@ -25,6 +25,7 @@ #include <debug.h> #include <memory.h> +#include <delay.h> #include <rffe.h> #include <keypad.h> #include <board.h> @@ -45,21 +46,6 @@ #include <layer1/sync.h> #include <layer1/tpu_window.h> -/* FIXME: We need proper calibrated delay loops at some point! */ -void delay_us(unsigned int us) -{ - volatile unsigned int i; - - for (i= 0; i < us*4; i++) { i; } -} - -void delay_ms(unsigned int ms) -{ - volatile unsigned int i; - - for (i= 0; i < ms*1300; i++) { i; } -} - const char *hr = "======================================================================\n"; /* MAIN program **************************************************************/ diff --git a/src/target/firmware/apps/loader/main.c b/src/target/firmware/apps/loader/main.c index f4e1f545..794b05f1 100644 --- a/src/target/firmware/apps/loader/main.c +++ b/src/target/firmware/apps/loader/main.c @@ -26,6 +26,7 @@ #include <debug.h> #include <memory.h> +#include <delay.h> #include <rffe.h> #include <keypad.h> #include <board.h> @@ -87,21 +88,6 @@ uint16_t ntohs(uint16_t hostshort) __attribute__((weak,alias("htons"))); #define BASE_ARFCN 871 #endif -/* FIXME: We need proper calibrated delay loops at some point! */ -void delay_us(unsigned int us) -{ - volatile unsigned int i; - - for (i= 0; i < us*4; i++) { i; } -} - -void delay_ms(unsigned int ms) -{ - volatile unsigned int i; - - for (i= 0; i < ms*1300; i++) { i; } -} - /* Main Program */ const char *hr = "======================================================================\n"; diff --git a/src/target/firmware/calypso/Makefile b/src/target/firmware/calypso/Makefile index ef8a6a7a..ff62cb8a 100644 --- a/src/target/firmware/calypso/Makefile +++ b/src/target/firmware/calypso/Makefile @@ -1,4 +1,4 @@ LIBRARIES+=calypso calypso_DIR=calypso -calypso_SRCS=arm.c clock.c dma.c dsp.c du.c i2c.c irq.c rtc.c spi.c tpu.c tsp.c keypad.c misc.c timer.c backlight.c uart.c uwire.c +calypso_SRCS=arm.c clock.c delay.c dma.c dsp.c du.c i2c.c irq.c rtc.c spi.c tpu.c tsp.c keypad.c misc.c timer.c backlight.c uart.c uwire.c diff --git a/src/target/firmware/calypso/delay.c b/src/target/firmware/calypso/delay.c new file mode 100644 index 00000000..09f0043d --- /dev/null +++ b/src/target/firmware/calypso/delay.c @@ -0,0 +1,16 @@ +#include <delay.h> + +/* FIXME: We need proper calibrated delay loops at some point! */ +void delay_us(unsigned int us) +{ + volatile unsigned int i; + + for (i= 0; i < us*4; i++) { i; } +} + +void delay_ms(unsigned int ms) +{ + volatile unsigned int i; + + for (i= 0; i < ms*1300; i++) { i; } +} |