Fix for IDE devices:
1) Restore broken HD load for ramdisk image 2) Check of support UDMA mode for disk devices before initialization channel of IDE controller git-svn-id: svn://kolibrios.org@4772 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79)
@@ -65,9 +65,9 @@ FindHDD_2:
|
||||
FindHDD_1:
|
||||
DEBUGF 1, "K : Channel %d ",[ChannelNumber]:2
|
||||
DEBUGF 1, "Disk %d\n",[DiskNumber]:1
|
||||
push ebx
|
||||
push ebx ecx
|
||||
call ReadHDD_ID
|
||||
pop ebx
|
||||
pop ecx ebx
|
||||
cmp [DevErrorCode], 0
|
||||
jne .FindCD
|
||||
|
||||
@@ -81,15 +81,15 @@ FindHDD_1:
|
||||
jmp .Print_Device_Name
|
||||
;--------------------------------------
|
||||
.FindCD:
|
||||
push ebx
|
||||
push ebx ecx
|
||||
call DeviceReset
|
||||
pop ebx
|
||||
pop ecx ebx
|
||||
cmp [DevErrorCode], 0
|
||||
jne .end
|
||||
|
||||
push ebx
|
||||
push ebx ecx
|
||||
call ReadCD_ID
|
||||
pop ebx
|
||||
pop ecx ebx
|
||||
cmp [DevErrorCode], 0
|
||||
jne .end
|
||||
|
||||
@@ -98,10 +98,22 @@ FindHDD_1:
|
||||
.Print_Device_Name:
|
||||
pushad
|
||||
pushfd
|
||||
|
||||
xor ebx, ebx
|
||||
mov bx, [ChannelNumber]
|
||||
dec ebx
|
||||
shl ebx, 1
|
||||
add bl, [DiskNumber]
|
||||
shl ebx, 1
|
||||
|
||||
call calculate_IDE_device_values_storage
|
||||
;--------------------------------------
|
||||
.copy_dev_name:
|
||||
mov esi, Sector512+27*2
|
||||
mov edi, dev_name
|
||||
mov ecx, 20
|
||||
cld
|
||||
;--------------------------------------
|
||||
@@:
|
||||
lodsw
|
||||
xchg ah, al
|
||||
@@ -112,12 +124,12 @@ FindHDD_1:
|
||||
|
||||
xor eax, eax
|
||||
mov ax, [Sector512+64*2]
|
||||
DEBUGF 1, "K : PIO mode possible modes %x\n", al
|
||||
DEBUGF 1, "K : PIO possible modes %x\n", al
|
||||
|
||||
mov ax, [Sector512+51*2]
|
||||
mov al, ah
|
||||
call convert_Sector512_value
|
||||
DEBUGF 1, "K : PIO mode set mode %x\n", ah
|
||||
DEBUGF 1, "K : PIO set mode %x\n", ah
|
||||
|
||||
mov ax, [Sector512+63*2]
|
||||
DEBUGF 1, "K : Multiword DMA possible modes %x\n", al
|
||||
@@ -129,10 +141,14 @@ FindHDD_1:
|
||||
mov ax, [Sector512+88*2]
|
||||
DEBUGF 1, "K : Ultra DMA possible modes %x\n", al
|
||||
|
||||
mov [ebx+IDE_DEVICE.UDMA_possible_modes], al
|
||||
|
||||
mov al, ah
|
||||
call convert_Sector512_value
|
||||
DEBUGF 1, "K : Ultra DMA set mode %x\n", ah
|
||||
|
||||
mov [ebx+IDE_DEVICE.UDMA_set_mode], ah
|
||||
|
||||
popfd
|
||||
popad
|
||||
ret
|
||||
@@ -141,9 +157,30 @@ FindHDD_1:
|
||||
DEBUGF 1, "K : Device not found\n"
|
||||
ret
|
||||
;-----------------------------------------------------------------------------
|
||||
calculate_IDE_device_values_storage:
|
||||
cmp ecx, IDE_controller_1
|
||||
jne @f
|
||||
|
||||
add ebx, IDE_device_1
|
||||
jmp .exit
|
||||
;--------------------------------------
|
||||
@@:
|
||||
cmp ecx, IDE_controller_2
|
||||
jne @f
|
||||
|
||||
add ebx, IDE_device_2
|
||||
jmp .exit
|
||||
;--------------------------------------
|
||||
@@:
|
||||
add ebx, IDE_device_3
|
||||
;--------------------------------------
|
||||
.exit:
|
||||
ret
|
||||
;-----------------------------------------------------------------------------
|
||||
convert_Sector512_value:
|
||||
mov ecx, 8
|
||||
xor ah, ah
|
||||
;--------------------------------------
|
||||
@@:
|
||||
test al, 1b
|
||||
jnz .end
|
||||
@@ -153,6 +190,7 @@ convert_Sector512_value:
|
||||
loop @b
|
||||
|
||||
xor ah, ah
|
||||
;--------------------------------------
|
||||
.end:
|
||||
ret
|
||||
;-----------------------------------------------------------------------------
|
||||
|
||||
@@ -140,6 +140,10 @@ cache_ide9 IDE_CACHE
|
||||
cache_ide10 IDE_CACHE
|
||||
cache_ide11 IDE_CACHE
|
||||
;--------------------------------------
|
||||
IDE_device_1 rd 2
|
||||
IDE_device_2 rd 2
|
||||
IDE_device_3 rd 2
|
||||
;--------------------------------------
|
||||
endg
|
||||
;-----------------------------------------------------------------------------
|
||||
; START of initialisation IDE ATA code
|
||||
@@ -295,13 +299,51 @@ Init_IDE_ATA_controller_2:
|
||||
.check_DRIVE_DATA:
|
||||
mov al, 0
|
||||
mov ah, [ebx+DRIVE_DATA+1]
|
||||
test ah, 10100000b
|
||||
test ah, 10100000b ; check for ATAPI devices
|
||||
jz @f
|
||||
;--------------------------------------
|
||||
.ch1_pio_set_ATAPI:
|
||||
DEBUGF 1, "K : IDE CH1 PIO, because ATAPI drive present\n"
|
||||
jmp .ch1_pio_set_for_all
|
||||
;--------------------------------------
|
||||
.ch1_pio_set_no_devices:
|
||||
DEBUGF 1, "K : IDE CH1 PIO because no devices\n"
|
||||
jmp .ch1_pio_set_for_all
|
||||
;-------------------------------------
|
||||
.ch1_pio_set:
|
||||
DEBUGF 1, "K : IDE CH1 PIO because device not support UDMA\n"
|
||||
;-------------------------------------
|
||||
.ch1_pio_set_for_all:
|
||||
mov [ecx+IDE_DATA.dma_hdd_channel_1], al
|
||||
jmp .ch2_check
|
||||
;--------------------------------------
|
||||
@@:
|
||||
xor ebx, ebx
|
||||
call calculate_IDE_device_values_storage
|
||||
|
||||
test ah, 1010000b
|
||||
jz .ch1_pio_set_no_devices
|
||||
|
||||
test ah, 1000000b
|
||||
jz @f
|
||||
|
||||
DEBUGF 1, "K : IDE CH1 PIO, because ATAPI drive present\n"
|
||||
mov [ecx+IDE_DATA.dma_hdd_channel_1], byte 0
|
||||
cmp [ebx+IDE_DEVICE.UDMA_possible_modes], al
|
||||
je .ch1_pio_set
|
||||
|
||||
jmp .ch2_check
|
||||
cmp [ebx+IDE_DEVICE.UDMA_set_mode], al
|
||||
je .ch1_pio_set
|
||||
;--------------------------------------
|
||||
@@:
|
||||
test ah, 10000b
|
||||
jz @f
|
||||
|
||||
add ebx, 2
|
||||
|
||||
cmp [ebx+IDE_DEVICE.UDMA_possible_modes], al
|
||||
je .ch1_pio_set
|
||||
|
||||
cmp [ebx+IDE_DEVICE.UDMA_set_mode], al
|
||||
je .ch1_pio_set
|
||||
;--------------------------------------
|
||||
@@:
|
||||
mov dx, [ecx+IDE_DATA.BAR1_val] ;0x3F4
|
||||
@@ -311,13 +353,51 @@ Init_IDE_ATA_controller_2:
|
||||
mov [ecx+IDE_DATA.dma_hdd_channel_1], byte 1
|
||||
;--------------------------------------
|
||||
.ch2_check:
|
||||
test ah, 1010b
|
||||
test ah, 1010b ; check for ATAPI devices
|
||||
jz @f
|
||||
;--------------------------------------
|
||||
.ch2_pio_set_ATAPI:
|
||||
DEBUGF 1, "K : IDE CH2 PIO, because ATAPI drive present\n"
|
||||
jmp .ch2_pio_set_for_all
|
||||
;--------------------------------------
|
||||
.ch2_pio_set_no_devices:
|
||||
DEBUGF 1, "K : IDE CH2 PIO because no devices\n"
|
||||
jmp .ch2_pio_set_for_all
|
||||
;--------------------------------------
|
||||
.ch2_pio_set:
|
||||
DEBUGF 1, "K : IDE CH2 PIO because device not support UDMA\n"
|
||||
;--------------------------------------
|
||||
.ch2_pio_set_for_all:
|
||||
mov [ecx+IDE_DATA.dma_hdd_channel_2], al
|
||||
jmp .end_set_interrupts
|
||||
;--------------------------------------
|
||||
@@:
|
||||
mov ebx, 4
|
||||
call calculate_IDE_device_values_storage
|
||||
|
||||
test ah, 101b
|
||||
jz .ch2_pio_set_no_devices
|
||||
|
||||
test ah, 100b
|
||||
jz @f
|
||||
|
||||
DEBUGF 1, "K : IDE CH2 PIO, because ATAPI drive present\n"
|
||||
mov [ecx+IDE_DATA.dma_hdd_channel_2], byte 0
|
||||
cmp [ebx+IDE_DEVICE.UDMA_possible_modes], al
|
||||
je .ch2_pio_set
|
||||
|
||||
jmp .end_set_interrupts
|
||||
cmp [ebx+IDE_DEVICE.UDMA_set_mode], al
|
||||
je .ch2_pio_set
|
||||
;--------------------------------------
|
||||
@@:
|
||||
test ah, 1b
|
||||
jz @f
|
||||
|
||||
add ebx, 2
|
||||
|
||||
cmp [ebx+IDE_DEVICE.UDMA_possible_modes], al
|
||||
je .ch2_pio_set
|
||||
|
||||
cmp [ebx+IDE_DEVICE.UDMA_set_mode], al
|
||||
je .ch2_pio_set
|
||||
;--------------------------------------
|
||||
@@:
|
||||
mov dx, [ecx+IDE_DATA.BAR3_val] ;0x374
|
||||
@@ -349,6 +429,16 @@ include 'getcache.inc'
|
||||
mov esi, boot_detectpart
|
||||
call boot_log
|
||||
include 'sear_par.inc'
|
||||
;-----------------------------------------------------------------------------
|
||||
mov esi, boot_init_sys
|
||||
call boot_log
|
||||
call Parser_params
|
||||
|
||||
if ~ defined extended_primary_loader
|
||||
; ramdisk image should be loaded by extended primary loader if it exists
|
||||
; READ RAMDISK IMAGE FROM HD
|
||||
include '../boot/rdload.inc'
|
||||
end if
|
||||
;-----------------------------------------------------------------------------
|
||||
mov ecx, IDE_controller_1
|
||||
mov [IDE_controller_pointer], ecx
|
||||
|
||||
Reference in New Issue
Block a user