From 02dbf8a32a329da620fefeec6ba25844e0c4e61b Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Sun, 29 Oct 1995 17:34:17 +0000
Subject: Made wcstart() non-static again.  It is called from atapi.c.  The
 modularization of the wd/wcd/atapi driver is ugly.

Include cons.h from a less bogus place.

Removed an ARGSUSED.  Unused args are normal for devswitch functions
and lint was informed about them for about 5 functions out of 1000.
Lint should be informed about them, if at all, in some other way.
---
 sys/i386/isa/wd.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'sys/i386/isa/wd.c')

diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index d806d07..680cfeb 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.88 1995/10/21 00:55:27 phk Exp $
+ *	$Id: wd.c,v 1.89 1995/10/28 15:39:28 phk Exp $
  */
 
 /* TODO:
@@ -80,8 +80,8 @@
 #include <sys/devconf.h>
 #include <machine/bootinfo.h>
 #include <machine/clock.h>
+#include <machine/cons.h>
 #include <machine/md_var.h>
-#include <i386/i386/cons.h>
 #include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/wdreg.h>
@@ -93,6 +93,8 @@
 #include <i386/isa/atapi.h>
 #endif
 
+extern void wdstart(int ctrlr);
+
 #define TIMEOUT		10000
 #define	RETRIES		5	/* number of retries before giving up */
 #define RECOVERYTIME	500000	/* usec for controller to recover after err */
@@ -253,7 +255,6 @@ static struct buf rwdbuf[NWD];	/* buffers for raw IO */
 static int wdprobe(struct isa_device *dvp);
 static int wdattach(struct isa_device *dvp);
 static void wdustart(struct disk *du);
-static void wdstart(int ctrlr);
 static int wdcontrol(struct buf *bp);
 static int wdcommand(struct disk *du, u_int cylinder, u_int head,
 		     u_int sector, u_int count, u_int command);
@@ -1625,7 +1626,6 @@ failed:
 	return (0);
 }
 
-/* ARGSUSED */
 int
 wdclose(dev_t dev, int flags, int fmt, struct proc *p)
 {
-- 
cgit v1.1