From bd4f7390c4d5e1b78a52264261a6bdb412f2574e Mon Sep 17 00:00:00 2001 From: eivind Date: Wed, 4 Feb 1998 03:16:25 +0000 Subject: Re-add my DEVFS changes after they were stomped on. This time, I throw away the DEVFS tokens (as they weren't used anywhere anyway). --- sys/dev/bktr/bktr_core.c | 6 ++++-- sys/dev/bktr/bktr_reg.h | 3 --- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'sys/dev/bktr') diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c index b5d49f5..7f9e838 100644 --- a/sys/dev/bktr/bktr_core.c +++ b/sys/dev/bktr/bktr_core.c @@ -883,8 +883,10 @@ bktr_attach( ATTACH_ARGS ) probeCard( bktr, TRUE ); #ifdef DEVFS - bktr->devfs_token = devfs_add_devswf(&bktr_cdevsw, unit, - DV_CHR, 0, 0, 0644, "brooktree"); + /* XXX This just throw away the token, which should probably be fixed when + DEVFS is finally made really operational. */ + devfs_add_devswf(&bktr_cdevsw, unit, DV_CHR, 0, 0, 0444, "bktr%d", unit); + devfs_add_devswf(&bktr_cdevsw, unit+16, DV_CHR, 0, 0, 0444, "tuner%d", unit); #endif /* DEVFS */ #if __FreeBSD__ > 2 fun = pci_conf_read(tag, PCI_COMMAND_STATUS_REG); diff --git a/sys/dev/bktr/bktr_reg.h b/sys/dev/bktr/bktr_reg.h index 0ae8f30..35ba615 100644 --- a/sys/dev/bktr/bktr_reg.h +++ b/sys/dev/bktr/bktr_reg.h @@ -432,9 +432,6 @@ struct bktr_softc { #define TUNER_INITALIZED 0x00000001 #define TUNER_OPEN 0x00000002 u_short fps; /* frames per second */ -#ifdef DEVFS - void *devfs_token; -#endif struct meteor_video video; struct TVTUNER tuner; struct CARDTYPE card; -- cgit v1.1