From 49ecae83bf6e5a8f787f7d801ddf305dce90cde5 Mon Sep 17 00:00:00 2001 From: zrj Date: Sat, 3 Feb 2018 20:42:11 +0200 Subject: [PATCH] kernel: Remove use of deprecated "%r" radix format. --- sys/dev/misc/kbd/kbd.c | 5 +++-- sys/dev/misc/syscons/syscons.c | 17 ++++++++++------- sys/dev/serial/digi/digi.c | 4 +++- sys/dev/serial/sio/sio.c | 19 ++++++++++++------- 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/sys/dev/misc/kbd/kbd.c b/sys/dev/misc/kbd/kbd.c index 04619fcafa..815dae0ad8 100644 --- a/sys/dev/misc/kbd/kbd.c +++ b/sys/dev/misc/kbd/kbd.c @@ -601,6 +601,7 @@ int kbd_attach(keyboard_t *kbd) { cdev_t dev; + char tbuf[MAKEDEV_MINNBUF]; lwkt_gettoken(&tty_token); if (kbd->kb_index >= keyboards) { @@ -614,8 +615,8 @@ kbd_attach(keyboard_t *kbd) if (kbd->kb_dev == NULL) { kbd->kb_dev = make_dev(&kbd_ops, kbd->kb_index, - UID_ROOT, GID_WHEEL, 0600, - "kbd%r", kbd->kb_index); + UID_ROOT, GID_WHEEL, 0600, "kbd%s", + makedev_unit_b32(tbuf, kbd->kb_index)); } dev = kbd->kb_dev; if (dev->si_drv1 == NULL) { diff --git a/sys/dev/misc/syscons/syscons.c b/sys/dev/misc/syscons/syscons.c index 5948903d92..1122592ba1 100644 --- a/sys/dev/misc/syscons/syscons.c +++ b/sys/dev/misc/syscons/syscons.c @@ -539,6 +539,7 @@ sc_attach_unit(int unit, int flags) int vc; cdev_t dev; flags &= ~SC_KERNEL_CONSOLE; + char tbuf[MAKEDEV_MINNBUF]; if ((flags & SC_EFI_FB) && probe_efi_fb(0) != 0) flags &= ~SC_EFI_FB; @@ -577,9 +578,9 @@ sc_attach_unit(int unit, int flags) if (flags & SC_KERNEL_CONSOLE) { KKASSERT(sc->dev == NULL); sc->dev = kmalloc(sizeof(cdev_t)*sc->vtys, M_SYSCONS, M_WAITOK|M_ZERO); - sc->dev[0] = make_dev(&sc_ops, sc_console_unit*MAXCONS, UID_ROOT, - GID_WHEEL, 0600, - "ttyv%r", sc_console_unit*MAXCONS); + sc->dev[0] = make_dev(&sc_ops, sc_console_unit*MAXCONS, UID_ROOT, + GID_WHEEL, 0600, "ttyv%s", makedev_unit_b32(tbuf, + sc_console_unit * MAXCONS)); sc->dev[0]->si_tty = ttymalloc(sc->dev[0]->si_tty); sc->dev[0]->si_drv1 = sc_console; } @@ -633,8 +634,8 @@ sc_attach_unit(int unit, int flags) */ for (vc = 1; vc < sc->vtys; vc++) { dev = make_dev(&sc_ops, vc + unit * MAXCONS, - UID_ROOT, GID_WHEEL, - 0600, "ttyv%r", vc + unit * MAXCONS); + UID_ROOT, GID_WHEEL, 0600, "ttyv%s", + makedev_unit_b32(tbuf, vc + unit * MAXCONS)); sc->dev[vc] = dev; } cctl_dev = make_dev(&sc_ops, SC_CONSOLECTL, @@ -3187,6 +3188,7 @@ scinit(int unit, int flags) sc_softc_t *sc; scr_stat *scp; video_adapter_t *adp; + char tbuf[MAKEDEV_MINNBUF]; int col; int row; int i; @@ -3286,8 +3288,9 @@ scinit(int unit, int flags) /* assert(sc_malloc) */ sc->dev = kmalloc(sizeof(cdev_t)*sc->vtys, M_SYSCONS, M_WAITOK | M_ZERO); - sc->dev[0] = make_dev(&sc_ops, unit*MAXCONS, UID_ROOT, - GID_WHEEL, 0600, "ttyv%r", unit*MAXCONS); + sc->dev[0] = make_dev(&sc_ops, unit*MAXCONS, UID_ROOT, + GID_WHEEL, 0600, "ttyv%s", + makedev_unit_b32(tbuf, unit * MAXCONS)); sc->dev[0]->si_tty = ttymalloc(sc->dev[0]->si_tty); scp = alloc_scp(sc, sc->first_vty); diff --git a/sys/dev/serial/digi/digi.c b/sys/dev/serial/digi/digi.c index d4688fbc9d..a99bddbcf3 100644 --- a/sys/dev/serial/digi/digi.c +++ b/sys/dev/serial/digi/digi.c @@ -1884,10 +1884,12 @@ digi_errortxt(int id) int digi_attach(struct digi_softc *sc) { + char tbuf[MAKEDEV_MINNBUF]; + lwkt_gettoken(&tty_token); sc->res.ctldev = make_dev(&digi_ops, (sc->res.unit << 16) | CTRL_DEV, UID_ROOT, GID_WHEEL, - 0600, "digi%r.ctl", sc->res.unit); + 0600, "digi%s.ctl", makedev_unit_b32(tbuf, sc->res.unit)); digi_loaddata(sc); digi_init(sc); diff --git a/sys/dev/serial/sio/sio.c b/sys/dev/serial/sio/sio.c index 4588eb9f0c..8ad637bcf6 100644 --- a/sys/dev/serial/sio/sio.c +++ b/sys/dev/serial/sio/sio.c @@ -968,6 +968,8 @@ sioattach(device_t dev, int xrid, u_long rclk) int rid; struct resource *port; int ret; + char tbuf[MAKEDEV_MINNBUF]; + char *unit_in_base32; static int did_init; lwkt_gettoken(&tty_token); @@ -1191,18 +1193,19 @@ determined_type: ; sio_registered = TRUE; } minorbase = UNIT_TO_MINOR(unit); + unit_in_base32 = makedev_unit_b32(tbuf, unit); make_dev(&sio_ops, minorbase, - UID_ROOT, GID_WHEEL, 0600, "ttyd%r", unit); + UID_ROOT, GID_WHEEL, 0600, "ttyd%s", unit_in_base32); make_dev(&sio_ops, minorbase | CONTROL_INIT_STATE, - UID_ROOT, GID_WHEEL, 0600, "ttyid%r", unit); + UID_ROOT, GID_WHEEL, 0600, "ttyid%s", unit_in_base32); make_dev(&sio_ops, minorbase | CONTROL_LOCK_STATE, - UID_ROOT, GID_WHEEL, 0600, "ttyld%r", unit); + UID_ROOT, GID_WHEEL, 0600, "ttyld%s", unit_in_base32); make_dev(&sio_ops, minorbase | CALLOUT_MASK, - UID_UUCP, GID_DIALER, 0660, "cuaa%r", unit); + UID_UUCP, GID_DIALER, 0660, "cuaa%s", unit_in_base32); make_dev(&sio_ops, minorbase | CALLOUT_MASK | CONTROL_INIT_STATE, - UID_UUCP, GID_DIALER, 0660, "cuaia%r", unit); + UID_UUCP, GID_DIALER, 0660, "cuaia%s", unit_in_base32); make_dev(&sio_ops, minorbase | CALLOUT_MASK | CONTROL_LOCK_STATE, - UID_UUCP, GID_DIALER, 0660, "cuala%r", unit); + UID_UUCP, GID_DIALER, 0660, "cuala%s", unit_in_base32); com->flags = flags; com->pps.ppscap = PPS_CAPTUREASSERT | PPS_CAPTURECLEAR; pps_init(&com->pps); @@ -3092,6 +3095,7 @@ static void siocninit_fini(struct consdev *cp) { cdev_t dev; + char tbuf[MAKEDEV_MINNBUF]; int unit; if (cp->cn_probegood) { @@ -3103,7 +3107,8 @@ siocninit_fini(struct consdev *cp) * If it isn't found, the serial port was not attached at all and we * shouldn't be here, so assert this case. */ - dev = devfs_find_device_by_name("ttyd%r", unit); + dev = devfs_find_device_by_name("ttyd%s", + makedev_unit_b32(tbuf, unit)); KKASSERT(dev != NULL); cp->cn_dev = dev; -- 2.41.0