4 files changed, 116 insertions, 38 deletions

diff --git a/firmware/drivers/isp1583.c b/firmware/drivers/isp1583.c
index 351618d566..7e78f87468 100644
--- a/firmware/drivers/isp1583.c
+++ b/firmware/drivers/isp1583.c
@@ -26,6 +26,7 @@
 #include "isp1583.h"

 #include "thread.h"

 #include "logf.h"

+#include <stdio.h>

 

 #define DIR_RX                      0

 #define DIR_TX                      1

@@ -149,7 +150,7 @@ static void usb_enable_endpoint(int idx)
     

     endpoints[epidx_n(idx)].enabled[epidx_dir(idx)] = 1;

 }

-

+/*

 static void usb_disable_endpoint(int idx, bool set_struct)

 {

     usb_select_endpoint(idx);

@@ -159,7 +160,7 @@ static void usb_disable_endpoint(int idx, bool set_struct)
     if(set_struct)

         endpoints[epidx_n(idx)].enabled[epidx_dir(idx)] = 0;

 }

-

+*/

 static int usb_get_packet(unsigned char *buf, int max_len)

 {

     int len, i;

@@ -389,7 +390,7 @@ void usb_helper(void)
     if(ISP1583_GEN_INT_READ & ISP1583_INIT_INTEN_READ)

     {

     #ifdef DEBUG

-        //logf("Helper detected interrupt... [%d]", current_tick);

+        logf("Helper detected interrupt... [%d]", current_tick);

     #endif

         usb_drv_int();

     }

@@ -712,6 +713,53 @@ void usb_drv_set_address(int address)
     usb_status_ack(0, DIR_TX);

 }

 

+int dbg_usb_num_items(void)

+{

+    return 2+NUM_ENDPOINTS*2;

+}

+

+char* dbg_usb_item(int selected_item, void *data, char *buffer, size_t buffer_len)

+{

+    if(selected_item < 2)

+    {

+        switch(selected_item)

+        {

+            case 0:

+                snprintf(buffer, buffer_len, "USB connected: %s", (usb_drv_connected() ? "Yes" : "No"));

+                return buffer;

+            case 1:

+                snprintf(buffer, buffer_len, "HS mode: %s", (high_speed_mode ? "Yes" : "No"));

+                return buffer;

+        }

+    }

+    else

+    {

+        int n = ep_index((selected_item - 2) / 2, (selected_item - 2) % 2);

+        if(endpoints[n].enabled == false)

+            snprintf(buffer, buffer_len, "EP%d[%s]: DISABLED", epidx_n(n), (epidx_dir(n) ? "TX" : "RX"));

+        else

+        {

+            if(epidx_dir(n))

+            {

+                if(endpoints[n].out_in_progress)

+                    snprintf(buffer, buffer_len, "EP%d[TX]: TRANSFERRING DATA -> %d bytes/%d bytes", epidx_n(n), (endpoints[n].out_len - endpoints[n].out_ptr), endpoints[n].out_len);

+                else

+                    snprintf(buffer, buffer_len, "EP%d[TX]: STANDBY", epidx_n(n));

+            }

+            else

+            {

+                if(endpoints[n].in_buf && !endpoints[n].in_ack)

+                    snprintf(buffer, buffer_len, "EP%d[RX]: RECEIVING DATA -> %d bytes/%d bytes", epidx_n(n), endpoints[n].in_ptr, endpoints[n].in_max_len);

+                else

+                    snprintf(buffer, buffer_len, "EP%d[RX]: STANDBY", epidx_n(n));

+            }

+        }

+        return buffer;

+    }

+    return NULL;

+    (void)data;

+}

+

 void usb_drv_set_test_mode(int mode)

 {

     logf("usb_drv_set_test_mode(%d)", mode);

diff --git a/firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c
index 09d3cf7c67..334ef25683 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c
+++ b/firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c
@@ -25,7 +25,6 @@
 #include "button-target.h"
 #include "i2c-dm320.h"
 
-
 #include "lcd-target.h"
 #include "lcd.h"
 #include "sprintf.h"
@@ -46,8 +45,10 @@
 #define BTN_REL                         1
 
 #define BTN_TOUCHPAD_PRESS              0x1F00
+#define BTN_TOUCHPAD_SCROLL_DOWN        0x0F03
 #define BTN_TOUCHPAD_CORNER_DOWN        0xAF00
 #define BTN_TOUCHPAD_CORNER_UP          0x3F00
+#define BTN_TOUCHPAD_SCROLL_UP          0x0F04
 
 #define HEADPHONE_PLUGIN_A              0x5707
 #define HEADPHONE_PLUGIN_B              0x5F07
@@ -176,6 +177,9 @@ static bool sw = false;
 
 void GIO0(void)
 {
+    /* Mask GIO0 interrupt */
+    IO_INTC_IRQ1 = INTR_IRQ1_EXT0;
+    
     unsigned char msg[4];
     i2c_read(PIC_ADR, msg, sizeof(msg));
     tick_diff = current_tick - last_tick;
@@ -200,6 +204,12 @@ void GIO0(void)
         map_button(BTN_TOUCHPAD_PRESS,       BUTTON_SELECT);
         map_button(BTN_TOUCHPAD_CORNER_DOWN, BUTTON_DOWN);
         map_button(BTN_TOUCHPAD_CORNER_UP,   BUTTON_UP);
+    case BTN_TOUCHPAD_SCROLL_DOWN:
+        btn = BUTTON_DOWN;
+        break;
+    case BTN_TOUCHPAD_SCROLL_UP:
+        btn = BUTTON_UP;
+        break;
     case BTN_HOLD:
         hold_switch = true;
         break;
@@ -252,8 +262,6 @@ void GIO0(void)
     lcd_update();
     sw = !sw;
 #endif
-    /* Mask GIO0 interrupt */
-    IO_INTC_IRQ1 = INTR_IRQ1_EXT0;
 }
 
 void send_command_to_pic(unsigned char in, unsigned char* out,
@@ -292,8 +300,7 @@ void button_init_device(void)
        it? */
     /* Enable GIO0 interrupt */
     IO_INTC_EINT1 |= INTR_EINT1_EXT0;
-    btn = nonbtn = pic_init_value = pic_init2_value = last_btn = hold_switch =
-        0;
+    btn=nonbtn=pic_init_value=pic_init2_value=last_btn=hold_switch=0;
     /* Initialize PIC */
     send_command_to_pic(1, (unsigned char *)&pic_init_value,
                         sizeof(pic_init_value));
@@ -301,27 +308,12 @@ void button_init_device(void)
                         sizeof(pic_init2_value));
 }
 
-int get_debug_info(int choice)
-{
-    switch(choice)
-    {
-        case 1:
-            return pic_init_value;
-        case 2:
-            return pic_init2_value;
-        case 3:
-            return last_btn;
-        case 4:
-            return nonbtn;
-        case 5:
-            return tick_diff;
-    }
-    return -1;
-}
-
 int button_read_device(void)
 {
-    return btn;
+    if(hold_switch)
+        return 0;
+    else
+        return btn;
 }
 
 bool button_hold(void)
@@ -333,3 +325,44 @@ bool button_usb_connected(void)
 {
     return (bool)(nonbtn & NONBUTTON_USB);
 }
+    
+int pic_dbg_num_items(void)
+{
+    return 13;
+}
+
+char* pic_dbg_item(int selected_item, void *data, char *buffer, size_t buffer_len)
+{
+    (void)data;
+    switch(selected_item)
+    {
+        case 0:
+            snprintf(buffer, buffer_len, "Init value 1: 0x%04x", pic_init_value);
+            return buffer;
+        case 1:
+            snprintf(buffer, buffer_len, "Init value 2: 0x%04x", pic_init2_value);
+            return buffer;
+        case 2:
+            snprintf(buffer, buffer_len, "Last button value: 0x%04x Raw value: 0x%04x", last_btn, btn);
+            return buffer;
+        case 3:
+            snprintf(buffer, buffer_len, "Last button differs in ticks: 0x%04x", tick_diff);
+            return buffer;
+        case 4:
+            snprintf(buffer, buffer_len, "Dock values: 0x%04x", nonbtn);
+            return buffer;
+        #define B(n,w,b)    case n: \
+                                    snprintf(buffer, buffer_len, "%s: 0x%04x", w, b); \
+                                    return buffer;
+        B(5,  "MASK_TV_OUT", MASK_TV_OUT(pic_init_value));
+        B(6,  "MASK_xx1",    MASK_xx1(pic_init_value));
+        B(7,  "MASK_xx2",    MASK_xx2(pic_init_value));
+        B(8,  "MASK_xx3",    MASK_xx3(pic_init_value));
+        B(9,  "MASK_xx4",    MASK_xx4(pic_init_value));
+        B(10, "MASK_xx5",    MASK_xx5(pic_init_value));
+        B(11, "MASK_xx6",    MASK_xx6(pic_init_value));
+        B(12, "MASK_xx7",    MASK_xx7(pic_init_value));
+        #undef B
+    }
+    return NULL;
+}
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h b/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h
index 4e3303911c..14ddc6eb0a 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h
+++ b/firmware/target/arm/tms320dm320/creative-zvm/usb-target.h
@@ -22,6 +22,7 @@
 

 #include "dm320.h"

 

+/* General purpose memory region #2 */

 #define ISP1583_IOBASE              0x60FFC000

 #define ISP1583_H_OVERRIDE

 

diff --git a/firmware/target/arm/tms320dm320/debug-dm320.c b/firmware/target/arm/tms320dm320/debug-dm320.c
index abfb5b09bc..23257ddcc6 100755
--- a/firmware/target/arm/tms320dm320/debug-dm320.c
+++ b/firmware/target/arm/tms320dm320/debug-dm320.c
@@ -82,6 +82,13 @@ bool __dbg_hw_info(void)
     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); 
+    lcd_puts(0, line++, "Interrupt info:");
+    snprintf(buf, sizeof(buf), " IO_INTC_EINT0: 0x%04x IO_INTC_EINT1: 0x%04x ", IO_INTC_EINT0, IO_INTC_EINT1);
+    lcd_puts(0, line++, buf); 
+    snprintf(buf, sizeof(buf), " IO_INTC_EINT2: 0x%04x IO_INTC_IRQ0: 0x%04x ", IO_INTC_EINT2, IO_INTC_IRQ0);
+    lcd_puts(0, line++, buf);
+    snprintf(buf, sizeof(buf), " IO_INTC_IRQ1: 0x%04x IO_INTC_IRQ2: 0x%04x ", IO_INTC_IRQ1, IO_INTC_IRQ2);
+    lcd_puts(0, line++, buf);
 #endif
                 
     lcd_puts(0, line++, "Board revision:");
@@ -130,17 +137,6 @@ bool __dbg_hw_info(void)
     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);