6 files changed, 20 insertions, 17 deletions

diff --git a/firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c
index 76c8869f50..1d71dadc37 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c
+++ b/firmware/target/arm/tms320dm320/creative-zvm/pic-creativezvm.c
@@ -25,10 +25,14 @@
 #include "button-target.h"
 #include "i2c-dm320.h"
 
+#define BUTTON_DEBUG
+
+#ifdef BUTTON_DEBUG
 #include "lcd-target.h"
 #include "lcd.h"
 #include "sprintf.h"
 #include "font.h"
+#endif
 
 #ifndef ZEN_VISION
 /* Creative Zen Vision:M */
@@ -189,7 +193,6 @@ void GIO0(void)
     if(tick_diff >= TICK_MIN && tick_diff <= TICK_MAX)
     {
         /* Ignore this, as it is a hold event */
-        IO_INTC_IRQ1 = INTR_IRQ1_EXT0;
         return;
     }
     last_btn = btn_press;
@@ -271,8 +274,8 @@ void GIO0(void)
 #endif
 }
 
-void send_command_to_pic(unsigned char in, unsigned char* out,
-                         unsigned int length)
+void send_command_to_pic(const unsigned char in, unsigned char* out,
+                         const unsigned int length)
 {
     /* Disable GIO0 interrupt */
     IO_INTC_EINT1 &= ~INTR_EINT1_EXT0;
diff --git a/firmware/target/arm/tms320dm320/crt0.S b/firmware/target/arm/tms320dm320/crt0.S
index 5729357f12..a0b5a5abfb 100755
--- a/firmware/target/arm/tms320dm320/crt0.S
+++ b/firmware/target/arm/tms320dm320/crt0.S
@@ -153,7 +153,7 @@ start:
     msr    cpsr_c, #0xd3
     ldr    sp, =stackend
     
-#if defined(BOOTLOADER) && !defined(CREATIVE_ZVM)
+#if defined(BOOTLOADER) && !defined(CREATIVE_ZVx)
     /* get the high part of our execute address */
     ldr    r2, =0xffffff00
     and    r4, pc, r2
diff --git a/firmware/target/arm/tms320dm320/debug-dm320.c b/firmware/target/arm/tms320dm320/debug-dm320.c
index 23257ddcc6..894f99c88d 100755
--- a/firmware/target/arm/tms320dm320/debug-dm320.c
+++ b/firmware/target/arm/tms320dm320/debug-dm320.c
@@ -34,7 +34,7 @@ bool __dbg_ports(void)
     return false;
 }
 
-#ifndef CREATIVE_ZVM
+#ifndef CREATIVE_ZVx
 extern char r_buffer[5];
 extern int r_button;
 #endif
@@ -42,7 +42,7 @@ bool __dbg_hw_info(void)
 {
     int line = 0, oldline;
         int button;
-#ifndef CREATIVE_ZVM
+#ifndef CREATIVE_ZVx
     int *address=0x0;
 #endif
     bool done=false;
@@ -103,14 +103,14 @@ bool __dbg_hw_info(void)
                                         lcd_puts(0, line++, " Unknown DM320 Chip ID");
         }
 
-#ifndef CREATIVE_ZVM
+#ifndef CREATIVE_ZVx
     line++;
 #endif
     oldline=line;
     while(!done)
     {
         line = oldline;
-#ifndef CREATIVE_ZVM
+#ifndef CREATIVE_ZVx
         button = button_get(false);
         button&=~BUTTON_REPEAT;
         if (button == BUTTON_POWER)
@@ -145,7 +145,7 @@ bool __dbg_hw_info(void)
         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
+#ifndef CREATIVE_ZVx
         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",
diff --git a/firmware/target/arm/tms320dm320/spi-dm320.c b/firmware/target/arm/tms320dm320/spi-dm320.c
index a7b4fc678e..6375298c0f 100644
--- a/firmware/target/arm/tms320dm320/spi-dm320.c
+++ b/firmware/target/arm/tms320dm320/spi-dm320.c
@@ -43,7 +43,7 @@ struct SPI_info {
 
 struct SPI_info spi_targets[] =
 {
-#ifndef CREATIVE_ZVM
+#ifndef CREATIVE_ZVx
     [SPI_target_TSC2100]   = { &IO_GIO_BITCLR1, &IO_GIO_BITSET1, GIO_TS_ENABLE },
     [SPI_target_RX5X348AB] = { &IO_GIO_BITSET0, &IO_GIO_BITCLR0, GIO_RTC_ENABLE},
     [SPI_target_BACKLIGHT] = { &IO_GIO_BITCLR1, &IO_GIO_BITSET1, GIO_BL_ENABLE },
@@ -106,7 +106,7 @@ void spi_init(void)
     IO_SERIAL0_MODE |= IO_SERIAL0_MODE_SCLK;
     /* Enable TX */
     IO_SERIAL0_TX_ENABLE = 0x0001;
-#ifndef CREATIVE_ZVM
+#ifndef CREATIVE_ZVx
     /* Set GIO 18 to output for touch screen slave enable */
     IO_GIO_DIR1 &= ~GIO_TS_ENABLE;
     /* Set GIO 12 to output for rtc slave enable */
diff --git a/firmware/target/arm/tms320dm320/spi-target.h b/firmware/target/arm/tms320dm320/spi-target.h
index 704867d92b..10da048792 100644
--- a/firmware/target/arm/tms320dm320/spi-target.h
+++ b/firmware/target/arm/tms320dm320/spi-target.h
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 
 enum SPI_target {
-#ifndef CREATIVE_ZVM
+#ifndef CREATIVE_ZVx
     SPI_target_TSC2100 = 0,
     SPI_target_RX5X348AB,
     SPI_target_BACKLIGHT,
diff --git a/firmware/target/arm/tms320dm320/system-dm320.c b/firmware/target/arm/tms320dm320/system-dm320.c
index 234d13c743..ac7df30121 100644
--- a/firmware/target/arm/tms320dm320/system-dm320.c
+++ b/firmware/target/arm/tms320dm320/system-dm320.c
@@ -24,7 +24,7 @@
 #include "uart-target.h"
 #include "system-arm.h"
 #include "spi.h"
-#ifdef CREATIVE_ZVM
+#ifdef CREATIVE_ZVx
 #include "dma-target.h"
 #endif
 
@@ -224,7 +224,7 @@ void system_init(void)
     IO_TIMER2_TMMD = CONFIG_TIMER2_TMMD_STOP;
     IO_TIMER3_TMMD = CONFIG_TIMER3_TMMD_STOP;
 
-#ifndef CREATIVE_ZVM
+#ifndef CREATIVE_ZVx
     /* set GIO26 (reset pin) to output and low */
     IO_GIO_BITCLR1=(1<<10);
     IO_GIO_DIR1&=~(1<<10);
@@ -233,7 +233,7 @@ void system_init(void)
     uart_init();
     spi_init();
     
-#ifdef CREATIVE_ZVM
+#ifdef CREATIVE_ZVx
     dma_init();
 #endif
  
@@ -245,8 +245,8 @@ void system_init(void)
     map_section(CONFIG_SDRAM_START, CONFIG_SDRAM_START, MEM, CACHE_ALL);
     /* enable buffered writing for the framebuffer */
     map_section((int)FRAME, (int)FRAME, 1, BUFFERED);
-#ifdef CREATIVE_ZVM
-    //mimic OF
+#ifdef CREATIVE_ZVx
+    /* mimic OF */
     map_section(0x00100000, 0x00100000,  4, CACHE_NONE);
     map_section(0x04700000, 0x04700000,  2,   BUFFERED);
     map_section(0x40000000, 0x40000000, 16, CACHE_NONE);