summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorBruce Evans <bde@FreeBSD.org>1998-07-15 12:18:34 +0000
committerBruce Evans <bde@FreeBSD.org>1998-07-15 12:18:34 +0000
commit18da528d41bd24bc59f2622de740bc5630757dc1 (patch)
treef393f16a7da1ff4ae437fa216d9691ad6d32c904 /sys/dev
parent19111ad38160beefc83ac2e956bebf6a3ba695af (diff)
Notes
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/cy/cy.c14
-rw-r--r--sys/dev/cy/cy_isa.c14
-rw-r--r--sys/dev/rp/rp.c4
-rw-r--r--sys/dev/sio/sio.c14
-rw-r--r--sys/dev/syscons/syscons.c4
5 files changed, 25 insertions, 25 deletions
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 04a0a1c00489..7ddfbc000775 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: cy.c,v 1.62 1998/03/18 20:52:28 dg Exp $
+ * $Id: cy.c,v 1.63 1998/06/07 17:10:16 dfr Exp $
*/
#include "opt_compat.h"
@@ -597,27 +597,27 @@ cyattach_common(cy_iobase, cy_align)
#ifdef DEVFS
com->devfs_token_ttyd = devfs_add_devswf(&sio_cdevsw,
unit, DV_CHR,
- UID_ROOT, GID_WHEEL, 0600, "ttyc%n%n", adapter,
+ UID_ROOT, GID_WHEEL, 0600, "ttyc%r%r", adapter,
unit % CY_MAX_PORTS);
com->devfs_token_ttyi = devfs_add_devswf(&sio_cdevsw,
unit | CONTROL_INIT_STATE, DV_CHR,
- UID_ROOT, GID_WHEEL, 0600, "ttyic%n%n", adapter,
+ UID_ROOT, GID_WHEEL, 0600, "ttyic%r%r", adapter,
unit % CY_MAX_PORTS);
com->devfs_token_ttyl = devfs_add_devswf(&sio_cdevsw,
unit | CONTROL_LOCK_STATE, DV_CHR,
- UID_ROOT, GID_WHEEL, 0600, "ttylc%n%n", adapter,
+ UID_ROOT, GID_WHEEL, 0600, "ttylc%r%r", adapter,
unit % CY_MAX_PORTS);
com->devfs_token_cuaa = devfs_add_devswf(&sio_cdevsw,
unit | CALLOUT_MASK, DV_CHR,
- UID_UUCP, GID_DIALER, 0660, "cuac%n%n", adapter,
+ UID_UUCP, GID_DIALER, 0660, "cuac%r%r", adapter,
unit % CY_MAX_PORTS);
com->devfs_token_cuai = devfs_add_devswf(&sio_cdevsw,
unit | CALLOUT_MASK | CONTROL_INIT_STATE, DV_CHR,
- UID_UUCP, GID_DIALER, 0660, "cuaic%n%n", adapter,
+ UID_UUCP, GID_DIALER, 0660, "cuaic%r%r", adapter,
unit % CY_MAX_PORTS);
com->devfs_token_cual = devfs_add_devswf(&sio_cdevsw,
unit | CALLOUT_MASK | CONTROL_LOCK_STATE, DV_CHR,
- UID_UUCP, GID_DIALER, 0660, "cualc%n%n", adapter,
+ UID_UUCP, GID_DIALER, 0660, "cualc%r%r", adapter,
unit % CY_MAX_PORTS);
#endif
}
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 04a0a1c00489..7ddfbc000775 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: cy.c,v 1.62 1998/03/18 20:52:28 dg Exp $
+ * $Id: cy.c,v 1.63 1998/06/07 17:10:16 dfr Exp $
*/
#include "opt_compat.h"
@@ -597,27 +597,27 @@ cyattach_common(cy_iobase, cy_align)
#ifdef DEVFS
com->devfs_token_ttyd = devfs_add_devswf(&sio_cdevsw,
unit, DV_CHR,
- UID_ROOT, GID_WHEEL, 0600, "ttyc%n%n", adapter,
+ UID_ROOT, GID_WHEEL, 0600, "ttyc%r%r", adapter,
unit % CY_MAX_PORTS);
com->devfs_token_ttyi = devfs_add_devswf(&sio_cdevsw,
unit | CONTROL_INIT_STATE, DV_CHR,
- UID_ROOT, GID_WHEEL, 0600, "ttyic%n%n", adapter,
+ UID_ROOT, GID_WHEEL, 0600, "ttyic%r%r", adapter,
unit % CY_MAX_PORTS);
com->devfs_token_ttyl = devfs_add_devswf(&sio_cdevsw,
unit | CONTROL_LOCK_STATE, DV_CHR,
- UID_ROOT, GID_WHEEL, 0600, "ttylc%n%n", adapter,
+ UID_ROOT, GID_WHEEL, 0600, "ttylc%r%r", adapter,
unit % CY_MAX_PORTS);
com->devfs_token_cuaa = devfs_add_devswf(&sio_cdevsw,
unit | CALLOUT_MASK, DV_CHR,
- UID_UUCP, GID_DIALER, 0660, "cuac%n%n", adapter,
+ UID_UUCP, GID_DIALER, 0660, "cuac%r%r", adapter,
unit % CY_MAX_PORTS);
com->devfs_token_cuai = devfs_add_devswf(&sio_cdevsw,
unit | CALLOUT_MASK | CONTROL_INIT_STATE, DV_CHR,
- UID_UUCP, GID_DIALER, 0660, "cuaic%n%n", adapter,
+ UID_UUCP, GID_DIALER, 0660, "cuaic%r%r", adapter,
unit % CY_MAX_PORTS);
com->devfs_token_cual = devfs_add_devswf(&sio_cdevsw,
unit | CALLOUT_MASK | CONTROL_LOCK_STATE, DV_CHR,
- UID_UUCP, GID_DIALER, 0660, "cualc%n%n", adapter,
+ UID_UUCP, GID_DIALER, 0660, "cualc%r%r", adapter,
unit % CY_MAX_PORTS);
#endif
}
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index 1c6e526fe60e..e26c46c9482e 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -1166,10 +1166,10 @@ rp_pciattach(pcici_t tag, int unit)
rp_table(line) = rp;
/* devfs_add_devswf(&rp_cdevsw,
port, DV_CHR, UID_ROOT, GID_WHEEL, 0600,
- "ttyR%n", port);
+ "ttyR%r", port);
devfs_add_devswf(&rp_cdevsw,
port | CONTROL_INIT_STATE, DV_CHR, UID_ROOT,
- GID_WHEEL, 0600, "ttyRi%n", port);
+ GID_WHEEL, 0600, "ttyRi%r", port);
*/
}
}
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 12b149a9f59c..5a7c340cab8c 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
- * $Id: sio.c,v 1.207 1998/06/16 11:05:59 bde Exp $
+ * $Id: sio.c,v 1.208 1998/06/24 09:23:32 phk Exp $
*/
#include "opt_comconsole.h"
@@ -1085,22 +1085,22 @@ determined_type: ;
#ifdef DEVFS
com->devfs_token_ttyd = devfs_add_devswf(&sio_cdevsw,
unit, DV_CHR,
- UID_ROOT, GID_WHEEL, 0600, "ttyd%n", unit);
+ UID_ROOT, GID_WHEEL, 0600, "ttyd%r", unit);
com->devfs_token_ttyi = devfs_add_devswf(&sio_cdevsw,
unit | CONTROL_INIT_STATE, DV_CHR,
- UID_ROOT, GID_WHEEL, 0600, "ttyid%n", unit);
+ UID_ROOT, GID_WHEEL, 0600, "ttyid%r", unit);
com->devfs_token_ttyl = devfs_add_devswf(&sio_cdevsw,
unit | CONTROL_LOCK_STATE, DV_CHR,
- UID_ROOT, GID_WHEEL, 0600, "ttyld%n", unit);
+ UID_ROOT, GID_WHEEL, 0600, "ttyld%r", unit);
com->devfs_token_cuaa = devfs_add_devswf(&sio_cdevsw,
unit | CALLOUT_MASK, DV_CHR,
- UID_UUCP, GID_DIALER, 0660, "cuaa%n", unit);
+ UID_UUCP, GID_DIALER, 0660, "cuaa%r", unit);
com->devfs_token_cuai = devfs_add_devswf(&sio_cdevsw,
unit | CALLOUT_MASK | CONTROL_INIT_STATE, DV_CHR,
- UID_UUCP, GID_DIALER, 0660, "cuaia%n", unit);
+ UID_UUCP, GID_DIALER, 0660, "cuaia%r", unit);
com->devfs_token_cual = devfs_add_devswf(&sio_cdevsw,
unit | CALLOUT_MASK | CONTROL_LOCK_STATE, DV_CHR,
- UID_UUCP, GID_DIALER, 0660, "cuala%n", unit);
+ UID_UUCP, GID_DIALER, 0660, "cuala%r", unit);
#endif
com->id_flags = isdp->id_flags; /* Heritate id_flags for later */
return (1);
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 7b6a36c5547d..4c0c43d6dc08 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: syscons.c,v 1.265 1998/07/06 06:29:07 imp Exp $
+ * $Id: syscons.c,v 1.266 1998/07/14 11:42:05 bde Exp $
*/
#include "sc.h"
@@ -812,7 +812,7 @@ scattach(struct isa_device *dev)
#ifdef DEVFS
for (vc = 0; vc < MAXCONS; vc++)
sc_devfs_token[vc] = devfs_add_devswf(&scdevsw, vc, DV_CHR,
- UID_ROOT, GID_WHEEL, 0600, "ttyv%n", vc);
+ UID_ROOT, GID_WHEEL, 0600, "ttyv%r", vc);
sc_vga_devfs_token = devfs_link(sc_devfs_token[0], "vga");
sc_mouse_devfs_token = devfs_add_devswf(&scdevsw, SC_MOUSE, DV_CHR,
UID_ROOT, GID_WHEEL, 0600, "sysmouse");