Commit cd2abbfe authored by Borislav Petkov's avatar Borislav Petkov Committed by Bartlomiej Zolnierkiewicz

ide-tape: unify idetape_create_read/write_cmd

A straightforward one. There should be no functional change resulting from this
change.

[bart: minor fixups]
Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 646c0cb6
...@@ -952,40 +952,29 @@ static ide_startstop_t idetape_media_access_finished(ide_drive_t *drive) ...@@ -952,40 +952,29 @@ static ide_startstop_t idetape_media_access_finished(ide_drive_t *drive)
return ide_stopped; return ide_stopped;
} }
static void idetape_create_read_cmd(idetape_tape_t *tape, static void ide_tape_create_rw_cmd(idetape_tape_t *tape,
struct ide_atapi_pc *pc, struct ide_atapi_pc *pc, unsigned int length,
unsigned int length, struct idetape_bh *bh) struct idetape_bh *bh, u8 opcode)
{ {
idetape_init_pc(pc); idetape_init_pc(pc);
pc->c[0] = READ_6;
put_unaligned(cpu_to_be32(length), (unsigned int *) &pc->c[1]); put_unaligned(cpu_to_be32(length), (unsigned int *) &pc->c[1]);
pc->c[1] = 1; pc->c[1] = 1;
pc->bh = bh; pc->bh = bh;
atomic_set(&bh->b_count, 0);
pc->buf = NULL; pc->buf = NULL;
pc->buf_size = length * tape->blk_size; pc->buf_size = length * tape->blk_size;
pc->req_xfer = pc->buf_size; pc->req_xfer = pc->buf_size;
if (pc->req_xfer == tape->buffer_size) if (pc->req_xfer == tape->buffer_size)
pc->flags |= PC_FLAG_DMA_OK; pc->flags |= PC_FLAG_DMA_OK;
}
static void idetape_create_write_cmd(idetape_tape_t *tape, if (opcode == READ_6) {
struct ide_atapi_pc *pc, pc->c[0] = READ_6;
unsigned int length, struct idetape_bh *bh) atomic_set(&bh->b_count, 0);
{ } else if (opcode == WRITE_6) {
idetape_init_pc(pc); pc->c[0] = WRITE_6;
pc->c[0] = WRITE_6; pc->flags |= PC_FLAG_WRITING;
put_unaligned(cpu_to_be32(length), (unsigned int *) &pc->c[1]); pc->b_data = bh->b_data;
pc->c[1] = 1; pc->b_count = atomic_read(&bh->b_count);
pc->flags |= PC_FLAG_WRITING; }
pc->bh = bh;
pc->b_data = bh->b_data;
pc->b_count = atomic_read(&bh->b_count);
pc->buf = NULL;
pc->buf_size = length * tape->blk_size;
pc->req_xfer = pc->buf_size;
if (pc->req_xfer == tape->buffer_size)
pc->flags |= PC_FLAG_DMA_OK;
} }
static ide_startstop_t idetape_do_request(ide_drive_t *drive, static ide_startstop_t idetape_do_request(ide_drive_t *drive,
...@@ -1062,14 +1051,16 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive, ...@@ -1062,14 +1051,16 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
} }
if (rq->cmd[0] & REQ_IDETAPE_READ) { if (rq->cmd[0] & REQ_IDETAPE_READ) {
pc = idetape_next_pc_storage(drive); pc = idetape_next_pc_storage(drive);
idetape_create_read_cmd(tape, pc, rq->current_nr_sectors, ide_tape_create_rw_cmd(tape, pc, rq->current_nr_sectors,
(struct idetape_bh *)rq->special); (struct idetape_bh *)rq->special,
READ_6);
goto out; goto out;
} }
if (rq->cmd[0] & REQ_IDETAPE_WRITE) { if (rq->cmd[0] & REQ_IDETAPE_WRITE) {
pc = idetape_next_pc_storage(drive); pc = idetape_next_pc_storage(drive);
idetape_create_write_cmd(tape, pc, rq->current_nr_sectors, ide_tape_create_rw_cmd(tape, pc, rq->current_nr_sectors,
(struct idetape_bh *)rq->special); (struct idetape_bh *)rq->special,
WRITE_6);
goto out; goto out;
} }
if (rq->cmd[0] & REQ_IDETAPE_PC1) { if (rq->cmd[0] & REQ_IDETAPE_PC1) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment