Disabled ATA debug, turned FAT Debug on, misc in IPStack/TCP

diff --git a/Kernel/Makefile.BuildNum b/Kernel/Makefile.BuildNum
index 10d13ca..dc8d809 100644 (file)
--- a/Kernel/Makefile.BuildNum
+++ b/Kernel/Makefile.BuildNum
@@ -1 +1 @@
-BUILD_NUM = 1817
+BUILD_NUM = 1822

diff --git a/Modules/Filesystems/FAT/fat.c b/Modules/Filesystems/FAT/fat.c
index 25b9cb0..3ec2a5f 100644 (file)
--- a/Modules/Filesystems/FAT/fat.c
+++ b/Modules/Filesystems/FAT/fat.c
@@ -12,11 +12,11 @@
  * \todo Implement changing of the parent directory when a file is written to\r
  * \todo Implement file creation / deletion\r
  */\r
-#define DEBUG  0\r
+#define DEBUG  1\r
 #define VERBOSE        1\r
 \r
 #define CACHE_FAT      1       //!< Caches the FAT in memory\r
-#define USE_LFN                1       //!< Enables the use of Long File Names\r
+#define USE_LFN                0       //!< Enables the use of Long File Names\r
 #define        SUPPORT_WRITE   0\r
 \r
 #include <acess.h>\r
@@ -238,7 +238,8 @@ tVFS_Node *FAT_InitDevice(char *Device, char **Options)
        \r
        // == VFS Interface\r
        node = &diskInfo->rootNode;\r
-       node->Size = bs->files_in_root;\r
+       //node->Size = bs->files_in_root;\r
+       node->Size = -1;\r
        node->Inode = diskInfo->rootOffset;     // 0:31 - Cluster, 32:63 - Parent Directory Cluster\r
        node->ImplPtr = diskInfo;       // Disk info pointer\r
        node->ImplInt = 0;      // 0:15 - Directory Index, 16: Dirty Flag, 17: Deletion Flag\r
@@ -599,14 +600,14 @@ Uint64 FAT_Read(tVFS_Node *Node, Uint64 offset, Uint64 length, void *buffer)
        \r
        // Sanity Check offset\r
        if(offset > Node->Size) {\r
-               LOG("Reading past EOF (%i > %i)", offset, node->Size);\r
+               LOG("Reading past EOF (%i > %i)", offset, Node->Size);\r
                LEAVE('i', 0);\r
                return 0;\r
        }\r
        // Clamp Size\r
        if(offset + length > Node->Size) {\r
                LOG("Reading past EOF (%lli + %lli > %lli), clamped to %lli",\r
-                       offset, length, node->Size, node->Size - offset);\r
+                       offset, length, Node->Size, Node->Size - offset);\r
                length = Node->Size - offset;\r
        }\r
        \r
@@ -856,14 +857,11 @@ void FAT_int_ProperFilename(char *dest, char *src)
 char *FAT_int_CreateName(fat_filetable *ft, char *LongFileName)\r
 {\r
        char    *ret;\r
-        int    len;\r
        ENTER("pft sLongFileName", ft, LongFileName);\r
        #if USE_LFN\r
        if(LongFileName && LongFileName[0] != '\0')\r
        {       \r
-               len = strlen(LongFileName);\r
-               ret = malloc(len+1);\r
-               strcpy(ret, LongFileName);\r
+               ret = strdup(LongFileName);\r
        }\r
        else\r
        {\r

diff --git a/Modules/IPStack/tcp.c b/Modules/IPStack/tcp.c
index 1c9464c..e7cded3 100644 (file)
--- a/Modules/IPStack/tcp.c
+++ b/Modules/IPStack/tcp.c
@@ -73,7 +73,7 @@ void TCP_StartConnection(tTCPConnection *Conn)
        hdr.SequenceNumber = Conn->NextSequenceSend;
        hdr.DataOffset = (sizeof(tTCPHeader)/4) << 4;
        hdr.Flags = TCP_FLAG_SYN;
-       hdr.WindowSize = 0;     // TODO
+       hdr.WindowSize = 0xFFFF;        // Max
        hdr.Checksum = 0;       // TODO
        hdr.UrgentPointer = 0;
        

diff --git a/Modules/Storage/ATA/main.c b/Modules/Storage/ATA/main.c
index a1010a8..0aadb6e 100644 (file)
--- a/Modules/Storage/ATA/main.c
+++ b/Modules/Storage/ATA/main.c
@@ -2,7 +2,7 @@
  * Acess2 IDE Harddisk Driver
  * - main.c
  */
-#define DEBUG  1
+#define DEBUG  0
 #include <acess.h>
 #include <modules.h>
 #include <vfs.h>