diff options
| -rw-r--r-- | sys/dev/bktr/bktr_core.c | 6 | ||||
| -rw-r--r-- | sys/dev/bktr/bktr_reg.h | 3 | ||||
| -rw-r--r-- | sys/pci/brktree_reg.h | 3 | ||||
| -rw-r--r-- | sys/pci/brooktree848.c | 6 |
4 files changed, 12 insertions, 6 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; diff --git a/sys/pci/brktree_reg.h b/sys/pci/brktree_reg.h index d0b4a58..85063f1 100644 --- a/sys/pci/brktree_reg.h +++ b/sys/pci/brktree_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; diff --git a/sys/pci/brooktree848.c b/sys/pci/brooktree848.c index 17fba20..76bb40f 100644 --- a/sys/pci/brooktree848.c +++ b/sys/pci/brooktree848.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); |
