diff options
| author | bde <bde@FreeBSD.org> | 1996-06-08 09:17:51 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1996-06-08 09:17:51 +0000 |
| commit | 9525e0f3d5530bbfc391218f44451a925357cf13 (patch) | |
| tree | 92be2ff4e9d5f1e3ab41f47459cf06ed1dd1f569 /sys/i386/isa/matcd | |
| parent | c75ddabf834905387953a28a6e531a55d0af665c (diff) | |
| download | FreeBSD-src-9525e0f3d5530bbfc391218f44451a925357cf13.zip FreeBSD-src-9525e0f3d5530bbfc391218f44451a925357cf13.tar.gz | |
Fixed existence, minor numbers, group and permissions for devfs devices
(locked devices weren't created; minor numbers didn't depend on the unit
number; group operator was games; permissions 0640 was 0600).
Diffstat (limited to 'sys/i386/isa/matcd')
| -rw-r--r-- | sys/i386/isa/matcd/matcd.c | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c index 2bf569e..362acda 100644 --- a/sys/i386/isa/matcd/matcd.c +++ b/sys/i386/isa/matcd/matcd.c @@ -337,7 +337,7 @@ static char MATCDVERSION[]="Version 1(26) 18-Oct-95"; static char MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank Durda IV"; /* The proceeding strings may not be changed*/ -/* $Id: matcd.c,v 1.16 1996/05/03 14:58:09 phk Exp $ */ +/* $Id: matcd.c,v 1.17 1996/05/03 16:49:14 phk Exp $ */ /*--------------------------------------------------------------------------- Include declarations @@ -432,6 +432,10 @@ static struct matcd_data { void *rc_devfs_token; void *a_devfs_token; void *c_devfs_token; + void *rla_devfs_token; + void *rlc_devfs_token; + void *la_devfs_token; + void *lc_devfs_token; #endif DEVFS } matcd_data[TOTALDRIVES]; @@ -1424,25 +1428,30 @@ matcd_attach(struct isa_device *dev) cd->partflags[i]=0; } #ifdef DEVFS -#define MATCD_UID 0 -#define MATCD_GID 13 - cd->ra_devfs_token = - devfs_add_devswf(&matcd_cdevsw, 0, DV_CHR, - MATCD_UID, MATCD_GID, 0600, - "rmatcd%da", i); - cd->rc_devfs_token = - devfs_add_devswf(&matcd_cdevsw, RAW_PART, - DV_CHR, MATCD_UID, MATCD_GID, - 0600, "rmatcd%dc", i); - cd->a_devfs_token = - devfs_add_devswf(&matcd_bdevsw, 0, DV_BLK, - MATCD_UID, MATCD_GID, 0600, - "matcd%da", i); - - cd->c_devfs_token = - devfs_add_devswf(&matcd_bdevsw, RAW_PART, - DV_BLK, MATCD_UID, MATCD_GID, - 0600, "matcd%dc", i); + cd->ra_devfs_token = devfs_add_devswf(&matcd_cdevsw, + dkmakeminor(i, 0, 0), DV_CHR, + UID_ROOT, GID_OPERATOR, 0640, "rmatcd%da", i); + cd->rc_devfs_token = devfs_add_devswf(&matcd_cdevsw, + dkmakeminor(i, 0, RAW_PART), DV_CHR, + UID_ROOT, GID_OPERATOR, 0640, "rmatcd%dc", i); + cd->a_devfs_token = devfs_add_devswf(&matcd_bdevsw, + dkmakeminor(i, 0, 0), DV_BLK, + UID_ROOT, GID_OPERATOR, 0640, "matcd%da", i); + cd->c_devfs_token = devfs_add_devswf(&matcd_bdevsw, + dkmakeminor(i, 0, RAW_PART), DV_BLK, + UID_ROOT, GID_OPERATOR, 0640, "matcd%dc", i); + cd->rla_devfs_token = devfs_add_devswf(&matcd_cdevsw, + 0x80 | dkmakeminor(i, 0, 0), DV_CHR, + UID_ROOT, GID_OPERATOR, 0640, "rmatcd%dla", i); + cd->rlc_devfs_token = devfs_add_devswf(&matcd_cdevsw, + 0x80 | dkmakeminor(i, 0, RAW_PART), DV_CHR, + UID_ROOT, GID_OPERATOR, 0640, "rmatcd%dc", i); + cd->la_devfs_token = devfs_add_devswf(&matcd_bdevsw, + 0x80 | dkmakeminor(i, 0, 0), DV_BLK, + UID_ROOT, GID_OPERATOR, 0640, "matcd%dla", i); + cd->lc_devfs_token = devfs_add_devswf(&matcd_bdevsw, + 0x80 | dkmakeminor(i, 0, RAW_PART), DV_BLK, + UID_ROOT, GID_OPERATOR, 0640, "matcd%dlc", i); #endif } } |
