aboutsummaryrefslogtreecommitdiff
path: root/src/block.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2019-11-15 12:17:50 +0100
committerGerd Hoffmann <kraxel@redhat.com>2019-11-18 14:58:37 +0100
commitb6f84715341c80665fa23d1fef4c95cb107b8a72 (patch)
tree57ad33eace0f0c26f3526df9cd0e59e8fec684d4 /src/block.c
parent0594486b639849b47d762c76f28730edbf648dc7 (diff)
downloadseabios-hppa-b6f84715341c80665fa23d1fef4c95cb107b8a72.zip
seabios-hppa-b6f84715341c80665fa23d1fef4c95cb107b8a72.tar.gz
seabios-hppa-b6f84715341c80665fa23d1fef4c95cb107b8a72.tar.bz2
Revert "geometry: Apply LCHS values for boot devices"
This reverts commit 9caa19be0e534c687081fbdfcd301406e728c98c.
Diffstat (limited to 'src/block.c')
-rw-r--r--src/block.c21
1 files changed, 1 insertions, 20 deletions
diff --git a/src/block.c b/src/block.c
index ca23a83..f73ec18 100644
--- a/src/block.c
+++ b/src/block.c
@@ -69,17 +69,9 @@ int create_bounce_buf(void)
* Disk geometry translation
****************************************************************/
-static int
-overriden_lchs_supplied(struct drive_s *drive)
-{
- return drive->lchs.cylinder || drive->lchs.head || drive->lchs.sector;
-}
-
static u8
get_translation(struct drive_s *drive)
{
- if (overriden_lchs_supplied(drive))
- return TRANSLATION_MACHINE;
u8 type = drive->type;
if (CONFIG_QEMU && type == DTYPE_ATA) {
// Emulators pass in the translation info via nvram.
@@ -167,16 +159,6 @@ setup_translation(struct drive_s *drive)
break;
}
break;
- case TRANSLATION_MACHINE:
- desc = "overriden";
- cylinders = drive->lchs.cylinder;
- heads = drive->lchs.head;
- if (heads > 255)
- heads = 255;
- spt = drive->lchs.sector;
- if (spt > 63)
- spt = 63;
- break;
}
// clip to 1024 cylinders in lchs
if (cylinders > 1024)
@@ -441,8 +423,7 @@ fill_ata_edd(struct segoff_s edd, struct drive_s *drive_gf)
u16 options = 0;
if (GET_GLOBALFLAT(drive_gf->type) == DTYPE_ATA) {
u8 translation = GET_GLOBALFLAT(drive_gf->translation);
- if ((translation != TRANSLATION_NONE) &&
- (translation != TRANSLATION_MACHINE)) {
+ if (translation != TRANSLATION_NONE) {
options |= 1<<3; // CHS translation
if (translation == TRANSLATION_LBA)
options |= 1<<9;