X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FFilesystems%2FFAT%2Ffat.c;h=be0a51c7f20e9a0b77e37b76a43eb7b6788ed89b;hb=f0b5018caef356cda6afa147ddb6917068c62dd7;hp=f7ebafe52620970b8fc4137360bb0cacbde12c76;hpb=891868f0b4d64eb274b5810ac0c4f0a53d104114;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/Filesystems/FAT/fat.c b/KernelLand/Modules/Filesystems/FAT/fat.c
index f7ebafe5..be0a51c7 100644
--- a/KernelLand/Modules/Filesystems/FAT/fat.c
+++ b/KernelLand/Modules/Filesystems/FAT/fat.c
@@ -98,7 +98,11 @@ int FAT_Detect(int FD)
 
 	if(bs.bps == 0 || bs.spc == 0)
 		return 0;
-	
+
+	Log_Debug("FAT", "_Detect: Media type = %02x", bs.mediaDesc);
+	if( bs.mediaDesc < 0xF0 )
+		return 0;
+
 	return 1;
 }
 /**
@@ -334,7 +338,7 @@ int FAT_int_GetAddress(tVFS_Node *Node, Uint64 Offset, Uint64 *Addr, Uint32 *Clu
 			if(Cluster)	*Cluster = cluster;
 			cluster = FAT_int_GetFatValue(disk, cluster);
 			// Check for end of cluster chain
-			if(cluster == 0xFFFFFFFF) {	LEAVE('i', 1);	return 1;}
+			if(cluster == GETFATVALUE_EOC) { LEAVE('i', 1); return 1; }
 		}
 		if(Cluster)	*Cluster = cluster;
 	}
@@ -417,7 +421,7 @@ size_t FAT_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer)
 	for(i = preSkip; i--; )
 	{
 		cluster = FAT_int_GetFatValue(disk, cluster);
-		if(cluster == -1) {
+		if(cluster == GETFATVALUE_EOC) {
 			Log_Warning("FAT", "Offset is past end of cluster chain mark");
 			LEAVE('i', 0);
 			return 0;
@@ -443,7 +447,7 @@ size_t FAT_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer)
 		LOG("pos = %i, Reading the rest of the clusters");
 		// Get next cluster in the chain
 		cluster = FAT_int_GetFatValue(disk, cluster);
-		if(cluster == -1) {
+		if(cluster == GETFATVALUE_EOC) {
 			Log_Warning("FAT", "Read past End of Cluster Chain (Align)");
 			LEAVE('X', pos);
 			return pos;
@@ -461,7 +465,7 @@ size_t FAT_Read(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer)
 	// Read the rest of the cluster data
 	for( ; count; count -- )
 	{
-		if(cluster == -1) {
+		if(cluster == GETFATVALUE_EOC) {
 			Log_Warning("FAT", "Read past End of Cluster Chain (Bulk)");
 			LEAVE('X', pos);
 			return pos;
@@ -519,7 +523,7 @@ size_t FAT_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffe
 	while( Offset > disk->BytesPerCluster )
 	{
 		cluster = FAT_int_GetFatValue( disk, cluster );
-		if(cluster == -1) {
+		if(cluster == GETFATVALUE_EOC) {
 			Log_Warning("FAT", "EOC Unexpectedly Reached");
 			LEAVE('i', 0);
 			return 0;
@@ -565,7 +569,7 @@ size_t FAT_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffe
 		
 		// Get next cluster (allocating if needed)
 		tmpCluster = FAT_int_GetFatValue(disk, cluster);
-		if(tmpCluster == -1) {
+		if(tmpCluster == GETFATVALUE_EOC) {
 			tmpCluster = FAT_int_AllocateCluster(disk, cluster);
 			if( tmpCluster == 0 )
 				goto ret_incomplete;
@@ -581,7 +585,7 @@ size_t FAT_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffe
 		
 		// Get next cluster (allocating if needed)
 		tmpCluster = FAT_int_GetFatValue(disk, cluster);
-		if(tmpCluster == -1) {
+		if(tmpCluster == GETFATVALUE_EOC) {
 			bNewCluster = 1;
 			tmpCluster = FAT_int_AllocateCluster(disk, cluster);
 			if( tmpCluster == 0 )