diff options
| -rw-r--r-- | bootloader/SOURCES | 6 | ||||
| -rw-r--r-- | bootloader/e200.c | 190 | ||||
| -rw-r--r-- | bootloader/main-pp.c (renamed from bootloader/h10.c) | 26 | ||||
| -rw-r--r-- | firmware/SOURCES | 6 | ||||
| -rw-r--r-- | firmware/boot.lds | 2 | ||||
| -rw-r--r-- | firmware/export/config-e200.h | 1 | ||||
| -rw-r--r-- | firmware/export/config-h10.h | 1 | ||||
| -rw-r--r-- | firmware/export/config-h10_5gb.h | 1 | ||||
| -rw-r--r-- | firmware/rolo.c | 5 | ||||
| -rw-r--r-- | firmware/target/arm/crt0-pp-bl.S | 179 | ||||
| -rw-r--r-- | firmware/target/arm/crt0-pp.S | 135 | ||||
| -rwxr-xr-x | tools/configure | 4 | ||||
| -rw-r--r-- | tools/scramble.c | 4 |
13 files changed, 239 insertions, 321 deletions
diff --git a/bootloader/SOURCES b/bootloader/SOURCES index 94f5a60e6b..b86365b429 100644 --- a/bootloader/SOURCES +++ b/bootloader/SOURCES @@ -2,10 +2,8 @@ ipod.c #elif defined(GIGABEAT_F) gigabeat.c -#elif defined(SANSA_E200) -e200.c -#elif defined(IRIVER_H10) || defined(IRIVER_H10_5GB) -h10.c +#elif defined(IRIVER_H10) || defined(IRIVER_H10_5GB) || defined(SANSA_E200) +main-pp.c #elif defined(ELIO_TPJ1022) tpj1022.c #else diff --git a/bootloader/e200.c b/bootloader/e200.c deleted file mode 100644 index 27b1118a1c..0000000000 --- a/bootloader/e200.c +++ /dev/null @@ -1,190 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 Daniel Stenberg - * - * 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 "config.h" - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include "cpu.h" -#include "system.h" -#include "lcd.h" -#include "kernel.h" -#include "thread.h" -#include "ata.h" -#include "fat.h" -#include "disk.h" -#include "font.h" -#include "adc.h" -#include "backlight.h" -#include "panic.h" -#include "power.h" -#include "file.h" - -static inline void blink(void) -{ - volatile unsigned int* ptr; - int i; - ptr = (volatile unsigned int*)0x70000020; - - *ptr &= ~(1 << 13); - for(i = 0; i < 0xfffff; i++) - { - } - *ptr |= (1 << 13); - for(i = 0; i < 0xfffff; i++) - { - } -} - -static inline void slow_blink(void) -{ - volatile unsigned int* ptr; - int i; - ptr = (volatile unsigned int*)0x70000020; - - *ptr &= ~(1 << 13); - for(i = 0; i < (0xfffff); i++) - { - } - for(i = 0; i < (0xfffff); i++) - { - } - for(i = 0; i < (0xfffff); i++) - { - } - - *ptr |= (1 << 13); - for(i = 0; i < (0xfffff); i++) - { - } - for(i = 0; i < (0xfffff); i++) - { - } - for(i = 0; i < (0xfffff); i++) - { - } -} - -static inline unsigned long get_pc(void) -{ - unsigned long pc; - asm volatile ( - "mov %0, pc\n" - : "=r"(pc) - ); - return pc; -} - -/* These functions are present in the firmware library, but we reimplement - them here because the originals do a lot more than we want */ - -void reset_poweroff_timer(void) -{ -} - -int dbg_ports(void) -{ - unsigned int gpio_a, gpio_b, gpio_c, gpio_d; - unsigned int gpio_e, gpio_f, gpio_g, gpio_h; - unsigned int gpio_i, gpio_j, gpio_k, gpio_l; - - char buf[128]; - int line; - - lcd_setmargins(0, 0); - lcd_clear_display(); - lcd_setfont(FONT_SYSFIXED); - - while(1) - { - gpio_a = GPIOA_INPUT_VAL; - gpio_b = GPIOB_INPUT_VAL; - gpio_c = GPIOC_INPUT_VAL; - - gpio_g = GPIOG_INPUT_VAL; - gpio_h = GPIOH_INPUT_VAL; - gpio_i = GPIOI_INPUT_VAL; - - line = 0; - snprintf(buf, sizeof(buf), "GPIO_A: %02x GPIO_G: %02x", gpio_a, gpio_g); - lcd_puts(0, line++, buf); - snprintf(buf, sizeof(buf), "GPIO_B: %02x GPIO_H: %02x", gpio_b, gpio_h); - lcd_puts(0, line++, buf); - snprintf(buf, sizeof(buf), "GPIO_C: %02x GPIO_I: %02x", gpio_c, gpio_i); - lcd_puts(0, line++, buf); - line++; - - gpio_d = GPIOD_INPUT_VAL; - gpio_e = GPIOE_INPUT_VAL; - gpio_f = GPIOF_INPUT_VAL; - - gpio_j = GPIOJ_INPUT_VAL; - gpio_k = GPIOK_INPUT_VAL; - gpio_l = GPIOL_INPUT_VAL; - - snprintf(buf, sizeof(buf), "GPIO_D: %02x GPIO_J: %02x", gpio_d, gpio_j); - lcd_puts(0, line++, buf); - snprintf(buf, sizeof(buf), "GPIO_E: %02x GPIO_K: %02x", gpio_e, gpio_k); - lcd_puts(0, line++, buf); - snprintf(buf, sizeof(buf), "GPIO_F: %02x GPIO_L: %02x", gpio_f, gpio_l); - lcd_puts(0, line++, buf); - line++; - snprintf(buf, sizeof(buf), "ADC_1: %02x", adc_read(ADC_0)); - lcd_puts(0, line++, buf); - snprintf(buf, sizeof(buf), "ADC_2: %02x", adc_read(ADC_1)); - lcd_puts(0, line++, buf); - snprintf(buf, sizeof(buf), "ADC_3: %02x", adc_read(ADC_2)); - lcd_puts(0, line++, buf); - snprintf(buf, sizeof(buf), "ADC_4: %02x", adc_read(ADC_3)); - lcd_puts(0, line++, buf); - lcd_update(); - } - return 0; -} - -void mpeg_stop(void) -{ -} - -void usb_acknowledge(void) -{ -} - -void usb_wait_for_disconnect(void) -{ -} - -void sys_poweroff(void) -{ -} - -void system_reboot(void) -{ - -} - -void main(void) -{ - kernel_init(); - adc_init(); - lcd_init_device(); - - dbg_ports(); -} - diff --git a/bootloader/h10.c b/bootloader/main-pp.c index 0cfd64a96e..a533cc7044 100644 --- a/bootloader/h10.c +++ b/bootloader/main-pp.c @@ -40,8 +40,8 @@ #include "power.h" #include "file.h" -/* Size of the buffer to store the loaded Rockbox/iriver image */ -#define MAX_LOADSIZE (5*1024*1024) +/* Size of the buffer to store the loaded firmware image */ +#define MAX_LOADSIZE (10*1024*1024) /* A buffer to load the iriver firmware or Rockbox into */ unsigned char loadbuffer[MAX_LOADSIZE]; @@ -52,18 +52,18 @@ char version[] = APPSVERSION; int line=0; -/* Load original iriver firmware. This function expects a file called - "/System/Original.mi4" on the player. It should be decrypted - and have the header stripped using mi4code. It reads the file in to a memory +/* Load original mi4 firmware. This function expects a file called + "/System/OF.bin" on the player. It should be a mi4 firmware decrypted + and header stripped using mi4code. It reads the file in to a memory buffer called buf. The rest of the loading is done in main() and crt0.S */ -int load_iriver(unsigned char* buf) +int load_original_firmware(unsigned char* buf) { int fd; int rc; int len; - fd = open("/System/Original.mi4", O_RDONLY); + fd = open("/System/OF.bin", O_RDONLY); len = filesize(fd); @@ -78,7 +78,7 @@ int load_iriver(unsigned char* buf) return len; } -/* Load Rockbox firmware (rockbox.h10) */ +/* Load Rockbox firmware (rockbox.*) */ int load_rockbox(unsigned char* buf) { int fd; @@ -164,6 +164,7 @@ void* main(void) kernel_init(); lcd_init(); font_init(); + button_init(); line=0; @@ -172,7 +173,7 @@ void* main(void) lcd_puts(0, line++, "Rockbox boot loader"); snprintf(buf, sizeof(buf), "Version: 20%s", version); lcd_puts(0, line++, buf); - snprintf(buf, sizeof(buf), "iriver H10"); + snprintf(buf, sizeof(buf), MODEL_NAME); lcd_puts(0, line++, buf); lcd_update(); @@ -212,11 +213,11 @@ void* main(void) i=button_read_device(); if(i==BUTTON_LEFT) { - lcd_puts(0, line, "Loading iriver firmware..."); + lcd_puts(0, line++, "Loading original firmware..."); lcd_update(); - rc=load_iriver(loadbuffer); + rc=load_original_firmware(loadbuffer); } else { - lcd_puts(0, line, "Loading Rockbox..."); + lcd_puts(0, line++, "Loading Rockbox..."); lcd_update(); rc=load_rockbox(loadbuffer); } @@ -225,6 +226,7 @@ void* main(void) snprintf(buf, sizeof(buf), "Rockbox error: %d",rc); lcd_puts(0, line++, buf); lcd_update(); + while(1) {} } memcpy((void*)DRAM_START,loadbuffer,rc); diff --git a/firmware/SOURCES b/firmware/SOURCES index f83abdbc51..386d3707c4 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -262,11 +262,13 @@ drivers/i2c-pnx0101.c /* no i2c driver yet */ #endif #if defined(CPU_PP) -#ifndef BOOTLOADER +#ifdef BOOTLOADER +target/arm/crt0-pp-bl.S +#else target/arm/pcm-pp.c target/arm/audio-pp.c -#endif target/arm/crt0-pp.S +#endif #elif defined(CPU_ARM) target/arm/crt0.S #endif /* defined(CPU_*) */ diff --git a/firmware/boot.lds b/firmware/boot.lds index 556e8db990..6c307bd4de 100644 --- a/firmware/boot.lds +++ b/firmware/boot.lds @@ -8,7 +8,7 @@ INPUT(target/coldfire/crt0.o) OUTPUT_FORMAT(elf32-littlearm) OUTPUT_ARCH(arm) #ifdef CPU_PP -INPUT(target/arm/crt0-pp.o) +INPUT(target/arm/crt0-pp-bl.o) #else INPUT(target/arm/crt0.o) #endif diff --git a/firmware/export/config-e200.h b/firmware/export/config-e200.h index 26b87c70fc..4c9e1b2d47 100644 --- a/firmware/export/config-e200.h +++ b/firmware/export/config-e200.h @@ -5,6 +5,7 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 16 +#define MODEL_NAME "Sandisk Sansa e200" /* define this if you have recording possibility */ /*#define HAVE_RECORDING 1*/ /* TODO: add support for this */ diff --git a/firmware/export/config-h10.h b/firmware/export/config-h10.h index 0b17920736..ae2a150ae6 100644 --- a/firmware/export/config-h10.h +++ b/firmware/export/config-h10.h @@ -6,6 +6,7 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 13 +#define MODEL_NAME "iriver H10 20GB" /* define this if you have recording possibility */ #define HAVE_RECORDING 1 diff --git a/firmware/export/config-h10_5gb.h b/firmware/export/config-h10_5gb.h index 534c4a455f..42f774832a 100644 --- a/firmware/export/config-h10_5gb.h +++ b/firmware/export/config-h10_5gb.h @@ -6,6 +6,7 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 14 +#define MODEL_NAME "iriver H10 5/6GB" /* define this if you have recording possibility */ #define HAVE_RECORDING 1 diff --git a/firmware/rolo.c b/firmware/rolo.c index 6f7bae90c9..84b3280da5 100644 --- a/firmware/rolo.c +++ b/firmware/rolo.c @@ -31,9 +31,8 @@ #include "buffer.h" #if !defined(IRIVER_IFP7XX_SERIES) && \ - (CONFIG_CPU != PP5002) && !defined(IRIVER_H10) && \ - !defined(IRIVER_H10_5GB) && (CONFIG_CPU != S3C2440) -/* FIX: this doesn't work on iFP, 3rd Gen ipods, or H10 yet */ + (CONFIG_CPU != PP5002) && (CONFIG_CPU != S3C2440) +/* FIX: this doesn't work on iFP, 3rd Gen ipods */ #define IRQ0_EDGE_TRIGGER 0x80 diff --git a/firmware/target/arm/crt0-pp-bl.S b/firmware/target/arm/crt0-pp-bl.S new file mode 100644 index 0000000000..4f50cac699 --- /dev/null +++ b/firmware/target/arm/crt0-pp-bl.S @@ -0,0 +1,179 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 by Linus Nielsen Feltzing + * + * 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 "config.h" +#include "cpu.h" + + .section .init.text,"ax",%progbits + + .global start +start: + +/* PortalPlayer bootloader and startup code based on startup.s from the iPodLinux + * loader + * + * Copyright (c) 2003, Daniel Palffy (dpalffy (at) rainstorm.org) + * Copyright (c) 2005, Bernard Leach <leachbj@bouncycastle.org> + * + */ +#if CONFIG_CPU == PP5002 + .equ PROC_ID, 0xc4000000 + .equ COP_CTRL, 0xcf004058 + .equ COP_STATUS, 0xcf004050 + .equ IIS_CONFIG, 0xc0002500 + .equ SLEEP, 0xca + .equ WAKE, 0xce + .equ SLEEPING, 0x4000 +#else + .equ PROC_ID, 0x60000000 + .equ COP_CTRL, 0x60007004 + .equ COP_STATUS, 0x60007004 + .equ IIS_CONFIG, 0x70002800 + .equ SLEEP, 0x80000000 + .equ WAKE, 0x0 + .equ SLEEPING, 0x80000000 + .equ CACHE_CTRL, 0x6000c000 +#endif + + msr cpsr_c, #0xd3 /* enter supervisor mode, disable IRQ */ + +/* 1 - Copy the bootloader to IRAM */ + /* get the high part of our execute address */ + ldr r7, =0xffffff00 + and r4, pc, r7 + + /* Copy bootloader to safe area - 0x40000000 (IRAM) */ + mov r5, #0x40000000 + ldr r6, = _dataend +1: + cmp r5, r6 + ldrcc r2, [r4], #4 + strcc r2, [r5], #4 + bcc 1b + +#ifndef IPOD_ARCH + /* For builds on targets with mi4 firmware, scramble writes data to + 0xe0-0xeb, so jump past that.*/ + b pad_skip + +.space 60*4 + +pad_skip: +#endif + + +/* 2 - Jump both CPU and COP there */ + ldr pc, =start_loc /* jump to the relocated start_loc: */ + +start_loc: + + /* Find out which processor we are */ + ldr r0, =PROC_ID + ldr r0, [r0] + and r0, r0, #0xff + cmp r0, #0x55 + beq cpu + + /* put us (co-processor) to sleep */ + ldr r4, =COP_CTRL + mov r3, #SLEEP + str r3, [r4] + ldr pc, =cop_wake_start + +cop_wake_start: +#if CONFIG_CPU != PP5002 + /* COP: Invalidate cache */ + ldr r0, =0xf000f044 + ldr r1, [r0] + orr r1, r1, #0x6 + str r1, [r0] + + ldr r0, =CACHE_CTRL +1: + ldr r1, [r0] + tst r1, #0x8000 + bne 1b +#endif + + ldr r0, =startup_loc + ldr pc, [r0] + +cpu: + /* Wait for COP to be sleeping */ + ldr r4, =COP_STATUS +1: + ldr r3, [r4] + ands r3, r3, #SLEEPING + beq 1b + + /* Initialise bss section to zero */ + ldr r2, =_edata + ldr r3, =_end + mov r4, #0 +1: + cmp r3, r2 + strhi r4, [r2], #4 + bhi 1b + + /* Set up some stack and munge it with 0xdeadbeef */ + ldr sp, =stackend + mov r3, sp + ldr r2, =stackbegin + ldr r4, =0xdeadbeef +1: + cmp r3, r2 + strhi r4, [r2], #4 + bhi 1b + + /* execute the loader - this will load an image to 0x10000000 */ + bl main + + ldr r1, =startup_loc + str r0, [r1] + +#if CONFIG_CPU != PP5002 + /* Flush cache */ + ldr r3, =0xf000f044 + ldr r4, [r3] + orr r4, r4, #0x2 + str r4, [r3] + + ldr r3, =CACHE_CTRL +1: + ldr r4, [r3] + tst r4, #0x8000 + bne 1b +#endif + + /* Wake up the coprocessor before executing the firmware */ + ldr r4, =COP_CTRL + mov r3, #WAKE + str r3, [r4] + + mov pc, r0 + +startup_loc: + .word 0x0 + +#ifdef IPOD_ARCH +.align 8 /* starts at 0x100 */ +.global boot_table +boot_table: + /* here comes the boot table, don't move its offset */ + .space 400 +#endif diff --git a/firmware/target/arm/crt0-pp.S b/firmware/target/arm/crt0-pp.S index 17b1e8a4a3..892275e411 100644 --- a/firmware/target/arm/crt0-pp.S +++ b/firmware/target/arm/crt0-pp.S @@ -52,15 +52,9 @@ start: msr cpsr_c, #0xd3 /* enter supervisor mode, disable IRQ */ -#ifndef BOOTLOADER b pad_skip -#if defined(SANSA_E200) -/* mi4tool writes junk between 0xe0 and 0xeb. Avoid this. */ -.space 60*4 /* (more than enough) space for exception vectors */ -#else -.space 50*4 -#endif +.space 50*4 /* (more than enough) space for exception vectors */ pad_skip: #ifdef SANSA_E200 @@ -108,11 +102,13 @@ remap_end: /* After doing the remapping, send the COP to sleep. On wakeup it will go to cop_init */ + + /* Find out which processor we are */ ldr r0, =PROC_ID ldr r0, [r0] and r0, r0, #0xff cmp r0, #0x55 - beq 1f + beq cpu_init /* put us (co-processor) to sleep */ ldr r4, =COP_CTRL @@ -121,9 +117,15 @@ remap_end: ldr pc, =cop_init -1: -#ifndef DEBUG +cpu_init: + /* Wait for COP to be sleeping */ + ldr r4, =COP_STATUS +1: + ldr r3, [r4] + ands r3, r3, #SLEEPING + beq 1b + /* Copy exception handler code to address 0 */ ldr r2, =_vectorsstart ldr r3, =_vectorsend @@ -133,15 +135,7 @@ remap_end: ldrhi r5, [r4], #4 strhi r5, [r2], #4 bhi 1b -#else - ldr r1, =vectors - ldr r0, =irq_handler - str r0, [r1, #24] - ldr r0, =fiq_handler - str r0, [r1, #28] -#endif -#ifndef STUB /* Zero out IBSS */ ldr r2, =_iedata ldr r3, =_iend @@ -160,8 +154,6 @@ remap_end: ldrhi r5, [r2], #4 strhi r5, [r3], #4 bhi 1b -#endif /* !STUB */ -#endif /* !BOOTLOADER */ /* Initialise bss section to zero */ ldr r2, =_edata @@ -181,90 +173,6 @@ remap_end: cmp r3, r2 strhi r4, [r2], #4 bhi 1b - -#ifdef BOOTLOADER - /* TODO: the high part of the address is probably dependent on CONFIG_CPU. - Since we tend to use ifdefs for each chipset target - anyway, we might as well just hardcode it here. - */ - - /* get the high part of our execute address */ - ldr r0, =0xff000000 - and r8, pc, r0 @ r8 is used later - - /* Find out which processor we are */ - mov r0, #PROC_ID - ldr r0, [r0] - and r0, r0, #0xff - cmp r0, #0x55 - beq 1f - - /* put us (co-processor) to sleep */ - ldr r4, =COP_CTRL - mov r3, #SLEEP - str r3, [r4] - ldr pc, =cop_wake_start - -cop_wake_start: - /* jump the COP to startup */ - ldr r0, =startup_loc - ldr pc, [r0] - -1: - - /* get the high part of our execute address */ - ldr r2, =0xffffff00 - and r4, pc, r2 - - /* Copy bootloader to safe area - 0x40000000 */ - mov r5, #0x40000000 - ldr r6, = _dataend - sub r0, r6, r5 /* length of loader */ - add r0, r4, r0 /* r0 points to start of loader */ -1: - cmp r5, r6 - ldrcc r2, [r4], #4 - strcc r2, [r5], #4 - bcc 1b - - ldr pc, =start_loc /* jump to the relocated start_loc: */ - -start_loc: - - /* execute the loader - this will load an image to 0x10000000 */ - bl main - - /* Wake up the coprocessor before executing the firmware */ - - /* save the startup address for the COP */ - ldr r1, =startup_loc - str r0, [r1] - - /* make sure COP is sleeping */ - ldr r4, =COP_STATUS -1: - ldr r3, [r4] - ands r3, r3, #SLEEPING - beq 1b - - /* wake up COP */ - ldr r4, =COP_CTRL - mov r3, #WAKE - str r3, [r4] - - /* jump to start location */ - mov pc, r0 - -startup_loc: - .word 0x0 - -.align 8 /* starts at 0x100 */ -.global boot_table -boot_table: - /* here comes the boot table, don't move its offset */ - .space 400 - -#else /* BOOTLOADER */ /* Set up stack for IRQ mode */ msr cpsr_c, #0xd2 @@ -290,6 +198,21 @@ boot_table: /* main() should never return */ cop_init: +#if CONFIG_CPU != PP5002 + /* COP: Invalidate cache */ + ldr r0, =0xf000f044 + ldr r1, [r0] + orr r1, r1, #0x6 + str r1, [r0] + + ldr r0, =0x6000c000 +1: + ldr r1, [r0] + tst r1, #0x8000 + bne 1b +#endif + + /* Setup stack for COP */ ldr sp, =cop_stackend mov r3, sp ldr r2, =cop_stackbegin @@ -300,6 +223,8 @@ cop_init: bhi 2b ldr sp, =cop_stackend + + /* Run cop_main() in apps/main.c */ bl cop_main /* Exception handlers. Will be copied to address 0 after memory remapping */ @@ -385,5 +310,3 @@ irq_stack: /* 256 words of FIQ stack */ .space 256*4 fiq_stack: - -#endif /* BOOTLOADER */ diff --git a/tools/configure b/tools/configure index 3a5c7352a6..4cb1f96291 100755 --- a/tools/configure +++ b/tools/configure @@ -1108,10 +1108,10 @@ EOF target="-DSANSA_E200" memory=32 # supposedly arm7tdmicc - tool="$rootdir/tools/scramble -mi4v3" + tool="$rootdir/tools/scramble -add=e200" bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" bmp2rb_native="$rootdir/tools/bmp2rb -f 4" - output="PP5022.mi4" + output="rockbox.e200" appextra="recorder:gui" archosrom="" flash="" diff --git a/tools/scramble.c b/tools/scramble.c index 30d4ea9edb..fed19621f8 100644 --- a/tools/scramble.c +++ b/tools/scramble.c @@ -89,7 +89,7 @@ void usage(void) "\t-mi4v3 PortalPlayer .mi4 format (revision 010301)\n" "\t-add=X Rockbox generic \"add-up\" checksum format\n" "\t (X values: h100, h120, h140, h300, ipco, nano, ipvd\n" - "\t ip3g, ip4g, mini, x5, h10, h10_5gb)\n" + "\t ip3g, ip4g, mini, x5, h10, h10_5gb, tpj2, e200)\n" "\nNo option results in Archos standard player/recorder format.\n"); exit(1); @@ -207,6 +207,8 @@ int main (int argc, char** argv) modelnum = 14; else if(!strcmp(&argv[1][5], "tpj2")) modelnum = 15; + else if(!strcmp(&argv[1][5], "e200")) + modelnum = 16; else { fprintf(stderr, "unsupported model: %s\n", &argv[1][5]); return 2; |