From 2bb5d7f9aceb3107c7722aaad6ce7fcd4d6c8288 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Thu, 14 Jul 2005 20:40:42 +0000 Subject: [PATCH] Also provide the function type in the nomatch routine. --- sys/dev/pccard/pccard.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c index 552d2717c08..f9fea3e855b 100644 --- a/sys/dev/pccard/pccard.c +++ b/sys/dev/pccard/pccard.c @@ -969,10 +969,13 @@ pccard_probe_nomatch(device_t bus, device_t child) struct pccard_softc *sc = PCCARD_SOFTC(bus); device_printf(bus, ""); - printf(" (manufacturer=0x%04x, product=0x%04x) at function %d\n", - sc->card.manufacturer, sc->card.product, pf->number); - device_printf(bus, " CIS info: %s, %s, %s\n", sc->card.cis1_info[0], - sc->card.cis1_info[1], sc->card.cis1_info[2]); + printf(" (manufacturer=0x%04x, product=0x%04x, function_type=%d) " + "at function %d\n", sc->card.manufacturer, sc->card.product, + pf->function, pf->number); + device_printf(bus, " CIS info: "); + for (i = 0; sc->card.cis1_info[i] != NULL && i < 4; i++) + printf("%s%s", i > 0 ? ", " : "", sc->card.cis1_info[i]); + printf("\n"); return; }