diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2012-07-25 10:58:38 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-08-06 14:56:34 -0400 |
commit | 6e6a2cd510351502064c3e2a56f411a19530cd57 (patch) | |
tree | 28b3c0ad9361a7c585916b1e4a611cc49a3183e3 /drivers/net/wireless/b43/main.c | |
parent | 95a96e08967fed6e64e53b2d6a5e153a4d605e11 (diff) |
b43: rename host flags defines
There are more than 3 registers on new hardware. Host flags handling has
to be rewritten, as we can't use u128 type to handle all 5 regs.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
-rw-r--r-- | drivers/net/wireless/b43/main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index b80352b308d5..724c771133cc 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -533,11 +533,11 @@ u64 b43_hf_read(struct b43_wldev *dev) | |||
533 | { | 533 | { |
534 | u64 ret; | 534 | u64 ret; |
535 | 535 | ||
536 | ret = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFHI); | 536 | ret = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTF3); |
537 | ret <<= 16; | 537 | ret <<= 16; |
538 | ret |= b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFMI); | 538 | ret |= b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTF2); |
539 | ret <<= 16; | 539 | ret <<= 16; |
540 | ret |= b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFLO); | 540 | ret |= b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTF1); |
541 | 541 | ||
542 | return ret; | 542 | return ret; |
543 | } | 543 | } |
@@ -550,9 +550,9 @@ void b43_hf_write(struct b43_wldev *dev, u64 value) | |||
550 | lo = (value & 0x00000000FFFFULL); | 550 | lo = (value & 0x00000000FFFFULL); |
551 | mi = (value & 0x0000FFFF0000ULL) >> 16; | 551 | mi = (value & 0x0000FFFF0000ULL) >> 16; |
552 | hi = (value & 0xFFFF00000000ULL) >> 32; | 552 | hi = (value & 0xFFFF00000000ULL) >> 32; |
553 | b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFLO, lo); | 553 | b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTF1, lo); |
554 | b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFMI, mi); | 554 | b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTF2, mi); |
555 | b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFHI, hi); | 555 | b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTF3, hi); |
556 | } | 556 | } |
557 | 557 | ||
558 | /* Read the firmware capabilities bitmask (Opensource firmware only) */ | 558 | /* Read the firmware capabilities bitmask (Opensource firmware only) */ |