From b51869eae86b42e5a2a20dd3e48650f3bf0bb3db Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Sat, 26 Jan 2008 20:13:03 +0100 Subject: [PATCH] --- yaml --- r: 77243 b: refs/heads/master c: 6dd9b8376adbee95ddc321cc83c7f641577e01f6 h: refs/heads/master i: 77241: 90354dcd927961b1876a4ae2c7be6bf7faf87344 77239: 58ebfef346e3bae16f60809944ffff52e4315898 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-disk.c | 7 +------ trunk/drivers/ide/ide-taskfile.c | 4 ++++ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f23a65e9be92..9d2d0fd441d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15ce926ada545cb078711bd9a18c083c93fa01d7 +refs/heads/master: 6dd9b8376adbee95ddc321cc83c7f641577e01f6 diff --git a/trunk/drivers/ide/ide-disk.c b/trunk/drivers/ide/ide-disk.c index 364dc57a5e1c..c1fb75c387ea 100644 --- a/trunk/drivers/ide/ide-disk.c +++ b/trunk/drivers/ide/ide-disk.c @@ -219,12 +219,7 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq, tf->lbal = (u8) block; tf->lbam = (u8)(block >> 8); tf->lbah = (u8)(block >> 16); -#ifdef DEBUG - printk("%s: 0x%02x%02x 0x%02x%02x%02x%02x%02x%02x\n", - drive->name, tf->hob_nsect, tf->nsect, - tf->hob_lbah, tf->hob_lbam, tf->hob_lbal, - tf->lbah, tf->lbam, tf->lbal); -#endif + task.tf_flags |= (IDE_TFLAG_LBA48 | IDE_TFLAG_OUT_HOB); } else { tf->nsect = nsectors & 0xff; diff --git a/trunk/drivers/ide/ide-taskfile.c b/trunk/drivers/ide/ide-taskfile.c index 2d63ea9ee61b..063e0eb6c9e4 100644 --- a/trunk/drivers/ide/ide-taskfile.c +++ b/trunk/drivers/ide/ide-taskfile.c @@ -77,6 +77,10 @@ void ide_tf_load(ide_drive_t *drive, ide_task_t *task) "lbam 0x%02x lbah 0x%02x dev 0x%02x cmd 0x%02x\n", drive->name, tf->feature, tf->nsect, tf->lbal, tf->lbam, tf->lbah, tf->device, tf->command); + printk("%s: hob: nsect 0x%02x lbal 0x%02x " + "lbam 0x%02x lbah 0x%02x\n", + drive->name, tf->hob_nsect, tf->hob_lbal, + tf->hob_lbam, tf->hob_lbah); #endif if (IDE_CONTROL_REG)