diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2018-05-21 17:12:17 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2018-05-21 17:12:17 +0000 |
| commit | e2cd8aebb4a9bca20317a3bd4588cbc09bb7c855 (patch) | |
| tree | 19ad1361d93efa6a5fe9ffda71201695e6816a7b | |
| parent | fd2efbb43bbf7605aaab6ed706f20ee85b72be38 (diff) | |
Make the way we print "not configured" lines for SDIO devices a bit nicer.
ok stsp@
| -rw-r--r-- | sys/dev/sdmmc/sdmmc_io.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/dev/sdmmc/sdmmc_io.c b/sys/dev/sdmmc/sdmmc_io.c index 4d2550f0bca..87259711a69 100644 --- a/sys/dev/sdmmc/sdmmc_io.c +++ b/sys/dev/sdmmc/sdmmc_io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sdmmc_io.c,v 1.32 2018/02/11 20:58:40 patrick Exp $ */ +/* $OpenBSD: sdmmc_io.c,v 1.33 2018/05/21 17:12:16 kettenis Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> @@ -305,19 +305,18 @@ sdmmc_print(void *aux, const char *pnp) if (i != 0) printf("\""); - if (cis->manufacturer != SDMMC_VENDOR_INVALID && + if (cis->manufacturer != SDMMC_VENDOR_INVALID || cis->product != SDMMC_PRODUCT_INVALID) { - printf("%s(", i ? " " : ""); + printf("%s", i ? " " : ""); if (cis->manufacturer != SDMMC_VENDOR_INVALID) - printf("manufacturer 0x%x%s", + printf("manufacturer 0x%04x%s", cis->manufacturer, cis->product == SDMMC_PRODUCT_INVALID ? "" : ", "); if (cis->product != SDMMC_PRODUCT_INVALID) - printf("product 0x%x", cis->product); - printf(")"); + printf("product 0x%04x", cis->product); } - printf("%sat %s", i ? " " : "", pnp); + printf(" at %s", pnp); } printf(" function %d", sf->number); |