Thu Oct 10 23:30:02 2019 UTC ()
use ether_snprintf instead of open coding it.


(bad)
diff -r1.72 -r1.73 src/sys/dev/usb/if_urtwn.c
cvs diff -r1.72 -r1.73 src/sys/dev/usb/if_urtwn.c (expand / switch to unified diff)

--- src/sys/dev/usb/if_urtwn.c 2019/08/19 07:20:07 1.72
+++ src/sys/dev/usb/if_urtwn.c 2019/10/10 23:30:02 1.73
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1/* $NetBSD: if_urtwn.c,v 1.72 2019/08/19 07:20:07 mrg Exp $ */ 1/* $NetBSD: if_urtwn.c,v 1.73 2019/10/10 23:30:02 bad Exp $ */
2/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */ 2/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */
3 3
4/*- 4/*-
5 * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> 5 * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
6 * Copyright (c) 2014 Kevin Lo <kevlo@FreeBSD.org> 6 * Copyright (c) 2014 Kevin Lo <kevlo@FreeBSD.org>
7 * Copyright (c) 2016 Nathanial Sloss <nathanialsloss@yahoo.com.au> 7 * Copyright (c) 2016 Nathanial Sloss <nathanialsloss@yahoo.com.au>
8 * 8 *
9 * Permission to use, copy, modify, and distribute this software for any 9 * Permission to use, copy, modify, and distribute this software for any
10 * purpose with or without fee is hereby granted, provided that the above 10 * purpose with or without fee is hereby granted, provided that the above
11 * copyright notice and this permission notice appear in all copies. 11 * copyright notice and this permission notice appear in all copies.
12 * 12 *
13 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 13 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
14 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 14 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
15 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 15 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
16 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 16 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
17 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 17 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
18 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 18 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
19 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 19 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
20 */ 20 */
21 21
22/*- 22/*-
23 * Driver for Realtek RTL8188CE-VAU/RTL8188CUS/RTL8188EU/RTL8188RU/RTL8192CU 23 * Driver for Realtek RTL8188CE-VAU/RTL8188CUS/RTL8188EU/RTL8188RU/RTL8192CU
24 * RTL8192EU. 24 * RTL8192EU.
25 */ 25 */
26 26
27#include <sys/cdefs.h> 27#include <sys/cdefs.h>
28__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.72 2019/08/19 07:20:07 mrg Exp $"); 28__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.73 2019/10/10 23:30:02 bad Exp $");
29 29
30#ifdef _KERNEL_OPT 30#ifdef _KERNEL_OPT
31#include "opt_inet.h" 31#include "opt_inet.h"
32#include "opt_usb.h" 32#include "opt_usb.h"
33#endif 33#endif
34 34
35#include <sys/param.h> 35#include <sys/param.h>
36#include <sys/sockio.h> 36#include <sys/sockio.h>
37#include <sys/sysctl.h> 37#include <sys/sysctl.h>
38#include <sys/mbuf.h> 38#include <sys/mbuf.h>
39#include <sys/kernel.h> 39#include <sys/kernel.h>
40#include <sys/socket.h> 40#include <sys/socket.h>
41#include <sys/systm.h> 41#include <sys/systm.h>
@@ -1330,30 +1330,28 @@ urtwn_read_chipid(struct urtwn_softc *sc @@ -1330,30 +1330,28 @@ urtwn_read_chipid(struct urtwn_softc *sc
1330static void 1330static void
1331urtwn_dump_rom(struct urtwn_softc *sc, struct r92c_rom *rp) 1331urtwn_dump_rom(struct urtwn_softc *sc, struct r92c_rom *rp)
1332{ 1332{
1333 1333
1334 aprint_normal_dev(sc->sc_dev, 1334 aprint_normal_dev(sc->sc_dev,
1335 "id 0x%04x, dbg_sel 0x%x, vid 0x%x, pid 0x%x\n", 1335 "id 0x%04x, dbg_sel 0x%x, vid 0x%x, pid 0x%x\n",
1336 rp->id, rp->dbg_sel, rp->vid, rp->pid); 1336 rp->id, rp->dbg_sel, rp->vid, rp->pid);
1337 1337
1338 aprint_normal_dev(sc->sc_dev, 1338 aprint_normal_dev(sc->sc_dev,
1339 "usb_opt 0x%x, ep_setting 0x%x, usb_phy 0x%x\n", 1339 "usb_opt 0x%x, ep_setting 0x%x, usb_phy 0x%x\n",
1340 rp->usb_opt, rp->ep_setting, rp->usb_phy); 1340 rp->usb_opt, rp->ep_setting, rp->usb_phy);
1341 1341
1342 aprint_normal_dev(sc->sc_dev, 1342 aprint_normal_dev(sc->sc_dev,
1343 "macaddr %02x:%02x:%02x:%02x:%02x:%02x\n", 1343 "macaddr %s\n",
1344 rp->macaddr[0], rp->macaddr[1], 1344 ether_sprintf(rp->macaddr));
1345 rp->macaddr[2], rp->macaddr[3], 
1346 rp->macaddr[4], rp->macaddr[5]); 
1347 1345
1348 aprint_normal_dev(sc->sc_dev, 1346 aprint_normal_dev(sc->sc_dev,
1349 "string %s, subcustomer_id 0x%x\n", 1347 "string %s, subcustomer_id 0x%x\n",
1350 rp->string, rp->subcustomer_id); 1348 rp->string, rp->subcustomer_id);
1351 1349
1352 aprint_normal_dev(sc->sc_dev, 1350 aprint_normal_dev(sc->sc_dev,
1353 "cck_tx_pwr c0: %d %d %d, c1: %d %d %d\n", 1351 "cck_tx_pwr c0: %d %d %d, c1: %d %d %d\n",
1354 rp->cck_tx_pwr[0][0], rp->cck_tx_pwr[0][1], rp->cck_tx_pwr[0][2], 1352 rp->cck_tx_pwr[0][0], rp->cck_tx_pwr[0][1], rp->cck_tx_pwr[0][2],
1355 rp->cck_tx_pwr[1][0], rp->cck_tx_pwr[1][1], rp->cck_tx_pwr[1][2]); 1353 rp->cck_tx_pwr[1][0], rp->cck_tx_pwr[1][1], rp->cck_tx_pwr[1][2]);
1356 1354
1357 aprint_normal_dev(sc->sc_dev, 1355 aprint_normal_dev(sc->sc_dev,
1358 "ht40_1s_tx_pwr c0 %d %d %d, c1 %d %d %d\n", 1356 "ht40_1s_tx_pwr c0 %d %d %d, c1 %d %d %d\n",
1359 rp->ht40_1s_tx_pwr[0][0], rp->ht40_1s_tx_pwr[0][1], 1357 rp->ht40_1s_tx_pwr[0][0], rp->ht40_1s_tx_pwr[0][1],