|
@@ -1,7 +1,8 @@
|
|
/*
|
|
/*
|
|
- * linux/drivers/ide/pci/trm290.c Version 1.02 Mar. 18, 2000
|
|
|
|
|
|
+ * linux/drivers/ide/pci/trm290.c Version 1.05 Dec. 26, 2007
|
|
*
|
|
*
|
|
* Copyright (c) 1997-1998 Mark Lord
|
|
* Copyright (c) 1997-1998 Mark Lord
|
|
|
|
+ * Copyright (c) 2007 MontaVista Software, Inc. <source@mvista.com>
|
|
* May be copied or modified under the terms of the GNU General Public License
|
|
* May be copied or modified under the terms of the GNU General Public License
|
|
*
|
|
*
|
|
* June 22, 2004 - get rid of check_region
|
|
* June 22, 2004 - get rid of check_region
|
|
@@ -177,7 +178,7 @@ static void trm290_selectproc (ide_drive_t *drive)
|
|
trm290_prepare_drive(drive, drive->using_dma);
|
|
trm290_prepare_drive(drive, drive->using_dma);
|
|
}
|
|
}
|
|
|
|
|
|
-static void trm290_ide_dma_exec_cmd(ide_drive_t *drive, u8 command)
|
|
|
|
|
|
+static void trm290_dma_exec_cmd(ide_drive_t *drive, u8 command)
|
|
{
|
|
{
|
|
BUG_ON(HWGROUP(drive)->handler != NULL); /* paranoia check */
|
|
BUG_ON(HWGROUP(drive)->handler != NULL); /* paranoia check */
|
|
ide_set_handler(drive, &ide_dma_intr, WAIT_CMD, NULL);
|
|
ide_set_handler(drive, &ide_dma_intr, WAIT_CMD, NULL);
|
|
@@ -185,7 +186,7 @@ static void trm290_ide_dma_exec_cmd(ide_drive_t *drive, u8 command)
|
|
outb(command, IDE_COMMAND_REG);
|
|
outb(command, IDE_COMMAND_REG);
|
|
}
|
|
}
|
|
|
|
|
|
-static int trm290_ide_dma_setup(ide_drive_t *drive)
|
|
|
|
|
|
+static int trm290_dma_setup(ide_drive_t *drive)
|
|
{
|
|
{
|
|
ide_hwif_t *hwif = drive->hwif;
|
|
ide_hwif_t *hwif = drive->hwif;
|
|
struct request *rq = hwif->hwgroup->rq;
|
|
struct request *rq = hwif->hwgroup->rq;
|
|
@@ -215,7 +216,7 @@ static int trm290_ide_dma_setup(ide_drive_t *drive)
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-static void trm290_ide_dma_start(ide_drive_t *drive)
|
|
|
|
|
|
+static void trm290_dma_start(ide_drive_t *drive)
|
|
{
|
|
{
|
|
}
|
|
}
|
|
|
|
|
|
@@ -240,6 +241,14 @@ static int trm290_ide_dma_test_irq (ide_drive_t *drive)
|
|
return (status == 0x00ff);
|
|
return (status == 0x00ff);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+static void trm290_dma_host_on(ide_drive_t *drive)
|
|
|
|
+{
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static void trm290_dma_host_off(ide_drive_t *drive)
|
|
|
|
+{
|
|
|
|
+}
|
|
|
|
+
|
|
static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
|
|
static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
|
|
{
|
|
{
|
|
unsigned int cfgbase = 0;
|
|
unsigned int cfgbase = 0;
|
|
@@ -280,11 +289,13 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
|
|
|
|
|
|
ide_setup_dma(hwif, (hwif->config_data + 4) ^ (hwif->channel ? 0x0080 : 0x0000), 3);
|
|
ide_setup_dma(hwif, (hwif->config_data + 4) ^ (hwif->channel ? 0x0080 : 0x0000), 3);
|
|
|
|
|
|
- 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;
|
|
|
|
|
|
+ hwif->dma_host_off = &trm290_dma_host_off;
|
|
|
|
+ hwif->dma_host_on = &trm290_dma_host_on;
|
|
|
|
+ hwif->dma_setup = &trm290_dma_setup;
|
|
|
|
+ hwif->dma_exec_cmd = &trm290_dma_exec_cmd;
|
|
|
|
+ hwif->dma_start = &trm290_dma_start;
|
|
|
|
+ hwif->ide_dma_end = &trm290_ide_dma_end;
|
|
|
|
+ hwif->ide_dma_test_irq = &trm290_ide_dma_test_irq;
|
|
|
|
|
|
hwif->selectproc = &trm290_selectproc;
|
|
hwif->selectproc = &trm290_selectproc;
|
|
#if 1
|
|
#if 1
|