vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Enable display first to catch ps2 output

Browse source
This commit is contained in:
Jeremy Soller 2016-09-01 20:52:52 -06:00
parent aad69e8a6c
commit 3d79c653bd
2 changed files with 6 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86_64/src/device/mod.rs
View file

@ -6,8 +6,8 @@ pub mod serial;
pub unsafe fn init(active_table: &mut ActivePageTable){ pub unsafe fn init(active_table: &mut ActivePageTable){
serial::init(); serial::init();
ps2::init();
display::init(active_table); display::init(active_table);
ps2::init();
} }
pub unsafe fn init_ap(active_table: &mut ActivePageTable) { pub unsafe fn init_ap(active_table: &mut ActivePageTable) {

43
bootloader/x86_64/vesa.asm
View file

@ -7,12 +7,9 @@ vesa:
mov di, VBECardInfo mov di, VBECardInfo
int 0x10 int 0x10
cmp ax, 0x4F cmp ax, 0x4F
je .edid je .findmode
mov eax, 1 mov eax, 1
ret ret
.edid:
cmp dword [.required], 0 ;if both required x and required y are set, forget this
jne near .findmode
.resetlist: .resetlist:
;if needed, reset mins/maxes/stuff ;if needed, reset mins/maxes/stuff
xor cx, cx xor cx, cx
@ -22,7 +19,7 @@ vesa:
mov [.requiredy], cx mov [.requiredy], cx
mov [.requiredmode], cx mov [.requiredmode], cx
.findmode: .findmode:
mov si, [VBECardInfo.videomodeptr] mov si, [VBECardInfo.videomodeptr]
mov ax, [VBECardInfo.videomodeptr+2] mov ax, [VBECardInfo.videomodeptr+2]
mov fs, ax mov fs, ax
sub si, 2 sub si, 2
@ -78,9 +75,9 @@ vesa:
mov cx, [.currentmode] mov cx, [.currentmode]
mov [.goodmode], cx mov [.goodmode], cx
push esi push esi
call decshowrm ; call decshowrm
mov al, ':' ; mov al, ':'
call charrm ; call charrm
mov cx, [VBEModeInfo.xresolution] mov cx, [VBEModeInfo.xresolution]
call decshowrm call decshowrm
mov al, 'x' mov al, 'x'
@ -122,8 +119,6 @@ vesa:
.requiredy dw 0 ;768 .requiredy dw 0 ;768
.requiredmode dw 0 .requiredmode dw 0
.noedidmsg db "EDID not supported.",10,13,0
.edidmsg db " is supported.",10,13,0
.modeok db ": Is this OK?(y/n)",10,13,0 .modeok db ": Is this OK?(y/n)",10,13,0
.goodmode dw 0 .goodmode dw 0
@ -209,31 +204,3 @@ charrm: ;char must be in al
mov ah, 0xE mov ah, 0xE
int 10h int 10h
ret ret
; .bestmode: ;preference is width > height > color
; mov bx, [VBEModeInfo.xresolution]
; cmp bx, [.width]
; ja .switchmode
; jb .searchmodes
; mov bx, [VBEModeInfo.yresolution]
; cmp bx, [.height]
; ja .switchmode
; jb .searchmodes
; mov bl, [VBEModeInfo.bitsperpixel]
; cmp bl, [.color]
; jb .searchmodes
; .switchmode:
; mov cx, [.currentmode]
; mov [.mode], cx
; mov bx, [VBEModeInfo.xresolution]
; mov [.width], bx
; mov bx, [VBEModeInfo.yresolution]
; mov [.height], bx
; mov bl, [VBEModeInfo.bitsperpixel]
; mov [.color], bl
; jmp .searchmodes
; .mode dw 0
; .color db 0
; .height dw 0
; .width dw 0