Move the prototypes for syslinux_shuffle_boot_*()

Move the prototypes for syslinux_shuffle_boot_[pr]m() from
<syslinux/movebits.h> to <syslinux/boot[pr]m.h>, which anyway has the
required structure definitions.  #include <syslinux/movebits.h> in
those files instead of relying on forward structure definitions.

diff --git a/com32/include/syslinux/bootpm.h b/com32/include/syslinux/bootpm.h
index be0d178..a52d992 100644 (file)
--- a/com32/include/syslinux/bootpm.h
+++ b/com32/include/syslinux/bootpm.h
@@ -35,6 +35,7 @@
 #define _SYSLINUX_BOOTPM_H
 
 #include <stdint.h>
+#include <syslinux/movebits.h>
 
 struct syslinux_pm_regs {
   uint32_t eax;                        /* Offset  0 */
@@ -49,4 +50,10 @@ struct syslinux_pm_regs {
   uint32_t eip;                        /* Offset 32 */
 };
 
+int syslinux_shuffle_boot_pm(struct syslinux_movelist *fraglist,
+                            struct syslinux_memmap *memmap,
+                            uint16_t bootflags,
+                            struct syslinux_pm_regs *regs);
+
+
 #endif /* _SYSLINUX_BOOTPM_H */

diff --git a/com32/include/syslinux/bootrm.h b/com32/include/syslinux/bootrm.h
index 6454129..3688a92 100644 (file)
--- a/com32/include/syslinux/bootrm.h
+++ b/com32/include/syslinux/bootrm.h
@@ -36,6 +36,7 @@
 
 #include <stdint.h>
 #include <com32.h>
+#include <syslinux/movebits.h>
 
 /* This register set is used by the shuffle and boot interface.  It is
    a completely different structure from what the __intcall() and
@@ -61,5 +62,9 @@ struct syslinux_rm_regs {
   uint16_t cs;                 /* Offset 46 */
 };
 
+int syslinux_shuffle_boot_rm(struct syslinux_movelist *fraglist,
+                            struct syslinux_memmap *memmap,
+                            uint16_t bootflags,
+                            struct syslinux_rm_regs *regs);
 
 #endif /* _SYSLINUX_BOOTRM_H */

diff --git a/com32/include/syslinux/movebits.h b/com32/include/syslinux/movebits.h
index 60fcebd..f35ef22 100644 (file)
--- a/com32/include/syslinux/movebits.h
+++ b/com32/include/syslinux/movebits.h
@@ -43,10 +43,6 @@ struct syslinux_memmap {
 };
 
 
-/* Defined in <syslinux/bootpm.h> and <syslinux/bootrm.h> respectively */
-struct syslinux_pm_regs;
-struct syslinux_rm_regs;
-
 /*
  * moves is computed from "fraglist" and "memmap".  Areas that are
  * to be zeroed should be marked as such in the memmap, not in the
@@ -65,14 +61,6 @@ int syslinux_allocate_from_list(struct syslinux_movelist **freelist,
                                addr_t dst, addr_t len);
 int syslinux_prepare_shuffle(struct syslinux_movelist *fraglist,
                             struct syslinux_memmap *memmap);
-int syslinux_shuffle_boot_rm(struct syslinux_movelist *fraglist,
-                            struct syslinux_memmap *memmap,
-                            uint16_t bootflags,
-                            struct syslinux_rm_regs *regs);
-int syslinux_shuffle_boot_pm(struct syslinux_movelist *fraglist,
-                            struct syslinux_memmap *memmap,
-                            uint16_t bootflags,
-                            struct syslinux_pm_regs *regs);
 
 /* Operatons on struct syslinux_memmap */
 struct syslinux_memmap *syslinux_init_memmap(void);