← Back to branch summary

~hamo/ubuntu/precise/grub2/grub2.hi_res

« back to all changes in this revision

Viewing changes to grub-core/loader/i386/xnu.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-01-11 17:11:44 UTC
  • mto: (17.6.24 experimental)
  • mto: This revision was merged to the branch mainline in revision 100.
  • Revision ID: james.westby@ubuntu.com-20110111171144-o2h6luxzei5fivmf
Tags: upstream-1.99~20110111
Import upstream version 1.99~20110111

Show diffs side-by-side

added added

removed removed

Lines of Context:
grub-core/loader/i386/xnu.c
951
951
grub_xnu_boot (void)
952
952
{
953
953
  struct grub_xnu_boot_params *bootparams;
 
954
  void *bp_in;
954
955
  grub_addr_t bootparams_target;
955
956
  grub_err_t err;
956
957
  grub_efi_uintn_t memory_map_size = 0;
957
 
  grub_efi_memory_descriptor_t *memory_map;
 
958
  void *memory_map;
958
959
  grub_addr_t memory_map_target;
959
960
  grub_efi_uintn_t map_key = 0;
960
961
  grub_efi_uintn_t descriptor_size = 0;
1006
1007
 
1007
1008
  /* Relocate the boot parameters to heap. */
1008
1009
  err = grub_xnu_heap_malloc (sizeof (*bootparams),
1009
 
                              (void **) &bootparams, &bootparams_target);
 
1010
                              &bp_in, &bootparams_target);
1010
1011
  if (err)
1011
1012
    return err;
 
1013
  bootparams = bp_in;
1012
1014
 
1013
1015
  /* Set video. */
1014
1016
  err = grub_xnu_set_video (bootparams);
1035
1037
     memory map growth.  */
1036
1038
  memory_map_size += 20 * descriptor_size;
1037
1039
  err = grub_xnu_heap_malloc (memory_map_size,
1038
 
                              (void **) &memory_map, &memory_map_target);
 
1040
                              &memory_map, &memory_map_target);
1039
1041
  if (err)
1040
1042
    return err;
1041
1043
 
1109
1111
  grub_xnu_arg1 = bootparams_target;
1110
1112
 
1111
1113
  grub_autoefi_set_virtual_address_map (memory_map_size, descriptor_size,
1112
 
                                        descriptor_version,memory_map);
 
1114
                                        descriptor_version, memory_map);
1113
1115
 
1114
1116
  state.eip = grub_xnu_entry_point;
1115
1117
  state.eax = grub_xnu_arg1;