Revert "geometry: Add boot_lchs_find_*() utility functions"

This reverts commit ad2910949b1886deba24f574cee76cdc75e7cabe.

diff --git a/src/boot.c b/src/boot.c
index 9248fab95a465a4dc37e02d3dd5f9bbf1702148f..b3d493049ae062bfc9ca62b0ab7d9956a0895085 100644 (file)
--- a/src/boot.c
+++ b/src/boot.c
@@ -157,88 +157,6 @@ loadBootDevices(void)
     }
 }
 
-// Search the bootdevices list for the given glob pattern.
-static BootDevice *
-bootdevice_find(const char *glob)
-{
-    dprintf(1, "Searching bootdevices for: %s\n", glob);
-    int i;
-    for (i = 0; i < BootDeviceCount; i++)
-        if (glob_prefix(glob, BootDevices[i].name))
-            return &BootDevices[i];
-    return NULL;
-}
-
-static BootDevice *
-bootdevice_find_pci_device(struct pci_device *pci)
-{
-    // Find pci device - for example: /pci@i0cf8/ethernet@5
-    char desc[256];
-    build_pci_path(desc, sizeof(desc), "*", pci);
-    return bootdevice_find(desc);
-}
-
-static BootDevice *
-bootdevice_find_scsi_device(struct pci_device *pci, int target, int lun)
-{
-    if (!pci)
-        // support only pci machine for now
-        return NULL;
-    // Find scsi drive - for example: /pci@i0cf8/scsi@5/channel@0/disk@1,0
-    char desc[256], *p;
-    p = build_pci_path(desc, sizeof(desc), "*", pci);
-    snprintf(p, desc+sizeof(desc)-p, "/*@0/*@%x,%x", target, lun);
-    return bootdevice_find(desc);
-}
-
-static BootDevice *
-bootdevice_find_ata_device(struct pci_device *pci, int chanid, int slave)
-{
-    if (!pci)
-        // support only pci machine for now
-        return NULL;
-    // Find ata drive - for example: /pci@i0cf8/ide@1,1/drive@1/disk@0
-    char desc[256], *p;
-    p = build_pci_path(desc, sizeof(desc), "*", pci);
-    snprintf(p, desc+sizeof(desc)-p, "/drive@%x/disk@%x", chanid, slave);
-    return bootdevice_find(desc);
-}
-
-int boot_lchs_find_pci_device(struct pci_device *pci, struct chs_s *chs)
-{
-    BootDevice *b = bootdevice_find_pci_device(pci);
-    if (!b)
-        return -1;
-    chs->cylinder = (u16)b->lcyls;
-    chs->head = (u16)b->lheads;
-    chs->sector = (u16)b->lsecs;
-    return 0;
-}
-
-int boot_lchs_find_scsi_device(struct pci_device *pci, int target, int lun,
-                               struct chs_s *chs)
-{
-    BootDevice *b = bootdevice_find_scsi_device(pci, target, lun);
-    if (!b)
-        return -1;
-    chs->cylinder = (u16)b->lcyls;
-    chs->head = (u16)b->lheads;
-    chs->sector = (u16)b->lsecs;
-    return 0;
-}
-
-int boot_lchs_find_ata_device(struct pci_device *pci, int chanid, int slave,
-                              struct chs_s *chs)
-{
-    BootDevice *b = bootdevice_find_ata_device(pci, chanid, slave);
-    if (!b)
-        return -1;
-    chs->cylinder = (u16)b->lcyls;
-    chs->head = (u16)b->lheads;
-    chs->sector = (u16)b->lsecs;
-    return 0;
-}
-
 
 /****************************************************************
  * Boot priority ordering

diff --git a/src/util.h b/src/util.h
index b173fa8898c719b9c558bd512921ed5b6a9a6ea2..e2afc80c425a55b2141df1e89aa82621ba90c03f 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -38,12 +38,6 @@ struct usbdevice_s;
 int bootprio_find_usb(struct usbdevice_s *usbdev, int lun);
 int get_keystroke_full(int msec);
 int get_keystroke(int msec);
-struct chs_s;
-int boot_lchs_find_pci_device(struct pci_device *pci, struct chs_s *chs);
-int boot_lchs_find_scsi_device(struct pci_device *pci, int target, int lun,
-                               struct chs_s *chs);
-int boot_lchs_find_ata_device(struct pci_device *pci, int chanid, int slave,
-                              struct chs_s *chs);
 
 // bootsplash.c
 void enable_vga_console(void);