Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3500 → Rev 3499

/kernel/branches/Kolibri-acpi/blkdev/disk.inc
150,7 → 150,7
; 0 if media fields are not used, nonzero otherwise. If .MediaRefCount is
; nonzero, this field is nonzero too; however, when .MediaRefCount goes
; to zero, there is some time interval during which media object is still used.
dw ? ; padding
align 4
; The following fields are not valid unless either .MediaInserted is nonzero
; or they are accessed from a code which has obtained the reference when
; .MediaInserted was nonzero.
381,7 → 381,6
call mutex_init
xor eax, eax
mov dword [esi+DISK.MediaInserted], eax
mov [esi+DISK.MediaRefCount], eax
inc eax
mov [esi+DISK.RefCount], eax
; The DISK structure is initialized.
/kernel/branches/Kolibri-acpi/blkdev/disk_cache.inc
629,9 → 629,7
mov [hdd_appl_data], 0
call write_cache
mov [hdd_appl_data], 1
call write_cache
mov eax, [hd_error]
ret
jmp write_cache
@@:
; The algorithm is straightforward.
push esi
/kernel/branches/Kolibri-acpi/blkdev/hd_drv.inc
340,11 → 340,7
; call clear_application_table_status
; mov esi,hd_timeout_str
; call sys_msg_board_str
if lang eq sp
DEBUGF 1,"K : FS - HD tiempo de espera agotado\n"
else
DEBUGF 1,"K : FS - HD timeout\n"
end if
 
mov [hd_error], 1
pop eax
356,11 → 352,7
; call clear_application_table_status
; mov esi,hd_read_str
; call sys_msg_board_str
if lang eq sp
DEBUGF 1,"K : FS - HD error de lectura\n"
else
DEBUGF 1,"K : FS - HD read error\n"
end if
pop edx eax
ret
 
370,11 → 362,7
; call clear_application_table_status
; mov esi,hd_write_str
; call sys_msg_board_str
if lang eq sp
DEBUGF 1,"K : FS - HD error de escritura\n"
else
DEBUGF 1,"K : FS - HD write error\n"
end if
ret
 
hd_write_error_dma:
382,11 → 370,7
; call clear_application_table_status
; mov esi, hd_write_str
; call sys_msg_board_str
if lang eq sp
DEBUGF 1,"K : FS - HD error de escritura\n"
else
DEBUGF 1,"K : FS - HD write error\n"
end if
DEBUGF 1,"K : FS - HD read error\n"
pop esi
ret
 
395,11 → 379,7
; call clear_application_table_status
; mov esi,hd_lba_str
; call sys_msg_board_str
if lang eq sp
DEBUGF 1,"K : FS - HD error en LBA\n"
else
DEBUGF 1,"K : FS - HD LBA error\n"
end if
jmp LBA_read_ret
 
 
/kernel/branches/Kolibri-acpi/blkdev/rd.inc
2257,10 → 2257,8
jmp .lfndel
.lfndone:
; delete FAT chain
cmp eax, 2
jb .done
cmp eax, 0xFF8
jae .done
test eax, eax
jz .done
lea eax, [RAMDISK_FAT + eax*2]
push dword [eax]
and word [eax], 0
/kernel/branches/Kolibri-acpi/blkdev/rdsave.inc
24,7 → 24,7
mov ebx, saverd_fileinfo
mov [saverd_fileinfo.name], ecx
pushad
call file_system_lfn_protected ;in ebx
call file_system_lfn ;in ebx
popad
mov [esp+32], eax
ret