d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update of isa drivers using compatability shims to use COMPAT_ISA_DRIVER().

Browse Source 
Submitted by:	haro@tk.kubota.co.jp (Munehiro Matsuda)
This commit is contained in:
nyan 2000-05-31 10:51:53 +00:00
parent a055f5e636
commit f9b0e0c037
4 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/pc98/cbus/olpt.c
View File

@ -113,6 +113,7 @@
#include <sys/conf.h>
#include <sys/bio.h>
#include <sys/buf.h>
#include <sys/bus.h>
#include <sys/kernel.h>
#include <sys/uio.h>
#include <sys/syslog.h>
@ -136,6 +137,9 @@
#include <net/bpf.h>
#endif /* INET */
#ifndef COMPAT_OLDISA
#error "The olpt device requires the old isa compatibility shims"
#endif
#define LPINITRDY 4 /* wait up to 4 seconds for a ready */
#define LPTOUTINITIAL 10 /* initial timeout to wait for ready 1/10 s */
@ -284,8 +288,12 @@ static void lpintr(int);
#endif /* INET */
struct isa_driver olptdriver = {
lptprobe, lptattach, "olpt"
INTR_TYPE_TTY,
lptprobe,
lptattach,
"olpt"
};
COMPAT_ISA_DRIVER(olpt, olptdriver);
static d_open_t lptopen;
static d_close_t lptclose;

6
sys/pc98/pc98/if_ed.c
View File

@ -99,6 +99,10 @@
#include <i386/isa/icu.h>
#include <dev/ed/if_edreg.h>
#ifndef COMPAT_OLDISA
#error "The ed device requires the old isa compatibility shims"
#endif
#ifdef PC98
/* register offsets */
struct pc98_edregister {
@ -322,11 +326,13 @@ card_intr(struct pccard_devinfo *devi)
#endif /* NCARD > 0 */
struct isa_driver eddriver = {
INTR_TYPE_NET,
ed_probe,
ed_attach_isa,
"ed",
1 /* We are ultra sensitive */
};
COMPAT_ISA_DRIVER(ed, eddriver);
/*
* Interrupt conversion table for WD/SMC ASIC/83C584

10
sys/pc98/pc98/olpt.c
View File

@ -113,6 +113,7 @@
#include <sys/conf.h>
#include <sys/bio.h>
#include <sys/buf.h>
#include <sys/bus.h>
#include <sys/kernel.h>
#include <sys/uio.h>
#include <sys/syslog.h>
@ -136,6 +137,9 @@
#include <net/bpf.h>
#endif /* INET */
#ifndef COMPAT_OLDISA
#error "The olpt device requires the old isa compatibility shims"
#endif
#define LPINITRDY 4 /* wait up to 4 seconds for a ready */
#define LPTOUTINITIAL 10 /* initial timeout to wait for ready 1/10 s */
@ -284,8 +288,12 @@ static void lpintr(int);
#endif /* INET */
struct isa_driver olptdriver = {
lptprobe, lptattach, "olpt"
INTR_TYPE_TTY,
lptprobe,
lptattach,
"olpt"
};
COMPAT_ISA_DRIVER(olpt, olptdriver);
static d_open_t lptopen;
static d_close_t lptclose;

12
sys/pc98/pc98/wd.c
View File

@ -93,6 +93,10 @@
#include <pc98/pc98/atapi.h>
#ifndef COMPAT_OLDISA
#error "The wdc device requires the old isa compatibility shims"
#endif
extern void wdstart(int ctrlr);
#ifdef IDE_DELAY
@ -238,10 +242,12 @@ static int wdunwedge(struct disk *du);
static int wdwait(struct disk *du, u_char bits_wanted, int timeout);
struct isa_driver wdcdriver = {
wdprobe, wdattach, "wdc",
INTR_TYPE_BIO,
wdprobe,
wdattach,
"wdc",
};
COMPAT_ISA_DRIVER(wdc, wdcdriver);
static d_open_t wdopen;
static d_close_t wdclose;