Another round of makro killing. Kill _ACX_CONF_FUNC() and replace all

calls with acx_set_conf()/acx_get_conf(). OK mglocker@

4 files changed, 51 insertions, 119 deletions

diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c
index e7c89303e69..5164f046cd5 100644
--- a/sys/dev/ic/acx.c
+++ b/sys/dev/ic/acx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acx.c,v 1.64 2007/02/28 09:09:29 claudio Exp $ */
+/*	$OpenBSD: acx.c,v 1.65 2007/02/28 09:26:26 claudio Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -507,7 +507,8 @@ acx_set_crypt_keys(struct acx_softc *sc)
 
 	/* Set current WEP key index */
 	wep_txkey.wep_txkey = ic->ic_wep_txkey;
-	if (acx_set_wep_txkey_conf(sc, &wep_txkey) != 0) {
+	if (acx_set_conf(sc, ACX_CONF_WEP_TXKEY, &wep_txkey,
+	    sizeof(wep_txkey)) != 0) {
 		printf("%s: set WEP txkey failed\n", sc->sc_dev.dv_xname);
 		return (ENXIO);
 	}
@@ -641,7 +642,7 @@ acx_read_config(struct acx_softc *sc, struct acx_config *conf)
 	int error;
 
 	/* Get region domain */
-	if (acx_get_regdom_conf(sc, &reg_dom) != 0) {
+	if (acx_get_conf(sc, ACX_CONF_REGDOM, &reg_dom, sizeof(reg_dom)) != 0) {
 		printf("%s: can't get region domain\n", sc->sc_dev.dv_xname);
 		return (ENXIO);
 	}
@@ -649,7 +650,7 @@ acx_read_config(struct acx_softc *sc, struct acx_config *conf)
 	DPRINTF(("%s: regdom %02x\n", sc->sc_dev.dv_xname, reg_dom.regdom));
 
 	/* Get antenna */
-	if (acx_get_antenna_conf(sc, &ant) != 0) {
+	if (acx_get_conf(sc, ACX_CONF_ANTENNA, &ant, sizeof(ant)) != 0) {
 		printf("%s: can't get antenna\n", sc->sc_dev.dv_xname);
 		return (ENXIO);
 	}
@@ -671,7 +672,7 @@ acx_read_config(struct acx_softc *sc, struct acx_config *conf)
 	DPRINTF(("%s: sensitivity %02x\n", sc->sc_dev.dv_xname, sen));
 
 	/* Get firmware revision */
-	if (acx_get_fwrev_conf(sc, &fw_rev) != 0) {
+	if (acx_get_conf(sc, ACX_CONF_FWREV, &fw_rev, sizeof(fw_rev)) != 0) {
 		printf("%s: can't get firmware revision\n",
 		    sc->sc_dev.dv_xname);
 		return (ENXIO);
@@ -721,41 +722,45 @@ acx_write_config(struct acx_softc *sc, struct acx_config *conf)
 
 	/* Set number of long/short retry */
 	sretry.nretry = sc->sc_short_retry_limit;
-	if (acx_set_nretry_short_conf(sc, &sretry) != 0) {
+	if (acx_set_conf(sc, ACX_CONF_NRETRY_SHORT, &sretry,
+	    sizeof(sretry)) != 0) {
 		printf("%s: can't set short retry limit\n", ifp->if_xname);
 		return (ENXIO);
 	}
 
 	lretry.nretry = sc->sc_long_retry_limit;
-	if (acx_set_nretry_long_conf(sc, &lretry) != 0) {
+	if (acx_set_conf(sc, ACX_CONF_NRETRY_LONG, &lretry,
+	    sizeof(lretry)) != 0) {
 		printf("%s: can't set long retry limit\n", ifp->if_xname);
 		return (ENXIO);
 	}
 
 	/* Set MSDU lifetime */
 	msdu_lifetime.lifetime = htole32(sc->sc_msdu_lifetime);
-	if (acx_set_msdu_lifetime_conf(sc, &msdu_lifetime) != 0) {
+	if (acx_set_conf(sc, ACX_CONF_MSDU_LIFETIME, &msdu_lifetime,
+	    sizeof(msdu_lifetime)) != 0) {
 		printf("%s: can't set MSDU lifetime\n", ifp->if_xname);
 		return (ENXIO);
 	}
 
 	/* Enable rate fallback */
 	rate_fb.ratefb_enable = 1;
-	if (acx_set_rate_fallback_conf(sc, &rate_fb) != 0) {
+	if (acx_set_conf(sc, ACX_CONF_RATE_FALLBACK, &rate_fb,
+	    sizeof(rate_fb)) != 0) {
 		printf("%s: can't enable rate fallback\n", ifp->if_xname);
 		return (ENXIO);
 	}
 
 	/* Set antenna */
 	ant.antenna = conf->antenna;
-	if (acx_set_antenna_conf(sc, &ant) != 0) {
+	if (acx_set_conf(sc, ACX_CONF_ANTENNA, &ant, sizeof(ant)) != 0) {
 		printf("%s: can't set antenna\n", ifp->if_xname);
 		return (ENXIO);
 	}
 
 	/* Set region domain */
 	reg_dom.regdom = conf->regdom;
-	if (acx_set_regdom_conf(sc, &reg_dom) != 0) {
+	if (acx_set_conf(sc, ACX_CONF_REGDOM, &reg_dom, sizeof(reg_dom)) != 0) {
 		printf("%s: can't set region domain\n", ifp->if_xname);
 		return (ENXIO);
 	}
@@ -773,7 +778,7 @@ acx_write_config(struct acx_softc *sc, struct acx_config *conf)
 	    RXOPT2_RECV_BEACON | RXOPT2_RECV_CF | RXOPT2_RECV_CTRL |
 	    RXOPT2_RECV_DATA | RXOPT2_RECV_MGMT | RXOPT2_RECV_PROBE_REQ |
 	    RXOPT2_RECV_PROBE_RESP | RXOPT2_RECV_OTHER);
-	if (acx_set_rxopt_conf(sc, &rx_opt) != 0) {
+	if (acx_set_conf(sc, ACX_CONF_RXOPT, &rx_opt, sizeof(rx_opt)) != 0) {
 		printf("%s: can't set RX option\n", ifp->if_xname);
 		return (ENXIO);
 	}
@@ -1505,7 +1510,7 @@ acx_load_radio_firmware(struct acx_softc *sc, const char *name)
 	 * Get the position, where base firmware is loaded, so that
 	 * radio firmware can be loaded after it.
 	 */
-	if (acx_get_mmap_conf(sc, &mem_map) != 0) {
+	if (acx_get_conf(sc, ACX_CONF_MMAP, &mem_map, sizeof(mem_map)) != 0) {
 		free(ucode, M_DEVBUF);
 		return (ENXIO);
 	}
@@ -1537,7 +1542,7 @@ acx_load_radio_firmware(struct acx_softc *sc, const char *name)
 		return (ENXIO);
 
 	/* Verify radio firmware's loading position */
-	if (acx_get_mmap_conf(sc, &mem_map) != 0)
+	if (acx_get_conf(sc, ACX_CONF_MMAP, &mem_map, sizeof(mem_map)) != 0)
 		return (ENXIO);
 
 	if (letoh32(mem_map.code_end) != radio_fw_ofs + size) {
diff --git a/sys/dev/ic/acx100.c b/sys/dev/ic/acx100.c
index 93b6b722411..6a00bcd65d0 100644
--- a/sys/dev/ic/acx100.c
+++ b/sys/dev/ic/acx100.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acx100.c,v 1.17 2006/12/17 21:45:49 claudio Exp $ */
+/*	$OpenBSD: acx100.c,v 1.18 2007/02/28 09:26:26 claudio Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -200,22 +200,6 @@ struct acx100_conf_wepkey {
 
 #define ACX100_WEPKEY_ACT_ADD	1
 
-#define ACX100_CONF_FUNC(sg, name)	_ACX_CONF_FUNC(sg, name, 100)
-#define ACX_CONF_fw_ring		ACX100_CONF_FW_RING
-#define ACX_CONF_memblk_size		ACX_CONF_MEMBLK_SIZE
-#define ACX_CONF_mem			ACX100_CONF_MEMOPT
-#define ACX_CONF_cca_mode		ACX_CONF_CCA_MODE
-#define ACX_CONF_ed_thresh		ACX_CONF_ED_THRESH
-#define ACX_CONF_wepkey			ACX_CONF_WEPKEY
-ACX100_CONF_FUNC(set, fw_ring);
-ACX100_CONF_FUNC(set, memblk_size);
-ACX100_CONF_FUNC(set, mem);
-ACX100_CONF_FUNC(get, cca_mode);
-ACX100_CONF_FUNC(set, cca_mode);
-ACX100_CONF_FUNC(get, ed_thresh);
-ACX100_CONF_FUNC(set, ed_thresh);
-ACX100_CONF_FUNC(set, wepkey);
-
 static const uint16_t	acx100_reg[ACXREG_MAX] = {
 	ACXREG(SOFT_RESET,		0x0000),
 
@@ -287,8 +271,7 @@ acx100_set_param(struct acx_softc *sc)
 	sc->chip_ee_eaddr_ofs = ACX100_EE_EADDR_OFS;
 	sc->chip_txdesc1_len = ACX_FRAME_HDRLEN;
 	sc->chip_fw_txdesc_ctrl = DESC_CTRL_AUTODMA |
-	    DESC_CTRL_RECLAIM |
-	    DESC_CTRL_FIRST_FRAG;
+	    DESC_CTRL_RECLAIM | DESC_CTRL_FIRST_FRAG;
 
 	sc->chip_phymode = IEEE80211_MODE_11B;
 	sc->chip_chan_flags = IEEE80211_CHAN_B;
@@ -353,14 +336,14 @@ acx100_init_wep(struct acx_softc *sc)
 	struct ifnet *ifp = &sc->sc_ic.ic_if;
 
 	/* Set WEP cache start/end address */
-	if (acx_get_mmap_conf(sc, &mem_map) != 0) {
+	if (acx_get_conf(sc, ACX_CONF_MMAP, &mem_map, sizeof(mem_map)) != 0) {
 		printf("%s: can't get mmap\n", ifp->if_xname);
 		return (1);
 	}
 
 	mem_map.wep_cache_start = htole32(letoh32(mem_map.code_end) + 4);
 	mem_map.wep_cache_end = htole32(letoh32(mem_map.code_end) + 4);
-	if (acx_set_mmap_conf(sc, &mem_map) != 0) {
+	if (acx_set_conf(sc, ACX_CONF_MMAP, &mem_map, sizeof(mem_map)) != 0) {
 		printf("%s: can't set mmap\n", ifp->if_xname);
 		return (1);
 	}
@@ -368,7 +351,7 @@ acx100_init_wep(struct acx_softc *sc)
 	/* Set WEP options */
 	wep_opt.nkey = htole16(IEEE80211_WEP_NKID + 10);
 	wep_opt.opt = WEPOPT_HDWEP;
-	if (acx_set_wepopt_conf(sc, &wep_opt) != 0) {
+	if (acx_set_conf(sc, ACX_CONF_WEPOPT, &wep_opt, sizeof(wep_opt)) != 0) {
 		printf("%s: can't set wep opt\n", ifp->if_xname);
 		return (1);
 	}
@@ -383,13 +366,13 @@ acx100_init_tmplt(struct acx_softc *sc)
 	struct ifnet *ifp = &sc->sc_ic.ic_if;
 
 	/* Set templates start address */
-	if (acx_get_mmap_conf(sc, &mem_map) != 0) {
+	if (acx_get_conf(sc, ACX_CONF_MMAP, &mem_map, sizeof(mem_map)) != 0) {
 		printf("%s: can't get mmap\n", ifp->if_xname);
 		return (1);
 	}
 
 	mem_map.pkt_tmplt_start = mem_map.wep_cache_end;
-	if (acx_set_mmap_conf(sc, &mem_map) != 0) {
+	if (acx_set_conf(sc, ACX_CONF_MMAP, &mem_map, sizeof(mem_map)) != 0) {
 		printf("%s: can't set mmap\n", ifp->if_xname);
 		return (1);
 	}
@@ -412,7 +395,7 @@ acx100_init_fw_ring(struct acx_softc *sc)
 	uint32_t txring_start, rxring_start, ring_end;
 
 	/* Set firmware descriptor ring start address */
-	if (acx_get_mmap_conf(sc, &mem_map) != 0) {
+	if (acx_get_conf(sc, ACX_CONF_MMAP, &mem_map, sizeof(mem_map)) != 0) {
 		printf("%s: can't get mmap\n", ifp->if_xname);
 		return (1);
 	}
@@ -422,7 +405,7 @@ acx100_init_fw_ring(struct acx_softc *sc)
 	ring_end = rxring_start + ACX100_FW_RXRING_SIZE;
 
 	mem_map.fw_desc_start = htole32(txring_start);
-	if (acx_set_mmap_conf(sc, &mem_map) != 0) {
+	if (acx_set_conf(sc, ACX_CONF_MMAP, &mem_map, sizeof(mem_map)) != 0) {
 		printf("%s: can't set mmap\n", ifp->if_xname);
 		return (1);
 	}
@@ -442,7 +425,7 @@ acx100_init_fw_ring(struct acx_softc *sc)
 
 	ring.opt = ACX100_RINGOPT_AUTO_RESET;
 	ACX100_SET_RING_END(&ring, ring_end);
-	if (acx100_set_fw_ring_conf(sc, &ring) != 0) {
+	if (acx_set_conf(sc, ACX100_CONF_FW_RING, &ring, sizeof(ring)) != 0) {
 		printf("%s: can't set fw ring configure\n", ifp->if_xname);
 		return (1);
 	}
@@ -468,7 +451,7 @@ acx100_init_memory(struct acx_softc *sc)
 	int total_memblk, txblk_num, rxblk_num;
 
 	/* Set memory block start address */
-	if (acx_get_mmap_conf(sc, &mem_map) != 0) {
+	if (acx_get_conf(sc, ACX_CONF_MMAP, &mem_map, sizeof(mem_map)) != 0) {
 		printf("%s: can't get mmap\n", ifp->if_xname);
 		return (1);
 	}
@@ -476,20 +459,21 @@ acx100_init_memory(struct acx_softc *sc)
 	mem_map.memblk_start =
 	    htole32(MEMBLK_ALIGN(letoh32(mem_map.fw_desc_end) + 4));
 
-	if (acx_set_mmap_conf(sc, &mem_map) != 0) {
+	if (acx_set_conf(sc, ACX_CONF_MMAP, &mem_map, sizeof(mem_map)) != 0) {
 		printf("%s: can't set mmap\n", ifp->if_xname);
 		return (1);
 	}
 
 	/* Set memory block size */
 	memblk_sz.memblk_size = htole16(ACX_MEMBLOCK_SIZE);
-	if (acx100_set_memblk_size_conf(sc, &memblk_sz) != 0) {
+	if (acx_set_conf(sc, ACX_CONF_MEMBLK_SIZE, &memblk_sz,
+	    sizeof(memblk_sz)) != 0) {
 		printf("%s: can't set mem block size\n", ifp->if_xname);
 		return (1);
 	}
 
 	/* Get memory map after setting it */
-	if (acx_get_mmap_conf(sc, &mem_map) != 0) {
+	if (acx_get_conf(sc, ACX_CONF_MMAP, &mem_map, sizeof(mem_map)) != 0) {
 		printf("%s: can't get mmap again\n", ifp->if_xname);
 		return (1);
 	}
@@ -517,7 +501,7 @@ acx100_init_memory(struct acx_softc *sc)
 	mem.tx_memblk_addr = htole32(MEMBLK_ALIGN(memblk_start +
 	    (ACX_MEMBLOCK_SIZE * rxblk_num)));
 
-	if (acx100_set_mem_conf(sc, &mem) != 0) {
+	if (acx_set_conf(sc, ACX100_CONF_MEMOPT, &mem, sizeof(mem)) != 0) {
 		printf("%s: can't set mem options\n", ifp->if_xname);
 		return (1);
 	}
@@ -542,10 +526,8 @@ acx100_init_fw_txring(struct acx_softc *sc, uint32_t fw_txdesc_start)
 	int i;
 
 	bzero(&fw_desc, sizeof(fw_desc));
-	fw_desc.f_tx_ctrl = DESC_CTRL_HOSTOWN |
-	    DESC_CTRL_RECLAIM |
-	    DESC_CTRL_AUTODMA |
-	    DESC_CTRL_FIRST_FRAG;
+	fw_desc.f_tx_ctrl = DESC_CTRL_HOSTOWN | DESC_CTRL_RECLAIM |
+	    DESC_CTRL_AUTODMA | DESC_CTRL_FIRST_FRAG;
 
 	tx_buf = sc->sc_buf_data.tx_buf;
 	fw_desc_offset = fw_txdesc_start;
@@ -612,7 +594,7 @@ acx100_read_config(struct acx_softc *sc, struct acx_config *conf)
 	 */
 
 	/* Get CCA mode */
-	if (acx100_get_cca_mode_conf(sc, &cca) != 0) {
+	if (acx_get_conf(sc, ACX_CONF_CCA_MODE, &cca, sizeof(cca)) != 0) {
 		printf("%s: %s can't get cca mode\n",
 		    ifp->if_xname, __func__);
 		return (ENXIO);
@@ -621,7 +603,7 @@ acx100_read_config(struct acx_softc *sc, struct acx_config *conf)
 	DPRINTF(("%s: cca mode %02x\n", ifp->if_xname, cca.cca_mode));
 
 	/* Get ED threshold */
-	if (acx100_get_ed_thresh_conf(sc, &ed) != 0) {
+	if (acx_get_conf(sc, ACX_CONF_ED_THRESH, &ed, sizeof(ed)) != 0) {
 		printf("%s: %s can't get ed threshold\n",
 		    ifp->if_xname, __func__);
 		return (ENXIO);
@@ -641,7 +623,7 @@ acx100_write_config(struct acx_softc *sc, struct acx_config *conf)
 
 	/* Set CCA mode */
 	cca.cca_mode = conf->cca_mode;
-	if (acx100_set_cca_mode_conf(sc, &cca) != 0) {
+	if (acx_set_conf(sc, ACX_CONF_CCA_MODE, &cca, sizeof(cca)) != 0) {
 		printf("%s: %s can't set cca mode\n",
 		    ifp->if_xname, __func__);
 		return (ENXIO);
@@ -649,7 +631,7 @@ acx100_write_config(struct acx_softc *sc, struct acx_config *conf)
 
 	/* Set ED threshold */
 	ed.ed_thresh = conf->ed_thresh;
-	if (acx100_set_ed_thresh_conf(sc, &ed) != 0) {
+	if (acx_set_conf(sc, ACX_CONF_ED_THRESH, &ed, sizeof(ed)) != 0) {
 		printf("%s: %s can't set ed threshold\n",
 		    ifp->if_xname, __func__);
 		return (ENXIO);
@@ -719,7 +701,7 @@ acx100_set_wepkey(struct acx_softc *sc, struct ieee80211_wepkey *wk, int wk_idx)
 	conf_wk.key_len = wk->wk_len;
 	conf_wk.key_idx = wk_idx;
 	bcopy(wk->wk_key, conf_wk.key, wk->wk_len);
-	if (acx100_set_wepkey_conf(sc, &conf_wk) != 0) {
+	if (acx_set_conf(sc, ACX_CONF_WEPKEY, &conf_wk, sizeof(conf_wk)) != 0) {
 		printf("%s: %s set %dth WEP key failed\n",
 		    ifp->if_xname, __func__, wk_idx);
 		return ENXIO;
diff --git a/sys/dev/ic/acx111.c b/sys/dev/ic/acx111.c
index 16ade568c21..7f88bf2f0be 100644
--- a/sys/dev/ic/acx111.c
+++ b/sys/dev/ic/acx111.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acx111.c,v 1.14 2006/12/08 00:04:10 mglocker Exp $ */
+/*	$OpenBSD: acx111.c,v 1.15 2007/02/28 09:26:26 claudio Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -214,17 +214,6 @@ struct acx111_wepkey {
 #define ACX111_WEPKEY_ACT_ADD		1
 #define ACX111_WEPKEY_TYPE_DEFAULT	0
 
-#define ACX111_CONF_FUNC(sg, name)	_ACX_CONF_FUNC(sg, name, 111)
-#define ACX_CONF_mem			ACX111_CONF_MEM
-#define ACX_CONF_meminfo		ACX111_CONF_MEMINFO
-#define ACX_CONF_txpower		ACX_CONF_TXPOWER
-#define ACX_CONF_option			ACX_CONF_OPTION
-ACX111_CONF_FUNC(set, mem);
-ACX111_CONF_FUNC(get, meminfo);
-ACX111_CONF_FUNC(set, txpower);
-ACX111_CONF_FUNC(get, option);
-ACX111_CONF_FUNC(set, option);
-
 static const uint16_t acx111_reg[ACXREG_MAX] = {
 	ACXREG(SOFT_RESET,		0x0000),
 
@@ -362,13 +351,14 @@ acx111_init_memory(struct acx_softc *sc)
 	mem.fw_txring_attr = ACX111_TXRING_ATTR_DEFAULT;
 	mem.fw_txdesc_num = ACX_TX_DESC_CNT;
 
-	if (acx111_set_mem_conf(sc, &mem) != 0) {
+	if (acx_set_conf(sc, ACX111_CONF_MEM, &mem, sizeof(mem)) != 0) {
 		printf("%s: can't set mem\n", ifp->if_xname);
 		return (1);
 	}
 
 	/* Get memory configuration */
-	if (acx111_get_meminfo_conf(sc, &mem_info) != 0) {
+	if (acx_get_conf(sc, ACX111_CONF_MEMINFO, &mem_info,
+	    sizeof(mem_info)) != 0) {
 		printf("%s: can't get meminfo\n", ifp->if_xname);
 		return (1);
 	}
@@ -421,7 +411,8 @@ acx111_write_config(struct acx_softc *sc, struct acx_config *conf)
 
 	/* Set TX power */
 	tx_power.txpower = ACX111_TXPOWER_VAL;
-	if (acx111_set_txpower_conf(sc, &tx_power) != 0) {
+	if (acx_set_conf(sc, ACX_CONF_TXPOWER, &tx_power,
+	    sizeof(tx_power)) != 0) {
 		printf("%s: %s can't set TX power\n",
 		    ifp->if_xname, __func__);
 		return (ENXIO);
@@ -430,7 +421,7 @@ acx111_write_config(struct acx_softc *sc, struct acx_config *conf)
 	/*
 	 * Turn off hardware WEP
 	 */
-	if (acx111_get_option_conf(sc, &opt) != 0) {
+	if (acx_get_conf(sc, ACX_CONF_OPTION, &opt, sizeof(opt)) != 0) {
 		printf("%s: %s can't get option\n", ifp->if_xname, __func__);
 		return (ENXIO);
 	}
@@ -440,7 +431,7 @@ acx111_write_config(struct acx_softc *sc, struct acx_config *conf)
 	    ACX111_DF_NO_RXDECRYPT;
 	opt.dataflow = htole32(dataflow);
 
-	if (acx111_set_option_conf(sc, &opt) != 0) {
+	if (acx_set_conf(sc, ACX_CONF_OPTION, &opt, sizeof(opt)) != 0) {
 		printf("%s: %s can't set option\n", ifp->if_xname, __func__);
 		return (ENXIO);
 	}
diff --git a/sys/dev/ic/acxreg.h b/sys/dev/ic/acxreg.h
index 6229a0f4fa5..3a2e779b38a 100644
--- a/sys/dev/ic/acxreg.h
+++ b/sys/dev/ic/acxreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acxreg.h,v 1.9 2006/12/17 21:45:49 claudio Exp $ */
+/*	$OpenBSD: acxreg.h,v 1.10 2007/02/28 09:26:26 claudio Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -426,52 +426,6 @@ struct acx_tmplt_tim {
 #define ACX_TMPLT_TIM_SIZ(bitmap_len)	\
 	(sizeof(uint16_t) + sizeof(struct tim_head) + (bitmap_len))
 
-#define _ACX_CONF_FUNC(sg, name, chip)			\
-static __inline int					\
-acx##chip##_##sg##_##name##_conf(struct acx_softc *_sc,	\
-	struct acx##chip##_conf_##name *_conf)		\
-{							\
-	return acx_##sg##_conf(_sc, ACX_CONF_##name,	\
-			       _conf, sizeof(*_conf));	\
-}							\
-struct __hack
-
-
-#define ACXCMD_TMPLT_tim	ACXCMD_TMPLT_TIM
-#define ACXCMD_TMPLT_beacon	ACXCMD_TMPLT_BEACON
-#define ACXCMD_TMPLT_probe_resp	ACXCMD_TMPLT_PROBE_RESP
-#define ACXCMD_TMPLT_null_data	ACXCMD_TMPLT_NULL_DATA
-#define ACXCMD_TMPLT_probe_req	ACXCMD_TMPLT_PROBE_REQ
-
-#define ACX_CONF_FUNC(sg, name)	_ACX_CONF_FUNC(sg, name,)
-#define ACX_CONF_wepopt		ACX_CONF_WEPOPT
-#define ACX_CONF_mmap		ACX_CONF_MMAP
-#define ACX_CONF_eaddr		ACX_CONF_EADDR
-#define ACX_CONF_regdom		ACX_CONF_REGDOM
-#define ACX_CONF_antenna	ACX_CONF_ANTENNA
-#define ACX_CONF_fwrev		ACX_CONF_FWREV
-#define ACX_CONF_nretry_long	ACX_CONF_NRETRY_LONG
-#define ACX_CONF_nretry_short	ACX_CONF_NRETRY_SHORT
-#define ACX_CONF_msdu_lifetime	ACX_CONF_MSDU_LIFETIME
-#define ACX_CONF_rate_fallback	ACX_CONF_RATE_FALLBACK
-#define ACX_CONF_rxopt		ACX_CONF_RXOPT
-#define ACX_CONF_wep_txkey	ACX_CONF_WEP_TXKEY
-ACX_CONF_FUNC(get, mmap);
-ACX_CONF_FUNC(set, mmap);
-ACX_CONF_FUNC(set, wepopt);
-ACX_CONF_FUNC(get, eaddr);
-ACX_CONF_FUNC(get, regdom);
-ACX_CONF_FUNC(set, regdom);
-ACX_CONF_FUNC(get, antenna);
-ACX_CONF_FUNC(set, antenna);
-ACX_CONF_FUNC(get, fwrev);
-ACX_CONF_FUNC(set, nretry_long);
-ACX_CONF_FUNC(set, nretry_short);
-ACX_CONF_FUNC(set, msdu_lifetime);
-ACX_CONF_FUNC(set, rate_fallback);
-ACX_CONF_FUNC(set, rxopt);
-ACX_CONF_FUNC(set, wep_txkey);
-
 #define CMDPRM_WRITE_REGION_1(sc, r, rlen)		\
 	bus_space_write_region_1((sc)->sc_mem2_bt,	\
 				 (sc)->sc_mem2_bh,	\