summaryrefslogtreecommitdiffstats
path: root/sys/dev/bktr
diff options
context:
space:
mode:
authoreivind <eivind@FreeBSD.org>1998-01-31 05:23:49 +0000
committereivind <eivind@FreeBSD.org>1998-01-31 05:23:49 +0000
commitabc8db9838cb1e162c6d3c75c9fa66d65fac30d3 (patch)
tree9bee80c47cdd6a8bc7d7aa15aeb512624c47b20d /sys/dev/bktr
parente8dbec0c0681514b40ec2b5462122bba5fd24923 (diff)
downloadFreeBSD-src-abc8db9838cb1e162c6d3c75c9fa66d65fac30d3.zip
FreeBSD-src-abc8db9838cb1e162c6d3c75c9fa66d65fac30d3.tar.gz
Attempt at making this use DEVFS properly. (Now it should at least work.)
Diffstat (limited to 'sys/dev/bktr')
-rw-r--r--sys/dev/bktr/bktr_core.c6
-rw-r--r--sys/dev/bktr/bktr_reg.h3
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 17fba20..76bb40f 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -859,8 +859,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");
+ bktr->devfs_bktr_token = devfs_add_devswf(&bktr_cdevsw, unit,
+ DV_CHR, 0, 0, 0444, "bktr%d", unit);
+ bktr->devfs_tuner_token = devfs_add_devswf(&bktr_cdevsw, unit+16,
+ DV_CHR, 0, 0, 0444, "tuner%d", unit);
#endif /* DEVFS */
fun = pci_conf_read(tag, PCI_COMMAND_STATUS_REG);
pci_conf_write(tag, PCI_COMMAND_STATUS_REG, fun | 4);
diff --git a/sys/dev/bktr/bktr_reg.h b/sys/dev/bktr/bktr_reg.h
index d0b4a58..85063f1 100644
--- a/sys/dev/bktr/bktr_reg.h
+++ b/sys/dev/bktr/bktr_reg.h
@@ -429,7 +429,8 @@ struct bktr_softc {
#define TUNER_OPEN 0x00000002
u_short fps; /* frames per second */
#ifdef DEVFS
- void *devfs_token;
+ void *devfs_bktr_token;
+ void *devfs_tuner_token;
#endif
struct meteor_video video;
struct TVTUNER tuner;
OpenPOWER on IntegriCloud