Rockbox Utility: add preliminary support for installing the bootloader (+ dual boot) on ChinaChip targets
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22356 a1c6a512-1295-4272-9138-f99709370657
diff --git a/rbutil/chinachippatcher/Makefile b/rbutil/chinachippatcher/Makefile
new file mode 100644
index 0000000..e19052a
--- /dev/null
+++ b/rbutil/chinachippatcher/Makefile
@@ -0,0 +1,10 @@
+CFLAGS=-g -Wall -DSTANDALONE
+CC=gcc
+
+all: chinachip
+
+chinachip: chinachip.c
+ $(CC) $(CFLAGS) -o $@ $^
+
+clean:
+ rm -f chinachip
diff --git a/rbutil/chinachippatcher/chinachip.c b/rbutil/chinachippatcher/chinachip.c
new file mode 100644
index 0000000..e7d4095
--- /dev/null
+++ b/rbutil/chinachippatcher/chinachip.c
@@ -0,0 +1,310 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2009 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.
+ *
+ ****************************************************************************/
+#include <stdio.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <time.h>
+#include "chinachip.h"
+
+/* From http://www.rockbox.org/wiki/ChinaChip */
+struct header
+{
+ uint32_t signature; /* WADF */
+ uint32_t unk;
+ int8_t timestamp[12]; /* 200805081100 */
+ uint32_t size;
+ uint32_t checksum;
+ uint32_t unk2;
+ int8_t identifier[32]; /* Chinachip PMP firmware V1.0 */
+} __attribute__ ((packed));
+
+static inline void int2le(unsigned char* addr, unsigned int val)
+{
+ addr[0] = val & 0xff;
+ addr[1] = (val >> 8) & 0xff;
+ addr[2] = (val >> 16) & 0xff;
+ addr[3] = (val >> 24) & 0xff;
+}
+
+static inline unsigned int le2int(unsigned char* buf)
+{
+ return (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
+}
+
+static long int filesize(FILE* fd)
+{
+ long int len;
+ fseek(fd, 0, SEEK_END);
+ len = ftell(fd);
+ fseek(fd, 0, SEEK_SET);
+ return len;
+}
+
+#ifdef STANDALONE
+#define ERR(fmt, ...) err(userdata, "[ERR] "fmt"\n", ##__VA_ARGS__)
+#define INFO(fmt, ...) info(userdata, "[INFO] "fmt"\n", ##__VA_ARGS__)
+#define tr(x) x
+#else
+#define ERR(fmt, ...) err(userdata, fmt, ##__VA_ARGS__)
+#define INFO(fmt, ...) info(userdata, fmt, ##__VA_ARGS__)
+#endif
+#define FCLOSE(fd) fclose(fd); fd = NULL;
+#define CCPMPBIN_HEADER_SIZE (sizeof(uint32_t)*2 + sizeof(uint8_t) + 9)
+#define TOTAL_SIZE (fsize + CCPMPBIN_HEADER_SIZE + bsize)
+int chinachip_patch(const char* firmware, const char* bootloader,
+ const char* output, const char* ccpmp_backup,
+ void (*info)(void*, char*, ...),
+ void (*err)(void*, char*, ...),
+ void* userdata)
+{
+ char header_time[13];
+ time_t cur_time;
+ struct tm* time_info;
+ unsigned char* buf = NULL;
+ FILE *fd = NULL, *bd = NULL, *od = NULL;
+ unsigned int ccpmp_size = 0, i, fsize, bsize;
+ signed int checksum = 0, ccpmp_pos;
+
+ fd = fopen(firmware, "rb");
+ if(!fd)
+ {
+ ERR("Can't open file %s!", firmware);
+ goto err;
+ }
+ bd = fopen(bootloader, "rb");
+ if(!bd)
+ {
+ ERR("Can't open file %s!", bootloader);
+ goto err;
+ }
+
+ bsize = filesize(bd);
+ INFO("Bootloader size is %d bytes", bsize);
+ FCLOSE(bd);
+
+ fsize = filesize(fd);
+ INFO("Firmware size is %d bytes", fsize);
+
+ buf = malloc(TOTAL_SIZE);
+ if(buf == NULL)
+ {
+ ERR("Can't allocate %d bytes!", fsize);
+ goto err;
+ }
+ memset(buf, 0, TOTAL_SIZE);
+
+ INFO("Reading %s into memory...", firmware);
+ if(fread(buf, fsize, 1, fd) != 1)
+ {
+ ERR("Can't read file %s to memory!", firmware);
+ goto err;
+ }
+ FCLOSE(fd);
+
+ if(memcmp(buf, "WADF", 4))
+ {
+ ERR("File %s isn't a valid ChinaChip firmware!", firmware);
+ goto err;
+ }
+
+ ccpmp_pos = -1, i = 0x40;
+ do
+ {
+ int filenamesize = le2int(&buf[i]);
+ i += sizeof(uint32_t);
+
+ if(!strncmp((char*) &buf[i], "ccpmp.bin", 9))
+ {
+ ccpmp_pos = i;
+ ccpmp_size = le2int(&buf[i + sizeof(uint8_t) + filenamesize]);
+ }
+ else
+ i += filenamesize + le2int(&buf[i + sizeof(uint8_t) + filenamesize])
+ + sizeof(uint32_t) + sizeof(uint8_t);
+ } while(ccpmp_pos < 0 && i < fsize);
+
+ if(i >= fsize)
+ {
+ ERR("Couldn't find ccpmp.bin in %s!", firmware);
+ goto err;
+ }
+ INFO("Found ccpmp.bin at %d bytes", ccpmp_pos);
+
+ if(ccpmp_backup)
+ {
+ bd = fopen(ccpmp_backup, "wb");
+ if(!bd)
+ {
+ ERR("Can't open file %s!", ccpmp_backup);
+ goto err;
+ }
+
+ INFO("Writing %d bytes to %s...", ccpmp_size, ccpmp_backup);
+ if(fwrite(&buf[ccpmp_pos], ccpmp_size, 1, bd) != 1)
+ {
+ ERR("Can't write to file %s!", ccpmp_backup);
+ goto err;
+ }
+ FCLOSE(bd);
+ }
+
+ INFO("Renaming it to ccpmp.old...");
+ buf[ccpmp_pos + 6] = 'o';
+ buf[ccpmp_pos + 7] = 'l';
+ buf[ccpmp_pos + 8] = 'd';
+
+ bd = fopen(bootloader, "rb");
+ if(!bd)
+ {
+ ERR("Can't open file %s!", bootloader);
+ goto err;
+ }
+
+ /* Also include path size */
+ ccpmp_pos -= sizeof(uint32_t);
+
+ INFO("Making place for ccpmp.bin...");
+ memmove(&buf[ccpmp_pos + bsize + CCPMPBIN_HEADER_SIZE],
+ &buf[ccpmp_pos], fsize - ccpmp_pos);
+
+ INFO("Reading %s into memory...", bootloader);
+ if(fread(&buf[ccpmp_pos + CCPMPBIN_HEADER_SIZE],
+ bsize, 1, bd) != 1)
+ {
+ ERR("Can't read file %s to memory!", bootloader);
+ goto err;
+ }
+ FCLOSE(bd);
+
+ INFO("Adding header to %s...", bootloader);
+ int2le(&buf[ccpmp_pos ], 9); /* Pathname Size */
+ memcpy(&buf[ccpmp_pos + 4 ], "ccpmp.bin", 9); /* Pathname */
+ memset(&buf[ccpmp_pos + 4 + 9 ], 0x20, sizeof(uint8_t)); /* File Type */
+ int2le(&buf[ccpmp_pos + 4 + 9 + 1], bsize); /* File Size */
+
+ time(&cur_time);
+ time_info = localtime(&cur_time);
+ if(time_info == NULL)
+ {
+ ERR("Can't obtain current time!");
+ goto err;
+ }
+
+ snprintf(header_time, 13, "%04d%02d%02d%02d%02d", time_info->tm_year + 1900,
+ time_info->tm_mon,
+ time_info->tm_mday,
+ time_info->tm_hour,
+ time_info->tm_min);
+
+ INFO("Computing checksum...");
+ for(i = sizeof(struct header); i < TOTAL_SIZE; i+=4)
+ checksum += le2int(&buf[i]);
+
+ INFO("Updating main header...");
+ memcpy(&buf[offsetof(struct header, timestamp)], header_time, 12);
+ int2le(&buf[offsetof(struct header, size) ], TOTAL_SIZE);
+ int2le(&buf[offsetof(struct header, checksum) ], checksum);
+
+ od = fopen(output, "wb");
+ if(!od)
+ {
+ ERR("Can't open file %s!", output);
+ goto err;
+ }
+
+ INFO("Writing output to %s...", output);
+ if(fwrite(buf, TOTAL_SIZE, 1, od) != 1)
+ {
+ ERR("Can't write to file %s!", output);
+ goto err;
+ }
+ fclose(od);
+ free(buf);
+
+ return 0;
+
+err:
+ if(buf)
+ free(buf);
+ if(fd)
+ fclose(fd);
+ if(bd)
+ fclose(bd);
+ if(od)
+ fclose(od);
+
+ return -1;
+}
+
+
+#ifdef STANDALONE
+
+#define VERSION "0.1"
+#define PRINT(fmt, ...) fprintf(stderr, fmt"\n", ##__VA_ARGS__)
+
+static void info(void* userdata, char* fmt, ...)
+{
+ (void)userdata;
+ va_list args;
+ va_start(args, fmt);
+ vfprintf(stderr, fmt, args);
+ va_end(args);
+}
+
+static void err(void* userdata, char* fmt, ...)
+{
+ (void)userdata;
+ va_list args;
+ va_start(args, fmt);
+ vfprintf(stderr, fmt, args);
+ va_end(args);
+}
+
+void usage(char* name)
+{
+ PRINT("Usage:");
+ PRINT(" %s <firmware> <bootloader> <firmware_output> [backup]", name);
+ PRINT("\nExample:");
+ PRINT(" %s VX747.HXF bootloader.bin output.HXF ccpmp.bak", name);
+ PRINT(" This will copy ccpmp.bin in VX747.HXF as ccpmp.old and replace it"
+ " with bootloader.bin, the output will get written to output.HXF."
+ " The old ccpmp.bin will get written to ccpmp.bak.");
+}
+
+int main(int argc, char* argv[])
+{
+ PRINT("ChinaChipPatcher v" VERSION " - (C) Maurus Cuelenaere 2009");
+ PRINT("This is free software; see the source for copying conditions. There is NO");
+ PRINT("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n");
+
+ if(argc < 4)
+ {
+ usage(argv[0]);
+ return 1;
+ }
+
+ return chinachip_patch(argv[1], argv[2], argv[3], argc > 4 ? argv[4] : NULL,
+ &info, &err, NULL);
+}
+#endif
diff --git a/rbutil/chinachippatcher/chinachip.h b/rbutil/chinachippatcher/chinachip.h
new file mode 100644
index 0000000..2f8ba9e
--- /dev/null
+++ b/rbutil/chinachippatcher/chinachip.h
@@ -0,0 +1,39 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2009 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.
+ *
+ ****************************************************************************/
+
+#ifndef __INCLUDE_CHINACHIP_H_
+#define __INCLUDE_CHINACHIP_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int chinachip_patch(const char* firmware, const char* bootloader,
+ const char* output, const char* ccpmp_backup,
+ void (*info)(void*, char*, ...),
+ void (*err)(void*, char*, ...),
+ void* userdata);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __INCLUDE_CHINACHIP_H_ */
diff --git a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp b/rbutil/rbutilqt/base/bootloaderinstallbase.cpp
index 5ce735a..a4cf22a 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallbase.cpp
@@ -155,7 +155,8 @@
msg += "<ol>";
msg += tr("<li>Safely remove your player.</li>");
- if(model == "h100" || model == "h120" || model == "h300") {
+ if(model == "h100" || model == "h120" || model == "h300" ||
+ model == "ondavx747") {
hint = true;
msg += tr("<li>Reboot your player into the original firmware.</li>"
"<li>Perform a firmware upgrade using the update functionality "
diff --git a/rbutil/rbutilqt/base/bootloaderinstallchinachip.cpp b/rbutil/rbutilqt/base/bootloaderinstallchinachip.cpp
new file mode 100644
index 0000000..dba2ec8
--- /dev/null
+++ b/rbutil/rbutilqt/base/bootloaderinstallchinachip.cpp
@@ -0,0 +1,117 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ *
+ * Copyright (C) 2009 by Maurus Cuelenaere
+ * $Id$
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include <QtCore>
+#include "bootloaderinstallbase.h"
+#include "bootloaderinstallchinachip.h"
+
+#include "../chinachippatcher/chinachip.h"
+
+BootloaderInstallChinaChip::BootloaderInstallChinaChip(QObject *parent)
+ : BootloaderInstallBase(parent)
+{
+ (void)parent;
+}
+
+QString BootloaderInstallChinaChip::ofHint()
+{
+ return tr("Bootloader installation requires you to provide "
+ "a firmware file of the original firmware (HXF file). "
+ "You need to download this file yourself due to legal "
+ "reasons. Please refer to the "
+ "<a href='http://www.rockbox.org/manual.shtml'>manual</a> and the "
+ "<a href='http://www.rockbox.org/wiki/OndaVX747"
+ "#Download_and_extract_a_recent_ve'>OndaVX747</a> wiki page on "
+ "how to obtain this file.<br/>"
+ "Press Ok to continue and browse your computer for the firmware "
+ "file.");
+}
+
+void BootloaderInstallChinaChip::logString(char* format, va_list args, int type)
+{
+ QString buffer;
+
+ emit logItem(buffer.vsprintf(format, args), type);
+ QCoreApplication::processEvents();
+}
+
+static void info(void* userdata, char* format, ...)
+{
+ BootloaderInstallChinaChip* pThis = (BootloaderInstallChinaChip*) userdata;
+ va_list args;
+
+ va_start(args, format);
+ pThis->logString(format, args, LOGINFO);
+ va_end(args);
+}
+
+static void err(void* userdata, char* format, ...)
+{
+ BootloaderInstallChinaChip* pThis = (BootloaderInstallChinaChip*) userdata;
+ va_list args;
+
+ va_start(args, format);
+ pThis->logString(format, args, LOGERROR);
+ va_end(args);
+}
+
+bool BootloaderInstallChinaChip::install()
+{
+ if(m_offile.isEmpty())
+ return false;
+
+ emit logItem(tr("Downloading bootloader file"), LOGINFO);
+
+ connect(this, SIGNAL(downloadDone()), this, SLOT(installStage2()));
+ downloadBlStart(m_blurl);
+
+ return true;
+}
+
+void BootloaderInstallChinaChip::installStage2()
+{
+ m_tempfile.open();
+ QString blfile = m_tempfile.fileName();
+ m_tempfile.close();
+
+ QString backupfile = QFileInfo(m_blfile).absoluteDir().absoluteFilePath("ccpmp.bin");
+
+ int ret = chinachip_patch(m_offile.toLocal8Bit(), blfile.toLocal8Bit(), m_blfile.toLocal8Bit(),
+ backupfile.toLocal8Bit(), &info, &err, (void*)this);
+ qDebug() << "chinachip_patch" << ret;
+
+ emit done(ret);
+}
+
+bool BootloaderInstallChinaChip::uninstall()
+{
+ /* TODO: only way is to restore the OF */
+ return false;
+}
+
+BootloaderInstallBase::BootloaderType BootloaderInstallChinaChip::installed()
+{
+ /* TODO: find a way to figure this out */
+ return BootloaderUnknown;
+}
+
+BootloaderInstallBase::Capabilities BootloaderInstallChinaChip::capabilities()
+{
+ return (Install | IsFile | NeedsOf);
+}
diff --git a/rbutil/rbutilqt/base/bootloaderinstallchinachip.h b/rbutil/rbutilqt/base/bootloaderinstallchinachip.h
new file mode 100644
index 0000000..292799c
--- /dev/null
+++ b/rbutil/rbutilqt/base/bootloaderinstallchinachip.h
@@ -0,0 +1,43 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ *
+ * Copyright (C) 2009 by Maurus Cuelenaere
+ * $Id$
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#ifndef BOOTLOADERINSTALLCCPMP_H
+#define BOOTLOADERINSTALLCCPMP_H
+
+#include <QtCore>
+#include "bootloaderinstallbase.h"
+
+class BootloaderInstallChinaChip : public BootloaderInstallBase
+{
+ Q_OBJECT
+
+ public:
+ BootloaderInstallChinaChip(QObject *parent = 0);
+ bool install(void);
+ bool uninstall(void);
+ BootloaderInstallBase::BootloaderType installed(void);
+ Capabilities capabilities(void);
+ QString ofHint();
+ void logString(char* buffer, va_list args, int type);
+
+ private slots:
+ void installStage2(void);
+};
+
+#endif // BOOTLOADERINSTALLCCPMP_H
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index 739a5d2..91770d7 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -43,6 +43,7 @@
platform32=iaudiox5v
platform33=iaudiom3
platform40=gigabeatf
+platform44=ondavx747
platform50=sansae200
platform51=sansac200
platform52=sansae200v2
@@ -481,6 +482,19 @@
targetid=33
encoder=rbspeex
+[ondavx747]
+name=VX747
+buildserver_modelname=ondavx747
+bootloadermethod=chinachip
+bootloadername=/onda/vx747/ccpmp.bin
+bootloaderfile=/SG301.HXF
+manualname=
+brand=Onda
+usbid=0x07c4a4a5
+configure_modelname=ondavx747
+targetid=44
+encoder=rbspeex
+
[smsgyh820]
name="YH-820"
buildserver_modelname=yh820
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index b0684f7..ec06955 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -45,6 +45,7 @@
#include "bootloaderinstallipod.h"
#include "bootloaderinstallsansa.h"
#include "bootloaderinstallfile.h"
+#include "bootloaderinstallchinachip.h"
#include "bootloaderinstallams.h"
@@ -659,6 +660,9 @@
else if(type == "file") {
bl = new BootloaderInstallFile(this);
}
+ else if(type == "chinachip") {
+ bl = new BootloaderInstallChinaChip(this);
+ }
else if(type == "ams") {
bl = new BootloaderInstallAms(this);
}
@@ -1213,3 +1217,4 @@
return error;
}
+
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index cf7f944..78c399e 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -77,6 +77,7 @@
base/autodetection.cpp \
../ipodpatcher/ipodpatcher.c \
../sansapatcher/sansapatcher.c \
+ ../chinachippatcher/chinachip.c \
browsedirtree.cpp \
themesinstallwindow.cpp \
base/uninstall.cpp \
@@ -103,6 +104,7 @@
base/bootloaderinstallipod.cpp \
base/bootloaderinstallsansa.cpp \
base/bootloaderinstallfile.cpp \
+ base/bootloaderinstallchinachip.cpp \
base/bootloaderinstallams.cpp \
../../tools/mkboot.c \
../../tools/iriver.c
@@ -129,6 +131,7 @@
../ipodpatcher/parttypes.h \
../sansapatcher/sansapatcher.h \
../sansapatcher/sansaio.h \
+ ../chinachippatcher/chinachip.h \
irivertools/h100sums.h \
irivertools/h120sums.h \
irivertools/h300sums.h \
@@ -158,6 +161,7 @@
base/bootloaderinstallipod.h \
base/bootloaderinstallsansa.h \
base/bootloaderinstallfile.h \
+ base/bootloaderinstallchinachip.h \
base/bootloaderinstallams.h \
../../tools/mkboot.h \
../../tools/iriver.h