Don\'t use get_diskinfo_floppy.

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>:

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>

stage2/asm.S

@@ -1221,6 +1221,7 @@ ENTRY(get_diskinfo_standard)
 	ret
 
 
+#if 0		
 /*
  *   int get_diskinfo_floppy (int drive, unsigned long *cylinders, 
  *                            unsigned long *heads, unsigned long *sectors)
@@ -1304,6 +1305,7 @@ probe_values:
 	popl	%ebp
 
 	ret
+#endif
 	
 
 /* Source files are splitted, as they have different copyrights.  */

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;