From f872017d2e677214f67bd85457999c4c3da26dcd Mon Sep 17 00:00:00 2001 From: Erwan Velu Date: Wed, 23 Mar 2011 21:02:51 +0100 Subject: [PATCH] hdt: Adding VPD to dump feature --- com32/hdt/hdt-dump-vpd.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ com32/hdt/hdt-dump.c | 1 + com32/hdt/hdt-dump.h | 2 ++ 3 files changed, 50 insertions(+) create mode 100644 com32/hdt/hdt-dump-vpd.c diff --git a/com32/hdt/hdt-dump-vpd.c b/com32/hdt/hdt-dump-vpd.c new file mode 100644 index 0000000..9e4a78e --- /dev/null +++ b/com32/hdt/hdt-dump-vpd.c @@ -0,0 +1,47 @@ +/* ----------------------------------------------------------------------- * + * + * Copyright 2011 Erwan Velu - All Rights Reserved + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom + * the Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall + * be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * ----------------------------------------------------------------------- + */ + +#include "hdt-common.h" +#include "hdt-dump.h" + +void dump_vpd(struct s_hardware *hardware, ZZJSON_CONFIG *config, ZZJSON **item) { + + + *item = zzjson_create_object(config, NULL); /* empty object */ + add_hb(is_vpd_valid); + if (hardware->is_vpd_valid) { + add_hs(vpd.bios_build_id); + add_hs(vpd.bios_release_date); + add_hs(vpd.bios_version); + add_hs(vpd.default_flash_filename); + add_hs(vpd.box_serial_number); + add_hs(vpd.motherboard_serial_number); + add_hs(vpd.machine_type_model); + } + flush("vpd",config,item); +} diff --git a/com32/hdt/hdt-dump.c b/com32/hdt/hdt-dump.c index 429902d..55ef907 100644 --- a/com32/hdt/hdt-dump.c +++ b/com32/hdt/hdt-dump.c @@ -117,6 +117,7 @@ void dump(struct s_hardware *hardware) dump_cpu(hardware, &config, &json); dump_pxe(hardware, &config, &json); dump_syslinux(hardware, &config, &json); + dump_vpd(hardware, &config, &json); /* We close & flush the file to send */ cpio_close(upload); diff --git a/com32/hdt/hdt-dump.h b/com32/hdt/hdt-dump.h index 0f1f817..8a2e410 100644 --- a/com32/hdt/hdt-dump.h +++ b/com32/hdt/hdt-dump.h @@ -41,6 +41,7 @@ #define add_hi(value) add_i(#value,hardware->value) #define add_hs(value) add_s(#value,(char *)hardware->value) #define add_b(name,value) if (value==true) {add_bool_true((char *)name);} else {add_bool_false((char *)name);} +#define add_hb(value) add_b(#value,hardware->value) extern struct print_buf p_buf; @@ -51,3 +52,4 @@ void flush (char *filename, ZZJSON_CONFIG *config, ZZJSON ** item); void dump_cpu(struct s_hardware *hardware, ZZJSON_CONFIG *config, ZZJSON **item); void dump_pxe(struct s_hardware *hardware, ZZJSON_CONFIG *config, ZZJSON **item); void dump_syslinux(struct s_hardware *hardware, ZZJSON_CONFIG *config, ZZJSON **item); +void dump_vpd(struct s_hardware *hardware, ZZJSON_CONFIG *config, ZZJSON **item); -- 2.7.4