diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-09-24 23:00:04 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-09-24 23:00:04 +0000 |
| commit | 426e573880398f82da24f0647522d6acf9155f81 (patch) | |
| tree | 0636ede41052ef70bc8208af805fbd59337b21c1 | |
| parent | fefbda201c63555776047d702f78b141d01e51c8 (diff) | |
bios and pctr are both ocis w/ seltrue
| -rw-r--r-- | sys/arch/i386/i386/bios.c | 11 | ||||
| -rw-r--r-- | sys/arch/i386/i386/conf.c | 5 | ||||
| -rw-r--r-- | sys/arch/i386/include/conf.h | 4 |
3 files changed, 7 insertions, 13 deletions
diff --git a/sys/arch/i386/i386/bios.c b/sys/arch/i386/i386/bios.c index 64f42c4e6a3..948ec5317df 100644 --- a/sys/arch/i386/i386/bios.c +++ b/sys/arch/i386/i386/bios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bios.c,v 1.6 1997/09/24 22:52:56 mickey Exp $ */ +/* $OpenBSD: bios.c,v 1.7 1997/09/24 23:00:01 mickey Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -256,15 +256,6 @@ biosioctl(dev, cmd, data, flag, p) return 0; } -int -biosselect(dev, rw, p) - dev_t dev; - int rw; - struct proc *p; -{ - return 0; -} - void bioscnprobe(cn) struct consdev *cn; diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index 600685f5a24..62a22390b00 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.36 1997/09/24 22:52:57 mickey Exp $ */ +/* $OpenBSD: conf.c,v 1.37 1997/09/24 23:00:02 mickey Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -161,7 +161,6 @@ cdev_decl(svr4_net); #include "joy.h" #include "apm.h" #include "pctr.h" -cdev_decl(pctr); #include "bios.h" cdev_decl(ipl); @@ -236,7 +235,7 @@ struct cdevsw cdevsw[] = #endif cdev_gen_ipf(NIPF,ipl), /* 44: ip filtering */ cdev_random_init(1,random), /* 45: random data source */ - cdev_uk_init(NPCTR,pctr), /* 46: pentium performance counters */ + cdev_ocis_init(NPCTR,pctr), /* 46: pentium performance counters */ cdev_disk_init(NRD,rd), /* 47: ram disk driver */ cdev_ocis_init(NBIOS,bios), /* 48: onboard BIOS PROM */ }; diff --git a/sys/arch/i386/include/conf.h b/sys/arch/i386/include/conf.h index f1c91b18da5..78dc2ae8d09 100644 --- a/sys/arch/i386/include/conf.h +++ b/sys/arch/i386/include/conf.h @@ -63,6 +63,10 @@ cdev_decl(pms); cdev_decl(joy); +#define biosselect seltrue cdev_decl(bios); cdev_decl(apm); + +#define pctrselect seltrue +cdev_decl(pctr); |