aboutsummaryrefslogtreecommitdiffstats
path: root/com32/gplinclude
diff options
context:
space:
mode:
authorPierre-Alexandre Meyer <pierre@mouraf.org>2009-09-07 16:12:59 -0700
committerPierre-Alexandre Meyer <pierre@mouraf.org>2009-09-07 16:22:36 -0700
commite9069caefc1460ec7f4d058796005474c125fc61 (patch)
tree25cd847439fb004798251a63fa8886073134009f /com32/gplinclude
parentc93e27af183de1cdf591706448d42887d0fbc0eb (diff)
parent03b2384b6e9f54d9697e87d2a19c321e6fd96ed5 (diff)
downloadsyslinux-e9069caefc1460ec7f4d058796005474c125fc61.tar.gz
syslinux-e9069caefc1460ec7f4d058796005474c125fc61.tar.xz
syslinux-e9069caefc1460ec7f4d058796005474c125fc61.zip
Merge branch 'bootloader-detection' into hdt-next
Conflicts: com32/hdt/hdt-cli-disk.c com32/hdt/hdt-common.h com32/hdt/hdt-menu-disk.c Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Diffstat (limited to 'com32/gplinclude')
-rw-r--r--com32/gplinclude/disk/bootloaders.h18
-rw-r--r--com32/gplinclude/disk/mbrs.h18
2 files changed, 36 insertions, 0 deletions
diff --git a/com32/gplinclude/disk/bootloaders.h b/com32/gplinclude/disk/bootloaders.h
new file mode 100644
index 00000000..6aec9b3d
--- /dev/null
+++ b/com32/gplinclude/disk/bootloaders.h
@@ -0,0 +1,18 @@
+/* ----------------------------------------------------------------------- *
+ *
+ * Copyright 2009 Pierre-Alexandre Meyer
+ *
+ * This file is part of Syslinux, and is made available under
+ * the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+
+#ifndef __BOOTLOADERS_H_
+#define __BOOTLOADERS_H_
+
+#include <stdint.h>
+#include <disk/geom.h>
+#include <disk/partition.h>
+
+int get_bootloader_string(const struct driveinfo *, const struct part_entry *, char*, const int);
+#endif /* __BOOTLOADERS_H_ */
diff --git a/com32/gplinclude/disk/mbrs.h b/com32/gplinclude/disk/mbrs.h
new file mode 100644
index 00000000..ad104ff7
--- /dev/null
+++ b/com32/gplinclude/disk/mbrs.h
@@ -0,0 +1,18 @@
+/* ----------------------------------------------------------------------- *
+ *
+ * Copyright 2009 Pierre-Alexandre Meyer
+ *
+ * This file is part of Syslinux, and is made available under
+ * the terms of the GNU General Public License version 2.
+ *
+ * ----------------------------------------------------------------------- */
+
+#ifndef __MBRS_H_
+#define __MBRS_H_
+
+#include <stdint.h>
+#include <disk/geom.h>
+
+void get_mbr_string(const uint32_t, void *, const int);
+uint32_t get_mbr_id(const struct driveinfo *);
+#endif /* __MBRS_H_ */