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

kolibri-ahci:

Browse Source 
- refactoring: use swap_bytes_in_words for strings in ident space
- added viewing lba48 addresable sectors count, disk capacity in MiB and GiB
- other small changes

git-svn-id: svn://kolibrios.org@9138 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Rustem Gimadutdinov (rgimad) 2021-08-16 17:36:12 +00:00
parent e7ec006b8b
commit 7bedba2c53
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
kernel/branches/kolibri-ahci/blkdev/ahci.inc
View File

@ -658,19 +658,18 @@ proc ahci_port_identify stdcall, pdata: dword
rep movsb rep movsb
mov byte [edi], 0 mov byte [edi], 0
xor ecx, ecx stdcall swap_bytes_in_words, modelstr, (46-27)+1
.reverse1:
cmp ecx, ((46-27)+1)*2
jae .reverse1_end
mov bl, byte [modelstr + ecx]
mov dl, byte [modelstr + ecx + 1]
mov byte [modelstr + ecx], dl
mov byte [modelstr + ecx + 1], bl
add ecx, 2
jmp .reverse1
.reverse1_end:
DEBUGF 1, "IDENTIFICATION RESULT: MODEL = %s\n", modelstr DEBUGF 1, "IDENTIFICATION RESULT: MODEL = %s\n", modelstr
mov esi, [buf_virt]
mov eax, [esi + 200]
mov edx, [esi + 200 + 4]
DEBUGF 1, "lba48 mode sector count = 0x%x:%x\n", edx, eax
shrd eax, edx, 11 ; i.e *512 / 1024 / 1024, 512 - sector size
DEBUGF 1, "disk capacity = %u MiB ", eax
shrd eax, edx, 10 ; / 1024
DEBUGF 1, "= %u GiB\n", eax
.ret: .ret:
popad popad
ret ret
@ -727,7 +726,6 @@ ahci_send_cmd:
ret ret
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; TODO: check correctness
; in: port - address of HBA_PORT structure ; in: port - address of HBA_PORT structure
; portno - port index (0..31) ; portno - port index (0..31)
; pdata - address of PORT_DATA structure ; pdata - address of PORT_DATA structure
@ -885,3 +883,24 @@ proc _memset stdcall, dest:dword, val:byte, cnt:dword ; doesnt clobber any regis
pop edi ecx eax pop edi ecx eax
ret ret
endp endp
; Swaps byte order in words
; base - address of first word
; len - how many words to swap bytes in
; doesnt clobber any registers
proc swap_bytes_in_words stdcall, base: dword, len: dword
push eax ebx ecx
xor ecx, ecx
mov ebx, [base]
.loop:
cmp ecx, [len]
jae .loop_end
mov ax, word [ebx + ecx*2]
xchg ah, al
mov word [ebx + ecx*2], ax
inc ecx
jmp .loop
.loop_end:
pop ecx ebx eax
ret
endp