summaryrefslogtreecommitdiff
path: root/com32/hdt/hdt-menu-disk.c
diff options
context:
space:
mode:
Diffstat (limited to 'com32/hdt/hdt-menu-disk.c')
-rw-r--r--com32/hdt/hdt-menu-disk.c271
1 files changed, 170 insertions, 101 deletions
diff --git a/com32/hdt/hdt-menu-disk.c b/com32/hdt/hdt-menu-disk.c
index 02f12f75..bd33bdf3 100644
--- a/com32/hdt/hdt-menu-disk.c
+++ b/com32/hdt/hdt-menu-disk.c
@@ -26,133 +26,200 @@
* -----------------------------------------------------------------------
*/
+#include <stdlib.h>
+#include <disk/errno_disk.h>
+#include <disk/geom.h>
+#include <disk/read.h>
+#include <disk/partition.h>
+#include <disk/error.h>
+#include <disk/msdos.h>
+#include <disk/swsusp.h>
+
#include "hdt-menu.h"
+#include "hdt-util.h"
+
+static int dn;
+
+static void show_partition_information(struct driveinfo *drive_info,
+ struct part_entry *ptab __unused,
+ int partition_offset __unused,
+ int nb_partitions_seen)
+{
+ char menu_title[MENULEN + 1];
+ char menu_title_ref[MENULEN + 1];
+
+ if (nb_partitions_seen == 1)
+ add_sep();
+
+ memset(menu_title,0,sizeof menu_title);
+ memset(menu_title_ref,0,sizeof menu_title_ref);
+ snprintf(menu_title_ref, sizeof menu_title_ref, "disk_%x_part_%d",
+ drive_info[dn].disk, nb_partitions_seen);
+ snprintf(menu_title, sizeof menu_title, "Partition %d", nb_partitions_seen);
+
+ add_item(menu_title, "Partition information (start, end, length, type, ...)",
+ OPT_SUBMENU, menu_title_ref, 0);
+}
+/**
+ * compute_partition_information - print information about a partition
+ * @ptab: part_entry describing the partition
+ * @i: Partition number (UI purposes only)
+ * @ptab_root: part_entry describing the root partition (extended only)
+ * @drive_info: driveinfo struct describing the drive on which the partition
+ * is
+ *
+ * Note on offsets (from hpa, see chain.c32):
+ *
+ * To make things extra confusing: data partition offsets are relative to where
+ * the data partition record is stored, whereas extended partition offsets
+ * are relative to the beginning of the extended partition all the way back
+ * at the MBR... but still not absolute!
+ **/
+static void compute_partition_information(struct driveinfo *drive_info,
+ struct part_entry *ptab,
+ int partition_offset,
+ int nb_partitions_seen)
+{
+ char size[9];
+ char *parttype;
+ unsigned int start, end;
+ char buffer[SUBMENULEN+1];
+ char statbuffer[STATLEN+1];
+ char menu_title[MENULEN + 1];
+ char menu_title_ref[MENULEN + 1];
+
+ memset(buffer,0,sizeof buffer);
+ memset(statbuffer,0,sizeof statbuffer);
+ memset(menu_title,0,sizeof menu_title);
+ memset(menu_title_ref,0,sizeof menu_title_ref);
+ snprintf(menu_title_ref, sizeof menu_title_ref, "disk_%x_part_%d", drive_info[dn].disk, nb_partitions_seen);
+ snprintf(menu_title, sizeof menu_title, "Partition %d", nb_partitions_seen);
+
+ add_named_menu(menu_title_ref,menu_title,-1);
+ set_menu_pos(SUBMENU_Y,SUBMENU_X);
+
+ start = partition_offset;
+ end = start + ptab->length - 1;
+
+ if (ptab->length > 0)
+ sectors_to_size(ptab->length, size);
+ else
+ memset(size, 0, sizeof size);
+
+ get_label(ptab->ostype, &parttype);
+
+ snprintf(buffer, sizeof buffer, "Size : %s",
+ remove_spaces(size));
+ snprintf(statbuffer, sizeof statbuffer, "Size : %s",
+ remove_spaces(size));
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
+
+ snprintf(buffer, sizeof buffer, "Type : %s",
+ parttype);
+ snprintf(statbuffer, sizeof statbuffer, "Type: %s",
+ parttype);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
+
+ snprintf(buffer, sizeof buffer, "Bootable : %s",
+ (ptab->active_flag == 0x80) ? "Yes" : "No");
+ snprintf(statbuffer, sizeof statbuffer, "Bootable: %s",
+ (ptab->active_flag == 0x80) ? "Yes" : "No");
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
+
+ snprintf(buffer, sizeof buffer, "Start : %d",
+ start);
+ snprintf(statbuffer, sizeof statbuffer, "Start: %d",
+ start);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
+
+ snprintf(buffer, sizeof buffer, "End : %d",
+ end);
+ snprintf(statbuffer, sizeof statbuffer, "End: %d",
+ end);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
+
+ snprintf(buffer, sizeof buffer, "Id : %X",
+ ptab->ostype);
+ snprintf(statbuffer, sizeof statbuffer, "Id: %X",
+ ptab->ostype);
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
+
+
+ free(parttype);
+
+ /* Extra info */
+ if (ptab->ostype == 0x82 && swsusp_check(drive_info, ptab) != -1) {
+ snprintf(buffer, sizeof buffer, "%s","Swsusp sig : detected");
+ snprintf(statbuffer, sizeof statbuffer, "%s","Swsusp sig : detected");
+ add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
+ }
+}
/* Compute the disk submenu */
-int compute_disk_module(struct s_my_menu *menu, int nb_sub_disk_menu,
- struct diskinfo *d, int disk_number)
+static int compute_disk_module(struct s_my_menu *menu, int nb_sub_disk_menu,
+ struct driveinfo *d, int disk_number)
{
char buffer[MENULEN + 1];
char statbuffer[STATLEN + 1];
- /* No need to add no existing devices */
- if (strlen(d[disk_number].aid.model) <= 0)
- return -1;
-
- snprintf(buffer, sizeof buffer, " Disk <%d> ", nb_sub_disk_menu);
+ snprintf(buffer, sizeof buffer, " Disk <0x%X> (EDD %X)", d[disk_number].disk,
+ d[disk_number].edd_version);
menu[nb_sub_disk_menu].menu = add_menu(buffer, -1);
menu[nb_sub_disk_menu].items_count = 0;
- snprintf(buffer, sizeof buffer, "Model : %s",
- d[disk_number].aid.model);
- snprintf(statbuffer, sizeof statbuffer, "Model: %s",
- d[disk_number].aid.model);
- add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
- menu[nb_sub_disk_menu].items_count++;
+ int previous_size, size;
+ char previous_unit[3], unit[3]; // GB
+ char size_iec[9]; // GiB
+ sectors_to_size_dec(previous_unit, &previous_size, unit, &size, d[disk_number].edd_params.sectors);
+ sectors_to_size(d[disk_number].edd_params.sectors, size_iec);
- /* Compute device size */
- char previous_unit[3], unit[3]; //GB
- int previous_size, size = d[disk_number].sectors / 2; // Converting to bytes
- strlcpy(unit, "KB", 2);
- strlcpy(previous_unit, unit, 2);
- previous_size = size;
- if (size > 1000) {
- size = size / 1000;
- strlcpy(unit, "MB", 2);
- if (size > 1000) {
- previous_size = size;
- size = size / 1000;
- strlcpy(previous_unit, unit, 2);
- strlcpy(unit, "GB", 2);
- if (size > 1000) {
- previous_size = size;
- size = size / 1000;
- strlcpy(previous_unit, unit, 2);
- strlcpy(unit, "TB", 2);
- }
- }
- }
-
- snprintf(buffer, sizeof buffer, "Size : %d %s (%d %s)", size,
+ snprintf(buffer, sizeof buffer, "Size : %s/%d %s (%d %s)", remove_spaces(size_iec),
+ size, unit, previous_size, previous_unit);
+ snprintf(statbuffer, sizeof statbuffer, "Size: %s/%d %s (%d %s)", remove_spaces(size_iec), size,
unit, previous_size, previous_unit);
- snprintf(statbuffer, sizeof statbuffer, "Size: %d %s (%d %s)", size,
- unit, previous_size, previous_unit);
- add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
- menu[nb_sub_disk_menu].items_count++;
-
- snprintf(buffer, sizeof buffer, "Firmware Rev.: %s",
- d[disk_number].aid.fw_rev);
- snprintf(statbuffer, sizeof statbuffer, "Firmware Revision: %s",
- d[disk_number].aid.fw_rev);
- add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
- menu[nb_sub_disk_menu].items_count++;
-
- snprintf(buffer, sizeof buffer, "Serial Number: %s",
- d[disk_number].aid.serial_no);
- snprintf(statbuffer, sizeof statbuffer, "Serial Number: %s",
- d[disk_number].aid.serial_no);
add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
menu[nb_sub_disk_menu].items_count++;
- snprintf(buffer, sizeof buffer, "Interface : %s",
- d[disk_number].interface_type);
- snprintf(statbuffer, sizeof statbuffer, "Interface: %s",
- d[disk_number].interface_type);
+ snprintf(buffer, sizeof buffer, "Host Bus / Interface : %s / %s",
+ remove_spaces(d[disk_number].edd_params.host_bus_type),
+ d[disk_number].edd_params.interface_type);
+ snprintf(statbuffer, sizeof statbuffer, "Host Bus / Interface: %s / %s",
+ remove_spaces(d[disk_number].edd_params.host_bus_type),
+ d[disk_number].edd_params.interface_type);
add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
menu[nb_sub_disk_menu].items_count++;
- snprintf(buffer, sizeof buffer, "Host Bus : %s",
- d[disk_number].host_bus_type);
- snprintf(statbuffer, sizeof statbuffer, "Host Bus Type: %s",
- d[disk_number].host_bus_type);
+ snprintf(buffer, sizeof buffer, "C / H / S : %d / %d / %d",
+ d[disk_number].legacy_max_cylinder + 1,
+ d[disk_number].legacy_max_head + 1,
+ (int) d[disk_number].edd_params.sectors);
+ snprintf(statbuffer, sizeof statbuffer, "Cylinders / Heads / Sectors: %d / %d / %d",
+ d[disk_number].legacy_max_cylinder + 1,
+ d[disk_number].legacy_max_head + 1,
+ (int) d[disk_number].edd_params.sectors);
add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
menu[nb_sub_disk_menu].items_count++;
- snprintf(buffer, sizeof buffer, "Sectors : %d",
- d[disk_number].sectors);
- snprintf(statbuffer, sizeof statbuffer, "Sectors: %d",
- d[disk_number].sectors);
- add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
- menu[nb_sub_disk_menu].items_count++;
-
- snprintf(buffer, sizeof buffer, "Heads : %d",
- d[disk_number].heads);
- snprintf(statbuffer, sizeof statbuffer, "Heads: %d",
- d[disk_number].heads);
- add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
- menu[nb_sub_disk_menu].items_count++;
-
- snprintf(buffer, sizeof buffer, "Cylinders : %d",
- d[disk_number].cylinders);
- snprintf(statbuffer, sizeof statbuffer, "Cylinders: %d",
- d[disk_number].cylinders);
- add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
- menu[nb_sub_disk_menu].items_count++;
-
- snprintf(buffer, sizeof buffer, "Sectors/Track: %d",
- d[disk_number].sectors_per_track);
+ snprintf(buffer, sizeof buffer, "Sectors/Track : %d",
+ d[disk_number].legacy_sectors_per_track);
snprintf(statbuffer, sizeof statbuffer, "Sectors per Track: %d",
- d[disk_number].sectors_per_track);
+ d[disk_number].legacy_sectors_per_track);
add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
menu[nb_sub_disk_menu].items_count++;
- snprintf(buffer, sizeof buffer, "Port : 0x%X", disk_number);
- snprintf(statbuffer, sizeof statbuffer, "Port: 0x%X", disk_number);
- add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
- menu[nb_sub_disk_menu].items_count++;
+ dn=disk_number;
- snprintf(buffer, sizeof buffer, "EDD Version : %s",
- d[disk_number].edd_version);
- snprintf(statbuffer, sizeof statbuffer, "EDD Version: %s",
- d[disk_number].edd_version);
- add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
- menu[nb_sub_disk_menu].items_count++;
+ parse_partition_table(&d[disk_number], &show_partition_information);
+ if (!parse_partition_table(&d[disk_number], &compute_partition_information)) {
+ get_error("parse_partition_table");
+ menu[nb_sub_disk_menu].items_count++;
+ }
return 0;
}
/* Compute the Disks menu */
-void compute_disks(struct s_hdt_menu *menu, struct diskinfo *disk_info, struct s_hardware *hardware)
+void compute_disks(struct s_hdt_menu *menu, struct driveinfo *disk_info, struct s_hardware *hardware)
{
char buffer[MENULEN + 1];
int nb_sub_disk_menu = 0;
@@ -161,17 +228,19 @@ void compute_disks(struct s_hdt_menu *menu, struct diskinfo *disk_info, struct s
menu->disk_menu.items_count = 0;
if (hardware->disks_count == 0) return;
- for (int i = 0; i < 0xff; i++) {
- if (compute_disk_module
+ for (int i = 0; i < hardware->disks_count; i++) {
+ if (!hardware->disk_info[i].cbios)
+ continue; /* Invalid geometry */
+ compute_disk_module
((struct s_my_menu*) &(menu->disk_sub_menu), nb_sub_disk_menu, disk_info,
- i) == 0)
- nb_sub_disk_menu++;
+ i);
+ nb_sub_disk_menu++;
}
menu->disk_menu.menu = add_menu(" Disks ", -1);
for (int i = 0; i < nb_sub_disk_menu; i++) {
- snprintf(buffer, sizeof buffer, " Disk <%d> ", i);
+ snprintf(buffer, sizeof buffer, " Disk <%d> ", i+1);
add_item(buffer, "Disk", OPT_SUBMENU, NULL,
menu->disk_sub_menu[i].menu);
menu->disk_menu.items_count++;