summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/stand/mbr/mbr.S6
-rw-r--r--sys/arch/i386/stand/mbr/mbr.S6
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/amd64/stand/mbr/mbr.S b/sys/arch/amd64/stand/mbr/mbr.S
index 8c2a032f29b..8a9a4d26b5e 100644
--- a/sys/arch/amd64/stand/mbr/mbr.S
+++ b/sys/arch/amd64/stand/mbr/mbr.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbr.S,v 1.4 2012/05/29 04:22:57 mglocker Exp $ */
+/* $OpenBSD: mbr.S,v 1.5 2012/06/04 16:17:04 mglocker Exp $ */
/*
* Copyright (c) 1997 Michael Shalayeff and Tobias Weingartner
@@ -170,10 +170,12 @@ reloc:
#ifdef SERIAL
/* Initialize the serial port to 9600 baud, 8N1.
*/
+ pushw %dx
xorw %ax, %ax
movb $0xe3, %ax
movw $SERIAL, %dx
int $0x14
+ popw %dx
#endif
/*
@@ -497,7 +499,7 @@ Lchr:
#ifdef SERIAL
pushw %dx
movb $0x01, %ah
- movw SERIAL, %dx
+ movw $SERIAL, %dx
int $0x14
popw %dx
#else
diff --git a/sys/arch/i386/stand/mbr/mbr.S b/sys/arch/i386/stand/mbr/mbr.S
index e76268344a4..66149ca6cd7 100644
--- a/sys/arch/i386/stand/mbr/mbr.S
+++ b/sys/arch/i386/stand/mbr/mbr.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbr.S,v 1.22 2012/05/29 04:22:57 mglocker Exp $ */
+/* $OpenBSD: mbr.S,v 1.23 2012/06/04 16:17:04 mglocker Exp $ */
/*
* Copyright (c) 1997 Michael Shalayeff and Tobias Weingartner
@@ -170,10 +170,12 @@ reloc:
#ifdef SERIAL
/* Initialize the serial port to 9600 baud, 8N1.
*/
+ pushw %dx
xorw %ax, %ax
movb $0xe3, %ax
movw $SERIAL, %dx
int $0x14
+ popw %dx
#endif
/*
@@ -497,7 +499,7 @@ Lchr:
#ifdef SERIAL
pushw %dx
movb $0x01, %ah
- movw SERIAL, %dx
+ movw $SERIAL, %dx
int $0x14
popw %dx
#else