From owner-svn-src-all@FreeBSD.ORG Tue Mar 15 01:06:27 2011 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 D34E6106564A; Tue, 15 Mar 2011 01:06:27 +0000 (UTC) (envelope-from davidch@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A94A38FC12; Tue, 15 Mar 2011 01:06:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2F16RLV017041; Tue, 15 Mar 2011 01:06:27 GMT (envelope-from davidch@svn.freebsd.org) Received: (from davidch@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2F16RFJ017039; Tue, 15 Mar 2011 01:06:27 GMT (envelope-from davidch@svn.freebsd.org) Message-Id: <201103150106.p2F16RFJ017039@svn.freebsd.org> From: David Christensen Date: Tue, 15 Mar 2011 01:06: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: r219656 - in head/sys: dev/bxe modules/bxe 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: Tue, 15 Mar 2011 01:06:27 -0000 Author: davidch Date: Tue Mar 15 01:06:27 2011 New Revision: 219656 URL: http://svn.freebsd.org/changeset/base/219656 Log: - Inadvertently committed files with +x attribute, fixed. - Minor change to info output string. Modified: head/sys/dev/bxe/if_bxe.c (contents, props changed) Directory Properties: head/sys/dev/bxe/bxe_debug.h (props changed) head/sys/dev/bxe/bxe_fw_defs.h (props changed) head/sys/dev/bxe/bxe_hsi.h (props changed) head/sys/dev/bxe/bxe_include.h (props changed) head/sys/dev/bxe/bxe_init.h (props changed) head/sys/dev/bxe/bxe_init_values_e1.h (props changed) head/sys/dev/bxe/bxe_init_values_e1h.h (props changed) head/sys/dev/bxe/bxe_link.c (props changed) head/sys/dev/bxe/bxe_link.h (props changed) head/sys/dev/bxe/bxe_reg.h (props changed) head/sys/dev/bxe/bxe_self_test.h (props changed) head/sys/dev/bxe/dump_e1.h (props changed) head/sys/dev/bxe/dump_e1h.h (props changed) head/sys/dev/bxe/hw_dump_reg_st.h (props changed) head/sys/dev/bxe/if_bxe.h (props changed) head/sys/modules/bxe/Makefile (props changed) Modified: head/sys/dev/bxe/if_bxe.c ============================================================================== --- head/sys/dev/bxe/if_bxe.c Mon Mar 14 23:54:19 2011 (r219655) +++ head/sys/dev/bxe/if_bxe.c Tue Mar 15 01:06:27 2011 (r219656) @@ -986,6 +986,7 @@ bxe_probe(device_t dev) static void bxe_print_adapter_info(struct bxe_softc *sc) { + int i = 0; DBENTER(BXE_EXTREME_LOAD); @@ -1008,17 +1009,26 @@ bxe_print_adapter_info(struct bxe_softc } /* Device features. */ - printf("); Flags ( "); + printf("); Flags ("); /* Miscellaneous flags. */ if (sc->bxe_flags & BXE_USING_MSI_FLAG) - printf("MSI "); - if (sc->bxe_flags & BXE_USING_MSIX_FLAG) - printf("MSI-X "); - if (sc->bxe_flags & BXE_SAFC_TX_FLAG) - printf("SAFC "); - if (TPA_ENABLED(sc)) - printf("TPA "); + printf("MSI"); + + if (sc->bxe_flags & BXE_USING_MSIX_FLAG) { + if (i > 0) printf("|"); + printf("MSI-X"); i++; + } + + if (sc->bxe_flags & BXE_SAFC_TX_FLAG) { + if (i > 0) printf("|"); + printf("SAFC"); i++; + } + + if (TPA_ENABLED(sc)) { + if (i > 0) printf("|"); + printf("TPA"); i++; + } printf(") Queues ("); switch (sc->multi_mode) { @@ -1032,8 +1042,9 @@ bxe_print_adapter_info(struct bxe_softc printf("Unknown"); break; } + /* Firmware versions and device features. */ - BXE_PRINTF("Firmware (%d.%d.%d); Bootcode (%d.%d.%d)\n", + printf("); Firmware (%d.%d.%d); Bootcode (%d.%d.%d)\n", BCM_5710_FW_MAJOR_VERSION, BCM_5710_FW_MINOR_VERSION, BCM_5710_FW_REVISION_VERSION,