[SeaBIOS] [PATCH 1/4] boot: Rename drive_g to drive
Kevin O'Connor
kevin at koconnor.net
Tue Jul 11 18:50:29 CEST 2017
The 'struct drive_s' pointer is a 32bit pointer (and boot.c code is
only compiled in 32bit mode), so avoid using the "_g" suffix on the
pointer.
Signed-off-by: Kevin O'Connor <kevin at koconnor.net>
---
src/boot.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/boot.c b/src/boot.c
index 59623fb..83d48f2 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -372,24 +372,24 @@ boot_add_bcv(u16 seg, u16 ip, u16 desc, int prio)
}
void
-boot_add_floppy(struct drive_s *drive_g, const char *desc, int prio)
+boot_add_floppy(struct drive_s *drive, const char *desc, int prio)
{
bootentry_add(IPL_TYPE_FLOPPY, defPrio(prio, DefaultFloppyPrio)
- , (u32)drive_g, desc);
+ , (u32)drive, desc);
}
void
-boot_add_hd(struct drive_s *drive_g, const char *desc, int prio)
+boot_add_hd(struct drive_s *drive, const char *desc, int prio)
{
bootentry_add(IPL_TYPE_HARDDISK, defPrio(prio, DefaultHDPrio)
- , (u32)drive_g, desc);
+ , (u32)drive, desc);
}
void
-boot_add_cd(struct drive_s *drive_g, const char *desc, int prio)
+boot_add_cd(struct drive_s *drive, const char *desc, int prio)
{
bootentry_add(IPL_TYPE_CDROM, defPrio(prio, DefaultCDPrio)
- , (u32)drive_g, desc);
+ , (u32)drive, desc);
}
// Add a CBFS payload entry
@@ -648,13 +648,13 @@ boot_disk(u8 bootdrv, int checksig)
// Boot from a CD-ROM
static void
-boot_cdrom(struct drive_s *drive_g)
+boot_cdrom(struct drive_s *drive)
{
if (! CONFIG_CDROM_BOOT)
return;
printf("Booting from DVD/CD...\n");
- int status = cdrom_boot(drive_g);
+ int status = cdrom_boot(drive);
if (status) {
printf("Boot failed: Could not read from CDROM (code %04x)\n", status);
return;
--
2.9.4
More information about the SeaBIOS
mailing list