From ba8d06c99014c66bcf01210e970cc5d9a0d72d09 Mon Sep 17 00:00:00 2001 From: dholland Date: Sun, 12 Oct 2008 02:15:02 +0000 Subject: [PATCH] Fix mangled attach output. Noted by Jari Kuittinen. --- sys/dev/cardbus/if_ral_cardbus.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/dev/cardbus/if_ral_cardbus.c b/sys/dev/cardbus/if_ral_cardbus.c index 7c6be81861d3..77ca13a723ff 100644 --- a/sys/dev/cardbus/if_ral_cardbus.c +++ b/sys/dev/cardbus/if_ral_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ral_cardbus.c,v 1.13 2008/06/24 19:44:52 drochner Exp $ */ +/* $NetBSD: if_ral_cardbus.c,v 1.14 2008/10/12 02:15:02 dholland Exp $ */ /* $OpenBSD: if_ral_cardbus.c,v 1.6 2006/01/09 20:03:31 damien Exp $ */ /*- @@ -22,7 +22,7 @@ * CardBus front-end for the Ralink RT2560/RT2561/RT2561S/RT2661 driver. */ #include -__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.13 2008/06/24 19:44:52 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.14 2008/10/12 02:15:02 dholland Exp $"); #include "bpfilter.h" @@ -134,8 +134,13 @@ ral_cardbus_attach(struct device *parent, struct device *self, struct rt2560_softc *sc = &csc->sc_sc; struct cardbus_attach_args *ca = aux; cardbus_devfunc_t ct = ca->ca_ct; + char devinfo[256]; bus_addr_t base; - int error; + int error, revision; + + pci_devinfo(ca->ca_id, ca->ca_class, 0, devinfo, sizeof(devinfo)); + revision = PCI_REVISION(ca->ca_class); + aprint_normal(": %s (rev. 0x%02x)\n", devinfo, revision); csc->sc_opns = (CARDBUS_PRODUCT(ca->ca_id) == PCI_PRODUCT_RALINK_RT2560) ?