Add interface for querying the syslinux feature flags.

diff --git a/com32/include/syslinux/features.h b/com32/include/syslinux/features.h
new file mode 100644 (file)
index 0000000..e3da12e
--- /dev/null
+++ b/com32/include/syslinux/features.h
@@ -0,0 +1,50 @@
+/* ----------------------------------------------------------------------- *
+ *
+ *   Copyright 2007 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 struct __syslinux_feature_flags {
+  unsigned int len;
+  const unsigned char *ptr;
+} __syslinux_feature_flags;
+
+static inline int syslinux_has_feature(unsigned int __flag)
+{
+  unsigned int __byte = __flag >> 3;
+  unsigned int __bit = __flag & 7;
+
+  if (__byte <= __syslinux_feature_flags.len)
+    return (__syslinux_feature_flags.ptr[__byte] >> __bit) & 1;
+  else
+    return 0;
+}
+
+#endif /* _SYSLINUX_FEATURE_H */

diff --git a/com32/lib/Makefile b/com32/lib/Makefile
index 46c3046..f038452 100644 (file)
--- a/com32/lib/Makefile
+++ b/com32/lib/Makefile
@@ -64,7 +64,7 @@ LIBOBJS = \
        \
        sys/x86_init_fpu.o math/pow.o math/strtod.o                     \
        \
-       syslinux/idle.o                                                 \
+       syslinux/idle.o syslinux/features.o                             \
        \
        syslinux/addlist.o syslinux/freelist.o syslinux/memmap.o        \
        syslinux/movebits.o syslinux/shuffle.o syslinux/shuffle_pm.o    \

diff --git a/com32/lib/syslinux/features.c b/com32/lib/syslinux/features.c
new file mode 100644 (file)
index 0000000..2b61eb4
--- /dev/null
+++ b/com32/lib/syslinux/features.c
@@ -0,0 +1,51 @@
+/* ----------------------------------------------------------------------- *
+ *
+ *   Copyright 2007 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.
+ *
+ * ----------------------------------------------------------------------- */
+
+/*
+ * syslinux/features.c
+ *
+ * SYSLINUX feature flag query
+ */
+
+#include <klibc/compiler.h>
+#include <syslinux/features.h>
+#include <string.h>
+#include <com32.h>
+
+struct __syslinux_feature_flags __syslinux_feature_flags;
+
+void __constructor __syslinux_detect_features(void)
+{
+  static com32sys_t reg;
+
+  memset(&reg, 0, sizeof reg);
+  reg.eax.w[0] = 0x0015;
+  __intcall(0x22, &reg, &reg);
+
+  __syslinux_feature_flags.len = reg.ecx.w[0];
+  __syslinux_feature_flags.ptr = MK_PTR(reg.es, reg.ebx.w[0]);
+}