summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarry Wardell <rockbox@barrywardell.net>2007-03-19 11:20:22 +0000
committerBarry Wardell <rockbox@barrywardell.net>2007-03-19 11:20:22 +0000
commitca8f7bf3528b471a896a0a954e71493ee4369392 (patch)
tree6274ccb4ccff96a8ee660e0e8fa9eacb605f6c04
parent58038d86f19174258f22ace959cc35438d3e6616 (diff)
downloadrockbox-ca8f7bf3528b471a896a0a954e71493ee4369392.tar.gz
rockbox-ca8f7bf3528b471a896a0a954e71493ee4369392.zip
The model and type strings are only 4 characters long. Also remove the 20 at the start of the version string - it should never have been there.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12839 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--bootloader/main-pp.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c
index e598a29fa0..e8a1667309 100644
--- a/bootloader/main-pp.c
+++ b/bootloader/main-pp.c
@@ -187,10 +187,10 @@ int load_mi4(unsigned char* buf, char* firmware, unsigned int buffer_size)
187 printf("CRC32: %x", mi4header.crc32); 187 printf("CRC32: %x", mi4header.crc32);
188 188
189 /* Rockbox model id */ 189 /* Rockbox model id */
190 printf("Model id: %4s", mi4header.model); 190 printf("Model id: %.4s", mi4header.model);
191 191
192 /* Read binary type (RBOS, RBBL) */ 192 /* Read binary type (RBOS, RBBL) */
193 printf("Binary type: %4s", mi4header.type); 193 printf("Binary type: %.4s", mi4header.type);
194 194
195 /* Load firmware */ 195 /* Load firmware */
196 lseek(fd, MI4_HEADER_SIZE, SEEK_SET); 196 lseek(fd, MI4_HEADER_SIZE, SEEK_SET);
@@ -245,10 +245,10 @@ int load_mi4_part(unsigned char* buf, struct partinfo* pinfo, unsigned int buffe
245 printf("CRC32: %x", mi4header.crc32); 245 printf("CRC32: %x", mi4header.crc32);
246 246
247 /* Rockbox model id */ 247 /* Rockbox model id */
248 printf("Model id: %4s", mi4header.model); 248 printf("Model id: %.4s", mi4header.model);
249 249
250 /* Read binary type (RBOS, RBBL) */ 250 /* Read binary type (RBOS, RBBL) */
251 printf("Binary type: %4s", mi4header.type); 251 printf("Binary type: %.4s", mi4header.type);
252 252
253 /* Load firmware */ 253 /* Load firmware */
254 ata_read_sectors(pinfo->start + PPMI_SECTOR_OFFSET + PPMI_SECTORS 254 ata_read_sectors(pinfo->start + PPMI_SECTOR_OFFSET + PPMI_SECTORS
@@ -298,7 +298,7 @@ void* main(void)
298 lcd_setfont(FONT_SYSFIXED); 298 lcd_setfont(FONT_SYSFIXED);
299 299
300 printf("Rockbox boot loader"); 300 printf("Rockbox boot loader");
301 printf("Version: 20%s", version); 301 printf("Version: %s", version);
302 printf(MODEL_NAME); 302 printf(MODEL_NAME);
303 303
304 i=ata_init(); 304 i=ata_init();