diff options
| author | Shao Miller <shao.miller@yrdsb.edu.on.ca> | 2010-06-28 03:18:09 -0400 |
|---|---|---|
| committer | Shao Miller <shao.miller@yrdsb.edu.on.ca> | 2010-07-10 01:03:06 -0400 |
| commit | c7d09b7143ec4e051033cfc19ab13257e0142655 (patch) | |
| tree | cbf827a6206d2083592536a2f0ee2d4652466220 | |
| parent | 6ba6279507775172c5d7dfe2a3b147ee0a7a0814 (diff) | |
| download | syslinux-c7d09b7143ec4e051033cfc19ab13257e0142655.tar.gz | |
chain.c32, libcom32: Move struct guid
Moving portions of chain.c32 into libcom32.
There might be a better header for struct guid to belong to.
Signed-off-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
| -rw-r--r-- | com32/include/syslinux/disk.h | 14 | ||||
| -rw-r--r-- | com32/modules/chain.c | 12 |
2 files changed, 14 insertions, 12 deletions
diff --git a/com32/include/syslinux/disk.h b/com32/include/syslinux/disk.h index f96e8fe7..221b6a9b 100644 --- a/com32/include/syslinux/disk.h +++ b/com32/include/syslinux/disk.h @@ -88,6 +88,20 @@ struct disk_dos_mbr { } __attribute__ ((packed)); #define disk_mbr_sig_magic 0xAA55 +/** + * A GPT disk/partition GUID + * + * Be careful with endianness, you must adjust it yourself + * iff you are directly using the fourth data chunk. + * There might be a better header for this... + */ +struct guid { + uint32_t data1; + uint16_t data2; + uint16_t data3; + uint64_t data4; +} __attribute__ ((packed)); + extern int disk_int13_retry(const com32sys_t * inreg, com32sys_t * outreg); extern int disk_get_params(int disk, struct disk_info *const diskinfo); extern void *disk_read_sectors(const struct disk_info *const diskinfo, diff --git a/com32/modules/chain.c b/com32/modules/chain.c index 896727d1..1d3f7baf 100644 --- a/com32/modules/chain.c +++ b/com32/modules/chain.c @@ -348,18 +348,6 @@ err_alloc: return NULL; } -/* - * GUID - * Be careful with endianness, you must adjust it yourself - * iff you are directly using the fourth data chunk - */ -struct guid { - uint32_t data1; - uint16_t data2; - uint16_t data3; - uint64_t data4; -} __attribute__ ((packed)); - /* * This walk-map effectively reverses the little-endian * portions of the GUID in the output text |