From 46c7cf52d9b3dcc387af695140fccd767e7d1322 Mon Sep 17 00:00:00 2001
From: "Sergey Semyonov (Serge)" <ion2@mail.ru>
Date: Sat, 31 Mar 2007 14:34:07 +0000
Subject: [PATCH] fixed address bug in fat12.inc

git-svn-id: svn://kolibrios.org@445 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 kernel/branches/flat_kernel/blkdev/flp_drv.inc | 16 ++++++++--------
 kernel/branches/flat_kernel/core/malloc.inc    |  2 +-
 kernel/branches/flat_kernel/core/taskman.inc   |  2 +-
 kernel/branches/flat_kernel/fs/fat12.inc       | 10 +++++-----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/kernel/branches/flat_kernel/blkdev/flp_drv.inc b/kernel/branches/flat_kernel/blkdev/flp_drv.inc
index a2c8a43e63..ca05e6f1d9 100644
--- a/kernel/branches/flat_kernel/blkdev/flp_drv.inc
+++ b/kernel/branches/flat_kernel/blkdev/flp_drv.inc
@@ -12,10 +12,10 @@ $Revision: 431 $
 ; Автор исходного текста  Кулаков Владимир Геннадьевич.
 ; Адаптация и доработка Mario79
 
-give_back_application_data:  ; переслать приложению
-     mov edi,[TASK_BASE]
-     mov edi,[edi+TASKDATA.mem_start]
-     add edi,ecx
+;give_back_application_data:  ; переслать приложению
+;     mov edi,[TASK_BASE]
+;     mov edi,[edi+TASKDATA.mem_start]
+;     add edi,ecx
 give_back_application_data_1:
      mov esi,FDD_BUFF   ;FDD_DataBuffer  ;0x40000
      xor ecx,ecx
@@ -24,10 +24,10 @@ give_back_application_data_1:
      rep movsd
      ret
 
-take_data_from_application:   ; взять из приложени
-     mov esi,[TASK_BASE]
-     mov esi,[esi+TASKDATA.mem_start]
-     add esi,ecx
+;take_data_from_application:   ; взять из приложени
+;     mov esi,[TASK_BASE]
+;     mov esi,[esi+TASKDATA.mem_start]
+;     add esi,ecx
 take_data_from_application_1:
      mov edi,FDD_BUFF   ;FDD_DataBuffer  ;0x40000
      xor ecx,ecx
diff --git a/kernel/branches/flat_kernel/core/malloc.inc b/kernel/branches/flat_kernel/core/malloc.inc
index 44554f33e4..ecb09d7504 100644
--- a/kernel/branches/flat_kernel/core/malloc.inc
+++ b/kernel/branches/flat_kernel/core/malloc.inc
@@ -992,7 +992,7 @@ init_malloc:
            mov [eax+12], eax
            add eax, 16
            cmp eax, mst.smallbins+512
-           jl @B
+           jb @B
 
            ret
 
diff --git a/kernel/branches/flat_kernel/core/taskman.inc b/kernel/branches/flat_kernel/core/taskman.inc
index 6690bcb89a..9e5be67d7a 100644
--- a/kernel/branches/flat_kernel/core/taskman.inc
+++ b/kernel/branches/flat_kernel/core/taskman.inc
@@ -1023,7 +1023,7 @@ proc set_app_params stdcall,slot:dword, params:dword,\
            mov eax, [esi+0x08]       ;app_eip
            mov [ebx+REG_EIP],  eax   ;app_entry
            mov [ebx+REG_CS], dword app_code
-           mov [ebx+REG_EFLAGS], dword 0x3202
+           mov [ebx+REG_EFLAGS], dword 0x1202
 
            mov eax, [esi+0x0C]       ;app_esp
            mov [ebx+REG_APP_ESP], eax    ;app_stack
diff --git a/kernel/branches/flat_kernel/fs/fat12.inc b/kernel/branches/flat_kernel/fs/fat12.inc
index 3f4094a996..46199a7a28 100644
--- a/kernel/branches/flat_kernel/fs/fat12.inc
+++ b/kernel/branches/flat_kernel/fs/fat12.inc
@@ -1125,7 +1125,7 @@ fd_prev_prev_sector     dd      ?
 endg
 
 flp_root_next:
-        cmp     edi, 0xD200-0x20
+        cmp     edi, OS_BASE+0xD200-0x20
         jae     @f
         add     edi, 0x20
         ret     ; CF=0
@@ -1172,7 +1172,7 @@ flp_rootmem_extend_dir:
         ret
 
 flp_notroot_next:
-        cmp     edi, 0xD200-0x20
+        cmp     edi, OS_BASE+0xD200-0x20
         jae     flp_notroot_next_sector
         add     edi, 0x20
         ret     ; CF=0
@@ -1223,7 +1223,7 @@ flp_notroot_end_write:
         popa
         ret
 flp_notroot_next_write:
-        cmp     edi, 0xD200
+        cmp     edi, OS_BASE+0xD200
         jae     @f
         ret
 @@:
@@ -1464,7 +1464,7 @@ fs_FloppyReadFolder:
         cmp     byte [edi+11], 0xF
         jnz     .do_bdfe
         add     edi, 0x20
-        cmp     edi, 0xD200
+        cmp     edi, OS_BASE+0xD200
         jb      .do_bdfe
         pop     eax
         inc     eax
@@ -1496,7 +1496,7 @@ fs_FloppyReadFolder:
         call    fat_entry_to_bdfe
 .l2:
         add     edi, 0x20
-        cmp     edi, 0xD200
+        cmp     edi, OS_BASE+0xD200
         jb      .l1
         pop     eax
         inc     eax