diff options
| author | bde <bde@FreeBSD.org> | 1996-04-13 12:45:57 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1996-04-13 12:45:57 +0000 |
| commit | 6eb67292b0fbbd0bd1936d5ccca1d9184f0cd387 (patch) | |
| tree | 82c451c31a31c4d821ca6348595300d7b8decbb8 /sys/i386/isa | |
| parent | e97a7a15c60a5616debcd9cc097e3510d9eca133 (diff) | |
| download | FreeBSD-src-6eb67292b0fbbd0bd1936d5ccca1d9184f0cd387.zip FreeBSD-src-6eb67292b0fbbd0bd1936d5ccca1d9184f0cd387.tar.gz | |
Eliminated sloppy common-style declarations. Now there are no duplicated
common labels for LINT. There are still some common declarations for the
!KERNEL case in tcp_debug.h and spx_debug.h. trpt depends on the ones in
tcp_debug.h.
Diffstat (limited to 'sys/i386/isa')
| -rw-r--r-- | sys/i386/isa/atapi.c | 20 | ||||
| -rw-r--r-- | sys/i386/isa/atapi.h | 16 |
2 files changed, 21 insertions, 15 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, |
