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

2008-03-20 Robert Millan <rmh@aybabtu.com> 

Remove 2 TiB limit in ata.mod.
        * disk/ata.c (grub_ata_device): Promote `size' to grub_uint64_t.
        (grub_ata_dumpinfo): Print sector count with 0x%llx.
        (grub_ata_identify): Interpret `&info16[100]' as a pointer to
        grub_uint64_t instead of grub_uint32_t.
This commit is contained in:
robertmh 2008-03-20 21:00:15 +00:00
parent 38ad2cf5a5
commit 68e7fc7aa8
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-03-20 Robert Millan <rmh@aybabtu.com>
Remove 2 TiB limit in ata.mod.
* disk/ata.c (grub_ata_device): Promote `size' to grub_uint64_t.
(grub_ata_dumpinfo): Print sector count with 0x%llx.
(grub_ata_identify): Interpret `&info16[100]' as a pointer to
grub_uint64_t instead of grub_uint32_t.
2008-03-05 Bean <bean123ch@gmail.com>
* loader/i386/pc/multiboot.c (grub_multiboot_get_bootdev): New function.

7
disk/ata.c
View File

@ -86,7 +86,7 @@ struct grub_ata_device
grub_ata_addressing_t addr;
/* Sector count. */
grub_size_t size;
grub_uint64_t size;
/* CHS maximums. */
grub_uint16_t cylinders;
@ -214,8 +214,7 @@ grub_ata_dumpinfo (struct grub_ata_device *dev, char *info)
grub_printf ("Model: %s\n", text);
grub_printf ("Addressing: %d\n", dev->addr);
grub_printf ("#sectors: %d\n", dev->size);
grub_printf ("#sectors: 0x%llx\n", dev->size);
}
static grub_err_t
@ -315,7 +314,7 @@ grub_ata_identify (struct grub_ata_device *dev)
if (dev->addr != GRUB_ATA_LBA48)
dev->size = grub_le_to_cpu32(*((grub_uint32_t *) &info16[60]));
else
dev->size = grub_le_to_cpu64(*((grub_uint32_t *) &info16[100]));
dev->size = grub_le_to_cpu64(*((grub_uint64_t *) &info16[100]));
/* Read CHS information. */
dev->cylinders = info16[1];