diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2008-11-02 01:14:46 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2008-11-02 01:14:46 +0000 |
commit | 430343bca7b2358b6862a096264fb2d16cbf0c58 (patch) | |
tree | 1de7114495004299314751d1e8701304c116579b /firmware/drivers/fat.c | |
parent | 0b34b77e1388b956685a66b04865c598585057aa (diff) | |
download | rockbox-430343bca7b2358b6862a096264fb2d16cbf0c58.tar.gz rockbox-430343bca7b2358b6862a096264fb2d16cbf0c58.zip |
implement single-driver storage layer with macros instead of inlines
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18975 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/fat.c')
-rw-r--r-- | firmware/drivers/fat.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/firmware/drivers/fat.c b/firmware/drivers/fat.c index 4317b70766..2ff4c61ac4 100644 --- a/firmware/drivers/fat.c +++ b/firmware/drivers/fat.c | |||
@@ -300,7 +300,7 @@ int fat_mount(IF_MV2(int volume,) IF_MV2(int drive,) long startsector) | |||
300 | #endif | 300 | #endif |
301 | 301 | ||
302 | /* Read the sector */ | 302 | /* Read the sector */ |
303 | rc = storage_read_sectors(IF_MV2(drive,) startsector,1,buf); | 303 | rc = storage_read_sectors(drive, startsector,1,buf); |
304 | if(rc) | 304 | if(rc) |
305 | { | 305 | { |
306 | DEBUGF( "fat_mount() - Couldn't read BPB (error code %d)\n", rc); | 306 | DEBUGF( "fat_mount() - Couldn't read BPB (error code %d)\n", rc); |
@@ -422,7 +422,7 @@ int fat_mount(IF_MV2(int volume,) IF_MV2(int drive,) long startsector) | |||
422 | #endif /* #ifdef HAVE_FAT16SUPPORT */ | 422 | #endif /* #ifdef HAVE_FAT16SUPPORT */ |
423 | { | 423 | { |
424 | /* Read the fsinfo sector */ | 424 | /* Read the fsinfo sector */ |
425 | rc = storage_read_sectors(IF_MV2(drive,) | 425 | rc = storage_read_sectors(drive, |
426 | startsector + fat_bpb->bpb_fsinfo, 1, buf); | 426 | startsector + fat_bpb->bpb_fsinfo, 1, buf); |
427 | if (rc < 0) | 427 | if (rc < 0) |
428 | { | 428 | { |
@@ -597,7 +597,7 @@ static void flush_fat_sector(struct fat_cache_entry *fce, | |||
597 | #endif | 597 | #endif |
598 | 598 | ||
599 | /* Write to the first FAT */ | 599 | /* Write to the first FAT */ |
600 | rc = storage_write_sectors(IF_MV2(fce->fat_vol->drive,) | 600 | rc = storage_write_sectors(fce->fat_vol->drive, |
601 | secnum, 1, | 601 | secnum, 1, |
602 | sectorbuf); | 602 | sectorbuf); |
603 | if(rc < 0) | 603 | if(rc < 0) |
@@ -618,7 +618,7 @@ static void flush_fat_sector(struct fat_cache_entry *fce, | |||
618 | #else | 618 | #else |
619 | secnum += fat_bpbs[0].fatsize; | 619 | secnum += fat_bpbs[0].fatsize; |
620 | #endif | 620 | #endif |
621 | rc = storage_write_sectors(IF_MV2(fce->fat_vol->drive,) | 621 | rc = storage_write_sectors(fce->fat_vol->drive, |
622 | secnum, 1, sectorbuf); | 622 | secnum, 1, sectorbuf); |
623 | if(rc < 0) | 623 | if(rc < 0) |
624 | { | 624 | { |
@@ -664,7 +664,7 @@ static void *cache_fat_sector(IF_MV2(struct bpb* fat_bpb,) | |||
664 | /* Load the sector if it is not cached */ | 664 | /* Load the sector if it is not cached */ |
665 | if(!fce->inuse) | 665 | if(!fce->inuse) |
666 | { | 666 | { |
667 | rc = storage_read_sectors(IF_MV2(fat_bpb->drive,) | 667 | rc = storage_read_sectors(fat_bpb->drive, |
668 | secnum + fat_bpb->startsector,1, | 668 | secnum + fat_bpb->startsector,1, |
669 | sectorbuf); | 669 | sectorbuf); |
670 | if(rc < 0) | 670 | if(rc < 0) |
@@ -923,7 +923,7 @@ static int update_fsinfo(IF_MV_NONVOID(struct bpb* fat_bpb)) | |||
923 | #endif /* #ifdef HAVE_FAT16SUPPORT */ | 923 | #endif /* #ifdef HAVE_FAT16SUPPORT */ |
924 | 924 | ||
925 | /* update fsinfo */ | 925 | /* update fsinfo */ |
926 | rc = storage_read_sectors(IF_MV2(fat_bpb->drive,) | 926 | rc = storage_read_sectors(fat_bpb->drive, |
927 | fat_bpb->startsector + fat_bpb->bpb_fsinfo, 1,fsinfo); | 927 | fat_bpb->startsector + fat_bpb->bpb_fsinfo, 1,fsinfo); |
928 | if (rc < 0) | 928 | if (rc < 0) |
929 | { | 929 | { |
@@ -936,7 +936,7 @@ static int update_fsinfo(IF_MV_NONVOID(struct bpb* fat_bpb)) | |||
936 | intptr = (long*)&(fsinfo[FSINFO_NEXTFREE]); | 936 | intptr = (long*)&(fsinfo[FSINFO_NEXTFREE]); |
937 | *intptr = htole32(fat_bpb->fsinfo.nextfree); | 937 | *intptr = htole32(fat_bpb->fsinfo.nextfree); |
938 | 938 | ||
939 | rc = storage_write_sectors(IF_MV2(fat_bpb->drive,) | 939 | rc = storage_write_sectors(fat_bpb->drive, |
940 | fat_bpb->startsector + fat_bpb->bpb_fsinfo,1,fsinfo); | 940 | fat_bpb->startsector + fat_bpb->bpb_fsinfo,1,fsinfo); |
941 | if (rc < 0) | 941 | if (rc < 0) |
942 | { | 942 | { |
@@ -2077,11 +2077,11 @@ static int transfer(IF_MV2(struct bpb* fat_bpb,) | |||
2077 | if (start + count > fat_bpb->totalsectors) | 2077 | if (start + count > fat_bpb->totalsectors) |
2078 | panicf("Write %ld after data\n", | 2078 | panicf("Write %ld after data\n", |
2079 | start + count - fat_bpb->totalsectors); | 2079 | start + count - fat_bpb->totalsectors); |
2080 | rc = storage_write_sectors(IF_MV2(fat_bpb->drive,) | 2080 | rc = storage_write_sectors(fat_bpb->drive, |
2081 | start + fat_bpb->startsector, count, buf); | 2081 | start + fat_bpb->startsector, count, buf); |
2082 | } | 2082 | } |
2083 | else | 2083 | else |
2084 | rc = storage_read_sectors(IF_MV2(fat_bpb->drive,) | 2084 | rc = storage_read_sectors(fat_bpb->drive, |
2085 | start + fat_bpb->startsector, count, buf); | 2085 | start + fat_bpb->startsector, count, buf); |
2086 | if (rc < 0) { | 2086 | if (rc < 0) { |
2087 | DEBUGF( "transfer() - Couldn't %s sector %lx" | 2087 | DEBUGF( "transfer() - Couldn't %s sector %lx" |