add some HAL functions (again) inspired by the changes from the

madwifi-old-openhal project. this was backed out the last time because
it was too close to the release and i didn't respect the ABI/API lock.

11 files changed, 235 insertions, 28 deletions

diff --git a/sys/dev/ic/ar5210.c b/sys/dev/ic/ar5210.c
index 1493cd76a86..528576c63a0 100644
--- a/sys/dev/ic/ar5210.c
+++ b/sys/dev/ic/ar5210.c
@@ -1,7 +1,7 @@
-/*     $OpenBSD: ar5210.c,v 1.37 2007/03/12 00:41:32 reyk Exp $        */
+/*     $OpenBSD: ar5210.c,v 1.38 2007/03/12 01:04:52 reyk Exp $        */
 
 /*
- * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
+ * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -171,6 +171,22 @@ ar5k_ar5210_fill(struct ath_hal *hal)
 	AR5K_HAL_FUNCTION(hal, ar5210, eeprom_is_busy);
 	AR5K_HAL_FUNCTION(hal, ar5210, eeprom_read);
 	AR5K_HAL_FUNCTION(hal, ar5210, eeprom_write);
+
+	/*
+	 * Unused functions or functions not implemented
+	 */
+	AR5K_HAL_FUNCTION(hal, ar5210, set_bssid_mask);
+	AR5K_HAL_FUNCTION(hal, ar5210, get_tx_queueprops);
+	AR5K_HAL_FUNCTION(hal, ar5210, num_tx_pending);
+	AR5K_HAL_FUNCTION(hal, ar5210, phy_disable);
+	AR5K_HAL_FUNCTION(hal, ar5210, set_txpower_limit);
+	AR5K_HAL_FUNCTION(hal, ar5210, set_def_antenna);
+	AR5K_HAL_FUNCTION(hal, ar5210, get_def_antenna);
+#ifdef notyet
+	AR5K_HAL_FUNCTION(hal, ar5210, set_capability);
+	AR5K_HAL_FUNCTION(hal, ar5210, proc_mib_event);
+	AR5K_HAL_FUNCTION(hal, ar5210, get_tx_inter_queue);
+#endif
 }
 
 struct ath_hal *
@@ -341,6 +357,13 @@ ar5k_ar5210_detach(struct ath_hal *hal)
 }
 
 HAL_BOOL
+ar5k_ar5210_phy_disable(struct ath_hal *hal)
+{
+	AR5K_REG_WRITE(AR5K_AR5210_PHY_ACTIVE, AR5K_AR5210_PHY_DISABLE);
+	return (AH_TRUE);
+}
+
+HAL_BOOL
 ar5k_ar5210_reset(struct ath_hal *hal, HAL_OPMODE op_mode, HAL_CHANNEL *channel,
     HAL_BOOL change_channel, HAL_STATUS *status)
 {
@@ -434,6 +457,19 @@ ar5k_ar5210_reset(struct ath_hal *hal, HAL_OPMODE op_mode, HAL_CHANNEL *channel,
 }
 
 void
+ar5k_ar5210_set_def_antenna(struct ath_hal *hal, u_int ant)
+{
+	/* Not available */
+	return;
+}
+
+u_int
+ar5k_ar5210_get_def_antenna(struct ath_hal *hal)
+{
+	return (0);
+}
+
+void
 ar5k_ar5210_set_opmode(struct ath_hal *hal)
 {
 	u_int32_t pcu_reg, beacon_reg, low_id, high_id;
@@ -738,6 +774,15 @@ ar5k_ar5210_setup_tx_queueprops(struct ath_hal *hal, int queue,
 }
 
 HAL_BOOL
+ar5k_ar5210_get_tx_queueprops(struct ath_hal *hal, int queue,
+    HAL_TXQ_INFO *queue_info)
+{
+	AR5K_ASSERT_ENTRY(queue, hal->ah_capabilities.cap_queues.q_tx_num);
+	bcopy(&hal->ah_txq[queue], queue_info, sizeof(HAL_TXQ_INFO));
+	return (AH_TRUE);
+}
+
+HAL_BOOL
 ar5k_ar5210_release_tx_queue(struct ath_hal *hal, u_int queue)
 {
 	AR5K_ASSERT_ENTRY(queue, hal->ah_capabilities.cap_queues.q_tx_num);
@@ -873,6 +918,12 @@ ar5k_ar5210_put_tx_buf(struct ath_hal *hal, u_int queue, u_int32_t phys_addr)
 	return (AH_TRUE);
 }
 
+u_int32_t
+ar5k_ar5210_num_tx_pending(struct ath_hal *hal, u_int queue)
+{
+	return (AH_FALSE);
+}
+
 HAL_BOOL
 ar5k_ar5210_tx_start(struct ath_hal *hal, u_int queue)
 {
@@ -1532,6 +1583,13 @@ ar5k_ar5210_set_associd(struct ath_hal *hal, const u_int8_t *bssid,
 }
 
 HAL_BOOL
+ar5k_ar5210_set_bssid_mask(struct ath_hal *hal, const u_int8_t* mask)
+{
+	/* Not supported in 5210 */
+	return (AH_FALSE);
+}
+
+HAL_BOOL
 ar5k_ar5210_set_gpio_output(struct ath_hal *hal, u_int32_t gpio)
 {
 	if (gpio > AR5K_AR5210_NUM_GPIO)
@@ -2319,3 +2377,9 @@ ar5k_ar5210_eeprom_write(struct ath_hal *hal, u_int32_t offset, u_int16_t data)
 	return (ETIMEDOUT);
 }
 
+HAL_BOOL
+ar5k_ar5210_set_txpower_limit(struct ath_hal *hal, u_int power)
+{
+	/* Not implemented */
+	return (AH_FALSE);
+}
diff --git a/sys/dev/ic/ar5210reg.h b/sys/dev/ic/ar5210reg.h
index eb443c263e1..9729f82ccc0 100644
--- a/sys/dev/ic/ar5210reg.h
+++ b/sys/dev/ic/ar5210reg.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: ar5210reg.h,v 1.12 2007/03/05 16:54:33 deraadt Exp $	*/
+/*	$OpenBSD: ar5210reg.h,v 1.13 2007/03/12 01:04:52 reyk Exp $	*/
 
 /*
- * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
+ * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/sys/dev/ic/ar5210var.h b/sys/dev/ic/ar5210var.h
index bf73d52a1cc..5cf4ce41a69 100644
--- a/sys/dev/ic/ar5210var.h
+++ b/sys/dev/ic/ar5210var.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: ar5210var.h,v 1.13 2007/03/05 16:54:33 deraadt Exp $	*/
+/*	$OpenBSD: ar5210var.h,v 1.14 2007/03/12 01:04:52 reyk Exp $	*/
 
 /*
- * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
+ * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/sys/dev/ic/ar5211.c b/sys/dev/ic/ar5211.c
index 56636ce5825..443a63b0752 100644
--- a/sys/dev/ic/ar5211.c
+++ b/sys/dev/ic/ar5211.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: ar5211.c,v 1.32 2007/03/12 00:41:32 reyk Exp $	*/
+/*	$OpenBSD: ar5211.c,v 1.33 2007/03/12 01:04:52 reyk Exp $	*/
 
 /*
- * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
+ * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -175,6 +175,22 @@ ar5k_ar5211_fill(struct ath_hal *hal)
 	AR5K_HAL_FUNCTION(hal, ar5211, eeprom_is_busy);
 	AR5K_HAL_FUNCTION(hal, ar5211, eeprom_read);
 	AR5K_HAL_FUNCTION(hal, ar5211, eeprom_write);
+
+	/*
+	 * Unused functions or functions not implemented
+	 */
+	AR5K_HAL_FUNCTION(hal, ar5211, get_tx_queueprops);
+	AR5K_HAL_FUNCTION(hal, ar5211, num_tx_pending);
+	AR5K_HAL_FUNCTION(hal, ar5211, phy_disable);
+	AR5K_HAL_FUNCTION(hal, ar5211, set_txpower_limit);
+	AR5K_HAL_FUNCTION(hal, ar5211, set_def_antenna);
+	AR5K_HAL_FUNCTION(hal, ar5211, get_def_antenna);
+	AR5K_HAL_FUNCTION(hal, ar5211, set_bssid_mask);
+#ifdef notyet
+	AR5K_HAL_FUNCTION(hal, ar5211, set_capability);
+	AR5K_HAL_FUNCTION(hal, ar5211, proc_mib_event);
+	AR5K_HAL_FUNCTION(hal, ar5211, get_tx_inter_queue);
+#endif
 }
 
 struct ath_hal *
@@ -391,6 +407,13 @@ ar5k_ar5211_detach(struct ath_hal *hal)
 }
 
 HAL_BOOL
+ar5k_ar5211_phy_disable(struct ath_hal *hal)
+{
+	AR5K_REG_WRITE(AR5K_AR5211_PHY_ACTIVE, AR5K_AR5211_PHY_DISABLE);
+	return (AH_TRUE);
+}
+
+HAL_BOOL
 ar5k_ar5211_reset(struct ath_hal *hal, HAL_OPMODE op_mode, HAL_CHANNEL *channel,
     HAL_BOOL change_channel, HAL_STATUS *status)
 {
@@ -644,6 +667,18 @@ ar5k_ar5211_reset(struct ath_hal *hal, HAL_OPMODE op_mode, HAL_CHANNEL *channel,
 }
 
 void
+ar5k_ar5211_set_def_antenna(struct ath_hal *hal, u_int ant)
+{
+	AR5K_REG_WRITE(AR5K_AR5211_DEFAULT_ANTENNA, ant);
+}
+
+u_int
+ar5k_ar5211_get_def_antenna(struct ath_hal *hal)
+{
+	return AR5K_REG_READ(AR5K_AR5211_DEFAULT_ANTENNA);
+}
+
+void
 ar5k_ar5211_set_opmode(struct ath_hal *hal)
 {
 	u_int32_t pcu_reg, low_id, high_id;
@@ -822,6 +857,15 @@ ar5k_ar5211_setup_tx_queueprops(struct ath_hal *hal, int queue,
 }
 
 HAL_BOOL
+ar5k_ar5211_get_tx_queueprops(struct ath_hal *hal, int queue,
+    HAL_TXQ_INFO *queue_info)
+{
+	AR5K_ASSERT_ENTRY(queue, hal->ah_capabilities.cap_queues.q_tx_num);
+	bcopy(&hal->ah_txq[queue], queue_info, sizeof(HAL_TXQ_INFO));
+	return (AH_TRUE);
+}
+
+HAL_BOOL
 ar5k_ar5211_release_tx_queue(struct ath_hal *hal, u_int queue)
 {
 	AR5K_ASSERT_ENTRY(queue, hal->ah_capabilities.cap_queues.q_tx_num);
@@ -1037,6 +1081,13 @@ ar5k_ar5211_put_tx_buf(struct ath_hal *hal, u_int queue, u_int32_t phys_addr)
 	return (AH_TRUE);
 }
 
+u_int32_t
+ar5k_ar5211_num_tx_pending(struct ath_hal *hal, u_int queue)
+{
+	AR5K_ASSERT_ENTRY(queue, hal->ah_capabilities.cap_queues.q_tx_num);
+	return (AR5K_AR5211_QCU_STS(queue) & AR5K_AR5211_QCU_STS_FRMPENDCNT);
+}
+
 HAL_BOOL
 ar5k_ar5211_tx_start(struct ath_hal *hal, u_int queue)
 {
@@ -1638,6 +1689,13 @@ ar5k_ar5211_set_associd(struct ath_hal *hal, const u_int8_t *bssid,
 }
 
 HAL_BOOL
+ar5k_ar5211_set_bssid_mask(struct ath_hal *hal, const u_int8_t* mask)
+{
+	/* Not supported in 5211 */
+	return (AH_FALSE);
+}
+
+HAL_BOOL
 ar5k_ar5211_set_gpio_output(struct ath_hal *hal, u_int32_t gpio)
 {
 	if (gpio > AR5K_AR5211_NUM_GPIO)
@@ -2515,3 +2573,10 @@ ar5k_ar5211_rfregs(struct ath_hal *hal, HAL_CHANNEL *channel, u_int freq,
 
 	hal->ah_rf_gain = HAL_RFGAIN_INACTIVE;
 }
+
+HAL_BOOL
+ar5k_ar5211_set_txpower_limit(struct ath_hal *hal, u_int power)
+{
+	/* Not implemented */
+	return (AH_FALSE);
+}
diff --git a/sys/dev/ic/ar5211reg.h b/sys/dev/ic/ar5211reg.h
index 186399c7932..fcf6ec329cc 100644
--- a/sys/dev/ic/ar5211reg.h
+++ b/sys/dev/ic/ar5211reg.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: ar5211reg.h,v 1.10 2007/03/05 16:54:33 deraadt Exp $	*/
+/*	$OpenBSD: ar5211reg.h,v 1.11 2007/03/12 01:04:52 reyk Exp $	*/
 
 /*
- * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
+ * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/sys/dev/ic/ar5211var.h b/sys/dev/ic/ar5211var.h
index 1c38c362917..c401a95cf9a 100644
--- a/sys/dev/ic/ar5211var.h
+++ b/sys/dev/ic/ar5211var.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: ar5211var.h,v 1.9 2007/03/05 16:54:33 deraadt Exp $	*/
+/*	$OpenBSD: ar5211var.h,v 1.10 2007/03/12 01:04:52 reyk Exp $	*/
 
 /*
- * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
+ * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/sys/dev/ic/ar5212.c b/sys/dev/ic/ar5212.c
index f25e577eed7..87a47163c9d 100644
--- a/sys/dev/ic/ar5212.c
+++ b/sys/dev/ic/ar5212.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: ar5212.c,v 1.38 2007/03/12 00:41:32 reyk Exp $	*/
+/*	$OpenBSD: ar5212.c,v 1.39 2007/03/12 01:04:52 reyk Exp $	*/
 
 /*
- * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
+ * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -172,6 +172,22 @@ ar5k_ar5212_fill(struct ath_hal *hal)
 	AR5K_HAL_FUNCTION(hal, ar5212, eeprom_is_busy);
 	AR5K_HAL_FUNCTION(hal, ar5212, eeprom_read);
 	AR5K_HAL_FUNCTION(hal, ar5212, eeprom_write);
+
+	/*
+	 * Unused functions or functions not implemented
+	 */
+	AR5K_HAL_FUNCTION(hal, ar5212, set_bssid_mask);
+	AR5K_HAL_FUNCTION(hal, ar5212, get_tx_queueprops);
+	AR5K_HAL_FUNCTION(hal, ar5212, num_tx_pending);
+	AR5K_HAL_FUNCTION(hal, ar5212, phy_disable);
+	AR5K_HAL_FUNCTION(hal, ar5212, set_txpower_limit);
+	AR5K_HAL_FUNCTION(hal, ar5212, set_def_antenna);
+	AR5K_HAL_FUNCTION(hal, ar5212, get_def_antenna);
+#ifdef notyet
+	AR5K_HAL_FUNCTION(hal, ar5212, set_capability);
+	AR5K_HAL_FUNCTION(hal, ar5212, proc_mib_event);
+	AR5K_HAL_FUNCTION(hal, ar5212, get_tx_inter_queue);
+#endif
 }
 
 struct ath_hal *
@@ -408,6 +424,13 @@ ar5k_ar5212_detach(struct ath_hal *hal)
 }
 
 HAL_BOOL
+ar5k_ar5212_phy_disable(struct ath_hal *hal)
+{
+	AR5K_REG_WRITE(AR5K_AR5212_PHY_ACTIVE, AR5K_AR5212_PHY_DISABLE);
+	return (AH_TRUE);
+}
+
+HAL_BOOL
 ar5k_ar5212_reset(struct ath_hal *hal, HAL_OPMODE op_mode, HAL_CHANNEL *channel,
     HAL_BOOL change_channel, HAL_STATUS *status)
 {
@@ -792,6 +815,18 @@ ar5k_ar5212_reset(struct ath_hal *hal, HAL_OPMODE op_mode, HAL_CHANNEL *channel,
 }
 
 void
+ar5k_ar5212_set_def_antenna(struct ath_hal *hal, u_int ant)
+{
+	AR5K_REG_WRITE(AR5K_AR5212_DEFAULT_ANTENNA, ant);
+}
+
+u_int
+ar5k_ar5212_get_def_antenna(struct ath_hal *hal)
+{
+	return AR5K_REG_READ(AR5K_AR5212_DEFAULT_ANTENNA);
+}
+
+void
 ar5k_ar5212_set_opmode(struct ath_hal *hal)
 {
 	u_int32_t pcu_reg, low_id, high_id;
@@ -978,6 +1013,15 @@ ar5k_ar5212_setup_tx_queueprops(struct ath_hal *hal, int queue,
 }
 
 HAL_BOOL
+ar5k_ar5212_get_tx_queueprops(struct ath_hal *hal, int queue,
+    HAL_TXQ_INFO *queue_info)
+{
+	AR5K_ASSERT_ENTRY(queue, hal->ah_capabilities.cap_queues.q_tx_num);
+	bcopy(&hal->ah_txq[queue], queue_info, sizeof(HAL_TXQ_INFO));
+	return (AH_TRUE);
+}
+
+HAL_BOOL
 ar5k_ar5212_release_tx_queue(struct ath_hal *hal, u_int queue)
 {
 	AR5K_ASSERT_ENTRY(queue, hal->ah_capabilities.cap_queues.q_tx_num);
@@ -1196,6 +1240,13 @@ ar5k_ar5212_put_tx_buf(struct ath_hal *hal, u_int queue, u_int32_t phys_addr)
 	return (AH_TRUE);
 }
 
+u_int32_t
+ar5k_ar5212_num_tx_pending(struct ath_hal *hal, u_int queue)
+{
+	AR5K_ASSERT_ENTRY(queue, hal->ah_capabilities.cap_queues.q_tx_num);
+	return (AR5K_AR5212_QCU_STS(queue) & AR5K_AR5212_QCU_STS_FRMPENDCNT);
+}
+
 HAL_BOOL
 ar5k_ar5212_tx_start(struct ath_hal *hal, u_int queue)
 {
@@ -1926,6 +1977,20 @@ ar5k_ar5212_set_associd(struct ath_hal *hal, const u_int8_t *bssid,
 }
 
 HAL_BOOL
+ar5k_ar5212_set_bssid_mask(struct ath_hal *hal, const u_int8_t* mask)
+{
+	u_int32_t low_id, high_id; 
+
+	low_id = AR5K_LOW_ID(mask);
+	high_id = 0x0000ffff & AR5K_HIGH_ID(mask);
+
+	AR5K_REG_WRITE(AR5K_AR5212_BSS_IDM0, low_id); 
+	AR5K_REG_WRITE(AR5K_AR5212_BSS_IDM1, high_id); 
+
+	return (AH_TRUE); 
+}
+
+HAL_BOOL
 ar5k_ar5212_set_gpio_output(struct ath_hal *hal, u_int32_t gpio)
 {
 	if (gpio > AR5K_AR5212_NUM_GPIO)
@@ -2882,3 +2947,11 @@ ar5k_ar5212_txpower(struct ath_hal *hal, HAL_CHANNEL *channel, u_int txpower)
 	return (AH_TRUE);
 }
 
+HAL_BOOL
+ar5k_ar5212_set_txpower_limit(struct ath_hal *hal, u_int power)
+{
+	HAL_CHANNEL *channel = &hal->ah_current_channel;
+
+	AR5K_PRINTF("changing txpower to %d\n", power);
+	return (ar5k_ar5212_txpower(hal, channel, power));
+}
diff --git a/sys/dev/ic/ar5212reg.h b/sys/dev/ic/ar5212reg.h
index c240619ed26..2684b603429 100644
--- a/sys/dev/ic/ar5212reg.h
+++ b/sys/dev/ic/ar5212reg.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: ar5212reg.h,v 1.10 2007/03/05 16:54:33 deraadt Exp $	*/
+/*	$OpenBSD: ar5212reg.h,v 1.11 2007/03/12 01:04:52 reyk Exp $	*/
 
 /*
- * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
+ * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/sys/dev/ic/ar5212var.h b/sys/dev/ic/ar5212var.h
index 7ac7adcb0a7..584eb3aff70 100644
--- a/sys/dev/ic/ar5212var.h
+++ b/sys/dev/ic/ar5212var.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: ar5212var.h,v 1.13 2007/03/05 16:54:33 deraadt Exp $	*/
+/*	$OpenBSD: ar5212var.h,v 1.14 2007/03/12 01:04:52 reyk Exp $	*/
 
 /*
- * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
+ * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/sys/dev/ic/ar5xxx.c b/sys/dev/ic/ar5xxx.c
index 3770bd6b9c3..ee5d132810c 100644
--- a/sys/dev/ic/ar5xxx.c
+++ b/sys/dev/ic/ar5xxx.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: ar5xxx.c,v 1.38 2007/03/05 16:54:33 deraadt Exp $	*/
+/*	$OpenBSD: ar5xxx.c,v 1.39 2007/03/12 01:04:52 reyk Exp $	*/
 
 /*
- * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
+ * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/sys/dev/ic/ar5xxx.h b/sys/dev/ic/ar5xxx.h
index a602263f76a..5b1692c7197 100644
--- a/sys/dev/ic/ar5xxx.h
+++ b/sys/dev/ic/ar5xxx.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: ar5xxx.h,v 1.38 2007/03/12 00:41:32 reyk Exp $	*/
+/*	$OpenBSD: ar5xxx.h,v 1.39 2007/03/12 01:04:52 reyk Exp $	*/
 
 /*
- * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
+ * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -1026,11 +1026,6 @@ struct ath_desc {
 	_t HAL_BOOL (_a _n##_is_cipher_supported)(struct ath_hal*, \
 	    HAL_CIPHER); \
 	_t HAL_RFGAIN (_a _n##_get_rf_gain)(struct ath_hal*); \
-	/*								\
-	    u_int32_t (_a _n##_getCurRssi)(struct ath_hal*);		\
-	    u_int32_t (_a _n##_getDefAntenna)(struct ath_hal*);	\
-	    void (_a _n##_setDefAntenna)(struct ath_hal*, u_int32_t ant); \
-	*/								\
 	_t HAL_BOOL (_a _n##_set_slot_time)(struct ath_hal*, u_int);	\
 	_t u_int (_a _n##_get_slot_time)(struct ath_hal*);		\
 	_t HAL_BOOL (_a _n##_set_ack_timeout)(struct ath_hal *, u_int); \
@@ -1079,7 +1074,17 @@ struct ath_desc {
 	_t int (_a _n##_eeprom_read)(struct ath_hal *, u_int32_t offset, \
 	    u_int16_t *data); \
 	_t int (_a _n##_eeprom_write)(struct ath_hal *, u_int32_t offset, \
-	    u_int16_t data);
+	    u_int16_t data); \
+	/* Unused functions */ \
+	_t HAL_BOOL (_a _n##_get_tx_queueprops)(struct ath_hal *, int, \
+	    HAL_TXQ_INFO *); \
+	_t u_int32_t  (_a _n##_num_tx_pending)(struct ath_hal *, u_int); \
+	_t HAL_BOOL (_a _n##_phy_disable)(struct ath_hal *); \
+	_t HAL_BOOL (_a _n##_set_txpower_limit)(struct ath_hal *, u_int); \
+	_t void (_a _n##_set_def_antenna)(struct ath_hal *, u_int); \
+	_t u_int  (_a _n ##_get_def_antenna)(struct ath_hal *); \
+	_t HAL_BOOL (_a _n##_set_bssid_mask)(struct ath_hal *, \
+	    const u_int8_t*);
 
 #define AR5K_MAX_GPIO		10
 #define AR5K_MAX_RF_BANKS	8