Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 4734 → Rev 4733

/kernel/trunk/blkdev/cd_drv.inc
755,7 → 755,6
cmp eax, 100
jb .end_1
 
pushfd
mov al, [DRIVE_DATA+1]
and al, 11b
cmp al, 10b
828,7 → 827,7
jz .ide8
;--------------------------------------
.end:
popfd
sti
mov eax, [timer_ticks]
mov [timer_ATAPI_check], eax
;--------------------------------------
911,7 → 910,7
.ide0:
cli
cmp [ATAPI_IDE0_lock], 1
jne .ide7_1
jne .end
 
cmp [cd_status], 0
jne .end
930,12 → 929,12
;--------------------------------------
@@:
call syscall_cdaudio.free
jmp .ide7_1
jmp .end
;-----------------------------------------------------------------------------
.ide7:
cli
cmp [ATAPI_IDE7_lock], 1
jne .ide6_1
jne .ide2_1
 
cmp [cd_status], 0
jne .end
954,12 → 953,12
;--------------------------------------
@@:
call syscall_cdaudio.free
jmp .ide6_1
jmp .ide2_1
;-----------------------------------------------------------------------------
.ide6:
cli
cmp [ATAPI_IDE6_lock], 1
jne .ide5_1
jne .ide1_1
 
cmp [cd_status], 0
jne .end
978,12 → 977,12
;--------------------------------------
@@:
call syscall_cdaudio.free
jmp .ide5_1
jmp .ide1_1
;-----------------------------------------------------------------------------
.ide5:
cli
cmp [ATAPI_IDE5_lock], 1
jne .ide4_1
jne .ide0_1
 
cmp [cd_status], 0
jne .end
1002,12 → 1001,12
;--------------------------------------
@@:
call syscall_cdaudio.free
jmp .ide4_1
jmp .ide0_1
;-----------------------------------------------------------------------------
.ide4:
cli
cmp [ATAPI_IDE4_lock], 1
jne .ide11_1
jne .end
 
cmp [cd_status], 0
jne .end
1026,12 → 1025,12
;--------------------------------------
@@:
call syscall_cdaudio.free
jmp .ide11_1
jmp .end
;-----------------------------------------------------------------------------
.ide11:
cli
cmp [ATAPI_IDE11_lock], 1
jne .ide10_1
jne .ide2_1
 
cmp [cd_status], 0
jne .end
1050,12 → 1049,12
;--------------------------------------
@@:
call syscall_cdaudio.free
jmp .ide10_1
jmp .ide2_1
;-----------------------------------------------------------------------------
.ide10:
cli
cmp [ATAPI_IDE10_lock], 1
jne .ide9_1
jne .ide1_1
 
cmp [cd_status], 0
jne .end
1074,12 → 1073,12
;--------------------------------------
@@:
call syscall_cdaudio.free
jmp .ide9_1
jmp .ide1_1
;-----------------------------------------------------------------------------
.ide9:
cli
cmp [ATAPI_IDE9_lock], 1
jne .ide8_1
jne .ide0_1
 
cmp [cd_status], 0
jne .end
1098,7 → 1097,7
;--------------------------------------
@@:
call syscall_cdaudio.free
jmp .ide8_1
jmp .ide0_1
;-----------------------------------------------------------------------------
.ide8:
cli
/kernel/trunk/kernel.asm
977,7 → 977,7
call set_lights
;// mike.dld ]
stdcall attach_int_handler, 1, irq1, 0
DEBUGF 1, "K : IRQ1 return code %x\n", eax
DEBUGF 1, "K : IRQ1 error code %x\n", eax
.no_keyboard:
 
; Load PS/2 mouse driver
1042,9 → 1042,10
mov [timer_ticks_enable], 1 ; for cd driver
 
sti
 
call mtrr_validate
 
; call change_task
 
jmp osloop
 
 
1132,13 → 1133,12
xchg eax, [osloop_nonperiodic_work]
test eax, eax
jz .no_periodic
 
; call [draw_pointer]
call __sys_draw_pointer
call window_check_events
call mouse_check_events
call checkmisc
call checkVga_N13
;--------------------------------------
.no_periodic:
call stack_handler
call check_fdd_motor_status
1145,7 → 1145,6
call check_ATAPI_device_event
call check_lights_state
call check_timers
 
jmp osloop
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; ;