From owner-svn-src-projects@FreeBSD.ORG Fri Nov 28 22:27:27 2008 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB75C1065676; Fri, 28 Nov 2008 22:27:27 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A55008FC22; Fri, 28 Nov 2008 22:27:27 +0000 (UTC) (envelope-from sam@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 mASMRRRO031668; Fri, 28 Nov 2008 22:27:27 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mASMRQU2031654; Fri, 28 Nov 2008 22:27:26 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200811282227.mASMRQU2031654@svn.freebsd.org> From: Sam Leffler Date: Fri, 28 Nov 2008 22:27:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r185418 - in projects/ath_hal: . ar5210 ar5211 ar5212 ar5312 ar5416 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Nov 2008 22:27:27 -0000 Author: sam Date: Fri Nov 28 22:27:26 2008 New Revision: 185418 URL: http://svn.freebsd.org/changeset/base/185418 Log: add chip+rf names for debug msgs, showing compiled-in support, etc. Modified: projects/ath_hal/ah_internal.h projects/ath_hal/ar5210/ar5210_attach.c projects/ath_hal/ar5211/ar5211_attach.c projects/ath_hal/ar5212/ar2316.c projects/ath_hal/ar5212/ar2317.c projects/ath_hal/ar5212/ar2413.c projects/ath_hal/ar5212/ar2425.c projects/ath_hal/ar5212/ar5111.c projects/ath_hal/ar5212/ar5112.c projects/ath_hal/ar5212/ar5212_attach.c projects/ath_hal/ar5212/ar5413.c projects/ath_hal/ar5312/ar5312_attach.c projects/ath_hal/ar5416/ar5416_attach.c projects/ath_hal/ar5416/ar9160_attach.c Modified: projects/ath_hal/ah_internal.h ============================================================================== --- projects/ath_hal/ah_internal.h Fri Nov 28 22:26:36 2008 (r185417) +++ projects/ath_hal/ah_internal.h Fri Nov 28 22:27:26 2008 (r185418) @@ -87,13 +87,15 @@ typedef enum { * Each chip or class of chips registers to offer support. */ struct ath_hal_chip { + const char *name; const char *(*probe)(uint16_t vendorid, uint16_t devid); struct ath_hal *(*attach)(uint16_t devid, HAL_SOFTC, HAL_BUS_TAG, HAL_BUS_HANDLE, HAL_STATUS *error); }; #ifndef AH_CHIP -#define AH_CHIP(name, _probe, _attach) \ +#define AH_CHIP(_name, _probe, _attach) \ static struct ath_hal_chip name##_chip = { \ + .name = #_name, \ .probe = _probe, \ .attach = _attach \ }; \ @@ -106,12 +108,14 @@ OS_DATA_SET(ah_chips, name##_chip) * have a fixed idea about which RF to use. */ struct ath_hal_rf { + const char *name; HAL_BOOL (*probe)(struct ath_hal *ah); HAL_BOOL (*attach)(struct ath_hal *ah, HAL_STATUS *ecode); }; #ifndef AH_RF -#define AH_RF(name, _probe, _attach) \ +#define AH_RF(_name, _probe, _attach) \ static struct ath_hal_rf name##_rf = { \ + .name = #_name, \ .probe = _probe, \ .attach = _attach \ }; \ Modified: projects/ath_hal/ar5210/ar5210_attach.c ============================================================================== --- projects/ath_hal/ar5210/ar5210_attach.c Fri Nov 28 22:26:36 2008 (r185417) +++ projects/ath_hal/ar5210/ar5210_attach.c Fri Nov 28 22:27:26 2008 (r185418) @@ -380,4 +380,4 @@ ar5210Probe(uint16_t vendorid, uint16_t return "Atheros 5210"; return AH_NULL; } -AH_CHIP(ar5210, ar5210Probe, ar5210Attach); +AH_CHIP(AR5210, ar5210Probe, ar5210Attach); Modified: projects/ath_hal/ar5211/ar5211_attach.c ============================================================================== --- projects/ath_hal/ar5211/ar5211_attach.c Fri Nov 28 22:26:36 2008 (r185417) +++ projects/ath_hal/ar5211/ar5211_attach.c Fri Nov 28 22:27:26 2008 (r185418) @@ -513,4 +513,4 @@ ar5211Probe(uint16_t vendorid, uint16_t } return AH_NULL; } -AH_CHIP(ar5211, ar5211Probe, ar5211Attach); +AH_CHIP(AR5211, ar5211Probe, ar5211Attach); Modified: projects/ath_hal/ar5212/ar2316.c ============================================================================== --- projects/ath_hal/ar5212/ar2316.c Fri Nov 28 22:26:36 2008 (r185417) +++ projects/ath_hal/ar5212/ar2316.c Fri Nov 28 22:27:26 2008 (r185418) @@ -764,4 +764,4 @@ ar2316Probe(struct ath_hal *ah) { return IS_2316(ah); } -AH_RF(ar2316, ar2316Probe, ar2316RfAttach); +AH_RF(RF2316, ar2316Probe, ar2316RfAttach); Modified: projects/ath_hal/ar5212/ar2317.c ============================================================================== --- projects/ath_hal/ar5212/ar2317.c Fri Nov 28 22:26:36 2008 (r185417) +++ projects/ath_hal/ar5212/ar2317.c Fri Nov 28 22:27:26 2008 (r185418) @@ -741,4 +741,4 @@ ar2317Probe(struct ath_hal *ah) { return IS_2317(ah); } -AH_RF(ar2317, ar2317Probe, ar2317RfAttach); +AH_RF(RF2317, ar2317Probe, ar2317RfAttach); Modified: projects/ath_hal/ar5212/ar2413.c ============================================================================== --- projects/ath_hal/ar5212/ar2413.c Fri Nov 28 22:26:36 2008 (r185417) +++ projects/ath_hal/ar5212/ar2413.c Fri Nov 28 22:27:26 2008 (r185418) @@ -756,4 +756,4 @@ ar2413Probe(struct ath_hal *ah) { return IS_2413(ah); } -AH_RF(ar2413, ar2413Probe, ar2413RfAttach); +AH_RF(RF2413, ar2413Probe, ar2413RfAttach); Modified: projects/ath_hal/ar5212/ar2425.c ============================================================================== --- projects/ath_hal/ar5212/ar2425.c Fri Nov 28 22:26:36 2008 (r185417) +++ projects/ath_hal/ar5212/ar2425.c Fri Nov 28 22:27:26 2008 (r185418) @@ -719,4 +719,4 @@ ar2425Probe(struct ath_hal *ah) { return IS_2425(ah) || IS_2417(ah); } -AH_RF(ar2425, ar2425Probe, ar2425RfAttach); +AH_RF(RF2425, ar2425Probe, ar2425RfAttach); Modified: projects/ath_hal/ar5212/ar5111.c ============================================================================== --- projects/ath_hal/ar5212/ar5111.c Fri Nov 28 22:26:36 2008 (r185417) +++ projects/ath_hal/ar5212/ar5111.c Fri Nov 28 22:27:26 2008 (r185418) @@ -708,4 +708,4 @@ ar5111Probe(struct ath_hal *ah) { return IS_RAD5111(ah); } -AH_RF(ar5111, ar5111Probe, ar5111RfAttach); +AH_RF(RF5111, ar5111Probe, ar5111RfAttach); Modified: projects/ath_hal/ar5212/ar5112.c ============================================================================== --- projects/ath_hal/ar5212/ar5112.c Fri Nov 28 22:26:36 2008 (r185417) +++ projects/ath_hal/ar5212/ar5112.c Fri Nov 28 22:27:26 2008 (r185418) @@ -878,4 +878,4 @@ ar5112Probe(struct ath_hal *ah) { return IS_RAD5112(ah); } -AH_RF(ar5112, ar5112Probe, ar5112RfAttach); +AH_RF(RF5112, ar5112Probe, ar5112RfAttach); Modified: projects/ath_hal/ar5212/ar5212_attach.c ============================================================================== --- projects/ath_hal/ar5212/ar5212_attach.c Fri Nov 28 22:26:36 2008 (r185417) +++ projects/ath_hal/ar5212/ar5212_attach.c Fri Nov 28 22:27:26 2008 (r185418) @@ -867,4 +867,4 @@ ar5212Probe(uint16_t vendorid, uint16_t } return AH_NULL; } -AH_CHIP(ar5212, ar5212Probe, ar5212Attach); +AH_CHIP(AR5212, ar5212Probe, ar5212Attach); Modified: projects/ath_hal/ar5212/ar5413.c ============================================================================== --- projects/ath_hal/ar5212/ar5413.c Fri Nov 28 22:26:36 2008 (r185417) +++ projects/ath_hal/ar5212/ar5413.c Fri Nov 28 22:27:26 2008 (r185418) @@ -794,4 +794,4 @@ ar5413Probe(struct ath_hal *ah) { return IS_5413(ah); } -AH_RF(ar5413, ar5413Probe, ar5413RfAttach); +AH_RF(RF5413, ar5413Probe, ar5413RfAttach); Modified: projects/ath_hal/ar5312/ar5312_attach.c ============================================================================== --- projects/ath_hal/ar5312/ar5312_attach.c Fri Nov 28 22:26:36 2008 (r185417) +++ projects/ath_hal/ar5312/ar5312_attach.c Fri Nov 28 22:27:26 2008 (r185418) @@ -331,4 +331,4 @@ ar5312Probe(uint16_t vendorid, uint16_t } return AH_NULL; } -AH_CHIP(ar5312, ar5312Probe, ar5312Attach); +AH_CHIP(AR5312, ar5312Probe, ar5312Attach); Modified: projects/ath_hal/ar5416/ar5416_attach.c ============================================================================== --- projects/ath_hal/ar5416/ar5416_attach.c Fri Nov 28 22:26:36 2008 (r185417) +++ projects/ath_hal/ar5416/ar5416_attach.c Fri Nov 28 22:27:26 2008 (r185418) @@ -483,4 +483,4 @@ ar5416Probe(uint16_t vendorid, uint16_t return "Atheros 5416"; return AH_NULL; } -AH_CHIP(ar5416, ar5416Probe, ar5416Attach); +AH_CHIP(AR5416, ar5416Probe, ar5416Attach); Modified: projects/ath_hal/ar5416/ar9160_attach.c ============================================================================== --- projects/ath_hal/ar5416/ar9160_attach.c Fri Nov 28 22:26:36 2008 (r185417) +++ projects/ath_hal/ar5416/ar9160_attach.c Fri Nov 28 22:27:26 2008 (r185418) @@ -304,4 +304,4 @@ ar9160Probe(uint16_t vendorid, uint16_t return "Atheros 9160"; return AH_NULL; } -AH_CHIP(ar9160, ar9160Probe, ar9160Attach); +AH_CHIP(AR9160, ar9160Probe, ar9160Attach);