search for: mac_count

...(0x33); part = (struct apple_part_header *)(gpt + 4096); @@ -868,11 +868,11 @@ initialise_apm(uint8_t *gpt, uint32_t start) part->signature = bendian_short(0x504d); part->map_count = bendian_int(3); part->start_block = bendian_int(mac_lba); - part->block_count = bendian_int(mac_count); + part->block_count = bendian_int(mac_count / 4); strcpy(part->name, "EFI"); strcpy(part->type, "Apple_HFS"); part->data_start = bendian_int(0); - part->data_count = bendian_int(mac_count); + part->data_count = bendian_int(mac_count / 4); part->sta...

...mbr[2] = 0xff; + mbr[3] = 0xff; + mbr[4] = 0x0; + mbr[5] = 0xfe; + mbr[6] = 0xff; + mbr[7] = 0xff; + + tmp = lendian_int(mac_lba * 4); + memcpy(&mbr[8], &tmp, sizeof(tmp)); + + tmp = lendian_int(mac_count); + memcpy(&mbr[12], &tmp, sizeof(tmp)); + } mbr += 16; } mbr[0] = 0x55; @@ -908,8 +954,7 @@ main(int argc, char *argv[]) if (!read_efi_section(buf)) { buf += 32; if (!read_efi_catalogue(buf, &efi_count, &efi_lba) && efi_lba...

Hi, following will be 6 patch proposals for isohybrid.c 1: Encode GPT partition names as UTF-16LE 2: Correct blocking factor in APM partition block counts 3: Correct end block address of first GPT partition 4: Write GPT backup to the very end of the image 5: Change all fseek(3) to fseeko(3) 6: Introduce option --mbr and make isohybrid.c compilable standalone If the form needs adjustments,

...0; uint32_t c = 0, cc = 0, cs = 0; +uint32_t psize = 0, isosize = 0; + /* boot catalogue parameters */ uint32_t de_lba = 0; uint16_t de_seg = 0, de_count = 0, de_mbz2 = 0; uint8_t de_boot = 0, de_media = 0, de_sys = 0, de_mbz1 = 0; +uint32_t efi_lba = 0, mac_lba = 0; +uint16_t efi_count = 0, mac_count = 0; +uint8_t efi_boot = 0, efi_media = 0, efi_sys = 0; + +int apm_parts = 3; + +uint8_t afp_header[] = { 0x45, 0x52, 0x08, 0x00, 0x00, 0x00, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };...

...r than 0x10: part->block_count = bendian_int(0x10); - These _count variables should probably be divided by 4 before being submitted to bendian_int(): part->block_count = bendian_int(efi_count); part->data_count = bendian_int(efi_count); part->block_count = bendian_int(mac_count); part->data_count = bendian_int(mac_count); The numbers stem from read_efi_catalogue() which deals with EFI blocks of 512 bytes. ----------------------------------------------------------------------- The "Last LBA" of the first GPT entry is 1329448, the size of the ISO imag...

...+= sizeof(struct gpt_part_header); @@ -815,7 +820,7 @@ initialise_gpt(uint8_t *gpt, uint32_t current, uint32_t alternate, int primary) memcpy(part->partTypeGUID, hfs_partition, sizeof(uuid_t)); part->firstLBA = lendian_64(mac_lba * 4); part->lastLBA = lendian_64(part->firstLBA + mac_count - 1); - memcpy(part->name, "ISOHybrid", 20); + memcpy(part->name, part_name_bootimg, 20); part--; } -- 1.8.4.2

..._header); > > @@ -864,7 +874,7 @@ initialise_gpt(uint8_t *gpt, uint32_t current, uint32_t alternate, int primary) > memcpy(part->partTypeGUID, hfs_partition, sizeof(uuid_t)); > part->firstLBA = lendian_64(mac_lba * 4); > part->lastLBA = lendian_64(part->firstLBA + mac_count - 1); > - memcpy(part->name, part_name_bootimg, 20); > + ascii_to_utf16le(part->name, "ISOHybrid"); > > part--; > } > _______________________________________________ > Syslinux-commits mailing list > Syslinux-commits at zytor.com > http://www.zyto...