From: Tejun Heo <tj@home-tj.org>
To: bzolnier@gmail.com, linux-ide@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH REPOST 2.6.11-rc2 14/14] ide_pci: Merges serverworks.h into serverworks.c
Date: Sat, 5 Feb 2005 09:01:36 +0900 [thread overview]
Message-ID: <20050205000136.GA2420@htj.dyndns.org> (raw)
In-Reply-To: <20050204071319.0ED0E132703@htj.dyndns.org>
Sorry, the original #14 added back SVWKS_DEBUG_DRIVE_INFO which #13
removed. This is the regenerated patch.
14_ide_pci_serverworks_merge.patch
Merges ide/pci/serverworks.h into serverworks.c.
Signed-off-by: Tejun Heo <tj@home-tj.org>
Index: linux-idepci-export/drivers/ide/pci/serverworks.c
===================================================================
--- linux-idepci-export.orig/drivers/ide/pci/serverworks.c 2005-02-05 08:56:34.184740697 +0900
+++ linux-idepci-export/drivers/ide/pci/serverworks.c 2005-02-05 08:57:24.673562622 +0900
@@ -39,7 +39,18 @@
#include <asm/io.h>
-#include "serverworks.h"
+#define SVWKS_CSB5_REVISION_NEW 0x92 /* min PCI_REVISION_ID for UDMA5 (A2.0) */
+#define SVWKS_CSB6_REVISION 0xa0 /* 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 +593,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-05 08:57:24.477594365 +0900
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -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_NEW 0x92 /* min PCI_REVISION_ID for UDMA5 (A2.0) */
-#define SVWKS_CSB6_REVISION 0xa0 /* 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",
- .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,
- }
-};
-
-#endif /* SERVERWORKS_H */
next prev parent reply other threads:[~2005-02-05 0:04 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-02-04 7:11 [PATCH 2.6.11-rc2] ide_pci: cleanup ide pci drivers and merges .h files into .c files Tejun Heo
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 02/14] ide_pci: Merges aec62xx.h into aec62xx.c Tejun Heo
2005-02-06 0:12 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 03/14] ide_pci: Merges cmd64x.h into cmd64x.c Tejun Heo
2005-02-06 0:20 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 01/14] ide_pci: Remove lousy macros from aec62xx Tejun Heo
2005-02-06 0:01 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 04/14] ide_pci: Merges cy82c693.h into cy82c693.c Tejun Heo
2005-02-06 0:32 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 05/14] ide_pci: Merges generic.h into generic.c Tejun Heo
2005-02-06 0:58 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 08/14] ide_pci: Merges opti621.h into opti621.c Tejun Heo
2005-02-06 2:00 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 07/14] ide_pci: Merges it8172.h into it8172.c Tejun Heo
2005-02-06 1:55 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 09/14] ide_pci: Merges pdc202xx_new.h into pdc202xx_new.c Tejun Heo
2005-02-06 2:13 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 06/14] ide_pci: Merges hpt366.h into hpt366.c Tejun Heo
2005-02-06 1:44 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 13/14] ide_pci: Removes unused SVWKS_DEBUG_DRIVE_INFO Tejun Heo
2005-02-06 13:05 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 14/14] ide_pci: Merges serverworks.h into serverworks.c Tejun Heo
2005-02-05 0:01 ` Tejun Heo [this message]
2005-02-06 13:13 ` [PATCH REPOST " Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 10/14] ide_pci: Removes SPLIT_BYTE macro from pdc202xx_old Tejun Heo
2005-02-06 2:22 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 11/14] ide_pci: Merges pdc202xx_old.h into pdc202xx_old.c Tejun Heo
2005-02-06 12:53 ` Bartlomiej Zolnierkiewicz
2005-02-04 7:13 ` [PATCH 2.6.11-rc2 12/14] ide_pci: Merges piix.h into piix.c Tejun Heo
2005-02-06 13:02 ` Bartlomiej Zolnierkiewicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050205000136.GA2420@htj.dyndns.org \
--to=tj@home-tj.org \
--cc=bzolnier@gmail.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®