Build the functionality of the wdc_p hack into the ide_pci.c code.

All it did was match a specific device ID and turn on a quirk for
the wdc driver.

Incidently, at line 1462 there is a return that prevents the generic
ide_pci code from trying to look at the device.  I'd be interested
to know if we can take out the return and let the generic code "see" it.
I've left the return in because that's the way it worked before.

(Be sure to rerun config after cvsup or you'll get undefined files!)

3 files changed, 6 insertions, 28 deletions

diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index d1aa3ee..fdf1fa6 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.191 1999/04/02 13:58:24 phk Exp $
+ *	$Id: wd.c,v 1.192 1999/04/13 19:38:11 peter Exp $
  */
 
 /* TODO:
@@ -94,7 +94,6 @@
 #include <vm/pmap.h>
 
 #include <i386/isa/atapi.h>
-#include <i386/isa/wdc_p.h>
 
 extern void wdstart(int ctrlr);
 
@@ -268,7 +267,7 @@ static int      eide_quirks;
 /*
  *  Here we use the pci-subsystem to find out, whether there is
  *  a cmd640b-chip attached on this pci-bus. This public routine
- *  will be called by wdc_p.c .
+ *  will be called by ide_pci.c
  */
 
 void
diff --git a/sys/i386/isa/wdc_p.h b/sys/i386/isa/wdc_p.h
deleted file mode 100644
index 4ef4b56..0000000
--- a/sys/i386/isa/wdc_p.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *
- * Copyright (c) 1996 Wolfgang Helbig <helbig@ba-stuttgart.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice immediately at the beginning of the file, without modification,
- *    this list of conditions, and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Absolutely no warranty of function or purpose is made by the author.
- * 4. Modifications may be freely made to this file if the above conditions
- *    are met.
- *
- *	$Id$
- */
-
-#define Q_CMD640B	0x00000001 /* CMD640B quirk: serialize IDE channels */
-
-void wdc_pci(int quirks);
diff --git a/sys/i386/isa/wdreg.h b/sys/i386/isa/wdreg.h
index 88a0fec..6885d8b 100644
--- a/sys/i386/isa/wdreg.h
+++ b/sys/i386/isa/wdreg.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wdreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: wdreg.h,v 1.24 1999/01/12 01:04:38 eivind Exp $
+ *	$Id: wdreg.h,v 1.25 1999/01/17 05:46:24 bde Exp $
  */
 
 /*
@@ -310,6 +310,9 @@ struct wddma {
 #define	WDDMA_UDMA1	0x41
 #define	WDDMA_UDMA2	0x42
 
+#define Q_CMD640B       0x00000001 /* CMD640B quirk: serialize IDE channels */
+void	wdc_pci(int quirks);
+
 extern struct wddma wddma[];
 
 void	wdintr __P((void *unit));