Sweetbread/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Issues Pull Requests Actions Activity

LBA28 support

Browse Source 
git-svn-id: svn://kolibrios.org@5852 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
pathoswithin 2015-10-20 22:51:18 +00:00
parent 7aa566873d
commit 4054b22aaa
3 changed files with 139 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
kernel/trunk/blkdev/hd_drv.inc
View File

@ -10,15 +10,16 @@ $Revision$
; HDD driver ; HDD driver
struct HD_DATA struct HD_DATA
hdbase dd ? hdbase dw ?
hdid dd ? hdid dw ?
hdpos dd ? hdpos dw ?
hd48 dw ?
ends ends
;----------------------------------------------------------------- ;-----------------------------------------------------------------
iglobal iglobal
align 4 align 4
ide_callbacks: ide_callbacks:
dd ide_callbacks.end - ide_callbacks ; strucsize dd ide_callbacks.end - ide_callbacks
dd 0 ; no close function dd 0 ; no close function
dd 0 ; no closemedia function dd 0 ; no closemedia function
dd ide_querymedia dd ide_querymedia
@ -28,18 +29,18 @@ ide_callbacks:
dd 0 ; use default cache size dd 0 ; use default cache size
.end: .end:
hd0_data HD_DATA ?, 0, 1 hd0_data HD_DATA ?, 0, 1, 0
hd1_data HD_DATA ?, 0x10, 2 hd1_data HD_DATA ?, 16, 2, 0
hd2_data HD_DATA ?, 0, 3 hd2_data HD_DATA ?, 0, 3, 0
hd3_data HD_DATA ?, 0x10, 4 hd3_data HD_DATA ?, 16, 4, 0
hd4_data HD_DATA ?, 0, 5 hd4_data HD_DATA ?, 0, 5, 0
hd5_data HD_DATA ?, 0x10, 6 hd5_data HD_DATA ?, 16, 6, 0
hd6_data HD_DATA ?, 0, 7 hd6_data HD_DATA ?, 0, 7, 0
hd7_data HD_DATA ?, 0x10, 8 hd7_data HD_DATA ?, 16, 8, 0
hd8_data HD_DATA ?, 0, 9 hd8_data HD_DATA ?, 0, 9, 0
hd9_data HD_DATA ?, 0x10, 10 hd9_data HD_DATA ?, 16, 10, 0
hd10_data HD_DATA ?, 0, 11 hd10_data HD_DATA ?, 0, 11, 0
hd11_data HD_DATA ?, 0x10, 12 hd11_data HD_DATA ?, 16, 12, 0
ide_mutex_table: ide_mutex_table:
dd ide_channel1_mutex dd ide_channel1_mutex
@ -74,7 +75,6 @@ ide_read:
ide_write: ide_write:
mov al, 35h ; WRITE DMA EXT mov al, 35h ; WRITE DMA EXT
; fall through to ide_read_write
proc ide_read_write stdcall uses esi edi ebx, \ proc ide_read_write stdcall uses esi edi ebx, \
hd_data, buffer, startsector:qword, numsectors hd_data, buffer, startsector:qword, numsectors
@ -86,9 +86,8 @@ proc ide_read_write stdcall uses esi edi ebx, \
locals locals
sectors_todo dd ? sectors_todo dd ?
channel_lock dd ? channel_lock dd ?
operation db ?
endl endl
mov [operation], al mov bl, al
; get number of requested sectors and say that no sectors were read yet ; get number of requested sectors and say that no sectors were read yet
mov ecx, [numsectors] mov ecx, [numsectors]
mov eax, [ecx] mov eax, [ecx]
@ -98,7 +97,7 @@ endl
mov ecx, ide_mutex mov ecx, ide_mutex
call mutex_lock call mutex_lock
mov ecx, [hd_data] mov ecx, [hd_data]
mov ecx, [ecx+HD_DATA.hdpos] movzx ecx, [ecx+HD_DATA.hdpos]
dec ecx dec ecx
shr ecx, 1 shr ecx, 1
shl ecx, 2 shl ecx, 2
@ -106,21 +105,21 @@ endl
mov [channel_lock], ecx mov [channel_lock], ecx
call mutex_lock call mutex_lock
; prepare worker procedures variables ; prepare worker procedures variables
mov ecx, [hd_data]
mov eax, [ecx+HD_DATA.hdbase]
mov [hdbase], eax
mov eax, [ecx+HD_DATA.hdid]
mov [hdid], eax
mov eax, [ecx+HD_DATA.hdpos]
mov [hdpos], eax
mov eax, dword [startsector]
mov [sector], eax
mov ax, word [startsector+4]
mov [sector+4], ax
mov esi, [buffer] mov esi, [buffer]
mov edi, esi mov edi, esi
mov bl, [operation] mov ecx, [hd_data]
mov ecx, [hdpos] movzx eax, [ecx+HD_DATA.hdbase]
mov [hdbase], eax
mov ax, [ecx+HD_DATA.hdid]
mov [hdid], eax
mov eax, dword [startsector]
mov [sector], eax
cmp [ecx+HD_DATA.hd48], 0
jz .LBA28
mov ax, word [startsector+4]
mov [sector+4], ax
movzx ecx, [ecx+HD_DATA.hdpos]
mov [hdpos], ecx
dec ecx dec ecx
shr ecx, 2 shr ecx, 2
imul ecx, sizeof.IDE_DATA imul ecx, sizeof.IDE_DATA
@ -134,7 +133,7 @@ endl
cmp [eax+IDE_DATA.dma_hdd_channel_1], 1 cmp [eax+IDE_DATA.dma_hdd_channel_1], 1
jz .next jz .next
dec ebx ; READ/WRITE SECTOR(S) EXT dec ebx ; READ/WRITE SECTOR(S) EXT
; worker procedures take max 8000h sectors per time ; LBA48 supports max 10000h sectors per time
; loop until all sectors will be processed ; loop until all sectors will be processed
.next: .next:
mov ecx, 8000h mov ecx, 8000h
@ -154,6 +153,30 @@ endl
add [sector], ecx add [sector], ecx
adc word [sector+4], 0 adc word [sector+4], 0
jmp .next jmp .next
.LBA28:
add eax, [sectors_todo]
add eax, 0xF0000000
jc .out
sub bl, 5 ; READ/WRITE SECTOR(S)
; LBA28 supports max 256 sectors per time
; loop until all sectors will be processed
.next28:
mov ecx, 256
cmp ecx, [sectors_todo]
jbe @f
mov ecx, [sectors_todo]
@@:
mov [blockSize], ecx
push ecx
call IDE_transfer.LBA28
pop ecx
jc .out
mov eax, [numsectors]
add [eax], ecx
sub [sectors_todo], ecx
jz .out
add [sector], ecx
jmp .next28
; loop is done, either due to error or because everything is done ; loop is done, either due to error or because everything is done
; release the global lock and return the corresponding status ; release the global lock and return the corresponding status
.out: .out:
@ -360,6 +383,42 @@ IDE_transfer:
cmp [eventPointer], 0 cmp [eventPointer], 0
jz .hd_error jz .hd_error
ret ret
.LBA28:
mov edx, [hdbase]
add edx, 6
mov al, byte [hdid]
add al, 224
out dx, al ; select the desired drive
call save_hd_wait_timeout
inc edx
@@:
call check_hd_wait_timeout
jc .hd_error
in al, dx
test al, 128 ; ready for command?
jnz @b
pushfd ; fill the ports
cli
mov edx, [hdbase]
inc edx
inc edx
mov al, [blockSize]
out dx, al ; Sector count (7:0)
inc edx
mov eax, [sector]
out dx, al ; LBA (7:0)
inc edx
shr eax, 8
out dx, al ; LBA (15:8)
inc edx
shr eax, 8
out dx, al ; LBA (23:16)
inc edx
shr eax, 8
add al, byte [hdid]
add al, 224
out dx, al ; LBA (27:24)
.PIO: .PIO:
inc edx ; ATACommand inc edx ; ATACommand
mov al, bl mov al, bl
@ -387,8 +446,8 @@ IDE_transfer:
cld cld
mov ecx, 256 mov ecx, 256
mov edx, [hdbase] mov edx, [hdbase]
cmp bl, 34h cmp bl, 30h
jz .write jnc .write
rep insw rep insw
jmp @f jmp @f
.write: .write:

51
kernel/trunk/detect/dev_hdcd.inc
View File

@ -7,61 +7,44 @@
$Revision$ $Revision$
; HDD and CD search
;******************************************************
; поиск приводов HDD и CD
; автор исходного текста Кулаков Владимир Геннадьевич.
; адаптация и доработка Mario79
;******************************************************
;****************************************************
;* ПОИСК HDD и CD *
;****************************************************
cmp [ecx+IDE_DATA.ProgrammingInterface], 0 cmp [ecx+IDE_DATA.ProgrammingInterface], 0
je EndFindHDD je EndFindHDD
FindHDD: FindHDD:
push ecx push ecx
xor ebx, ebx xor ebx, ebx
inc ebx inc ebx
mov [DeviceNumber], 0
cmp ecx, IDE_controller_2 cmp ecx, IDE_controller_1
jne @f jz .find
add bl, 5 add bl, 5
jmp .find add [DeviceNumber], sizeof.HD_DATA*4
@@: cmp ecx, IDE_controller_2
cmp ecx, IDE_controller_3 jz .find
jne .find add bl, 5
add [DeviceNumber], sizeof.HD_DATA*4
add bl, 10
;--------------------------------------
.find: .find:
mov [ChannelNumber], 1 mov [ChannelNumber], 1
mov [DiskNumber], 0 mov [DiskNumber], 0
call FindHDD_2 call FindHDD_1
mov [DiskNumber], 1 inc [DiskNumber]
call FindHDD_2 call FindHDD_2
inc [ChannelNumber] inc [ChannelNumber]
dec [DiskNumber]
mov [DiskNumber], 0
call FindHDD_2 call FindHDD_2
mov [DiskNumber], 1 inc [DiskNumber]
call FindHDD_1 call FindHDD_2
pop ecx pop ecx
jmp EndFindHDD jmp EndFindHDD
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
FindHDD_2: FindHDD_2:
call FindHDD_1 add [DeviceNumber], sizeof.HD_DATA
shl byte [ebx+DRIVE_DATA], 2 shl byte [ebx+DRIVE_DATA], 2
ret
;-----------------------------------------------------------------------------
FindHDD_1: FindHDD_1:
DEBUGF 1, "K : Channel %d ",[ChannelNumber]:2 DEBUGF 1, "K : Channel %d ",[ChannelNumber]:2
DEBUGF 1, "Disk %d\n",[DiskNumber]:1 DEBUGF 1, "Disk %d\n",[DiskNumber]:1
@ -80,6 +63,9 @@ FindHDD_1:
ja .FindCD ja .FindCD
inc byte [ebx+DRIVE_DATA] inc byte [ebx+DRIVE_DATA]
movzx eax, [DeviceNumber]
bt word [Sector512+166], 10
adc [eax+hd0_data.hd48], 0
jmp .Print_Device_Name jmp .Print_Device_Name
;-------------------------------------- ;--------------------------------------
.FindCD: .FindCD:
@ -262,6 +248,7 @@ StandardATABases dw ?, ? ; 1F0h, 170h
ChannelNumber dw ? ChannelNumber dw ?
; Номер диска ; Номер диска
DiskNumber db ? DiskNumber db ?
DeviceNumber db ?
; Базовый адрес группы портов контроллера ATA ; Базовый адрес группы портов контроллера ATA
ATABasePortAddr dw ? ATABasePortAddr dw ?
; Параметры ATA-команды ; Параметры ATA-команды

24
kernel/trunk/detect/sear_par.inc
View File

@ -13,27 +13,27 @@ search_partitions:
xor eax, eax xor eax, eax
mov edx, IDE_controller_1 mov edx, IDE_controller_1
mov ax, [edx + IDE_DATA.BAR0_val] mov ax, [edx + IDE_DATA.BAR0_val]
mov [hd0_data.hdbase], eax mov [hd0_data.hdbase], ax
mov [hd1_data.hdbase], eax mov [hd1_data.hdbase], ax
mov ax, [edx + IDE_DATA.BAR2_val] mov ax, [edx + IDE_DATA.BAR2_val]
mov [hd2_data.hdbase], eax mov [hd2_data.hdbase], ax
mov [hd3_data.hdbase], eax mov [hd3_data.hdbase], ax
mov edx, IDE_controller_2 mov edx, IDE_controller_2
mov ax, [edx + IDE_DATA.BAR0_val] mov ax, [edx + IDE_DATA.BAR0_val]
mov [hd4_data.hdbase], eax mov [hd4_data.hdbase], ax
mov [hd5_data.hdbase], eax mov [hd5_data.hdbase], ax
mov ax, [edx + IDE_DATA.BAR2_val] mov ax, [edx + IDE_DATA.BAR2_val]
mov [hd6_data.hdbase], eax mov [hd6_data.hdbase], ax
mov [hd7_data.hdbase], eax mov [hd7_data.hdbase], ax
mov edx, IDE_controller_3 mov edx, IDE_controller_3
mov ax, [edx + IDE_DATA.BAR0_val] mov ax, [edx + IDE_DATA.BAR0_val]
mov [hd8_data.hdbase], eax mov [hd8_data.hdbase], ax
mov [hd9_data.hdbase], eax mov [hd9_data.hdbase], ax
mov ax, [edx + IDE_DATA.BAR2_val] mov ax, [edx + IDE_DATA.BAR2_val]
mov [hd10_data.hdbase], eax mov [hd10_data.hdbase], ax
mov [hd11_data.hdbase], eax mov [hd11_data.hdbase], ax
; 2. Notify the system about /hd* disks. ; 2. Notify the system about /hd* disks.
; For every existing disk, call ide_disk_add with correct parameters. ; For every existing disk, call ide_disk_add with correct parameters.
; Generate name "hdN" on the stack; this is 4 bytes including terminating zero. ; Generate name "hdN" on the stack; this is 4 bytes including terminating zero.