7 files changed, 213 insertions, 24 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index 278fcda9d6..711a7c0c56 100644..100755
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -1215,7 +1215,7 @@ target/mips/ingenic_jz47xx/usb-jz4740.c
 drivers/nand_id.c
 #endif
 
-#ifdef ONDA_VX747
+#if defined(ONDA_VX747) || defined(ONDA_VX747P)
 target/mips/ingenic_jz47xx/onda_vx747/backlight-onda_vx747.c
 target/mips/ingenic_jz47xx/onda_vx747/lcd-onda_vx747.c
 target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c
diff --git a/firmware/export/config-ondavx747.h b/firmware/export/config-ondavx747.h
index e92e5a9829..2856e7e16d 100644..100755
--- a/firmware/export/config-ondavx747.h
+++ b/firmware/export/config-ondavx747.h
@@ -161,6 +161,4 @@
 #define USB_VENDOR_ID 0x041e 
 #define USB_PRODUCT_ID 0x4133
 
-#include <stdbool.h> /* HACKY */
-
 #endif
diff --git a/firmware/export/config-ondavx747p.h b/firmware/export/config-ondavx747p.h
new file mode 100755
index 0000000000..5c4d3e7aea
--- /dev/null
+++ b/firmware/export/config-ondavx747p.h
@@ -0,0 +1,164 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2008 by Olivier Barbut
+ *
+ * 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 Onda VX747+
+ */
+#define TARGET_TREE /* this target is using the target tree system */
+
+#define CONFIG_SDRAM_START 0x80004000
+
+#define ONDA_VX747P 1
+
+#define MODEL_NAME  "Onda VX747+"
+
+/* For Rolo and boot loader */
+#define MODEL_NUMBER 44
+
+//#define HAVE_ATA_SD
+//#define HAVE_HOTSWAP
+
+//#define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD)
+#define CONFIG_STORAGE STORAGE_RAMDISK /* Multivolume currently handled at firmware/target/ level */
+
+#define CONFIG_NAND NAND_CC
+
+#define HAVE_MULTIVOLUME
+
+/* define this if you have a bitmap LCD display */
+#define HAVE_LCD_BITMAP
+
+/* 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 have access to the pitchscreen */
+#define HAVE_PITCHSCREEN
+
+/* 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_ONDAVX747
+
+#define LCD_WIDTH  240
+#define LCD_HEIGHT 400
+
+#define LCD_DEPTH  16   /* 16bit colours */
+#define LCD_PIXELFORMAT RGB565 /* rgb565 */
+
+/* Define this if your LCD can be enabled/disabled */
+#define HAVE_LCD_ENABLE
+
+#define CONFIG_KEYPAD ONDAVX747_PAD
+#define HAVE_TOUCHSCREEN
+#define HAVE_BUTTON_DATA
+
+/* Define this if you do software codec */
+#define CONFIG_CODEC SWCODEC
+
+/* define this if you have a real-time clock */
+#define CONFIG_RTC RTC_JZ47XX
+
+/* Define this for LCD backlight available */
+#define HAVE_BACKLIGHT
+
+#define HAVE_BACKLIGHT_BRIGHTNESS
+
+/* Main LCD backlight brightness range and defaults */
+#define MIN_BRIGHTNESS_SETTING          100
+#define MAX_BRIGHTNESS_SETTING          300
+#define DEFAULT_BRIGHTNESS_SETTING      300 /* "full brightness" */
+#define DEFAULT_DIMNESS_SETTING         100 /* "most dim" */
+
+/* Define this if you have a software controlled poweroff */
+//#define HAVE_SW_POWEROFF
+
+/* 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 */
+//#define HAVE_INGENIC_CODEC
+
+#define CONFIG_I2C I2C_JZ47XX
+
+/* 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 */
+
+/* Hardware controlled charging with monitoring */
+//#define CONFIG_CHARGING CHARGING_MONITOR
+
+#ifndef SIMULATOR
+
+/* Define this if you have a Ingenic JZ4732 */
+#define CONFIG_CPU JZ4732
+
+/* define this if the hardware can be powered off while charging */
+#define HAVE_POWEROFF_WHILE_CHARGING
+
+/* Define this to the CPU frequency */
+#define CPU_FREQ 3686400
+
+/* define this if you have a flash memory storage */
+#define HAVE_FLASH_STORAGE
+
+/* Virtual LED (icon) */
+#define CONFIG_LED LED_VIRTUAL
+
+/* define this if the backlight can be set to a brightness */
+#define __BACKLIGHT_INIT
+
+/* Offset ( in the firmware file's header ) to the file CRC */
+#define FIRMWARE_OFFSET_FILE_CRC 0
+
+/* Offset ( in the firmware file's header ) to the real data */
+#define FIRMWARE_OFFSET_FILE_DATA 8
+
+/* Define this if you have adjustable CPU frequency */
+/* #define HAVE_ADJUSTABLE_CPU_FREQ */
+
+#define BOOTFILE_EXT "vx747p"
+#define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
+
+#define CONFIG_USBOTG USBOTG_JZ4740
+#define HAVE_USBSTACK
+#define USB_VENDOR_ID 0x041e 
+#define USB_PRODUCT_ID 0x4133
+
+#endif
diff --git a/firmware/export/config-ondavx767.h b/firmware/export/config-ondavx767.h
index 7a635b50e9..7216ef0d35 100644..100755
--- a/firmware/export/config-ondavx767.h
+++ b/firmware/export/config-ondavx767.h
@@ -33,11 +33,13 @@
 /* For Rolo and boot loader */
 #define MODEL_NUMBER 36
 
-/* define this if you use an ATA controller */
-//#define CONFIG_STORAGE STORAGE_ATA
+//#define HAVE_ATA_SD
+//#define HAVE_HOTSWAP
 
-#define HAVE_ATA_SD
-#define HAVE_HOTSWAP
+//#define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD)
+#define CONFIG_STORAGE STORAGE_RAMDISK /* Multivolume currently handled at firmware/target/ level */
+
+#define CONFIG_NAND NAND_CC
 
 #define HAVE_MULTIVOLUME
 
@@ -152,11 +154,9 @@
 #define BOOTFILE "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/.rockbox"
 
-/*#define CONFIG_USBOTG USBOTG_INGENIC
+#define CONFIG_USBOTG   USBOTG_JZ4740
 #define HAVE_USBSTACK
 #define USB_VENDOR_ID 0x041e 
-#define USB_PRODUCT_ID 0x4133*/
-
-#include <stdbool.h> /* HACKY */
+#define USB_PRODUCT_ID 0x4133
 
 #endif
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 221e9a8124..75aa76a898 100644..100755
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -316,6 +316,8 @@
 #include "config-meizu-m3.h"
 #elif defined(ONDA_VX747)
 #include "config-ondavx747.h"
+#elif defined(ONDA_VX747P)
+#include "config-ondavx747p.h"
 #elif defined(ONDA_VX767)
 #include "config-ondavx767.h"
 #elif defined(SANSA_CLIP)
@@ -634,4 +636,8 @@
 #define STORAGE_GET_INFO
 #endif
 
+#ifdef CPU_MIPS
+#include <stdbool.h> /* MIPS GCC fix? */
+#endif
+
 #endif /* __CONFIG_H__ */
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c b/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c
index 2624eb3d82..1aa98819fe 100644..100755
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c
@@ -27,11 +27,22 @@
 #include "powermgmt.h"
 #include "kernel.h"
 
+#ifdef ONDA_VX747
 #define BTN_OFF      (1 << 29)
 #define BTN_VOL_DOWN (1 << 27)
 #define BTN_HOLD     (1 << 16)
 #define BTN_MENU     (1 << 1)
 #define BTN_VOL_UP   (1 << 0)
+#elif defined(ONDA_VX747P)
+#define BTN_OFF      (1 << 29)
+#define BTN_VOL_DOWN (1 << 27)
+#define BTN_HOLD     (1 << 22)  /* on REG_GPIO_PXPIN(2) */
+#define BTN_MENU     (1 << 20)
+#define BTN_VOL_UP   (1 << 19)
+#else
+#error No buttons defined!
+#endif
+
 #define BTN_MASK     (BTN_OFF | BTN_VOL_DOWN | \
                       BTN_MENU | BTN_VOL_UP)
 
@@ -130,11 +141,19 @@ void button_init_device(void)
     REG_SADC_CTRL = (~(SADC_CTRL_PENDM | SADC_CTRL_PENUM | SADC_CTRL_TSRDYM | SADC_CTRL_PBATRDYM));
     REG_SADC_ENA = (SADC_ENA_TSEN | SADC_ENA_PBATEN);
     
+#ifdef ONDA_VX747
     __gpio_as_input(32*3 + 29);
     __gpio_as_input(32*3 + 27);
     __gpio_as_input(32*3 + 16);
     __gpio_as_input(32*3 + 1);
     __gpio_as_input(32*3 + 0);
+#elif defined(ONDA_VX747P)
+    __gpio_as_input(32*3 + 29);
+    __gpio_as_input(32*3 + 27);
+    __gpio_as_input(32*3 + 20);
+    __gpio_as_input(32*3 + 19);
+    __gpio_as_input(32*2 + 22);
+#endif
     
     mutex_init(&battery_mtx);
 }
@@ -173,7 +192,13 @@ int button_read_device(int *data)
     int ret = 0, tmp;
 
     /* Filter button events out if HOLD button is pressed at firmware/ level */
-    if((~REG_GPIO_PXPIN(3)) & BTN_HOLD)
+    if(
+#ifdef ONDA_VX747
+    (~REG_GPIO_PXPIN(3)) & BTN_HOLD
+#elif defined(ONDA_VX747P)
+    (~REG_GPIO_PXPIN(2)) & BTN_HOLD
+#endif
+    )
         return 0;
 
     tmp = (~REG_GPIO_PXPIN(3)) & BTN_MASK;
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h b/firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h
index c681bdaa12..887d7415d0 100644..100755
--- a/firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h
+++ b/firmware/target/mips/ingenic_jz47xx/onda_vx767/usb-target.h
@@ -24,23 +24,19 @@
 
 #include "config.h"
 
-#define __gpio_as_usb_detect()            \
-do {                                      \
-    REG_GPIO_PXFUNS(3) = 0x10000000;      \
-    REG_GPIO_PXSELS(3) = 0x10000000;      \
-    REG_GPIO_PXPES(3) = 0x10000000;       \
-} while (0)
-
 #define GPIO_UDC_DETE      (32 * 3 + 28)
 #define IRQ_GPIO_UDC_DETE  (IRQ_GPIO_0 + GPIO_UDC_DETE)
 
-static inline void usb_init_gpio(void)
-{
-    __gpio_as_usb_detect();
-    system_enable_irq(IRQ_UDC);
-    __gpio_as_input(GPIO_UDC_DETE);
+#define USB_INIT_GPIO()              \
+{                                    \
+    REG_GPIO_PXFUNS(3) = 0x10000000; \
+    REG_GPIO_PXSELS(3) = 0x10000000; \
+    REG_GPIO_PXPES(3)  = 0x10000000; \
+    __gpio_as_input(GPIO_UDC_DETE);  \
 }
 
+#define USB_DRV_CONNECTED()    (__gpio_get_pin(GPIO_UDC_DETE) == 1)
+
 int usb_detect(void);
 void usb_init_device(void);
 bool usb_drv_connected(void);