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

Commit 3a6a3549 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide-cd: fix register loading order in cdrom_start_packet_command() 



Load IDE_CONTROL_REG before other registers in cdrom_start_packet_command().

It shouldn't affect anything (just a usual paranoia to separate changes
which change the way in which hardware is accessed from code cleanups).

While at it move misplaced FIXME comment in the right place.

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 8e7657ae

drivers/ide/ide-cd.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -917,19 +917,19 @@ static ide_startstop_t cdrom_start_packet_command(ide_drive_t *drive, 
	if (ide_wait_stat(&startstop, drive, 0, BUSY_STAT, WAIT_READY))

	if (ide_wait_stat(&startstop, drive, 0, BUSY_STAT, WAIT_READY))

		return startstop;

		return startstop;





	/* FIXME: for Virtual DMA we must check harder */

	if (info->dma)

	if (info->dma)

		info->dma = !hwif->dma_setup(drive);

		info->dma = !hwif->dma_setup(drive);





	/* Set up the controller registers. */

	/* Set up the controller registers. */

	/* FIXME: for Virtual DMA we must check harder */

	if (IDE_CONTROL_REG)

		HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG);

	HWIF(drive)->OUTB(info->dma, IDE_FEATURE_REG);

	HWIF(drive)->OUTB(info->dma, IDE_FEATURE_REG);

	HWIF(drive)->OUTB(0, IDE_IREASON_REG);

	HWIF(drive)->OUTB(0, IDE_IREASON_REG);

	HWIF(drive)->OUTB(0, IDE_SECTOR_REG);

	HWIF(drive)->OUTB(0, IDE_SECTOR_REG);





	HWIF(drive)->OUTB(xferlen & 0xff, IDE_BCOUNTL_REG);

	HWIF(drive)->OUTB(xferlen & 0xff, IDE_BCOUNTL_REG);

	HWIF(drive)->OUTB(xferlen >> 8  , IDE_BCOUNTH_REG);

	HWIF(drive)->OUTB(xferlen >> 8  , IDE_BCOUNTH_REG);

	if (IDE_CONTROL_REG)

		HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG);

 

 

	if (CDROM_CONFIG_FLAGS (drive)->drq_interrupt) {

	if (CDROM_CONFIG_FLAGS (drive)->drq_interrupt) {

		/* waiting for CDB interrupt, not DMA yet. */

		/* waiting for CDB interrupt, not DMA yet. */