From b3a700eadb898874d1bf6f3aec0551188e25da7e Mon Sep 17 00:00:00 2001 From: Diego Calleja Date: Tue, 26 Sep 2006 10:52:30 +0200 Subject: [PATCH] --- yaml --- r: 35815 b: refs/heads/master c: 606bd58de6542e847c51b1b6d83a4cd70a632fe7 h: refs/heads/master i: 35813: 8c83724be3ad66fdc669ad74efb3eb1407fe0f78 35811: 758f8ff8fef9ac987180c83c7de705f4ef6aed91 35807: 6c014f5a7b318c01348163d54ea6f3dc5296d93f v: v3 --- [refs] | 2 +- trunk/arch/i386/boot/setup.S | 4 ++-- trunk/arch/x86_64/boot/setup.S | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 929dcb8287bd..0dad493ebf9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf4c6a2f27f5db810b69dcb1da7f194489e8ff88 +refs/heads/master: 606bd58de6542e847c51b1b6d83a4cd70a632fe7 diff --git a/trunk/arch/i386/boot/setup.S b/trunk/arch/i386/boot/setup.S index d2b684cd620a..3aec4538a113 100644 --- a/trunk/arch/i386/boot/setup.S +++ b/trunk/arch/i386/boot/setup.S @@ -494,12 +494,12 @@ no_voyager: movw %cs, %ax # aka SETUPSEG subw $DELTA_INITSEG, %ax # aka INITSEG movw %ax, %ds - movw $0, (0x1ff) # default is no pointing device + movb $0, (0x1ff) # default is no pointing device int $0x11 # int 0x11: equipment list testb $0x04, %al # check if mouse installed jz no_psmouse - movw $0xAA, (0x1ff) # device present + movb $0xAA, (0x1ff) # device present no_psmouse: #if defined(CONFIG_X86_SPEEDSTEP_SMI) || defined(CONFIG_X86_SPEEDSTEP_SMI_MODULE) diff --git a/trunk/arch/x86_64/boot/setup.S b/trunk/arch/x86_64/boot/setup.S index a50b631f4d2b..c3bfd223ab49 100644 --- a/trunk/arch/x86_64/boot/setup.S +++ b/trunk/arch/x86_64/boot/setup.S @@ -526,12 +526,12 @@ is_disk1: movw %cs, %ax # aka SETUPSEG subw $DELTA_INITSEG, %ax # aka INITSEG movw %ax, %ds - movw $0, (0x1ff) # default is no pointing device + movb $0, (0x1ff) # default is no pointing device int $0x11 # int 0x11: equipment list testb $0x04, %al # check if mouse installed jz no_psmouse - movw $0xAA, (0x1ff) # device present + movb $0xAA, (0x1ff) # device present no_psmouse: #include "../../i386/boot/edd.S"