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

diff --git a/KernelLand/Modules/Filesystems/FAT/fat.c b/KernelLand/Modules/Filesystems/FAT/fat.c
index bb90c3cf..f7ebafe5 100644
--- a/KernelLand/Modules/Filesystems/FAT/fat.c
+++ b/KernelLand/Modules/Filesystems/FAT/fat.c
@@ -17,7 +17,7 @@
  * \todo Implement changing of the parent directory when a file is written to
  * \todo Implement file creation / deletion
  */
-#define DEBUG	1
+#define DEBUG	0
 #define VERBOSE	1
 
 #include <acess.h>
@@ -27,6 +27,7 @@
 // === PROTOTYPES ===
 // --- Driver Core
  int	FAT_Install(char **Arguments);
+ int	FAT_Detect(int FD);
 tVFS_Node	*FAT_InitDevice(const char *device, const char **options);
 void	FAT_Unmount(tVFS_Node *Node);
 // --- Helpers
@@ -46,7 +47,13 @@ void	FAT_CloseFile(tVFS_Node *node);
 MODULE_DEFINE(0, VER2(0,80) /*v0.80*/, VFAT, FAT_Install, NULL, NULL);
 tFAT_VolInfo	gFAT_Disks[8];
  int	giFAT_PartCount = 0;
-tVFS_Driver	gFAT_FSInfo = {"fat", 0, FAT_InitDevice, FAT_Unmount, FAT_GetNodeFromINode, NULL};
+tVFS_Driver	gFAT_FSInfo = {
+	.Name = "fat",
+	.Detect = FAT_Detect,
+	.InitDevice = FAT_InitDevice,
+	.Unmount = FAT_Unmount,
+	.GetNodeFromINode = FAT_GetNodeFromINode
+};
 tVFS_NodeType	gFAT_DirType = {
 	.TypeName = "FAT-Dir",
 	.ReadDir = FAT_ReadDir,
@@ -78,6 +85,22 @@ int FAT_Install(char **Arguments)
 	return MODULE_ERR_OK;
 }
 
+/**
+ * \brief Detect if a file is a FAT device
+ */
+int FAT_Detect(int FD)
+{
+	fat_bootsect bs;
+	
+	if( VFS_ReadAt(FD, 0, 512, &bs) != 512) {
+		return 0;
+	}
+
+	if(bs.bps == 0 || bs.spc == 0)
+		return 0;
+	
+	return 1;
+}
 /**
  * \brief Reads the boot sector of a disk and prepares the structures for it
  */
@@ -105,6 +128,7 @@ tVFS_Node *FAT_InitDevice(const char *Device, const char **Options)
 	
 	if(bs->bps == 0 || bs->spc == 0) {
 		Log_Notice("FAT", "Error in FAT Boot Sector (zero BPS/SPC)");
+		VFS_Close(diskInfo->fileHandle);
 		return NULL;
 	}
 	
@@ -185,6 +209,7 @@ tVFS_Node *FAT_InitDevice(const char *Device, const char **Options)
 		diskInfo->FATCache = (Uint32*)malloc(sizeof(Uint32)*diskInfo->ClusterCount);
 		if(diskInfo->FATCache == NULL) {
 			Log_Warning("FAT", "Heap Exhausted");
+			VFS_Cose(diskInfo->fileHandle);
 			return NULL;
 		}
 		Ofs = bs->resvSectCount*512;