ath9k: kill ath9k's memzero() and use memset() instead

[safe/jmp/linux-2.6] / drivers / net / wireless / zd1211rw / zd_chip.h

diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zd1211rw/zd_chip.h
index 009c037..f8c061a 100644 (file)
--- a/drivers/net/wireless/zd1211rw/zd_chip.h
+++ b/drivers/net/wireless/zd1211rw/zd_chip.h
@@ -489,6 +489,7 @@ enum {
 
 #define CR_RX_OFFSET                   CTL_REG(0x065c)
 
+#define CR_BCN_LENGTH                  CTL_REG(0x0664)
 #define CR_PHY_DELAY                   CTL_REG(0x066C)
 #define CR_BCN_FIFO                    CTL_REG(0x0670)
 #define CR_SNIFFER_ON                  CTL_REG(0x0674)
@@ -545,6 +546,8 @@ enum {
 #define RX_FILTER_CTRL (RX_FILTER_RTS | RX_FILTER_CTS | \
        RX_FILTER_CFEND | RX_FILTER_CFACK)
 
+#define BCN_MODE_IBSS                  0x2000000
+
 /* Monitor mode sets filter to 0xfffff */
 
 #define CR_ACK_TIMEOUT_EXT             CTL_REG(0x0690)
@@ -578,6 +581,11 @@ enum {
 
 /* CAM: Continuous Access Mode (power management) */
 #define CR_CAM_MODE                    CTL_REG(0x0700)
+#define MODE_IBSS                      0x0
+#define MODE_AP                                0x1
+#define MODE_STA                       0x2
+#define MODE_AP_WDS                    0x3
+
 #define CR_CAM_ROLL_TB_LOW             CTL_REG(0x0704)
 #define CR_CAM_ROLL_TB_HIGH            CTL_REG(0x0708)
 #define CR_CAM_ADDRESS                 CTL_REG(0x070C)
@@ -625,11 +633,10 @@ enum {
 #define CR_S_MD                                CTL_REG(0x0830)
 
 #define CR_USB_DEBUG_PORT              CTL_REG(0x0888)
-
-#define CR_ZD1211B_TX_PWR_CTL1         CTL_REG(0x0b00)
-#define CR_ZD1211B_TX_PWR_CTL2         CTL_REG(0x0b04)
-#define CR_ZD1211B_TX_PWR_CTL3         CTL_REG(0x0b08)
-#define CR_ZD1211B_TX_PWR_CTL4         CTL_REG(0x0b0c)
+#define CR_ZD1211B_CWIN_MAX_MIN_AC0    CTL_REG(0x0b00)
+#define CR_ZD1211B_CWIN_MAX_MIN_AC1    CTL_REG(0x0b04)
+#define CR_ZD1211B_CWIN_MAX_MIN_AC2    CTL_REG(0x0b08)
+#define CR_ZD1211B_CWIN_MAX_MIN_AC3    CTL_REG(0x0b0c)
 #define CR_ZD1211B_AIFS_CTL1           CTL_REG(0x0b10)
 #define CR_ZD1211B_AIFS_CTL2           CTL_REG(0x0b14)
 #define CR_ZD1211B_TXOP                        CTL_REG(0x0b20)