summaryrefslogtreecommitdiffstats
path: root/sys/i386/isa/psm.c
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1998-04-15 17:06:52 +0000
committerphk <phk@FreeBSD.org>1998-04-15 17:06:52 +0000
commitb7f7670c8a01c82d8ed45eb3a4643ac0f7d944b0 (patch)
tree34b308f37cd9bb24b6b7a1b38cdbb1b23b735160 /sys/i386/isa/psm.c
parent1ceef06f4152c24e9d98521d5986288ad9a91529 (diff)
downloadFreeBSD-src-b7f7670c8a01c82d8ed45eb3a4643ac0f7d944b0.zip
FreeBSD-src-b7f7670c8a01c82d8ed45eb3a4643ac0f7d944b0.tar.gz
In pre-devfs days, /dev/psm0 had always been a non-blocking
device. But with devfs, currently, /dev/psm0 is the blocking device and /dev/npsm0 is the non-blocking one. DEVFS must stay consistent with the older behaviour. PR: 6260 Reviewed by: phk Submitted by: Kapil Chowksey <kchowksey@hss.hns.com>
Diffstat (limited to 'sys/i386/isa/psm.c')
-rw-r--r--sys/i386/isa/psm.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/i386/isa/psm.c b/sys/i386/isa/psm.c
index cc7b94d..b36a7a7 100644
--- a/sys/i386/isa/psm.c
+++ b/sys/i386/isa/psm.c
@@ -20,7 +20,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: psm.c,v 1.50 1998/01/24 12:12:32 yokota Exp $
+ * $Id: psm.c,v 1.51 1998/03/28 10:33:01 bde Exp $
*/
/*
@@ -163,7 +163,7 @@ static struct psm_softc { /* Driver status information */
int button; /* the latest button state */
#ifdef DEVFS
void *devfs_token;
- void *n_devfs_token;
+ void *b_devfs_token;
#endif
#ifdef PSM_HOOKAPM
struct apmhook resumehook;
@@ -983,11 +983,11 @@ psmattach(struct isa_device *dvp)
/* Done */
#ifdef DEVFS
sc->devfs_token =
- devfs_add_devswf(&psm_cdevsw, PSM_MKMINOR(unit, TRUE),
- DV_CHR, 0, 0, 0666, "psm%d", unit);
- sc->n_devfs_token =
devfs_add_devswf(&psm_cdevsw, PSM_MKMINOR(unit, FALSE),
- DV_CHR, 0, 0, 0666, "npsm%d", unit);
+ DV_CHR, 0, 0, 0666, "psm%d", unit);
+ sc->b_devfs_token =
+ devfs_add_devswf(&psm_cdevsw, PSM_MKMINOR(unit, TRUE),
+ DV_CHR, 0, 0, 0666, "bpsm%d", unit);
#endif /* DEVFS */
#ifdef PSM_HOOKAPM
OpenPOWER on IntegriCloud