Syslinux - Sep 2012 - [PATCH 1/1] dmi_bios.h: Bug fix: Added the missing entry in struct s_characteristics

From: Hung-chi Lihn <hlihn at google.com>

Bug fix: Added the missing entry (boot_from_pcmcia) in struct
s_characteristics.

In bios_charac_strings[] of /com32/gpllib/dmi/dmi_bios.c there are actually
29 entries. However, BIOS_CHAR_NB_ELEMENTS in /com32/gplinclude/dmi/dmi_bios.h
was defined as 28 and struct s_characteristics in the same file also only
had 28 entries. It turns out that there was a missing entry
"boot_from_pcmcia"
(the 16th entry representing bit 18) in s_characteristics.

Signed-off-by: Hung-chi Lihn <hlihn at google.com>
---
 com32/gplinclude/dmi/dmi_bios.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/com32/gplinclude/dmi/dmi_bios.h
b/com32/gplinclude/dmi/dmi_bios.h
index 5d47e89..4af7e0b 100644
--- a/com32/gplinclude/dmi/dmi_bios.h
+++ b/com32/gplinclude/dmi/dmi_bios.h
@@ -22,7 +22,7 @@
 #define BIOS_BIOS_REVISION_SIZE                16
 #define BIOS_FIRMWARE_REVISION_SIZE    16

-#define BIOS_CHAR_NB_ELEMENTS          28
+#define BIOS_CHAR_NB_ELEMENTS          29
 #define BIOS_CHAR_X1_NB_ELEMENTS       8
 #define BIOS_CHAR_X2_NB_ELEMENTS       3

@@ -46,6 +46,7 @@ typedef struct {
     bool boot_from_cd;
     bool selectable_boot;
     bool bios_rom_socketed;
+    bool boot_from_pcmcia;
     bool edd;
     bool japanese_floppy_nec_9800_1_2MB;
     bool japanese_floppy_toshiba_1_2MB;

From: Hung-chi Lihn <hlihn at google.com>

Bug fix: Added the missing entry (boot_from_pcmcia) in struct s_characteristics.

In bios_charac_strings[] of /com32/gpllib/dmi/dmi_bios.c there are actually 29
entries. However, BIOS_CHAR_NB_ELEMENTS in /com32/gplinclude/dmi/dmi_bios.h was
defined as 28 and struct s_characteristics in the same file also only had 28
entries. It turns out that there was a missing entry
"boot_from_pcmcia" (the 16th entry representing bit 18) in
s_characteristics.

Signed-off-by: Hung-chi Lihn <hlihn at google.com>
---
Resubmit to fix the broken submission due to automatic word-wrap.

 com32/gplinclude/dmi/dmi_bios.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/com32/gplinclude/dmi/dmi_bios.h b/com32/gplinclude/dmi/dmi_bios.h
index 5d47e89..4af7e0b 100644
--- a/com32/gplinclude/dmi/dmi_bios.h
+++ b/com32/gplinclude/dmi/dmi_bios.h
@@ -22,7 +22,7 @@
 #define BIOS_BIOS_REVISION_SIZE		16
 #define BIOS_FIRMWARE_REVISION_SIZE	16
 
-#define BIOS_CHAR_NB_ELEMENTS		28
+#define BIOS_CHAR_NB_ELEMENTS		29
 #define BIOS_CHAR_X1_NB_ELEMENTS	8
 #define BIOS_CHAR_X2_NB_ELEMENTS	3
 
@@ -46,6 +46,7 @@ typedef struct {
     bool boot_from_cd;
     bool selectable_boot;
     bool bios_rom_socketed;
+    bool boot_from_pcmcia;
     bool edd;
     bool japanese_floppy_nec_9800_1_2MB;
     bool japanese_floppy_toshiba_1_2MB;