Update of isa drivers using compatability shims to use COMPAT_ISA_DRIVER().
Submitted by: haro@tk.kubota.co.jp (Munehiro Matsuda)
This commit is contained in:
parent
6042137954
commit
932d2288a0
@ -113,6 +113,7 @@
|
|||||||
#include <sys/conf.h>
|
#include <sys/conf.h>
|
||||||
#include <sys/bio.h>
|
#include <sys/bio.h>
|
||||||
#include <sys/buf.h>
|
#include <sys/buf.h>
|
||||||
|
#include <sys/bus.h>
|
||||||
#include <sys/kernel.h>
|
#include <sys/kernel.h>
|
||||||
#include <sys/uio.h>
|
#include <sys/uio.h>
|
||||||
#include <sys/syslog.h>
|
#include <sys/syslog.h>
|
||||||
@ -136,6 +137,9 @@
|
|||||||
#include <net/bpf.h>
|
#include <net/bpf.h>
|
||||||
#endif /* INET */
|
#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 LPINITRDY 4 /* wait up to 4 seconds for a ready */
|
||||||
#define LPTOUTINITIAL 10 /* initial timeout to wait for ready 1/10 s */
|
#define LPTOUTINITIAL 10 /* initial timeout to wait for ready 1/10 s */
|
||||||
@ -284,8 +288,12 @@ static void lpintr(int);
|
|||||||
#endif /* INET */
|
#endif /* INET */
|
||||||
|
|
||||||
struct isa_driver olptdriver = {
|
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_open_t lptopen;
|
||||||
static d_close_t lptclose;
|
static d_close_t lptclose;
|
||||||
|
@ -99,6 +99,10 @@
|
|||||||
#include <i386/isa/icu.h>
|
#include <i386/isa/icu.h>
|
||||||
#include <dev/ed/if_edreg.h>
|
#include <dev/ed/if_edreg.h>
|
||||||
|
|
||||||
|
#ifndef COMPAT_OLDISA
|
||||||
|
#error "The ed device requires the old isa compatibility shims"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef PC98
|
#ifdef PC98
|
||||||
/* register offsets */
|
/* register offsets */
|
||||||
struct pc98_edregister {
|
struct pc98_edregister {
|
||||||
@ -322,11 +326,13 @@ card_intr(struct pccard_devinfo *devi)
|
|||||||
#endif /* NCARD > 0 */
|
#endif /* NCARD > 0 */
|
||||||
|
|
||||||
struct isa_driver eddriver = {
|
struct isa_driver eddriver = {
|
||||||
|
INTR_TYPE_NET,
|
||||||
ed_probe,
|
ed_probe,
|
||||||
ed_attach_isa,
|
ed_attach_isa,
|
||||||
"ed",
|
"ed",
|
||||||
1 /* We are ultra sensitive */
|
1 /* We are ultra sensitive */
|
||||||
};
|
};
|
||||||
|
COMPAT_ISA_DRIVER(ed, eddriver);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Interrupt conversion table for WD/SMC ASIC/83C584
|
* Interrupt conversion table for WD/SMC ASIC/83C584
|
||||||
|
@ -113,6 +113,7 @@
|
|||||||
#include <sys/conf.h>
|
#include <sys/conf.h>
|
||||||
#include <sys/bio.h>
|
#include <sys/bio.h>
|
||||||
#include <sys/buf.h>
|
#include <sys/buf.h>
|
||||||
|
#include <sys/bus.h>
|
||||||
#include <sys/kernel.h>
|
#include <sys/kernel.h>
|
||||||
#include <sys/uio.h>
|
#include <sys/uio.h>
|
||||||
#include <sys/syslog.h>
|
#include <sys/syslog.h>
|
||||||
@ -136,6 +137,9 @@
|
|||||||
#include <net/bpf.h>
|
#include <net/bpf.h>
|
||||||
#endif /* INET */
|
#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 LPINITRDY 4 /* wait up to 4 seconds for a ready */
|
||||||
#define LPTOUTINITIAL 10 /* initial timeout to wait for ready 1/10 s */
|
#define LPTOUTINITIAL 10 /* initial timeout to wait for ready 1/10 s */
|
||||||
@ -284,8 +288,12 @@ static void lpintr(int);
|
|||||||
#endif /* INET */
|
#endif /* INET */
|
||||||
|
|
||||||
struct isa_driver olptdriver = {
|
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_open_t lptopen;
|
||||||
static d_close_t lptclose;
|
static d_close_t lptclose;
|
||||||
|
@ -93,6 +93,10 @@
|
|||||||
|
|
||||||
#include <pc98/pc98/atapi.h>
|
#include <pc98/pc98/atapi.h>
|
||||||
|
|
||||||
|
#ifndef COMPAT_OLDISA
|
||||||
|
#error "The wdc device requires the old isa compatibility shims"
|
||||||
|
#endif
|
||||||
|
|
||||||
extern void wdstart(int ctrlr);
|
extern void wdstart(int ctrlr);
|
||||||
|
|
||||||
#ifdef IDE_DELAY
|
#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);
|
static int wdwait(struct disk *du, u_char bits_wanted, int timeout);
|
||||||
|
|
||||||
struct isa_driver wdcdriver = {
|
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_open_t wdopen;
|
||||||
static d_close_t wdclose;
|
static d_close_t wdclose;
|
||||||
|
Loading…
Reference in New Issue
Block a user