Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29f3aaca authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide-cd: merge cdrom_start_read_continuation() and cdrom_start_rw_cont() 



* Add handling of write requests to cdrom_start_read_continuation(),
  rename it to cdrom_start_rw_cont() and remove no longer needed
  cdrom_start_write_cont().

* Remove redundant '(rq->sector & (sectors_per_frame - 1)' check.

There should be no functionality changes caused by this patch.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 94f5a86d

drivers/ide/ide-cd.c

+35 −39
Original line number Diff line number Diff line
@@ -800,39 +800,48 @@ static int cdrom_read_from_buffer (ide_drive_t *drive) 
static ide_startstop_t cdrom_rw_intr(ide_drive_t *);



/*

 * Routine to send a read packet command to the drive.

 * This is usually called directly from cdrom_start_read.

 * Routine to send a read/write packet command to the drive.

 * This is usually called directly from cdrom_start_{read,write}().

 * However, for drq_interrupt devices, it is called from an interrupt

 * when the drive is ready to accept the command.

 */

static ide_startstop_t cdrom_start_read_continuation (ide_drive_t *drive)

static ide_startstop_t cdrom_start_rw_cont(ide_drive_t *drive)

{

	struct request *rq = HWGROUP(drive)->rq;

	unsigned short sectors_per_frame;

	int nskip;



	sectors_per_frame = queue_hardsect_size(drive->queue) >> SECTOR_BITS;

	if (rq_data_dir(rq) == READ) {

		unsigned short sectors_per_frame =

			queue_hardsect_size(drive->queue) >> SECTOR_BITS;

		int nskip = rq->sector & (sectors_per_frame - 1);



	/* If the requested sector doesn't start on a cdrom block boundary,

	   we must adjust the start of the transfer so that it does,

	   and remember to skip the first few sectors.

	   If the CURRENT_NR_SECTORS field is larger than the size

	   of the buffer, it will mean that we're to skip a number

	   of sectors equal to the amount by which CURRENT_NR_SECTORS

	   is larger than the buffer size. */

	nskip = rq->sector & (sectors_per_frame - 1);

		/*

		 * If the requested sector doesn't start on a frame boundary,

		 * we must adjust the start of the transfer so that it does,

		 * and remember to skip the first few sectors.

		 *

		 * If the rq->current_nr_sectors field is larger than the size

		 * of the buffer, it will mean that we're to skip a number of

		 * sectors equal to the amount by which rq->current_nr_sectors

		 * is larger than the buffer size.

		 */

		if (nskip > 0) {

			/* Sanity check... */

		if (rq->current_nr_sectors != bio_cur_sectors(rq->bio) &&

			(rq->sector & (sectors_per_frame - 1))) {

			printk(KERN_ERR "%s: cdrom_start_read_continuation: buffer botch (%u)\n",

				drive->name, rq->current_nr_sectors);

			if (rq->current_nr_sectors !=

			    bio_cur_sectors(rq->bio)) {

				printk(KERN_ERR "%s: %s: buffer botch (%u)\n",

						drive->name, __FUNCTION__,

						rq->current_nr_sectors);

				cdrom_end_request(drive, 0);

				return ide_stopped;

			}

			rq->current_nr_sectors += nskip;

		}



	}

#if 0

	else

		/* the immediate bit */

		rq->cmd[1] = 1 << 3;

#endif

	/* Set up the command */

	rq->timeout = ATAPI_WAIT_PC;
@@ -840,7 +849,6 @@ static ide_startstop_t cdrom_start_read_continuation (ide_drive_t *drive) 
	return cdrom_transfer_packet_command(drive, rq, cdrom_rw_intr);

}





#define IDECD_SEEK_THRESHOLD	(1000)			/* 1000 blocks */

#define IDECD_SEEK_TIMER	(5 * WAIT_MIN_SLEEP)	/* 100 ms */

#define IDECD_SEEK_TIMEOUT	(2 * WAIT_CMD)		/* 20 sec */
@@ -939,7 +947,7 @@ static ide_startstop_t cdrom_start_read (ide_drive_t *drive, unsigned int block) 
		info->dma = 0;



	/* Start sending the read request to the drive. */

	return cdrom_start_packet_command(drive, 32768, cdrom_start_read_continuation);

	return cdrom_start_packet_command(drive, 32768, cdrom_start_rw_cont);

}



/****************************************************************************
@@ -1375,18 +1383,6 @@ static ide_startstop_t cdrom_rw_intr(ide_drive_t *drive) 
	return ide_started;

}



static ide_startstop_t cdrom_start_write_cont(ide_drive_t *drive)

{

	struct request *rq = HWGROUP(drive)->rq;



#if 0	/* the immediate bit */

	rq->cmd[1] = 1 << 3;

#endif

	rq->timeout = ATAPI_WAIT_PC;



	return cdrom_transfer_packet_command(drive, rq, cdrom_rw_intr);

}



static ide_startstop_t cdrom_start_write(ide_drive_t *drive, struct request *rq)

{

	struct cdrom_info *info = drive->driver_data;
@@ -1419,7 +1415,7 @@ static ide_startstop_t cdrom_start_write(ide_drive_t *drive, struct request *rq) 
	info->devinfo.media_written = 1;



	/* Start sending the write request to the drive. */

	return cdrom_start_packet_command(drive, 32768, cdrom_start_write_cont);

	return cdrom_start_packet_command(drive, 32768, cdrom_start_rw_cont);

}



static ide_startstop_t cdrom_do_newpc_cont(ide_drive_t *drive)