From owner-p4-projects@FreeBSD.ORG  Thu May 10 15:56:06 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F241A16A406; Thu, 10 May 2007 15:56:05 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id AB1DB16A400
	for <perforce@freebsd.org>; Thu, 10 May 2007 15:56:05 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 9AEC313C44C
	for <perforce@freebsd.org>; Thu, 10 May 2007 15:56:05 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4AFu531021624
	for <perforce@freebsd.org>; Thu, 10 May 2007 15:56:05 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4AFu50L021621
	for perforce@freebsd.org; Thu, 10 May 2007 15:56:05 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 10 May 2007 15:56:05 GMT
Message-Id: <200705101556.l4AFu50L021621@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 119635 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 May 2007 15:56:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=119635

Change 119635 by sam@sam_ebb on 2007/05/10 15:56:00

	add compat shims for in-tree hal

Affected files ...

.. //depot/projects/wifi/sys/dev/ath/if_ath.c#141 edit
.. //depot/projects/wifi/sys/dev/ath/if_athvar.h#56 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ath/if_ath.c#141 (text+ko) ====

@@ -3444,6 +3444,7 @@
 	rix = rs->rs_rate;
 	sc->sc_rx_th.wr_rate = sc->sc_hwmap[rix].ieeerate;
 	sc->sc_rx_th.wr_flags = sc->sc_hwmap[rix].rxflags;
+#if HAL_ABI_VERSION >= 0x07050400
 	if (sc->sc_curchan.channelFlags & CHANNEL_HT) {
 		/*
 		 * For HT operation we must specify the channel
@@ -3462,6 +3463,7 @@
 				    IEEE80211_RADIOTAP_F_SHORTGI;
 		}
 	}
+#endif
 	sc->sc_rx_th.wr_tsf = htole64(ath_extend_tsf(rs->rs_tstamp, tsf));
 	if (rs->rs_status & HAL_RXERR_CRC)
 		sc->sc_rx_th.wr_flags |= IEEE80211_RADIOTAP_F_BADFCS;

==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#56 (text+ko) ====

@@ -586,6 +586,14 @@
 #define	ath_hal_isgsmsku(ah) \
 	((ah)->ah_countryCode == 843)
 #endif
+#if HAL_ABI_VERSION < 0x07050400
+/* compat shims so code compilers--it won't work though */
+#define	CHANNEL_HT20		0x10000
+#define	CHANNEL_HT40PLUS 	0x20000
+#define	CHANNEL_HT40MINUS 	0x40000
+#define	HAL_MODE_11NG_HT20	0x008000
+#define HAL_MODE_11NA_HT20  	0x010000
+#endif
 
 #define	ath_hal_setuprxdesc(_ah, _ds, _size, _intreq) \
 	((*(_ah)->ah_setupRxDesc)((_ah), (_ds), (_size), (_intreq)))