From patchwork Wed Jun  9 19:10:13 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: SeaBIOS CD/DVD abbreviations
Date: Wed, 09 Jun 2010 19:10:13 -0000
From: Stefan Reinauer <stefan.reinauer@coresystems.de>
X-Patchwork-Id: 1495
Message-Id: <4C0FE715.4010302@coresystems.de>
To: coreboot@coreboot.org, seabios@seabios.org

On 6/9/10 5:43 PM, Andrew Morgan wrote:
> Just a small point, the "ROM" bit isn't really needed. The fact that
> CDs are read-only is pretty much irrelevant. No other type of disk
> gets -ROM or -RAM stuck on the end of it. Also some CDs aren't read
> only...

Good point.
Updated patch attached
- Use the same description text for CD and DVD drives all over the tree.
- Mention DVD first as it's more likely these days
- capitalize "Rom" since it's an abbreviation

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>


--- src/ata.c
+++ src/ata.c
@@ -774,7 +774,7 @@
     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
--- src/boot.c
+++ src/boot.c
@@ -29,9 +29,9 @@
     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 @@
     // CDROM
     if (CONFIG_CDROM_BOOT) {
         ie->type = IPL_TYPE_CDROM;
-        ie->description = "CD-Rom";
+        ie->description = "DVD/CD";
         ie++;
     }
 
@@ -191,7 +191,7 @@
     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;
 }