diff options
-rwxr-xr-x | bootloader/mrobe500.c | 5 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/system-dm320.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/bootloader/mrobe500.c b/bootloader/mrobe500.c index c051e54fb6..75e1ae4316 100755 --- a/bootloader/mrobe500.c +++ b/bootloader/mrobe500.c | |||
@@ -127,9 +127,10 @@ void mrdebug(void) | |||
127 | else if (button==BUTTON_RC_REW) | 127 | else if (button==BUTTON_RC_REW) |
128 | address-=0x1000; | 128 | address-=0x1000; |
129 | { | 129 | { |
130 | extern int irq_count; | ||
130 | short x,y,z1,z2; | 131 | short x,y,z1,z2; |
131 | tsc2100_read_values(&x, &y, &z1, &z2); | 132 | tsc2100_read_values(&x, &y, &z1, &z2); |
132 | printf("x: %04x y: %04x z1: %04x z2: %04x", x, y, z1, z2); | 133 | printf("%d, x: %04x y: %04x z1: %04x z2: %04x", irq_count,x, y, z1, z2); |
133 | printf("tsadc: %4x", tsc2100_readreg(TSADC_PAGE, TSADC_ADDRESS)&0xffff); | 134 | printf("tsadc: %4x", tsc2100_readreg(TSADC_PAGE, TSADC_ADDRESS)&0xffff); |
134 | printf("current tick: %04x", current_tick); | 135 | printf("current tick: %04x", current_tick); |
135 | printf("Address: 0x%08x Data: 0x%08x", address, *address); | 136 | printf("Address: 0x%08x Data: 0x%08x", address, *address); |
@@ -167,10 +168,8 @@ void main(void) | |||
167 | adc_init(); | 168 | adc_init(); |
168 | button_init(); | 169 | button_init(); |
169 | backlight_init(); | 170 | backlight_init(); |
170 | uart_init(); | ||
171 | 171 | ||
172 | font_init(); | 172 | font_init(); |
173 | spi_init(); | ||
174 | 173 | ||
175 | lcd_setfont(FONT_SYSFIXED); | 174 | lcd_setfont(FONT_SYSFIXED); |
176 | 175 | ||
diff --git a/firmware/target/arm/tms320dm320/system-dm320.c b/firmware/target/arm/tms320dm320/system-dm320.c index fad2d4331e..8a50ba7f08 100644 --- a/firmware/target/arm/tms320dm320/system-dm320.c +++ b/firmware/target/arm/tms320dm320/system-dm320.c | |||
@@ -20,6 +20,8 @@ | |||
20 | #include "kernel.h" | 20 | #include "kernel.h" |
21 | #include "system.h" | 21 | #include "system.h" |
22 | #include "panic.h" | 22 | #include "panic.h" |
23 | #include "uart-target.h" | ||
24 | #include "spi.h" | ||
23 | 25 | ||
24 | #define default_interrupt(name) \ | 26 | #define default_interrupt(name) \ |
25 | extern __attribute__((weak,alias("UIRQ"))) void name (void) | 27 | extern __attribute__((weak,alias("UIRQ"))) void name (void) |
@@ -175,6 +177,8 @@ void system_init(void) | |||
175 | IO_GIO_DIR1&=~(1<<10); | 177 | IO_GIO_DIR1&=~(1<<10); |
176 | 178 | ||
177 | enable_interrupts(); | 179 | enable_interrupts(); |
180 | uart_init(); | ||
181 | spi_init(); | ||
178 | } | 182 | } |
179 | 183 | ||
180 | int system_memory_guard(int newmode) | 184 | int system_memory_guard(int newmode) |