From owner-svn-src-all@FreeBSD.ORG Thu Mar 12 07:18:28 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4BD3B1065670; Thu, 12 Mar 2009 07:18:28 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 04B758FC1F; Thu, 12 Mar 2009 07:18:28 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2C7IRac020382; Thu, 12 Mar 2009 07:18:27 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2C7IRsR020381; Thu, 12 Mar 2009 07:18:27 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200903120718.n2C7IRsR020381@svn.freebsd.org> From: Warner Losh Date: Thu, 12 Mar 2009 07:18:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189728 - head/sys/dev/fe X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2009 07:18:28 -0000 Author: imp Date: Thu Mar 12 07:18:27 2009 New Revision: 189728 URL: http://svn.freebsd.org/changeset/base/189728 Log: Fix the whitespace in this file to be consistent with itself and with the rest of the project's files. s/sn_/fe_/ in a routine name that I copied from sn. Modified: head/sys/dev/fe/if_fe_pccard.c Modified: head/sys/dev/fe/if_fe_pccard.c ============================================================================== --- head/sys/dev/fe/if_fe_pccard.c Thu Mar 12 06:36:44 2009 (r189727) +++ head/sys/dev/fe/if_fe_pccard.c Thu Mar 12 07:18:27 2009 (r189728) @@ -60,7 +60,7 @@ static int fe_pccard_attach(device_t); static int fe_pccard_detach(device_t); static const struct fe_pccard_product { - struct pccard_product mpp_product; + struct pccard_product mpp_product; int mpp_flags; #define MPP_MBH10302 1 #define MPP_ANYFUNC 2 @@ -72,19 +72,19 @@ static const struct fe_pccard_product { { PCMCIA_CARD(FUJITSU2, FMV_J182A), 0 }, { PCMCIA_CARD(FUJITSU2, ITCFJ182A), 0 }, /* These need to be second */ - { PCMCIA_CARD(TDK, LAK_CD021BX), 0 }, - { PCMCIA_CARD(TDK, LAK_CF010), 0 }, + { PCMCIA_CARD(TDK, LAK_CD021BX), 0 }, + { PCMCIA_CARD(TDK, LAK_CF010), 0 }, #if 0 /* XXX 86960-based? */ - { PCMCIA_CARD(TDK, LAK_DFL9610), 0 }, + { PCMCIA_CARD(TDK, LAK_DFL9610), 0 }, #endif - { PCMCIA_CARD(CONTEC, CNETPC), 0 }, + { PCMCIA_CARD(CONTEC, CNETPC), 0 }, { PCMCIA_CARD(FUJITSU, LA501), 0 }, { PCMCIA_CARD(FUJITSU, LA10S), 0 }, { PCMCIA_CARD(FUJITSU, NE200T), MPP_MBH10302 },/* Sold by Eagle */ { PCMCIA_CARD(HITACHI, HT_4840), MPP_MBH10302 | MPP_SKIP_TO_CFE_10}, { PCMCIA_CARD(RATOC, REX_R280), 0 }, { PCMCIA_CARD(XIRCOM, CE), MPP_ANYFUNC }, - { { NULL } } + { { NULL } } }; static int @@ -92,12 +92,12 @@ fe_pccard_probe(device_t dev) { int error; uint32_t fcn = PCCARD_FUNCTION_UNSPEC; - const struct fe_pccard_product *pp; + const struct fe_pccard_product *pp; int i; - if ((pp = (const struct fe_pccard_product *)pccard_product_lookup(dev, - (const struct pccard_product *)fe_pccard_products, - sizeof(fe_pccard_products[0]), NULL)) != NULL) { + if ((pp = (const struct fe_pccard_product *)pccard_product_lookup(dev, + (const struct pccard_product *)fe_pccard_products, + sizeof(fe_pccard_products[0]), NULL)) != NULL) { if (pp->mpp_product.pp_name != NULL) device_set_desc(dev, pp->mpp_product.pp_name); if (pp->mpp_flags & MPP_ANYFUNC) @@ -119,15 +119,15 @@ fe_pccard_probe(device_t dev) } good:; return (0); - } - return (ENXIO); + } + return (ENXIO); } static device_method_t fe_pccard_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, fe_pccard_probe), - DEVMETHOD(device_attach, fe_pccard_attach), - DEVMETHOD(device_detach, fe_pccard_detach), + /* Device interface */ + DEVMETHOD(device_probe, fe_pccard_probe), + DEVMETHOD(device_attach, fe_pccard_attach), + DEVMETHOD(device_detach, fe_pccard_detach), { 0, 0 } }; @@ -143,23 +143,21 @@ MODULE_DEPEND(fe, pccard, 1, 1, 1); static int fe_probe_mbh(device_t, const struct fe_pccard_product *); static int fe_probe_tdk(device_t, const struct fe_pccard_product *); -/* - * Initialize the device - called from Slot manager. - */ + static int fe_pccard_attach(device_t dev) { struct fe_softc *sc; - const struct fe_pccard_product *pp; + const struct fe_pccard_product *pp; int error; /* Prepare for the device probe process. */ sc = device_get_softc(dev); sc->sc_unit = device_get_unit(dev); - pp = (const struct fe_pccard_product *) pccard_product_lookup(dev, + pp = (const struct fe_pccard_product *) pccard_product_lookup(dev, (const struct pccard_product *)fe_pccard_products, - sizeof(fe_pccard_products[0]), NULL); + sizeof(fe_pccard_products[0]), NULL); if (pp == NULL) return (ENXIO); @@ -269,7 +267,7 @@ fe_probe_mbh(device_t dev, const struct } static int -sn_pccard_xircom_mac(const struct pccard_tuple *tuple, void *argp) +fe_pccard_xircom_mac(const struct pccard_tuple *tuple, void *argp) { uint8_t *enaddr = argp; int i; @@ -317,41 +315,41 @@ fe_probe_tdk (device_t dev, const struct { struct fe_softc *sc = device_get_softc(dev); - static struct fe_simple_probe_struct probe_table [] = { - { FE_DLCR2, 0x10, 0x00 }, - { FE_DLCR4, 0x08, 0x00 }, - /* { FE_DLCR5, 0x80, 0x00 }, Does not work well. */ - { 0 } - }; + static struct fe_simple_probe_struct probe_table [] = { + { FE_DLCR2, 0x10, 0x00 }, + { FE_DLCR4, 0x08, 0x00 }, +/* { FE_DLCR5, 0x80, 0x00 }, Does not work well. */ + { 0 } + }; - /* C-NET(PC)C occupies 16 I/O addresses. */ + /* C-NET(PC)C occupies 16 I/O addresses. */ if (fe_alloc_port(dev, 16)) return ENXIO; /* Fill the softc struct with default values. */ fe_softc_defaults(sc); - /* - * See if C-NET(PC)C is on its address. - */ - if (!fe_simple_probe(sc, probe_table)) + /* + * See if C-NET(PC)C is on its address. + */ + if (!fe_simple_probe(sc, probe_table)) return ENXIO; - /* Determine the card type. */ + /* Determine the card type. */ sc->type = FE_TYPE_TDK; - sc->typestr = "Generic MB8696x/78Q837x Ethernet (PCMCIA)"; + sc->typestr = "Generic MB8696x/78Q837x Ethernet (PCMCIA)"; pccard_get_ether(dev, sc->enaddr); - /* Make sure we got a valid station address. */ - if (!fe_valid_Ether_p(sc->enaddr, 0)) { - pccard_cis_scan(dev, sn_pccard_xircom_mac, sc->enaddr); + /* Make sure we got a valid station address. */ + if (!fe_valid_Ether_p(sc->enaddr, 0)) { + pccard_cis_scan(dev, fe_pccard_xircom_mac, sc->enaddr); } - /* Make sure we got a valid station address. */ - if (!fe_valid_Ether_p(sc->enaddr, 0)) + /* Make sure we got a valid station address. */ + if (!fe_valid_Ether_p(sc->enaddr, 0)) return ENXIO; - return 0; + return 0; }