Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 1039
b: refs/heads/master
c: 125947f
h: refs/heads/master
i:
  1037: 48fdbef
  1035: 3efe4b9
  1031: d0efa32
  1023: 4a33e99
v: v3
  • Loading branch information
Domen Puncer authored and Linus Torvalds committed May 5, 2005
1 parent f93b239 commit c3cbbaa
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 845d34318f8acb0d92d18ccc72ef6db4c7baeaea
refs/heads/master: 125947f2ab8c45417feaa4a8800e89529ca4612f
2 changes: 1 addition & 1 deletion trunk/arch/i386/boot/bootsect.S
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ bugger_off_msg:
.ascii "\n"
.ascii "Remove disk and press any key to reboot . . .\r\n"
.byte 0


# Kernel attributes; used by setup

Expand Down
18 changes: 9 additions & 9 deletions trunk/arch/i386/boot/video.S
Original file line number Diff line number Diff line change
Expand Up @@ -1924,36 +1924,36 @@ skip10: movb %ah, %al
ret

store_edid:
pushw %es # just save all registers
pushw %ax
pushw %es # just save all registers
pushw %ax
pushw %bx
pushw %cx
pushw %dx
pushw %di

pushw %fs
pushw %fs
popw %es

movl $0x13131313, %eax # memset block with 0x13
movw $32, %cx
movw $0x140, %di
cld
rep
stosl
rep
stosl

movw $0x4f15, %ax # do VBE/DDC
movw $0x4f15, %ax # do VBE/DDC
movw $0x01, %bx
movw $0x00, %cx
movw $0x01, %dx
movw $0x140, %di
int $0x10
int $0x10

popw %di # restore all registers
popw %di # restore all registers
popw %dx
popw %cx
popw %bx
popw %ax
popw %es
popw %es
ret

# VIDEO_SELECT-only variables
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/x86_64/boot/bootsect.S
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ msg_loop:
jz die
movb $0xe, %ah
movw $7, %bx
int $0x10
int $0x10
jmp msg_loop

die:
# Allow the user to press a key, then reboot
xorw %ax, %ax
int $0x16
int $0x19

# int 0x19 should never return. In case it does anyway,
# invoke the BIOS reset code...
ljmp $0xf000,$0xfff0
Expand Down

0 comments on commit c3cbbaa

Please sign in to comment.