aboutsummaryrefslogtreecommitdiffstats
path: root/com32/gplinclude
diff options
context:
space:
mode:
authorErwan Velu <erwanaliasr1@gmail.com>2010-05-26 22:46:36 +0200
committerErwan Velu <erwanaliasr1@gmail.com>2010-05-26 22:46:36 +0200
commitce3db882c2cd0fa5d591125bc5b43d201930da5a (patch)
treef8a640d7a7df146b358f0cffb829078f68fb9fac /com32/gplinclude
parent0c890f2eda9f5f4869c9a4477ce2b6ef2b49761e (diff)
parent08b3602db548775ca819780de77686a186156ec7 (diff)
downloadsyslinux-ce3db882c2cd0fa5d591125bc5b43d201930da5a.tar.gz
syslinux-ce3db882c2cd0fa5d591125bc5b43d201930da5a.tar.xz
syslinux-ce3db882c2cd0fa5d591125bc5b43d201930da5a.zip
Merge branch 'master', remote branch 'origin' into chouffe
Diffstat (limited to 'com32/gplinclude')
-rw-r--r--com32/gplinclude/disk/bootloaders.h2
-rw-r--r--com32/gplinclude/dmi/dmi.h1
-rw-r--r--com32/gplinclude/dmi/dmi_processor.h2
-rw-r--r--com32/gplinclude/vpd/vpd.h2
4 files changed, 3 insertions, 4 deletions
diff --git a/com32/gplinclude/disk/bootloaders.h b/com32/gplinclude/disk/bootloaders.h
index 5a6ff9d9..56a0f4e3 100644
--- a/com32/gplinclude/disk/bootloaders.h
+++ b/com32/gplinclude/disk/bootloaders.h
@@ -14,6 +14,6 @@
#include <disk/geom.h>
#include <disk/partition.h>
-int get_bootloader_string(const struct driveinfo *, const struct part_entry *,
+int get_bootloader_string(struct driveinfo *, const struct part_entry *,
char *, const int);
#endif /* __BOOTLOADERS_H_ */
diff --git a/com32/gplinclude/dmi/dmi.h b/com32/gplinclude/dmi/dmi.h
index dba2229b..92cd5f86 100644
--- a/com32/gplinclude/dmi/dmi.h
+++ b/com32/gplinclude/dmi/dmi.h
@@ -13,7 +13,6 @@
#ifndef DMI_H
#define DMI_H
#include <inttypes.h>
-#define DMI_BUFFER_SIZE 16
#define MAX_DMI_MEMORY_ITEMS 32
#define MAX_DMI_CACHE_ITEMS 32
#define OEM_STRINGS_SIZE 512
diff --git a/com32/gplinclude/dmi/dmi_processor.h b/com32/gplinclude/dmi/dmi_processor.h
index 63b8767f..6107d31d 100644
--- a/com32/gplinclude/dmi/dmi_processor.h
+++ b/com32/gplinclude/dmi/dmi_processor.h
@@ -19,7 +19,7 @@
#define PROCESSOR_TYPE_SIZE 32
#define PROCESSOR_FAMILY_SIZE 32
#define PROCESSOR_MANUFACTURER_SIZE 64
-#define PROCESSOR_VERSION_SIZE 32
+#define PROCESSOR_VERSION_SIZE 64
#define PROCESSOR_VOLTAGE_SIZE 16
#define PROCESSOR_STATUS_SIZE 16
#define PROCESSOR_UPGRADE_SIZE 16
diff --git a/com32/gplinclude/vpd/vpd.h b/com32/gplinclude/vpd/vpd.h
index f1dcec68..bff77bd4 100644
--- a/com32/gplinclude/vpd/vpd.h
+++ b/com32/gplinclude/vpd/vpd.h
@@ -25,7 +25,7 @@ typedef struct {
char bios_release_date[9];
char default_flash_filename[13];
char bios_version[255];
- char base_address[6];
+ char base_address[16];
bool filled;
} s_vpd;