WebSVN – Kolibri OS – Diff – /kernel/branches/kolibri-process/blkdev/hd_drv.inc

 struct HD_DATA
 hdbase  dd      ?
 hdid    dd      ?
 hdpos   dd      ?
 ends
+;-----------------------------------------------------------------------------
 iglobal
 align 4
 ide_callbacks:
         dd      ide_callbacks.end - ide_callbacks       ; strucsize
         dd      0       ; no close function
 hd0_data        HD_DATA         ?,    0, 1
 hd1_data        HD_DATA         ?, 0x10, 2
 hd2_data        HD_DATA         ?,    0, 3
+hd3_data        HD_DATA         ?, 0x10, 4
+hd4_data        HD_DATA         ?,    0, 5
+hd5_data        HD_DATA         ?, 0x10, 6
+hd6_data        HD_DATA         ?,    0, 7
+hd7_data        HD_DATA         ?, 0x10, 8
+hd8_data        HD_DATA         ?,    0, 9
+hd9_data        HD_DATA         ?, 0x10, 10
+hd10_data       HD_DATA         ?,    0, 11
-hd3_data        HD_DATA         ?, 0x10, 4
+hd11_data       HD_DATA         ?, 0x10, 12
-hd_address_table:
+ide_mutex_table:
+        dd ide_channel1_mutex
+        dd ide_channel2_mutex
+        dd ide_channel3_mutex
+        dd ide_channel4_mutex
-        dd      0x1f0, 0x00, 0x1f0, 0x10
+        dd ide_channel5_mutex
-        dd      0x170, 0x00, 0x170, 0x10
+        dd ide_channel6_mutex
-endg
+endg
 ;-----------------------------------------------------------------------------
 uglobal
 ide_mutex               MUTEX
 ide_channel1_mutex      MUTEX
+ide_channel2_mutex      MUTEX
+ide_channel3_mutex      MUTEX
+ide_channel4_mutex      MUTEX
+ide_channel5_mutex      MUTEX
-ide_channel2_mutex      MUTEX
+ide_channel6_mutex      MUTEX
-endg
+endg
 ;-----------------------------------------------------------------------------
 proc ide_read stdcall uses edi, \
         hd_data, buffer, startsector:qword, numsectors
         ; hd_data = pointer to hd*_data
         ; buffer = pointer to buffer for data
         mov     dword [ecx], 0
         mov     [sectors_todo], eax
 ; 2. Acquire the global lock.
         mov     ecx, ide_mutex
         call    mutex_lock
-        mov     ecx, ide_channel2_mutex
+        mov     ecx, [hd_data]
-        mov     eax, [hd_data]
+        mov     ecx, [ecx+HD_DATA.hdpos]
-        push    ecx
+        dec     ecx
-        mov     ecx, [hd_address_table]
-        cmp     [eax+HD_DATA.hdbase], ecx ; 0x1F0
-        pop     ecx
+        shr     ecx, 1
-        jne     .IDE_Channel_2
+        shl     ecx, 2
-        mov     ecx, ide_channel1_mutex
+        mov     ecx, [ecx + ide_mutex_table]
-.IDE_Channel_2:
         mov     [channel_lock], ecx
         call    mutex_lock
 ; 3. Convert parameters to the form suitable for worker procedures.
 ; Underlying procedures do not know about 64-bit sectors.
 ; Worker procedures use global variables and edi for [buffer].
         cmp     dword [startsector+4], 0
         jnz     .fail
         and     [hd_error], 0
         mov     ecx, [hd_data]
         mov     eax, [ecx+HD_DATA.hdbase]
         mov     [hdbase], eax
         mov     eax, [ecx+HD_DATA.hdid]
 ; 4. Worker procedures take one sectors per time, so loop over all sectors to read.
 .sectors_loop:
 ; DMA read is permitted if [allow_dma_access]=1 or 2
         cmp     [allow_dma_access], 2
         ja      .nodma
-        cmp     [dma_hdd], 1
-        jnz     .nodma
-;--------------------------------------
-        push    eax
-        mov     eax, [hd_address_table]
-        cmp     [hdbase], eax ; 0x1F0
-        pop     eax
-        jnz     @f
+        push    eax ecx
+        mov     ecx, [hdpos]
-        test    [DRIVE_DATA+1], byte 10100000b
+        dec     ecx
+        shr     ecx, 2
+        imul    ecx, sizeof.IDE_DATA
+        add     ecx, IDE_controller_1
+        mov     [IDE_controller_pointer], ecx
-        jnz     .nodma
+        mov     eax, [hdpos]
+        dec     eax
+        and     eax, 11b
-        jmp     .dma
+        shr     eax, 1
+        add     eax, ecx
-@@:
+        cmp     [eax+IDE_DATA.dma_hdd_channel_1], 1
-        test    [DRIVE_DATA+1], byte 1010b
+        pop     ecx eax
-        jnz     .nodma
-.dma:
+        jnz     .nodma
 ;--------------------------------------
+        call    hd_read_dma
-        call    hd_read_dma
+        jmp     @f
-        jmp     @f
+;--------------------------------------
+.nodma:
-.nodma:
+        call    hd_read_pio
-        call    hd_read_pio
+;--------------------------------------
 @@:
+        cmp     [hd_error], 0
-        cmp     [hd_error], 0
+        jnz     .fail
         jnz     .fail
         mov     ecx, [numsectors]
         inc     dword [ecx]     ; one more sector is read
+        dec     [sectors_todo]
-        dec     [sectors_todo]
+        jz      .done
         jz      .done
+        inc     eax
-        inc     eax
+        jnz     .sectors_loop
-        jnz     .sectors_loop
+;--------------------------------------
 ; 5. Loop is done, either due to error or because everything is done.
 ; Release the global lock and return the corresponding status.
 .fail:
+        mov     ecx, [channel_lock]
-        mov     ecx, [channel_lock]
+        call    mutex_unlock
         call    mutex_unlock
+        mov     ecx, ide_mutex
-        mov     ecx, ide_mutex
+        call    mutex_unlock
         call    mutex_unlock
+        or      eax, -1
-        or      eax, -1
+        ret
-        ret
+;--------------------------------------
 .done:
+        mov     ecx, [channel_lock]
-        mov     ecx, [channel_lock]
+        call    mutex_unlock
         call    mutex_unlock
+        mov     ecx, ide_mutex
-        mov     ecx, ide_mutex
+        call    mutex_unlock
         call    mutex_unlock
         xor     eax, eax
-        ret
+        ret
 endp
 ;-----------------------------------------------------------------------------
 proc ide_write stdcall uses esi edi, \
         hd_data, buffer, startsector:qword, numsectors
         ; hd_data = pointer to hd*_data
         mov     dword [ecx], 0
         mov     [sectors_todo], eax
 ; 2. Acquire the global lock.
         mov     ecx, ide_mutex
         call    mutex_lock
-        mov     ecx, ide_channel2_mutex
+        mov     ecx, [hd_data]
-        mov     eax, [hd_data]
+        mov     ecx, [ecx+HD_DATA.hdpos]
-        push    ecx
+        dec     ecx
-        mov     ecx, [hd_address_table]
-        cmp     [eax+HD_DATA.hdbase], ecx ; 0x1F0
-        pop     ecx
+        shr     ecx, 1
-        jne     .IDE_Channel_2
+        shl     ecx, 2
-        mov     ecx, ide_channel1_mutex
+        mov     ecx, [ecx + ide_mutex_table]
-.IDE_Channel_2:
         mov     [channel_lock], ecx
         call    mutex_lock
 ; 3. Convert parameters to the form suitable for worker procedures.
 ; Underlying procedures do not know about 64-bit sectors.
 ; Worker procedures use global variables and esi for [buffer].
         cmp     dword [startsector+4], 0
         jnz     .fail
         and     [hd_error], 0
         mov     ecx, [hd_data]
         mov     eax, [ecx+HD_DATA.hdbase]
         mov     [hdbase], eax
         mov     eax, [ecx+HD_DATA.hdid]
 ; loop until all sectors will be processed.
 .sectors_loop:
         mov     ecx, 16
         cmp     ecx, [sectors_todo]
         jbe     @f
         mov     ecx, [sectors_todo]
+;--------------------------------------
 @@:
         mov     [cache_chain_size], cl
 ; DMA write is permitted only if [allow_dma_access]=1
         cmp     [allow_dma_access], 2
         jae     .nodma
-        cmp     [dma_hdd], 1
-        jnz     .nodma
-;--------------------------------------
-        push    eax
-        mov     eax, [hd_address_table]
-        cmp     [hdbase], eax ; 0x1F0
-        pop     eax
-        jnz     @f
+        push    eax ecx
+        mov     ecx, [hdpos]
-        test    [DRIVE_DATA+1], byte 10100000b
+        dec     ecx
+        shr     ecx, 2
+        imul    ecx, sizeof.IDE_DATA
+        add     ecx, IDE_controller_1
+        mov     [IDE_controller_pointer], ecx
-        jnz     .nodma
+        mov     eax, [hdpos]
+        dec     eax
+        and     eax, 11b
-        jmp     .dma
+        shr     eax, 1
+        add     eax, ecx
-@@:
+        cmp     [eax+IDE_DATA.dma_hdd_channel_1], 1
-        test    [DRIVE_DATA+1], byte 1010b
+        pop     ecx eax
-        jnz     .nodma
-.dma:
+        jnz     .nodma
 ;--------------------------------------
+        call    cache_write_dma
-        call    cache_write_dma
+        jmp     .common
-        jmp     .common
+;--------------------------------------
 .nodma:
+        mov     [cache_chain_size], 1
-        mov     [cache_chain_size], 1
+        call    cache_write_pio
-        call    cache_write_pio
+;--------------------------------------
 .common:
+        cmp     [hd_error], 0
-        cmp     [hd_error], 0
+        jnz     .fail
         jnz     .fail
         movzx   ecx, [cache_chain_size]
         mov     eax, [numsectors]
         add     [eax], ecx
+        sub     [sectors_todo], ecx
-        sub     [sectors_todo], ecx
+        jz      .done
         jz      .done
+        add     [edi], ecx
-        add     [edi], ecx
+        jc      .fail
         jc      .fail
         shl     ecx, 9
+        add     esi, ecx
-        add     esi, ecx
+        jmp     .sectors_loop
-        jmp     .sectors_loop
+;--------------------------------------
 ; 5. Loop is done, either due to error or because everything is done.
 ; Release the global lock and return the corresponding status.
 .fail:
+        mov     ecx, [channel_lock]
-        mov     ecx, [channel_lock]
+        call    mutex_unlock
         call    mutex_unlock
+        mov     ecx, ide_mutex
-        mov     ecx, ide_mutex
+        call    mutex_unlock
         call    mutex_unlock
+        or      eax, -1
-        or      eax, -1
+        ret
-        ret
+;--------------------------------------
 .done:
+        mov     ecx, [channel_lock]
-        mov     ecx, [channel_lock]
+        call    mutex_unlock
         call    mutex_unlock
+        mov     ecx, ide_mutex
-        mov     ecx, ide_mutex
+        call    mutex_unlock
         call    mutex_unlock
         xor     eax, eax
-        ret
+        ret
 endp
 ;-----------------------------------------------------------------------------
 ; This is a stub.
 proc ide_querymedia stdcall, hd_data, mediainfo
         mov     eax, [mediainfo]
         mov     [eax+DISKMEDIAINFO.Flags], 0
         mov     [eax+DISKMEDIAINFO.SectorSize], 512
         or      dword [eax+DISKMEDIAINFO.Capacity], 0xFFFFFFFF
         or      dword [eax+DISKMEDIAINFO.Capacity+4], 0xFFFFFFFF
         xor     eax, eax
-        ret
-endp
+        ret
 endp
 ;-----------------------------------------------------------------------------
 align 4
 ; input: eax = sector, edi -> buffer
 ; output: edi = edi + 512
-hd_read_pio:
-        push    eax edx
+hd_read_pio:
         push    eax edx
 ; Select the desired drive
         mov     edx, [hdbase]
         add     edx, 6   ;адрес регистра головок
         mov     al, byte [hdid]
         add     al, 128+64+32
+        out     dx, al; номер головки/номер диска
         out     dx, al; номер головки/номер диска
         call    wait_for_hd_idle
-        call    wait_for_hd_idle
         cmp     [hd_error], 0
-        jne     hd_read_error
+        cmp     [hd_error], 0
         jne     hd_read_error
 ; ATA with 28 or 48 bit for sector number?
         mov     eax, [esp+4]
         cmp     [hd_error], 0
         jne     hd_read_error
         pushfd
-        cli
         cli
         mov     ecx, 256
         mov     edx, [hdbase]
         cld
         rep insw
         mov     al, byte [hdid]
         add     al, 128+64+32
         out     dx, al ; номер головки/номер диска
+        call    wait_for_hd_idle
         call    wait_for_hd_idle
         cmp     [hd_error], 0
         jne     hd_write_error
         add     edx, 0x7
 ;--------------------------------------
 align 4
 wfhil1:
         call    check_hd_wait_timeout
         cmp     [hd_error], 0
         jne     @f
         in      al, dx
         test    al, 128
-        jnz     wfhil1
+        jnz     wfhil1
 ;--------------------------------------
 @@:
         pop     edx eax
         ret
 ;-----------------------------------------------------------------------------
         call    save_hd_wait_timeout
 ;--------------------------------------
 align 4
 hdwait_sbuf:                  ; wait for sector buffer to be ready
         call    check_hd_wait_timeout
         cmp     [hd_error], 0
         jne     @f
         in      al, dx
         cmp     [hd_setup], 1   ; do not mark error for setup request
         je      buf_wait_ok
         test    al, 1           ; previous command ended up with an error
+        jz      buf_wait_ok
-        jz      buf_wait_ok
+;--------------------------------------
 @@:
-        mov     [hd_error], 1
+        mov     [hd_error], 1
 ;--------------------------------------
 buf_wait_ok:
         pop     edx eax
         ret
 ;-----------------------------------------------------------------------------
         call    save_hd_wait_timeout
 ;--------------------------------------
 align 4
 .wait:
         call    change_task
         cmp     [IDE_common_irq_param], 0
         jz      .done
+        call    check_hd_wait_timeout
         call    check_hd_wait_timeout
         cmp     [hd_error], 0
-        jz      .wait
-; clear Bus Master IDE Command register
-        pushfd
+        jz      .wait
         cli
-        mov     [IDE_common_irq_param], 0
-        mov     dx, [IDEContrRegsBaseAddr]
-        mov     al, 0
-        out     dx, al
-        popfd
+        mov     [IDE_common_irq_param], 0
-;--------------------------------------
-align 4
+;--------------------------------------
 .done:
         pop     edx
         pop     eax
         ret
         call    save_hd_wait_timeout
 ;--------------------------------------
 align 4
 .wait:
         call    change_task
         cmp     [IDE_common_irq_param], 0
         jz      .done
+        call    check_hd_wait_timeout
         call    check_hd_wait_timeout
         cmp     [hd_error], 0
-        jz      .wait
-; clear Bus Master IDE Command register
-        pushfd
+        jz      .wait
         cli
-        mov     [IDE_common_irq_param], 0
-        mov     dx, [IDEContrRegsBaseAddr]
-        add     dx, 8
-        mov     al, 0
-        out     dx, al
-        popfd
+        mov     [IDE_common_irq_param], 0
-;--------------------------------------
-align 4
+;--------------------------------------
 .done:
         pop     edx
         pop     eax
         ret
 ;-----------------------------------------------------------------------------
 iglobal
 align 4
+; note that IDE descriptor table must be 4-byte aligned
-; note that IDE descriptor table must be 4-byte aligned and do not cross 4K boundary
+; and do not cross 4K boundary
 IDE_descriptor_table:
         dd IDE_DMA
         dw 0x2000
 IDE_common_irq_param db 0
 endg
 ;-----------------------------------------------------------------------------
 uglobal
 ; all uglobals are zeroed at boot
-dma_process         dd 0
-dma_slot_ptr        dd 0
-cache_chain_pos     dd 0
 cache_chain_ptr     dd 0
 cache_chain_size    db 0
-cache_chain_started db 0
-dma_task_switched   db 0
-dma_hdd             db 0
 allow_dma_access    db 0
 endg
 ;-----------------------------------------------------------------------------
 align 4
 IDE_irq_14_handler:
+;        DEBUGF  1, 'K : IDE_irq_14_handler %x\n', [IDE_common_irq_param]:2
         cmp     [IDE_common_irq_param], irq14_num
         jne     .exit
         pushfd
         cli
         pushad
+        mov     [IDE_common_irq_param], 0
-        mov     [IDE_common_irq_param], 0
+        mov     ecx, [IDE_controller_pointer]
-        mov     dx, [IDEContrRegsBaseAddr]
+        mov     dx, [ecx+IDE_DATA.RegsBaseAddres]
 ; test whether it is our interrupt?
         add     edx, 2
         in      al, dx
         test    al, 100b
         popad
         popfd
         mov     al, 1
         ret
 ;--------------------------------------
-align 4
 @@:
         popad
         popfd
 ;--------------------------------------
-align 4
 .exit:
         mov     al, 0
         ret
 ;-----------------------------------------------------------------------------
 align 4
 IDE_irq_15_handler:
+;        DEBUGF  1, 'K : IDE_irq_15_handler %x\n', [IDE_common_irq_param]:2
         cmp     [IDE_common_irq_param], irq15_num
         jne     .exit
         pushfd
         cli
         pushad
+        mov     [IDE_common_irq_param], 0
-        mov     [IDE_common_irq_param], 0
+        mov     ecx, [IDE_controller_pointer]
-        mov     dx, [IDEContrRegsBaseAddr]
+        mov     dx, [ecx+IDE_DATA.RegsBaseAddres]
         add     dx, 8
 ; test whether it is our interrupt?
         add     edx, 2
         in      al, dx
         popad
         popfd
         mov     al, 1
         ret
 ;--------------------------------------
-align 4
 @@:
         popad
         popfd
 ;--------------------------------------
-align 4
 .exit:
         mov     al, 0
         ret
 ;-----------------------------------------------------------------------------
 align 4
 IDE_common_irq_handler:
+;        DEBUGF  1, 'K : IDE_common_irq_handler %x\n', [IDE_common_irq_param]:2
+        pushfd
+        cli
         cmp     [IDE_common_irq_param], 0
         je      .exit
-        pushfd
         cli
         pushad
+        xor     ebx, ebx
-        xor     ebx, ebx
+        mov     ecx, [IDE_controller_pointer]
-        mov     dx, [IDEContrRegsBaseAddr]
+        mov     dx, [ecx+IDE_DATA.RegsBaseAddres]
         mov     eax, IDE_common_irq_param
         cmp     [eax], irq14_num
         mov     [eax], bl
         je      @f
-        add     dx, 8
-;--------------------------------------
+        add     dx, 8
-align 4
+;--------------------------------------
 @@:
 ; test whether it is our interrupt?
         add     edx, 2
         popad
         popfd
         mov     al, 1
         ret
 ;--------------------------------------
-align 4
 @@:
         popad
-        popfd
 ;--------------------------------------
-align 4
 .exit:
+        popfd
         mov     al, 0
         ret
 ;-----------------------------------------------------------------------------
 align 4
 hd_read_dma:
         push    eax
         push    edx
         mov     edx, [dma_hdpos]
         cmp     edx, [hdpos]
         jne     .notread
         mov     edx, [dma_cur_sector]
         cmp     eax, edx
         jb      .notread
         add     edx, 15
         cmp     [esp+4], edx
         ja      .notread
         mov     eax, [esp+4]
         sub     eax, [dma_cur_sector]
         shl     eax, 9
         add     eax, (OS_BASE+IDE_DMA)
         push    ecx esi
         mov     esi, eax
         mov     ecx, 512/4
         cld
         rep movsd
         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     ecx, [IDE_controller_pointer]
-        mov     dx, [IDEContrRegsBaseAddr]
+        mov     dx, [ecx+IDE_DATA.RegsBaseAddres]
         push    eax
-        mov     eax, [hd_address_table]
+        mov     eax, [hdpos]
+        dec     eax
-        cmp     [hdbase], eax ; 0x1F0
+        test    eax, 10b
         pop     eax
         jz      @f
         add     edx, 8
+;--------------------------------------
 @@:
         push    edx
 ; Bus Master IDE PRD Table Address
         add     edx, 4
 ; save IDE_descriptor_table
         mov     al, byte [hdid]
         add     al, 128+64+32
         out     dx, al ; номер головки/номер диска
+        call    wait_for_hd_idle
         call    wait_for_hd_idle
         cmp     [hd_error], 0
-        jnz     hd_read_error
         jnz     hd_read_error
 ; ATA with 28 or 48 bit for sector number?
         mov     eax, [esp+4]
 ; -10h because the PreCache hits the boundary between lba28 and lba48
 ; 10h = 16  - size of PreCache
         mov     al, 25h ; READ DMA EXT
         out     dx, al ; ATACommand регистр команд
 ;--------------------------------------
 .continue:
 ; select controller Primary or Secondary
+        mov     ecx, [IDE_controller_pointer]
-        mov     dx, [IDEContrRegsBaseAddr]
+        mov     dx, [ecx+IDE_DATA.RegsBaseAddres]
-        mov     eax, [hd_address_table]
+        mov     eax, [hdpos]
+        dec     eax
-        cmp     [hdbase], eax ; 0x1F0
+        test    eax, 10b
         jz      @f
         add     dx, 8
+;--------------------------------------
 @@:
 ; set write to memory and Start Bus Master
         mov     al, 9
         out     dx, al
-        mov     eax, [CURRENT_TASK]
+        mov     eax, [hdpos]
-        mov     [dma_process], eax
+        dec     eax
-        mov     eax, [TASK_BASE]
-        mov     [dma_slot_ptr], eax
-        mov     eax, [hd_address_table]
-        cmp     [hdbase], eax ; 0x1F0
+        test    eax, 10b
         jnz     .ide1
+        mov     [IDE_common_irq_param], irq14_num
-        mov     [IDE_common_irq_param], irq14_num
+        jmp     @f
-        jmp     @f
+;--------------------------------------
+.ide1:
-.ide1:
+        mov     [IDE_common_irq_param], irq15_num
-        mov     [IDE_common_irq_param], irq15_num
+;--------------------------------------
 @@:
         popfd
+; wait for interrupt
-; wait for interrupt
+        mov     eax, [hdpos]
-        mov     eax, [hd_address_table]
+        dec     eax
+        test    eax, 10b
-        cmp     [hdbase], eax ; 0x1F0
+        jnz     .wait_ide1
         jnz     .wait_ide1
+        call    wait_for_sector_dma_ide0
-        call    wait_for_sector_dma_ide0
+        jmp     @f
-        jmp     @f
+;--------------------------------------
+.wait_ide1:
-.wait_ide1:
+        call    wait_for_sector_dma_ide1
-        call    wait_for_sector_dma_ide1
+;--------------------------------------
 @@:
+        cmp     [hd_error], 0
-        cmp     [hd_error], 0
+        jnz     hd_read_error
         jnz     hd_read_error
         mov     eax, [hdpos]
         mov     [dma_hdpos], eax
+        pop     edx
-        pop     edx
+        pop     eax
         pop     eax
         mov     [dma_cur_sector], eax
         jmp     hd_read_dma
 ;-----------------------------------------------------------------------------
 cache_write_dma:
         mov     eax, [cache_chain_ptr] ; for what?
         push    esi
 ; set data for PRD Table
+        mov     eax, IDE_descriptor_table
-        mov     eax, IDE_descriptor_table
+        mov     edx, eax
         mov     edx, eax
         pusha
         mov     edi, (OS_BASE+IDE_DMA)
         mov     dword [edx], IDE_DMA
         movzx   ecx, [cache_chain_size]
         shl     ecx, 9
         mov     word [edx+4], cx
         shr     ecx, 2
         cld
+        rep movsd
-        rep movsd
+        popa
         popa
+        sub     eax, OS_BASE
-        sub     eax, OS_BASE
+; select controller Primary or Secondary
+        mov     ecx, [IDE_controller_pointer]
-; select controller Primary or Secondary
+        mov     dx, [ecx+IDE_DATA.RegsBaseAddres]
-        mov     dx, [IDEContrRegsBaseAddr]
+        push    eax
-        push    eax
+        mov     eax, [hdpos]
-        mov     eax, [hd_address_table]
+        dec     eax
-        cmp     [hdbase], eax ; 0x1F0
+        test    eax, 10b
+        pop     eax
-        pop     eax
+        jz      @f
-        jz      @f
+        add     edx, 8
-        add     edx, 8
+;--------------------------------------
 @@:
         push    edx
 ; Bus Master IDE PRD Table Address
         mov     al, byte [hdid]
         add     al, 128+64+32
         out     dx, al ; номер головки/номер диска
+        call    wait_for_hd_idle
         call    wait_for_hd_idle
         cmp     [hd_error], 0
-        jnz     hd_write_error_dma
         jnz     hd_write_error_dma
 ; ATA with 28 or 48 bit for sector number?
         mov     esi, [cache_chain_ptr]
         mov     eax, [esi]
 ; -40h because the PreCache hits the boundary between lba28 and lba48
         mov     al, 35h ; WRITE DMA EXT
         out     dx, al ; ATACommand регистр команд
 ;--------------------------------------
 .continue:
 ; select controller Primary or Secondary
+        mov     ecx, [IDE_controller_pointer]
-        mov     dx, [IDEContrRegsBaseAddr]
+        mov     dx, [ecx+IDE_DATA.RegsBaseAddres]
-        mov     eax, [hd_address_table]
+        mov     eax, [hdpos]
+        dec     eax
-        cmp     [hdbase], eax ; 0x1F0
+        test    eax, 10b
         jz      @f
         add     dx, 8
+;--------------------------------------
 @@:
 ; set write to device and Start Bus Master
         mov     al, 1
         out     dx, al
-        mov     eax, [CURRENT_TASK]
+        mov     eax, [hdpos]
-        mov     [dma_process], eax
+        dec     eax
-        mov     eax, [TASK_BASE]
+        test    eax, 10b
-        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
-        jmp     @f
+;--------------------------------------
 .ide1:
+        mov     [IDE_common_irq_param], irq15_num
-        mov     [IDE_common_irq_param], irq15_num
+;--------------------------------------
 @@:
         popfd
 ; wait for interrupt
+        mov     [dma_cur_sector], not 0x40
-        mov     [dma_cur_sector], not 0x40
+        mov     eax, [hdpos]
-        mov     eax, [hd_address_table]
+        dec     eax
-        cmp     [hdbase], eax ; 0x1F0
+        test    eax, 10b
+        jnz     .wait_ide1
         jnz     .wait_ide1
+        call    wait_for_sector_dma_ide0
         call    wait_for_sector_dma_ide0
+        jmp     @f
-        jmp     @f
+;--------------------------------------
 .wait_ide1:
+        call    wait_for_sector_dma_ide1
-        call    wait_for_sector_dma_ide1
+;--------------------------------------
 @@:
         cmp     [hd_error], 0
         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 ?
-IDE_BAR2_val    dw ?
-IDE_BAR3_val    dw ?
-endg
-;-----------------------------------------------------------------------------
 ;-----------------------------------------------------------------------------
 proc clear_pci_ide_interrupts
+        mov     esi, pcidev_list
+;--------------------------------------
-        mov     esi, pcidev_list
+align 4
 .loop:
         mov     esi, [esi+PCIDEV.fd]
         cmp     esi, pcidev_list
+        jz      .done
-        jz      .done
+;        cmp     [esi+PCIDEV.class], 0x01018F
+        mov     eax, [esi+PCIDEV.class]
+        shr     eax, 4
-        cmp     [esi+PCIDEV.class], 0x01018F
+        cmp     eax, 0x01018
+        jnz     .loop
         jnz     .loop
         mov     ah, [esi+PCIDEV.bus]
         mov     al, 2
         mov     bh, [esi+PCIDEV.devfn]
         mov     bl, 0x20
+        call    pci_read_reg
         call    pci_read_reg
         and     eax, 0FFFCh
         mov     edx, eax
         add     edx, 2
         in      al, dx
         DEBUGF 1,'port[%x] = %x ',dx,al
         out     dx, al
         in      al, dx
         DEBUGF 1,'-> %x\n',al
         jmp     .loop
+;--------------------------------------
 .done:
         ret
 endp
+;-----------------------------------------------------------------------------

Subversion Repositories Kolibri OS

(root)/kernel/branches/kolibri-process/blkdev/hd_drv.inc – Rev 4587 → 4923