WebSVN – Kolibri OS – Diff – /kernel/trunk/blkdev/hd_drv.inc

 ;; Copyright (C) KolibriOS team 2004-2013. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 3774 $
+$Revision: 3870 $
         call    save_hd_wait_timeout
 ;--------------------------------------
 align 4
 .wait:
         call    change_task
-        cmp     [IDE_common_irq_param], irq14_num
+        cmp     [IDE_common_irq_param], 0
-        jnz     .done
+        jz      .done
         call    check_hd_wait_timeout
         cmp     [hd_error], 0
+        jz      .wait
-        jz      .wait
+        pushfd
         cli
         mov     [IDE_common_irq_param], 0
         mov     dx, [IDEContrRegsBaseAddr]
+        mov     al, 0
-        mov     al, 0
+        out     dx, al
-        out     dx, al
+        popfd
 .done:
         pop     edx
         pop     eax
         call    save_hd_wait_timeout
 ;--------------------------------------
 align 4
 .wait:
         call    change_task
-        cmp     [IDE_common_irq_param], irq15_num
+        cmp     [IDE_common_irq_param], 0
-        jnz     .done
+        jz      .done
         call    check_hd_wait_timeout
         cmp     [hd_error], 0
+        jz      .wait
-        jz      .wait
+        pushfd
         cli
         mov     [IDE_common_irq_param], 0
         mov     dx, [IDEContrRegsBaseAddr]
         add     dx, 8
+        mov     al, 0
-        mov     al, 0
+        out     dx, al
-        out     dx, al
+        popfd
 .done:
         pop     edx
         pop     eax
 dma_hdd             db 0
 allow_dma_access    db 0
 endg
 ;-----------------------------------------------------------------------------
 align 4
-IDE_common_irq_handler:
+IDE_irq_14_handler:
+        cmp     [IDE_common_irq_param], irq14_num
+        jne     .exit
         pushfd
         cli
         pushad
-        xor     ebx, ebx
-        mov     eax, IDE_common_irq_param
-        cmp     [eax], irq15_num
-        mov     [eax], ebx
-        je      @f
-;--------------------------------------
+        mov     [IDE_common_irq_param], 0
         mov     dx, [IDEContrRegsBaseAddr]
         mov     al, 0
+        out     dx, al
+        popad
+        popfd
-        out     dx, al
+.exit:
+        mov     al, 1
-        jmp     .end
+        ret
-;--------------------------------------
+;-----------------------------------------------------------------------------
+align 4
+IDE_irq_15_handler:
+        cmp     [IDE_common_irq_param], irq15_num
-align 4
+        jne     .exit
+        pushfd
+        cli
+        pushad
-@@:
+        mov     [IDE_common_irq_param], 0
         mov     dx, [IDEContrRegsBaseAddr]
         add     dx, 8
         mov     al, 0
+        out     dx, al
+        popad
+        popfd
+.exit:
+        mov     al, 1
+        ret
+;-----------------------------------------------------------------------------
+align 4
+IDE_common_irq_handler:
+        cmp     [IDE_common_irq_param], 0
+        je      .exit
+        pushfd
+        cli
+        pushad
+        xor     ebx, ebx
+        mov     dx, [IDEContrRegsBaseAddr]
+        mov     eax, IDE_common_irq_param
+        cmp     [eax], irq14_num
+        mov     [eax], bl
+        xor     eax, eax
+        je      @f
-        out     dx, al
+        add     dx, 8
 ;--------------------------------------
 align 4
+@@:
+        out     dx, al
 .end:
         popad
+        popfd
-        popfd
+.exit:
         mov     al, 1
         ret
 ;-----------------------------------------------------------------------------
 align 4
         pop     esi ecx
         pop     edx
         pop     eax
         ret
 .notread:
+; set data for PRD Table
         mov     eax, IDE_descriptor_table
         mov     dword [eax], IDE_DMA
         mov     word [eax+4], 0x2000
         sub     eax, OS_BASE
+; select controller Primary or Secondary
         mov     dx, [IDEContrRegsBaseAddr]
         push    eax
         mov     eax, [hd_address_table]
         cmp     [hdbase], eax ; 0x1F0
         pop     eax
         jz      @f
         add     edx, 8
 @@:
         push    edx
+; Bus Master IDE PRD Table Address
         add     edx, 4
+; save IDE_descriptor_table
         out     dx, eax
         pop     edx
+; clear Bus Master IDE Command register
         mov     al, 0
         out     dx, al
+; set write to memory
+;        mov     al, 8 ; 1000b
+;        out     dx, al
+; clear Bus Master IDE Status register
+; clear Error bit and Interrupt bit
         add     edx, 2
-        mov     al, 6
+        mov     al, 6 ; 110b
         out     dx, al
 ; Select the desired drive
         mov     edx, [hdbase]
         inc     edx
         mov     al, 25h ; READ DMA EXT
         out     dx, al ; ATACommand регистр команд
 ;--------------------------------------
 .continue:
+; select controller Primary or Secondary
         mov     dx, [IDEContrRegsBaseAddr]
         mov     eax, [hd_address_table]
         cmp     [hdbase], eax ; 0x1F0
         jz      @f
         add     dx, 8
 @@:
+; set write to memory and Start Bus Master
         mov     al, 9
         out     dx, al
         mov     eax, [CURRENT_TASK]
         mov     [dma_process], eax
         mov     eax, [TASK_BASE]
         mov     [dma_slot_ptr], eax
         mov     eax, [hd_address_table]
         cmp     [hdbase], eax ; 0x1F0
         jnz     .ide1
         mov     [IDE_common_irq_param], irq14_num
         jmp     @f
 .ide1:
         mov     [IDE_common_irq_param], irq15_num
 @@:
+        popfd
-        popfd
+; wait for interrupt
         mov     eax, [hd_address_table]
         cmp     [hdbase], eax ; 0x1F0
         jnz     .wait_ide1
         call    wait_for_sector_dma_ide0

Subversion Repositories Kolibri OS

(root)/kernel/trunk/blkdev/hd_drv.inc – Rev 3774 → 3870