vserver 1.9.5.x5

[linux-2.6.git] / drivers / ide / pci / trm290.c

diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index bb7de7a..8b5eea5 100644 (file)
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -179,64 +179,32 @@ static void trm290_selectproc (ide_drive_t *drive)
 }
 
 #ifdef CONFIG_BLK_DEV_IDEDMA
-static int trm290_ide_dma_write (ide_drive_t *drive /*, struct request *rq */)
+static void trm290_ide_dma_exec_cmd(ide_drive_t *drive, u8 command)
 {
        ide_hwif_t *hwif        = HWIF(drive);
-       struct request *rq      = HWGROUP(drive)->rq;
-//     ide_task_t *args        = rq->special;
-       task_ioreg_t command    = WIN_NOP;
-       unsigned int count, reading = 2, writing = 0;
 
-       reading = 0;
-       writing = 1;
-#ifdef TRM290_NO_DMA_WRITES
-       /* always use PIO for writes */
-       trm290_prepare_drive(drive, 0); /* select PIO xfer */
-       return 1;
-#endif
-       if (!(count = ide_build_dmatable(drive, rq))) {
-               /* try PIO instead of DMA */
-               trm290_prepare_drive(drive, 0); /* select PIO xfer */
-               return 1;
-       }
-       /* select DMA xfer */
-       trm290_prepare_drive(drive, 1);
-       hwif->OUTL(hwif->dmatable_dma|reading|writing, hwif->dma_command);
-       drive->waiting_for_dma = 1;
-       /* start DMA */
-       hwif->OUTW((count * 2) - 1, hwif->dma_status);
-       if (drive->media != ide_disk)
-               return 0;
        if (HWGROUP(drive)->handler != NULL)    /* paranoia check */
                BUG();
        ide_set_handler(drive, &ide_dma_intr, WAIT_CMD, NULL);
-       /*
-        * FIX ME to use only ACB ide_task_t args Struct
-        */
-#if 0
-       {
-               ide_task_t *args = rq->special;
-               command = args->tfRegister[IDE_COMMAND_OFFSET];
-       }
-#else
-       command = /* (lba48) ? WIN_READDMA_EXT : */ WIN_READDMA;
-       if (rq->flags & REQ_DRIVE_TASKFILE) {
-               ide_task_t *args = rq->special;
-               command = args->tfRegister[IDE_COMMAND_OFFSET];
-       }
-#endif
        /* issue cmd to drive */
        hwif->OUTB(command, IDE_COMMAND_REG);
-       return hwif->ide_dma_begin(drive);
 }
 
-static int trm290_ide_dma_read (ide_drive_t *drive  /*, struct request *rq */)
+static int trm290_ide_dma_setup(ide_drive_t *drive)
 {
-       ide_hwif_t *hwif        = HWIF(drive);
-       struct request *rq      = HWGROUP(drive)->rq;
-//     ide_task_t *args        = rq->special;
-       task_ioreg_t command    = WIN_NOP;
-       unsigned int count, reading = 2, writing = 0;
+       ide_hwif_t *hwif = drive->hwif;
+       struct request *rq = hwif->hwgroup->rq;
+       unsigned int count, rw;
+
+       if (rq_data_dir(rq)) {
+#ifdef TRM290_NO_DMA_WRITES
+               /* always use PIO for writes */
+               trm290_prepare_drive(drive, 0); /* select PIO xfer */
+               return 1;
+#endif
+               rw = 1;
+       } else
+               rw = 2;
 
        if (!(count = ide_build_dmatable(drive, rq))) {
                /* try PIO instead of DMA */
@@ -245,38 +213,15 @@ static int trm290_ide_dma_read (ide_drive_t *drive  /*, struct request *rq */)
        }
        /* select DMA xfer */
        trm290_prepare_drive(drive, 1);
-       hwif->OUTL(hwif->dmatable_dma|reading|writing, hwif->dma_command);
+       hwif->OUTL(hwif->dmatable_dma|rw, hwif->dma_command);
        drive->waiting_for_dma = 1;
        /* start DMA */
        hwif->OUTW((count * 2) - 1, hwif->dma_status);
-       if (drive->media != ide_disk)
-               return 0;
-       if (HWGROUP(drive)->handler != NULL)    /* paranoia check */
-               BUG();
-       ide_set_handler(drive, &ide_dma_intr, WAIT_CMD, NULL);
-       /*
-        * FIX ME to use only ACB ide_task_t args Struct
-        */
-#if 0
-       {
-               ide_task_t *args = rq->special;
-               command = args->tfRegister[IDE_COMMAND_OFFSET];
-       }
-#else
-       command = /* (lba48) ? WIN_WRITEDMA_EXT : */ WIN_WRITEDMA;
-       if (rq->flags & REQ_DRIVE_TASKFILE) {
-               ide_task_t *args = rq->special;
-               command = args->tfRegister[IDE_COMMAND_OFFSET];
-       }
-#endif
-       /* issue cmd to drive */
-       hwif->OUTB(command, IDE_COMMAND_REG);
-       return hwif->ide_dma_begin(drive);
+       return 0;
 }
 
-static int trm290_ide_dma_begin (ide_drive_t *drive)
+static void trm290_ide_dma_start(ide_drive_t *drive)
 {
-       return 0;
 }
 
 static int trm290_ide_dma_end (ide_drive_t *drive)
@@ -304,7 +249,7 @@ static int trm290_ide_dma_test_irq (ide_drive_t *drive)
 /*
  * Invoked from ide-dma.c at boot time.
  */
-void __devinit init_hwif_trm290(ide_hwif_t *hwif)
+static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
 {
        unsigned int cfgbase = 0;
        unsigned long flags;
@@ -347,9 +292,9 @@ void __devinit init_hwif_trm290(ide_hwif_t *hwif)
        ide_setup_dma(hwif, (hwif->config_data + 4) ^ (hwif->channel ? 0x0080 : 0x0000), 3);
 
 #ifdef CONFIG_BLK_DEV_IDEDMA
-       hwif->ide_dma_write = &trm290_ide_dma_write;
-       hwif->ide_dma_read = &trm290_ide_dma_read;
-       hwif->ide_dma_begin = &trm290_ide_dma_begin;
+       hwif->dma_setup = &trm290_ide_dma_setup;
+       hwif->dma_exec_cmd = &trm290_ide_dma_exec_cmd;
+       hwif->dma_start = &trm290_ide_dma_start;
        hwif->ide_dma_end = &trm290_ide_dma_end;
        hwif->ide_dma_test_irq = &trm290_ide_dma_test_irq;
 #endif /* CONFIG_BLK_DEV_IDEDMA */
@@ -397,8 +342,7 @@ static ide_pci_device_t trm290_chipset __devinitdata = {
 
 static int __devinit trm290_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_setup_pci_device(dev, &trm290_chipset);
-       return 0;
+       return ide_setup_pci_device(dev, &trm290_chipset);
 }
 
 static struct pci_device_id trm290_pci_tbl[] = {