aboutsummaryrefslogtreecommitdiffstats
path: root/com32/gplinclude/dmi
diff options
context:
space:
mode:
authorPierre-Alexandre Meyer <pierre@mouraf.org>2009-05-14 22:24:20 -0700
committerPierre-Alexandre Meyer <pierre@mouraf.org>2009-05-14 22:24:20 -0700
commit28ef450da5869ecfd4d7d7226f6008c942525996 (patch)
tree17d6c30734dc04d69299beeef2a4ebf94c628962 /com32/gplinclude/dmi
parent897f8349b7f231329d0059ffc6645074ec8ab903 (diff)
parent4899adbd7ad688fb6a6b8dc2f8aad54719168e09 (diff)
downloadsyslinux-28ef450da5869ecfd4d7d7226f6008c942525996.tar.gz
syslinux-28ef450da5869ecfd4d7d7226f6008c942525996.tar.xz
syslinux-28ef450da5869ecfd4d7d7226f6008c942525996.zip
Merge branch 'for-erwan' of git://git.zytor.com/users/pam/hdt-pierre into for-erwan
Conflicts: com32/gplinclude/dmi/dmi.h com32/gpllib/dmi/dmi.c com32/hdt/hdt-cli-dmi.c Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Diffstat (limited to 'com32/gplinclude/dmi')
-rw-r--r--com32/gplinclude/dmi/dmi.h2
-rw-r--r--com32/gplinclude/dmi/dmi_memory.h16
2 files changed, 18 insertions, 0 deletions
diff --git a/com32/gplinclude/dmi/dmi.h b/com32/gplinclude/dmi/dmi.h
index 50cd4cac..f087df56 100644
--- a/com32/gplinclude/dmi/dmi.h
+++ b/com32/gplinclude/dmi/dmi.h
@@ -66,9 +66,11 @@ typedef struct {
s_chassis chassis;
s_processor processor;
s_battery battery;
+ s_memory_module memory_module[MAX_DMI_MEMORY_ITEMS];
s_memory memory[MAX_DMI_MEMORY_ITEMS];
s_ipmi ipmi;
s_cache cache[MAX_DMI_CACHE_ITEMS];
+ int memory_module_count;
int memory_count;
int cache_count;
dmi_table dmitable;
diff --git a/com32/gplinclude/dmi/dmi_memory.h b/com32/gplinclude/dmi/dmi_memory.h
index 2b744b5c..6939cd00 100644
--- a/com32/gplinclude/dmi/dmi_memory.h
+++ b/com32/gplinclude/dmi/dmi_memory.h
@@ -49,6 +49,17 @@ char part_number[MEMORY_PART_NUMBER_SIZE];
bool filled;
} s_memory;
+typedef struct {
+char socket_designation[8];
+char bank_connections[8];
+char speed[8];
+char type[16];
+char installed_size[8];
+char enabled_size[8];
+char error_status[8];
+bool filled;
+} s_memory_module;
+
void dmi_memory_array_error_handle(uint16_t code,char *array);
void dmi_memory_device_width(uint16_t code, char *width);
void dmi_memory_device_size(uint16_t code, char *size);
@@ -58,4 +69,9 @@ 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_speed(uint16_t code, char *speed);
+void dmi_memory_module_connections(uint8_t, char*);
+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_error(uint8_t, const char*, char*);
#endif