jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-28 13:22:48 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added `#include "ioconf.h"' to <machine/conf.h> and cleaned up the

Browse Source 
misplaced extern declarations (mostly prototypes of interrupt handlers)
that this exposed.  The prototypes should be moved back to the driver
sources when the functions are staticalized.

Added idempotency guards to <machine/conf.h>.  "ioconf.h" can't be
included when building LKMs so define a wart in bsd.kmod.mk to help
guard against including it.
This commit is contained in:
Bruce Evans 1995-11-04 17:08:13 +00:00
parent aff85b5385
commit 4ff3de8e80
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=12080
47 changed files with 75 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
share/mk/bsd.kmod.mk
View File

@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
# $Id: bsd.kmod.mk,v 1.14 1995/10/15 16:46:00 phk Exp $
# $Id: bsd.kmod.mk,v 1.15 1995/10/15 16:56:56 phk Exp $
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
@ -12,7 +12,8 @@
# ${.CURDIR}/../../sys. We don't bother adding a .PATH since nothing
# actually lives in /sys directly.
#
CFLAGS+=${COPTS} -DKERNEL -I${.CURDIR}/../../sys -W -Wcomment -Wredundant-decls
CFLAGS+=${COPTS} -DKERNEL -DACTUALLY_LKM_NOT_KERNEL -I${.CURDIR}/../../sys \
-W -Wcomment -Wredundant-decls
KMODGRP?= bin
KMODOWN?= bin

3
sys/amd64/include/fpu.h
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.h 5.3 (Berkeley) 1/18/91
* $Id: npx.h,v 1.8 1995/08/17 11:30:02 davidg Exp $
* $Id: npx.h,v 1.9 1995/09/19 18:54:53 bde Exp $
*/
/*
@ -143,7 +143,6 @@ struct proc;
int npxdna __P((void));
void npxexit __P((struct proc *p));
void npxinit __P((int control));
void npxintr __P((int unit));
void npxsave __P((struct save87 *addr));
#endif

3
sys/amd64/include/npx.h
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.h 5.3 (Berkeley) 1/18/91
* $Id: npx.h,v 1.8 1995/08/17 11:30:02 davidg Exp $
* $Id: npx.h,v 1.9 1995/09/19 18:54:53 bde Exp $
*/
/*
@ -143,7 +143,6 @@ struct proc;
int npxdna __P((void));
void npxexit __P((struct proc *p));
void npxinit __P((int control));
void npxintr __P((int unit));
void npxsave __P((struct save87 *addr));
#endif

5
sys/conf/kmod.mk
View File

@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
# $Id: bsd.kmod.mk,v 1.14 1995/10/15 16:46:00 phk Exp $
# $Id: bsd.kmod.mk,v 1.15 1995/10/15 16:56:56 phk Exp $
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
@ -12,7 +12,8 @@
# ${.CURDIR}/../../sys. We don't bother adding a .PATH since nothing
# actually lives in /sys directly.
#
CFLAGS+=${COPTS} -DKERNEL -I${.CURDIR}/../../sys -W -Wcomment -Wredundant-decls
CFLAGS+=${COPTS} -DKERNEL -DACTUALLY_LKM_NOT_KERNEL -I${.CURDIR}/../../sys \
-W -Wcomment -Wredundant-decls
KMODGRP?= bin
KMODOWN?= bin

5
sys/dev/cy/cy.c
View File

@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: cy.c,v 1.16 1995/10/22 15:38:08 bde Exp $
* $Id: cy.c,v 1.17 1995/11/04 13:23:31 bde Exp $
*/
#include "cy.h"
@ -325,8 +325,7 @@ struct com_s {
*/
/* Interrupt handling entry points. */
void siointr __P((int unit));
void siointrts __P((int unit));
inthand2_t siointrts;
void siopoll __P((void));
/* Device switch entry points. */

5
sys/dev/cy/cy_isa.c
View File

@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: cy.c,v 1.16 1995/10/22 15:38:08 bde Exp $
* $Id: cy.c,v 1.17 1995/11/04 13:23:31 bde Exp $
*/
#include "cy.h"
@ -325,8 +325,7 @@ struct com_s {
*/
/* Interrupt handling entry points. */
void siointr __P((int unit));
void siointrts __P((int unit));
inthand2_t siointrts;
void siopoll __P((void));
/* Device switch entry points. */

3
sys/dev/ed/if_ed.c
View File

@ -13,7 +13,7 @@
* the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000,
* and a variety of similar clones.
*
* $Id: if_ed.c,v 1.82 1995/10/28 22:46:26 pst Exp $
* $Id: if_ed.c,v 1.83 1995/10/31 18:41:08 phk Exp $
*/
#include "ed.h"
@ -109,7 +109,6 @@ struct ed_softc {
static int ed_attach(struct isa_device *);
static void ed_init(int);
void edintr(int);
static int ed_ioctl(struct ifnet *, int, caddr_t);
static int ed_probe(struct isa_device *);
static void ed_start(struct ifnet *);

3
sys/dev/ep/if_ep.c
View File

@ -38,7 +38,7 @@
*/
/*
* $Id: if_ep.c,v 1.32 1995/10/26 20:29:37 julian Exp $
* $Id: if_ep.c,v 1.33 1995/10/28 15:39:04 phk Exp $
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
@ -113,7 +113,6 @@ static void epmbuffill __P((caddr_t, int));
static void epmbufempty __P((struct ep_softc *));
void epinit __P((int));
void epintr __P((int));
void epread __P((struct ep_softc *));
void epreset __P((int));
void epstart __P((struct ifnet *));

3
sys/dev/fdc/fdc.c
View File

@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
* $Id: fd.c,v 1.67 1995/10/28 15:38:57 phk Exp $
* $Id: fd.c,v 1.68 1995/11/04 13:23:34 bde Exp $
*
*/
@ -274,7 +274,6 @@ static int fdattach(struct isa_device *);
/* exported functions */
int fdsize (dev_t);
void fdintr(fdcu_t);
/* needed for ft driver, thus exported */
int in_fdc(fdcu_t);

3
sys/dev/fe/if_fe.c
View File

@ -245,9 +245,6 @@ struct fe_softc {
*/
#define IFNET2SOFTC(P) ( ( struct fe_softc * )(P) )
/* Public entry point. This is the only functoin which must be external. */
void feintr ( int );
/* Standard driver entry points. These can be static. */
int fe_probe ( struct isa_device * );
int fe_attach ( struct isa_device * );

3
sys/dev/mse/mse.c
View File

@ -11,7 +11,7 @@
* this software for any purpose. It is provided "as is"
* without express or implied warranty.
*
* $Id: mse.c,v 1.13 1995/07/16 10:12:06 bde Exp $
* $Id: mse.c,v 1.14 1995/09/08 11:07:50 bde Exp $
*/
/*
* Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@ -63,7 +63,6 @@
static int mseprobe(struct isa_device *);
static int mseattach(struct isa_device *);
void mseintr(int);
struct isa_driver msedriver = {
mseprobe, mseattach, "mse"

2
sys/dev/rc/rc.c
View File

@ -67,8 +67,8 @@ int rcattach __P((struct isa_device *));
* regression tests :-(.
*
*
*
*/
void rcintr __P((int));
void rcpoll __P((void));
#define rcin(port) RC_IN (nec, port)

3
sys/dev/si/si.c
View File

@ -30,7 +30,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHORS BE LIABLE.
*
* $Id: si.c,v 1.11 1995/10/28 15:39:19 phk Exp $
* $Id: si.c,v 1.12 1995/11/04 13:23:40 bde Exp $
*/
#ifndef lint
@ -94,7 +94,6 @@ static void si_disc_optim __P((struct tty *tp, struct termios *t,
static void sihardclose __P((struct si_port *pp));
static void sidtrwakeup __P((void *chan));
void siintr __P((int unit));
int siparam __P((struct tty *, struct termios *));
extern void si_registerdev __P((struct isa_device *id));

5
sys/dev/sio/sio.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: sio.c,v 1.115 1995/10/22 15:38:05 bde Exp $
* $Id: sio.c,v 1.116 1995/11/04 13:23:43 bde Exp $
*/
#include "sio.h"
@ -251,8 +251,7 @@ struct com_s {
*/
/* Interrupt handling entry points. */
void siointr __P((int unit));
void siointrts __P((int unit));
inthand2_t siointrts;
void siopoll __P((void));
/* Device switch entry points. */

3
sys/dev/syscons/syscons.h
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: syscons.h,v 1.10 1995/07/11 18:34:30 bde Exp $
* $Id: syscons.h,v 1.11 1995/09/10 21:35:13 bde Exp $
*/
#ifndef _I386_ISA_SYSCONS_H_
@ -170,7 +170,6 @@ int scprobe(struct isa_device *dev);
int scattach(struct isa_device *dev);
int scparam(struct tty *tp, struct termios *t);
void scstart(struct tty *tp);
void scintr(int unit);
static void scinit(void);
static u_int scgetc(int noblock);
static scr_stat *get_scr_stat(dev_t dev);

3
sys/i386/eisa/aha1742.c
View File

@ -14,7 +14,7 @@
*
* commenced: Sun Sep 27 18:14:01 PDT 1992
*
* $Id: aha1742.c,v 1.37 1995/09/19 18:55:06 bde Exp $
* $Id: aha1742.c,v 1.38 1995/10/28 15:38:42 phk Exp $
*/
#include <sys/types.h>
@ -266,7 +266,6 @@ static int ahbprobe();
static int ahbprobe1 __P((struct isa_device *dev));
static int ahb_attach();
static int ahb_init __P((int unit));
inthand2_t ahbintr;
static int32 ahb_scsi_cmd();
static timeout_t ahb_timeout;
static void ahb_done();

25
sys/i386/include/conf.h
View File

@ -1,3 +1,24 @@
#ifndef _MACHINE_CONF_H_
#define _MACHINE_CONF_H_
#ifdef KERNEL
#ifndef ACTUALLY_LKM_NOT_KERNEL
/*
* XXX instead of this, the per-driver declarations should probably be
* put in the "driver.h" headers. Then ioconf.h could include all the
* "driver.h" headers and drivers would automatically include their
* own "driver.h" header, so we wouldn't need to include ioconf.h here.
* Interrupt handlers should probably be static.
*/
#include "ioconf.h"
#endif
/*
* The following was copied from the bogusly non-machine-generated
* file <i386/i386/conf.c>. Eventually the routines should be static.
*/
d_rdwr_t rawread, rawwrite;
d_open_t wdopen;
d_close_t wdclose;
@ -296,3 +317,7 @@ d_open_t labpcopen;
d_close_t labpcclose;
d_strategy_t labpcstrategy;
d_ioctl_t labpcioctl;
#endif /* KERNEL */
#endif /* !_MACHINE_CONF_H_ */

3
sys/i386/include/npx.h
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.h 5.3 (Berkeley) 1/18/91
* $Id: npx.h,v 1.8 1995/08/17 11:30:02 davidg Exp $
* $Id: npx.h,v 1.9 1995/09/19 18:54:53 bde Exp $
*/
/*
@ -143,7 +143,6 @@ struct proc;
int npxdna __P((void));
void npxexit __P((struct proc *p));
void npxinit __P((int control));
void npxintr __P((int unit));
void npxsave __P((struct save87 *addr));
#endif

3
sys/i386/isa/aha1542.c
View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: aha1542.c,v 1.48 1995/10/01 15:09:51 dufault Exp $
* $Id: aha1542.c,v 1.49 1995/10/28 15:38:40 phk Exp $
*/
/*
@ -318,7 +318,6 @@ static struct aha_data {
struct scsi_link sc_link; /* prototype for subdevs */
} *ahadata[NAHA];
inthand2_t ahaintr;
static struct aha_ccb *aha_get_ccb();
static int ahaprobe();
static void aha_done();

3
sys/i386/isa/aha1742.c
View File

@ -14,7 +14,7 @@
*
* commenced: Sun Sep 27 18:14:01 PDT 1992
*
* $Id: aha1742.c,v 1.37 1995/09/19 18:55:06 bde Exp $
* $Id: aha1742.c,v 1.38 1995/10/28 15:38:42 phk Exp $
*/
#include <sys/types.h>
@ -266,7 +266,6 @@ static int ahbprobe();
static int ahbprobe1 __P((struct isa_device *dev));
static int ahb_attach();
static int ahb_init __P((int unit));
inthand2_t ahbintr;
static int32 ahb_scsi_cmd();
static timeout_t ahb_timeout;
static void ahb_done();

3
sys/i386/isa/aic6360.c
View File

@ -31,7 +31,7 @@
*/
/*
* $Id: aic6360.c,v 1.11 1995/09/19 18:55:07 bde Exp $
* $Id: aic6360.c,v 1.12 1995/10/28 15:38:43 phk Exp $
*
* Acknowledgements: Many of the algorithms used in this driver are
* inspired by the work of Julian Elischer (julian@tfs.com) and
@ -683,7 +683,6 @@ void aicattach __P((struct device *, struct device *, void *));
void aic_minphys __P((struct buf *));
#ifdef __FreeBSD__
u_int32 aic_adapter_info __P((int));
inthand2_t aicintr;
void aic_init __P((struct aic_data *));
int aic_find __P((struct aic_data *));
#else

3
sys/i386/isa/bt742a.c
View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: bt742a.c,v 1.41 1995/09/19 18:55:08 bde Exp $
* $Id: bt742a.c,v 1.42 1995/10/28 15:38:47 phk Exp $
*/
/*
@ -394,7 +394,6 @@ static int bt_debug = 0;
#ifdef KERNEL
static int btprobe();
static int btattach();
inthand2_t btintr;
static int32 bt_scsi_cmd();
static int bt_poll __P((int unit, struct scsi_xfer *xs, struct bt_ccb *ccb));
static void bt_timeout(void *);

5
sys/i386/isa/cy.c
View File

@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: cy.c,v 1.16 1995/10/22 15:38:08 bde Exp $
* $Id: cy.c,v 1.17 1995/11/04 13:23:31 bde Exp $
*/
#include "cy.h"
@ -325,8 +325,7 @@ struct com_s {
*/
/* Interrupt handling entry points. */
void siointr __P((int unit));
void siointrts __P((int unit));
inthand2_t siointrts;
void siopoll __P((void));
/* Device switch entry points. */

3
sys/i386/isa/fd.c
View File

@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
* $Id: fd.c,v 1.67 1995/10/28 15:38:57 phk Exp $
* $Id: fd.c,v 1.68 1995/11/04 13:23:34 bde Exp $
*
*/
@ -274,7 +274,6 @@ static int fdattach(struct isa_device *);
/* exported functions */
int fdsize (dev_t);
void fdintr(fdcu_t);
/* needed for ft driver, thus exported */
int in_fdc(fdcu_t);

3
sys/i386/isa/if_ed.c
View File

@ -13,7 +13,7 @@
* the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000,
* and a variety of similar clones.
*
* $Id: if_ed.c,v 1.82 1995/10/28 22:46:26 pst Exp $
* $Id: if_ed.c,v 1.83 1995/10/31 18:41:08 phk Exp $
*/
#include "ed.h"
@ -109,7 +109,6 @@ struct ed_softc {
static int ed_attach(struct isa_device *);
static void ed_init(int);
void edintr(int);
static int ed_ioctl(struct ifnet *, int, caddr_t);
static int ed_probe(struct isa_device *);
static void ed_start(struct ifnet *);

3
sys/i386/isa/if_eg.c
View File

@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_eg.c,v 1.5 1995/10/13 19:47:42 wollman Exp $
* $Id: if_eg.c,v 1.6 1995/10/26 20:29:32 julian Exp $
*/
/* To do:
@ -145,7 +145,6 @@ eg_registerdev(struct isa_device *id, const char *descr)
dev_attach(kdc);
}
void egintr (int);
static void eginit __P((struct eg_softc *));
static int egioctl (struct ifnet *, int, caddr_t);
static void egrecv(struct eg_softc *);

3
sys/i386/isa/if_el.c
View File

@ -6,7 +6,7 @@
*
* Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
*
* $Id: if_el.c,v 1.16 1995/10/26 20:29:34 julian Exp $
* $Id: if_el.c,v 1.17 1995/10/28 15:39:02 phk Exp $
*/
/* Except of course for the portions of code lifted from other FreeBSD
* drivers (mainly elread, elget and el_ioctl)
@ -87,7 +87,6 @@ struct el_softc {
/* Prototypes */
int el_attach(struct isa_device *);
void el_init(int);
void elintr(int);
int el_ioctl(struct ifnet *,int,caddr_t);
int el_probe(struct isa_device *);
void el_start(struct ifnet *);

3
sys/i386/isa/if_ep.c
View File

@ -38,7 +38,7 @@
*/
/*
* $Id: if_ep.c,v 1.32 1995/10/26 20:29:37 julian Exp $
* $Id: if_ep.c,v 1.33 1995/10/28 15:39:04 phk Exp $
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
@ -113,7 +113,6 @@ static void epmbuffill __P((caddr_t, int));
static void epmbufempty __P((struct ep_softc *));
void epinit __P((int));
void epintr __P((int));
void epread __P((struct ep_softc *));
void epreset __P((int));
void epstart __P((struct ifnet *));

3
sys/i386/isa/if_fe.c
View File

@ -245,9 +245,6 @@ struct fe_softc {
*/
#define IFNET2SOFTC(P) ( ( struct fe_softc * )(P) )
/* Public entry point. This is the only functoin which must be external. */
void feintr ( int );
/* Standard driver entry points. These can be static. */
int fe_probe ( struct isa_device * );
int fe_attach ( struct isa_device * );

3
sys/i386/isa/if_ix.c
View File

@ -28,7 +28,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_ix.c,v 1.12 1995/10/28 15:39:06 phk Exp $
* $Id: if_ix.c,v 1.13 1995/10/31 18:41:11 phk Exp $
*/
#include "ix.h"
@ -153,7 +153,6 @@ static int ixattach(struct isa_device *);
static void ixinit(int);
static void ixinit_rfa(int);
static void ixinit_tfa(int);
inthand2_t ixintr;
static inline void ixintr_cx(int);
static inline void ixintr_cx_free(int, cb_t *);
static inline void ixintr_fr(int);

3
sys/i386/isa/if_le.c
View File

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_le.c,v 1.21 1995/10/26 20:29:48 julian Exp $
* $Id: if_le.c,v 1.22 1995/10/28 15:39:08 phk Exp $
*/
/*
@ -250,7 +250,6 @@ struct le_softc {
static int le_probe(struct isa_device *dvp);
static int le_attach(struct isa_device *dvp);
static int le_ioctl(struct ifnet *ifp, int command, caddr_t data);
extern inthand2_t le_intr;
static void le_input(le_softc_t *sc, caddr_t seg1, size_t total_len,
size_t len2, caddr_t seg2);
static void le_multi_filter(le_softc_t *sc);

3
sys/i386/isa/lpt.c
View File

@ -46,7 +46,7 @@
* SUCH DAMAGE.
*
* from: unknown origin, 386BSD 0.1
* $Id: lpt.c,v 1.34 1995/09/08 11:07:45 bde Exp $
* $Id: lpt.c,v 1.35 1995/09/25 16:57:47 wollman Exp $
*/
/*
@ -239,7 +239,6 @@ struct lpt_softc {
static void lptout (struct lpt_softc * sc);
int lptprobe (struct isa_device *dvp);
int lptattach (struct isa_device *isdp);
void lptintr (int unit);
#ifdef INET

3
sys/i386/isa/mse.c
View File

@ -11,7 +11,7 @@
* this software for any purpose. It is provided "as is"
* without express or implied warranty.
*
* $Id: mse.c,v 1.13 1995/07/16 10:12:06 bde Exp $
* $Id: mse.c,v 1.14 1995/09/08 11:07:50 bde Exp $
*/
/*
* Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@ -63,7 +63,6 @@
static int mseprobe(struct isa_device *);
static int mseattach(struct isa_device *);
void mseintr(int);
struct isa_driver msedriver = {
mseprobe, mseattach, "mse"

1
sys/i386/isa/ncr5380.c
View File

@ -215,7 +215,6 @@ adapter_t ncadata[NNCA];
if (cnt == -1 && msg)\
printf ("nca: %s timeout\n", msg); }
inthand2_t ncaintr;
static int nca_probe (struct isa_device *dev);
static int nca_attach (struct isa_device *dev);
static int32 nca_scsi_cmd (struct scsi_xfer *xs);

2
sys/i386/isa/pcvt/pcvt_hdr.h
View File

@ -1119,7 +1119,6 @@ extern int vt_switch_pending;
extern u_int addr_6845;
extern u_short *Crtat;
extern struct isa_driver vtdriver;
extern u_char do_initialization;
extern u_char pcvt_is_console;
extern u_char bgansitopc[];
@ -1211,7 +1210,6 @@ extern void bcopyb(void *from, void *to, u_int length);
extern void fillw(U_short value, void *addr, u_int length);
#endif
void pcrint ( int );
int pcparam ( struct tty *tp, struct termios *t );
/*

2
sys/i386/isa/rc.c
View File

@ -67,8 +67,8 @@ int rcattach __P((struct isa_device *));
* regression tests :-(.
*
*
*
*/
void rcintr __P((int));
void rcpoll __P((void));
#define rcin(port) RC_IN (nec, port)

3
sys/i386/isa/seagate.c
View File

@ -60,7 +60,7 @@
* that category, with the possible exception of scanners and
* some of the older MO drives.
*
* $Id: seagate.c,v 1.10 1995/08/23 23:02:30 gibbs Exp $
* $Id: seagate.c,v 1.11 1995/09/19 18:55:17 bde Exp $
*/
/*
@ -330,7 +330,6 @@ adapter_t seadata[NSEA];
(t)->ndelay.op = 1;\
(t)->init.op = 1; }
inthand2_t seaintr;
static int sea_probe (struct isa_device *dev);
static int sea_detect (adapter_t *z, struct isa_device *dev);
static int sea_attach (struct isa_device *dev);

3
sys/i386/isa/si.c
View File

@ -30,7 +30,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHORS BE LIABLE.
*
* $Id: si.c,v 1.11 1995/10/28 15:39:19 phk Exp $
* $Id: si.c,v 1.12 1995/11/04 13:23:40 bde Exp $
*/
#ifndef lint
@ -94,7 +94,6 @@ static void si_disc_optim __P((struct tty *tp, struct termios *t,
static void sihardclose __P((struct si_port *pp));
static void sidtrwakeup __P((void *chan));
void siintr __P((int unit));
int siparam __P((struct tty *, struct termios *));
extern void si_registerdev __P((struct isa_device *id));

5
sys/i386/isa/sio.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: sio.c,v 1.115 1995/10/22 15:38:05 bde Exp $
* $Id: sio.c,v 1.116 1995/11/04 13:23:43 bde Exp $
*/
#include "sio.h"
@ -251,8 +251,7 @@ struct com_s {
*/
/* Interrupt handling entry points. */
void siointr __P((int unit));
void siointrts __P((int unit));
inthand2_t siointrts;
void siopoll __P((void));
/* Device switch entry points. */

1
sys/i386/isa/sound/sound_calls.h
View File

@ -176,7 +176,6 @@ void pas_midi_interrupt(void);
long attach_gus_card(long mem_start, struct address_info * hw_config);
int probe_gus(struct address_info *hw_config);
int gus_set_midi_irq(int num);
void gusintr(INT_HANDLER_PARMS(irq, dummy));
long attach_gus_db16(long mem_start, struct address_info * hw_config);
int probe_gus_db16(struct address_info *hw_config);

3
sys/i386/isa/syscons.h
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: syscons.h,v 1.10 1995/07/11 18:34:30 bde Exp $
* $Id: syscons.h,v 1.11 1995/09/10 21:35:13 bde Exp $
*/
#ifndef _I386_ISA_SYSCONS_H_
@ -170,7 +170,6 @@ int scprobe(struct isa_device *dev);
int scattach(struct isa_device *dev);
int scparam(struct tty *tp, struct termios *t);
void scstart(struct tty *tp);
void scintr(int unit);
static void scinit(void);
static u_int scgetc(int noblock);
static scr_stat *get_scr_stat(dev_t dev);

3
sys/i386/isa/ultra14f.c
View File

@ -22,7 +22,7 @@
* today: Fri Jun 2 17:21:03 EST 1994
* added 24F support ++sg
*
* $Id: ultra14f.c,v 1.36 1995/08/25 20:39:01 bde Exp $
* $Id: ultra14f.c,v 1.37 1995/09/19 18:55:20 bde Exp $
*/
#include <sys/types.h>
@ -264,7 +264,6 @@ struct uha_data {
int uhaprobe();
int uha_attach();
inthand2_t uhaintr;
int32 uha_scsi_cmd();
timeout_t uha_timeout;
void uha_free_mscp();

1
sys/i386/isa/wd7000.c
View File

@ -228,7 +228,6 @@ static void wds_minphys(struct buf *);
static struct wds_req *wdsr_alloc(int);
static int32 wds_scsi_cmd(struct scsi_xfer *);
static u_int32 wds_adapter_info(int);
inthand2_t wdsintr;
static int wds_done(int, struct wds_cmd *, u_char);
static int wdsattach(struct isa_device *);
static int wds_init(struct isa_device *);

3
sys/i386/isa/wdreg.h
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)wdreg.h 7.1 (Berkeley) 5/9/91
* $Id: wdreg.h,v 1.8 1995/03/22 05:23:01 davidg Exp $
* $Id: wdreg.h,v 1.9 1995/11/04 13:23:45 bde Exp $
*/
/*
@ -138,7 +138,6 @@ struct wdparams {
/*
* wd driver entry points
*/
void wdintr(int unit);
#ifdef B_FORMAT
int wdformat(struct buf *bp);
#endif

3
sys/isa/fd.c
View File

@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
* $Id: fd.c,v 1.67 1995/10/28 15:38:57 phk Exp $
* $Id: fd.c,v 1.68 1995/11/04 13:23:34 bde Exp $
*
*/
@ -274,7 +274,6 @@ static int fdattach(struct isa_device *);
/* exported functions */
int fdsize (dev_t);
void fdintr(fdcu_t);
/* needed for ft driver, thus exported */
int in_fdc(fdcu_t);

5
sys/isa/sio.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: sio.c,v 1.115 1995/10/22 15:38:05 bde Exp $
* $Id: sio.c,v 1.116 1995/11/04 13:23:43 bde Exp $
*/
#include "sio.h"
@ -251,8 +251,7 @@ struct com_s {
*/
/* Interrupt handling entry points. */
void siointr __P((int unit));
void siointrts __P((int unit));
inthand2_t siointrts;
void siopoll __P((void));
/* Device switch entry points. */

3
sys/isa/syscons.h
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: syscons.h,v 1.10 1995/07/11 18:34:30 bde Exp $
* $Id: syscons.h,v 1.11 1995/09/10 21:35:13 bde Exp $
*/
#ifndef _I386_ISA_SYSCONS_H_
@ -170,7 +170,6 @@ int scprobe(struct isa_device *dev);
int scattach(struct isa_device *dev);
int scparam(struct tty *tp, struct termios *t);
void scstart(struct tty *tp);
void scintr(int unit);
static void scinit(void);
static u_int scgetc(int noblock);
static scr_stat *get_scr_stat(dev_t dev);