vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don\'t use get_diskinfo_floppy.

Browse source
This commit is contained in:
okuji 2001-10-13 12:28:37 +00:00
parent 61928d1323
commit 3785f597a0
4 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -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> 2001-10-13 Yoshinori K. Okuji <okuji@gnu.org>
Based on a patch from Jeremy Katz <katzj@redhat.com>: Based on a patch from Jeremy Katz <katzj@redhat.com>:

1
THANKS
View file

@ -10,6 +10,7 @@ Adrian Phillips <a.phillips@dnmi.no>
Alessandro Rubini <rubini@gnu.org> Alessandro Rubini <rubini@gnu.org>
Alexander K. Hudek <alexhudek@home.com> Alexander K. Hudek <alexhudek@home.com>
Andrew Clausen <clausen@gnu.org> Andrew Clausen <clausen@gnu.org>
Ben Liblit <liblit@eecs.berkeley.edu>
Bernhard Treutwein <Bernhard.Treutwein@Verwaltung.Uni-Muenchen.DE> Bernhard Treutwein <Bernhard.Treutwein@Verwaltung.Uni-Muenchen.DE>
Bodo Rueskamp <br@itchigo.com>. Bodo Rueskamp <br@itchigo.com>.
Bradford Hovinen <hovinen@redrose.net> Bradford Hovinen <hovinen@redrose.net>

6
stage2/asm.S
View file

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

5
stage2/bios.c
View file

@ -33,10 +33,12 @@ extern int get_diskinfo_standard (int drive,
unsigned long *cylinders, unsigned long *cylinders,
unsigned long *heads, unsigned long *heads,
unsigned long *sectors); unsigned long *sectors);
#if 0
extern int get_diskinfo_floppy (int drive, extern int get_diskinfo_floppy (int drive,
unsigned long *cylinders, unsigned long *cylinders,
unsigned long *heads, unsigned long *heads,
unsigned long *sectors); unsigned long *sectors);
#endif
/* Read/write NSEC sectors starting from SECTOR in DRIVE disk with GEOMETRY /* 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->heads,
&geometry->sectors); &geometry->sectors);
#if 0
/* If fails, then try floppy-specific probe routine. */ /* If fails, then try floppy-specific probe routine. */
if (err) if (err)
err = get_diskinfo_floppy (drive, err = get_diskinfo_floppy (drive,
&geometry->cylinders, &geometry->cylinders,
&geometry->heads, &geometry->heads,
&geometry->sectors); &geometry->sectors);
#endif
if (err) if (err)
return err; return err;