Merge branch 'feature/upstream' into develop

1 files changed, 16 insertions, 0 deletions

diff --git a/dmidecode.h b/dmidecode.h
index 1dc59a7..318cdc6 100644
--- a/dmidecode.h
+++ b/dmidecode.h
@@ -31,7 +31,23 @@ struct dmi_header
 	u8 *data;
 };
 
+enum cpuid_type
+{
+	cpuid_none,
+	cpuid_80386,
+	cpuid_80486,
+	cpuid_arm_legacy,
+	cpuid_arm_soc_id,
+	cpuid_x86_intel,
+	cpuid_x86_amd,
+};
+
+extern enum cpuid_type cpuid_type;
+
 int is_printable(const u8 *data, int len);
 const char *dmi_string(const struct dmi_header *dm, u8 s);
+void dmi_print_memory_size(const char *addr, u64 code, int shift);
+void dmi_print_cpuid(void (*print_cb)(const char *name, const char *format, ...),
+		     const char *label, enum cpuid_type sig, const u8 *p);
 
 #endif