From e70053b6a658502cd334638c14e377e91e5d5018 Mon Sep 17 00:00:00 2001 From: David Planella Date: Sat, 31 May 2008 21:36:32 +0200 Subject: [PATCH] Revert "Rename all ACX_IE_* to ACX_REG_*: we talk about registers here" This reverts commit 56a8d0bea0c46530541afbdca8fad13387a9f58f. Conflicts: acx_mmio.h usb.c There is no need to refactor IE to REG. IE refers to Information Elements, which was the original name for these logical structures. Unless there is a solid reason against it, they should retain their original name, regardless of their implementation (e.g. memory-mapped registers). There are also some functions and references throughout the code which make reference to these Information Elements, so we should be careful about renaming. --- acx_mmio.h | 403 +++++++++++++++++++++++++++++------------------------------ acx_struct.h | 6 +- common.c | 290 +++++++++++++++++++++--------------------- pci.c | 20 +-- usb.c | 8 +- 5 files changed, 357 insertions(+), 370 deletions(-) diff --git a/acx_mmio.h b/acx_mmio.h index a02900e..075063c 100644 --- a/acx_mmio.h +++ b/acx_mmio.h @@ -2,9 +2,9 @@ #define _ACX_MMIO_H_ /* - * acx_mmio.h: querying/configuration commands and on-chip (EEPROM?) registers. - * Differ depending on the chipset and bus type (PCI or USB - it appears that - * VLYNQ behaves like PCI most of the time - most). + * acx_mmio.h: querying/configuration commands. Differ depending on the + * chipset and bus type (PCI or USB - it appears that VLYNQ behaves like PCI + * most of the time - most). * * Copyright (c) 2003, 2008 ACX100 driver project. * @@ -15,9 +15,7 @@ * just cannot make sense of the first part right now. * * See also the file README.unknowncommands: it contains other commands gathered - * from snooping/anyothermeans of unhandled TI chipsets. Note that what was - * called ACX.._IE_ before is now called ACX.._REG_, because what we talk about - * here are really registers. + * from snooping/anyothermeans of unhandled TI chipsets. * * ---------------------------------------------------------------------------- * NB: length includes JUST the data part of the IE @@ -29,6 +27,197 @@ */ +/* Information Elements: Network Parameters, Static Configuration Entities */ +/* these are handled by real_cfgtable in firmware "Rev 1.5.0" (FW150) */ +//DEF_IE(1xx_IE_UNKNOWN_00 ,0x0000, -1); /* mapped to cfgInvalid in FW150 */ +#define ACX100_IE_ACX_TIMER (0x0001) +#define ACX100_IE_ACX_TIMER_LEN (0x10) +/* TNETW1450: length 0x18!! */ +#define ACX1xx_IE_POWER_MGMT (0x0002) +#define ACX1xx_IE_POWER_MGMT_LEN (0x06) +#define ACX1xx_IE_QUEUE_CONFIG (0x0003) +#define ACX1xx_IE_QUEUE_CONFIG_LEN (0x1c) +#define ACX100_IE_BLOCK_SIZE (0x0004) +#define ACX100_IE_BLOCK_SIZE_LEN (0x02) +/* later firmware versions only? */ +#define ACX1FF_IE_SLOT_TIME (0x0004) +#define ACX1FF_IE_SLOT_TIME_LEN (0x08) +#define ACX1xx_IE_MEMORY_CONFIG_OPTIONS (0x0005) +#define ACX1xx_IE_MEMORY_CONFIG_OPTIONS_LEN (0x14) +#define ACX1FF_IE_QUEUE_HEAD (0x0005) +#define ACX1FF_IE_QUEUE_HEAD_LEN (0x14 /* FIXME: length? */) +/* TNETW1450: length 2 */ +#define ACX1xx_IE_RATE_FALLBACK (0x0006) +#define ACX1xx_IE_RATE_FALLBACK_LEN (0x01) +#define ACX100_IE_WEP_OPTIONS (0x0007) +#define ACX100_IE_WEP_OPTIONS_LEN (0x03) +#define ACX111_IE_RADIO_BAND (0x0007) +#define ACX111_IE_RADIO_BAND_LEN (-1) +/* later firmware versions; TNETW1450 only? */ +#define ACX1FF_IE_TIMING_CFG (0x0007) +#define ACX1FF_IE_TIMING_CFG_LEN (-1) +/* huh? */ +#define ACX100_IE_SSID (0x0008) +#define ACX100_IE_SSID_LEN (0x20) +/* huh? TNETW1450 has length 0x40!! */ +#define ACX1xx_IE_MEMORY_MAP (0x0008) +#define ACX1xx_IE_MEMORY_MAP_LEN (0x28) +/* mapped to cfgInvalid in FW150 */ +#define ACX1xx_IE_SCAN_STATUS (0x0009) +#define ACX1xx_IE_SCAN_STATUS_LEN (0x04) +#define ACX1xx_IE_ASSOC_ID (0x000a) +#define ACX1xx_IE_ASSOC_ID_LEN (0x02) +/* mapped to cfgInvalid in FW150 */ +#define ACX1xx_IE_UNKNOWN_0B (0x000b) +#define ACX1xx_IE_UNKNOWN_0B_LEN (-1) +/* later firmware versions; TNETW1450 only? */ +#define ACX1FF_IE_TX_POWER_LEVEL_TABLE (0x000b) +#define ACX1FF_IE_TX_POWER_LEVEL_TABLE_LEN (0x18) +/* very small implementation in FW150! */ +#define ACX100_IE_UNKNOWN_0C (0x000c) +#define ACX100_IE_UNKNOWN_0C_LEN (-1) +/* + * ACX100 has an equivalent struct in the cmd mailbox directly after reset. + * 0x14c seems extremely large, will trash stack on failure (memset!) + * in case of small input struct --> OOPS! + */ +#define ACX111_IE_CONFIG_OPTIONS (0x000c) +#define ACX111_IE_CONFIG_OPTIONS_LEN (0x14c) +#define ACX1xx_IE_FWREV (0x000d) +#define ACX1xx_IE_FWREV_LEN (0x18) +#define ACX1xx_IE_FCS_ERROR_COUNT (0x000e) +#define ACX1xx_IE_FCS_ERROR_COUNT_LEN (0x04) +#define ACX1xx_IE_MEDIUM_USAGE (0x000f) +#define ACX1xx_IE_MEDIUM_USAGE_LEN (0x08) +#define ACX1xx_IE_RXCONFIG (0x0010) +#define ACX1xx_IE_RXCONFIG_LEN (0x04) +/* NONBINARY: large implementation in FW150! link quality readings or so? */ +#define ACX100_IE_UNKNOWN_11 (0x0011) +#define ACX100_IE_UNKNOWN_11_LEN (-1) +#define ACX111_IE_QUEUE_THRESH (0x0011) +#define ACX111_IE_QUEUE_THRESH_LEN (-1) +/* NONBINARY: VERY large implementation in FW150!! */ +#define ACX100_IE_UNKNOWN_12 (0x0012) +#define ACX100_IE_UNKNOWN_12_LEN (-1) +#define ACX111_IE_BSS_POWER_SAVE (0x0012) +#define ACX111_IE_BSS_POWER_SAVE_LEN (/* -1 */ 2) +/* TNETW1450: length 0x134!! */ +#define ACX1xx_IE_FIRMWARE_STATISTICS (0x0013) +#define ACX1xx_IE_FIRMWARE_STATISTICS_LEN (0x9c) +/* later firmware versions, TNETW1450 only? */ +#define ACX1FF_IE_RX_INTR_CONFIG (0x0014) +#define ACX1FF_IE_RX_INTR_CONFIG_LEN (0x14) +#define ACX1xx_IE_FEATURE_CONFIG (0x0015) +#define ACX1xx_IE_FEATURE_CONFIG_LEN (0x08) +/* for rekeying. really len=4?? */ +#define ACX111_IE_KEY_CHOOSE (0x0016) +#define ACX111_IE_KEY_CHOOSE_LEN (0x04) +/* later firmware versions, TNETW1450 only? */ +#define ACX1FF_IE_MISC_CONFIG_TABLE (0x0017) +#define ACX1FF_IE_MISC_CONFIG_TABLE_LEN (0x04) +/* later firmware versions, TNETW1450 only? */ +#define ACX1FF_IE_WONE_CONFIG (0x0018) +#define ACX1FF_IE_WONE_CONFIG_LEN (-1) +/* later firmware versions, TNETW1450 only? */ +#define ACX1FF_IE_TID_CONFIG (0x001a) +#define ACX1FF_IE_TID_CONFIG_LEN (0x2c) +/* later firmware versions, TNETW1450 only? */ +#define ACX1FF_IE_CALIB_ASSESSMENT (0x001e) +#define ACX1FF_IE_CALIB_ASSESSMENT_LEN (0x04) +/* later firmware versions, TNETW1450 only? */ +#define ACX1FF_IE_BEACON_FILTER_OPTIONS (0x001f) +#define ACX1FF_IE_BEACON_FILTER_OPTIONS_LEN (0x02) +/* later firmware versions, TNETW1450 only? */ +#define ACX1FF_IE_LOW_RSSI_THRESH_OPT (0x0020) +#define ACX1FF_IE_LOW_RSSI_THRESH_OPT_LEN (0x04) +/* later firmware versions, TNETW1450 only? */ +#define ACX1FF_IE_NOISE_HISTOGRAM_RESULTS (0x0021) +#define ACX1FF_IE_NOISE_HISTOGRAM_RESULTS_LEN (0x30) +/* later firmware versions, TNETW1450 only? */ +#define ACX1FF_IE_PACKET_DETECT_THRESH (0x0023) +#define ACX1FF_IE_PACKET_DETECT_THRESH_LEN (0x04) +/* later firmware versions, TNETW1450 only? */ +#define ACX1FF_IE_TX_CONFIG_OPTIONS (0x0024) +#define ACX1FF_IE_TX_CONFIG_OPTIONS_LEN (0x04) +/* later firmware versions, TNETW1450 only? */ +#define ACX1FF_IE_CCA_THRESHOLD (0x0025) +#define ACX1FF_IE_CCA_THRESHOLD_LEN (0x02) +/* later firmware versions, TNETW1450 only? */ +#define ACX1FF_IE_EVENT_MASK (0x0026) +#define ACX1FF_IE_EVENT_MASK_LEN (0x08) +/* later firmware versions, TNETW1450 only? */ +#define ACX1FF_IE_DTIM_PERIOD (0x0027) +#define ACX1FF_IE_DTIM_PERIOD_LEN (0x02) +/* later firmware versions; maybe TNETW1450 only? */ +#define ACX1FF_IE_ACI_CONFIG_SET (0x0029) +#define ACX1FF_IE_ACI_CONFIG_SET_LEN (0x06) +/* later firmware versions; maybe TNETW1450 only? */ +#define ACX1FF_IE_EEPROM_VER (0x0030) +#define ACX1FF_IE_EEPROM_VER_LEN (0x04) +#define ACX1xx_IE_DOT11_STATION_ID (0x1001) +#define ACX1xx_IE_DOT11_STATION_ID_LEN (0x06) +/* mapped to cfgInvalid in FW150 */ +#define ACX100_IE_DOT11_UNKNOWN_1002 (0x1002) +#define ACX100_IE_DOT11_UNKNOWN_1002_LEN (-1) +/* mapped to cfgInvalid in FW150; TNETW1450 has length 2!! */ +#define ACX111_IE_DOT11_FRAG_THRESH (0x1002) +#define ACX111_IE_DOT11_FRAG_THRESH_LEN (-1) +/* mapped to cfgInvalid in FW150 */ +#define ACX100_IE_DOT11_BEACON_PERIOD (0x1003) +#define ACX100_IE_DOT11_BEACON_PERIOD_LEN (0x02) +/* mapped to cfgInvalid in FW150 */ +#define ACX1xx_IE_DOT11_DTIM_PERIOD (0x1004) +#define ACX1xx_IE_DOT11_DTIM_PERIOD_LEN (-1) +/* later firmware versions; maybe TNETW1450 only? */ +#define ACX1FF_IE_DOT11_MAX_RX_LIFETIME (0x1004) +#define ACX1FF_IE_DOT11_MAX_RX_LIFETIME_LEN (-1) +/* TNETW1450: length 2 */ +#define ACX1xx_IE_DOT11_SHORT_RETRY_LIMIT (0x1005) +#define ACX1xx_IE_DOT11_SHORT_RETRY_LIMIT_LEN (0x01) +/* TNETW1450: length 2 */ +#define ACX1xx_IE_DOT11_LONG_RETRY_LIMIT (0x1006) +#define ACX1xx_IE_DOT11_LONG_RETRY_LIMIT_LEN (0x01) +/* configure default keys; TNETW1450 has length 0x24!! */ +#define ACX100_IE_DOT11_WEP_DEFAULT_KEY_WRITE (0x1007) +#define ACX100_IE_DOT11_WEP_DEFAULT_KEY_WRITE_LEN (0x20) +#define ACX1xx_IE_DOT11_MAX_XMIT_MSDU_LIFETIME (0x1008) +#define ACX1xx_IE_DOT11_MAX_XMIT_MSDU_LIFETIME_LEN (0x04) +#define ACX1xx_IE_DOT11_GROUP_ADDR (0x1009) +#define ACX1xx_IE_DOT11_GROUP_ADDR_LEN (-1) +#define ACX1xx_IE_DOT11_CURRENT_REG_DOMAIN (0x100a) +#define ACX1xx_IE_DOT11_CURRENT_REG_DOMAIN_LEN (0x02) +/* It's harmless to have larger struct. Use USB case always. */ +/* in fact len=1 for PCI */ +#define ACX1xx_IE_DOT11_CURRENT_ANTENNA (0x100b) +#define ACX1xx_IE_DOT11_CURRENT_ANTENNA_LEN (0x02) +/* mapped to cfgInvalid in FW150 */ +#define ACX1xx_IE_DOT11_UNKNOWN_100C (0x100c) +#define ACX1xx_IE_DOT11_UNKNOWN_100C_LEN (-1) +/* TNETW1450 has length 2!! */ +#define ACX1xx_IE_DOT11_TX_POWER_LEVEL (0x100d) +#define ACX1xx_IE_DOT11_TX_POWER_LEVEL_LEN (0x01) +/* in fact len=1 for PCI */ +#define ACX1xx_IE_DOT11_CURRENT_CCA_MODE (0x100e) +#define ACX1xx_IE_DOT11_CURRENT_CCA_MODE_LEN (0x02) +/* USB doesn't return anything - len==0?! */ +#define ACX100_IE_DOT11_ED_THRESHOLD (0x100f) +#define ACX100_IE_DOT11_ED_THRESHOLD_LEN (0x04) +/* set default key ID; TNETW1450: length 2 */ +#define ACX1xx_IE_DOT11_WEP_DEFAULT_KEY_SET (0x1010) +#define ACX1xx_IE_DOT11_WEP_DEFAULT_KEY_SET_LEN (0x01) +/* mapped to cfgInvalid in FW150 */ +#define ACX100_IE_DOT11_UNKNOWN_1011 (0x1011) +#define ACX100_IE_DOT11_UNKNOWN_1011_LEN (-1) +/* later firmware versions; maybe TNETW1450 only? */ +#define ACX1FF_IE_DOT11_CURR_5GHZ_REGDOM (0x1011) +#define ACX1FF_IE_DOT11_CURR_5GHZ_REGDOM_LEN (-1) +/* mapped to cfgInvalid in FW150 */ +#define ACX100_IE_DOT11_UNKNOWN_1012 (0x1012) +#define ACX100_IE_DOT11_UNKNOWN_1012_LEN (-1) +/* mapped to cfgInvalid in FW150 */ +#define ACX100_IE_DOT11_UNKNOWN_1013 (0x1013) +#define ACX100_IE_DOT11_UNKNOWN_1013_LEN (-1) + /* * COMMANDS */ @@ -89,206 +278,4 @@ #define ACX1FF_CMD_CONTROL_DBG_TRACE 0x21 -/* - * REGISTERS - * - * Note that some of them are read/write, and others are read-only. - * - * Original comment, whatever it means: - * - * ---------------------------------------------------------------------------- - * these are handled by real_cfgtable in firmware "Rev 1.5.0" (FW150) - * ---------------------------------------------------------------------------- - */ -//DEF_IE(1xx_IE_UNKNOWN_00 ,0x0000, -1); /* mapped to cfgInvalid in FW150 */ -#define ACX100_REG_ACX_TIMER (0x0001) -#define ACX100_REG_ACX_TIMER_LEN (0x10) -/* TNETW1450: length 0x18!! */ -#define ACX1xx_REG_POWER_MGMT (0x0002) -#define ACX1xx_REG_POWER_MGMT_LEN (0x06) -#define ACX1xx_REG_QUEUE_CONFIG (0x0003) -#define ACX1xx_REG_QUEUE_CONFIG_LEN (0x1c) -#define ACX100_REG_BLOCK_SIZE (0x0004) -#define ACX100_REG_BLOCK_SIZE_LEN (0x02) -/* later firmware versions only? */ -#define ACX1FF_REG_SLOT_TIME (0x0004) -#define ACX1FF_REG_SLOT_TIME_LEN (0x08) -#define ACX1xx_REG_MEMORY_CONFIG_OPTIONS (0x0005) -#define ACX1xx_REG_MEMORY_CONFIG_OPTIONS_LEN (0x14) -#define ACX1FF_REG_QUEUE_HEAD (0x0005) -/* FIXME: length? */ -#define ACX1FF_REG_QUEUE_HEAD_LEN (0x14) -/* TNETW1450: length 2 */ -#define ACX1xx_REG_RATE_FALLBACK (0x0006) -#define ACX1xx_REG_RATE_FALLBACK_LEN (0x01) -#define ACX100_REG_WEP_OPTIONS (0x0007) -#define ACX100_REG_WEP_OPTIONS_LEN (0x03) -#define ACX111_REG_RADIO_BAND (0x0007) -#define ACX111_REG_RADIO_BAND_LEN (-1) -/* later firmware versions; TNETW1450 only? */ -#define ACX1FF_REG_TIMING_CFG (0x0007) -#define ACX1FF_REG_TIMING_CFG_LEN (-1) -/* huh? */ -#define ACX100_REG_SSID (0x0008) -#define ACX100_REG_SSID_LEN (0x20) -/* huh? TNETW1450 has length 0x40!! */ -#define ACX1xx_REG_MEMORY_MAP (0x0008) -#define ACX1xx_REG_MEMORY_MAP_LEN (0x28) -/* mapped to cfgInvalid in FW150 */ -#define ACX1xx_REG_SCAN_STATUS (0x0009) -#define ACX1xx_REG_SCAN_STATUS_LEN (0x04) -#define ACX1xx_REG_ASSOC_ID (0x000a) -#define ACX1xx_REG_ASSOC_ID_LEN (0x02) -/* mapped to cfgInvalid in FW150 */ -#define ACX1xx_REG_UNKNOWN_0B (0x000b) -#define ACX1xx_REG_UNKNOWN_0B_LEN (-1) -/* later firmware versions; TNETW1450 only? */ -#define ACX1FF_REG_TX_POWER_LEVEL_TABLE (0x000b) -#define ACX1FF_REG_TX_POWER_LEVEL_TABLE_LEN (0x18) -/* very small implementation in FW150! */ -#define ACX100_REG_UNKNOWN_0C (0x000c) -#define ACX100_REG_UNKNOWN_0C_LEN (-1) -/* - * ACX100 has an equivalent struct in the cmd mailbox directly after reset. - * 0x14c seems extremely large, will trash stack on failure (memset!) - * in case of small input struct --> OOPS! - */ -#define ACX111_REG_CONFIG_OPTIONS (0x000c) -#define ACX111_REG_CONFIG_OPTIONS_LEN (0x14c) -#define ACX1xx_REG_FWREV (0x000d) -#define ACX1xx_REG_FWREV_LEN (0x18) -#define ACX1xx_REG_FCS_ERROR_COUNT (0x000e) -#define ACX1xx_REG_FCS_ERROR_COUNT_LEN (0x04) -#define ACX1xx_REG_MEDIUM_USAGE (0x000f) -#define ACX1xx_REG_MEDIUM_USAGE_LEN (0x08) -#define ACX1xx_REG_RXCONFIG (0x0010) -#define ACX1xx_REG_RXCONFIG_LEN (0x04) -/* NONBINARY: large implementation in FW150! link quality readings or so? */ -#define ACX100_REG_UNKNOWN_11 (0x0011) -#define ACX100_REG_UNKNOWN_11_LEN (-1) -#define ACX111_REG_QUEUE_THRESH (0x0011) -#define ACX111_REG_QUEUE_THRESH_LEN (-1) -/* NONBINARY: VERY large implementation in FW150!! */ -#define ACX100_REG_UNKNOWN_12 (0x0012) -#define ACX100_REG_UNKNOWN_12_LEN (-1) -#define ACX111_REG_BSS_POWER_SAVE (0x0012) -#define ACX111_REG_BSS_POWER_SAVE_LEN (/* -1 */ 2) -/* TNETW1450: length 0x134!! */ -#define ACX1xx_REG_FIRMWARE_STATISTICS (0x0013) -#define ACX1xx_REG_FIRMWARE_STATISTICS_LEN (0x9c) -/* later firmware versions, TNETW1450 only? */ -#define ACX1FF_REG_RX_INTR_CONFIG (0x0014) -#define ACX1FF_REG_RX_INTR_CONFIG_LEN (0x14) -#define ACX1xx_REG_FEATURE_CONFIG (0x0015) -#define ACX1xx_REG_FEATURE_CONFIG_LEN (0x08) -/* for rekeying. really len=4?? */ -#define ACX111_REG_KEY_CHOOSE (0x0016) -#define ACX111_REG_KEY_CHOOSE_LEN (0x04) -/* later firmware versions, TNETW1450 only? */ -#define ACX1FF_REG_MISC_CONFIG_TABLE (0x0017) -#define ACX1FF_REG_MISC_CONFIG_TABLE_LEN (0x04) -/* later firmware versions, TNETW1450 only? */ -#define ACX1FF_REG_WONE_CONFIG (0x0018) -#define ACX1FF_REG_WONE_CONFIG_LEN (-1) -/* later firmware versions, TNETW1450 only? */ -#define ACX1FF_REG_TID_CONFIG (0x001a) -#define ACX1FF_REG_TID_CONFIG_LEN (0x2c) -/* later firmware versions, TNETW1450 only? */ -#define ACX1FF_REG_CALIB_ASSESSMENT (0x001e) -#define ACX1FF_REG_CALIB_ASSESSMENT_LEN (0x04) -/* later firmware versions, TNETW1450 only? */ -#define ACX1FF_REG_BEACON_FILTER_OPTIONS (0x001f) -#define ACX1FF_REG_BEACON_FILTER_OPTIONS_LEN (0x02) -/* later firmware versions, TNETW1450 only? */ -#define ACX1FF_REG_LOW_RSSI_THRESH_OPT (0x0020) -#define ACX1FF_REG_LOW_RSSI_THRESH_OPT_LEN (0x04) -/* later firmware versions, TNETW1450 only? */ -#define ACX1FF_REG_NOISE_HISTOGRAM_RESULTS (0x0021) -#define ACX1FF_REG_NOISE_HISTOGRAM_RESULTS_LEN (0x30) -/* later firmware versions, TNETW1450 only? */ -#define ACX1FF_REG_PACKET_DETECT_THRESH (0x0023) -#define ACX1FF_REG_PACKET_DETECT_THRESH_LEN (0x04) -/* later firmware versions, TNETW1450 only? */ -#define ACX1FF_REG_TX_CONFIG_OPTIONS (0x0024) -#define ACX1FF_REG_TX_CONFIG_OPTIONS_LEN (0x04) -/* later firmware versions, TNETW1450 only? */ -#define ACX1FF_REG_CCA_THRESHOLD (0x0025) -#define ACX1FF_REG_CCA_THRESHOLD_LEN (0x02) -/* later firmware versions, TNETW1450 only? */ -#define ACX1FF_REG_EVENT_MASK (0x0026) -#define ACX1FF_REG_EVENT_MASK_LEN (0x08) -/* later firmware versions, TNETW1450 only? */ -#define ACX1FF_REG_DTIM_PERIOD (0x0027) -#define ACX1FF_REG_DTIM_PERIOD_LEN (0x02) -/* later firmware versions; maybe TNETW1450 only? */ -#define ACX1FF_REG_ACI_CONFIG_SET (0x0029) -#define ACX1FF_REG_ACI_CONFIG_SET_LEN (0x06) -/* later firmware versions; maybe TNETW1450 only? */ -#define ACX1FF_REG_EEPROM_VER (0x0030) -#define ACX1FF_REG_EEPROM_VER_LEN (0x04) -#define ACX1xx_REG_DOT11_STATION_ID (0x1001) -#define ACX1xx_REG_DOT11_STATION_ID_LEN (0x06) -/* mapped to cfgInvalid in FW150 */ -#define ACX100_REG_DOT11_UNKNOWN_1002 (0x1002) -#define ACX100_REG_DOT11_UNKNOWN_1002_LEN (-1) -/* mapped to cfgInvalid in FW150; TNETW1450 has length 2!! */ -#define ACX111_REG_DOT11_FRAG_THRESH (0x1002) -#define ACX111_REG_DOT11_FRAG_THRESH_LEN (-1) -/* mapped to cfgInvalid in FW150 */ -#define ACX100_REG_DOT11_BEACON_PERIOD (0x1003) -#define ACX100_REG_DOT11_BEACON_PERIOD_LEN (0x02) -/* mapped to cfgInvalid in FW150 */ -#define ACX1xx_REG_DOT11_DTIM_PERIOD (0x1004) -#define ACX1xx_REG_DOT11_DTIM_PERIOD_LEN (-1) -/* later firmware versions; maybe TNETW1450 only? */ -#define ACX1FF_REG_DOT11_MAX_RX_LIFETIME (0x1004) -#define ACX1FF_REG_DOT11_MAX_RX_LIFETIME_LEN (-1) -/* TNETW1450: length 2 */ -#define ACX1xx_REG_DOT11_SHORT_RETRY_LIMIT (0x1005) -#define ACX1xx_REG_DOT11_SHORT_RETRY_LIMIT_LEN (0x01) -/* TNETW1450: length 2 */ -#define ACX1xx_REG_DOT11_LONG_RETRY_LIMIT (0x1006) -#define ACX1xx_REG_DOT11_LONG_RETRY_LIMIT_LEN (0x01) -/* configure default keys; TNETW1450 has length 0x24!! */ -#define ACX100_REG_DOT11_WEP_DEFAULT_KEY_WRITE (0x1007) -#define ACX100_REG_DOT11_WEP_DEFAULT_KEY_WRITE_LEN (0x20) -#define ACX1xx_REG_DOT11_MAX_XMIT_MSDU_LIFETIME (0x1008) -#define ACX1xx_REG_DOT11_MAX_XMIT_MSDU_LIFETIME_LEN (0x04) -#define ACX1xx_REG_DOT11_GROUP_ADDR (0x1009) -#define ACX1xx_REG_DOT11_GROUP_ADDR_LEN (-1) -#define ACX1xx_REG_DOT11_CURRENT_REG_DOMAIN (0x100a) -#define ACX1xx_REG_DOT11_CURRENT_REG_DOMAIN_LEN (0x02) -/* It's harmless to have larger struct. Use USB case always. */ -/* in fact len=1 for PCI */ -#define ACX1xx_REG_DOT11_CURRENT_ANTENNA (0x100b) -#define ACX1xx_REG_DOT11_CURRENT_ANTENNA_LEN (0x02) -/* mapped to cfgInvalid in FW150 */ -#define ACX1xx_REG_DOT11_UNKNOWN_100C (0x100c) -#define ACX1xx_REG_DOT11_UNKNOWN_100C_LEN (-1) -/* TNETW1450 has length 2!! */ -#define ACX1xx_REG_DOT11_TX_POWER_LEVEL (0x100d) -#define ACX1xx_REG_DOT11_TX_POWER_LEVEL_LEN (0x01) -/* in fact len=1 for PCI */ -#define ACX1xx_REG_DOT11_CURRENT_CCA_MODE (0x100e) -#define ACX1xx_REG_DOT11_CURRENT_CCA_MODE_LEN (0x02) -/* USB doesn't return anything - len==0?! */ -#define ACX100_REG_DOT11_ED_THRESHOLD (0x100f) -#define ACX100_REG_DOT11_ED_THRESHOLD_LEN (0x04) -/* set default key ID; TNETW1450: length 2 */ -#define ACX1xx_REG_DOT11_WEP_DEFAULT_KEY_SET (0x1010) -#define ACX1xx_REG_DOT11_WEP_DEFAULT_KEY_SET_LEN (0x01) -/* mapped to cfgInvalid in FW150 */ -#define ACX100_REG_DOT11_UNKNOWN_1011 (0x1011) -#define ACX100_REG_DOT11_UNKNOWN_1011_LEN (-1) -/* later firmware versions; maybe TNETW1450 only? */ -#define ACX1FF_REG_DOT11_CURR_5GHZ_REGDOM (0x1011) -#define ACX1FF_REG_DOT11_CURR_5GHZ_REGDOM_LEN (-1) -/* mapped to cfgInvalid in FW150 */ -#define ACX100_REG_DOT11_UNKNOWN_1012 (0x1012) -#define ACX100_REG_DOT11_UNKNOWN_1012_LEN (-1) -/* mapped to cfgInvalid in FW150 */ -#define ACX100_REG_DOT11_UNKNOWN_1013 (0x1013) -#define ACX100_REG_DOT11_UNKNOWN_1013_LEN (-1) - - #endif /* _ACX_MMIO_H_ */ diff --git a/acx_struct.h b/acx_struct.h index dc203ec..2de0d74 100644 --- a/acx_struct.h +++ b/acx_struct.h @@ -697,7 +697,7 @@ struct acx_device { #define ieee2adev(ieee80211_hw) ((ieee80211_hw)->priv) -/* For use with ACX1xx_REG_RXCONFIG */ +/* For use with ACX1xx_IE_RXCONFIG */ /* bit description * 13 include additional header (length etc.) *required* * struct is defined in 'struct rxbuffer' @@ -753,7 +753,7 @@ struct acx_device { #define RX_CFG2_RCV_ACK_FRAMES 0x0002 #define RX_CFG2_RCV_OTHER 0x0001 -/* For use with ACX1xx_REG_FEATURE_CONFIG */ +/* For use with ACX1xx_IE_FEATURE_CONFIG */ #define FEATURE1_80MHZ_CLOCK 0x00000040L #define FEATURE1_4X 0x00000020L #define FEATURE1_LOW_RX 0x00000008L @@ -1245,7 +1245,7 @@ acx_struct_size_check(void) CHECK_SIZEOF(acx100_ie_queueconfig_t, 0x20); CHECK_SIZEOF(acx_joinbss_t, 0x30); /* IEs need 4 bytes for (type,len) tuple */ - CHECK_SIZEOF(acx111_ie_configoption_t, ACX111_REG_CONFIG_OPTIONS_LEN + 4); + CHECK_SIZEOF(acx111_ie_configoption_t, ACX111_IE_CONFIG_OPTIONS_LEN + 4); } diff --git a/common.c b/common.c index 3ce83e1..3518836 100644 --- a/common.c +++ b/common.c @@ -206,7 +206,7 @@ void acx_s_get_firmware_version(acx_device_t * adev) FN_ENTER; memset(fw.fw_id, 'E', FW_ID_SIZE); - acx_s_interrogate(adev, &fw, ACX1xx_REG_FWREV); + acx_s_interrogate(adev, &fw, ACX1xx_IE_FWREV); memcpy(adev->firmware_version, fw.fw_id, FW_ID_SIZE); adev->firmware_version[FW_ID_SIZE] = '\0'; @@ -432,74 +432,74 @@ u8 acx_signal_determine_quality(u8 signal, u8 noise) * unless the firmware actually expects a different length than the struct length */ static const u16 acx100_ie_len[] = { 0, - ACX100_REG_ACX_TIMER_LEN, + ACX100_IE_ACX_TIMER_LEN, sizeof(acx100_ie_powersave_t) - 4, /* is that 6 or 8??? */ - ACX1xx_REG_QUEUE_CONFIG_LEN, - ACX100_REG_BLOCK_SIZE_LEN, - ACX1xx_REG_MEMORY_CONFIG_OPTIONS_LEN, - ACX1xx_REG_RATE_FALLBACK_LEN, - ACX100_REG_WEP_OPTIONS_LEN, - ACX1xx_REG_MEMORY_MAP_LEN, /* ACX1xx_REG_SSID_LEN, */ + ACX1xx_IE_QUEUE_CONFIG_LEN, + ACX100_IE_BLOCK_SIZE_LEN, + ACX1xx_IE_MEMORY_CONFIG_OPTIONS_LEN, + ACX1xx_IE_RATE_FALLBACK_LEN, + ACX100_IE_WEP_OPTIONS_LEN, + ACX1xx_IE_MEMORY_MAP_LEN, /* ACX1xx_IE_SSID_LEN, */ 0, - ACX1xx_REG_ASSOC_ID_LEN, + ACX1xx_IE_ASSOC_ID_LEN, 0, - ACX111_REG_CONFIG_OPTIONS_LEN, - ACX1xx_REG_FWREV_LEN, - ACX1xx_REG_FCS_ERROR_COUNT_LEN, - ACX1xx_REG_MEDIUM_USAGE_LEN, - ACX1xx_REG_RXCONFIG_LEN, + ACX111_IE_CONFIG_OPTIONS_LEN, + ACX1xx_IE_FWREV_LEN, + ACX1xx_IE_FCS_ERROR_COUNT_LEN, + ACX1xx_IE_MEDIUM_USAGE_LEN, + ACX1xx_IE_RXCONFIG_LEN, 0, 0, sizeof(fw_stats_t) - 4, 0, - ACX1xx_REG_FEATURE_CONFIG_LEN, - ACX111_REG_KEY_CHOOSE_LEN, - ACX1FF_REG_MISC_CONFIG_TABLE_LEN, - ACX1FF_REG_WONE_CONFIG_LEN, + ACX1xx_IE_FEATURE_CONFIG_LEN, + ACX111_IE_KEY_CHOOSE_LEN, + ACX1FF_IE_MISC_CONFIG_TABLE_LEN, + ACX1FF_IE_WONE_CONFIG_LEN, 0, - ACX1FF_REG_TID_CONFIG_LEN, + ACX1FF_IE_TID_CONFIG_LEN, 0, 0, 0, - ACX1FF_REG_CALIB_ASSESSMENT_LEN, - ACX1FF_REG_BEACON_FILTER_OPTIONS_LEN, - ACX1FF_REG_LOW_RSSI_THRESH_OPT_LEN, - ACX1FF_REG_NOISE_HISTOGRAM_RESULTS_LEN, + ACX1FF_IE_CALIB_ASSESSMENT_LEN, + ACX1FF_IE_BEACON_FILTER_OPTIONS_LEN, + ACX1FF_IE_LOW_RSSI_THRESH_OPT_LEN, + ACX1FF_IE_NOISE_HISTOGRAM_RESULTS_LEN, 0, - ACX1FF_REG_PACKET_DETECT_THRESH_LEN, - ACX1FF_REG_TX_CONFIG_OPTIONS_LEN, - ACX1FF_REG_CCA_THRESHOLD_LEN, - ACX1FF_REG_EVENT_MASK_LEN, - ACX1FF_REG_DTIM_PERIOD_LEN, + ACX1FF_IE_PACKET_DETECT_THRESH_LEN, + ACX1FF_IE_TX_CONFIG_OPTIONS_LEN, + ACX1FF_IE_CCA_THRESHOLD_LEN, + ACX1FF_IE_EVENT_MASK_LEN, + ACX1FF_IE_DTIM_PERIOD_LEN, 0, - ACX1FF_REG_ACI_CONFIG_SET_LEN, + ACX1FF_IE_ACI_CONFIG_SET_LEN, 0, 0, 0, 0, 0, 0, - ACX1FF_REG_EEPROM_VER_LEN, + ACX1FF_IE_EEPROM_VER_LEN, }; static const u16 acx100_ie_len_dot11[] = { 0, - ACX1xx_REG_DOT11_STATION_ID_LEN, + ACX1xx_IE_DOT11_STATION_ID_LEN, 0, - ACX100_REG_DOT11_BEACON_PERIOD_LEN, - ACX1xx_REG_DOT11_DTIM_PERIOD_LEN, - ACX1xx_REG_DOT11_SHORT_RETRY_LIMIT_LEN, - ACX1xx_REG_DOT11_LONG_RETRY_LIMIT_LEN, - ACX100_REG_DOT11_WEP_DEFAULT_KEY_WRITE_LEN, - ACX1xx_REG_DOT11_MAX_XMIT_MSDU_LIFETIME_LEN, + ACX100_IE_DOT11_BEACON_PERIOD_LEN, + ACX1xx_IE_DOT11_DTIM_PERIOD_LEN, + ACX1xx_IE_DOT11_SHORT_RETRY_LIMIT_LEN, + ACX1xx_IE_DOT11_LONG_RETRY_LIMIT_LEN, + ACX100_IE_DOT11_WEP_DEFAULT_KEY_WRITE_LEN, + ACX1xx_IE_DOT11_MAX_XMIT_MSDU_LIFETIME_LEN, 0, - ACX1xx_REG_DOT11_CURRENT_REG_DOMAIN_LEN, - ACX1xx_REG_DOT11_CURRENT_ANTENNA_LEN, + ACX1xx_IE_DOT11_CURRENT_REG_DOMAIN_LEN, + ACX1xx_IE_DOT11_CURRENT_ANTENNA_LEN, 0, - ACX1xx_REG_DOT11_TX_POWER_LEVEL_LEN, - ACX1xx_REG_DOT11_CURRENT_CCA_MODE_LEN, - ACX100_REG_DOT11_ED_THRESHOLD_LEN, - ACX1xx_REG_DOT11_WEP_DEFAULT_KEY_SET_LEN, + ACX1xx_IE_DOT11_TX_POWER_LEVEL_LEN, + ACX1xx_IE_DOT11_CURRENT_CCA_MODE_LEN, + ACX100_IE_DOT11_ED_THRESHOLD_LEN, + ACX1xx_IE_DOT11_WEP_DEFAULT_KEY_SET_LEN, 0, 0, 0, @@ -507,74 +507,74 @@ static const u16 acx100_ie_len_dot11[] = { static const u16 acx111_ie_len[] = { 0, - ACX100_REG_ACX_TIMER_LEN, + ACX100_IE_ACX_TIMER_LEN, sizeof(acx111_ie_powersave_t) - 4, - ACX1xx_REG_QUEUE_CONFIG_LEN, - ACX100_REG_BLOCK_SIZE_LEN, - ACX1xx_REG_MEMORY_CONFIG_OPTIONS_LEN, - ACX1xx_REG_RATE_FALLBACK_LEN, - ACX100_REG_WEP_OPTIONS_LEN, - ACX1xx_REG_MEMORY_MAP_LEN, /* ACX1xx_REG_SSID_LEN, */ + ACX1xx_IE_QUEUE_CONFIG_LEN, + ACX100_IE_BLOCK_SIZE_LEN, + ACX1xx_IE_MEMORY_CONFIG_OPTIONS_LEN, + ACX1xx_IE_RATE_FALLBACK_LEN, + ACX100_IE_WEP_OPTIONS_LEN, + ACX1xx_IE_MEMORY_MAP_LEN, /* ACX1xx_IE_SSID_LEN, */ 0, - ACX1xx_REG_ASSOC_ID_LEN, + ACX1xx_IE_ASSOC_ID_LEN, 0, - ACX111_REG_CONFIG_OPTIONS_LEN, - ACX1xx_REG_FWREV_LEN, - ACX1xx_REG_FCS_ERROR_COUNT_LEN, - ACX1xx_REG_MEDIUM_USAGE_LEN, - ACX1xx_REG_RXCONFIG_LEN, + ACX111_IE_CONFIG_OPTIONS_LEN, + ACX1xx_IE_FWREV_LEN, + ACX1xx_IE_FCS_ERROR_COUNT_LEN, + ACX1xx_IE_MEDIUM_USAGE_LEN, + ACX1xx_IE_RXCONFIG_LEN, 0, 0, sizeof(fw_stats_t) - 4, 0, - ACX1xx_REG_FEATURE_CONFIG_LEN, - ACX111_REG_KEY_CHOOSE_LEN, - ACX1FF_REG_MISC_CONFIG_TABLE_LEN, - ACX1FF_REG_WONE_CONFIG_LEN, + ACX1xx_IE_FEATURE_CONFIG_LEN, + ACX111_IE_KEY_CHOOSE_LEN, + ACX1FF_IE_MISC_CONFIG_TABLE_LEN, + ACX1FF_IE_WONE_CONFIG_LEN, 0, - ACX1FF_REG_TID_CONFIG_LEN, + ACX1FF_IE_TID_CONFIG_LEN, 0, 0, 0, - ACX1FF_REG_CALIB_ASSESSMENT_LEN, - ACX1FF_REG_BEACON_FILTER_OPTIONS_LEN, - ACX1FF_REG_LOW_RSSI_THRESH_OPT_LEN, - ACX1FF_REG_NOISE_HISTOGRAM_RESULTS_LEN, + ACX1FF_IE_CALIB_ASSESSMENT_LEN, + ACX1FF_IE_BEACON_FILTER_OPTIONS_LEN, + ACX1FF_IE_LOW_RSSI_THRESH_OPT_LEN, + ACX1FF_IE_NOISE_HISTOGRAM_RESULTS_LEN, 0, - ACX1FF_REG_PACKET_DETECT_THRESH_LEN, - ACX1FF_REG_TX_CONFIG_OPTIONS_LEN, - ACX1FF_REG_CCA_THRESHOLD_LEN, - ACX1FF_REG_EVENT_MASK_LEN, - ACX1FF_REG_DTIM_PERIOD_LEN, + ACX1FF_IE_PACKET_DETECT_THRESH_LEN, + ACX1FF_IE_TX_CONFIG_OPTIONS_LEN, + ACX1FF_IE_CCA_THRESHOLD_LEN, + ACX1FF_IE_EVENT_MASK_LEN, + ACX1FF_IE_DTIM_PERIOD_LEN, 0, - ACX1FF_REG_ACI_CONFIG_SET_LEN, + ACX1FF_IE_ACI_CONFIG_SET_LEN, 0, 0, 0, 0, 0, 0, - ACX1FF_REG_EEPROM_VER_LEN, + ACX1FF_IE_EEPROM_VER_LEN, }; static const u16 acx111_ie_len_dot11[] = { 0, - ACX1xx_REG_DOT11_STATION_ID_LEN, + ACX1xx_IE_DOT11_STATION_ID_LEN, 0, - ACX100_REG_DOT11_BEACON_PERIOD_LEN, - ACX1xx_REG_DOT11_DTIM_PERIOD_LEN, - ACX1xx_REG_DOT11_SHORT_RETRY_LIMIT_LEN, - ACX1xx_REG_DOT11_LONG_RETRY_LIMIT_LEN, - ACX100_REG_DOT11_WEP_DEFAULT_KEY_WRITE_LEN, - ACX1xx_REG_DOT11_MAX_XMIT_MSDU_LIFETIME_LEN, + ACX100_IE_DOT11_BEACON_PERIOD_LEN, + ACX1xx_IE_DOT11_DTIM_PERIOD_LEN, + ACX1xx_IE_DOT11_SHORT_RETRY_LIMIT_LEN, + ACX1xx_IE_DOT11_LONG_RETRY_LIMIT_LEN, + ACX100_IE_DOT11_WEP_DEFAULT_KEY_WRITE_LEN, + ACX1xx_IE_DOT11_MAX_XMIT_MSDU_LIFETIME_LEN, 0, - ACX1xx_REG_DOT11_CURRENT_REG_DOMAIN_LEN, - ACX1xx_REG_DOT11_CURRENT_ANTENNA_LEN, + ACX1xx_IE_DOT11_CURRENT_REG_DOMAIN_LEN, + ACX1xx_IE_DOT11_CURRENT_ANTENNA_LEN, 0, - ACX1xx_REG_DOT11_TX_POWER_LEVEL_LEN, - ACX1xx_REG_DOT11_CURRENT_CCA_MODE_LEN, - ACX100_REG_DOT11_ED_THRESHOLD_LEN, - ACX1xx_REG_DOT11_WEP_DEFAULT_KEY_SET_LEN, + ACX1xx_IE_DOT11_TX_POWER_LEVEL_LEN, + ACX1xx_IE_DOT11_CURRENT_CCA_MODE_LEN, + ACX100_IE_DOT11_ED_THRESHOLD_LEN, + ACX1xx_IE_DOT11_WEP_DEFAULT_KEY_SET_LEN, 0, 0, 0, @@ -818,7 +818,7 @@ static int acx_s_proc_diag_output(char *buf, acx_device_t * adev) part_str = "statistics query command"; - if (OK != acx_s_interrogate(adev, st, ACX1xx_REG_FIRMWARE_STATISTICS)) + if (OK != acx_s_interrogate(adev, st, ACX1xx_IE_FIRMWARE_STATISTICS)) goto fw_stats_end; st += sizeof(u16); @@ -1663,7 +1663,7 @@ acx111_s_get_feature_config(acx_device_t * adev, memset(&feat, 0, sizeof(feat)); - if (OK != acx_s_interrogate(adev, &feat, ACX1xx_REG_FEATURE_CONFIG)) { + if (OK != acx_s_interrogate(adev, &feat, ACX1xx_IE_FEATURE_CONFIG)) { FN_EXIT1(NOT_OK); return NOT_OK; } @@ -1727,7 +1727,7 @@ acx111_s_set_feature_config(acx_device_t * adev, le32_to_cpu(feat.feature_options), le32_to_cpu(feat.data_flow_options)); - if (OK != acx_s_configure(adev, &feat, ACX1xx_REG_FEATURE_CONFIG)) { + if (OK != acx_s_configure(adev, &feat, ACX1xx_IE_FEATURE_CONFIG)) { FN_EXIT1(NOT_OK); return NOT_OK; } @@ -1772,7 +1772,7 @@ acx100_s_init_memory_pools(acx_device_t * adev, const acx_ie_memmap_t * mmt) MemoryBlockSize.size = cpu_to_le16(adev->memblocksize); /* Then we alert the card to our decision of block size */ - if (OK != acx_s_configure(adev, &MemoryBlockSize, ACX100_REG_BLOCK_SIZE)) { + if (OK != acx_s_configure(adev, &MemoryBlockSize, ACX100_IE_BLOCK_SIZE)) { goto bad; } @@ -1838,7 +1838,7 @@ acx100_s_init_memory_pools(acx_device_t * adev, const acx_ie_memmap_t * mmt) /* alert the device to our decision */ if (OK != acx_s_configure(adev, &MemoryConfigOption, - ACX1xx_REG_MEMORY_CONFIG_OPTIONS)) { + ACX1xx_IE_MEMORY_CONFIG_OPTIONS)) { goto bad; } @@ -1871,7 +1871,7 @@ static int acx100_s_create_dma_regions(acx_device_t * adev) FN_ENTER; /* read out the acx100 physical start address for the queues */ - if (OK != acx_s_interrogate(adev, &memmap, ACX1xx_REG_MEMORY_MAP)) { + if (OK != acx_s_interrogate(adev, &memmap, ACX1xx_IE_MEMORY_MAP)) { goto fail; } @@ -1904,7 +1904,7 @@ static int acx100_s_create_dma_regions(acx_device_t * adev) /* sets the beginning of the next queue */ queueconf.HostQueueEnd = cpu_to_le32(le32_to_cpu(queueconf.QueueEnd) + 8); - if (OK != acx_s_configure(adev, &queueconf, ACX1xx_REG_QUEUE_CONFIG)) { + if (OK != acx_s_configure(adev, &queueconf, ACX1xx_IE_QUEUE_CONFIG)) { goto fail; } @@ -1915,14 +1915,14 @@ static int acx100_s_create_dma_regions(acx_device_t * adev) acxpci_create_desc_queues(adev, tx_queue_start, rx_queue_start); } - if (OK != acx_s_interrogate(adev, &memmap, ACX1xx_REG_MEMORY_MAP)) { + if (OK != acx_s_interrogate(adev, &memmap, ACX1xx_IE_MEMORY_MAP)) { goto fail; } memmap.PoolStart = cpu_to_le32((le32_to_cpu(memmap.QueueEnd) + 4 + 0x1f) & ~0x1f); - if (OK != acx_s_configure(adev, &memmap, ACX1xx_REG_MEMORY_MAP)) { + if (OK != acx_s_configure(adev, &memmap, ACX1xx_IE_MEMORY_MAP)) { goto fail; } @@ -1999,17 +1999,17 @@ static int acx111_s_create_dma_regions(acx_device_t * adev) memconf.tx_queue1_count_descs = TX_CNT; /* done by memset: memconf.tx_queue1_attributes = 0; lowest priority */ - /* NB1: this looks wrong: (memconf,ACX1xx_REG_QUEUE_CONFIG), - ** (queueconf,ACX1xx_REG_MEMORY_CONFIG_OPTIONS) look swapped, eh? + /* NB1: this looks wrong: (memconf,ACX1xx_IE_QUEUE_CONFIG), + ** (queueconf,ACX1xx_IE_MEMORY_CONFIG_OPTIONS) look swapped, eh? ** But it is actually correct wrt IE numbers. - ** NB2: sizeof(memconf) == 28 == 0x1c but configure(ACX1xx_REG_QUEUE_CONFIG) + ** NB2: sizeof(memconf) == 28 == 0x1c but configure(ACX1xx_IE_QUEUE_CONFIG) ** writes 0x20 bytes (because same IE for acx100 uses struct acx100_ie_queueconfig ** which is 4 bytes larger. what a mess. TODO: clean it up) */ - if (OK != acx_s_configure(adev, &memconf, ACX1xx_REG_QUEUE_CONFIG)) { + if (OK != acx_s_configure(adev, &memconf, ACX1xx_IE_QUEUE_CONFIG)) { goto fail; } - acx_s_interrogate(adev, &queueconf, ACX1xx_REG_MEMORY_CONFIG_OPTIONS); + acx_s_interrogate(adev, &queueconf, ACX1xx_IE_MEMORY_CONFIG_OPTIONS); tx_queue_start = le32_to_cpu(queueconf.tx1_queue_address); rx_queue_start = le32_to_cpu(queueconf.rx1_queue_address); @@ -2120,7 +2120,7 @@ static void acx_s_initialize_rx_config(acx_device_t * adev) cfg.rx_cfg1 = cpu_to_le16(adev->rx_config_1); cfg.rx_cfg2 = cpu_to_le16(adev->rx_config_2); - acx_s_configure(adev, &cfg, ACX1xx_REG_RXCONFIG); + acx_s_configure(adev, &cfg, ACX1xx_IE_RXCONFIG); } @@ -2159,7 +2159,7 @@ static int acx111_s_set_tx_level(acx_device_t * adev, u8 level_dbm) "adjusted %d dBm to %d dBm\n", level_dbm, adev->tx_level_dbm); - return acx_s_configure(adev, &tx_level, ACX1xx_REG_DOT11_TX_POWER_LEVEL); + return acx_s_configure(adev, &tx_level, ACX1xx_IE_DOT11_TX_POWER_LEVEL); } static int acx_s_set_tx_level(acx_device_t *adev, u8 level_dbm) @@ -2775,7 +2775,7 @@ static void acx100_s_set_wepkey(acx_device_t * adev) dk.defaultKeyNum = i; memcpy(dk.key, adev->wep_keys[i].key, dk.keySize); acx_s_configure(adev, &dk, - ACX100_REG_DOT11_WEP_DEFAULT_KEY_WRITE); + ACX100_IE_DOT11_WEP_DEFAULT_KEY_WRITE); } } } @@ -2831,7 +2831,7 @@ static int acx100_s_init_wep(acx_device_t * adev) FN_ENTER; - if (OK != acx_s_interrogate(adev, &pt, ACX1xx_REG_MEMORY_MAP)) { + if (OK != acx_s_interrogate(adev, &pt, ACX1xx_IE_MEMORY_MAP)) { goto fail; } @@ -2840,7 +2840,7 @@ static int acx100_s_init_wep(acx_device_t * adev) pt.WEPCacheStart = cpu_to_le32(le32_to_cpu(pt.CodeEnd) + 0x4); pt.WEPCacheEnd = cpu_to_le32(le32_to_cpu(pt.CodeEnd) + 0x4); - if (OK != acx_s_configure(adev, &pt, ACX1xx_REG_MEMORY_MAP)) { + if (OK != acx_s_configure(adev, &pt, ACX1xx_IE_MEMORY_MAP)) { goto fail; } @@ -2849,7 +2849,7 @@ static int acx100_s_init_wep(acx_device_t * adev) options.WEPOption = 0x00; acx_log(LOG_DEBUG, L_ASSOC, "writing WEP options\n"); - acx_s_configure(adev, &options, ACX100_REG_WEP_OPTIONS); + acx_s_configure(adev, &options, ACX100_IE_WEP_OPTIONS); acx100_s_set_wepkey(adev); @@ -2858,7 +2858,7 @@ static int acx100_s_init_wep(acx_device_t * adev) "setting active default WEP key number: %d\n", adev->wep_current_index); dk.KeyID = adev->wep_current_index; - acx_s_configure(adev, &dk, ACX1xx_REG_DOT11_WEP_DEFAULT_KEY_SET); /* 0x1010 */ + acx_s_configure(adev, &dk, ACX1xx_IE_DOT11_WEP_DEFAULT_KEY_SET); /* 0x1010 */ } /* FIXME!!! wep_key_struct is filled nowhere! But adev * is initialized to 0, and we don't REALLY need those keys either */ @@ -2877,9 +2877,9 @@ static int acx100_s_init_wep(acx_device_t * adev) */ /* now retrieve the updated WEPCacheEnd pointer... */ - if (OK != acx_s_interrogate(adev, &pt, ACX1xx_REG_MEMORY_MAP)) { + if (OK != acx_s_interrogate(adev, &pt, ACX1xx_IE_MEMORY_MAP)) { acx_log(LOG_WARNING, L_ANY, - "%s: ACX1xx_REG_MEMORY_MAP read #2 FAILED\n", + "%s: ACX1xx_IE_MEMORY_MAP read #2 FAILED\n", wiphy_name(adev->ieee->wiphy)); goto fail; } @@ -2887,9 +2887,9 @@ static int acx100_s_init_wep(acx_device_t * adev) /* (no endianness conversion needed) */ pt.PacketTemplateStart = pt.WEPCacheEnd; - if (OK != acx_s_configure(adev, &pt, ACX1xx_REG_MEMORY_MAP)) { + if (OK != acx_s_configure(adev, &pt, ACX1xx_IE_MEMORY_MAP)) { acx_log(LOG_WARNING, L_ANY, - "%s: ACX1xx_REG_MEMORY_MAP write #2 FAILED\n", + "%s: ACX1xx_IE_MEMORY_MAP write #2 FAILED\n", wiphy_name(adev->ieee->wiphy)); goto fail; } @@ -3095,11 +3095,11 @@ static int acx_s_init_packet_templates(acx_device_t * adev) acx_log(LOG_DEBUG, L_REALLYVERBOSE, "sizeof(memmap)=%d bytes\n", (int)sizeof(mm)); - if (OK != acx_s_interrogate(adev, &mm, ACX1xx_REG_MEMORY_MAP)) + if (OK != acx_s_interrogate(adev, &mm, ACX1xx_IE_MEMORY_MAP)) goto failed_acx100; mm.QueueStart = cpu_to_le32(le32_to_cpu(mm.PacketTemplateEnd) + 4); - if (OK != acx_s_configure(adev, &mm, ACX1xx_REG_MEMORY_MAP)) + if (OK != acx_s_configure(adev, &mm, ACX1xx_IE_MEMORY_MAP)) goto failed_acx100; result = OK; @@ -3216,7 +3216,7 @@ static void acx_s_update_80211_powersave_mode(acx_device_t * adev) adev->ps_wakeup_cfg, adev->ps_listen_interval, adev->ps_options, adev->ps_hangover_period, adev->ps_enhanced_transition_time); - acx_s_interrogate(adev, &pm, ACX1xx_REG_POWER_MGMT); + acx_s_interrogate(adev, &pm, ACX1xx_IE_POWER_MGMT); acx_log(LOG_DEBUG, L_INIT, "Previous PS mode settings: " "wakeup_cfg 0x%02X, " "listen interval %u, options 0x%02X, " @@ -3242,12 +3242,12 @@ static void acx_s_update_80211_powersave_mode(acx_device_t * adev) pm.acx100.enhanced_ps_transition_time = cpu_to_le16(adev->ps_enhanced_transition_time); } - acx_s_configure(adev, &pm, ACX1xx_REG_POWER_MGMT); - acx_s_interrogate(adev, &pm, ACX1xx_REG_POWER_MGMT); + acx_s_configure(adev, &pm, ACX1xx_IE_POWER_MGMT); + acx_s_interrogate(adev, &pm, ACX1xx_IE_POWER_MGMT); acx_log(LOG_DEBUG, L_INIT, "wakeup_cfg: 0x%02X\n", pm.acx111.wakeup_cfg); acx_s_mwait(40); - acx_s_interrogate(adev, &pm, ACX1xx_REG_POWER_MGMT); + acx_s_interrogate(adev, &pm, ACX1xx_IE_POWER_MGMT); acx_log(LOG_DEBUG, L_INIT, "wakeup_cfg: 0x%02X\n", pm.acx111.wakeup_cfg); acx_log(LOG_DEBUG, L_INIT, "power save mode change %s\n", @@ -3295,7 +3295,7 @@ void acx_s_set_sane_reg_domain(acx_device_t *adev, int do_set) if (do_set) { acx_ie_generic_t dom; dom.m.bytes[0] = adev->reg_dom_id; - acx_s_configure(adev, &dom, ACX1xx_REG_DOT11_CURRENT_REG_DOMAIN); + acx_s_configure(adev, &dom, ACX1xx_IE_DOT11_CURRENT_REG_DOMAIN); } adev->reg_dom_chanmask = reg_domain_channel_masks[i]; @@ -3386,10 +3386,10 @@ void acx_s_update_card_settings(acx_device_t *adev) if (adev->get_mask & GETSET_STATION_ID) { - u8 stationID[4 + ACX1xx_REG_DOT11_STATION_ID_LEN]; + u8 stationID[4 + ACX1xx_IE_DOT11_STATION_ID_LEN]; const u8 *paddr; - acx_s_interrogate(adev, &stationID, ACX1xx_REG_DOT11_STATION_ID); + acx_s_interrogate(adev, &stationID, ACX1xx_IE_DOT11_STATION_ID); paddr = &stationID[4]; // memcpy(adev->dev_addr, adev->ndev->dev_addr, ETH_ALEN); for (i = 0; i < ETH_ALEN; i++) { @@ -3421,11 +3421,11 @@ void acx_s_update_card_settings(acx_device_t *adev) } if (adev->get_mask & GETSET_ANTENNA) { - u8 antenna[4 + ACX1xx_REG_DOT11_CURRENT_ANTENNA_LEN]; + u8 antenna[4 + ACX1xx_IE_DOT11_CURRENT_ANTENNA_LEN]; memset(antenna, 0, sizeof(antenna)); acx_s_interrogate(adev, antenna, - ACX1xx_REG_DOT11_CURRENT_ANTENNA); + ACX1xx_IE_DOT11_CURRENT_ANTENNA); adev->antenna = antenna[4]; acx_log(LOG_INFO, L_INIT, "got antenna value 0x%02X\n", adev->antenna); @@ -3434,11 +3434,11 @@ void acx_s_update_card_settings(acx_device_t *adev) if (adev->get_mask & GETSET_ED_THRESH) { if (IS_ACX100(adev)) { - u8 ed_threshold[4 + ACX100_REG_DOT11_ED_THRESHOLD_LEN]; + u8 ed_threshold[4 + ACX100_IE_DOT11_ED_THRESHOLD_LEN]; memset(ed_threshold, 0, sizeof(ed_threshold)); acx_s_interrogate(adev, ed_threshold, - ACX100_REG_DOT11_ED_THRESHOLD); + ACX100_IE_DOT11_ED_THRESHOLD); adev->ed_threshold = ed_threshold[4]; } else { acx_log(LOG_WARNING, L_INIT, @@ -3453,11 +3453,11 @@ void acx_s_update_card_settings(acx_device_t *adev) if (adev->get_mask & GETSET_CCA) { if (IS_ACX100(adev)) { - u8 cca[4 + ACX1xx_REG_DOT11_CURRENT_CCA_MODE_LEN]; + u8 cca[4 + ACX1xx_IE_DOT11_CURRENT_CCA_MODE_LEN]; memset(cca, 0, sizeof(adev->cca)); acx_s_interrogate(adev, cca, - ACX1xx_REG_DOT11_CURRENT_CCA_MODE); + ACX1xx_IE_DOT11_CURRENT_CCA_MODE); adev->cca = cca[4]; } else { acx_log(LOG_WARNING, L_INIT, @@ -3474,7 +3474,7 @@ void acx_s_update_card_settings(acx_device_t *adev) acx_ie_generic_t dom; acx_s_interrogate(adev, &dom, - ACX1xx_REG_DOT11_CURRENT_REG_DOMAIN); + ACX1xx_IE_DOT11_CURRENT_REG_DOMAIN); adev->reg_dom_id = dom.m.bytes[0]; acx_s_set_sane_reg_domain(adev, 0); acx_log(LOG_INFO, L_INIT, @@ -3483,7 +3483,7 @@ void acx_s_update_card_settings(acx_device_t *adev) } if (adev->set_mask & GETSET_STATION_ID) { - u8 stationID[4 + ACX1xx_REG_DOT11_STATION_ID_LEN]; + u8 stationID[4 + ACX1xx_IE_DOT11_STATION_ID_LEN]; u8 *paddr; paddr = &stationID[4]; @@ -3495,7 +3495,7 @@ void acx_s_update_card_settings(acx_device_t *adev) * the card!) */ paddr[i] = adev->dev_addr[ETH_ALEN - 1 - i]; } - acx_s_configure(adev, &stationID, ACX1xx_REG_DOT11_STATION_ID); + acx_s_configure(adev, &stationID, ACX1xx_IE_DOT11_STATION_ID); CLEAR_BIT(adev->set_mask, GETSET_STATION_ID); } @@ -3503,7 +3503,7 @@ void acx_s_update_card_settings(acx_device_t *adev) CLEAR_BIT(adev->set_mask, SET_STA_LIST); } if (adev->set_mask & SET_RATE_FALLBACK) { - u8 rate[4 + ACX1xx_REG_RATE_FALLBACK_LEN]; + u8 rate[4 + ACX1xx_IE_RATE_FALLBACK_LEN]; /* configure to not do fallbacks when not in auto rate mode */ rate[4] = @@ -3511,7 +3511,7 @@ void acx_s_update_card_settings(acx_device_t *adev) rate_auto) ? /* adev->txrate_fallback_retries */ 1 : 0; acx_log(LOG_DEBUG, L_INIT, "updating Tx fallback to %u retries\n", rate[4]); - acx_s_configure(adev, &rate, ACX1xx_REG_RATE_FALLBACK); + acx_s_configure(adev, &rate, ACX1xx_IE_RATE_FALLBACK); CLEAR_BIT(adev->set_mask, SET_RATE_FALLBACK); } if (adev->set_mask & GETSET_TXPOWER) { @@ -3544,14 +3544,14 @@ void acx_s_update_card_settings(acx_device_t *adev) if (adev->set_mask & GETSET_ANTENNA) { /* antenna */ - u8 antenna[4 + ACX1xx_REG_DOT11_CURRENT_ANTENNA_LEN]; + u8 antenna[4 + ACX1xx_IE_DOT11_CURRENT_ANTENNA_LEN]; memset(antenna, 0, sizeof(antenna)); antenna[4] = adev->antenna; acx_log(LOG_DEBUG, L_INIT, "updating antenna value: 0x%02X\n", adev->antenna); acx_s_configure(adev, &antenna, - ACX1xx_REG_DOT11_CURRENT_ANTENNA); + ACX1xx_IE_DOT11_CURRENT_ANTENNA); CLEAR_BIT(adev->set_mask, GETSET_ANTENNA); } @@ -3561,12 +3561,12 @@ void acx_s_update_card_settings(acx_device_t *adev) "updating Energy Detect (ED) threshold: %u\n", adev->ed_threshold); if (IS_ACX100(adev)) { - u8 ed_threshold[4 + ACX100_REG_DOT11_ED_THRESHOLD_LEN]; + u8 ed_threshold[4 + ACX100_IE_DOT11_ED_THRESHOLD_LEN]; memset(ed_threshold, 0, sizeof(ed_threshold)); ed_threshold[4] = adev->ed_threshold; acx_s_configure(adev, &ed_threshold, - ACX100_REG_DOT11_ED_THRESHOLD); + ACX100_IE_DOT11_ED_THRESHOLD); } else acx_log(LOG_WARNING, L_INIT, "acx111 doesn't support ED!\n"); @@ -3579,12 +3579,12 @@ void acx_s_update_card_settings(acx_device_t *adev) "updating Channel Clear Assessment (CCA) value: " "0x%02X\n", adev->cca); if (IS_ACX100(adev)) { - u8 cca[4 + ACX1xx_REG_DOT11_CURRENT_CCA_MODE_LEN]; + u8 cca[4 + ACX1xx_IE_DOT11_CURRENT_CCA_MODE_LEN]; memset(cca, 0, sizeof(cca)); cca[4] = adev->cca; acx_s_configure(adev, &cca, - ACX1xx_REG_DOT11_CURRENT_CCA_MODE); + ACX1xx_IE_DOT11_CURRENT_CCA_MODE); } else acx_log(LOG_WARNING, L_INIT, "acx111 doesn't support CCA!\n"); @@ -3645,8 +3645,8 @@ void acx_s_update_card_settings(acx_device_t *adev) } if (adev->set_mask & GETSET_RETRY) { - u8 short_retry[4 + ACX1xx_REG_DOT11_SHORT_RETRY_LIMIT_LEN]; - u8 long_retry[4 + ACX1xx_REG_DOT11_LONG_RETRY_LIMIT_LEN]; + u8 short_retry[4 + ACX1xx_IE_DOT11_SHORT_RETRY_LIMIT_LEN]; + u8 long_retry[4 + ACX1xx_IE_DOT11_LONG_RETRY_LIMIT_LEN]; acx_log(LOG_INFO, L_INIT, "updating short retry limit: %u, " @@ -3655,22 +3655,22 @@ void acx_s_update_card_settings(acx_device_t *adev) short_retry[0x4] = adev->short_retry; long_retry[0x4] = adev->long_retry; acx_s_configure(adev, &short_retry, - ACX1xx_REG_DOT11_SHORT_RETRY_LIMIT); + ACX1xx_IE_DOT11_SHORT_RETRY_LIMIT); acx_s_configure(adev, &long_retry, - ACX1xx_REG_DOT11_LONG_RETRY_LIMIT); + ACX1xx_IE_DOT11_LONG_RETRY_LIMIT); CLEAR_BIT(adev->set_mask, GETSET_RETRY); } if (adev->set_mask & SET_MSDU_LIFETIME) { u8 xmt_msdu_lifetime[4 + - ACX1xx_REG_DOT11_MAX_XMIT_MSDU_LIFETIME_LEN]; + ACX1xx_IE_DOT11_MAX_XMIT_MSDU_LIFETIME_LEN]; acx_log(LOG_DEBUG, L_INIT, "updating tx MSDU lifetime: %u\n", adev->msdu_lifetime); *(u32 *) & xmt_msdu_lifetime[4] = cpu_to_le32((u32) adev->msdu_lifetime); acx_s_configure(adev, &xmt_msdu_lifetime, - ACX1xx_REG_DOT11_MAX_XMIT_MSDU_LIFETIME); + ACX1xx_IE_DOT11_MAX_XMIT_MSDU_LIFETIME); CLEAR_BIT(adev->set_mask, SET_MSDU_LIFETIME); } @@ -3757,10 +3757,10 @@ void acx_s_update_card_settings(acx_device_t *adev) "setting WEP key %u as default\n", dkey.KeyID); acx_s_configure(adev, &dkey, - ACX1xx_REG_DOT11_WEP_DEFAULT_KEY_SET); + ACX1xx_IE_DOT11_WEP_DEFAULT_KEY_SET); #ifdef DEBUG_WEP keyindic.val = 3; - acx_s_configure(adev, &keyindic, ACX111_REG_KEY_CHOOSE); + acx_s_configure(adev, &keyindic, ACX111_IE_KEY_CHOOSE); #endif } @@ -3791,7 +3791,7 @@ void acx_s_update_card_settings(acx_device_t *adev) options.WEPOption = 2; } - acx_s_configure(adev, &options, ACX100_REG_WEP_OPTIONS); + acx_s_configure(adev, &options, ACX100_IE_WEP_OPTIONS); } CLEAR_BIT(adev->set_mask, SET_WEP_OPTIONS); } diff --git a/pci.c b/pci.c index dd6b005..e94f318 100644 --- a/pci.c +++ b/pci.c @@ -642,7 +642,7 @@ int acxpci_s_upload_radio(acx_device_t * adev) FN_ENTER; - acx_s_interrogate(adev, &mm, ACX1xx_REG_MEMORY_MAP); + acx_s_interrogate(adev, &mm, ACX1xx_IE_MEMORY_MAP); offset = le32_to_cpu(mm.CodeEnd); snprintf(filename, sizeof(filename), "tiacx1%02dr%02X", @@ -689,7 +689,7 @@ int acxpci_s_upload_radio(acx_device_t * adev) &radioinit, sizeof(radioinit), CMD_TIMEOUT_MS(1000)); - res = acx_s_interrogate(adev, &mm, ACX1xx_REG_MEMORY_MAP); + res = acx_s_interrogate(adev, &mm, ACX1xx_IE_MEMORY_MAP); fail: FN_EXIT1(res); return res; @@ -1661,7 +1661,7 @@ acxpci_e_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (IS_ACX111(adev)) { /* ACX111: configopt struct needs to be queried after full init */ - acx_s_interrogate(adev, &co, ACX111_REG_CONFIG_OPTIONS); + acx_s_interrogate(adev, &co, ACX111_IE_CONFIG_OPTIONS); } /* TODO: merge them into one function, they are called just once and are the same for pci & usb */ if (OK != acxpci_read_eeprom_byte(adev, 0x05, &adev->eeprom_version)) @@ -2715,27 +2715,27 @@ acx111pci_ioctl_info(struct net_device *ndev, memset(&memconf, 0, sizeof(memconf)); /* BTW, fails with 12 (Write only) error code. ** Retained for easy testing of issue_cmd error handling :) */ - acx_s_interrogate(adev, &memconf, ACX1xx_REG_QUEUE_CONFIG); + acx_s_interrogate(adev, &memconf, ACX1xx_IE_QUEUE_CONFIG); /* get Acx111 Queue Configuration */ memset(&queueconf, 0, sizeof(queueconf)); - acx_s_interrogate(adev, &queueconf, ACX1xx_REG_MEMORY_CONFIG_OPTIONS); + acx_s_interrogate(adev, &queueconf, ACX1xx_IE_MEMORY_CONFIG_OPTIONS); /* get Acx111 Memory Map */ memset(memmap, 0, sizeof(memmap)); - acx_s_interrogate(adev, &memmap, ACX1xx_REG_MEMORY_MAP); + acx_s_interrogate(adev, &memmap, ACX1xx_IE_MEMORY_MAP); /* get Acx111 Rx Config */ memset(rxconfig, 0, sizeof(rxconfig)); - acx_s_interrogate(adev, &rxconfig, ACX1xx_REG_RXCONFIG); + acx_s_interrogate(adev, &rxconfig, ACX1xx_IE_RXCONFIG); /* get Acx111 fcs error count */ memset(fcserror, 0, sizeof(fcserror)); - acx_s_interrogate(adev, &fcserror, ACX1xx_REG_FCS_ERROR_COUNT); + acx_s_interrogate(adev, &fcserror, ACX1xx_IE_FCS_ERROR_COUNT); /* get Acx111 rate fallback */ memset(ratefallback, 0, sizeof(ratefallback)); - acx_s_interrogate(adev, &ratefallback, ACX1xx_REG_RATE_FALLBACK); + acx_s_interrogate(adev, &ratefallback, ACX1xx_IE_RATE_FALLBACK); /* force occurrence of a beacon interrupt */ /* TODO: comment why is this necessary */ @@ -4254,7 +4254,7 @@ static __devinit int vlynq_probe(struct vlynq_device *vdev, if (OK != acx_s_init_mac(adev)) goto fail_init_mac; - acx_s_interrogate(adev, &co, ACX111_REG_CONFIG_OPTIONS); + acx_s_interrogate(adev, &co, ACX111_IE_CONFIG_OPTIONS); /* TODO: merge them into one function, they are called just once and are the same for pci & usb */ if (OK != acxpci_read_eeprom_byte(adev, 0x05, &adev->eeprom_version)) goto fail_read_eeprom_version; diff --git a/usb.c b/usb.c index fb1817b..61e68cd 100644 --- a/usb.c +++ b/usb.c @@ -304,7 +304,7 @@ acxusb_s_issue_cmd_timeo_debug(acx_device_t * adev, ** ** Configure: write (cmd,status,rid,frmlen,data[frmlen]) ** -** Possibly bogus special handling of ACX1xx_REG_SCAN_STATUS removed +** Possibly bogus special handling of ACX1xx_IE_SCAN_STATUS removed */ /* now write the parameters of the command if needed */ @@ -372,7 +372,7 @@ acxusb_s_issue_cmd_timeo_debug(acx_device_t * adev, /* check for result==buflen+4? Was seen: -query(type:ACX100_REG_DOT11_ED_THRESHOLD,len:4) +interrogate(type:ACX100_IE_DOT11_ED_THRESHOLD,len:4) issue_cmd(cmd:ACX1xx_CMD_INTERROGATE,buflen:8,type:4111) ctrl inpipe=0x80000280 outpipe=0x80000200 sending USB control msg (out) (blocklen=8) @@ -707,7 +707,7 @@ static void acxusb_s_read_eeprom_version(acx_device_t * adev) u8 eeprom_ver[0x8]; memset(eeprom_ver, 0, sizeof(eeprom_ver)); - acx_s_interrogate(adev, &eeprom_ver, ACX1FF_REG_EEPROM_VER); + acx_s_interrogate(adev, &eeprom_ver, ACX1FF_IE_EEPROM_VER); /* FIXME: which one of those values to take? */ adev->eeprom_version = eeprom_ver[5]; @@ -946,7 +946,7 @@ acxusb_e_probe(struct usb_interface *intf, const struct usb_device_id *devID) SET_IEEE80211_DEV(ieee, &intf->dev); /* TODO: move all of fw cmds to open()? But then we won't know our MAC addr - until ifup (it's available via reading ACX1xx_REG_DOT11_STATION_ID)... */ + until ifup (it's available via reading ACX1xx_IE_DOT11_STATION_ID)... */ /* put acx out of sleep mode and initialize it */ acx_s_issue_cmd(adev, ACX1xx_CMD_WAKE, NULL, 0); -- 2.11.4.GIT