hdt: Initial work for dumping disks

More work is necessary to export partition' configuration

diff --git a/com32/hdt/hdt-dump-disks.c b/com32/hdt/hdt-dump-disks.c
new file mode 100644 (file)
index 0000000..ad729b2
--- /dev/null
+++ b/com32/hdt/hdt-dump-disks.c
@@ -0,0 +1,84 @@
+/* ----------------------------------------------------------------------- *
+ *
+ *   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"
+#include "hdt-util.h"
+
+void show_disk(struct s_hardware *hardware, ZZJSON_CONFIG *config, ZZJSON **item, int drive) {
+       int i = drive - 0x80;
+       struct driveinfo *d = &hardware->disk_info[i];
+       char mbr_name[50]={0};
+       char disk_size[11]={0};
+
+       get_mbr_string(hardware->mbr_ids[i], &mbr_name,sizeof(mbr_name));
+       if ((int)d->edd_params.sectors > 0)
+               sectors_to_size((int)d->edd_params.sectors, disk_size);
+
+       char disk[5]={0};
+       char edd_version[5]={0};
+       snprintf(disk,sizeof(disk),"0x%X",d->disk);
+       snprintf(edd_version,sizeof(edd_version),"%X",d->edd_version);
+       zzjson_print(config, *item);
+       zzjson_free(config, *item);
+
+        *item = zzjson_create_object(config, NULL); /* empty object */
+       add_s("disk->number", disk);
+       add_i("disk->cylinders",d->legacy_max_cylinder + 1);
+       add_i("disk->heads",d->legacy_max_head + 1);
+       add_i("disk->sectors_per_track",d->legacy_sectors_per_track);
+       add_s("disk->edd_version",edd_version);
+       add_s("disk->size",disk_size);
+       add_i("disk->bytes_per_sector",(int)d->edd_params.bytes_per_sector);
+       add_i("disk->sectors_per_track",(int)d->edd_params.sectors_per_track);
+       add_s("disk->host_bus",remove_spaces((char *)d->edd_params.host_bus_type));
+       add_s("disk->interface_type",remove_spaces((char *)d->edd_params.interface_type));
+       add_s("disk->mbr_name",mbr_name);
+       add_i("disk->mbr_id",hardware->mbr_ids[i]);
+
+}
+
+void dump_disks(struct s_hardware *hardware, ZZJSON_CONFIG *config, ZZJSON **item) {
+       bool found=false;
+       for (int drive = 0x80; drive < 0xff; drive++) {
+               if (hardware->disk_info[drive - 0x80].cbios) {
+                       if (found==false) {
+                               *item = zzjson_create_object(config, NULL); /* empty object */
+                               add_b("disks->is_valid",true);
+                                       found=true;
+                       }
+                       show_disk(hardware, config, item, drive);
+               }
+       }
+
+       if (found==false) {
+               *item = zzjson_create_object(config, NULL); /* empty object */
+               add_b("disks->is_valid",false);
+       }
+       flush("disks",config,item);
+}

diff --git a/com32/hdt/hdt-dump.c b/com32/hdt/hdt-dump.c
index 805289f..d38a46a 100644 (file)
--- a/com32/hdt/hdt-dump.c
+++ b/com32/hdt/hdt-dump.c
@@ -119,6 +119,7 @@ void dump(struct s_hardware *hardware)
     dump_syslinux(hardware, &config, &json);
     dump_vpd(hardware, &config, &json);
     dump_vesa(hardware, &config, &json);
+    dump_disks(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 4f4d6ca..c8eeaeb 100644 (file)
--- a/com32/hdt/hdt-dump.h
+++ b/com32/hdt/hdt-dump.h
@@ -34,13 +34,17 @@
 #include <zzjson/zzjson.h>
 #include "hdt-common.h"
 
+#define ADD_I(value) zzjson_create_number_i(config,value)
+#define ADD_S(value) zzjson_create_string(config,value)
+#define add_ai(name,value) *item = zzjson_array_append(config, *item, zzjson_object_append(config, *item, name, zzjson_create_number_i(config, value)))
 #define add_i(name,value) *item = zzjson_object_append(config, *item, name, zzjson_create_number_i(config, value))
 #define add_s(name,value) *item = zzjson_object_append(config, *item, name, zzjson_create_string(config, value))
-#define add_bool_true(name) *item = zzjson_object_append(config, *item, name, zzjson_create_true(config))
-#define add_bool_false(name) *item = zzjson_object_append(config, *item, name, zzjson_create_false(config))
+#define add_as(name,value) *item = zzjson_array_append(config, *item, zzjson_object_append(config, *item, name, zzjson_create_string(config, value)))
+#define add_bool_true(name) *item = zzjson_object_append(config, *item, (char *)name, zzjson_create_true(config))
+#define add_bool_false(name) *item = zzjson_object_append(config, *item, (char*)name, zzjson_create_false(config))
 #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_b(name,value) if (value==true) {add_bool_true(name);} else {add_bool_false(name);}
 #define add_hb(value) add_b(#value,hardware->value)
 
 extern struct print_buf p_buf;
@@ -54,3 +58,4 @@ 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);
 void dump_vesa(struct s_hardware *hardware, ZZJSON_CONFIG *config, ZZJSON **item);
+void dump_disks(struct s_hardware *hardware, ZZJSON_CONFIG *config, ZZJSON **item);