X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=elilo.h;h=bd0cd0b69bbdda709f77eea887a1f28d3c157960;hb=refs%2Fheads%2Fmaster;hp=74f740d0082f31c360b6f6802c742dc0a5cd4425;hpb=2344eb51e123a29ed29ed03e6b4d56190d8d7c43;p=debian%2Felilo diff --git a/elilo.h b/elilo.h index 74f740d..bd0cd0b 100644 --- a/elilo.h +++ b/elilo.h @@ -29,8 +29,16 @@ #ifndef __ELILO_H__ #define __ELILO_H__ +#define ELILO_VERSION L"3.14" + #include +#ifdef CONFIG_ia32 +#define PTR_FMT L"0x%x" +#else +#define PTR_FMT L"0x%lx" +#endif + #include "elilo_debug.h" #include "fileops.h" @@ -46,6 +54,10 @@ #define ROUNDUP(x,a) (((x) + (a) - 1) & ~((a) - 1)) #define ROUNDDOWN(x,a) ((x) & ~((a) - 1)) +#ifndef UINT32_MAX +#define UINT32_MAX ((UINT32)-1) +#endif + /* * Elilo Boot modes */ @@ -57,7 +69,8 @@ #define ELILO_DEFAULT_TIMEOUT ELILO_TIMEOUT_INFINITY #define ELILO_TIMEOUT_INFINITY (~0UL) -#define CMDLINE_MAXLEN 512 /* needed by ia32 */ +#define CMDLINE_MAXLEN 2048 +#define PATHNAME_MAXLEN 512 #define FILENAME_MAXLEN 256 #define MAX_ARGS 256 /* Just pick an arbitrary number that's high enough for now :o) */ @@ -150,6 +163,7 @@ extern VOID *alloc_pages(UINTN, EFI_MEMORY_TYPE, EFI_ALLOCATE_TYPE, VOID *); extern VOID free_pages(VOID *); extern VOID free_all(VOID); extern INTN alloc_kmem(VOID *, UINTN); +extern INTN alloc_kmem_anywhere(VOID **, UINTN); extern VOID free_kmem(VOID); extern VOID free_all_memory(VOID); @@ -183,7 +197,7 @@ extern CHAR16 *get_config_file(VOID); extern INTN load_file(CHAR16 *, memdesc_t *); /* from alternate.c */ -extern INTN alternate_kernel(CHAR16 *, INTN); +extern INTN alternate_kernel(CHAR16 *, UINTN); /* from bootparams.c */ extern VOID *create_boot_params (CHAR16 *, memdesc_t *, memdesc_t *, UINTN *); @@ -203,6 +217,7 @@ extern CHAR16 *sysdeps_get_cmdline_opts(VOID); extern INTN sysdeps_getopt(INTN, INTN, CHAR16 *); extern VOID sysdeps_print_cmdline_opts(VOID); extern INTN sysdeps_register_options(VOID); +extern VOID *sysdeps_checkfix_initrd(VOID *, memdesc_t *); #define CHAR_SLASH L'/' #define CHAR_BACKSLASH L'\\'