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

     ctba_arr      rd 32 ; ctba_arr[0] = clb[0].ctba, ... and so on.
     port          dd ? ; address of correspoding HBA_PORT structure
     portno        dd ? ; port index, 0..31
     drive_type    db ? ; drive type
     sector_count  dq ? ; number of sectors
+    ctr_ptr       dd ? ; pointer to controller to which port belongs
 ends
 ; Register FIS – Host to Device
 struct FIS_REG_H2D
         mov     ecx, ebx
         imul    ecx, sizeof.PORT_DATA
         add     ecx, AHCI_CTR.port_data_arr
+        add     ecx, [ctr_ptr]
+        mov     eax, [ctr_ptr]
-        add     ecx, [ctr_ptr]
+        mov     [ecx + PORT_DATA.ctr_ptr], eax ; to which controller the port belongs
         stdcall ahci_port_rebase, edi, ebx, ecx
         endl
         pushad
-        mov     esi, [pdata] ; esi - address of PORT_DATA struct of port
-        mov     edi, [esi + PORT_DATA.port] ; edi - address of HBA_PORT struct of port
-        mov     eax, edi
+        mov     esi, [pdata] ; esi - address of PORT_DATA struct of port
-        call    ahci_find_cmdslot
+        stdcall ahci_find_cmdslot, esi
         jne     @f
         mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.command], ATAPI_IDENTIFY
 @@:
         mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.device], 0
+        mov     edi, [esi + PORT_DATA.port] ; edi - address of HBA_PORT struct of port
         ; Wait on previous command to complete, before issuing new command.
         stdcall ahci_port_wait, edi, AHCI_PORT_TIMEOUT
         ; DEBUGF  1, "eax = %x\n", eax
         pushad
         DEBUGF  AHCI_DBGLVL, "    ahci_rw_sectors: buffer = 0x%x, startsector = 0x%x:%x, numsectors = %u, is_write = %u\n", [vbuf], [startsector], [startsector + 4], [numsectors], [is_write]:1
-        mov     esi, [pdata] ; esi - address of PORT_DATA struct of port
-        mov     edi, [esi + PORT_DATA.port] ; edi - address of HBA_PORT struct of port
-        mov     eax, edi
+        mov     esi, [pdata] ; esi - address of PORT_DATA struct of port
-        call    ahci_find_cmdslot
+        stdcall ahci_find_cmdslot, esi
         cmp     eax, -1
         jne     .cmdslot_found
         mov     ebx, [numsectors]
         mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.countl], bl
         shr     ebx, 8
         mov     byte [eax + HBA_CMD_TBL.cfis + FIS_REG_H2D.counth], bl
+        mov     edi, [esi + PORT_DATA.port] ; edi - address of HBA_PORT struct of port
         ; Wait on previous command to complete, before issuing new command.
         stdcall ahci_port_wait, edi, AHCI_PORT_TIMEOUT
                 numsectors dd ?
         endl
+        pushad
-        pushad
+        mov     ecx, [pdata]
         mov     ecx, [ecx + PORT_DATA.ctr_ptr]
-        mov     ecx, ctr1_data.mutex  ; why ctr1 ? TODO: make for corresponding controller
+        mov     ecx, [ecx + AHCI_CTR.mutex]
         call    mutex_lock
         adc     dword [startsector + 4], 0
         jmp     .read_loop
+.read_loop_end:
-.read_loop_end:
+        mov     ecx, [pdata]
         mov     ecx, [ecx + PORT_DATA.ctr_ptr]
-        mov     ecx, ctr1_data.mutex  ; why ctr1 ? TODO: make for corresponding controller
+        mov     ecx, [ecx + AHCI_CTR.mutex]
         call    mutex_unlock
                 numsectors dd ?
         endl
+        pushad
-        pushad
+        mov     ecx, [pdata]
         mov     ecx, [ecx + PORT_DATA.ctr_ptr]
-        mov     ecx, ctr1_data.mutex  ; why ctr1 ? TODO: make for corresponding controller
+        mov     ecx, [ecx + AHCI_CTR.mutex]
         call    mutex_lock
         adc     dword [startsector + 4], 0
         jmp     .write_loop
+.write_loop_end:
-.write_loop_end:
+        mov     ecx, [pdata]
         mov     ecx, [ecx + PORT_DATA.ctr_ptr]
-        mov     ecx, ctr1_data.mutex  ; why ctr1 ? TODO: make for corresponding controller
+        mov     ecx, [ecx + AHCI_CTR.mutex]
         call    mutex_unlock
 ; ---------------------------------------------------------------------------
 ; in: port - address of HBA_PORT structure
 ;     portno - port index (0..31)
+;     pdata - address of PORT_DATA structure
+; out:
-;     pdata - address of PORT_DATA structure
+;     rebases port and fills pdata with mappings
 proc ahci_port_rebase stdcall, port: dword, portno: dword, pdata: dword
         locals
             phys_page1  dd ?
             virt_page1  dd ?
         ret
 endp
 ; ----------------------------------------------------------- ; TODO check
 ; Find a free command list slot
-; in: eax - address of HBA_PORT structure
+; in: pdata - address of HBA_PORT structure
 ; out: eax - if not found -1, else slot index
-ahci_find_cmdslot:
+proc ahci_find_cmdslot stdcall, pdata: dword
+        push    ebx ecx edx esi
+        mov     esi, [pdata]
+        mov     eax, [esi + PORT_DATA.port]
         push    ebx ecx edx esi
         ; If not set in SACT and CI, the slot is free
         mov     ebx, [eax + HBA_PORT.sata_active]
         or      ebx, [eax + HBA_PORT.command_issue] ; ebx = slots
         mov     esi, [esi + PORT_DATA.ctr_ptr]
-        mov     esi, [ctr1_data.abar] ; why ctr1 ? TODO: make for corresponding controller
+        mov     esi, [esi + AHCI_CTR.abar]
         mov     edx, [esi + HBA_MEM.cap]
         shr     edx, 8
         and     edx, 0xf
         DEBUGF  1, "Cannot find free command list entry\n"
         mov     eax, -1
 .ret:
         pop     esi edx ecx ebx
         ret
+endp
 proc _memset stdcall, dest:dword, val:byte, cnt:dword ; doesnt clobber any registers

Subversion Repositories Kolibri OS

(root)/kernel/trunk/blkdev/ahci.inc – Rev 9271 → 9272