Stefan Reinauer (stefan.reinauer@coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1722
-gerrit
commit 2cfd0f00bea0f83f4ad76a91787bb2235297ff67 Author: Gabe Black gabeblack@google.com Date: Tue Aug 28 16:31:09 2012 -0700
Move the definition of ipchksum into its own header file.
Change-Id: Ifb7c18f9ca566bd50ca138ffd8af951375089537 Signed-off-by: Gabe Black gabeblack@google.com --- payloads/libpayload/include/coreboot_tables.h | 1 + payloads/libpayload/include/ipchksum.h | 33 +++++++++++++++++++++++++++ payloads/libpayload/include/libpayload.h | 8 +------ 3 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/payloads/libpayload/include/coreboot_tables.h b/payloads/libpayload/include/coreboot_tables.h index 771cd26..9251826 100644 --- a/payloads/libpayload/include/coreboot_tables.h +++ b/payloads/libpayload/include/coreboot_tables.h @@ -31,6 +31,7 @@ #define _COREBOOT_TABLES_H
#include <arch/types.h> +#include <ipchksum.h>
struct cbuint64 { u32 lo; diff --git a/payloads/libpayload/include/ipchksum.h b/payloads/libpayload/include/ipchksum.h new file mode 100644 index 0000000..b7ded08 --- /dev/null +++ b/payloads/libpayload/include/ipchksum.h @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2012 The Chromium OS Authors. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but without any warranty; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef __IPCHKSUM_H__ +#define __IPCHKSUM_H__ + +/** + * @defgroup ipchecksum IP checksum functions + * @{ + */ +unsigned short ipchksum(const void *ptr, unsigned long nbytes); +/** @} */ + +#endif diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h index c3729e2..b47d79f 100644 --- a/payloads/libpayload/include/libpayload.h +++ b/payloads/libpayload/include/libpayload.h @@ -45,6 +45,7 @@
#include <libpayload-config.h> #include <ctype.h> +#include <ipchksum.h> #include <stddef.h> #include <stdio.h> #include <stdarg.h> @@ -262,13 +263,6 @@ void console_add_input_driver(struct console_input_driver *in); #define havechar havekey /** @} */
-/** - * @defgroup ipchecksum IP checksum functions - * @{ - */ -unsigned short ipchksum(const void *ptr, unsigned long nbytes); -/** @} */ -
/** * @defgroup exec Execution functions