From 203f6f385d948c578e59dafdb79b9fe01b27af91 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Wed, 9 Jun 2010 21:10:13 +0200 Subject: [PATCH] SeaBIOS CD/DVD abbreviations - Use the same description text for CD and DVD drives all over the tree. - Mention DVD first as it's more likely these days Signed-off-by: Stefan Reinauer --- src/ata.c | 2 +- src/boot.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ata.c b/src/ata.c index 62cdbb8..2e934be 100644 --- a/src/ata.c +++ b/src/ata.c @@ -774,7 +774,7 @@ init_drive_atapi(struct atadrive_s *dummy, u16 *buffer) snprintf(adrive_g->drive.desc, MAXDESCSIZE, "ata%d-%d: %s ATAPI-%d %s" , adrive_g->chan_gf->chanid, adrive_g->slave , extract_model(model, buffer), extract_version(buffer) - , (iscd ? "CD-Rom/DVD-Rom" : "Device")); + , (iscd ? "DVD/CD" : "Device")); dprintf(1, "%s\n", adrive_g->drive.desc); // fill cdidmap diff --git a/src/boot.c b/src/boot.c index 335522f..d2ac703 100644 --- a/src/boot.c +++ b/src/boot.c @@ -29,9 +29,9 @@ boot_setup(void) dprintf(3, "init boot device ordering\n"); memset(&IPL, 0, sizeof(IPL)); + struct ipl_entry_s *ie = &IPL.bev[0]; // Floppy drive - struct ipl_entry_s *ie = &IPL.bev[0]; ie->type = IPL_TYPE_FLOPPY; ie->description = "Floppy"; ie++; @@ -44,7 +44,7 @@ boot_setup(void) // CDROM if (CONFIG_CDROM_BOOT) { ie->type = IPL_TYPE_CDROM; - ie->description = "CD-Rom"; + ie->description = "DVD/CD"; ie++; } @@ -191,7 +191,7 @@ menu_show_cdrom(struct ipl_entry_s *ie, int menupos) int i; for (i = 0; i < Drives.cdcount; i++) { struct drive_s *drive_g = getDrive(EXTTYPE_CD, i); - printf("%d. CD-Rom [%s]\n", menupos + i, drive_g->desc); + printf("%d. DVD/CD [%s]\n", menupos + i, drive_g->desc); } return Drives.cdcount; } -- 2.39.5