aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/at91_ide.c
diff options
context:
space:
mode:
authorSergei Shtylyov <sshtylyov@ru.mvista.com>2009-03-31 14:15:31 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-31 14:15:31 -0400
commitbac08cee93f9cb37b40ecfa8eaf1f6d8daf3909b (patch)
treee3a5a3dd993077d64e16699e866e37ad66d652c8 /drivers/ide/at91_ide.c
parentdeae17fd5d147ae65e277905343b7ea578574d12 (diff)
ide: call {in|out}put_data() methods from tf_{read|load}() methods (take 2)
Handle IDE_FTFLAG_{IN|OUT}_DATA flags in tf_{read|load}() methods by calling {in|out}put_data() methods to transfer 2 bytes -- this will allow us to move that handling out of those methods altogether... Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/at91_ide.c')
-rw-r--r--drivers/ide/at91_ide.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/ide/at91_ide.c b/drivers/ide/at91_ide.c
index 9dce793d93b4..b7be66d600f8 100644
--- a/drivers/ide/at91_ide.c
+++ b/drivers/ide/at91_ide.c
@@ -196,9 +196,9 @@ static void at91_ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
196 HIHI = 0xFF; 196 HIHI = 0xFF;
197 197
198 if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) { 198 if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {
199 u16 data = (tf->hob_data << 8) | tf->data; 199 u8 data[2] = { tf->data, tf->hob_data };
200 200
201 at91_ide_output_data(drive, NULL, &data, 2); 201 at91_ide_output_data(drive, cmd, data, 2);
202 } 202 }
203 203
204 if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE) 204 if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
@@ -234,11 +234,12 @@ static void at91_ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
234 struct ide_taskfile *tf = &cmd->tf; 234 struct ide_taskfile *tf = &cmd->tf;
235 235
236 if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) { 236 if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {
237 u16 data; 237 u8 data[2];
238 238
239 at91_ide_input_data(drive, NULL, &data, 2); 239 at91_ide_input_data(drive, cmd, data, 2);
240 tf->data = data & 0xff; 240
241 tf->hob_data = (data >> 8) & 0xff; 241 tf->data = data[0];
242 tf->hob_data = data[1];
242 } 243 }
243 244
244 /* be sure we're looking at the low order bits */ 245 /* be sure we're looking at the low order bits */