From: Michael Brown <mcb30@ipxe.org>
Date: Mon, 10 Sep 2012 14:29:36 +0000 (+0100)
Subject: [smbios] Default to "hex" type for non-string SMBIOS settings
X-Git-Tag: v1.20.1~1647
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4500fb7cab08beabeee5c2d1e35f964764a7045;p=thirdparty%2Fipxe.git

[smbios] Default to "hex" type for non-string SMBIOS settings

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/interface/smbios/smbios_settings.c b/src/interface/smbios/smbios_settings.c
index 727970e96..893b958e1 100644
--- a/src/interface/smbios/smbios_settings.c
+++ b/src/interface/smbios/smbios_settings.c
@@ -120,14 +120,21 @@ static int smbios_fetch ( struct settings *settings __unused,
 
 		if ( tag_len == 0 ) {
 			/* String */
-			return read_smbios_string ( &structure,
-						    buf[tag_offset],
-						    data, len );
+			if ( ( rc = read_smbios_string ( &structure,
+							 buf[tag_offset],
+							 data, len ) ) < 0 ) {
+				return rc;
+			}
+			if ( ! setting->type )
+				setting->type = &setting_type_string;
+			return rc;
 		} else {
 			/* Raw data */
 			if ( len > tag_len )
 				len = tag_len;
 			memcpy ( data, &buf[tag_offset], len );
+			if ( ! setting->type )
+				setting->type = &setting_type_hex;
 			return tag_len;
 		}
 	}