commit-grub
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[2415] 2009-07-16 Vladimir Serbinenko <address@hidden>


From: Vladimir Serbinenko
Subject: [2415] 2009-07-16 Vladimir Serbinenko <address@hidden>
Date: Wed, 15 Jul 2009 22:04:42 +0000

Revision: 2415
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2415
Author:   phcoder
Date:     2009-07-15 22:04:41 +0000 (Wed, 15 Jul 2009)
Log Message:
-----------
2009-07-16  Vladimir Serbinenko  <address@hidden>

        Fix 64-bit efiemu

        * include/grub/efiemu/efiemu.h (grub_efiemu_configuration_table64_t):
        correct wrong typedef
        * efiemu/prepare.c (SUFFIX (grub_efiemu_prepare)): minor style fixes

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/efiemu/prepare.c
    trunk/grub2/include/grub/efiemu/efiemu.h

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-07-15 19:45:44 UTC (rev 2414)
+++ trunk/grub2/ChangeLog       2009-07-15 22:04:41 UTC (rev 2415)
@@ -1,3 +1,11 @@
+2009-07-16  Vladimir Serbinenko  <address@hidden>
+
+       Fix 64-bit efiemu
+
+       * include/grub/efiemu/efiemu.h (grub_efiemu_configuration_table64_t):
+       correct wrong typedef
+       * efiemu/prepare.c (SUFFIX (grub_efiemu_prepare)): minor style fixes
+
 2009-07-15  Pavel Roskin  <address@hidden>
 
        * include/grub/disk.h (struct grub_disk_dev): Use enum for id.

Modified: trunk/grub2/efiemu/prepare.c
===================================================================
--- trunk/grub2/efiemu/prepare.c        2009-07-15 19:45:44 UTC (rev 2414)
+++ trunk/grub2/efiemu/prepare.c        2009-07-15 22:04:41 UTC (rev 2415)
@@ -63,14 +63,15 @@
     curhook->hook (curhook->data);
 
   /* Move runtime to its due place */
-  if ((err = grub_efiemu_loadcore_load ()))
+  err = grub_efiemu_loadcore_load ();
+  if (err)
     {
       grub_efiemu_unload ();
       return err;
     }
 
-  if ((err = grub_efiemu_resolve_symbol ("efiemu_system_table",
-                                        &handle, &off)))
+  err = grub_efiemu_resolve_symbol ("efiemu_system_table", &handle, &off);
+  if (err)
     {
       grub_efiemu_unload ();
       return err;
@@ -78,14 +79,14 @@
 
   SUFFIX (grub_efiemu_system_table)
     = (struct SUFFIX (grub_efi_system_table) *)
-    ((grub_uint8_t *)grub_efiemu_mm_obtain_request (handle) + off);
+    ((grub_uint8_t *) grub_efiemu_mm_obtain_request (handle) + off);
 
   /* compute CRC32 of runtime_services */
   if ((err = grub_efiemu_resolve_symbol ("efiemu_runtime_services",
                                         &handle, &off)))
     return err;
   runtime_services = (struct SUFFIX (grub_efiemu_runtime_services) *)
-       ((grub_uint8_t *)grub_efiemu_mm_obtain_request (handle) + off);
+       ((grub_uint8_t *) grub_efiemu_mm_obtain_request (handle) + off);
   runtime_services->hdr.crc32 = 0;
   runtime_services->hdr.crc32 = grub_getcrc32
     (0, runtime_services, runtime_services->hdr.header_size);

Modified: trunk/grub2/include/grub/efiemu/efiemu.h
===================================================================
--- trunk/grub2/include/grub/efiemu/efiemu.h    2009-07-15 19:45:44 UTC (rev 
2414)
+++ trunk/grub2/include/grub/efiemu/efiemu.h    2009-07-15 22:04:41 UTC (rev 
2415)
@@ -187,7 +187,7 @@
   grub_efi_guid_t vendor_guid;
   grub_efi_uint64_t vendor_table;
 } __attribute__ ((packed));
-typedef struct grub_efiemu_configuration_table32 
grub_efiemu_configuration_table64_t;
+typedef struct grub_efiemu_configuration_table64 
grub_efiemu_configuration_table64_t;
 grub_err_t grub_efiemu_unregister_configuration_table (grub_efi_guid_t guid);
 grub_err_t
 grub_efiemu_register_configuration_table (grub_efi_guid_t guid,





reply via email to

[Prev in Thread] Current Thread [Next in Thread]