diff options
| -rw-r--r-- | payloads/libpayload/i386/multiboot.c | 2 | ||||
| -rw-r--r-- | payloads/libpayload/include/libpayload.h | 9 | ||||
| -rw-r--r-- | payloads/libpayload/include/sysinfo.h | 2 | ||||
| -rw-r--r-- | payloads/libpayload/libc/Makefile.inc | 2 | ||||
| -rw-r--r-- | payloads/libpayload/libc/sysinfo.c | 39 |
5 files changed, 53 insertions, 1 deletions
diff --git a/payloads/libpayload/i386/multiboot.c b/payloads/libpayload/i386/multiboot.c index 09e72c768b..040cc082f1 100644 --- a/payloads/libpayload/i386/multiboot.c +++ b/payloads/libpayload/i386/multiboot.c @@ -86,6 +86,8 @@ int get_multiboot_info(struct sysinfo_t *info) table = (struct multiboot_header *) phys_to_virt(loader_ebx); + info->mbtable = phys_to_virt(loader_ebx); + if (table->flags & MULTIBOOT_FLAGS_MMAP) mb_parse_mmap(table, info); diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h index 66d114e8f1..6d48279628 100644 --- a/payloads/libpayload/include/libpayload.h +++ b/payloads/libpayload/include/libpayload.h @@ -421,6 +421,15 @@ int lfclose(struct LFILE *file); /** @} */ /** + * @defgroup info System information functions + * This module contains functions that return information about the system + * @{ + */ + +int sysinfo_have_multiboot(unsigned long *addr); +/** @} */ + +/** * @defgroup arch Architecture specific functions * This module contains global architecture specific functions. * All architectures are expected to define these functions. diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h index a9d7d122fb..3b2c69c61d 100644 --- a/payloads/libpayload/include/sysinfo.h +++ b/payloads/libpayload/include/sysinfo.h @@ -48,6 +48,8 @@ struct sysinfo_t { u32 cmos_range_start; u32 cmos_range_end; u32 cmos_checksum_location; + + unsigned long *mbtable; /** Pointer to the multiboot table */ }; extern struct sysinfo_t lib_sysinfo; diff --git a/payloads/libpayload/libc/Makefile.inc b/payloads/libpayload/libc/Makefile.inc index a4cd1bce6f..0353bb67e0 100644 --- a/payloads/libpayload/libc/Makefile.inc +++ b/payloads/libpayload/libc/Makefile.inc @@ -31,4 +31,4 @@ TARGETS-$(CONFIG_LIBC) += libc/malloc.o libc/printf.o libc/console.o libc/string.o TARGETS-$(CONFIG_LIBC) += libc/memory.o libc/ctype.o libc/ipchecksum.o libc/lib.o TARGETS-$(CONFIG_LIBC) += libc/rand.o libc/time.o libc/lar.o libc/exec.o -TARGETS-$(CONFIG_LIBC) += libc/readline.o +TARGETS-$(CONFIG_LIBC) += libc/readline.o libc/sysinfo.o diff --git a/payloads/libpayload/libc/sysinfo.c b/payloads/libpayload/libc/sysinfo.c new file mode 100644 index 0000000000..73a9ab5539 --- /dev/null +++ b/payloads/libpayload/libc/sysinfo.c @@ -0,0 +1,39 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2008 Jordan Crouse <jordan@cosmicpenguin.net> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <libpayload.h> +#include <sysinfo.h> + +extern struct sysinfo_t lib_sysinfo; + +int sysinfo_have_multiboot(unsigned long *addr) +{ + *addr = (unsigned long) lib_sysinfo.mbtable; + return (lib_sysinfo.mbtable == 0) ? 0 : 1; +} |