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: 3870 $
+$Revision: 3881 $
         add     al, 128+64+32
         out     dx, al ; номер головки/номер диска
         inc     edx
         mov     al, 30h ; WRITE SECTOR(S)
         out     dx, al ; ATACommand регистр команд
-        popfd
         jmp     .continue
 ;--------------------------------------
 .lba48:
         pushfd
         cli
         add     al, 128+64+32
         out     dx, al ; номер головки/номер диска
         inc     edx
         mov     al, 34h ; WRITE SECTOR(S) EXT
         out     dx, al ; ATACommand регистр команд
-        popfd
 ;--------------------------------------
 .continue:
+        popfd
         call    wait_for_sector_buffer
         cmp     [hd_error], 0
         jz      .done
         call    check_hd_wait_timeout
         cmp     [hd_error], 0
-        jz      .wait
+        jz      .wait
 ; clear Bus Master IDE Command register
         pushfd
         cli
         mov     [IDE_common_irq_param], 0
         mov     dx, [IDEContrRegsBaseAddr]
         mov     al, 0
         out     dx, al
+        popfd
+;--------------------------------------
-        popfd
+align 4
 .done:
         pop     edx
         pop     eax
         ret
         jz      .done
         call    check_hd_wait_timeout
         cmp     [hd_error], 0
-        jz      .wait
+        jz      .wait
 ; clear Bus Master IDE Command register
         pushfd
         cli
         mov     [IDE_common_irq_param], 0
         mov     dx, [IDEContrRegsBaseAddr]
         add     dx, 8
         mov     al, 0
         out     dx, al
+        popfd
+;--------------------------------------
-        popfd
+align 4
 .done:
         pop     edx
         pop     eax
         ret
         jne     .exit
         pushfd
         cli
-        pushad
+        pushad
 ; clear Bus Master IDE Command register
         mov     [IDE_common_irq_param], 0
         mov     dx, [IDEContrRegsBaseAddr]
         mov     al, 0
+        out     dx, al
+; clear Bus Master IDE Status register
+; clear Interrupt bit
+        add     edx, 2
+        mov     al, 4 ; 100b
         out     dx, al
+        popad
+        popfd
-        popad
+;--------------------------------------
-        popfd
+align 4
 .exit:
         mov     al, 1
         ret
         jne     .exit
         pushfd
         cli
-        pushad
+        pushad
 ; clear Bus Master IDE Command register
         mov     [IDE_common_irq_param], 0
         mov     dx, [IDEContrRegsBaseAddr]
         add     dx, 8
         mov     al, 0
+        out     dx, al
+; clear Bus Master IDE Status register
+; clear Interrupt bit
+        add     edx, 2
+        mov     al, 4 ; 100b
         out     dx, al
+        popad
+        popfd
-        popad
+;--------------------------------------
-        popfd
+align 4
 .exit:
         mov     al, 1
         ret
         je      .exit
         pushfd
         cli
-        pushad
+        pushad
 ; clear Bus Master IDE Command register
         xor     ebx, ebx
         mov     dx, [IDEContrRegsBaseAddr]
         mov     eax, IDE_common_irq_param
         cmp     [eax], irq14_num
         add     dx, 8
 ;--------------------------------------
 align 4
 @@:
         out     dx, al
+; clear Bus Master IDE Status register
+; clear Interrupt bit
+        add     edx, 2
+        mov     al, 4 ; 100b
+        out     dx, al
         popad
+        popfd
+;--------------------------------------
-        popfd
+align 4
 .exit:
         mov     al, 1
         ret
 ;-----------------------------------------------------------------------------
         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 ; 110b
         out     dx, al
 ; Select the desired drive
         mov     edx, [hdbase]
         add     edx, 6   ; адрес регистра головок
         mov     al, byte [hdid]
         add     al, 128+64+32
         pop     eax
         mov     [dma_cur_sector], eax
         jmp     hd_read_dma
 ;-----------------------------------------------------------------------------
 cache_write_dma:
-        mov     eax, [cache_chain_ptr]
+        mov     eax, [cache_chain_ptr] ; for what?
         push    esi
+; set data for PRD Table
         mov     eax, IDE_descriptor_table
         mov     edx, eax
         pusha
         mov     edi, (OS_BASE+IDE_DMA)
         mov     dword [edx], IDE_DMA
         shr     ecx, 2
         cld
         rep movsd
         popa
         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
+; clear Bus Master IDE Status register
+; clear Error bit and Interrupt bit
         add     edx, 2
         mov     al, 6
         out     dx, al
 ; Select the desired drive
         mov     edx, [hdbase]
         add     edx, 6   ; адрес регистра головок
         mov     al, byte [hdid]
         add     al, 128+64+32
         inc     edx
         mov     al, 35h ; WRITE 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 device and Start Bus Master
         mov     al, 1
         out     dx, al
         mov     eax, [CURRENT_TASK]
         mov     [dma_process], eax
         mov     eax, [TASK_BASE]
         jmp     @f
 .ide1:
         mov     [IDE_common_irq_param], irq15_num
 @@:
         popfd
+; wait for interrupt
         mov     [dma_cur_sector], not 0x40
         mov     eax, [hd_address_table]
         cmp     [hdbase], eax ; 0x1F0
         jnz     .wait_ide1
         call    wait_for_sector_dma_ide0
         jnz     hd_write_error_dma
         pop     esi
         ret
 ;-----------------------------------------------------------------------------
 uglobal
+align 4
 IDE_Interrupt   dw ?
 IDEContrRegsBaseAddr         dw ?
 IDEContrProgrammingInterface dw ?
 IDE_BAR0_val    dw ?
 IDE_BAR1_val    dw ?

Subversion Repositories Kolibri OS

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