Commit 089c5c7e authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: factor out debugging code from ide_tf_load() 



Factor out debugging code from ide_tf_load() to ide_tf_dump() helper
and update ide_tf_load() users accordingly.

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

drivers/ide/ide-io.c

+1 −0
Original line number Diff line number Diff line
@@ -1680,6 +1680,7 @@ void ide_pktcmd_tf_load(ide_drive_t *drive, u32 tf_flags, u16 bcount, u8 dma) 
	task.tf.lbam    = bcount & 0xff;

	task.tf.lbah    = (bcount >> 8) & 0xff;



	ide_tf_dump(drive->name, &task.tf);

	ide_tf_load(drive, &task);

}

drivers/ide/ide-taskfile.c

+17 −12
Original line number Diff line number Diff line
@@ -33,26 +33,29 @@ 
#include <asm/uaccess.h>

#include <asm/io.h>



void ide_tf_load(ide_drive_t *drive, ide_task_t *task)

void ide_tf_dump(const char *s, struct ide_taskfile *tf)

{

	ide_hwif_t *hwif = drive->hwif;

	struct ide_io_ports *io_ports = &hwif->io_ports;

	struct ide_taskfile *tf = &task->tf;

	u8 HIHI = (task->tf_flags & IDE_TFLAG_LBA48) ? 0xE0 : 0xEF;



	if (task->tf_flags & IDE_TFLAG_FLAGGED)

		HIHI = 0xFF;



#ifdef DEBUG

	printk("%s: tf: feat 0x%02x nsect 0x%02x lbal 0x%02x "

		"lbam 0x%02x lbah 0x%02x dev 0x%02x cmd 0x%02x\n",

		drive->name, tf->feature, tf->nsect, tf->lbal,

		s, tf->feature, tf->nsect, tf->lbal,

		tf->lbam, tf->lbah, tf->device, tf->command);

	printk("%s: hob: nsect 0x%02x lbal 0x%02x "

		"lbam 0x%02x lbah 0x%02x\n",

		drive->name, tf->hob_nsect, tf->hob_lbal,

		s, tf->hob_nsect, tf->hob_lbal,

		tf->hob_lbam, tf->hob_lbah);

#endif

}



void ide_tf_load(ide_drive_t *drive, ide_task_t *task)

{

	ide_hwif_t *hwif = drive->hwif;

	struct ide_io_ports *io_ports = &hwif->io_ports;

	struct ide_taskfile *tf = &task->tf;

	u8 HIHI = (task->tf_flags & IDE_TFLAG_LBA48) ? 0xE0 : 0xEF;



	if (task->tf_flags & IDE_TFLAG_FLAGGED)

		HIHI = 0xFF;



	ide_set_irq(drive, 1);
@@ -149,8 +152,10 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task) 
	if (task->tf_flags & IDE_TFLAG_FLAGGED)

		task->tf_flags |= IDE_TFLAG_FLAGGED_SET_IN_FLAGS;



	if ((task->tf_flags & IDE_TFLAG_DMA_PIO_FALLBACK) == 0)

	if ((task->tf_flags & IDE_TFLAG_DMA_PIO_FALLBACK) == 0) {

		ide_tf_dump(drive->name, tf);

		ide_tf_load(drive, task);

	}



	switch (task->data_phase) {

	case TASKFILE_MULTI_OUT:

include/linux/ide.h

+2 −0
Original line number Diff line number Diff line
@@ -960,6 +960,8 @@ typedef struct ide_task_s { 
	void			*special;	/* valid_t generally */

} ide_task_t;



void ide_tf_dump(const char *, struct ide_taskfile *);



void ide_tf_load(ide_drive_t *, ide_task_t *);

void ide_tf_read(ide_drive_t *, ide_task_t *);