RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2003-10-22 Thomas Doerfler <Thomas.Doerfler@imd-systems.de>

Browse Source 
PR 515/filesystem
	* src/dosfs/fat_fat_operations.c: Remove commented out code.
This commit is contained in:
Joel Sherrill
2003-10-22 19:16:44 +00:00
parent d61e9c0fec
commit 471feaffd2
2 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cpukit/libfs/ChangeLog
View File

@@ -1,3 +1,8 @@
2003-10-22 Thomas Doerfler <Thomas.Doerfler@imd-systems.de>
PR 515/filesystem
* src/dosfs/fat_fat_operations.c: Remove commented out code.
2003-10-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2003-10-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
PR 509/filesystem PR 509/filesystem

36
cpukit/libfs/src/dosfs/fat_fat_operations.c
View File

@@ -63,8 +63,7 @@ fat_scan_fat_for_free_clusters(
if (count == 0) if (count == 0)
return rc; return rc;
if ((fs_info->vol.type & FAT_FAT32) && if (fs_info->vol.next_cl != FAT_UNDEFINED_VALUE)
(fs_info->vol.next_cl != FAT_UNDEFINED_VALUE))
cl4find = fs_info->vol.next_cl; cl4find = fs_info->vol.next_cl;
/* /*
@@ -82,7 +81,6 @@ fat_scan_fat_for_free_clusters(
return rc; return rc;
} }
/*if ((next_cln & fs_info->vol.mask) == FAT_GENFAT_FREE)*/
if (next_cln == FAT_GENFAT_FREE) if (next_cln == FAT_GENFAT_FREE)
{ {
/* /*
@@ -131,13 +129,10 @@ fat_scan_fat_for_free_clusters(
/* have we satisfied request ? */ /* have we satisfied request ? */
if (*cls_added == count) if (*cls_added == count)
{
if (fs_info->vol.type & FAT_FAT32)
{ {
fs_info->vol.next_cl = save_cln; fs_info->vol.next_cl = save_cln;
if (fs_info->vol.free_cls != 0xFFFFFFFF) if (fs_info->vol.free_cls != 0xFFFFFFFF)
fs_info->vol.free_cls -= (*cls_added); fs_info->vol.free_cls -= (*cls_added);
}
*last_cl = save_cln; *last_cl = save_cln;
fat_buf_release(fs_info); fat_buf_release(fs_info);
return rc; return rc;
@@ -149,12 +144,10 @@ fat_scan_fat_for_free_clusters(
cl4find = 2; cl4find = 2;
} }
if (fs_info->vol.type & FAT_FAT32)
{
fs_info->vol.next_cl = save_cln; fs_info->vol.next_cl = save_cln;
if (fs_info->vol.free_cls != 0xFFFFFFFF) if (fs_info->vol.free_cls != 0xFFFFFFFF)
fs_info->vol.free_cls -= (*cls_added); fs_info->vol.free_cls -= (*cls_added);
}
*last_cl = save_cln; *last_cl = save_cln;
fat_buf_release(fs_info); fat_buf_release(fs_info);
return RC_OK; return RC_OK;
@@ -187,9 +180,9 @@ fat_free_fat_clusters_chain(
rc = fat_get_fat_cluster(mt_entry, cur_cln, &next_cln); rc = fat_get_fat_cluster(mt_entry, cur_cln, &next_cln);
if ( rc != RC_OK ) if ( rc != RC_OK )
{ {
if ((fs_info->vol.type & FAT_FAT32) && if(fs_info->vol.free_cls != FAT_UNDEFINED_VALUE)
(fs_info->vol.free_cls != FAT_UNDEFINED_VALUE))
fs_info->vol.free_cls += freed_cls_cnt; fs_info->vol.free_cls += freed_cls_cnt;
fat_buf_release(fs_info); fat_buf_release(fs_info);
return rc; return rc;
} }
@@ -202,12 +195,9 @@ fat_free_fat_clusters_chain(
cur_cln = next_cln; cur_cln = next_cln;
} }
if (fs_info->vol.type & FAT_FAT32)
{
fs_info->vol.next_cl = chain; fs_info->vol.next_cl = chain;
if (fs_info->vol.free_cls != FAT_UNDEFINED_VALUE) if (fs_info->vol.free_cls != FAT_UNDEFINED_VALUE)
fs_info->vol.free_cls += freed_cls_cnt; fs_info->vol.free_cls += freed_cls_cnt;
}
fat_buf_release(fs_info); fat_buf_release(fs_info);
if (rc1 != RC_OK) if (rc1 != RC_OK)
@@ -346,16 +336,7 @@ fat_set_fat_cluster(
case FAT_FAT12: case FAT_FAT12:
if ( FAT_CLUSTER_IS_ODD(cln) ) if ( FAT_CLUSTER_IS_ODD(cln) )
{ {
#if 0
/*
* do not perform endian conversion explicitely,
* because following code will enforce little
* endian format implicitly!
*/
fat16_clv = CT_LE_W((((unsigned16)in_val) << FAT_FAT12_SHIFT));
#else
fat16_clv = ((unsigned16)in_val) << FAT_FAT12_SHIFT; fat16_clv = ((unsigned16)in_val) << FAT_FAT12_SHIFT;
#endif
*((unsigned8 *)(block0->buffer + ofs)) = *((unsigned8 *)(block0->buffer + ofs)) =
(*((unsigned8 *)(block0->buffer + ofs))) & 0x0F; (*((unsigned8 *)(block0->buffer + ofs))) & 0x0F;
@@ -391,16 +372,7 @@ fat_set_fat_cluster(
} }
else else
{ {
#if 0
/*
* do not perform endian conversion explicitely,
* because following code will enforce little
* endian format implicitly!
*/
fat16_clv = CT_LE_W((((unsigned16)in_val) & FAT_FAT12_MASK));
#else
fat16_clv = ((unsigned16)in_val) & FAT_FAT12_MASK; fat16_clv = ((unsigned16)in_val) & FAT_FAT12_MASK;
#endif
*((unsigned8 *)(block0->buffer + ofs)) &= 0x00; *((unsigned8 *)(block0->buffer + ofs)) &= 0x00;
*((unsigned8 *)(block0->buffer + ofs)) = *((unsigned8 *)(block0->buffer + ofs)) =