firmware: Fix assorted compiler warnings

This commit makes the build a little quieter by fixing the following
warnings,

firmware.h:39:43: warning: ‘struct initramfs’ declared inside parameter list

main.c:714:2: warning: implicit declaration of function ‘fs_init’

core/mem/free.c:79:5: warning: implicit declaration of function ‘FreePool’
core/mem/malloc.c:73:5: warning: implicit declaration of function ‘AllocatePool’

Signed-off-by: Chandramouli Narayanan <chandramouli.narayanan@intel.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>

diff --git a/com32/include/syslinux/firmware.h b/com32/include/syslinux/firmware.h
index ceb006f..456ba66 100644 (file)
--- a/com32/include/syslinux/firmware.h
+++ b/com32/include/syslinux/firmware.h
@@ -25,13 +25,14 @@ struct adv_ops {
 };
 
 struct disk_private;
+struct initramfs;
 
 struct firmware {
        void (*init)(void);
        int (*scan_memory)(scan_memory_callback_t, void *);
        void (*adjust_screen)(void);
        void (*cleanup)(void);
-       struct disk *(*disk_init)(struct disk_private *);
+       struct disk *(*disk_init)(void *);
        struct output_ops *o_ops;
        struct input_ops *i_ops;
        char *(*get_config_file_name)(void);

diff --git a/core/include/core.h b/core/include/core.h
index 69c16d6..b66e008 100644 (file)
--- a/core/include/core.h
+++ b/core/include/core.h
@@ -11,6 +11,11 @@
 #include <com32.h>
 #include <errno.h>
 #include <syslinux/pmapi.h>
+#ifdef SYSLINUX_EFI
+#include <efi.h>
+#include <efilib.h>
+#include <efistdarg.h>
+#endif
 
 extern char core_xfer_buf[65536];
 extern char core_cache_buf[65536];

diff --git a/core/include/fs.h b/core/include/fs.h
index decada6..a9bf9a6 100644 (file)
--- a/core/include/fs.h
+++ b/core/include/fs.h
@@ -181,6 +181,8 @@ static inline struct file *handle_to_file(uint16_t handle)
 
 extern char *PATH;
 
+/* fs.c */
+void fs_init(const struct fs_ops **ops, struct disk_private *priv);
 void pm_mangle_name(com32sys_t *);
 void pm_searchdir(com32sys_t *);
 void mangle_name(char *, const char *);

diff --git a/efi/main.c b/efi/main.c
index 9893767..5467415 100644 (file)
--- a/efi/main.c
+++ b/efi/main.c
@@ -653,7 +653,7 @@ bail:
        return -1;
 }
 
-extern struct disk *efi_disk_init(com32sys_t *);
+extern struct disk *efi_disk_init(EFI_HANDLE);
 extern void serialcfg(uint16_t *, uint16_t *, uint16_t *);
 
 struct firmware efi_fw = {
@@ -685,7 +685,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *table)
 {
        EFI_LOADED_IMAGE *info;
        EFI_STATUS status = EFI_SUCCESS;
-       struct fs_ops *ops[] = { &vfat_fs_ops, NULL };
+       const struct fs_ops *ops[] = { &vfat_fs_ops, NULL };
        unsigned long len = (unsigned long)__bss_end - (unsigned long)__bss_start;
        static struct disk_private priv;