Changeset e9069caefc1460ec7f4d058796005474c125fc61 for com32/hdt/hdt-menu-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-menu-disk.c (modified) (6 diffs)

com32/hdt/hdt-menu-disk.c

@@ -75 +75 @@
 {
         char size[9];
+        char bootloader_name[9];
         char *parttype;
         unsigned int start, end;
@@ -114 +115 @@
         add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
 
+        if (get_bootloader_string(drive_info, ptab, bootloader_name, 9) == 0) {
+                snprintf(buffer, sizeof buffer, "Bootloader  : %s",
+                         bootloader_name);
+                snprintf(statbuffer, sizeof statbuffer, "Bootloader: %s",
+                         bootloader_name);
+                add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
+        }
+
         snprintf(buffer, sizeof buffer, "Bootable    : %s",
                  (ptab->active_flag == 0x80) ? "Yes" : "No");
@@ -151 +160 @@
 /* Compute the disk submenu */
 static int compute_disk_module(struct s_my_menu *menu, int nb_sub_disk_menu,
-                               struct driveinfo *d, int disk_number)
+                               const struct s_hardware *hardware, int disk_number)
 {
   char buffer[MENULEN + 1];
   char statbuffer[STATLEN + 1];
+        char mbr_name[50];
+        struct driveinfo *d = (struct driveinfo*) hardware->disk_info;
 
   snprintf(buffer, sizeof buffer, " Disk <0x%X> (EDD %X)", d[disk_number].disk,
@@ -201 +212 @@
   menu[nb_sub_disk_menu].items_count++;
 
+        get_mbr_string(hardware->mbr_ids[disk_number], &mbr_name, 50);
+
+        snprintf(buffer, sizeof buffer, "MBR                  : %s (0x%X)",
+                 remove_spaces(mbr_name),
+                 hardware->mbr_ids[disk_number]);
+        snprintf(statbuffer, sizeof statbuffer, "MBR: %s (id 0x%X)",
+                 remove_spaces(mbr_name),
+                 hardware->mbr_ids[disk_number]);
+        add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
+        menu[nb_sub_disk_menu].items_count++;
+
   dn=disk_number;
 
@@ -213 +235 @@
 
 /* Compute the Disks menu */
-void compute_disks(struct s_hdt_menu *menu, struct driveinfo *disk_info, struct s_hardware *hardware)
+void compute_disks(struct s_hdt_menu *menu, struct s_hardware *hardware)
 {
   char buffer[MENULEN + 1];
@@ -226 +248 @@
       continue; /* Invalid geometry */
     compute_disk_module
-        ((struct s_my_menu*) &(menu->disk_sub_menu), nb_sub_disk_menu, disk_info,
-         i);
+        ((struct s_my_menu*) &(menu->disk_sub_menu), nb_sub_disk_menu,
+         hardware, i);
     nb_sub_disk_menu++;
   }