Re: [PATCH 2.6.11-rc2 14/14] ide_pci: Merges serverworks.h into serverworks.c
14_ide_pci_serverworks_merge.patch Merges ide/pci/serverworks.h into serverworks.c. Signed-off-by: Tejun Heo <[EMAIL PROTECTED]> Index: linux-idepci-export/drivers/ide/pci/serverworks.c === --- linux-idepci-export.orig/drivers/ide/pci/serverworks.c 2005-02-04 16:07:36.271461827 +0900 +++ linux-idepci-export/drivers/ide/pci/serverworks.c 2005-02-04 16:08:27.019196797 +0900 @@ -39,7 +39,20 @@ #include -#include "serverworks.h" +#undef SVWKS_DEBUG_DRIVE_INFO + +#define SVWKS_CSB5_REVISION_NEW0x92 /* min PCI_REVISION_ID for UDMA5 (A2.0) */ +#define SVWKS_CSB6_REVISION0xa0 /* min PCI_REVISION_ID for UDMA4 (A1.0) */ + +/* Seagate Barracuda ATA IV Family drives in UDMA mode 5 + * can overrun their FIFOs when used with the CSB5 */ +static const char *svwks_bad_ata100[] = { + "ST320011A", + "ST340016A", + "ST360021A", + "ST380021A", + NULL +}; static u8 svwks_revision = 0; static struct pci_dev *isa_dev; @@ -582,6 +595,48 @@ static int __init init_setup_csb6 (struc return ide_setup_pci_device(dev, d); } +/* + * Table of the various serverworks capability blocks + */ + +static ide_pci_device_t serverworks_chipsets[] __devinitdata = { + { /* 0 */ + .name = "SvrWks OSB4", + .init_setup = init_setup_svwks, + .init_chipset = init_chipset_svwks, + .init_hwif = init_hwif_svwks, + .channels = 2, + .autodma= AUTODMA, + .bootable = ON_BOARD, + },{ /* 1 */ + .name = "SvrWks CSB5", + .init_setup = init_setup_svwks, + .init_chipset = init_chipset_svwks, + .init_hwif = init_hwif_svwks, + .init_dma = init_dma_svwks, + .channels = 2, + .autodma= AUTODMA, + .bootable = ON_BOARD, + },{ /* 2 */ + .name = "SvrWks CSB6", + .init_setup = init_setup_csb6, + .init_chipset = init_chipset_svwks, + .init_hwif = init_hwif_svwks, + .init_dma = init_dma_svwks, + .channels = 2, + .autodma= AUTODMA, + .bootable = ON_BOARD, + },{ /* 3 */ + .name = "SvrWks CSB6", + .init_setup = init_setup_csb6, + .init_chipset = init_chipset_svwks, + .init_hwif = init_hwif_svwks, + .init_dma = init_dma_svwks, + .channels = 1,/* 2 */ + .autodma= AUTODMA, + .bootable = ON_BOARD, + } +}; /** * svwks_init_one - called when a OSB/CSB is found Index: linux-idepci-export/drivers/ide/pci/serverworks.h === --- linux-idepci-export.orig/drivers/ide/pci/serverworks.h 2005-02-04 16:08:26.831227410 +0900 +++ /dev/null 1970-01-01 00:00:00.0 + @@ -1,67 +0,0 @@ - -#ifndef SERVERWORKS_H -#define SERVERWORKS_H - -#include -#include -#include - -#define SVWKS_CSB5_REVISION_NEW0x92 /* min PCI_REVISION_ID for UDMA5 (A2.0) */ -#define SVWKS_CSB6_REVISION0xa0 /* min PCI_REVISION_ID for UDMA4 (A1.0) */ - -/* Seagate Barracuda ATA IV Family drives in UDMA mode 5 - * can overrun their FIFOs when used with the CSB5 */ -static const char *svwks_bad_ata100[] = { - "ST320011A", - "ST340016A", - "ST360021A", - "ST380021A", - NULL -}; - -static int init_setup_svwks(struct pci_dev *, ide_pci_device_t *); -static int init_setup_csb6(struct pci_dev *, ide_pci_device_t *); -static unsigned int init_chipset_svwks(struct pci_dev *, const char *); -static void init_hwif_svwks(ide_hwif_t *); -static void init_dma_svwks(ide_hwif_t *, unsigned long); - -static ide_pci_device_t serverworks_chipsets[] __devinitdata = { - { /* 0 */ - .name = "SvrWks OSB4", - .init_setup = init_setup_svwks, - .init_chipset = init_chipset_svwks, - .init_hwif = init_hwif_svwks, - .channels = 2, - .autodma= AUTODMA, - .bootable = ON_BOARD, - },{ /* 1 */ - .name = "SvrWks CSB5", - .init_setup = init_setup_svwks, - .init_chipset = init_chipset_svwks, - .init_hwif = init_hwif_svwks, - .init_dma = init_dma_svwks, - .channels = 2, - .autodma= AUTODMA, - .bootable = ON_BOARD, - },{ /* 2 */ - .name = "SvrWks CSB6", -
Re: [PATCH 2.6.11-rc2 14/14] ide_pci: Merges serverworks.h into serverworks.c
14_ide_pci_serverworks_merge.patch Merges ide/pci/serverworks.h into serverworks.c. Signed-off-by: Tejun Heo [EMAIL PROTECTED] Index: linux-idepci-export/drivers/ide/pci/serverworks.c === --- linux-idepci-export.orig/drivers/ide/pci/serverworks.c 2005-02-04 16:07:36.271461827 +0900 +++ linux-idepci-export/drivers/ide/pci/serverworks.c 2005-02-04 16:08:27.019196797 +0900 @@ -39,7 +39,20 @@ #include asm/io.h -#include serverworks.h +#undef SVWKS_DEBUG_DRIVE_INFO + +#define SVWKS_CSB5_REVISION_NEW0x92 /* min PCI_REVISION_ID for UDMA5 (A2.0) */ +#define SVWKS_CSB6_REVISION0xa0 /* min PCI_REVISION_ID for UDMA4 (A1.0) */ + +/* Seagate Barracuda ATA IV Family drives in UDMA mode 5 + * can overrun their FIFOs when used with the CSB5 */ +static const char *svwks_bad_ata100[] = { + ST320011A, + ST340016A, + ST360021A, + ST380021A, + NULL +}; static u8 svwks_revision = 0; static struct pci_dev *isa_dev; @@ -582,6 +595,48 @@ static int __init init_setup_csb6 (struc return ide_setup_pci_device(dev, d); } +/* + * Table of the various serverworks capability blocks + */ + +static ide_pci_device_t serverworks_chipsets[] __devinitdata = { + { /* 0 */ + .name = SvrWks OSB4, + .init_setup = init_setup_svwks, + .init_chipset = init_chipset_svwks, + .init_hwif = init_hwif_svwks, + .channels = 2, + .autodma= AUTODMA, + .bootable = ON_BOARD, + },{ /* 1 */ + .name = SvrWks CSB5, + .init_setup = init_setup_svwks, + .init_chipset = init_chipset_svwks, + .init_hwif = init_hwif_svwks, + .init_dma = init_dma_svwks, + .channels = 2, + .autodma= AUTODMA, + .bootable = ON_BOARD, + },{ /* 2 */ + .name = SvrWks CSB6, + .init_setup = init_setup_csb6, + .init_chipset = init_chipset_svwks, + .init_hwif = init_hwif_svwks, + .init_dma = init_dma_svwks, + .channels = 2, + .autodma= AUTODMA, + .bootable = ON_BOARD, + },{ /* 3 */ + .name = SvrWks CSB6, + .init_setup = init_setup_csb6, + .init_chipset = init_chipset_svwks, + .init_hwif = init_hwif_svwks, + .init_dma = init_dma_svwks, + .channels = 1,/* 2 */ + .autodma= AUTODMA, + .bootable = ON_BOARD, + } +}; /** * svwks_init_one - called when a OSB/CSB is found Index: linux-idepci-export/drivers/ide/pci/serverworks.h === --- linux-idepci-export.orig/drivers/ide/pci/serverworks.h 2005-02-04 16:08:26.831227410 +0900 +++ /dev/null 1970-01-01 00:00:00.0 + @@ -1,67 +0,0 @@ - -#ifndef SERVERWORKS_H -#define SERVERWORKS_H - -#include linux/config.h -#include linux/pci.h -#include linux/ide.h - -#define SVWKS_CSB5_REVISION_NEW0x92 /* min PCI_REVISION_ID for UDMA5 (A2.0) */ -#define SVWKS_CSB6_REVISION0xa0 /* min PCI_REVISION_ID for UDMA4 (A1.0) */ - -/* Seagate Barracuda ATA IV Family drives in UDMA mode 5 - * can overrun their FIFOs when used with the CSB5 */ -static const char *svwks_bad_ata100[] = { - ST320011A, - ST340016A, - ST360021A, - ST380021A, - NULL -}; - -static int init_setup_svwks(struct pci_dev *, ide_pci_device_t *); -static int init_setup_csb6(struct pci_dev *, ide_pci_device_t *); -static unsigned int init_chipset_svwks(struct pci_dev *, const char *); -static void init_hwif_svwks(ide_hwif_t *); -static void init_dma_svwks(ide_hwif_t *, unsigned long); - -static ide_pci_device_t serverworks_chipsets[] __devinitdata = { - { /* 0 */ - .name = SvrWks OSB4, - .init_setup = init_setup_svwks, - .init_chipset = init_chipset_svwks, - .init_hwif = init_hwif_svwks, - .channels = 2, - .autodma= AUTODMA, - .bootable = ON_BOARD, - },{ /* 1 */ - .name = SvrWks CSB5, - .init_setup = init_setup_svwks, - .init_chipset = init_chipset_svwks, - .init_hwif = init_hwif_svwks, - .init_dma = init_dma_svwks, - .channels = 2, - .autodma= AUTODMA, - .bootable = ON_BOARD, - },{ /* 2 */ - .name = SvrWks CSB6, -