2009-11-16 Felix Zielcke <fzielcke@z-51.de>

	Enable ata.mod on x86_64-efi, i386-efi and i386-ieee1275.

	* disk/ata.c (grub_ata_dumpinfo): Add a cast.
	(grub_ata_readwrite): Likewise.  Update 2 format strings.
	(grub_atapi_read): Likewise.

	* conf/i386-coreboot.rmk (pkglib_MODULES): Move `ata.mod' from here ...
	* conf/i386.rmk (pkglib_MODULES): ... to here ...
	* conf/x86_64-efi.rmk (pkglib_MODULES): ... and here.
	* conf/i386-coreboot.rmk (ata_mod_SOURCES, ata_mod_CFLAGS)
	(ata_mod_LDFLAGS): Move from here ...
	* conf/i386.rmk: ... to here ...
	* conf/x86_64-efi.rmk: ... and here.
	* conf/i386-pc.rmk (pkglib_MODULES): Remove `ata.mod'
	(ata_mod_SOURCES, ata_mod_CFLAGS, ata_mod_LDFLAGS): Remove.

diff --git a/ChangeLog b/ChangeLog
index 2e4875916d123175ae8af9d01845b8faba6ff922..c7ba18d1a4ee37d7babc6b5031b52f26142b4f55 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2009-11-16  Felix Zielcke  <fzielcke@z-51.de>
+
+       Enable ata.mod on x86_64-efi, i386-efi and i386-ieee1275.
+
+       * disk/ata.c (grub_ata_dumpinfo): Add a cast.
+       (grub_ata_readwrite): Likewise.  Update 2 format strings.
+       (grub_atapi_read): Likewise.
+
+       * conf/i386-coreboot.rmk (pkglib_MODULES): Move `ata.mod' from here ...
+       * conf/i386.rmk (pkglib_MODULES): ... to here ...
+       * conf/x86_64-efi.rmk (pkglib_MODULES): ... and here.
+       * conf/i386-coreboot.rmk (ata_mod_SOURCES, ata_mod_CFLAGS)
+       (ata_mod_LDFLAGS): Move from here ...
+       * conf/i386.rmk: ... to here ...
+       * conf/x86_64-efi.rmk: ... and here.
+       * conf/i386-pc.rmk (pkglib_MODULES): Remove `ata.mod'
+       (ata_mod_SOURCES, ata_mod_CFLAGS, ata_mod_LDFLAGS): Remove.
+
 2009-11-16  Robert Millan  <rmh.grub@aybabtu.com>
 
        Relicense multiboot.h, with RMS' blessing.

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 9a60db785a7c9c44f35041e875f9d74d74759dfa..c506e4153f1137e36afd95f6f5fb6b2fe6bc1161 100644 (file)
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -157,7 +157,7 @@ grub_mkrescue_SOURCES = util/grub-mkrescue.in
 
 # Modules.
 pkglib_MODULES = linux.mod multiboot.mod               \
-       aout.mod play.mod serial.mod ata.mod            \
+       aout.mod play.mod serial.mod                    \
        memdisk.mod pci.mod lspci.mod reboot.mod        \
        halt.mod datetime.mod date.mod datehook.mod     \
        lsmmap.mod mmap.mod
@@ -221,11 +221,6 @@ play_mod_SOURCES = commands/i386/pc/play.c
 play_mod_CFLAGS = $(COMMON_CFLAGS)
 play_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For ata.mod.
-ata_mod_SOURCES = disk/ata.c
-ata_mod_CFLAGS = $(COMMON_CFLAGS)
-ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For memdisk.mod.
 memdisk_mod_SOURCES = disk/memdisk.c
 memdisk_mod_CFLAGS = $(COMMON_CFLAGS)

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index a3aae6bad394b9c6cbcfae630799a9eb569298ea..90bc2b2e3cb71a9353d7cb1194d7a9e6218df583 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -177,12 +177,12 @@ grub_mkrescue_SOURCES = util/grub-mkrescue.in
 bin_SCRIPTS += grub-mkfloppy
 grub_mkfloppy_SOURCES = util/i386/pc/grub-mkfloppy.in
 
-pkglib_MODULES = biosdisk.mod chain.mod \
-       multiboot.mod reboot.mod halt.mod       \
-       vbe.mod vbetest.mod vbeinfo.mod play.mod serial.mod     \
-       ata.mod vga.mod memdisk.mod pci.mod lspci.mod   \
-       aout.mod bsd.mod pxe.mod pxecmd.mod datetime.mod date.mod \
-       datehook.mod lsmmap.mod ata_pthru.mod hdparm.mod \
+pkglib_MODULES = biosdisk.mod chain.mod                                \
+       multiboot.mod reboot.mod halt.mod                               \
+       vbe.mod vbetest.mod vbeinfo.mod play.mod serial.mod             \
+       vga.mod memdisk.mod pci.mod lspci.mod                           \
+       aout.mod bsd.mod pxe.mod pxecmd.mod datetime.mod date.mod       \
+       datehook.mod lsmmap.mod ata_pthru.mod hdparm.mod                \
        usb.mod uhci.mod ohci.mod usbtest.mod usbms.mod usb_keyboard.mod \
        efiemu.mod mmap.mod acpi.mod drivemap.mod
 
@@ -293,11 +293,6 @@ play_mod_SOURCES = commands/i386/pc/play.c
 play_mod_CFLAGS = $(COMMON_CFLAGS)
 play_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For ata.mod.
-ata_mod_SOURCES = disk/ata.c
-ata_mod_CFLAGS = $(COMMON_CFLAGS)
-ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For vga.mod.
 vga_mod_SOURCES = term/i386/pc/vga.c
 vga_mod_CFLAGS = $(COMMON_CFLAGS)

diff --git a/conf/i386.rmk b/conf/i386.rmk
index 93f84ce39cf45714413befdd26c98182a1e05798..bf102a9b68dc20bc15e2a74b6fa4d5dc99639b5a 100644 (file)
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -14,3 +14,8 @@ pkglib_MODULES += vga_text.mod
 vga_text_mod_SOURCES = term/i386/pc/vga_text.c term/i386/vga_common.c
 vga_text_mod_CFLAGS = $(COMMON_CFLAGS)
 vga_text_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+pkglib_MODULES += ata.mod
+ata_mod_SOURCES = disk/ata.c
+ata_mod_CFLAGS = $(COMMON_CFLAGS)
+ata_mod_LDFLAGS = $(COMMON_LDFLAGS)

diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 5be1b404f57b300b566690f5bcb60e00e6c9a24c..f536746ef8d62ccf744470b047ddf8d5b873cf67 100644 (file)
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -81,10 +81,10 @@ sbin_SCRIPTS = grub-install
 grub_install_SOURCES = util/i386/efi/grub-install.in
 
 # Modules.
-pkglib_MODULES = kernel.mod chain.mod appleldr.mod \
+pkglib_MODULES = kernel.mod chain.mod appleldr.mod     \
        halt.mod reboot.mod linux.mod pci.mod lspci.mod \
        datetime.mod date.mod datehook.mod loadbios.mod \
-       fixvideo.mod mmap.mod acpi.mod
+       fixvideo.mod mmap.mod acpi.mod ata.mod
 
 # For kernel.mod.
 kernel_mod_EXPORTS = no
@@ -129,6 +129,11 @@ acpi_mod_SOURCES = commands/acpi.c commands/efi/acpi.c
 acpi_mod_CFLAGS = $(COMMON_CFLAGS)
 acpi_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For ata.mod
+ata_mod_SOURCES = disk/ata.c
+ata_mod_CFLAGS = $(COMMON_CFLAGS)
+ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 # For mmap.mod.
 mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c \
                   mmap/efi/mmap.c

diff --git a/disk/ata.c b/disk/ata.c
index 78d396526c757206e01a8686e035874ca116b32a..11489828fd904b1618da4899bb4d0baf22571850 100644 (file)
--- a/disk/ata.c
+++ b/disk/ata.c
@@ -140,7 +140,7 @@ grub_ata_dumpinfo (struct grub_ata_device *dev, char *info)
   if (! dev->atapi)
     {
       grub_dprintf ("ata", "Addressing: %d\n", dev->addr);
-      grub_dprintf ("ata", "Sectors: %lld\n", dev->size);
+      grub_dprintf ("ata", "Sectors: %lld\n", (unsigned long long) dev->size);
     }
 }
 
@@ -569,7 +569,7 @@ grub_ata_readwrite (grub_disk_t disk, grub_disk_addr_t sector,
 {
   struct grub_ata_device *dev = (struct grub_ata_device *) disk->data;
 
-  grub_dprintf("ata", "grub_ata_readwrite (size=%u, rw=%d)\n", size, rw);
+  grub_dprintf("ata", "grub_ata_readwrite (size=%llu, rw=%d)\n", (unsigned long long) size, rw);
 
   grub_ata_addressing_t addressing = dev->addr;
   grub_size_t batch;
@@ -596,7 +596,7 @@ grub_ata_readwrite (grub_disk_t disk, grub_disk_addr_t sector,
       if (size - nsectors < batch)
        batch = size - nsectors;
 
-      grub_dprintf("ata", "rw=%d, sector=%llu, batch=%u\n", rw, sector, batch);
+      grub_dprintf("ata", "rw=%d, sector=%llu, batch=%llu\n", rw, (unsigned long long) sector, (unsigned long long) batch);
 
       /* Send read/write command.  */
       if (grub_ata_setaddress (dev, addressing, sector, batch))
@@ -755,7 +755,7 @@ grub_atapi_read (struct grub_scsi *scsi,
 {
   struct grub_ata_device *dev = (struct grub_ata_device *) scsi->data;
 
-  grub_dprintf("ata", "grub_atapi_read (size=%u)\n", size);
+  grub_dprintf("ata", "grub_atapi_read (size=%llu)\n", (unsigned long long) size);
 
   if (grub_atapi_packet (dev, cmd, size))
     return grub_errno;