diff options
author | Michal Soltys <soltys@ziu.info> | 2013-02-14 16:51:46 +0100 |
---|---|---|
committer | Michal Soltys <soltys@ziu.info> | 2013-02-14 16:53:05 +0100 |
commit | 9729a776507e811040ebb65699312b4620546ba3 (patch) | |
tree | d76464d63eb4ac23ac201ba5ad5b389082469bb1 | |
parent | 2a6351535426d966745a82be71baf937994cb417 (diff) | |
download | syslinux-9729a776507e811040ebb65699312b4620546ba3.tar.gz syslinux-9729a776507e811040ebb65699312b4620546ba3.tar.xz syslinux-9729a776507e811040ebb65699312b4620546ba3.zip |
com32/chain: remove common.h
Only 2 defines there related to preliminary options.c's and chain.c's
hecks (real checks come later during mapping to real memory). So move
them to options.h and remove common.h.
Signed-off-by: Michal Soltys <soltys@ziu.info>
-rw-r--r-- | com32/chain/chain.c | 1 | ||||
-rw-r--r-- | com32/chain/common.h | 39 | ||||
-rw-r--r-- | com32/chain/mangle.c | 1 | ||||
-rw-r--r-- | com32/chain/options.c | 1 | ||||
-rw-r--r-- | com32/chain/options.h | 3 | ||||
-rw-r--r-- | com32/chain/partiter.c | 1 |
6 files changed, 3 insertions, 43 deletions
diff --git a/com32/chain/chain.c b/com32/chain/chain.c index d6eab7ce..87dea378 100644 --- a/com32/chain/chain.c +++ b/com32/chain/chain.c @@ -34,7 +34,6 @@ #include <syslinux/config.h> #include <syslinux/disk.h> #include <syslinux/video.h> -#include "common.h" #include "chain.h" #include "utility.h" #include "options.h" diff --git a/com32/chain/common.h b/com32/chain/common.h deleted file mode 100644 index 65f78f0c..00000000 --- a/com32/chain/common.h +++ /dev/null @@ -1,39 +0,0 @@ -/* ----------------------------------------------------------------------- * - * - * Copyright 2003-2009 H. Peter Anvin - All Rights Reserved - * Copyright 2009-2010 Intel Corporation; author: H. Peter Anvin - * Copyright 2010 Shao Miller - * Copyright 2010-2012 Michal Soltys - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom - * the Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall - * be included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - * - * ----------------------------------------------------------------------- */ - -#ifndef COM32_CHAIN_COMMON_H -#define COM32_CHAIN_COMMON_H - -#define ADDRMAX 0x9EFFFu -#define ADDRMIN 0x500u - -#endif - -/* vim: set ts=8 sts=4 sw=4 noet: */ diff --git a/com32/chain/mangle.c b/com32/chain/mangle.c index e1f7ae33..391554b2 100644 --- a/com32/chain/mangle.c +++ b/com32/chain/mangle.c @@ -35,7 +35,6 @@ #include <stdint.h> #include <dprintf.h> #include <syslinux/config.h> -#include "common.h" #include "chain.h" #include "options.h" #include "utility.h" diff --git a/com32/chain/options.c b/com32/chain/options.c index 4044520b..70f50697 100644 --- a/com32/chain/options.c +++ b/com32/chain/options.c @@ -31,7 +31,6 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> -#include "common.h" #include "chain.h" #include "partiter.h" #include "utility.h" diff --git a/com32/chain/options.h b/com32/chain/options.h index 5ae41090..a53f38bf 100644 --- a/com32/chain/options.h +++ b/com32/chain/options.h @@ -34,6 +34,9 @@ #include <stdint.h> #include <syslinux/bootrm.h> +#define ADDRMAX 0x9EFFFu +#define ADDRMIN 0x500u + enum {HIDE_OFF = 0, HIDE_ON = 1, HIDE_EXT = 2, HIDE_REV = 4}; struct options { diff --git a/com32/chain/partiter.c b/com32/chain/partiter.c index 3c7670d6..2e03fb55 100644 --- a/com32/chain/partiter.c +++ b/com32/chain/partiter.c @@ -40,7 +40,6 @@ #include <stdarg.h> #include <zlib.h> #include <syslinux/disk.h> -#include "common.h" #include "partiter.h" #include "utility.h" |