Changeset e9069caefc1460ec7f4d058796005474c125fc61 for com32/hdt/hdt-cli-disk.c

Timestamp:

09/07/09 23:22:36 (3 years ago)

Author:

Pierre-Alexandre Meyer <pierre@…>

Children:

47ac912cd5d8df0a96b8f5b98d7476f7cfb1cb19

Parents:

c93e27af183de1cdf591706448d42887d0fbc0eb, 03b2384b6e9f54d9697e87d2a19c321e6fd96ed5

git-author:

Pierre-Alexandre Meyer <pierre@mouraf.org> / 2009-09-07T16:12:59Z-0700

git-committer:

Pierre-Alexandre Meyer <pierre@mouraf.org> / 2009-09-07T16:22:36Z-0700

Message:

Merge branch 'bootloader-detection' into hdt-next

Conflicts:

com32/hdt/hdt-cli-disk.c
com32/hdt/hdt-common.h
com32/hdt/hdt-menu-disk.c

Signed-off-by: Pierre-Alexandre Meyer <pierre@…>

Files:

• com32/hdt/hdt-cli-disk.c (modified) (6 diffs)

com32/hdt/hdt-cli-disk.c

@@ -57 +57 @@
 {
         char size[9];
+        char bootloader_name[9];
         char *parttype;
         unsigned int start, end;
@@ -71 +72 @@
 
         if (i == 1)
-                more_printf("   #  B       Start         End    Size Id Type\n");
+                more_printf(" #  B       Start         End    Size Id Type\n");
 
         get_label(ptab->ostype, &parttype);
-        more_printf("  %2d  %s %11d %11d %s %02X %s",
+        more_printf("%2d  %s %11d %11d %s %02X %s",
                     i, (ptab->active_flag == 0x80) ? "x" : " ",
                     start,
@@ -85 +86 @@
                 more_printf("%s", " (Swsusp sig. detected)");
 
+        if (get_bootloader_string(drive_info, ptab, bootloader_name, 9) == 0)
+                more_printf("%-46s %s %s", " ", "Bootloader:", bootloader_name);
+
         more_printf("\n");
 
@@ -108 +112 @@
         struct driveinfo *d = &hardware->disk_info[i];
         char disk_size[9];
+        char mbr_name[50];
 
         detect_disks(hardware);
         if (!hardware->disk_info[i].cbios)
                 return; /* Invalid geometry */
+
+        get_mbr_string(hardware->mbr_ids[i], &mbr_name, 50);
 
         if ((int) d->edd_params.sectors > 0)
@@ -120 +127 @@
         more_printf("DISK 0x%X:\n"
                     "  C/H/S: %d cylinders, %d heads, %d sectors/track\n"
-                    "  EDD:   Version: %X\n"
+                    "    EDD: Version: %X\n"
                     "         Size: %s, %d bytes/sector, %d sectors/track\n"
-                    "         Host bus: %s, Interface type: %s\n\n",
+                    "         Host bus: %s, Interface type: %s\n"
+                    "    MBR: %s (id 0x%X)\n\n",
                 d->disk,
                 d->legacy_max_cylinder + 1, d->legacy_max_head + 1, d->legacy_sectors_per_track,
                 d->edd_version,
                 disk_size, (int) d->edd_params.bytes_per_sector, (int) d->edd_params.sectors_per_track,
-                remove_spaces((char *) d->edd_params.host_bus_type), remove_spaces((char*) d->edd_params.interface_type));
+                remove_spaces((char *) d->edd_params.host_bus_type), remove_spaces((char*) d->edd_params.interface_type),
+                mbr_name, hardware->mbr_ids[i]);
+        display_line_nb += 6;
 
         if (parse_partition_table(d, &show_partition_information)) {
@@ -148 +158 @@
         detect_disks(hardware);
 
+        int first_one = 0;
         for (int drive = 0x80; drive < 0xff; drive++) {
-                char buf[5] = "";
-                sprintf(buf, "0x%x", drive);
-                char *argv[1] = { buf };
-                main_show_disk(1, argv, hardware);
+                if (hardware->disk_info[drive - 0x80].cbios) {
+                        if (!first_one) {
+                                first_one = 1;
+                        } else {
+                                pause_printf();
+                        }
+                        char buf[5] = "";
+                        sprintf(buf, "0x%x", drive);
+                        char *argv[1] = { buf };
+                        main_show_disk(1, argv, hardware);
+                }
         }
 }