1 files changed, 69 insertions, 1 deletions

diff --git a/firmware/target/arm/tms320dm320/debug-dm320.c b/firmware/target/arm/tms320dm320/debug-dm320.c
index 1a987b4dda..abfb5b09bc 100755
--- a/firmware/target/arm/tms320dm320/debug-dm320.c
+++ b/firmware/target/arm/tms320dm320/debug-dm320.c
@@ -27,18 +27,24 @@
 #include "sprintf.h"
 #include "font.h"
 #include "debug-target.h"
+#include "lcd-target.h"
 
 bool __dbg_ports(void)
 {
     return false;
 }
 
+#ifndef CREATIVE_ZVM
 extern char r_buffer[5];
 extern int r_button;
+#endif
 bool __dbg_hw_info(void)
 {
-    int line = 0, button, oldline;
+    int line = 0, oldline;
+        int button;
+#ifndef CREATIVE_ZVM
     int *address=0x0;
+#endif
     bool done=false;
     char buf[100];
 
@@ -50,6 +56,7 @@ bool __dbg_hw_info(void)
     lcd_puts(0, line++, "[Hardware info]");
 
     lcd_puts(0, line++, "Clock info:");
+#if LCD_WIDTH > 320
     snprintf(buf, sizeof(buf), "IO_CLK_PLLA: 0x%04x IO_CLK_PLLB: 0x%04x IO_CLK_SEL0: 0x%04x IO_CLK_SEL1: 0x%04x",
         IO_CLK_PLLA, IO_CLK_PLLB, IO_CLK_SEL0, IO_CLK_SEL1);    lcd_puts(0, line++, buf);
     snprintf(buf, sizeof(buf), "IO_CLK_SEL2: 0x%04x IO_CLK_DIV0: 0x%04x IO_CLK_DIV1: 0x%04x IO_CLK_DIV2: 0x%04x",
@@ -58,12 +65,45 @@ bool __dbg_hw_info(void)
         IO_CLK_DIV3, IO_CLK_DIV4, IO_CLK_BYP, IO_CLK_INV);    lcd_puts(0, line++, buf);
     snprintf(buf, sizeof(buf), "IO_CLK_MOD0: 0x%04x IO_CLK_MOD1: 0x%04x IO_CLK_MOD2: 0x%04x IO_CLK_LPCTL0: 0x%04x",
         IO_CLK_MOD0, IO_CLK_MOD1, IO_CLK_MOD2, IO_CLK_LPCTL0);    lcd_puts(0, line++, buf);
+#else
+    snprintf(buf, sizeof(buf), " IO_CLK_PLLA: 0x%04x IO_CLK_PLLB: 0x%04x", IO_CLK_PLLA, IO_CLK_PLLB);
+    lcd_puts(0, line++, buf);
+    snprintf(buf, sizeof(buf), " IO_CLK_SEL0: 0x%04x IO_CLK_SEL1: 0x%04x", IO_CLK_SEL0, IO_CLK_SEL1);
+    lcd_puts(0, line++, buf); 
+    snprintf(buf, sizeof(buf), " IO_CLK_SEL2: 0x%04x IO_CLK_DIV0: 0x%04x", IO_CLK_SEL2, IO_CLK_DIV0);
+    lcd_puts(0, line++, buf);
+    snprintf(buf, sizeof(buf), " IO_CLK_DIV1: 0x%04x IO_CLK_DIV2: 0x%04x", IO_CLK_DIV1, IO_CLK_DIV2);
+    lcd_puts(0, line++, buf);
+    snprintf(buf, sizeof(buf), " IO_CLK_DIV3: 0x%04x IO_CLK_DIV4: 0x%04x", IO_CLK_DIV3, IO_CLK_DIV4);
+    lcd_puts(0, line++, buf);
+    snprintf(buf, sizeof(buf), " IO_CLK_BYP : 0x%04x IO_CLK_INV : 0x%04x", IO_CLK_BYP, IO_CLK_INV);
+    lcd_puts(0, line++, buf);
+    snprintf(buf, sizeof(buf), " IO_CLK_MOD0: 0x%04x IO_CLK_MOD1: 0x%04x ", IO_CLK_MOD0, IO_CLK_MOD1);
+    lcd_puts(0, line++, buf);
+    snprintf(buf, sizeof(buf), " IO_CLK_MOD2: 0x%04x IO_CLK_LPCTL0: 0x%04x ", IO_CLK_MOD2, IO_CLK_LPCTL0);
+    lcd_puts(0, line++, buf); 
+#endif
+                
+    lcd_puts(0, line++, "Board revision:");
+        switch (IO_BUSC_REVR) {
+                        case 0x0010:
+                                        lcd_puts(0, line++, " DM320 Rev. A");
+                                        break;
+                        case 0x0011:
+                                        lcd_puts(0, line++, " DM320 Rev. B/C");
+                                        break;
+                        default:
+                                        lcd_puts(0, line++, " Unknown DM320 Chip ID");
+        }
 
+#ifndef CREATIVE_ZVM
     line++;
+#endif
     oldline=line;
     while(!done)
     {
         line = oldline;
+#ifndef CREATIVE_ZVM
         button = button_get(false);
         button&=~BUTTON_REPEAT;
         if (button == BUTTON_POWER)
@@ -81,14 +121,42 @@ bool __dbg_hw_info(void)
             r_buffer[0], r_buffer[1], r_buffer[2], r_buffer[3],r_buffer[4] );    lcd_puts(0, line++, buf);
         snprintf(buf, sizeof(buf), "Button: 0x%08x, HWread: 0x%08x",
             (unsigned int)button, r_button);  lcd_puts(0, line++, buf);
+#else
+     button = button_get(false);
+     if(button & BUTTON_POWER)
+        done = true;
+    else if(button & BUTTON_LEFT)
+        lcd_set_direct_fb(false);
+    else if(button & BUTTON_RIGHT)
+        lcd_set_direct_fb(true);
+    
+    lcd_puts(0, line++, "PIC info:");
+    snprintf(buf, sizeof(buf), " Init value 1: 0x%04x", get_debug_info(1));
+    lcd_puts(0, line++, buf);
+    snprintf(buf, sizeof(buf), " Init value 2: 0x%04x", get_debug_info(2));
+    lcd_puts(0, line++, buf);
+    snprintf(buf, sizeof(buf), " Last button value: 0x%04x Raw value: 0x%04x", get_debug_info(3), button_read_device());
+    lcd_puts(0, line++, buf);
+    snprintf(buf, sizeof(buf), " Last button at: 0x%04x", get_debug_info(5));
+    lcd_puts(0, line++, buf);
+    snprintf(buf, sizeof(buf), " Dock values: 0x%04x", get_debug_info(4));
+    lcd_puts(0, line++, buf);
+    lcd_puts(0, line++, "LCD info:");
+    snprintf(buf, sizeof(buf), " LCD direct FB access? %s", (lcd_get_direct_fb() ? "yes" : "no"));
+    lcd_puts(0, line++, buf);
+    line++;
+#endif
+        lcd_puts(0, line++, "[Rockbox info]");
         snprintf(buf, sizeof(buf), "current tick: %08x Seconds running: %08d",
             (unsigned int)current_tick, (unsigned int)current_tick/100);  lcd_puts(0, line++, buf);
+#ifndef CREATIVE_ZVM
         snprintf(buf, sizeof(buf), "Address: 0x%08x Data: 0x%08x", 
             (unsigned int)address, *address);           lcd_puts(0, line++, buf);
         snprintf(buf, sizeof(buf), "Address: 0x%08x Data: 0x%08x",
             (unsigned int)(address+1), *(address+1));   lcd_puts(0, line++, buf);
         snprintf(buf, sizeof(buf), "Address: 0x%08x Data: 0x%08x",
             (unsigned int)(address+2), *(address+2));   lcd_puts(0, line++, buf);
+#endif
 
         lcd_update();
     }