From 757ee5cca95b78889f0bd380f78627ff79aa8b56 Mon Sep 17 00:00:00 2001
From: Robert Nordier <rnordier@FreeBSD.org>
Date: Tue, 13 Oct 1998 23:43:38 +0000
Subject: [PATCH] Fix flow of control after directory listing; enable EDD
 support; cosmetics.

---
 sys/boot/i386/boot2/boot2.c     | 9 +++++----
 sys/boot/i386/gptboot/gptboot.c | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c
index 088601a9cd2..9577eec28ae 100644
--- a/sys/boot/i386/boot2/boot2.c
+++ b/sys/boot/i386/boot2/boot2.c
@@ -14,7 +14,7 @@
  */
 
 /*
- *	$Id: boot2.c,v 1.4 1998/10/13 22:17:05 rnordier Exp $
+ *	$Id: boot2.c,v 1.5 1998/10/13 23:00:47 rnordier Exp $
  */
 
 #include <sys/param.h>
@@ -192,8 +192,9 @@ load(const char *fname)
     uint32_t addr, x;
     int fmt, i, j;
 
-    if (!(ino = lookup(fname)) && !ls) {
-	printf("No `%s'\n", fname);
+    if (!(ino = lookup(fname))) {
+	if (!ls)
+	    printf("No %s\n", fname);
 	return;
     }
     if (xfsread(ino, &hdr, sizeof(hdr)))
@@ -712,7 +713,7 @@ drvread(void *buf, unsigned lba, unsigned nblk)
     v86.eax = nblk;
     v86.ebx = VTOPSEG(buf) << 16 | VTOPOFF(buf);
     v86.ecx = lba;
-    v86.edx = dsk.drive;
+    v86.edx = 0x100 | dsk.drive;
     v86int();
     v86.ctl = V86_FLAGS;
     if (V86_CY(v86.efl)) {
diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c
index 088601a9cd2..9577eec28ae 100644
--- a/sys/boot/i386/gptboot/gptboot.c
+++ b/sys/boot/i386/gptboot/gptboot.c
@@ -14,7 +14,7 @@
  */
 
 /*
- *	$Id: boot2.c,v 1.4 1998/10/13 22:17:05 rnordier Exp $
+ *	$Id: boot2.c,v 1.5 1998/10/13 23:00:47 rnordier Exp $
  */
 
 #include <sys/param.h>
@@ -192,8 +192,9 @@ load(const char *fname)
     uint32_t addr, x;
     int fmt, i, j;
 
-    if (!(ino = lookup(fname)) && !ls) {
-	printf("No `%s'\n", fname);
+    if (!(ino = lookup(fname))) {
+	if (!ls)
+	    printf("No %s\n", fname);
 	return;
     }
     if (xfsread(ino, &hdr, sizeof(hdr)))
@@ -712,7 +713,7 @@ drvread(void *buf, unsigned lba, unsigned nblk)
     v86.eax = nblk;
     v86.ebx = VTOPSEG(buf) << 16 | VTOPOFF(buf);
     v86.ecx = lba;
-    v86.edx = dsk.drive;
+    v86.edx = 0x100 | dsk.drive;
     v86int();
     v86.ctl = V86_FLAGS;
     if (V86_CY(v86.efl)) {