On Fri, Oct 27 2017, Mikhail <[email protected]> wrote:
> add missed DEVNAME's and \n's
They are not missing. The point is to have _attach() print a single
line in dmesg.
PS: your diff would not apply (mangled whitespace)
> Index: dev/usb/if_urndis.c
> ===================================================================
> RCS file: /home/misha/work/cvs/src/sys/dev/usb/if_urndis.c,v
> retrieving revision 1.67
> diff -u -p -r1.67 if_urndis.c
> --- dev/usb/if_urndis.c 19 Jul 2017 16:31:56 -0000 1.67
> +++ dev/usb/if_urndis.c 27 Oct 2017 12:10:28 -0000
> @@ -1396,7 +1396,7 @@ urndis_attach(struct device *parent, str
> }
>
> uc = urndis_lookup(id);
> - printf("%s: using %s", DEVNAME(sc), uc->typestr);
> + printf("%s: using %s\n", DEVNAME(sc), uc->typestr);
>
> id = usbd_get_interface_descriptor(sc->sc_iface_data);
> cd = usbd_get_config_descriptor(sc->sc_udev);
> @@ -1404,7 +1404,8 @@ urndis_attach(struct device *parent, str
>
> for (j = 0; j < altcnt; j++) {
> if (usbd_set_interface(sc->sc_iface_data, j)) {
> - printf(": interface alternate setting %u failed\n", j);
> + printf("%s: interface alternate setting %u failed\n",
> + DEVNAME(sc), j);
> return;
> }
> /* Find endpoints. */
> @@ -1414,8 +1415,8 @@ urndis_attach(struct device *parent, str
> ed = usbd_interface2endpoint_descriptor(
> sc->sc_iface_data, i);
> if (!ed) {
> - printf(": no descriptor for bulk endpoint "
> - "%u\n", i);
> + printf("%s: no descriptor for bulk endpoint "
> + "%u\n", DEVNAME(sc), i);
> return;
> }
> if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
> @@ -1439,9 +1440,9 @@ urndis_attach(struct device *parent, str
> }
>
> if (sc->sc_bulkin_no == -1)
> - printf(": could not find data bulk in\n");
> + printf("%s: could not find data bulk in\n", DEVNAME(sc));
> if (sc->sc_bulkout_no == -1 )
> - printf(": could not find data bulk out\n");
> + printf("%s: could not find data bulk out\n", DEVNAME(sc));
> return;
>
> found:
> @@ -1461,7 +1462,7 @@ urndis_attach(struct device *parent, str
>
> if (urndis_ctrl_query(sc, OID_802_3_PERMANENT_ADDRESS, NULL, 0,
> &buf, &bufsz) != RNDIS_STATUS_SUCCESS) {
> - printf(": unable to get hardware address\n");
> + printf("%s: unable to get hardware address\n", DEVNAME(sc));
> splx(s);
> return;
> }
>
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
