* [PATCH] zd1211rw: Fixed incorrect constant name.
@ 2008-02-09 2:41 Javier Cardona
2008-02-15 20:21 ` Daniel Drake
0 siblings, 1 reply; 2+ messages in thread
From: Javier Cardona @ 2008-02-09 2:41 UTC (permalink / raw)
To: linux-wireless
Trial and error reveals that CR_ZD1211B_TX_PWR_CTL* do not affect the
transmission power. Instead these registers seem to control the contention
windows limits for different QoS access categories.
Signed-off-by: Javier Cardona <javier@cozybit.com>
---
drivers/net/wireless/zd1211rw/zd_chip.c | 8 ++++----
drivers/net/wireless/zd1211rw/zd_chip.h | 9 ++++-----
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 66abc4e..0acb5c3 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -771,10 +771,10 @@ static int zd1211b_hw_init_hmac(struct zd_chip *chip)
{
static const struct zd_ioreq32 ioreqs[] = {
{ CR_ZD1211B_RETRY_MAX, 0x02020202 },
- { CR_ZD1211B_TX_PWR_CTL4, 0x007f003f },
- { CR_ZD1211B_TX_PWR_CTL3, 0x007f003f },
- { CR_ZD1211B_TX_PWR_CTL2, 0x003f001f },
- { CR_ZD1211B_TX_PWR_CTL1, 0x001f000f },
+ { CR_ZD1211B_CWIN_MAX_MIN_AC0, 0x007f003f },
+ { CR_ZD1211B_CWIN_MAX_MIN_AC1, 0x007f003f },
+ { CR_ZD1211B_CWIN_MAX_MIN_AC2, 0x003f001f },
+ { CR_ZD1211B_CWIN_MAX_MIN_AC3, 0x001f000f },
{ CR_ZD1211B_AIFS_CTL1, 0x00280028 },
{ CR_ZD1211B_AIFS_CTL2, 0x008C003C },
{ CR_ZD1211B_TXOP, 0x01800824 },
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zd1211rw/zd_chip.h
index 5cffbd6..3f44db2 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.h
+++ b/drivers/net/wireless/zd1211rw/zd_chip.h
@@ -633,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)
--
1.5.2.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] zd1211rw: Fixed incorrect constant name.
2008-02-09 2:41 [PATCH] zd1211rw: Fixed incorrect constant name Javier Cardona
@ 2008-02-15 20:21 ` Daniel Drake
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Drake @ 2008-02-15 20:21 UTC (permalink / raw)
To: Javier Cardona; +Cc: linux-wireless, John Linville, Ulrich Kunitz
Javier Cardona wrote:
> Trial and error reveals that CR_ZD1211B_TX_PWR_CTL* do not affect the
> transmission power. Instead these registers seem to control the contention
> windows limits for different QoS access categories.
These constant names were taken from the vendor driver but your verdict
looks correct, at least the values programmed into them seem to resemble
the CWIN_SIZE format.
Have you tried queuing frames to be sent over the alternative categories
or did you discover this some other way?
> Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: Daniel Drake <dsd@gentoo.org>
> ---
> drivers/net/wireless/zd1211rw/zd_chip.c | 8 ++++----
> drivers/net/wireless/zd1211rw/zd_chip.h | 9 ++++-----
> 2 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
> index 66abc4e..0acb5c3 100644
> --- a/drivers/net/wireless/zd1211rw/zd_chip.c
> +++ b/drivers/net/wireless/zd1211rw/zd_chip.c
> @@ -771,10 +771,10 @@ static int zd1211b_hw_init_hmac(struct zd_chip *chip)
> {
> static const struct zd_ioreq32 ioreqs[] = {
> { CR_ZD1211B_RETRY_MAX, 0x02020202 },
> - { CR_ZD1211B_TX_PWR_CTL4, 0x007f003f },
> - { CR_ZD1211B_TX_PWR_CTL3, 0x007f003f },
> - { CR_ZD1211B_TX_PWR_CTL2, 0x003f001f },
> - { CR_ZD1211B_TX_PWR_CTL1, 0x001f000f },
> + { CR_ZD1211B_CWIN_MAX_MIN_AC0, 0x007f003f },
> + { CR_ZD1211B_CWIN_MAX_MIN_AC1, 0x007f003f },
> + { CR_ZD1211B_CWIN_MAX_MIN_AC2, 0x003f001f },
> + { CR_ZD1211B_CWIN_MAX_MIN_AC3, 0x001f000f },
> { CR_ZD1211B_AIFS_CTL1, 0x00280028 },
> { CR_ZD1211B_AIFS_CTL2, 0x008C003C },
> { CR_ZD1211B_TXOP, 0x01800824 },
> diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zd1211rw/zd_chip.h
> index 5cffbd6..3f44db2 100644
> --- a/drivers/net/wireless/zd1211rw/zd_chip.h
> +++ b/drivers/net/wireless/zd1211rw/zd_chip.h
> @@ -633,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)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-02-15 20:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-09 2:41 [PATCH] zd1211rw: Fixed incorrect constant name Javier Cardona
2008-02-15 20:21 ` Daniel Drake
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).