diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2010-04-03 22:18:16 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2010-04-03 22:18:16 +0000 |
commit | 2dbafc10863fda3d18745e3948d76b09a017dd65 (patch) | |
tree | b066313f8357aa938a76759d417d6e8af6135fc4 | |
parent | e07909a9c13d19c2d986206caa566eebb4c0a4f7 (diff) | |
download | rockbox-2dbafc10863fda3d18745e3948d76b09a017dd65.tar.gz rockbox-2dbafc10863fda3d18745e3948d76b09a017dd65.zip |
Fix some forgotten storage_(read|write)_sectors() calls
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25461 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | bootloader/main-c240wipe.c | 10 | ||||
-rw-r--r-- | bootloader/main-c250wipe.c | 12 | ||||
-rw-r--r-- | bootloader/main-e200r-installer.c | 5 | ||||
-rw-r--r-- | bootloader/main-pp.c | 12 |
4 files changed, 19 insertions, 20 deletions
diff --git a/bootloader/main-c240wipe.c b/bootloader/main-c240wipe.c index 8c213a94c2..556907b34a 100644 --- a/bootloader/main-c240wipe.c +++ b/bootloader/main-c240wipe.c | |||
@@ -192,7 +192,7 @@ void* main(void) | |||
192 | printf("Zeroing flash"); | 192 | printf("Zeroing flash"); |
193 | for(i=0;i<250816;i++) | 193 | for(i=0;i<250816;i++) |
194 | { | 194 | { |
195 | storage_write_sectors(0,i*32,32,zero); | 195 | storage_write_sectors(i*32,32,zero); |
196 | if(i%64 == 0) | 196 | if(i%64 == 0) |
197 | { | 197 | { |
198 | printf("%d kB left",(250816-i)/2); | 198 | printf("%d kB left",(250816-i)/2); |
@@ -200,13 +200,13 @@ void* main(void) | |||
200 | } | 200 | } |
201 | 201 | ||
202 | printf("Writing MBR"); | 202 | printf("Writing MBR"); |
203 | storage_write_sectors(0,0,1,mbr); | 203 | storage_write_sectors(0,1,mbr); |
204 | printf("Writing FAT bootsector"); | 204 | printf("Writing FAT bootsector"); |
205 | storage_write_sectors(0,1023,1,fat); | 205 | storage_write_sectors(1023,1,fat); |
206 | printf("Writing more FAT"); | 206 | printf("Writing more FAT"); |
207 | storage_write_sectors(0,1024,1,backupfat); | 207 | storage_write_sectors(1024,1,backupfat); |
208 | printf("Writing more FAT"); | 208 | printf("Writing more FAT"); |
209 | storage_write_sectors(0,1264,1,backupfat); | 209 | storage_write_sectors(1264,1,backupfat); |
210 | if (button_hold()) | 210 | if (button_hold()) |
211 | printf("Release Hold and"); | 211 | printf("Release Hold and"); |
212 | 212 | ||
diff --git a/bootloader/main-c250wipe.c b/bootloader/main-c250wipe.c index cecc0aac5a..c64bbee92e 100644 --- a/bootloader/main-c250wipe.c +++ b/bootloader/main-c250wipe.c | |||
@@ -257,7 +257,7 @@ void* main(void) | |||
257 | printf("Zeroing flash"); | 257 | printf("Zeroing flash"); |
258 | for(i=0;i<250816;i++) | 258 | for(i=0;i<250816;i++) |
259 | { | 259 | { |
260 | storage_write_sectors(0,i*32,32,zero); | 260 | storage_write_sectors(i*32,32,zero); |
261 | if(i%64 == 0) | 261 | if(i%64 == 0) |
262 | { | 262 | { |
263 | printf("%d kB left",(250816-i)/2); | 263 | printf("%d kB left",(250816-i)/2); |
@@ -265,15 +265,15 @@ void* main(void) | |||
265 | } | 265 | } |
266 | 266 | ||
267 | printf("Writing MBR"); | 267 | printf("Writing MBR"); |
268 | storage_write_sectors(0,0,1,mbr); | 268 | storage_write_sectors(0,1,mbr); |
269 | printf("Writing FAT bootsector"); | 269 | printf("Writing FAT bootsector"); |
270 | storage_write_sectors(0,1017,2,bootsector); | 270 | storage_write_sectors(1017,2,bootsector); |
271 | printf("Writing more FAT"); | 271 | printf("Writing more FAT"); |
272 | storage_write_sectors(0,1023,1,fat); | 272 | storage_write_sectors(1023,1,fat); |
273 | printf("Writing more FAT"); | 273 | printf("Writing more FAT"); |
274 | storage_write_sectors(0,1049,1,backupfat); | 274 | storage_write_sectors(1049,1,backupfat); |
275 | printf("Writing more FAT"); | 275 | printf("Writing more FAT"); |
276 | storage_write_sectors(0,4920,1,backupfat); | 276 | storage_write_sectors(4920,1,backupfat); |
277 | if (button_hold()) | 277 | if (button_hold()) |
278 | printf("Release Hold and"); | 278 | printf("Release Hold and"); |
279 | 279 | ||
diff --git a/bootloader/main-e200r-installer.c b/bootloader/main-e200r-installer.c index a24892458d..0a7b56b1b6 100644 --- a/bootloader/main-e200r-installer.c +++ b/bootloader/main-e200r-installer.c | |||
@@ -139,8 +139,7 @@ void* main(void) | |||
139 | printf("reading: %x", (START_SECTOR_OF_ROM + ROMSECTOR_TO_HACK)*512); | 139 | printf("reading: %x", (START_SECTOR_OF_ROM + ROMSECTOR_TO_HACK)*512); |
140 | #endif | 140 | #endif |
141 | 141 | ||
142 | storage_read_sectors(0, | 142 | storage_read_sectors(pinfo->start + START_SECTOR_OF_ROM + ROMSECTOR_TO_HACK, |
143 | pinfo->start + START_SECTOR_OF_ROM + ROMSECTOR_TO_HACK, | ||
144 | 1 , sector); | 143 | 1 , sector); |
145 | crc32 = chksum_crc32 (sector, 512); | 144 | crc32 = chksum_crc32 (sector, 512); |
146 | 145 | ||
@@ -161,7 +160,7 @@ void* main(void) | |||
161 | /* E200R bootloader detected - patch it */ | 160 | /* E200R bootloader detected - patch it */ |
162 | memcpy(§or[HACK_OFFSET], changedBytes, | 161 | memcpy(§or[HACK_OFFSET], changedBytes, |
163 | sizeof(changedBytes)/sizeof(*changedBytes)); | 162 | sizeof(changedBytes)/sizeof(*changedBytes)); |
164 | storage_write_sectors(0, | 163 | storage_write_sectors( |
165 | pinfo->start + START_SECTOR_OF_ROM + ROMSECTOR_TO_HACK, | 164 | pinfo->start + START_SECTOR_OF_ROM + ROMSECTOR_TO_HACK, |
166 | 1 , sector); | 165 | 1 , sector); |
167 | printf("Firmware unlocked"); | 166 | printf("Firmware unlocked"); |
diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c index a2562f8a9d..4f1fe2a4e1 100644 --- a/bootloader/main-pp.c +++ b/bootloader/main-pp.c | |||
@@ -391,8 +391,8 @@ int load_mi4_part(unsigned char* buf, struct partinfo* pinfo, | |||
391 | unsigned long sum; | 391 | unsigned long sum; |
392 | 392 | ||
393 | /* Read header to find out how long the mi4 file is. */ | 393 | /* Read header to find out how long the mi4 file is. */ |
394 | storage_read_sectors(0, pinfo->start + PPMI_SECTOR_OFFSET, | 394 | storage_read_sectors(pinfo->start + PPMI_SECTOR_OFFSET, |
395 | PPMI_SECTORS, &ppmi_header); | 395 | PPMI_SECTORS, &ppmi_header); |
396 | 396 | ||
397 | /* The first four characters at 0x80000 (sector 1024) should be PPMI*/ | 397 | /* The first four characters at 0x80000 (sector 1024) should be PPMI*/ |
398 | if( memcmp(ppmi_header.magic, "PPMI", 4) ) | 398 | if( memcmp(ppmi_header.magic, "PPMI", 4) ) |
@@ -401,7 +401,7 @@ int load_mi4_part(unsigned char* buf, struct partinfo* pinfo, | |||
401 | printf("BL mi4 size: %x", ppmi_header.length); | 401 | printf("BL mi4 size: %x", ppmi_header.length); |
402 | 402 | ||
403 | /* Read mi4 header of the OF */ | 403 | /* Read mi4 header of the OF */ |
404 | storage_read_sectors(0, pinfo->start + PPMI_SECTOR_OFFSET + PPMI_SECTORS | 404 | storage_read_sectors(pinfo->start + PPMI_SECTOR_OFFSET + PPMI_SECTORS |
405 | + (ppmi_header.length/512), MI4_HEADER_SECTORS, &mi4header); | 405 | + (ppmi_header.length/512), MI4_HEADER_SECTORS, &mi4header); |
406 | 406 | ||
407 | /* We don't support encrypted mi4 files yet */ | 407 | /* We don't support encrypted mi4 files yet */ |
@@ -424,7 +424,7 @@ int load_mi4_part(unsigned char* buf, struct partinfo* pinfo, | |||
424 | printf("Binary type: %.4s", mi4header.type); | 424 | printf("Binary type: %.4s", mi4header.type); |
425 | 425 | ||
426 | /* Load firmware */ | 426 | /* Load firmware */ |
427 | storage_read_sectors(0, pinfo->start + PPMI_SECTOR_OFFSET + PPMI_SECTORS | 427 | storage_read_sectors(pinfo->start + PPMI_SECTOR_OFFSET + PPMI_SECTORS |
428 | + (ppmi_header.length/512) + MI4_HEADER_SECTORS, | 428 | + (ppmi_header.length/512) + MI4_HEADER_SECTORS, |
429 | (mi4header.mi4size-MI4_HEADER_SIZE)/512, buf); | 429 | (mi4header.mi4size-MI4_HEADER_SIZE)/512, buf); |
430 | 430 | ||
@@ -443,9 +443,9 @@ int load_mi4_part(unsigned char* buf, struct partinfo* pinfo, | |||
443 | 443 | ||
444 | printf("Disabling database rebuild"); | 444 | printf("Disabling database rebuild"); |
445 | 445 | ||
446 | storage_read_sectors(0, pinfo->start + 0x3c08, 1, block); | 446 | storage_read_sectors(pinfo->start + 0x3c08, 1, block); |
447 | block[0xe1] = 0; | 447 | block[0xe1] = 0; |
448 | storage_write_sectors(0, pinfo->start + 0x3c08, 1, block); | 448 | storage_write_sectors(pinfo->start + 0x3c08, 1, block); |
449 | } | 449 | } |
450 | #else | 450 | #else |
451 | (void) disable_rebuild; | 451 | (void) disable_rebuild; |