aboutsummaryrefslogtreecommitdiffstats
path: root/com32/gplinclude
diff options
context:
space:
mode:
authorErwan Velu <erwanaliasr1@gmail.com>2011-01-25 20:41:50 +0100
committerErwan Velu <erwanaliasr1@gmail.com>2011-01-25 20:41:50 +0100
commit995558ff657a357b3e44a299525ff66dbb0300b3 (patch)
treeb6caeafa866311926705b2eba695fbd699220f60 /com32/gplinclude
parent2cb593ae927a80e856a255c9e484d16038033f62 (diff)
parent808d43ea43c9df30a0a6922ef4cb4678634d41ab (diff)
downloadsyslinux-995558ff657a357b3e44a299525ff66dbb0300b3.tar.gz
syslinux-995558ff657a357b3e44a299525ff66dbb0300b3.tar.xz
syslinux-995558ff657a357b3e44a299525ff66dbb0300b3.zip
Merge branch 'master' into chouffe
Conflicts: com32/hdt/hdt.h
Diffstat (limited to 'com32/gplinclude')
-rw-r--r--com32/gplinclude/cpuid.h6
-rw-r--r--com32/gplinclude/dmi/dmi_memory.h8
2 files changed, 5 insertions, 9 deletions
diff --git a/com32/gplinclude/cpuid.h b/com32/gplinclude/cpuid.h
index bc9df171..53a08085 100644
--- a/com32/gplinclude/cpuid.h
+++ b/com32/gplinclude/cpuid.h
@@ -19,6 +19,7 @@
#include <stdbool.h>
#include <stdint.h>
#include <cpufeature.h>
+#include <sys/bitops.h>
#include <sys/cpu.h>
#include <klibc/compiler.h>
@@ -173,11 +174,6 @@ typedef struct {
#define X86_VENDOR_NUM 9
#define X86_VENDOR_UNKNOWN 0xff
-static inline __purefunc bool test_bit(int nr, const uint32_t * addr)
-{
- return ((1UL << (nr & 31)) & (addr[nr >> 5])) != 0;
-}
-
#define cpu_has(c, bit) test_bit(bit, (c)->x86_capability)
/*
diff --git a/com32/gplinclude/dmi/dmi_memory.h b/com32/gplinclude/dmi/dmi_memory.h
index 47ad7fcd..4d0ad442 100644
--- a/com32/gplinclude/dmi/dmi_memory.h
+++ b/com32/gplinclude/dmi/dmi_memory.h
@@ -66,12 +66,12 @@ void dmi_memory_device_size(uint16_t code, char *size);
const char *dmi_memory_device_form_factor(uint8_t code);
void dmi_memory_device_set(uint8_t code, char *set);
const char *dmi_memory_device_type(uint8_t code);
-void dmi_memory_device_type_detail(uint16_t code, char *type_detail);
+void dmi_memory_device_type_detail(uint16_t code, char *type_detail, int sizeof_type_detail);
void dmi_memory_device_speed(uint16_t code, char *speed);
-void dmi_memory_module_connections(uint8_t, char *);
+void dmi_memory_module_connections(uint8_t, char *, int);
void dmi_memory_module_speed(uint8_t, char *);
-void dmi_memory_module_types(uint16_t, const char *, char *);
-void dmi_memory_module_size(uint8_t, char *);
+void dmi_memory_module_types(uint16_t, const char *, char *, int);
+void dmi_memory_module_size(uint8_t, char *, int);
void dmi_memory_module_error(uint8_t, const char *, char *);
#endif