summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbootloader/mrobe500.c5
-rw-r--r--firmware/target/arm/tms320dm320/system-dm320.c4
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)
else if (button==BUTTON_RC_REW)
address-=0x1000;
{
+ extern int irq_count;
short x,y,z1,z2;
tsc2100_read_values(&x, &y, &z1, &z2);
- printf("x: %04x y: %04x z1: %04x z2: %04x", x, y, z1, z2);
+ printf("%d, x: %04x y: %04x z1: %04x z2: %04x", irq_count,x, y, z1, z2);
printf("tsadc: %4x", tsc2100_readreg(TSADC_PAGE, TSADC_ADDRESS)&0xffff);
printf("current tick: %04x", current_tick);
printf("Address: 0x%08x Data: 0x%08x", address, *address);
@@ -167,10 +168,8 @@ void main(void)
adc_init();
button_init();
backlight_init();
- uart_init();
font_init();
- spi_init();
lcd_setfont(FONT_SYSFIXED);
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 @@
#include "kernel.h"
#include "system.h"
#include "panic.h"
+#include "uart-target.h"
+#include "spi.h"
#define default_interrupt(name) \
extern __attribute__((weak,alias("UIRQ"))) void name (void)
@@ -175,6 +177,8 @@ void system_init(void)
IO_GIO_DIR1&=~(1<<10);
enable_interrupts();
+ uart_init();
+ spi_init();
}
int system_memory_guard(int newmode)