KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

r3711 continued, no binary changes

Browse Source 
git-svn-id: svn://kolibrios.org@3726 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
CleverMouse
2013-06-28 08:45:59 +00:00
parent 38f0b2a169
commit 436a7c0974
2 changed files with 275 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
kernel/trunk/kernel.asm
View File

@@ -358,40 +358,40 @@ high_code:
call mutex_init
; SAVE REAL MODE VARIABLES
xor eax,eax
xor eax, eax
mov ax, [BOOT_VAR + BOOT_IDE_PI_16]
mov [IDEContrProgrammingInterface], ax
mov ax, [BOOT_VAR + BOOT_IDE_BASE_ADDR]
mov [IDEContrRegsBaseAddr], ax
mov ax, [BOOT_VAR + BOOT_IDE_BAR0_16]
mov [IDE_BAR0_val], ax
cmp ax,0
je @f
cmp ax,1
je @f
and ax,0xfff0
mov [StandardATABases],ax
mov [hd_address_table],eax
mov [hd_address_table+8],eax
cmp ax, 0
je @f
cmp ax, 1
je @f
and ax, 0xfff0
mov [StandardATABases], ax
mov [hd_address_table], eax
mov [hd_address_table+8], eax
@@:
mov ax, [BOOT_VAR + BOOT_IDE_BAR1_16]
mov ax, [BOOT_VAR + BOOT_IDE_BAR1_16]
mov [IDE_BAR1_val], ax
mov ax, [BOOT_VAR + BOOT_IDE_BAR2_16]
mov [IDE_BAR2_val], ax
cmp ax,0
je @f
cmp ax,1
je @f
and ax,0xfff0
mov [StandardATABases+2],ax
mov [hd_address_table+16],eax
mov [hd_address_table+24],eax
cmp ax, 0
je @f
cmp ax, 1
je @f
and ax, 0xfff0
mov [StandardATABases+2], ax
mov [hd_address_table+16], eax
mov [hd_address_table+24], eax
@@:
mov ax, [BOOT_VAR + BOOT_IDE_BAR3_16]
mov [IDE_BAR3_val], ax
; --------------- APM ---------------------
; init selectors
@@ -1066,17 +1066,17 @@ end if
cmp [IDEContrRegsBaseAddr], 0
setnz [dma_hdd]
cmp [dma_hdd],0
cmp [dma_hdd], 0
je .print_pio
.print_dma:
DEBUGF 1, "K : IDE DMA mode\n"
jmp .continue
.print_pio:
DEBUGF 1, "K : IDE PIO mode\n"
.continue:
mov [timer_ticks_enable], 1 ; for cd driver
sti
@@ -1634,27 +1634,27 @@ endg
dec ecx
jnz noprma
mov eax,[hd_address_table]
mov [cdbase], eax ;0x1f0
mov eax, [hd_address_table]
mov [cdbase], eax ;0x1f0
mov [cdid], 0xa0
noprma:
dec ecx
jnz noprsl
mov eax,[hd_address_table]
mov [cdbase], eax ;0x1f0
mov eax, [hd_address_table]
mov [cdbase], eax ;0x1f0
mov [cdid], 0xb0
noprsl:
dec ecx
jnz nosema
mov eax,[hd_address_table+16]
mov [cdbase], eax ;0x170
mov eax, [hd_address_table+16]
mov [cdbase], eax ;0x170
mov [cdid], 0xa0
nosema:
dec ecx
jnz nosesl
mov eax,[hd_address_table+16]
mov [cdbase], eax ;0x170
mov eax, [hd_address_table+16]
mov [cdbase], eax ;0x170
mov [cdid], 0xb0
nosesl:
ret
@@ -1683,8 +1683,8 @@ endg
cmp ecx, 1
jnz noprmahd
mov eax,[hd_address_table]
mov [hdbase], eax ;0x1f0
mov eax, [hd_address_table]
mov [hdbase], eax ;0x1f0
and dword [hdid], 0x0
mov dword [hdpos], ecx
; call set_FAT32_variables
@@ -1692,8 +1692,8 @@ endg
cmp ecx, 2
jnz noprslhd
mov eax,[hd_address_table]
mov [hdbase], eax ;0x1f0
mov eax, [hd_address_table]
mov [hdbase], eax ;0x1f0
mov [hdid], 0x10
mov dword [hdpos], ecx
; call set_FAT32_variables
@@ -1701,8 +1701,8 @@ endg
cmp ecx, 3
jnz nosemahd
mov eax,[hd_address_table+16]
mov [hdbase], eax ;0x170
mov eax, [hd_address_table+16]
mov [hdbase], eax ;0x170
and dword [hdid], 0x0
mov dword [hdpos], ecx
; call set_FAT32_variables
@@ -1710,8 +1710,8 @@ endg
cmp ecx, 4
jnz noseslhd
mov eax,[hd_address_table+16]
mov [hdbase], eax ;0x170
mov eax, [hd_address_table+16]
mov [hdbase], eax ;0x170
mov [hdid], 0x10
mov dword [hdpos], ecx
; call set_FAT32_variables