aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-atapi.c
diff options
context:
space:
mode:
authorBorislav Petkov <petkovbb@googlemail.com>2009-01-02 10:12:52 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-01-02 10:12:52 -0500
commit392de1d53dd40e2eebee3a0a26aa647a3865ca78 (patch)
tree6e904d52596b73d0f1ab343a4e84b0d8de5958fe /drivers/ide/ide-atapi.c
parent4f02ff06b4d33aba50ce5157c23e99cd21d447ee (diff)
ide-atapi: accomodate transfer length calculation for ide-cd
... by factoring it out of ide_cd_do_request() into a helper, as suggested by Bart. There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> [bart: BLK_DEV_IDECD needs to select IDE_ATAPI now] Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-atapi.c')
-rw-r--r--drivers/ide/ide-atapi.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 74273fdc8827..8884877bd2b5 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -252,6 +252,18 @@ int ide_scsi_expiry(ide_drive_t *drive)
252} 252}
253EXPORT_SYMBOL_GPL(ide_scsi_expiry); 253EXPORT_SYMBOL_GPL(ide_scsi_expiry);
254 254
255int ide_cd_get_xferlen(struct request *rq)
256{
257 if (blk_fs_request(rq))
258 return 32768;
259 else if (blk_sense_request(rq) || blk_pc_request(rq) ||
260 rq->cmd_type == REQ_TYPE_ATA_PC)
261 return rq->data_len;
262 else
263 return 0;
264}
265EXPORT_SYMBOL_GPL(ide_cd_get_xferlen);
266
255/* 267/*
256 * This is the usual interrupt handler which will be called during a packet 268 * This is the usual interrupt handler which will be called during a packet
257 * command. We will transfer some of the data (as requested by the drive) 269 * command. We will transfer some of the data (as requested by the drive)
@@ -551,7 +563,7 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, unsigned int timeout,
551 struct ide_atapi_pc *pc = drive->pc; 563 struct ide_atapi_pc *pc = drive->pc;
552 ide_hwif_t *hwif = drive->hwif; 564 ide_hwif_t *hwif = drive->hwif;
553 u32 tf_flags; 565 u32 tf_flags;
554 u16 bcount = 0; 566 u16 bcount;
555 u8 scsi = !!(drive->dev_flags & IDE_DFLAG_SCSI); 567 u8 scsi = !!(drive->dev_flags & IDE_DFLAG_SCSI);
556 568
557 /* We haven't transferred any data yet */ 569 /* We haven't transferred any data yet */
@@ -560,6 +572,7 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, unsigned int timeout,
560 572
561 if (dev_is_idecd(drive)) { 573 if (dev_is_idecd(drive)) {
562 tf_flags = IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL; 574 tf_flags = IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL;
575 bcount = ide_cd_get_xferlen(hwif->hwgroup->rq);
563 } else if (scsi) { 576 } else if (scsi) {
564 tf_flags = 0; 577 tf_flags = 0;
565 bcount = min(pc->req_xfer, 63 * 1024); 578 bcount = min(pc->req_xfer, 63 * 1024);