diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-12-07 11:33:45 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-12-07 11:33:45 +0000 |
| commit | 10f6cf6eef0a7da7dad1933efdbfb101155792d0 (patch) | |
| tree | d8ee3bfc6e55e739e0f135cd6d945955c670dd46 /com32/include/syslinux | |
| parent | 35928ee37da523e5f992cc462a4a4193d0bfaa4c (diff) | |
| parent | ddb10ce99c327888ade4d2ba3e4c50ad12aaa059 (diff) | |
| download | syslinux-10f6cf6eef0a7da7dad1933efdbfb101155792d0.tar.gz | |
Merge tag 'syslinux-5.00' into firmwaresyslinux-6.00-pre3
Conflicts:
Makefile
com32/elflink/ldlinux/Makefile
com32/lib/sys/module/elf_module.c
core/cleanup.c
core/comboot.inc
core/conio.c
core/fs/fs.c
core/init.c
core/mem/free.c
core/mem/malloc.c
core/timer.inc
diag/geodsp/Makefile
extlinux/main.c
mk/embedded.mk
modules/Makefile
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'com32/include/syslinux')
| -rw-r--r-- | com32/include/syslinux/boot.h | 1 | ||||
| -rw-r--r-- | com32/include/syslinux/features.h | 48 |
2 files changed, 0 insertions, 49 deletions
diff --git a/com32/include/syslinux/boot.h b/com32/include/syslinux/boot.h index aea32d9c..74a311df 100644 --- a/com32/include/syslinux/boot.h +++ b/com32/include/syslinux/boot.h @@ -61,7 +61,6 @@ extern const struct image_types image_boot_types[]; #define IMAGE_TYPE_BSS 3 #define IMAGE_TYPE_PXE 4 #define IMAGE_TYPE_FDIMAGE 5 -#define IMAGE_TYPE_COMBOOT 6 #define IMAGE_TYPE_COM32 7 #define IMAGE_TYPE_CONFIG 8 #define IMAGE_TYPE_LOCALBOOT 9 diff --git a/com32/include/syslinux/features.h b/com32/include/syslinux/features.h deleted file mode 100644 index d25d08d5..00000000 --- a/com32/include/syslinux/features.h +++ /dev/null @@ -1,48 +0,0 @@ -/* ----------------------------------------------------------------------- * - * - * Copyright 2007-2008 H. Peter Anvin - All Rights Reserved - * - * 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 _SYSLINUX_FEATURES_H -#define _SYSLINUX_FEATURES_H - -#define SYSLINUX_FEATURE_LOCAL_BOOT (0*8+0) -#define SYSLINUX_FEATURE_NOOP_IDLE (0*8+1) - -extern uint8_t feature_flags; -extern uint8_t feature_flags_len; - -static inline int syslinux_has_feature(unsigned int __flag) -{ - unsigned int __byte = __flag >> 3; - unsigned int __bit = __flag & 7; - - if (__byte <= feature_flags_len) - return (feature_flags[__byte] >> __bit) & 1; - else - return 0; -} - -#endif /* _SYSLINUX_FEATURE_H */ |