diff options
| author | bde <bde@FreeBSD.org> | 1995-11-04 17:08:13 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1995-11-04 17:08:13 +0000 |
| commit | 6073486300a2c7430d184a9a41ad42bcb0c4345c (patch) | |
| tree | a314bfc13d707ab8df235edc500e88916380d16d /sys/isa | |
| parent | e2427bd86958366ec25f29d70bb5c148c61a704b (diff) | |
| download | FreeBSD-src-6073486300a2c7430d184a9a41ad42bcb0c4345c.zip FreeBSD-src-6073486300a2c7430d184a9a41ad42bcb0c4345c.tar.gz | |
Added `#include "ioconf.h"' to <machine/conf.h> and cleaned up the
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.
Diffstat (limited to 'sys/isa')
| -rw-r--r-- | sys/isa/fd.c | 3 | ||||
| -rw-r--r-- | sys/isa/sio.c | 5 | ||||
| -rw-r--r-- | sys/isa/syscons.h | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/sys/isa/fd.c b/sys/isa/fd.c index 150e692..5a2c861 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -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); diff --git a/sys/isa/sio.c b/sys/isa/sio.c index 18d7a45..2337ea3 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -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. */ diff --git a/sys/isa/syscons.h b/sys/isa/syscons.h index e660ba7..9859954 100644 --- a/sys/isa/syscons.h +++ b/sys/isa/syscons.h @@ -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); |
