summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/fdc/fdc.c6
-rw-r--r--sys/i386/isa/fd.c6
-rw-r--r--sys/i386/isa/snd/sound.c14
-rw-r--r--sys/i386/isa/sound/soundcard.c14
-rw-r--r--sys/isa/fd.c6
-rw-r--r--sys/kern/subr_diskslice.c6
-rw-r--r--sys/miscfs/devfs/devfs_tree.c4
-rw-r--r--sys/pc98/cbus/fdc.c6
-rw-r--r--sys/pc98/pc98/fd.c6
-rw-r--r--sys/sys/devfsext.h4
10 files changed, 36 insertions, 36 deletions
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 37df7b1..4d78f2e 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $Id: fd.c,v 1.125 1998/12/04 22:54:46 archie Exp $
+ * $Id: fd.c,v 1.126 1998/12/07 21:58:20 archie Exp $
*
*/
@@ -784,10 +784,10 @@ fdattach(struct isa_device *dev)
}
for (i = 0; i < MAXPARTITIONS; i++) {
- fd->bdevs[1 + NUMDENS + i] = devfs_link(fd->bdevs[0],
+ fd->bdevs[1 + NUMDENS + i] = devfs_makelink(fd->bdevs[0],
"fd%d%c", fdu, 'a' + i);
fd->cdevs[1 + NUMDENS + i] =
- devfs_link(fd->cdevs[0],
+ devfs_makelink(fd->cdevs[0],
"rfd%d%c", fdu, 'a' + i);
}
#endif /* DEVFS */
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index 37df7b1..4d78f2e 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $Id: fd.c,v 1.125 1998/12/04 22:54:46 archie Exp $
+ * $Id: fd.c,v 1.126 1998/12/07 21:58:20 archie Exp $
*
*/
@@ -784,10 +784,10 @@ fdattach(struct isa_device *dev)
}
for (i = 0; i < MAXPARTITIONS; i++) {
- fd->bdevs[1 + NUMDENS + i] = devfs_link(fd->bdevs[0],
+ fd->bdevs[1 + NUMDENS + i] = devfs_makelink(fd->bdevs[0],
"fd%d%c", fdu, 'a' + i);
fd->cdevs[1 + NUMDENS + i] =
- devfs_link(fd->cdevs[0],
+ devfs_makelink(fd->cdevs[0],
"rfd%d%c", fdu, 'a' + i);
}
#endif /* DEVFS */
diff --git a/sys/i386/isa/snd/sound.c b/sys/i386/isa/snd/sound.c
index 3253af9..e233250 100644
--- a/sys/i386/isa/snd/sound.c
+++ b/sys/i386/isa/snd/sound.c
@@ -314,32 +314,32 @@ pcmattach(struct isa_device * dev)
*/
cookie = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_DSP,
DV_CHR, UID_SND, GID_SND, PERM_SND, "dsp%r", dev->id_unit);
- if (cookie) devfs_link(cookie, "dsp");
+ if (cookie) devfs_makelink(cookie, "dsp");
cookie = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_DSP16,
DV_CHR, UID_SND, GID_SND, PERM_SND, "dspW%r", dev->id_unit);
- if (cookie) devfs_link(cookie, "dspW");
+ if (cookie) devfs_makelink(cookie, "dspW");
cookie = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_AUDIO,
DV_CHR, UID_SND, GID_SND, PERM_SND, "audio%r", dev->id_unit);
- if (cookie) devfs_link(cookie, "audio");
+ if (cookie) devfs_makelink(cookie, "audio");
cookie = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_CTL,
DV_CHR, UID_SND, GID_SND, PERM_SND, "mixer%r", dev->id_unit);
- if (cookie) devfs_link(cookie, "mixer");
+ if (cookie) devfs_makelink(cookie, "mixer");
cookie = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_STATUS,
DV_CHR, UID_SND, GID_SND, PERM_SND, "sndstat%r", dev->id_unit);
- if (cookie) devfs_link(cookie, "sndstat");
+ if (cookie) devfs_makelink(cookie, "sndstat");
#if 0 /* these two are still unsupported... */
cookie = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_MIDIN,
DV_CHR, UID_SND, GID_SND, PERM_SND, "midi%r", dev->id_unit);
- if (cookie) devfs_link(cookie, "midi");
+ if (cookie) devfs_makelink(cookie, "midi");
cookie = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_SYNTH,
DV_CHR, UID_SND, GID_SND, PERM_SND, "sequencer%r", dev->id_unit);
- if (cookie) devfs_link(cookie, "sequencer");
+ if (cookie) devfs_makelink(cookie, "sequencer");
#endif
#endif /* DEVFS */
diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c
index e490541..3b6db0b 100644
--- a/sys/i386/isa/sound/soundcard.c
+++ b/sys/i386/isa/sound/soundcard.c
@@ -499,35 +499,35 @@ sndattach(struct isa_device * dev)
tmp = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_SEQ,
DV_CHR, UID_SND, GID_SND, PERM_SND,
"sequencer%r", dev->id_unit);
- if (tmp) devfs_link(tmp, "sequencer");
+ if (tmp) devfs_makelink(tmp, "sequencer");
} else if (dev->id_driver == &mpudriver ||
dev->id_driver == &sbmididriver ||
dev->id_driver == &uartdriver){
tmp = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_MIDIN,
DV_CHR, UID_SND, GID_SND, PERM_SND,
"midi%r", dev->id_unit);
- if (tmp) devfs_link(tmp, "midi");
+ if (tmp) devfs_makelink(tmp, "midi");
} else {
tmp = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_DSP,
DV_CHR, UID_SND, GID_SND, PERM_SND,
"dsp%r", dev->id_unit);
- if (tmp) devfs_link(tmp, "dsp");
+ if (tmp) devfs_makelink(tmp, "dsp");
tmp = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_DSP16,
DV_CHR, UID_SND, GID_SND, PERM_SND,
"dspW%r", dev->id_unit);
- if (tmp) devfs_link(tmp, "dspW");
+ if (tmp) devfs_makelink(tmp, "dspW");
tmp = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_AUDIO,
DV_CHR, UID_SND, GID_SND, PERM_SND,
"audio%r", dev->id_unit);
- if (tmp) devfs_link(tmp, "audio");
+ if (tmp) devfs_makelink(tmp, "audio");
tmp = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_CTL,
DV_CHR, UID_SND, GID_SND, PERM_SND,
"mixer%r", dev->id_unit);
- if (tmp) devfs_link(tmp, "mixer");
+ if (tmp) devfs_makelink(tmp, "mixer");
tmp = devfs_add_devswf(&snd_cdevsw, (dev->id_unit << 4) | SND_DEV_STATUS,
DV_CHR, UID_SND, GID_SND, PERM_SND,
"sndstat%r", dev->id_unit);
- if (tmp) devfs_link(tmp, "sndstat");
+ if (tmp) devfs_makelink(tmp, "sndstat");
}
#endif /* DEVFS */
return TRUE;
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index 37df7b1..4d78f2e 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $Id: fd.c,v 1.125 1998/12/04 22:54:46 archie Exp $
+ * $Id: fd.c,v 1.126 1998/12/07 21:58:20 archie Exp $
*
*/
@@ -784,10 +784,10 @@ fdattach(struct isa_device *dev)
}
for (i = 0; i < MAXPARTITIONS; i++) {
- fd->bdevs[1 + NUMDENS + i] = devfs_link(fd->bdevs[0],
+ fd->bdevs[1 + NUMDENS + i] = devfs_makelink(fd->bdevs[0],
"fd%d%c", fdu, 'a' + i);
fd->cdevs[1 + NUMDENS + i] =
- devfs_link(fd->cdevs[0],
+ devfs_makelink(fd->cdevs[0],
"rfd%d%c", fdu, 'a' + i);
}
#endif /* DEVFS */
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index 8a4eef6..fa0e4a4 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -43,7 +43,7 @@
* from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
* from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- * $Id: subr_diskslice.c,v 1.59 1998/10/17 09:46:42 bde Exp $
+ * $Id: subr_diskslice.c,v 1.60 1998/12/04 22:54:51 archie Exp $
*/
#include "opt_devfs.h"
@@ -1158,10 +1158,10 @@ set_ds_labeldevs_unaliased(dname, dev, ssp)
sname = dsname(dname, dkunit(dev), slice, part, partname);
if (part == RAW_PART && sp->ds_bdev != NULL) {
sp->ds_bdevs[part] =
- devfs_link(sp->ds_bdev,
+ devfs_makelink(sp->ds_bdev,
"%s%s", sname, partname);
sp->ds_cdevs[part] =
- devfs_link(sp->ds_cdev,
+ devfs_makelink(sp->ds_cdev,
"r%s%s", sname, partname);
} else {
mynor = minor(dkmodpart(dev, part));
diff --git a/sys/miscfs/devfs/devfs_tree.c b/sys/miscfs/devfs/devfs_tree.c
index 9691537..7839645 100644
--- a/sys/miscfs/devfs/devfs_tree.c
+++ b/sys/miscfs/devfs/devfs_tree.c
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: devfs_tree.c,v 1.56 1998/07/05 23:10:21 julian Exp $
+ * $Id: devfs_tree.c,v 1.57 1998/11/26 18:50:23 eivind Exp $
*/
@@ -1129,7 +1129,7 @@ devfs_add_devswf(void *devsw, int minor, int chrblk, uid_t uid,
* this function is exported.. see sys/devfsext.h *
\***********************************************************************/
void *
-devfs_link(void *original, char *fmt, ...)
+devfs_makelink(void *original, char *fmt, ...)
{
devnm_p new_dev;
devnm_p orig = (devnm_p) original;
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index b606f93..154c33a 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $Id: fd.c,v 1.43 1998/12/05 09:24:20 kato Exp $
+ * $Id: fd.c,v 1.44 1998/12/08 08:18:58 kato Exp $
*
*/
@@ -1069,10 +1069,10 @@ fdattach(struct isa_device *dev)
}
for (i = 0; i < MAXPARTITIONS; i++) {
- fd->bdevs[1 + NUMDENS + i] = devfs_link(fd->bdevs[0],
+ fd->bdevs[1 + NUMDENS + i] = devfs_makelink(fd->bdevs[0],
"fd%d%c", fdu, 'a' + i);
fd->cdevs[1 + NUMDENS + i] =
- devfs_link(fd->cdevs[0],
+ devfs_makelink(fd->cdevs[0],
"rfd%d%c", fdu, 'a' + i);
}
#endif /* DEVFS */
diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c
index b606f93..154c33a 100644
--- a/sys/pc98/pc98/fd.c
+++ b/sys/pc98/pc98/fd.c
@@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $Id: fd.c,v 1.43 1998/12/05 09:24:20 kato Exp $
+ * $Id: fd.c,v 1.44 1998/12/08 08:18:58 kato Exp $
*
*/
@@ -1069,10 +1069,10 @@ fdattach(struct isa_device *dev)
}
for (i = 0; i < MAXPARTITIONS; i++) {
- fd->bdevs[1 + NUMDENS + i] = devfs_link(fd->bdevs[0],
+ fd->bdevs[1 + NUMDENS + i] = devfs_makelink(fd->bdevs[0],
"fd%d%c", fdu, 'a' + i);
fd->cdevs[1 + NUMDENS + i] =
- devfs_link(fd->cdevs[0],
+ devfs_makelink(fd->cdevs[0],
"rfd%d%c", fdu, 'a' + i);
}
#endif /* DEVFS */
diff --git a/sys/sys/devfsext.h b/sys/sys/devfsext.h
index 3086fba..425cbff 100644
--- a/sys/sys/devfsext.h
+++ b/sys/sys/devfsext.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: devfsext.h,v 1.20 1998/04/28 00:10:52 julian Exp $
+ * $Id: devfsext.h,v 1.21 1998/07/13 06:45:16 bde Exp $
*/
#ifndef _SYS_DEVFSEXT_H_
@@ -43,7 +43,7 @@ void *devfs_add_devswf __P((void *devsw, int minor, int chrblk, uid_t uid,
* at the moment there is nothing you can do with it that you couldn't do
* with the original cookie. ( XXX this might be something I should change )
*/
-void *devfs_link __P((void *original, char *fmt, ...)) __printflike(2, 3);
+void *devfs_makelink __P((void *original, char *fmt, ...)) __printflike(2, 3);
/*
* Remove all instances of a device you have made. INCLUDING LINKS.
OpenPOWER on IntegriCloud