badpork/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Additional check for IDE controllers

Browse Source 
git-svn-id: svn://kolibrios.org@3785 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79) 2013-07-09 00:34:01 +00:00
parent 114a0ef2bb
commit bb7366e80a
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/trunk/detect/dev_hdcd.inc
View File

@ -17,6 +17,9 @@ $Revision$
;**************************************************** ;****************************************************
;* ПОИСК HDD и CD * ;* ПОИСК HDD и CD *
;**************************************************** ;****************************************************
cmp [IDEContrProgrammingInterface], 0
je EndFindHDD
FindHDD: FindHDD:
mov [ChannelNumber], 1 mov [ChannelNumber], 1
mov [DiskNumber], 0 mov [DiskNumber], 0

8
kernel/trunk/kernel.asm
View File

@ -755,12 +755,15 @@ no_mode_0x12:
mov esi, boot_enableirq mov esi, boot_enableirq
call boot_log call boot_log
; Enable timer IRQ (IRQ0) and hard drives IRQs (IRQ14, IRQ15) ; Enable timer IRQ (IRQ0) and co-processor IRQ (IRQ13)
; they are used: when partitions are scanned, hd_read relies on timer ; they are used: when partitions are scanned, hd_read relies on timer
call unmask_timer call unmask_timer
stdcall enable_irq, 2 ; @#$%! PIC stdcall enable_irq, 2 ; @#$%! PIC
stdcall enable_irq, 13 ; co-processor stdcall enable_irq, 13 ; co-processor
cmp [IDEContrProgrammingInterface], 0
je @f
mov esi, boot_disabling_ide mov esi, boot_disabling_ide
call boot_log call boot_log
;-------------------------------------- ;--------------------------------------
@ -776,6 +779,7 @@ no_mode_0x12:
mov dx, [IDE_BAR3_val] ;0x374 mov dx, [IDE_BAR3_val] ;0x374
add dx, 2 ;0x376 add dx, 2 ;0x376
out dx, al out dx, al
@@:
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
;!!!!!!!!!!!!!!!!!!!!!!!!!! ;!!!!!!!!!!!!!!!!!!!!!!!!!!
; mov esi, boot_detectdisks ; mov esi, boot_detectdisks
@ -1111,6 +1115,8 @@ end if
cmp [IDEContrRegsBaseAddr], 0 cmp [IDEContrRegsBaseAddr], 0
setnz [dma_hdd] setnz [dma_hdd]
cmp [IDEContrProgrammingInterface], 0
je set_interrupts_for_IDE_controllers.continue
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; set interrupts for IDE Controller ; set interrupts for IDE Controller
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------