From 3785f597a0abf57e203f32f8d1d2c47c7bfa3202 Mon Sep 17 00:00:00 2001
From: okuji <okuji@localhost>
Date: Sat, 13 Oct 2001 12:28:37 +0000
Subject: [PATCH] Don\'t use get_diskinfo_floppy.

---
 ChangeLog     | 9 +++++++++
 THANKS        | 1 +
 stage2/asm.S  | 6 ++++--
 stage2/bios.c | 5 +++++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2e0acc0a6..346615302 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-10-13  Yoshinori K. Okuji  <okuji@gnu.org>
+
+	Don't use get_diskinfo_floppy. Reported by Ben Liblit
+	<liblit@eecs.berkeley.edu>.
+	
+	* stage2/asm.S (get_diskinfo_floppy): Removed (by cpp).
+	* stage2/bios.c (get_diskinfo_floppy): Removed.
+	(get_diskinfo): Don't call get_diskinfo_floppy any longer.
+	
 2001-10-13  Yoshinori K. Okuji  <okuji@gnu.org>
 
 	Based on a patch from Jeremy Katz <katzj@redhat.com>:
diff --git a/THANKS b/THANKS
index 36802f5f2..c3d31fd5d 100644
--- a/THANKS
+++ b/THANKS
@@ -10,6 +10,7 @@ Adrian Phillips <a.phillips@dnmi.no>
 Alessandro Rubini <rubini@gnu.org>
 Alexander K. Hudek <alexhudek@home.com>
 Andrew Clausen <clausen@gnu.org>
+Ben Liblit <liblit@eecs.berkeley.edu>
 Bernhard Treutwein <Bernhard.Treutwein@Verwaltung.Uni-Muenchen.DE>
 Bodo Rueskamp <br@itchigo.com>.
 Bradford Hovinen <hovinen@redrose.net>
diff --git a/stage2/asm.S b/stage2/asm.S
index 563f506a8..ade585f14 100644
--- a/stage2/asm.S
+++ b/stage2/asm.S
@@ -1220,7 +1220,8 @@ ENTRY(get_diskinfo_standard)
 
 	ret
 
-		
+
+#if 0		
 /*
  *   int get_diskinfo_floppy (int drive, unsigned long *cylinders, 
  *                            unsigned long *heads, unsigned long *sectors)
@@ -1304,7 +1305,8 @@ probe_values:
 	popl	%ebp
 
 	ret
-
+#endif
+	
 
 /* Source files are splitted, as they have different copyrights.  */
 #ifndef STAGE1_5
diff --git a/stage2/bios.c b/stage2/bios.c
index 40d041e8e..91db02f38 100644
--- a/stage2/bios.c
+++ b/stage2/bios.c
@@ -33,10 +33,12 @@ extern int get_diskinfo_standard (int drive,
 				  unsigned long *cylinders,
 				  unsigned long *heads,
 				  unsigned long *sectors);
+#if 0
 extern int get_diskinfo_floppy (int drive,
 				unsigned long *cylinders,
 				unsigned long *heads,
 				unsigned long *sectors);
+#endif
 
 
 /* Read/write NSEC sectors starting from SECTOR in DRIVE disk with GEOMETRY
@@ -215,12 +217,15 @@ get_diskinfo (int drive, struct geometry *geometry)
 				   &geometry->heads,
 				   &geometry->sectors);
 
+#if 0
       /* If fails, then try floppy-specific probe routine.  */
       if (err)
 	err = get_diskinfo_floppy (drive,
 				   &geometry->cylinders,
 				   &geometry->heads,
 				   &geometry->sectors);
+#endif
+      
       if (err)
 	return err;