2008-07-05 Pavel Roskin <proski@gnu.org>

	* disk/ata.c (grub_ata_dumpinfo): Don't output addressing and
	size for ATAPI devices, they are undefined.  Output sector
	number in decimal form.

diff --git a/ChangeLog b/ChangeLog
index dfb9f3a4b7f0d4890d2ee59acaa8f4deba19543a..5bbb103b0d9afb213508af92d5b7dffd347a607d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-07-05  Pavel Roskin  <proski@gnu.org>
 
+       * disk/ata.c (grub_ata_dumpinfo): Don't output addressing and
+       size for ATAPI devices, they are undefined.  Output sector
+       number in decimal form.
+
        * disk/ata.c: Use named constants for status bits.
 
 2008-07-04  Pavel Roskin  <proski@gnu.org>

diff --git a/disk/ata.c b/disk/ata.c
index 015e393a0ad79997c64bf679e2919f8fa380284a..7925fb8757b9ed24f86a6eaa1f6304fe5e47f742 100644 (file)
--- a/disk/ata.c
+++ b/disk/ata.c
@@ -225,8 +225,11 @@ grub_ata_dumpinfo (struct grub_ata_device *dev, char *info)
   grub_ata_strncpy (text, info + 54, 40);
   grub_printf ("Model: %s\n", text);
 
-  grub_printf ("Addressing: %d\n", dev->addr);
-  grub_printf ("#sectors: 0x%llx\n", dev->size);
+  if (! dev->atapi)
+    {
+      grub_printf ("Addressing: %d\n", dev->addr);
+      grub_printf ("Sectors: %lld\n", dev->size);
+    }
 }
 
 static grub_err_t