ide: use ide_tf_load() in execute_drive_cmd()
* Add IDE_TFLAG_OUT_DEVICE taskfile flag to indicate the need of writing the Device register and handle it in ide_tf_load(). Update ide_tf_load() and {do_rw,flagged}_taskfile() users accordingly. * Use struct ide_taskfile and ide_tf_load() in execute_drive_cmd(). * Make the debugging code dump all taskfile registers for both REQ_ATA_TYPE_{CMD,TASK} requests and move it to ide_tf_load() so it also covers REQ_ATA_TYPE_TASKFILE requests. There should be no functionality changes caused by this patch (unless DEBUG is defined). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
@ -72,6 +72,13 @@ void ide_tf_load(ide_drive_t *drive, ide_task_t *task)
|
||||
if (task->tf_flags & IDE_TFLAG_FLAGGED)
|
||||
HIHI = 0xFF;
|
||||
|
||||
#ifdef DEBUG
|
||||
printk("%s: tf: feat 0x%02x nsect 0x%02x lbal 0x%02x "
|
||||
"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);
|
||||
#endif
|
||||
|
||||
if (IDE_CONTROL_REG)
|
||||
hwif->OUTB(drive->ctl, IDE_CONTROL_REG); /* clear nIEN */
|
||||
|
||||
@ -103,7 +110,8 @@ void ide_tf_load(ide_drive_t *drive, ide_task_t *task)
|
||||
if (task->tf_flags & IDE_TFLAG_OUT_LBAH)
|
||||
hwif->OUTB(tf->lbah, IDE_HCYL_REG);
|
||||
|
||||
hwif->OUTB((tf->device & HIHI) | drive->select.all, IDE_SELECT_REG);
|
||||
if (task->tf_flags & IDE_TFLAG_OUT_DEVICE)
|
||||
hwif->OUTB((tf->device & HIHI) | drive->select.all, IDE_SELECT_REG);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(ide_tf_load);
|
||||
|
Reference in New Issue
Block a user