PERFORCE change 119635 for review

[Sam Leffler]

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

Change 119635 by sam at 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)))