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).
This commit is contained in:
Eivind Eklund 1998-02-04 03:16:25 +00:00
parent 31ea9a843a
commit 287591d703
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=33066
4 changed files with 8 additions and 10 deletions

View file

@ -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);

View file

@ -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;

View file

@ -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;

View file

@ -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);