BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /kernel/branches/Kolibri-acpi/fs/ @ 3625

  → /kernel/branches/Kolibri-acpi/fs/ @ 3626

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Regard whitespace Rev 3625 → Rev 3626

/kernel/branches/Kolibri-acpi/fs/fat12.inc
1311,8 → 1311,7
push ecx edi
mov ecx, 8
repnz scasb
push 1
pop eax ; 1 entry
movi eax, 1 ; 1 entry
jnz .notilde
; we need ceil(strlen(esi)/13) additional entries = floor((strlen(esi)+12+13)/13) total
xor eax, eax
1822,8 → 1821,7
jb @b
.fat_err:
pop ecx
push ERROR_FAT_TABLE
pop eax
movi eax, ERROR_FAT_TABLE
stc
ret
@@:
1885,8 → 1883,7
pop edi ecx
pop esi edx
stc
push ERROR_DISK_FULL
pop eax
movi eax, ERROR_DISK_FULL
ret
;----------------------------------------------------------------

/kernel/branches/Kolibri-acpi/fs/fat32.inc
167,8 → 167,7
; in the normal operation, let's hope for the best and allocate data now; if
; it will prove wrong, just deallocate it.
push ebx
push sizeof.FAT
pop eax
movi eax, sizeof.FAT
call malloc
pop ebx
test eax, eax
972,8 → 971,7
jz ntfs_HdReadFolder
cmp [fs_type], 2
jz ext2_HdReadFolder
push ERROR_UNSUPPORTED_FS
pop eax
movi eax, ERROR_UNSUPPORTED_FS
or ebx, -1
ret
@@:
1659,8 → 1657,7
push ecx edi
mov ecx, 8
repnz scasb
push 1
pop eax ; 1 entry
movi eax, 1 ; 1 entry
jnz .notilde
; we need ceil(strlen(esi)/13) additional entries = floor((strlen(esi)+12+13)/13) total
xor eax, eax
2362,8 → 2359,7
jmp .device_err2
.disk_full:
pop eax edx esi
push ERROR_DISK_FULL
pop eax
movi eax, ERROR_DISK_FULL
stc
ret
2390,8 → 2386,7
jz ntfs_HdSetFileEnd
cmp [fs_type], 2
jz ext2_HdSetFileEnd
push ERROR_UNKNOWN_FS
pop eax
movi eax, ERROR_UNKNOWN_FS
ret
@@:
sub ebx, 4
2566,8 → 2561,7
pop eax ecx eax edi
call update_disk
call fat_unlock
push ERROR_DEVICE
pop eax
movi eax, ERROR_DEVICE
ret
@@:
; we will zero data at the end of last sector - remember it
2640,8 → 2634,7
pop eax ecx eax edi
call update_disk
call fat_unlock
push ERROR_FAT_TABLE
pop eax
movi eax, ERROR_FAT_TABLE
ret
fs_HdGetFileInfo:
2771,8 → 2764,7
jz ntfs_HdDelete
cmp [fs_type], 2
jz ext2_HdDelete
push ERROR_UNKNOWN_FS
pop eax
movi eax, ERROR_UNKNOWN_FS
ret
@@:
sub ebx, 4
2866,15 → 2858,13
.err2:
pop edi
call fat_unlock
push ERROR_DEVICE
pop eax
movi eax, ERROR_DEVICE
ret
.error_fat:
popad
pop edi
call fat_unlock
push ERROR_FAT_TABLE
pop eax
movi eax, ERROR_FAT_TABLE
ret
.notempty:
popad
2881,8 → 2871,7
.access_denied2:
pop edi
call fat_unlock
push ERROR_ACCESS_DENIED
pop eax
movi eax, ERROR_ACCESS_DENIED
ret
.empty:
popad

/kernel/branches/Kolibri-acpi/fs/fs_lfn.inc
683,61 → 683,43
fs_HasRamdisk:
mov al, 1 ; we always have ramdisk
ret
fs_HasFloppy:
cmp byte [DRIVE_DATA], 0
setnz al
ret
fs_HasHd0:
mov al, [DRIVE_DATA+1]
and al, 11000000b
cmp al, 01000000b
setz al
test byte [DRIVE_DATA+1], 01000000b
setnz al
ret
fs_HasHd1:
mov al, [DRIVE_DATA+1]
and al, 00110000b
cmp al, 00010000b
setz al
test byte [DRIVE_DATA+1], 00010000b
setnz al
ret
fs_HasHd2:
mov al, [DRIVE_DATA+1]
and al, 00001100b
cmp al, 00000100b
setz al
test byte [DRIVE_DATA+1], 00000100b
setnz al
ret
fs_HasHd3:
mov al, [DRIVE_DATA+1]
and al, 00000011b
cmp al, 00000001b
setz al
test byte [DRIVE_DATA+1], 00000001b
setnz al
ret
;*******************************************************
fs_HasCd0:
mov al, [DRIVE_DATA+1]
and al, 11000000b
cmp al, 10000000b
setz al
test byte [DRIVE_DATA+1], 10000000b
setnz al
ret
fs_HasCd1:
mov al, [DRIVE_DATA+1]
and al, 00110000b
cmp al, 00100000b
setz al
test byte [DRIVE_DATA+1], 00100000b
setnz al
ret
fs_HasCd2:
mov al, [DRIVE_DATA+1]
and al, 00001100b
cmp al, 00001000b
setz al
test byte [DRIVE_DATA+1], 00001000b
setnz al
ret
fs_HasCd3:
mov al, [DRIVE_DATA+1]
and al, 00000011b
cmp al, 00000010b
setz al
test byte [DRIVE_DATA+1], 00000010b
setnz al
ret
;*******************************************************

/kernel/branches/Kolibri-acpi/fs/ntfs.inc
1139,15 → 1139,13
cmp byte [esi], 0
jnz @f
or ebx, -1
push ERROR_ACCESS_DENIED
pop eax
movi eax, ERROR_ACCESS_DENIED
ret
@@:
call ntfs_find_lfn
jnc .found
or ebx, -1
push ERROR_FILE_NOT_FOUND
pop eax
movi eax, ERROR_FILE_NOT_FOUND
ret
.found:
mov [ntfs_cur_attr], 0x80 ; $DATA
1156,8 → 1154,7
call ntfs_read_attr
jnc @f
or ebx, -1
push ERROR_ACCESS_DENIED
pop eax
movi eax, ERROR_ACCESS_DENIED
ret
@@:
pushad
1171,8 → 1168,7
popad
xor ebx, ebx
.eof:
push ERROR_END_OF_FILE
pop eax
movi eax, ERROR_END_OF_FILE
ret
@@:
mov eax, [ebx]
1349,8 → 1345,7
.nomem:
popad
or ebx, -1
push 12
pop eax
movi eax, 12
ret
@@:
mov [ntfs_data.cur_index_buf], eax
1804,14 → 1799,12
ntfs_HdGetFileInfo:
cmp byte [esi], 0
jnz @f
push 2
pop eax
movi eax, 2
ret
@@:
call ntfs_find_lfn
jnc .doit
push ERROR_FILE_NOT_FOUND
pop eax
movi eax, ERROR_FILE_NOT_FOUND
cmp [hd_error], 0
jz @f
mov al, 11