diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/app.lds | 12 | ||||
-rw-r--r-- | firmware/crt0.S | 20 | ||||
-rw-r--r-- | firmware/gdb.lds | 12 | ||||
-rw-r--r-- | firmware/player.lds | 12 | ||||
-rw-r--r-- | firmware/rolo.c | 143 | ||||
-rw-r--r-- | firmware/rolo.h | 24 |
6 files changed, 217 insertions, 6 deletions
diff --git a/firmware/app.lds b/firmware/app.lds index 2e594b6db1..49678d887e 100644 --- a/firmware/app.lds +++ b/firmware/app.lds | |||
@@ -39,7 +39,9 @@ SECTIONS | |||
39 | _stackbegin = .; | 39 | _stackbegin = .; |
40 | /* We put the copy of the .iram section here to save space */ | 40 | /* We put the copy of the .iram section here to save space */ |
41 | _iramcopy = .; | 41 | _iramcopy = .; |
42 | . = 0x2000; | 42 | . += 0x2000; |
43 | _topramcopy = .; | ||
44 | . += 0x300; | ||
43 | _stackend = .; | 45 | _stackend = .; |
44 | } > DRAM | 46 | } > DRAM |
45 | 47 | ||
@@ -56,11 +58,17 @@ SECTIONS | |||
56 | _mp3buf = .; | 58 | _mp3buf = .; |
57 | } > DRAM | 59 | } > DRAM |
58 | 60 | ||
59 | .mp3end 0x09200000 : | 61 | .mp3end 0x09200000 - 0x300: |
60 | { | 62 | { |
61 | _mp3end = .; | 63 | _mp3end = .; |
62 | } > DRAM | 64 | } > DRAM |
63 | 65 | ||
66 | .topram : AT ( _topramcopy ) { | ||
67 | _topramstart = .; | ||
68 | *(.topcode) | ||
69 | _topramend = .; | ||
70 | } > DRAM | ||
71 | |||
64 | .iram 0xf000000 : AT ( _iramcopy ) | 72 | .iram 0xf000000 : AT ( _iramcopy ) |
65 | { | 73 | { |
66 | _iramstart = .; | 74 | _iramstart = .; |
diff --git a/firmware/crt0.S b/firmware/crt0.S index 99aab83867..0343fd1e23 100644 --- a/firmware/crt0.S +++ b/firmware/crt0.S | |||
@@ -112,6 +112,20 @@ copy_l: | |||
112 | bf copy_l | 112 | bf copy_l |
113 | nop | 113 | nop |
114 | 114 | ||
115 | /* copy the .topram section */ | ||
116 | mov.l topramcopy_k,r0 | ||
117 | mov.l topram_k,r1 | ||
118 | mov.l topramend_k,r2 | ||
119 | copy_l2: | ||
120 | mov.l @r0,r3 | ||
121 | mov.l r3,@r1 | ||
122 | add #4,r0 | ||
123 | add #4,r1 | ||
124 | cmp/ge r2,r1 | ||
125 | bf copy_l2 | ||
126 | nop | ||
127 | |||
128 | |||
115 | /* Munge the main thread stack */ | 129 | /* Munge the main thread stack */ |
116 | mov.l stack_k,r2 | 130 | mov.l stack_k,r2 |
117 | mov.l deadbeef_k,r0 | 131 | mov.l deadbeef_k,r0 |
@@ -150,6 +164,12 @@ iram_k: | |||
150 | .long _iramstart | 164 | .long _iramstart |
151 | iramend_k: | 165 | iramend_k: |
152 | .long _iramend | 166 | .long _iramend |
167 | topramcopy_k: | ||
168 | .long _topramcopy | ||
169 | topram_k: | ||
170 | .long _topramstart | ||
171 | topramend_k: | ||
172 | .long _topramend | ||
153 | main_k: | 173 | main_k: |
154 | .long _main | 174 | .long _main |
155 | vbr_k: | 175 | vbr_k: |
diff --git a/firmware/gdb.lds b/firmware/gdb.lds index badb7856fc..c214cb2e69 100644 --- a/firmware/gdb.lds +++ b/firmware/gdb.lds | |||
@@ -39,7 +39,9 @@ SECTIONS | |||
39 | _stackbegin = .; | 39 | _stackbegin = .; |
40 | /* We put the copy of the .iram section here to save space */ | 40 | /* We put the copy of the .iram section here to save space */ |
41 | _iramcopy = .; | 41 | _iramcopy = .; |
42 | . = 0x2000; | 42 | . += 0x2000; |
43 | _topramcopy = .; | ||
44 | . += 0x300; | ||
43 | _stackend = .; | 45 | _stackend = .; |
44 | } > DRAM | 46 | } > DRAM |
45 | 47 | ||
@@ -63,11 +65,17 @@ SECTIONS | |||
63 | _mp3buf = .; | 65 | _mp3buf = .; |
64 | } > DRAM | 66 | } > DRAM |
65 | 67 | ||
66 | .mp3end 0x09200000 : | 68 | .mp3end 0x09200000 - 0x300: |
67 | { | 69 | { |
68 | _mp3end = .; | 70 | _mp3end = .; |
69 | } > DRAM | 71 | } > DRAM |
70 | 72 | ||
73 | .topram : AT ( _topramcopy ) { | ||
74 | _topramstart = .; | ||
75 | *(.topcode) | ||
76 | _topramend = .; | ||
77 | } > DRAM | ||
78 | |||
71 | .iram 0xf000000 : AT ( _iramcopy ) | 79 | .iram 0xf000000 : AT ( _iramcopy ) |
72 | { | 80 | { |
73 | _iramstart = .; | 81 | _iramstart = .; |
diff --git a/firmware/player.lds b/firmware/player.lds index 2e594b6db1..49678d887e 100644 --- a/firmware/player.lds +++ b/firmware/player.lds | |||
@@ -39,7 +39,9 @@ SECTIONS | |||
39 | _stackbegin = .; | 39 | _stackbegin = .; |
40 | /* We put the copy of the .iram section here to save space */ | 40 | /* We put the copy of the .iram section here to save space */ |
41 | _iramcopy = .; | 41 | _iramcopy = .; |
42 | . = 0x2000; | 42 | . += 0x2000; |
43 | _topramcopy = .; | ||
44 | . += 0x300; | ||
43 | _stackend = .; | 45 | _stackend = .; |
44 | } > DRAM | 46 | } > DRAM |
45 | 47 | ||
@@ -56,11 +58,17 @@ SECTIONS | |||
56 | _mp3buf = .; | 58 | _mp3buf = .; |
57 | } > DRAM | 59 | } > DRAM |
58 | 60 | ||
59 | .mp3end 0x09200000 : | 61 | .mp3end 0x09200000 - 0x300: |
60 | { | 62 | { |
61 | _mp3end = .; | 63 | _mp3end = .; |
62 | } > DRAM | 64 | } > DRAM |
63 | 65 | ||
66 | .topram : AT ( _topramcopy ) { | ||
67 | _topramstart = .; | ||
68 | *(.topcode) | ||
69 | _topramend = .; | ||
70 | } > DRAM | ||
71 | |||
64 | .iram 0xf000000 : AT ( _iramcopy ) | 72 | .iram 0xf000000 : AT ( _iramcopy ) |
65 | { | 73 | { |
66 | _iramstart = .; | 74 | _iramstart = .; |
diff --git a/firmware/rolo.c b/firmware/rolo.c new file mode 100644 index 0000000000..ed9fcff931 --- /dev/null +++ b/firmware/rolo.c | |||
@@ -0,0 +1,143 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2002 Randy D. Wood | ||
11 | * | ||
12 | * All files in this archive are subject to the GNU General Public License. | ||
13 | * See the file COPYING in the source tree root for full license agreement. | ||
14 | * | ||
15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
16 | * KIND, either express or implied. | ||
17 | * | ||
18 | ****************************************************************************/ | ||
19 | |||
20 | #include "lcd.h" | ||
21 | #include "kernel.h" | ||
22 | #include "sprintf.h" | ||
23 | #include "button.h" | ||
24 | #include "file.h" | ||
25 | #include "mpeg.h" | ||
26 | #include "system.h" | ||
27 | #include "i2c.h" | ||
28 | #include "string.h" | ||
29 | |||
30 | #define IRQ0_EDGE_TRIGGER 0x80 | ||
31 | |||
32 | static void rolo_error(char *text) | ||
33 | { | ||
34 | lcd_clear_display(); | ||
35 | lcd_puts(0, 0, "ROLO error:"); | ||
36 | lcd_puts_scroll(0, 1, text); | ||
37 | lcd_update(); | ||
38 | button_get(true); | ||
39 | lcd_stop_scroll(); | ||
40 | } | ||
41 | /*************************************************************************** | ||
42 | * | ||
43 | * Name: rolo_load_app(char *filename,int scrambled) | ||
44 | * Filename must be a fully defined filename including the path and extension | ||
45 | * | ||
46 | ***************************************************************************/ | ||
47 | int rolo_load(char* filename) __attribute__ ((section (".topcode"))); | ||
48 | int rolo_load(char* filename) | ||
49 | { | ||
50 | int fd,slen; | ||
51 | unsigned long length,file_length,i; | ||
52 | extern unsigned char mp3buf[],mp3end; | ||
53 | unsigned short checksum,file_checksum; | ||
54 | unsigned char* ramstart = (void*)0x09000000; | ||
55 | void (*start_func)(void) = (void*)ramstart + 0x200; | ||
56 | |||
57 | lcd_clear_display(); | ||
58 | lcd_puts(0, 0, "ROLO..."); | ||
59 | lcd_puts(0, 1, "Loading"); | ||
60 | lcd_update(); | ||
61 | |||
62 | mpeg_stop(); | ||
63 | |||
64 | fd = open(filename, O_RDONLY); | ||
65 | if(-1 == fd) { | ||
66 | rolo_error("File not found"); | ||
67 | return -1; | ||
68 | } | ||
69 | |||
70 | /* Read file length from header and compare to real file length */ | ||
71 | length=lseek(fd,0,SEEK_END)-6; | ||
72 | lseek(fd, 0, SEEK_SET); | ||
73 | if(read(fd, &file_length, 4) != 4) { | ||
74 | rolo_error("Error Reading File Length"); | ||
75 | return -1; | ||
76 | } | ||
77 | if (length != file_length) { | ||
78 | rolo_error("File length mismatch"); | ||
79 | return -1; | ||
80 | } | ||
81 | |||
82 | /* Read and save checksum */ | ||
83 | lseek(fd, 4, SEEK_SET); | ||
84 | if (read(fd, &file_checksum, 2) != 2) { | ||
85 | rolo_error("Error Reading checksum"); | ||
86 | return -1; | ||
87 | } | ||
88 | lseek(fd, 6, SEEK_SET); | ||
89 | |||
90 | /* verify that file can be read and descrambled */ | ||
91 | if ((&mp3buf[0] + (2*length)+4) >= &mp3end) { | ||
92 | rolo_error("Not enough room to load file"); | ||
93 | return -1; | ||
94 | } | ||
95 | |||
96 | if (read(fd, &mp3buf[length], length) != (int)length) { | ||
97 | rolo_error("Error Reading File"); | ||
98 | return -1; | ||
99 | } | ||
100 | |||
101 | lcd_puts(0, 1, "Descrambling"); | ||
102 | lcd_update(); | ||
103 | |||
104 | /* descramble */ | ||
105 | slen = length/4; | ||
106 | for (i = 0; i < length; i++) { | ||
107 | unsigned long addr = ((i % slen) << 2) + i/slen; | ||
108 | unsigned char data = mp3buf[i+length]; | ||
109 | data = ~((data >> 1) | ((data << 7) & 0x80)); /* poor man's ROR */ | ||
110 | mp3buf[addr] = data; | ||
111 | } | ||
112 | |||
113 | /* Compute checksum and verify against checksum from file header */ | ||
114 | checksum=0; | ||
115 | for (i=0; i<length; i++) | ||
116 | checksum += mp3buf[i]; | ||
117 | |||
118 | if (checksum != file_checksum) { | ||
119 | rolo_error("Checksum Error"); | ||
120 | return -1; | ||
121 | } | ||
122 | |||
123 | lcd_puts(0, 1, "Executing "); | ||
124 | lcd_update(); | ||
125 | |||
126 | /* Disable interrupts */ | ||
127 | asm("mov #15<<4,r6\n" | ||
128 | "ldc r6,sr"); | ||
129 | |||
130 | /* Calling these 2 initialization routines was necessary to get the | ||
131 | the origional Archos version of the firmware to load and execute. */ | ||
132 | system_init(); /* Initialize system for restart */ | ||
133 | i2c_init(); /* Init i2c bus - it seems like a good idea */ | ||
134 | ICR = IRQ0_EDGE_TRIGGER; /* Make IRQ0 edge triggered */ | ||
135 | |||
136 | /* move firmware to start of ram */ | ||
137 | for ( i=0; i < length/4+1; i++ ) | ||
138 | ((unsigned int*)ramstart)[i] = ((unsigned int*)mp3buf)[i]; | ||
139 | |||
140 | start_func(); /* start new firmware */ | ||
141 | |||
142 | return 0; /* this is never reached */ | ||
143 | } | ||
diff --git a/firmware/rolo.h b/firmware/rolo.h new file mode 100644 index 0000000000..e2dd814c1a --- /dev/null +++ b/firmware/rolo.h | |||
@@ -0,0 +1,24 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2002 Randy D. Wood | ||
11 | * | ||
12 | * All files in this archive are subject to the GNU General Public License. | ||
13 | * See the file COPYING in the source tree root for full license agreement. | ||
14 | * | ||
15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
16 | * KIND, either express or implied. | ||
17 | * | ||
18 | ****************************************************************************/ | ||
19 | #ifndef __ROLO_H__ | ||
20 | #define __ROLO_H__ | ||
21 | |||
22 | void rolo_load(char* file); | ||
23 | |||
24 | #endif | ||