Staging: pata_rdc: remove the driver from the staging tree
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 29 Jul 2009 13:54:11 +0000 (06:54 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 15 Sep 2009 19:02:11 +0000 (12:02 -0700)
Now that a "real" driver is in the libata tree for this hardware, we need
to remove the staging driver as it is no longer needed.

Cc: Kevin Huang <Kevin.Huang@rdc.com.tw>
Cc: Tomy Wang <Tomy.Wang@rdc.com.tw>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/pata_rdc/Kconfig [deleted file]
drivers/staging/pata_rdc/Makefile [deleted file]
drivers/staging/pata_rdc/pata_rdc.c [deleted file]
drivers/staging/pata_rdc/pata_rdc.h [deleted file]

index 7b500a88060a49e153999d821368a486a757c453..979de8fb32cdf88e8c9c3b8a6cccfd941858dfe5 100644 (file)
@@ -129,8 +129,6 @@ source "drivers/staging/vt6656/Kconfig"
 
 source "drivers/staging/cpc-usb/Kconfig"
 
-source "drivers/staging/pata_rdc/Kconfig"
-
 source "drivers/staging/udlfb/Kconfig"
 
 source "drivers/staging/hv/Kconfig"
index 1ac7c8f23d0299292466a2b27c71c43eb14a7c30..c80d05006dc60ebe3f815668efb297ca62b8b06d 100644 (file)
@@ -46,7 +46,6 @@ obj-$(CONFIG_OCTEON_ETHERNET) += octeon/
 obj-$(CONFIG_VT6655)           += vt6655/
 obj-$(CONFIG_VT6656)           += vt6656/
 obj-$(CONFIG_USB_CPC)          += cpc-usb/
-obj-$(CONFIG_RDC_17F3101X)     += pata_rdc/
 obj-$(CONFIG_FB_UDL)           += udlfb/
 obj-$(CONFIG_HYPERV)           += hv/
 obj-$(CONFIG_VME_BUS)          += vme/
diff --git a/drivers/staging/pata_rdc/Kconfig b/drivers/staging/pata_rdc/Kconfig
deleted file mode 100644 (file)
index 7a406b0..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-config RDC_17F3101X
-       tristate "RDC_17F3101X IDE support"
-       depends on PCI && ATA && ATA_SFF
-       ---help---
-         This is an experimental driver for RDC_17F31011 and
-         RDC_17F31012 IDE driver.
diff --git a/drivers/staging/pata_rdc/Makefile b/drivers/staging/pata_rdc/Makefile
deleted file mode 100644 (file)
index f952c16..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_RDC_17F3101X)     += pata_rdc.o
-
diff --git a/drivers/staging/pata_rdc/pata_rdc.c b/drivers/staging/pata_rdc/pata_rdc.c
deleted file mode 100644 (file)
index 6252745..0000000
+++ /dev/null
@@ -1,955 +0,0 @@
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/module.h>
-
-#include <linux/pci.h>
-#include <linux/device.h>
-
-#include <scsi/scsi_host.h>
-#include <linux/libata.h>
-
-#include "pata_rdc.h"
-
-static const struct pci_device_id rdc_pata_id_table[] = {
-       { PCI_DEVICE(0x17F3, 0x1011), RDC_17F31011},
-       { PCI_DEVICE(0x17F3, 0x1012), RDC_17F31012},
-       { }     /* terminate list */
-};
-MODULE_DEVICE_TABLE(pci, rdc_pata_id_table);
-
-/* see ATA Host Adapters Standards. */
-static struct pci_bits ATA_Decode_Enable_Bits[] = {
-       { 0x41U, 1U, 0x80UL, 0x80UL },  /* port (Channel) 0 */
-       { 0x43U, 1U, 0x80UL, 0x80UL },  /* port (Channel) 1 */
-};
-
-static uint PCIDeviceIO_ReadPCIConfiguration(struct pci_dev *pdev, uint Offset, uint Length, void *pBuffer)
-{
-       uint funcresult;
-       unchar *pchar;
-       uint i;
-
-       funcresult = TRUE;
-
-       pchar = pBuffer;
-
-       for (i = 0; i < Length; i++) {
-               pci_read_config_byte(pdev, Offset, pchar);
-               Offset++;
-               pchar++;
-       }
-
-       funcresult = TRUE;
-
-       goto funcexit;
-funcexit:
-
-       return funcresult;
-}
-
-static uint PCIDeviceIO_WritePCIConfiguration(struct pci_dev *pdev, uint Offset, uint Length, void *pBuffer)
-{
-       uint funcresult;
-       unchar *pchar;
-       uint i;
-
-       funcresult = TRUE;
-
-       pchar = pBuffer;
-
-       for (i = 0; i < Length; i++) {
-               pci_write_config_byte(pdev, Offset, *pchar);
-               Offset++;
-               pchar++;
-       }
-
-       funcresult = TRUE;
-
-       goto funcexit;
-funcexit:
-
-       return funcresult;
-}
-
-static uint ATAHostAdapter_SetPrimaryPIO(struct pci_dev *pdev, uint DeviceID,
-                                        uint PIOTimingMode, uint DMAEnable,
-                                        uint PrefetchPostingEnable)
-{
-       uint funcresult;
-       uint result;
-       uint ATATimingRegister;
-       uint Device1TimingRegister;
-
-       funcresult = TRUE;
-
-       ATATimingRegister = 0;
-       Device1TimingRegister = 0;
-
-       result = PCIDeviceIO_ReadPCIConfiguration(pdev,
-                                                ATAConfiguration_ID_PrimaryTiming + ATAConfiguration_PCIOffset,
-                                                ATAConfiguration_ID_PrimaryTiming_Size,
-                                                &ATATimingRegister);
-       if (result == FALSE) {
-               funcresult = FALSE;
-               goto funcexit;
-       }
-
-       result = PCIDeviceIO_ReadPCIConfiguration(pdev,
-                                                 ATAConfiguration_ID_Device1Timing + ATAConfiguration_PCIOffset,
-                                                 ATAConfiguration_ID_Device1Timing_Size,
-                                                 &Device1TimingRegister);
-       if (result == FALSE) {
-               funcresult = FALSE;
-               goto funcexit;
-       }
-
-       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device1TimingRegisterEnable;
-
-       switch (DeviceID) {
-       case 0:
-               /* mask clear */
-               ATATimingRegister &= ~(ATAConfiguration_PrimaryTiming_Device0FastTimingEnable |
-                                     ATAConfiguration_PrimaryTiming_Device0IORDYSampleModeEnable |
-                                     ATAConfiguration_PrimaryTiming_Device0PrefetchandPostingEnable |
-                                     ATAConfiguration_PrimaryTiming_Device0DMATimingEnable |
-                                     ATAConfiguration_PrimaryTiming_Device0RecoveryMode |
-                                     ATAConfiguration_PrimaryTiming_Device0IORDYSampleMode);
-
-               if (PIOTimingMode > PIO0)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device0FastTimingEnable;
-
-               if (PIOTimingMode >= PIO3)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device0IORDYSampleModeEnable;
-
-               if (PIOTimingMode >= PIO2 && PrefetchPostingEnable == TRUE)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device0PrefetchandPostingEnable;
-
-               if (DMAEnable == TRUE && PIOTimingMode >= PIO2)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device0DMATimingEnable;
-
-               if (PIOTimingMode <= PIO2)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device0RecoveryMode_0;
-               else if (PIOTimingMode == PIO3)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device0RecoveryMode_1;
-               else if (PIOTimingMode == PIO4)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device0RecoveryMode_3;
-
-               if (PIOTimingMode <= PIO1)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device0IORDYSampleMode_0;
-               else if (PIOTimingMode == PIO2)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device0IORDYSampleMode_1;
-               else if (PIOTimingMode <= PIO4)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device0IORDYSampleMode_2;
-               break;
-       case 1:
-               ATATimingRegister &= ~(ATAConfiguration_PrimaryTiming_Device1FastTimingEnable |
-                                      ATAConfiguration_PrimaryTiming_Device1IORDYSampleModeEnable |
-                                      ATAConfiguration_PrimaryTiming_Device1PrefetchandPostingEnable |
-                                      ATAConfiguration_PrimaryTiming_Device1DMATimingEnable);
-
-               if (PIOTimingMode > PIO0)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device1FastTimingEnable;
-
-               if (PIOTimingMode >= PIO3)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device1IORDYSampleModeEnable;
-
-               if (PIOTimingMode >= PIO2 && PrefetchPostingEnable == TRUE)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device1PrefetchandPostingEnable;
-
-               if (DMAEnable == TRUE && PIOTimingMode >= PIO2)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device1DMATimingEnable;
-
-               Device1TimingRegister &= ~(ATAConfiguration_Device1Timing_PrimaryRecoveryMode |
-                                          ATAConfiguration_Device1Timing_PrimaryIORDYSampleMode);
-
-               if (PIOTimingMode <= PIO2)
-                       Device1TimingRegister |= ATAConfiguration_Device1Timing_PrimaryRecoveryMode_0;
-               else if (PIOTimingMode == PIO3)
-                       Device1TimingRegister |= ATAConfiguration_Device1Timing_PrimaryRecoveryMode_1;
-               else if (PIOTimingMode == PIO4)
-                       Device1TimingRegister |= ATAConfiguration_Device1Timing_PrimaryRecoveryMode_3;
-
-               if (PIOTimingMode <= PIO1)
-                       Device1TimingRegister |= ATAConfiguration_Device1Timing_PrimaryIORDYSampleMode_0;
-               else if (PIOTimingMode == PIO2)
-                       Device1TimingRegister |= ATAConfiguration_Device1Timing_PrimaryIORDYSampleMode_1;
-               else if (PIOTimingMode <= PIO4)
-                       Device1TimingRegister |= ATAConfiguration_Device1Timing_PrimaryIORDYSampleMode_2;
-               break;
-       default:
-               funcresult = FALSE;
-               goto funcexit;
-               break;
-       }
-
-       result = PCIDeviceIO_WritePCIConfiguration(pdev,
-                                                  ATAConfiguration_ID_PrimaryTiming + ATAConfiguration_PCIOffset,
-                                                  ATAConfiguration_ID_PrimaryTiming_Size,
-                                                  &ATATimingRegister);
-       if (result == FALSE) {
-               funcresult = FALSE;
-               goto funcexit;
-       }
-
-       result = PCIDeviceIO_WritePCIConfiguration(pdev,
-                                                  ATAConfiguration_ID_Device1Timing + ATAConfiguration_PCIOffset,
-                                                  ATAConfiguration_ID_Device1Timing_Size,
-                                                  &Device1TimingRegister);
-       if (result == FALSE) {
-               funcresult = FALSE;
-               goto funcexit;
-       }
-
-       goto funcexit;
-funcexit:
-
-       return funcresult;
-}
-
-static uint ATAHostAdapter_SetSecondaryPIO(struct pci_dev *pdev, uint DeviceID,
-                                          uint PIOTimingMode, uint DMAEnable,
-                                          uint PrefetchPostingEnable)
-{
-       uint funcresult;
-       uint result;
-       uint ATATimingRegister;
-       uint Device1TimingRegister;
-
-       funcresult = TRUE;
-
-       ATATimingRegister = 0;
-       Device1TimingRegister = 0;
-
-       result = PCIDeviceIO_ReadPCIConfiguration(pdev,
-                                                 ATAConfiguration_ID_SecondaryTiming + ATAConfiguration_PCIOffset,
-                                                 ATAConfiguration_ID_SecondaryTiming_Size,
-                                                 &ATATimingRegister);
-       if (result == FALSE) {
-               funcresult = FALSE;
-               goto funcexit;
-       }
-
-       result = PCIDeviceIO_ReadPCIConfiguration(pdev,
-                                                 ATAConfiguration_ID_Device1Timing + ATAConfiguration_PCIOffset,
-                                                 ATAConfiguration_ID_Device1Timing_Size,
-                                                 &Device1TimingRegister);
-       if (result == FALSE) {
-               funcresult = FALSE;
-               goto funcexit;
-       }
-
-       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device1TimingRegisterEnable;
-
-       switch (DeviceID) {
-       case 0:
-               /* mask clear */
-               ATATimingRegister &= ~(ATAConfiguration_PrimaryTiming_Device0FastTimingEnable |
-                                      ATAConfiguration_PrimaryTiming_Device0IORDYSampleModeEnable |
-                                      ATAConfiguration_PrimaryTiming_Device0PrefetchandPostingEnable |
-                                      ATAConfiguration_PrimaryTiming_Device0DMATimingEnable |
-                                      ATAConfiguration_PrimaryTiming_Device0RecoveryMode |
-                                      ATAConfiguration_PrimaryTiming_Device0IORDYSampleMode);
-
-               if (PIOTimingMode > PIO0)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device0FastTimingEnable;
-
-               if (PIOTimingMode >= PIO3)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device0IORDYSampleModeEnable;
-
-               if (PIOTimingMode >= PIO2 && PrefetchPostingEnable == TRUE)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device0PrefetchandPostingEnable;
-
-               if (DMAEnable == TRUE && PIOTimingMode >= PIO2)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device0DMATimingEnable;
-
-               if (PIOTimingMode <= PIO2)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device0RecoveryMode_0;
-               else if (PIOTimingMode == PIO3)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device0RecoveryMode_1;
-               else if (PIOTimingMode == PIO4)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device0RecoveryMode_3;
-
-               if (PIOTimingMode <= PIO1)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device0IORDYSampleMode_0;
-               else if (PIOTimingMode == PIO2)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device0IORDYSampleMode_1;
-               else if (PIOTimingMode <= PIO4)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device0IORDYSampleMode_2;
-               break;
-       case 1:
-               ATATimingRegister &= ~(ATAConfiguration_PrimaryTiming_Device1FastTimingEnable |
-                                      ATAConfiguration_PrimaryTiming_Device1IORDYSampleModeEnable |
-                                      ATAConfiguration_PrimaryTiming_Device1PrefetchandPostingEnable |
-                                      ATAConfiguration_PrimaryTiming_Device1DMATimingEnable);
-
-               if (PIOTimingMode > PIO0)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device1FastTimingEnable;
-
-               if (PIOTimingMode >= PIO3)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device1IORDYSampleModeEnable;
-
-               if (PIOTimingMode >= PIO2 && PrefetchPostingEnable == TRUE)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device1PrefetchandPostingEnable;
-
-               if (DMAEnable == TRUE && PIOTimingMode >= PIO2)
-                       ATATimingRegister |= ATAConfiguration_PrimaryTiming_Device1DMATimingEnable;
-
-               Device1TimingRegister &= ~(ATAConfiguration_Device1Timing_SecondaryRecoveryMode |
-                                          ATAConfiguration_Device1Timing_SecondaryIORDYSampleMode);
-
-               if (PIOTimingMode <= PIO2)
-                       Device1TimingRegister |= ATAConfiguration_Device1Timing_SecondaryRecoveryMode_0;
-               else if (PIOTimingMode == PIO3)
-                       Device1TimingRegister |= ATAConfiguration_Device1Timing_SecondaryRecoveryMode_1;
-               else if (PIOTimingMode == PIO4)
-                       Device1TimingRegister |= ATAConfiguration_Device1Timing_SecondaryRecoveryMode_3;
-
-               if (PIOTimingMode <= PIO1)
-                       Device1TimingRegister |= ATAConfiguration_Device1Timing_SecondaryIORDYSampleMode_0;
-               else if (PIOTimingMode == PIO2)
-                       Device1TimingRegister |= ATAConfiguration_Device1Timing_SecondaryIORDYSampleMode_1;
-               else if (PIOTimingMode <= PIO4)
-                       Device1TimingRegister |= ATAConfiguration_Device1Timing_SecondaryIORDYSampleMode_2;
-               break;
-       default:
-               funcresult = FALSE;
-               goto funcexit;
-               break;
-       }
-
-       result = PCIDeviceIO_WritePCIConfiguration(pdev,
-                                                  ATAConfiguration_ID_SecondaryTiming + ATAConfiguration_PCIOffset,
-                                                  ATAConfiguration_ID_SecondaryTiming_Size,
-                                                  &ATATimingRegister);
-       if (result == FALSE) {
-               funcresult = FALSE;
-               goto funcexit;
-       }
-
-       result = PCIDeviceIO_WritePCIConfiguration(pdev,
-                                                  ATAConfiguration_ID_Device1Timing + ATAConfiguration_PCIOffset,
-                                                  ATAConfiguration_ID_Device1Timing_Size,
-                                                  &Device1TimingRegister);
-       if (result == FALSE) {
-               funcresult = FALSE;
-               goto funcexit;
-       }
-
-       goto funcexit;
-funcexit:
-       return funcresult;
-}
-
-static uint ATAHostAdapter_SetPrimaryUDMA(struct pci_dev *pdev, uint DeviceID,
-                                         uint UDMAEnable, uint UDMATimingMode)
-{
-       uint funcresult;
-       uint result;
-       uint UDMAControlRegister;
-       uint UDMATimingRegister;
-       ulong IDEIOConfigurationRegister;
-
-       funcresult = TRUE;
-       UDMAControlRegister = 0;
-       UDMATimingRegister = 0;
-       IDEIOConfigurationRegister = 0;
-
-       result = PCIDeviceIO_ReadPCIConfiguration(pdev,
-                                                 ATAConfiguration_ID_UDMAControl + ATAConfiguration_PCIOffset,
-                                                 ATAConfiguration_ID_UDMAControl_Size,
-                                                 &UDMAControlRegister);
-       if (result == FALSE) {
-               funcresult = FALSE;
-               goto funcexit;
-       }
-
-       result = PCIDeviceIO_ReadPCIConfiguration(pdev,
-                                                 ATAConfiguration_ID_UDMATiming + ATAConfiguration_PCIOffset,
-                                                 ATAConfiguration_ID_UDMATiming_Size,
-                                                 &UDMATimingRegister);
-       if (result == FALSE) {
-               funcresult = FALSE;
-               goto funcexit;
-       }
-
-       result = PCIDeviceIO_ReadPCIConfiguration(pdev,
-                                                 ATAConfiguration_ID_IDEIOConfiguration + ATAConfiguration_PCIOffset,
-                                                 ATAConfiguration_ID_IDEIOConfiguration_Size,
-                                                 &IDEIOConfigurationRegister);
-       if (result == FALSE) {
-               funcresult = FALSE;
-               goto funcexit;
-       }
-
-       /*Rom Code will determine the device cable type and ATA 100.*/
-       /*IDEIOConfigurationRegister |= ATAConfiguration_IDEIOConfiguration_DeviceCable80Report;*/
-       /*IDEIOConfigurationRegister |= ATAConfiguration_IDEIOConfiguration_ATA100IsSupported;*/
-
-       switch (DeviceID) {
-       case 0:
-               UDMAControlRegister &= ~(ATAConfiguration_UDMAControl_PrimaryDevice0UDMAModeEnable);
-               if (UDMAEnable == TRUE)
-                       UDMAControlRegister |= ATAConfiguration_UDMAControl_PrimaryDevice0UDMAModeEnable;
-
-               IDEIOConfigurationRegister &= ~(ATAConfiguration_IDEIOConfiguration_PrimaryDevice066MhzEnable |
-                                               ATAConfiguration_IDEIOConfiguration_PrimaryDevice0100MhzEnable);
-
-               if (UDMATimingMode >= UDMA5)
-                       IDEIOConfigurationRegister |= ATAConfiguration_IDEIOConfiguration_PrimaryDevice0100MhzEnable;
-               else if (UDMATimingMode >= UDMA3)
-                       IDEIOConfigurationRegister |= ATAConfiguration_IDEIOConfiguration_PrimaryDevice066MhzEnable;
-
-               /* if 80 cable report */
-               UDMATimingRegister &= ~(ATAConfiguration_UDMATiming_PrimaryDevice0CycleTime);
-
-               if (UDMATimingMode == UDMA0) {
-                       UDMATimingRegister |= ATAConfiguration_UDMATiming_PrimaryDevice0CycleTime_0;
-               } else if (UDMATimingMode == UDMA1 ||
-                          UDMATimingMode == UDMA3 ||
-                          UDMATimingMode == UDMA5) {
-                       UDMATimingRegister |= ATAConfiguration_UDMATiming_PrimaryDevice0CycleTime_1;
-               } else if (UDMATimingMode == UDMA2 ||
-                          UDMATimingMode == UDMA4) {
-                       UDMATimingRegister |= ATAConfiguration_UDMATiming_PrimaryDevice0CycleTime_2;
-               }
-               break;
-       case 1:
-               UDMAControlRegister &= ~(ATAConfiguration_UDMAControl_PrimaryDevice1UDMAModeEnable);
-               if (UDMAEnable == TRUE)
-                       UDMAControlRegister |= ATAConfiguration_UDMAControl_PrimaryDevice1UDMAModeEnable;
-
-               IDEIOConfigurationRegister &= ~(ATAConfiguration_IDEIOConfiguration_PrimaryDevice166MhzEnable |
-                                               ATAConfiguration_IDEIOConfiguration_PrimaryDevice1100MhzEnable);
-
-               if (UDMATimingMode >= UDMA5)
-                       IDEIOConfigurationRegister |= ATAConfiguration_IDEIOConfiguration_PrimaryDevice1100MhzEnable;
-               else if (UDMATimingMode >= UDMA3)
-                       IDEIOConfigurationRegister |= ATAConfiguration_IDEIOConfiguration_PrimaryDevice166MhzEnable;
-
-               /* if 80 cable report */
-               UDMATimingRegister &= ~(ATAConfiguration_UDMATiming_PrimaryDevice1CycleTime);
-
-               if (UDMATimingMode == UDMA0) {
-                       UDMATimingRegister |= ATAConfiguration_UDMATiming_PrimaryDevice1CycleTime_0;
-               } else if (UDMATimingMode == UDMA1 ||
-                          UDMATimingMode == UDMA3 ||
-                          UDMATimingMode == UDMA5) {
-                       UDMATimingRegister |= ATAConfiguration_UDMATiming_PrimaryDevice1CycleTime_1;
-               } else if (UDMATimingMode == UDMA2 ||
-                          UDMATimingMode == UDMA4) {
-                       UDMATimingRegister |= ATAConfiguration_UDMATiming_PrimaryDevice1CycleTime_2;
-               }
-               break;
-       default:
-               funcresult = FALSE;
-               goto funcexit;
-               break;
-       }
-
-       result = PCIDeviceIO_WritePCIConfiguration(pdev,
-                                                  ATAConfiguration_ID_UDMAControl + ATAConfiguration_PCIOffset,
-                                                  ATAConfiguration_ID_UDMAControl_Size,
-                                                  &UDMAControlRegister);
-       if (result == FALSE) {
-               funcresult = FALSE;
-               goto funcexit;
-       }
-
-       result = PCIDeviceIO_WritePCIConfiguration(pdev,
-                                                  ATAConfiguration_ID_UDMATiming + ATAConfiguration_PCIOffset,
-                                                  ATAConfiguration_ID_UDMATiming_Size,
-                                                  &UDMATimingRegister);
-       if (result == FALSE) {
-               funcresult = FALSE;
-               goto funcexit;
-       }
-
-       result = PCIDeviceIO_WritePCIConfiguration(pdev,
-                                                  ATAConfiguration_ID_IDEIOConfiguration + ATAConfiguration_PCIOffset,
-                                                  ATAConfiguration_ID_IDEIOConfiguration_Size,
-                                                  &IDEIOConfigurationRegister);
-       if (result == FALSE) {
-               funcresult = FALSE;
-               goto funcexit;
-       }
-
-       goto funcexit;
-funcexit:
-       return funcresult;
-}
-
-static uint ATAHostAdapter_SetSecondaryUDMA(struct pci_dev *pdev, uint DeviceID,
-                                           uint UDMAEnable, uint UDMATimingMode)
-{
-       uint funcresult;
-       uint result;
-       uint UDMAControlRegister;
-       uint UDMATimingRegister;
-       ulong IDEIOConfigurationRegister;
-
-       funcresult = TRUE;
-
-       UDMAControlRegister = 0;
-       UDMATimingRegister = 0;
-       IDEIOConfigurationRegister = 0;
-
-       result = PCIDeviceIO_ReadPCIConfiguration(pdev,
-                                                 ATAConfiguration_ID_UDMAControl + ATAConfiguration_PCIOffset,
-                                                 ATAConfiguration_ID_UDMAControl_Size,
-                                                 &UDMAControlRegister);
-       if (result == FALSE) {
-               funcresult = FALSE;
-               goto funcexit;
-       }
-
-       result = PCIDeviceIO_ReadPCIConfiguration(pdev,
-                                                 ATAConfiguration_ID_UDMATiming + ATAConfiguration_PCIOffset,
-                                                 ATAConfiguration_ID_UDMATiming_Size,
-                                                 &UDMATimingRegister);
-       if (result == FALSE) {
-               funcresult = FALSE;
-               goto funcexit;
-       }
-
-       result = PCIDeviceIO_ReadPCIConfiguration(pdev,
-                                                 ATAConfiguration_ID_IDEIOConfiguration + ATAConfiguration_PCIOffset,
-                                                 ATAConfiguration_ID_IDEIOConfiguration_Size,
-                                                 &IDEIOConfigurationRegister);
-       if (result == FALSE) {
-               funcresult = FALSE;
-               goto funcexit;
-       }
-
-       /* Rom Code will determine the device cable type and ATA 100. */
-       /* IDEIOConfigurationRegister |= ATAConfiguration_IDEIOConfiguration_DeviceCable80Report; */
-       /* IDEIOConfigurationRegister |= ATAConfiguration_IDEIOConfiguration_ATA100IsSupported; */
-
-       switch (DeviceID) {
-       case 0:
-               UDMAControlRegister &= ~(ATAConfiguration_UDMAControl_SecondaryDevice0UDMAModeEnable);
-               if (UDMAEnable == TRUE)
-                       UDMAControlRegister |= ATAConfiguration_UDMAControl_SecondaryDevice0UDMAModeEnable;
-
-               IDEIOConfigurationRegister &= ~(ATAConfiguration_IDEIOConfiguration_SecondaryDevice066MhzEnable |
-                                               ATAConfiguration_IDEIOConfiguration_SecondaryDevice0100MhzEnable);
-
-               if (UDMATimingMode >= UDMA5)
-                       IDEIOConfigurationRegister |= ATAConfiguration_IDEIOConfiguration_SecondaryDevice0100MhzEnable;
-               else if (UDMATimingMode >= UDMA3)
-                       IDEIOConfigurationRegister |= ATAConfiguration_IDEIOConfiguration_SecondaryDevice066MhzEnable;
-
-               /* if 80 cable report */
-               UDMATimingRegister &= ~(ATAConfiguration_UDMATiming_SecondaryDevice0CycleTime);
-
-               if (UDMATimingMode == UDMA0) {
-                       UDMATimingRegister |= ATAConfiguration_UDMATiming_SecondaryDevice0CycleTime_0;
-               } else if (UDMATimingMode == UDMA1 ||
-                          UDMATimingMode == UDMA3 ||
-                          UDMATimingMode == UDMA5) {
-                       UDMATimingRegister |= ATAConfiguration_UDMATiming_SecondaryDevice0CycleTime_1;
-               } else if (UDMATimingMode == UDMA2 ||
-                          UDMATimingMode == UDMA4) {
-                       UDMATimingRegister |= ATAConfiguration_UDMATiming_SecondaryDevice0CycleTime_2;
-               }
-               break;
-       case 1:
-               UDMAControlRegister &= ~(ATAConfiguration_UDMAControl_SecondaryDevice1UDMAModeEnable);
-               if (UDMAEnable == TRUE)
-                       UDMAControlRegister |= ATAConfiguration_UDMAControl_SecondaryDevice1UDMAModeEnable;
-
-               IDEIOConfigurationRegister &= ~(ATAConfiguration_IDEIOConfiguration_SecondaryDevice166MhzEnable |
-                                               ATAConfiguration_IDEIOConfiguration_SecondaryDevice1100MhzEnable);
-
-               if (UDMATimingMode >= UDMA5)
-                       IDEIOConfigurationRegister |= ATAConfiguration_IDEIOConfiguration_SecondaryDevice1100MhzEnable;
-               else if (UDMATimingMode >= UDMA3)
-                       IDEIOConfigurationRegister |= ATAConfiguration_IDEIOConfiguration_SecondaryDevice166MhzEnable;
-
-               /* if 80 cable report */
-               UDMATimingRegister &= ~(ATAConfiguration_UDMATiming_SecondaryDevice1CycleTime);
-
-               if (UDMATimingMode == UDMA0) {
-                       UDMATimingRegister |= ATAConfiguration_UDMATiming_SecondaryDevice1CycleTime_0;
-               } else if (UDMATimingMode == UDMA1 ||
-                          UDMATimingMode == UDMA3 ||
-                          UDMATimingMode == UDMA5) {
-                       UDMATimingRegister |= ATAConfiguration_UDMATiming_SecondaryDevice1CycleTime_1;
-               } else if (UDMATimingMode == UDMA2 ||
-                          UDMATimingMode == UDMA4) {
-                       UDMATimingRegister |= ATAConfiguration_UDMATiming_SecondaryDevice1CycleTime_2;
-               }
-               break;
-       default:
-               funcresult = FALSE;
-               goto funcexit;
-               break;
-       }
-
-       result = PCIDeviceIO_WritePCIConfiguration(pdev,
-                                                  ATAConfiguration_ID_UDMAControl + ATAConfiguration_PCIOffset,
-                                                  ATAConfiguration_ID_UDMAControl_Size,
-                                                  &UDMAControlRegister);
-       if (result == FALSE) {
-               funcresult = FALSE;
-               goto funcexit;
-       }
-
-       result = PCIDeviceIO_WritePCIConfiguration(pdev,
-                                                  ATAConfiguration_ID_UDMATiming + ATAConfiguration_PCIOffset,
-                                                  ATAConfiguration_ID_UDMATiming_Size,
-                                                  &UDMATimingRegister);
-       if (result == FALSE) {
-               funcresult = FALSE;
-               goto funcexit;
-       }
-
-       result = PCIDeviceIO_WritePCIConfiguration(pdev,
-                                                  ATAConfiguration_ID_IDEIOConfiguration + ATAConfiguration_PCIOffset,
-                                                  ATAConfiguration_ID_IDEIOConfiguration_Size,
-                                                  &IDEIOConfigurationRegister);
-       if (result == FALSE) {
-               funcresult = FALSE;
-               goto funcexit;
-       }
-
-       goto funcexit;
-funcexit:
-       return funcresult;
-}
-
-static int rdc_pata_port_start(struct ata_port *ap)
-{
-       uint    Channel;
-
-       Channel = ap->port_no;
-       dev_dbg(ap->dev, "%s: Channel: %u\n", __func__, Channel);
-       if (ap->ioaddr.bmdma_addr) {
-               return ata_port_start(ap);
-       } else {
-               dev_dbg(ap->dev, "%s: return 0!!!\n", __func__);
-               return 0;
-       }
-}
-
-static void rdc_pata_port_stop(struct ata_port *ap)
-{
-       uint    Channel;
-
-       Channel = ap->port_no;
-
-       dev_dbg(ap->dev, "%s Channel: %u\n", __func__, Channel);
-}
-
-static int rdc_pata_prereset(struct ata_link *link, unsigned long deadline)
-{
-       struct pci_dev *pdev;
-       struct ata_port *ap;
-       uint Channel;
-
-       dev_dbg(link->ap->dev, "%s\n", __func__);
-
-       ap = link->ap;
-       pdev = to_pci_dev(ap->host->dev);
-
-       Channel = ap->port_no;
-
-       /* test ATA Decode Enable Bits, should be enable. */
-       if (!pci_test_config_bits(pdev, &ATA_Decode_Enable_Bits[Channel])) {
-               dev_dbg(link->ap->dev, "%s: Channel: %u, Decode Disable\n",
-                       __func__, Channel);
-               return -ENOENT;
-       } else {
-               dev_dbg(link->ap->dev, "%s: Channel: %u, Decode Enable\n",
-                       __func__, Channel);
-               return ata_std_prereset(link, deadline);
-       }
-}
-
-static int rdc_pata_cable_detect(struct ata_port *ap)
-{
-       struct pci_dev *pdev;
-       uint Channel;
-       uint Mask;
-       u32 u32Value;
-
-       dev_dbg(ap->dev, "%s\n", __func__);
-
-       pdev = to_pci_dev(ap->host->dev);
-
-       Channel = ap->port_no;
-
-       if (Channel == 0)
-               Mask = ATAConfiguration_IDEIOConfiguration_PrimaryDeviceCable80Report;
-       else
-               Mask = ATAConfiguration_IDEIOConfiguration_SecondaryDeviceCable80Report;
-
-       /* check BIOS cable detect results */
-       pci_read_config_dword(pdev, ATAConfiguration_ID_IDEIOConfiguration + ATAConfiguration_PCIOffset, &u32Value);
-
-       if ((u32Value & Mask) == 0) {
-               dev_dbg(ap->dev, "%s: Channel: %u, PATA40 \n",
-                       __func__, Channel);
-               return ATA_CBL_PATA40;
-       } else {
-               dev_dbg(ap->dev, "%s: Channel: %u, PATA80 \n",
-                       __func__, Channel);
-               return ATA_CBL_PATA80;
-       }
-}
-
-static void rdc_pata_set_piomode(struct ata_port *ap, struct ata_device *adev)
-{
-       struct pci_dev *pdev;
-       uint    Channel;
-       uint    DeviceID;
-       uint    PIOTimingMode;
-       uint    PrefetchPostingEnable;
-
-       dev_dbg(ap->dev, "%s\n", __func__);
-
-       pdev = to_pci_dev(ap->host->dev);
-
-       Channel = ap->port_no;
-       DeviceID = adev->devno;
-       /*
-        * piomode = 0, 1, 2, 3... ; adev->pio_mode = XFER_PIO_0, XFER_PIO_1,
-        * XFER_PIO_2, XFER_PIO_3...
-        */
-       PIOTimingMode = adev->pio_mode - XFER_PIO_0;
-
-       if (adev->class == ATA_DEV_ATA) {
-               PrefetchPostingEnable = TRUE;
-       } else {
-               /* ATAPI, CD DVD Rom */
-               PrefetchPostingEnable = FALSE;
-       }
-
-       /* PIO configuration clears DTE unconditionally.  It will be
-        * programmed in set_dmamode which is guaranteed to be called
-        * after set_piomode if any DMA mode is available.
-        */
-
-       /* Ensure the UDMA bit is off - it will be turned back on if UDMA is
-        * selected */
-
-       if (Channel == 0) {
-               ATAHostAdapter_SetPrimaryPIO(
-                   pdev,
-                   DeviceID,
-                   PIOTimingMode,
-                   TRUE,
-                   PrefetchPostingEnable
-                   );
-
-               ATAHostAdapter_SetPrimaryUDMA(
-                   pdev,
-                   DeviceID,
-                   FALSE,
-                   UDMA0
-                   );
-       } else {
-               ATAHostAdapter_SetSecondaryPIO(
-                   pdev,
-                   DeviceID,
-                   PIOTimingMode,
-                   TRUE,
-                   PrefetchPostingEnable
-                   );
-
-               ATAHostAdapter_SetSecondaryUDMA(
-                   pdev,
-                   DeviceID,
-                   FALSE,
-                   UDMA0
-                   );
-       }
-       dev_dbg(ap->dev, "%s: Channel: %u, DeviceID: %u, PIO: %d\n",
-               __func__, Channel, DeviceID, PIOTimingMode);
-}
-
-static void rdc_pata_set_dmamode(struct ata_port *ap, struct ata_device *adev)
-{
-       struct pci_dev *pdev;
-       uint    Channel;
-       uint    DeviceID;
-       uint    PIOTimingMode;
-       uint    PrefetchPostingEnable;
-       uint    DMATimingMode;
-       uint    UDMAEnable;
-
-       dev_dbg(ap->dev, "%s\n", __func__);
-
-       pdev = to_pci_dev(ap->host->dev);
-
-       Channel = ap->port_no;
-       DeviceID = adev->devno;
-       PIOTimingMode = adev->pio_mode - XFER_PIO_0;  /* piomode = 0, 1, 2, 3... ; adev->pio_mode = XFER_PIO_0, XFER_PIO_1, XFER_PIO_2, XFER_PIO_3... */
-       DMATimingMode = adev->dma_mode; /* UDMA or MDMA */
-
-       if (adev->class == ATA_DEV_ATA) {
-               PrefetchPostingEnable = TRUE;
-       } else {
-               /* ATAPI, CD DVD Rom */
-               PrefetchPostingEnable = FALSE;
-       }
-
-       if (ap->udma_mask == 0) {
-               /* ata_port dont support udma. depend on hardware spec. */
-               UDMAEnable = FALSE;
-       } else {
-               UDMAEnable = TRUE;
-       }
-
-       if (Channel == 0) {
-               if (DMATimingMode >= XFER_UDMA_0) {
-                       /* UDMA */
-                       ATAHostAdapter_SetPrimaryPIO(pdev,
-                               DeviceID,
-                               PIOTimingMode,
-                               TRUE,
-                               PrefetchPostingEnable);
-
-                       ATAHostAdapter_SetPrimaryUDMA(pdev,
-                               DeviceID,
-                               UDMAEnable,
-                               DMATimingMode - XFER_UDMA_0);
-                       dev_dbg(ap->dev,
-                               "%s: Channel: %u, DeviceID: %u, UDMA: %u\n",
-                               __func__, Channel, DeviceID,
-                               (uint)(DMATimingMode - XFER_UDMA_0));
-               } else {
-                       /* MDMA */
-                       ATAHostAdapter_SetPrimaryPIO(pdev,
-                               DeviceID,
-                               (DMATimingMode - XFER_MW_DMA_0) + PIO2, /* MDMA0 = PIO2 */
-                               TRUE,
-                               PrefetchPostingEnable);
-
-                       ATAHostAdapter_SetPrimaryUDMA(pdev,
-                               DeviceID,
-                               FALSE,
-                               UDMA0);
-                       dev_dbg(ap->dev,
-                               "%s: Channel: %u, DeviceID: %u, MDMA: %u\n",
-                               __func__, Channel, DeviceID,
-                               (uint)(DMATimingMode - XFER_MW_DMA_0));
-               }
-       } else {
-               if (DMATimingMode >= XFER_UDMA_0) {
-                       /* UDMA */
-                       ATAHostAdapter_SetSecondaryPIO(pdev,
-                               DeviceID,
-                               PIOTimingMode,
-                               TRUE,
-                               PrefetchPostingEnable);
-
-                       ATAHostAdapter_SetSecondaryUDMA(pdev,
-                               DeviceID,
-                               UDMAEnable,
-                               DMATimingMode - XFER_UDMA_0);
-                       dev_dbg(ap->dev,
-                               "%s: Channel: %u, DeviceID: %u, UDMA: %u\n",
-                               __func__, Channel, DeviceID,
-                               (uint)(DMATimingMode - XFER_UDMA_0));
-               } else {
-                       /* MDMA */
-                       ATAHostAdapter_SetSecondaryPIO(pdev,
-                               DeviceID,
-                               (DMATimingMode - XFER_MW_DMA_0) + PIO2, /* MDMA0 = PIO2 */
-                               TRUE,
-                               PrefetchPostingEnable);
-
-                       ATAHostAdapter_SetSecondaryUDMA(pdev,
-                               DeviceID,
-                               FALSE,
-                               UDMA0);
-                       dev_dbg(ap->dev,
-                               "%s: Channel: %u, DeviceID: %u, MDMA: %u \n",
-                               __func__, Channel, DeviceID,
-                               (uint)(DMATimingMode - XFER_MW_DMA_0));
-               }
-       }
-}
-
-static struct scsi_host_template rdc_pata_sht = {
-       ATA_BMDMA_SHT(KBUILD_MODNAME),
-};
-
-static struct ata_port_operations rdc_pata_ops = {
-       .inherits       = &ata_bmdma_port_ops,
-
-       .port_start     = rdc_pata_port_start,
-       .port_stop      = rdc_pata_port_stop,
-       .prereset       = rdc_pata_prereset,
-       .cable_detect   = rdc_pata_cable_detect,
-       .set_piomode    = rdc_pata_set_piomode,
-       .set_dmamode    = rdc_pata_set_dmamode,
-};
-
-static struct ata_port_info rdc_pata_port_info[] = {
-       [RDC_17F31011] = {
-       .flags          = ATA_FLAG_SLAVE_POSS,
-       .pio_mask       = 0x1f,         /* pio0-4 */
-       .mwdma_mask     = 0x07,         /* mwdma0-2 */
-       .udma_mask      = ATA_UDMA5,    /* udma0-5 */
-       .port_ops       = &rdc_pata_ops,
-       },
-
-       [RDC_17F31012] = {
-       .flags          = ATA_FLAG_SLAVE_POSS,
-       .pio_mask       = 0x1f,         /* pio0-4 */
-       .mwdma_mask     = 0x07,         /* mwdma0-2 */
-       .udma_mask      = ATA_UDMA5,    /* udma0-5 */
-       .port_ops       = &rdc_pata_ops,
-       },
-};
-
-static int __devinit rdc_init_one(struct pci_dev *pdev,
-                                 const struct pci_device_id *ent)
-{
-       struct ata_port_info port_info[2];
-       const struct ata_port_info *ppinfo[] = { &port_info[0], &port_info[1] };
-
-       int rc;
-
-       dev_dbg(&pdev->dev, "%s\n", __func__);
-
-       port_info[0] = rdc_pata_port_info[ent->driver_data];
-       port_info[1] = rdc_pata_port_info[ent->driver_data];
-
-       rc = pci_enable_device(pdev);
-       if (rc) {
-               dev_dbg(&pdev->dev, "%s pci_enable_device failed\n", __func__);
-               return rc;
-       }
-       pci_intx(pdev, 1);
-
-       return ata_pci_sff_init_one(pdev, ppinfo, &rdc_pata_sht, NULL);
-}
-
-static struct pci_driver rdc_pata_driver = {
-       .name           = KBUILD_MODNAME,
-       .id_table       = rdc_pata_id_table,
-       .probe          = rdc_init_one,
-       .remove         = ata_pci_remove_one,
-#ifdef CONFIG_PM
-       .suspend        = ata_pci_device_suspend,
-       .resume         = ata_pci_device_resume,
-#endif
-};
-
-static int __init pata_rdc_init(void)
-{
-       return pci_register_driver(&rdc_pata_driver);
-}
-
-static void __exit pata_rdc_exit(void)
-{
-       pci_unregister_driver(&rdc_pata_driver);
-}
-
-module_init(pata_rdc_init);
-module_exit(pata_rdc_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("RDC PCI IDE Driver");
diff --git a/drivers/staging/pata_rdc/pata_rdc.h b/drivers/staging/pata_rdc/pata_rdc.h
deleted file mode 100644 (file)
index a833339..0000000
+++ /dev/null
@@ -1,144 +0,0 @@
-#ifndef pata_rdc_H
-#define pata_rdc_H
-
-#ifndef TRUE
-#define TRUE   1
-#endif
-
-#ifndef FALSE
-#define FALSE  0
-#endif
-
-/* ATA Configuration Register ID offset address size */
-#define ATAConfiguration_PCIOffset                     0x40
-#define ATAConfiguration_ID_PrimaryTiming              0x00
-#define ATAConfiguration_ID_SecondaryTiming            0x02
-#define ATAConfiguration_ID_Device1Timing              0x04
-#define ATAConfiguration_ID_UDMAControl                        0x08
-#define ATAConfiguration_ID_UDMATiming                 0x0A
-#define ATAConfiguration_ID_IDEIOConfiguration         0x14
-
-#define ATAConfiguration_ID_PrimaryTiming_Size         2
-#define ATAConfiguration_ID_SecondaryTiming_Size       2
-#define ATAConfiguration_ID_Device1Timing_Size         1
-#define ATAConfiguration_ID_UDMAControl_Size           1
-#define ATAConfiguration_ID_UDMATiming_Size            2
-#define ATAConfiguration_ID_IDEIOConfiguration_Size    4
-
-/* ATA Configuration Register bit define */
-#define ATAConfiguration_PrimaryTiming_Device0FastTimingEnable         0x0001
-#define ATAConfiguration_PrimaryTiming_Device0IORDYSampleModeEnable    0x0002  /* PIO 3 or greater */
-#define ATAConfiguration_PrimaryTiming_Device0PrefetchandPostingEnable 0x0004  /* PIO 2 or greater */
-#define ATAConfiguration_PrimaryTiming_Device0DMATimingEnable          0x0008
-#define ATAConfiguration_PrimaryTiming_Device1FastTimingEnable         0x0010
-#define ATAConfiguration_PrimaryTiming_Device1IORDYSampleModeEnable    0x0020  /* PIO 3 or greater */
-#define ATAConfiguration_PrimaryTiming_Device1PrefetchandPostingEnable 0x0040  /* PIO 2 or greater */
-#define ATAConfiguration_PrimaryTiming_Device1DMATimingEnable          0x0080
-#define ATAConfiguration_PrimaryTiming_Device0RecoveryMode             0x0300
-#define ATAConfiguration_PrimaryTiming_Device0RecoveryMode_0           0x0000  /* PIO 0, PIO 2, MDMA 0 */
-#define ATAConfiguration_PrimaryTiming_Device0RecoveryMode_1           0x0100  /* PIO 3, MDMA 1 */
-#define ATAConfiguration_PrimaryTiming_Device0RecoveryMode_2           0x0200  /* X */
-#define ATAConfiguration_PrimaryTiming_Device0RecoveryMode_3           0x0300  /* PIO 4, MDMA 2 */
-#define ATAConfiguration_PrimaryTiming_Device0IORDYSampleMode          0x3000
-#define ATAConfiguration_PrimaryTiming_Device0IORDYSampleMode_0                0x0000  /* PIO 0 */
-#define ATAConfiguration_PrimaryTiming_Device0IORDYSampleMode_1                0x1000  /* PIO 2, MDMA 0 */
-#define ATAConfiguration_PrimaryTiming_Device0IORDYSampleMode_2                0x2000  /* PIO 3, PIO 4, MDMA 1, MDMA 2 */
-#define ATAConfiguration_PrimaryTiming_Device0IORDYSampleMode_3                0x3000  /* X */
-#define ATAConfiguration_PrimaryTiming_Device1TimingRegisterEnable     0x4000
-#define ATAConfiguration_PrimaryTiming_IDEDecodeEnable                 0x8000
-
-#define ATAConfiguration_Device1Timing_PrimaryRecoveryMode             0x0003
-#define ATAConfiguration_Device1Timing_PrimaryRecoveryMode_0           0x0000
-#define ATAConfiguration_Device1Timing_PrimaryRecoveryMode_1           0x0001
-#define ATAConfiguration_Device1Timing_PrimaryRecoveryMode_2           0x0002
-#define ATAConfiguration_Device1Timing_PrimaryRecoveryMode_3           0x0003
-#define ATAConfiguration_Device1Timing_PrimaryIORDYSampleMode          0x000C
-#define ATAConfiguration_Device1Timing_PrimaryIORDYSampleMode_0                0x0000
-#define ATAConfiguration_Device1Timing_PrimaryIORDYSampleMode_1                0x0004
-#define ATAConfiguration_Device1Timing_PrimaryIORDYSampleMode_2                0x0008
-#define ATAConfiguration_Device1Timing_PrimaryIORDYSampleMode_3                0x000C
-#define ATAConfiguration_Device1Timing_SecondaryRecoveryMode           0x0030
-#define ATAConfiguration_Device1Timing_SecondaryRecoveryMode_0         0x0000
-#define ATAConfiguration_Device1Timing_SecondaryRecoveryMode_1         0x0010
-#define ATAConfiguration_Device1Timing_SecondaryRecoveryMode_2         0x0020
-#define ATAConfiguration_Device1Timing_SecondaryRecoveryMode_3         0x0030
-#define ATAConfiguration_Device1Timing_SecondaryIORDYSampleMode                0x00C0
-#define ATAConfiguration_Device1Timing_SecondaryIORDYSampleMode_0      0x0000
-#define ATAConfiguration_Device1Timing_SecondaryIORDYSampleMode_1      0x0040
-#define ATAConfiguration_Device1Timing_SecondaryIORDYSampleMode_2      0x0080
-#define ATAConfiguration_Device1Timing_SecondaryIORDYSampleMode_3      0x00C0
-
-#define ATAConfiguration_UDMAControl_PrimaryDevice0UDMAModeEnable      0x0001
-#define ATAConfiguration_UDMAControl_PrimaryDevice1UDMAModeEnable      0x0002
-#define ATAConfiguration_UDMAControl_SecondaryDevice0UDMAModeEnable    0x0004
-#define ATAConfiguration_UDMAControl_SecondaryDevice1UDMAModeEnable    0x0008
-
-#define ATAConfiguration_UDMATiming_PrimaryDevice0CycleTime            0x0003
-#define ATAConfiguration_UDMATiming_PrimaryDevice0CycleTime_0          0x0000  /* UDMA 0 */
-#define ATAConfiguration_UDMATiming_PrimaryDevice0CycleTime_1          0x0001  /* UDMA 1, UDMA 3, UDMA 5 */
-#define ATAConfiguration_UDMATiming_PrimaryDevice0CycleTime_2          0x0002  /* UDMA 2, UDMA 4 */
-#define ATAConfiguration_UDMATiming_PrimaryDevice0CycleTime_3          0x0003  /* X */
-#define ATAConfiguration_UDMATiming_PrimaryDevice1CycleTime            0x0030
-#define ATAConfiguration_UDMATiming_PrimaryDevice1CycleTime_0          0x0000  /* UDMA 0 */
-#define ATAConfiguration_UDMATiming_PrimaryDevice1CycleTime_1          0x0010  /* UDMA 1, UDMA 3, UDMA 5 */
-#define ATAConfiguration_UDMATiming_PrimaryDevice1CycleTime_2          0x0020  /* UDMA 2, UDMA 4 */
-#define ATAConfiguration_UDMATiming_PrimaryDevice1CycleTime_3          0x0030  /* X */
-#define ATAConfiguration_UDMATiming_SecondaryDevice0CycleTime          0x0300
-#define ATAConfiguration_UDMATiming_SecondaryDevice0CycleTime_0                0x0000  /* UDMA 0 */
-#define ATAConfiguration_UDMATiming_SecondaryDevice0CycleTime_1                0x0100  /* UDMA 1, UDMA 3, UDMA 5 */
-#define ATAConfiguration_UDMATiming_SecondaryDevice0CycleTime_2                0x0200  /* UDMA 2, UDMA 4 */
-#define ATAConfiguration_UDMATiming_SecondaryDevice0CycleTime_3                0x0300  /* X */
-#define ATAConfiguration_UDMATiming_SecondaryDevice1CycleTime          0x3000
-#define ATAConfiguration_UDMATiming_SecondaryDevice1CycleTime_0                0x0000  /* UDMA 0 */
-#define ATAConfiguration_UDMATiming_SecondaryDevice1CycleTime_1                0x1000  /* UDMA 1, UDMA 3, UDMA 5 */
-#define ATAConfiguration_UDMATiming_SecondaryDevice1CycleTime_2                0x2000  /* UDMA 2, UDMA 4 */
-#define ATAConfiguration_UDMATiming_SecondaryDevice1CycleTime_3                0x3000  /* X */
-
-#define ATAConfiguration_IDEIOConfiguration_PrimaryDevice066MhzEnable          0x00000001      /* UDMA 3, UDMA 4 */
-#define ATAConfiguration_IDEIOConfiguration_PrimaryDevice166MhzEnable          0x00000002
-#define ATAConfiguration_IDEIOConfiguration_SecondaryDevice066MhzEnable                0x00000004
-#define ATAConfiguration_IDEIOConfiguration_SecondaryDevice166MhzEnable                0x00000008
-#define ATAConfiguration_IDEIOConfiguration_DeviceCable80Report                        0x000000F0
-#define ATAConfiguration_IDEIOConfiguration_PrimaryDeviceCable80Report         0x00000030
-#define ATAConfiguration_IDEIOConfiguration_PrimaryDevice0Cable80Report                0x00000010      /* UDMA 3, UDMA 4, UDMA 5 */
-#define ATAConfiguration_IDEIOConfiguration_PrimaryDevice1Cable80Report                0x00000020
-#define ATAConfiguration_IDEIOConfiguration_SecondaryDeviceCable80Report       0x000000C0
-#define ATAConfiguration_IDEIOConfiguration_SecondaryDevice0Cable80Report      0x00000040
-#define ATAConfiguration_IDEIOConfiguration_SecondaryDevice1Cable80Report      0x00000080
-#define ATAConfiguration_IDEIOConfiguration_PrimaryDevice0100MhzEnable         0x00001000      /* UDMA 5 */
-#define ATAConfiguration_IDEIOConfiguration_PrimaryDevice1100MhzEnable         0x00002000
-#define ATAConfiguration_IDEIOConfiguration_SecondaryDevice0100MhzEnable       0x00004000
-#define ATAConfiguration_IDEIOConfiguration_SecondaryDevice1100MhzEnable       0x00008000
-#define ATAConfiguration_IDEIOConfiguration_ATA100IsSupported                  0x00F00000
-
-enum _PIOTimingMode {
-       PIO0 = 0,
-       PIO1,
-       PIO2,   /* MDMA 0 */
-       PIO3,   /* MDMA 1 */
-       PIO4    /* MDMA 2 */
-};
-
-enum _DMATimingMode {
-       MDMA0 = 0,
-       MDMA1,
-       MDMA2
-};
-
-enum _UDMATimingMode {
-       UDMA0 = 0,
-       UDMA1,
-       UDMA2,
-       UDMA3,
-       UDMA4,
-       UDMA5
-};
-
-
-enum rdc_controller_ids {
-       /* controller IDs */
-       RDC_17F31011,
-       RDC_17F31012
-};
-
-#endif