diff options
| -rw-r--r-- | sys/i386/isa/atapi.c | 20 | ||||
| -rw-r--r-- | sys/i386/isa/atapi.h | 16 | ||||
| -rw-r--r-- | sys/net/if_ppp.c | 4 | ||||
| -rw-r--r-- | sys/net/if_pppvar.h | 4 | ||||
| -rw-r--r-- | sys/netinet/tcp_debug.c | 6 | ||||
| -rw-r--r-- | sys/netinet/tcp_debug.h | 10 | ||||
| -rw-r--r-- | sys/pc98/pc98/atapi.h | 16 |
7 files changed, 48 insertions, 28 deletions
diff --git a/sys/i386/isa/atapi.c b/sys/i386/isa/atapi.c index 6fdbc81..8c51d70 100644 --- a/sys/i386/isa/atapi.c +++ b/sys/i386/isa/atapi.c @@ -905,15 +905,7 @@ struct atapires atapi_request_immediate (struct atapi *ata, int unit, } #endif /* ATAPI_STATIC */ -#ifdef ATAPI_MODULE -/* - * ATAPI loadable driver stubs. - */ -#include <sys/exec.h> -#include <sys/conf.h> -#include <sys/sysent.h> -#include <sys/lkm.h> - +#if defined (ATAPI_MODULE) || !defined(ATAPI_STATIC) int (*atapi_start_ptr) (int ctrlr); int (*atapi_intr_ptr) (int ctrlr); void (*atapi_debug_ptr) (struct atapi *ata, int on); @@ -932,6 +924,16 @@ struct atapires (*atapi_request_immediate_ptr) (struct atapi *ata, int unit, u_char a5, u_char a6, u_char a7, u_char a8, u_char a9, u_char a10, u_char a11, u_char a12, u_char a13, u_char a14, u_char a15, char *addr, int count); +#endif + +#ifdef ATAPI_MODULE +/* + * ATAPI loadable driver stubs. + */ +#include <sys/exec.h> +#include <sys/conf.h> +#include <sys/sysent.h> +#include <sys/lkm.h> extern int atapi_lock (int ctlr); /* diff --git a/sys/i386/isa/atapi.h b/sys/i386/isa/atapi.h index dce6d9e..6f3f142 100644 --- a/sys/i386/isa/atapi.h +++ b/sys/i386/isa/atapi.h @@ -251,20 +251,24 @@ extern struct atapi *atapi_tab; /* the table of atapi controllers */ int atapi_attach (int ctlr, int unit, int port, struct kern_devconf*); #endif -int atapi_start (int ctrlr); -int atapi_intr (int ctrlr); -void atapi_debug (struct atapi *ata, int on); -struct atapires atapi_request_wait (struct atapi *ata, int unit, +/* + * These "functions" are declared with archaic `extern's because they are + * actually pointers in the !ATAPI_STATIC case. + */ +extern int atapi_start (int ctrlr); +extern int atapi_intr (int ctrlr); +extern void atapi_debug (struct atapi *ata, int on); +extern struct atapires atapi_request_wait (struct atapi *ata, int unit, u_char cmd, u_char a1, u_char a2, u_char a3, u_char a4, u_char a5, u_char a6, u_char a7, u_char a8, u_char a9, u_char a10, u_char a11, u_char a12, u_char a13, u_char a14, u_char a15, char *addr, int count); -void atapi_request_callback (struct atapi *ata, int unit, +extern void atapi_request_callback (struct atapi *ata, int unit, u_char cmd, u_char a1, u_char a2, u_char a3, u_char a4, u_char a5, u_char a6, u_char a7, u_char a8, u_char a9, u_char a10, u_char a11, u_char a12, u_char a13, u_char a14, u_char a15, char *addr, int count, atapi_callback_t *done, void *x, void *y); -struct atapires atapi_request_immediate (struct atapi *ata, int unit, +extern struct atapires atapi_request_immediate (struct atapi *ata, int unit, u_char cmd, u_char a1, u_char a2, u_char a3, u_char a4, u_char a5, u_char a6, u_char a7, u_char a8, u_char a9, u_char a10, u_char a11, u_char a12, u_char a13, u_char a14, u_char a15, diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c index 363aeaf..d1022d3 100644 --- a/sys/net/if_ppp.c +++ b/sys/net/if_ppp.c @@ -69,7 +69,7 @@ * Paul Mackerras (paulus@cs.anu.edu.au). */ -/* $Id: if_ppp.c,v 1.31 1996/02/06 18:51:12 wollman Exp $ */ +/* $Id: if_ppp.c,v 1.32 1996/04/07 17:39:08 bde Exp $ */ /* from if_ppp.c,v 1.5 1995/08/16 01:36:38 paulus Exp */ /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */ @@ -123,6 +123,8 @@ #include <net/ppp_comp.h> #endif +struct ppp_softc ppp_softc[NPPP]; + static void pppattach __P((void *)); PSEUDO_SET(pppattach, if_ppp); diff --git a/sys/net/if_pppvar.h b/sys/net/if_pppvar.h index 652042c..23768ec 100644 --- a/sys/net/if_pppvar.h +++ b/sys/net/if_pppvar.h @@ -1,5 +1,5 @@ /* from Id: if_pppvar.h,v 1.1 1994/12/15 22:28:09 paulus Exp */ -/* $Id: if_pppvar.h,v 1.3 1996/01/30 22:57:49 mpp Exp $ */ +/* $Id: if_pppvar.h,v 1.4 1996/02/06 18:51:13 wollman Exp $ */ /* * if_pppvar.h - private structures and declarations for PPP. * @@ -95,7 +95,7 @@ struct ppp_softc { int sc_rawin_count; /* # in sc_rawin */ }; -struct ppp_softc ppp_softc[NPPP]; +extern struct ppp_softc ppp_softc[NPPP]; struct ppp_softc *pppalloc __P((pid_t pid)); void pppdealloc __P((struct ppp_softc *sc)); diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c index b749368..a54beb2 100644 --- a/sys/netinet/tcp_debug.c +++ b/sys/netinet/tcp_debug.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_debug.c 8.1 (Berkeley) 6/10/93 - * $Id: tcp_debug.c,v 1.5 1995/11/14 20:34:24 phk Exp $ + * $Id: tcp_debug.c,v 1.6 1996/03/11 15:13:26 davidg Exp $ */ #ifdef TCPDEBUG @@ -70,6 +70,10 @@ #ifdef TCPDEBUG static int tcpconsdebug = 0; #endif + +static struct tcp_debug tcp_debug[TCP_NDEBUG]; +static int tcp_debx; + /* * Tcp debug routines */ diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h index 02af11e..cab4451 100644 --- a/sys/netinet/tcp_debug.h +++ b/sys/netinet/tcp_debug.h @@ -31,11 +31,11 @@ * SUCH DAMAGE. * * @(#)tcp_debug.h 8.1 (Berkeley) 6/10/93 - * $Id: tcp_debug.h,v 1.3 1994/08/21 05:27:35 paul Exp $ + * $Id: tcp_debug.h,v 1.4 1995/11/14 20:34:29 phk Exp $ */ #ifndef _NETINET_TCP_DEBUG_H_ -#define _NETINET_TCP_DEBUG_H_ +#define _NETINET_TCP_DEBUG_H_ struct tcp_debug { n_time td_time; @@ -59,7 +59,11 @@ static char *tanames[] = #endif #define TCP_NDEBUG 100 + +#ifndef KERNEL +/* XXX common variables for broken applications. */ struct tcp_debug tcp_debug[TCP_NDEBUG]; int tcp_debx; - #endif + +#endif /* !_NETINET_TCP_DEBUG_H_ */ diff --git a/sys/pc98/pc98/atapi.h b/sys/pc98/pc98/atapi.h index dce6d9e..6f3f142 100644 --- a/sys/pc98/pc98/atapi.h +++ b/sys/pc98/pc98/atapi.h @@ -251,20 +251,24 @@ extern struct atapi *atapi_tab; /* the table of atapi controllers */ int atapi_attach (int ctlr, int unit, int port, struct kern_devconf*); #endif -int atapi_start (int ctrlr); -int atapi_intr (int ctrlr); -void atapi_debug (struct atapi *ata, int on); -struct atapires atapi_request_wait (struct atapi *ata, int unit, +/* + * These "functions" are declared with archaic `extern's because they are + * actually pointers in the !ATAPI_STATIC case. + */ +extern int atapi_start (int ctrlr); +extern int atapi_intr (int ctrlr); +extern void atapi_debug (struct atapi *ata, int on); +extern struct atapires atapi_request_wait (struct atapi *ata, int unit, u_char cmd, u_char a1, u_char a2, u_char a3, u_char a4, u_char a5, u_char a6, u_char a7, u_char a8, u_char a9, u_char a10, u_char a11, u_char a12, u_char a13, u_char a14, u_char a15, char *addr, int count); -void atapi_request_callback (struct atapi *ata, int unit, +extern void atapi_request_callback (struct atapi *ata, int unit, u_char cmd, u_char a1, u_char a2, u_char a3, u_char a4, u_char a5, u_char a6, u_char a7, u_char a8, u_char a9, u_char a10, u_char a11, u_char a12, u_char a13, u_char a14, u_char a15, char *addr, int count, atapi_callback_t *done, void *x, void *y); -struct atapires atapi_request_immediate (struct atapi *ata, int unit, +extern struct atapires atapi_request_immediate (struct atapi *ata, int unit, u_char cmd, u_char a1, u_char a2, u_char a3, u_char a4, u_char a5, u_char a6, u_char a7, u_char a8, u_char a9, u_char a10, u_char a11, u_char a12, u_char a13, u_char a14, u_char a15, |
