fs_HdDelete:

* correct check for ext2 partition type (never reached ext2 implementation)

reserve_cd_channel:
* jump to correct label (wrong channel was being reserved if retry occured)
* re-enable interrupts (were being masked upon proc return)


git-svn-id: svn://kolibrios.org@2044 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Mihail Semenyako (mike.dld) 2011-08-10 19:21:44 +00:00
parent 6c55e4b3c3
commit 74263ea13b
2 changed files with 4 additions and 2 deletions

View File

@ -2787,7 +2787,7 @@ fs_HdSetFileInfo:
fs_HdDelete:
cmp [fs_type], 1
jz ntfs_HdDelete
cmp [fs_type], 1
cmp [fs_type], 2
jz ext2_HdDelete
cmp [fs_type], 16
jz @f

View File

@ -54,12 +54,14 @@ reserve_cd_channel:
je .reserve_ok_2
sti
call change_task
jmp .IDE_Channel_1
jmp .IDE_Channel_2
.reserve_ok_1:
mov [IDE_Channel_1],1
sti
ret
.reserve_ok_2:
mov [IDE_Channel_2],1
sti
ret
free_cd_channel: