move ieee80211_compute_duration() and ieee80211_compute_duration1()

functions into the two drivers that use them (atw and rtw.)
this code is not generic enough to be used by other drivers and
there is no chance that it will ever be used in newer driver since
it supports 802.11b only.
plus, it hurts my eyes each time i look into ieee80211_output.c.

"fine with me as long as the logic doesn't change in the functions" jsg@

1 files changed, 11 insertions, 3 deletions

diff --git a/sys/dev/ic/atwvar.h b/sys/dev/ic/atwvar.h
index e1e23c11116..0bb116e1a1f 100644
--- a/sys/dev/ic/atwvar.h
+++ b/sys/dev/ic/atwvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atwvar.h,v 1.12 2006/06/27 04:25:12 jsg Exp $	*/
+/*	$OpenBSD: atwvar.h,v 1.13 2007/06/07 20:20:15 damien Exp $	*/
 /*	$NetBSD: atwvar.h,v 1.13 2004/07/23 07:07:55 dyoung Exp $	*/
 
 /*
@@ -95,6 +95,14 @@ struct atw_control_data {
 #define	ATW_CDOFF(x)		offsetof(struct atw_control_data, x)
 #define	ATW_CDTXOFF(x)	ATW_CDOFF(acd_txdescs[(x)])
 #define	ATW_CDRXOFF(x)	ATW_CDOFF(acd_rxdescs[(x)])
+
+struct atw_duration {
+	uint16_t	d_rts_dur;
+	uint16_t	d_data_dur;
+	uint16_t	d_plcp_len;
+	uint8_t		d_residue;	/* unused octets in time slot */
+};
+
 /*
  * Software state for transmit jobs.
  */
@@ -104,8 +112,8 @@ struct atw_txsoft {
 	int txs_firstdesc;		/* first descriptor in packet */
 	int txs_lastdesc;		/* last descriptor in packet */
 	int txs_ndescs;			/* number of descriptors */
-	struct ieee80211_duration txs_d0;
-	struct ieee80211_duration txs_dn;
+	struct atw_duration txs_d0;
+	struct atw_duration txs_dn;
 	SIMPLEQ_ENTRY(atw_txsoft) txs_q;
 };