[syslinux:disklib] chain.c32, libcom32: Move struct guid
syslinux-bot for Shao Miller
shao.miller at yrdsb.edu.on.ca
Sun Jul 25 17:33:13 PDT 2010
Commit-ID: c7d09b7143ec4e051033cfc19ab13257e0142655
Gitweb: http://syslinux.zytor.com/commit/c7d09b7143ec4e051033cfc19ab13257e0142655
Author: Shao Miller <shao.miller at yrdsb.edu.on.ca>
AuthorDate: Mon, 28 Jun 2010 03:18:09 -0400
Committer: Shao Miller <shao.miller at yrdsb.edu.on.ca>
CommitDate: Sat, 10 Jul 2010 01:03:06 -0400
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 at yrdsb.edu.on.ca>
---
com32/include/syslinux/disk.h | 14 ++++++++++++++
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 f96e8fe..221b6a9 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 896727d..1d3f7ba 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
More information about the Syslinux-commits
mailing list