Changeset 1125 for Whitix

Timestamp:

10/14/08 18:46:19 (1 month ago)

Author:

mwhitworth

Message:

Add to mkfatfs, bug fixes, put media byte in first FAT entry's first byte.

Files:

• Whitix/branches/keobject/user/makefs/fat/main.c (modified) (10 diffs)

Whitix/branches/keobject/user/makefs/fat/main.c

@@ -36 +36 @@
         /* Only used by FAT32 */
         DWORD secsPerFat32;
+        
         WORD extFlags;
         WORD fsVer;
@@ -79 +80 @@
 char emptySector[512];
 unsigned long numClusters,fatLength;
-char* fatFirst,*rootDir;
+char* fatFirst;
 
 int GetDeviceInfo()
@@ -117 +118 @@
         if (stat.mode & _SYS_STAT_BLOCK)
         {
-                printf("Block device: TODO. Get sector size\n");
+                printf("Block device: TODO. Get sector size. 512 for now.\n");
                 blockSize=512;
         }else
@@ -147 +148 @@
 }
 
+void FatMarkCluster(int index, DWORD value)
+{
+        switch (fatSize)
+        {
+                case 12:
+                {
+                        unsigned char* fat=(unsigned char*)fatFirst;
+                        value &= 0x0FFF;
+
+                        if (!((index * 3) & 0x1))
+                        {
+                                fat[3*index/2]=value & 0xFF;
+                                fat[(3*index/2)+1]=((fat[(3*index/2)+1] & 0xF0)
+                                        | ((value & 0xF00) >> 8));
+                        }else{
+                                printf("TODO\n");
+                        }
+                        break;
+                }
+
+                case 16:
+                {
+                        unsigned short* fat=(unsigned short*)fatFirst;
+                        fat[index] = (unsigned short)value;
+                        break;
+                }
+                        
+                default:
+                        printf("TODO\n");
+        }
+}
+
 int ConstructFs()
 {
@@ -247 +280 @@
         }
 
+        if (verbose)
+                printf("Number of reserved sectors: %u\n", reservedSectors);
+
         /* TODO: Fill in boot code? */
 
-        strncpy((char*)bootSec.oemID,"mkfatfs",11);
+        strncpy((char*)bootSec.oemID, "mkfatfs", 8);
         bootSec.bytesPerSec=blockSize;
         bootSec.sectorsPerClus=secsPerClus;
@@ -255 +291 @@
         bootSec.numFats=numFats;
         bootSec.numRootDirEnts=numRootDirEnts;
-        bootSec.totalSecSmall=totalSize/blockSize;
-        /* media ID byte */
-        bootSec.secsPerTrack=bootSec.heads=0;
+        bootSec.mediaIDByte=0xF8;
+        bootSec.secsPerTrack=32;
+        bootSec.heads=64;
         bootSec.secsPerFat=(WORD)fatLength;
-
-        strncpy(bootSec.volLabel,(volumeName) ? volumeName : "mkfatfs",11);
+        bootSec.hiddenSectors=0;
+        bootSec.totalSecSmall=bootSec.totalSectorsLarge=totalSize/blockSize;
+        bootSec.volID=0xDEADBEEF;
+        bootSec.bootSig=0x28;
+        bootSec.driveNum=0x80;
+        strncpy(bootSec.volLabel,(volumeName) ? volumeName : "whitix",11);
+        strncpy(bootSec.fileSysType, "FAT16", 8);
 
         /* Allocate the FAT and initiate special entries? */
@@ -269 +310 @@
         memset(fatFirst,0,blockSize);
 
-        /* Make the . and .. entries */
-        rootDir=(char*)malloc(blockSize);
-        if (!rootDir)
-        {
-                free(fatFirst);
-                return 1;
-        }
-
-        memset(rootDir,0,blockSize);
-
-        dirEntry=(struct FatDirEntry*)rootDir;
-
-        /* '.' */
-        memcpy(dirEntry->fileName,".          ",11);
-        dirEntry->startClusterLow=dirEntry->startClusterHigh=0;
-        dirEntry->fileSize=0;
-        dirEntry->attribute=ATTR_DIR;
+        FatMarkCluster(0, 0xFFFFFFFF);
+        FatMarkCluster(1, 0xFFFFFFFF);
         
-        /* TODO: time */
-
-        dirEntry++;
-
-        /* '..' */
-        memcpy(dirEntry->fileName,"..         ",11);
-        dirEntry->startClusterLow=dirEntry->startClusterHigh=0;
-        dirEntry->fileSize=0;
-        dirEntry->attribute=ATTR_DIR;
+        /* Put the media byte in the first byte. */
+        fatFirst[0] = 0xF8;
 
         return 0;
@@ -330 +349 @@
                 WriteBuffer(fatFirst,blockSize);
                 for (j=0; j<fatLength-1; j++)
-                        WriteBuffer(emptySector,blockSize);
+                        WriteBuffer(emptySector, blockSize);
 
                 if (verbose)
@@ -336 +355 @@
         }
 
-        /* Write root directory - again only the first sector is important */
-        WriteBuffer(rootDir,blockSize);
+        /* Write root directory */
         
-        for (i=0; i<((numRootDirEnts*32)/blockSize)-1; i++)
+        for (i=0; i<((numRootDirEnts*32)/blockSize); i++)
                 WriteBuffer(emptySector,blockSize);
 
@@ -345 +363 @@
                 printf("Wrote root directory\n");
 
-        /* Free fat and root dir entries */
-        free(rootDir);
+        /* Free fat entries */
         free(fatFirst);