Creative Zen Vision: fix config file (?!)

If I'm interpreting the git history correctly,
the config file for Zen Vision was at some point
inadvertently replaced with one for the
Zen Vision:M.

This deletes the currently unused creativezv.h,
and moves its contents into zenvision.h.

The config files appear to be identical except for
CREATIVE_ZV vs CREATIVE_ZVM define, different
keypads (CREATIVEZVM_PAD vs CREATIVEZV_PAD) and
BOOTFILE_EXT (zv vs zvm), a different model name
and number, as well as different LCD dimensions
and DPI.

The buttonmap still seems to require adjustment.

Change-Id: I9a5e65df750db21be5f5a1ed7a80a50706237781

4 files changed, 168 insertions, 167 deletions

diff --git a/firmware/export/config/creativezv.h b/firmware/export/config/creativezv.h
deleted file mode 100644
index f10ef2b83e..0000000000
--- a/firmware/export/config/creativezv.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2008 by Maurus Cuelenaere
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-/*
- * This config file is for the Creative Zen Vision
- */
-
-#define CONFIG_SDRAM_START 0x00900000
-
-#define CREATIVE_ZV 1
-
-#define MODEL_NAME   "Creative Zen Vision"
-
-/* This makes it part of the Creative Zen Vision family :) */
-#define CREATIVE_ZVx 1
-
-/* For Rolo and boot loader */
-#define MODEL_NUMBER 28
-
-/* define this if you use an ATA controller */
-#define CONFIG_STORAGE STORAGE_ATA
-
-/*define this if the ATA controller and method of USB access support LBA48 */
-#define HAVE_LBA48
-
-
-
-
-/* define this if you have a colour LCD */
-#define HAVE_LCD_COLOR
-
-/* define this if you have access to the quickscreen */
-#define HAVE_QUICKSCREEN
-
-/* define this if you would like tagcache to build on this target */
-#define HAVE_TAGCACHE
-
-/* define this if the target has volume keys which can be used in the lists */
-//#define HAVE_VOLUME_IN_LIST
-
-/* LCD dimensions */
-#define CONFIG_LCD LCD_CREATIVEZVM
-
-/* choose the lcd orientation. both work */
-#define CONFIG_ORIENTATION SCREEN_PORTRAIT
-
-#define LCD_WIDTH  640
-#define LCD_HEIGHT 480
-/* sqrt(640^2 + 480^2) / 2.5 = 320.0 */
-#define LCD_DPI 320
-
-#define LCD_DEPTH  16   /* 65k colours */
-#define LCD_PIXELFORMAT RGB565 /* rgb565 */
-
-/* Define this if your LCD can be enabled/disabled */
-#define HAVE_LCD_ENABLE
-
-#define CONFIG_KEYPAD CREATIVEZV_PAD
-#define HAVE_HEADPHONE_DETECTION
-//#define HAVE_TOUCHPAD
-
-/* Define this to enable morse code input */
-#define HAVE_MORSE_INPUT
-
-
-
-
-/* define this if you have a real-time clock */
-//#define CONFIG_RTC RTC_RX5X348AB
-
-/* define this if you have a disk storage, i.e. something
-   that needs spinups and can cause skips when shaked */
-#define HAVE_DISK_STORAGE
-
-/* Define this for LCD backlight available */
-//#define HAVE_BACKLIGHT
-
-//#define HAVE_BACKLIGHT_BRIGHTNESS
-
-/* Main LCD backlight brightness range and defaults */
-//#define MIN_BRIGHTNESS_SETTING          0
-//#define MAX_BRIGHTNESS_SETTING          127
-//#define DEFAULT_BRIGHTNESS_SETTING      85 /* OF "full brightness" */
-//#define DEFAULT_DIMNESS_SETTING         22 /* OF "most dim" */
-
-/* Define this if you have a software controlled poweroff */
-//#define HAVE_SW_POWEROFF
-//TODO: enable this back
-
-/* The number of bytes reserved for loadable codecs */
-#define CODEC_SIZE 0x100000
-
-/* The number of bytes reserved for loadable plugins */
-#define PLUGIN_BUFFER_SIZE 0x100000
-
-/* Define this if you have the TLV320 audio codec -> controlled by the DSP */
-#define HAVE_TLV320
-
-#define CONFIG_I2C I2C_DM320
-
-/* TLV320 has no tone controls, so we use the software ones */
-#define HAVE_SW_TONE_CONTROLS
-
-/*#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | \
-    SAMPR_CAP_11)*/
-
-#define BATTERY_CAPACITY_DEFAULT 1250 /* default battery capacity */
-#define BATTERY_CAPACITY_MIN 500        /* min. capacity selectable */
-#define BATTERY_CAPACITY_MAX 2500        /* max. capacity selectable */
-#define BATTERY_CAPACITY_INC 100         /* capacity increment */
-#define BATTERY_TYPES_COUNT  1          /* only one type */
-
-#define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE
-
-/* Hardware controlled charging with monitoring */
-//#define CONFIG_CHARGING CHARGING_MONITOR
-
-/* Define this if you have a TI TMS320DM320 */
-#define CONFIG_CPU DM320
-
-/* define this if the hardware can be powered off while charging */
-#define HAVE_POWEROFF_WHILE_CHARGING
-
-/* The size of the flash ROM */
-#define FLASH_SIZE 0x400000
-
-/* Define this to the CPU frequency */
-#define CPU_FREQ 16934400
-
-/* Define this if you have ATA power-off control */
-#define HAVE_ATA_POWER_OFF
-
-/* Define this if you have adjustable CPU frequency */
-/* #define HAVE_ADJUSTABLE_CPU_FREQ */
-
-#define BOOTFILE_EXT "zv"
-#define BOOTFILE "rockbox." BOOTFILE_EXT
-#define BOOTDIR "/.rockbox"
-
-#define CONFIG_USBOTG USBOTG_ISP1583
-#define HAVE_USBSTACK
-#define USB_VENDOR_ID 0x041e 
-#define USB_PRODUCT_ID 0x4133
-#define USB_NUM_ENDPOINTS 7
-
-/* Define this if a programmable hotkey is mapped */
-#define HAVE_HOTKEY
diff --git a/firmware/export/config/zenvision.h b/firmware/export/config/zenvision.h
index c2d4b879d3..f10ef2b83e 100644
--- a/firmware/export/config/zenvision.h
+++ b/firmware/export/config/zenvision.h
@@ -1 +1,165 @@
-#include "zenvisionm30gb.h"
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2008 by Maurus Cuelenaere
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+/*
+ * This config file is for the Creative Zen Vision
+ */
+
+#define CONFIG_SDRAM_START 0x00900000
+
+#define CREATIVE_ZV 1
+
+#define MODEL_NAME   "Creative Zen Vision"
+
+/* This makes it part of the Creative Zen Vision family :) */
+#define CREATIVE_ZVx 1
+
+/* For Rolo and boot loader */
+#define MODEL_NUMBER 28
+
+/* define this if you use an ATA controller */
+#define CONFIG_STORAGE STORAGE_ATA
+
+/*define this if the ATA controller and method of USB access support LBA48 */
+#define HAVE_LBA48
+
+
+
+
+/* define this if you have a colour LCD */
+#define HAVE_LCD_COLOR
+
+/* define this if you have access to the quickscreen */
+#define HAVE_QUICKSCREEN
+
+/* define this if you would like tagcache to build on this target */
+#define HAVE_TAGCACHE
+
+/* define this if the target has volume keys which can be used in the lists */
+//#define HAVE_VOLUME_IN_LIST
+
+/* LCD dimensions */
+#define CONFIG_LCD LCD_CREATIVEZVM
+
+/* choose the lcd orientation. both work */
+#define CONFIG_ORIENTATION SCREEN_PORTRAIT
+
+#define LCD_WIDTH  640
+#define LCD_HEIGHT 480
+/* sqrt(640^2 + 480^2) / 2.5 = 320.0 */
+#define LCD_DPI 320
+
+#define LCD_DEPTH  16   /* 65k colours */
+#define LCD_PIXELFORMAT RGB565 /* rgb565 */
+
+/* Define this if your LCD can be enabled/disabled */
+#define HAVE_LCD_ENABLE
+
+#define CONFIG_KEYPAD CREATIVEZV_PAD
+#define HAVE_HEADPHONE_DETECTION
+//#define HAVE_TOUCHPAD
+
+/* Define this to enable morse code input */
+#define HAVE_MORSE_INPUT
+
+
+
+
+/* define this if you have a real-time clock */
+//#define CONFIG_RTC RTC_RX5X348AB
+
+/* define this if you have a disk storage, i.e. something
+   that needs spinups and can cause skips when shaked */
+#define HAVE_DISK_STORAGE
+
+/* Define this for LCD backlight available */
+//#define HAVE_BACKLIGHT
+
+//#define HAVE_BACKLIGHT_BRIGHTNESS
+
+/* Main LCD backlight brightness range and defaults */
+//#define MIN_BRIGHTNESS_SETTING          0
+//#define MAX_BRIGHTNESS_SETTING          127
+//#define DEFAULT_BRIGHTNESS_SETTING      85 /* OF "full brightness" */
+//#define DEFAULT_DIMNESS_SETTING         22 /* OF "most dim" */
+
+/* Define this if you have a software controlled poweroff */
+//#define HAVE_SW_POWEROFF
+//TODO: enable this back
+
+/* The number of bytes reserved for loadable codecs */
+#define CODEC_SIZE 0x100000
+
+/* The number of bytes reserved for loadable plugins */
+#define PLUGIN_BUFFER_SIZE 0x100000
+
+/* Define this if you have the TLV320 audio codec -> controlled by the DSP */
+#define HAVE_TLV320
+
+#define CONFIG_I2C I2C_DM320
+
+/* TLV320 has no tone controls, so we use the software ones */
+#define HAVE_SW_TONE_CONTROLS
+
+/*#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | \
+    SAMPR_CAP_11)*/
+
+#define BATTERY_CAPACITY_DEFAULT 1250 /* default battery capacity */
+#define BATTERY_CAPACITY_MIN 500        /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 2500        /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 100         /* capacity increment */
+#define BATTERY_TYPES_COUNT  1          /* only one type */
+
+#define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE
+
+/* Hardware controlled charging with monitoring */
+//#define CONFIG_CHARGING CHARGING_MONITOR
+
+/* Define this if you have a TI TMS320DM320 */
+#define CONFIG_CPU DM320
+
+/* define this if the hardware can be powered off while charging */
+#define HAVE_POWEROFF_WHILE_CHARGING
+
+/* The size of the flash ROM */
+#define FLASH_SIZE 0x400000
+
+/* Define this to the CPU frequency */
+#define CPU_FREQ 16934400
+
+/* Define this if you have ATA power-off control */
+#define HAVE_ATA_POWER_OFF
+
+/* Define this if you have adjustable CPU frequency */
+/* #define HAVE_ADJUSTABLE_CPU_FREQ */
+
+#define BOOTFILE_EXT "zv"
+#define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
+
+#define CONFIG_USBOTG USBOTG_ISP1583
+#define HAVE_USBSTACK
+#define USB_VENDOR_ID 0x041e 
+#define USB_PRODUCT_ID 0x4133
+#define USB_NUM_ENDPOINTS 7
+
+/* Define this if a programmable hotkey is mapped */
+#define HAVE_HOTKEY
diff --git a/firmware/target/arm/system-arm.h b/firmware/target/arm/system-arm.h
index 985ab3fa62..2695c77cd3 100644
--- a/firmware/target/arm/system-arm.h
+++ b/firmware/target/arm/system-arm.h
@@ -110,7 +110,7 @@ static inline int set_interrupt_status(int status, int mask)
     unsigned long cpsr;
     int oldstatus;
     /* Read the old levels and set the new ones */
-#if defined(CREATIVE_ZVM) && defined(BOOTLOADER)
+#if (defined(CREATIVE_ZVM) ||defined(CREATIVE_ZV)) && defined(BOOTLOADER)
 // FIXME:  This workaround is for a problem with inlining;
 // for some reason 'mask' gets treated as a variable/non-immediate constant
 // but only on this build.  All others (including the nearly-identical mrobe500boot) are fine
diff --git a/uisimulator/buttonmap/SOURCES b/uisimulator/buttonmap/SOURCES
index 8ba566150a..cb0d876e9d 100644
--- a/uisimulator/buttonmap/SOURCES
+++ b/uisimulator/buttonmap/SOURCES
@@ -33,6 +33,8 @@ mrobe100.c
 cowon-d2.c
 #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
 creative-zvm.c
+#elif CONFIG_KEYPAD == CREATIVEZV_PAD
+creative-zv.c
 #elif CONFIG_KEYPAD == MEIZU_M6SL_PAD
 meizu-m6sl.c
 #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD