diff options
| author | Michael Brown <mcb30@ipxe.org> | 2013-05-01 20:42:57 +0100 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2013-05-01 22:11:04 +0100 |
| commit | 8bc20c1aa09ec521476f4b35b0a09c21e2e1e5f3 (patch) | |
| tree | 2d931446de6536772b283a69d1ddbaaa34094465 /src/interface/smbios/smbios_settings.c | |
| parent | a352fde45ef58ed4766c074d772c3cf9f4410fd7 (diff) | |
| download | ipxe-8bc20c1aa09ec521476f4b35b0a09c21e2e1e5f3.tar.gz | |
[smbios] Allow access to multiple instances of SMBIOS structures
Extend the syntax for numerical SMBIOS settings from
smbios/<type>.<offset>.<length>
to
smbios/[<instance>.]<type>.<offset>.<length>
Where SMBIOS provides multiple structures with the same <type>, this
extended syntax allows for access to structures other than the first.
If <instance> is omitted then it will default to zero, giving access
to the first instance (and so matching existing behaviour).
The 16-bit SMBIOS handle (which is an alternative way to disambiguate
multiple instances of the same type of structure) can be accessed, if
required, using
smbios/<instance>.<type>.2.2:uint16
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/interface/smbios/smbios_settings.c')
| -rw-r--r-- | src/interface/smbios/smbios_settings.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/interface/smbios/smbios_settings.c b/src/interface/smbios/smbios_settings.c index 17f9a48ee..d2975df44 100644 --- a/src/interface/smbios/smbios_settings.c +++ b/src/interface/smbios/smbios_settings.c @@ -81,18 +81,21 @@ static int smbios_fetch ( struct settings *settings __unused, struct setting *setting, void *data, size_t len ) { struct smbios_structure structure; + unsigned int tag_instance; unsigned int tag_type; unsigned int tag_offset; unsigned int tag_len; int rc; - /* Split tag into type, offset and length */ + /* Split tag into instance, type, offset and length */ + tag_instance = ( ( setting->tag >> 24 ) & 0xff ); tag_type = ( ( setting->tag >> 16 ) & 0xff ); tag_offset = ( ( setting->tag >> 8 ) & 0xff ); tag_len = ( setting->tag & 0xff ); /* Find SMBIOS structure */ - if ( ( rc = find_smbios_structure ( tag_type, &structure ) ) != 0 ) + if ( ( rc = find_smbios_structure ( tag_type, tag_instance, + &structure ) ) != 0 ) return rc; { |