From e49ffb23fc36e8a2ed468c7679219fe42da61889 Mon Sep 17 00:00:00 2001
From: Maurus Cuelenaere <mcuelenaere@gmail.com>
Date: Sun, 16 Aug 2009 21:03:22 +0000
Subject: [PATCH] * Onda VX747/VX767: fix target_id & MODEL_NUMBER * Add
 support to Rockbox Utility for Onda VX747+ & VX777

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22359 a1c6a512-1295-4272-9138-f99709370657
---
 firmware/export/config-ondavx767.h |  2 +-
 rbutil/rbutilqt/rbutil.ini         | 30 +++++++++++++++++++++++++++++-
 tools/configure                    |  4 ++--
 tools/scramble.c                   |  6 ++++--
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/firmware/export/config-ondavx767.h b/firmware/export/config-ondavx767.h
index d4873370dd..1d005b1d32 100644
--- a/firmware/export/config-ondavx767.h
+++ b/firmware/export/config-ondavx767.h
@@ -31,7 +31,7 @@
 #define MODEL_NAME  "Onda VX767"
 
 /* For Rolo and boot loader */
-#define MODEL_NUMBER 36
+#define MODEL_NUMBER 64
 
 //#define HAVE_ATA_SD
 //#define HAVE_HOTSWAP
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index 91770d72b3..61d14fa6a5 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -44,6 +44,8 @@ platform32=iaudiox5v
 platform33=iaudiom3
 platform40=gigabeatf
 platform44=ondavx747
+platform45=ondavx747p
+platform46=ondavx777
 platform50=sansae200
 platform51=sansac200
 platform52=sansae200v2
@@ -492,7 +494,33 @@ manualname=
 brand=Onda
 usbid=0x07c4a4a5
 configure_modelname=ondavx747
-targetid=44
+targetid=45
+encoder=rbspeex
+
+[ondavx747p]
+name=VX747+
+buildserver_modelname=ondavx747p
+bootloadermethod=chinachip
+bootloadername=/onda/vx747p/ccpmp.bin
+bootloaderfile=/SG301.HXF
+manualname=
+brand=Onda
+usbid=0x07c4a4a5
+configure_modelname=ondavx747p
+targetid=54
+encoder=rbspeex
+
+[ondavx777]
+name=VX777
+buildserver_modelname=ondavx777
+bootloadermethod=chinachip
+bootloadername=/onda/vx777/ccpmp.bin
+bootloaderfile=/VX777.HXF
+manualname=
+brand=Onda
+usbid=0x07c4a4a5
+configure_modelname=ondavx777
+targetid=61
 encoder=rbspeex
 
 [smsgyh820]
diff --git a/tools/configure b/tools/configure
index b7fa988d11..486a4706db 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2148,7 +2148,7 @@ fi
     ;;
     
     120|ondavx747)
-    target_id=44
+    target_id=45
     modelname="ondavx747"
     target="-DONDA_VX747"
     memory=16
@@ -2170,7 +2170,7 @@ fi
     ;;
     
     121|ondavx767)
-    target_id=45
+    target_id=64
     modelname="ondavx767"
     target="-DONDA_VX767"
     memory=16 #FIXME
diff --git a/tools/scramble.c b/tools/scramble.c
index 5d2b12fb84..ce06523db5 100644
--- a/tools/scramble.c
+++ b/tools/scramble.c
@@ -304,8 +304,6 @@ int main (int argc, char** argv)
             modelnum = 45;
         else if (!strcmp(&argv[1][5], "747p"))
             modelnum = 54;
-        else if (!strcmp(&argv[1][5], "x777"))
-            modelnum = 61;
         else if (!strcmp(&argv[1][5], "y820")) /* Samsung YH-820 */
             modelnum = 57;
         else if (!strcmp(&argv[1][5], "y920")) /* Samsung YH-920 */
@@ -314,6 +312,10 @@ int main (int argc, char** argv)
             modelnum = 59;
         else if (!strcmp(&argv[1][5], "clv2")) /* Sansa Clipv2 */
             modelnum = 60;
+        else if (!strcmp(&argv[1][5], "x777"))
+            modelnum = 61;
+        else if (!strcmp(&argv[1][5], "x767"))
+            modelnum = 64;
         else {
             fprintf(stderr, "unsupported model: %s\n", &argv[1][5]);
             return 2;