Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
fb3bc67e
Commit
fb3bc67e
authored
Mar 28, 2013
by
Rafał Miłecki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
b43: use defines for board_type
Signed-off-by:
Rafał Miłecki
<
zajec5@gmail.com
>
parent
542e15f3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
drivers/net/wireless/b43/phy_lp.c
drivers/net/wireless/b43/phy_lp.c
+2
-2
drivers/net/wireless/b43/phy_n.c
drivers/net/wireless/b43/phy_n.c
+3
-3
No files found.
drivers/net/wireless/b43/phy_lp.c
View file @
fb3bc67e
...
@@ -281,8 +281,8 @@ static void lpphy_baseband_rev0_1_init(struct b43_wldev *dev)
...
@@ -281,8 +281,8 @@ static void lpphy_baseband_rev0_1_init(struct b43_wldev *dev)
b43_phy_maskset
(
dev
,
B43_LPPHY_TR_LOOKUP_8
,
0xFFC0
,
0x000A
);
b43_phy_maskset
(
dev
,
B43_LPPHY_TR_LOOKUP_8
,
0xFFC0
,
0x000A
);
b43_phy_maskset
(
dev
,
B43_LPPHY_TR_LOOKUP_8
,
0xC0FF
,
0x0B00
);
b43_phy_maskset
(
dev
,
B43_LPPHY_TR_LOOKUP_8
,
0xC0FF
,
0x0B00
);
}
else
if
(
b43_current_band
(
dev
->
wl
)
==
IEEE80211_BAND_5GHZ
||
}
else
if
(
b43_current_band
(
dev
->
wl
)
==
IEEE80211_BAND_5GHZ
||
(
dev
->
dev
->
board_type
==
0x048A
)
||
((
dev
->
phy
.
rev
==
0
)
&&
(
dev
->
dev
->
board_type
==
SSB_BOARD_BU4312
)
||
(
sprom
->
boardflags_lo
&
B43_BFL_FEM
)))
{
(
dev
->
phy
.
rev
==
0
&&
(
sprom
->
boardflags_lo
&
B43_BFL_FEM
)))
{
b43_phy_maskset
(
dev
,
B43_LPPHY_TR_LOOKUP_1
,
0xFFC0
,
0x0001
);
b43_phy_maskset
(
dev
,
B43_LPPHY_TR_LOOKUP_1
,
0xFFC0
,
0x0001
);
b43_phy_maskset
(
dev
,
B43_LPPHY_TR_LOOKUP_1
,
0xC0FF
,
0x0400
);
b43_phy_maskset
(
dev
,
B43_LPPHY_TR_LOOKUP_1
,
0xC0FF
,
0x0400
);
b43_phy_maskset
(
dev
,
B43_LPPHY_TR_LOOKUP_2
,
0xFFC0
,
0x0001
);
b43_phy_maskset
(
dev
,
B43_LPPHY_TR_LOOKUP_2
,
0xFFC0
,
0x0001
);
...
...
drivers/net/wireless/b43/phy_n.c
View file @
fb3bc67e
...
@@ -1016,7 +1016,7 @@ static void b43_radio_init2055_post(struct b43_wldev *dev)
...
@@ -1016,7 +1016,7 @@ static void b43_radio_init2055_post(struct b43_wldev *dev)
if
(
sprom
->
revision
<
4
)
if
(
sprom
->
revision
<
4
)
workaround
=
(
dev
->
dev
->
board_vendor
!=
PCI_VENDOR_ID_BROADCOM
workaround
=
(
dev
->
dev
->
board_vendor
!=
PCI_VENDOR_ID_BROADCOM
&&
dev
->
dev
->
board_type
==
0x46D
&&
dev
->
dev
->
board_type
==
SSB_BOARD_CB2_4321
&&
dev
->
dev
->
board_rev
>=
0x41
);
&&
dev
->
dev
->
board_rev
>=
0x41
);
else
else
workaround
=
workaround
=
...
@@ -2616,7 +2616,7 @@ static void b43_nphy_workarounds_rev1_2(struct b43_wldev *dev)
...
@@ -2616,7 +2616,7 @@ static void b43_nphy_workarounds_rev1_2(struct b43_wldev *dev)
u8
delays2
[
7
]
=
{
0x8
,
0x6
,
0x2
,
0x4
,
0x4
,
0x6
,
0x1
};
u8
delays2
[
7
]
=
{
0x8
,
0x6
,
0x2
,
0x4
,
0x4
,
0x6
,
0x1
};
if
(
sprom
->
boardflags2_lo
&
B43_BFL2_SKWRKFEM_BRD
||
if
(
sprom
->
boardflags2_lo
&
B43_BFL2_SKWRKFEM_BRD
||
dev
->
dev
->
board_type
==
0x8B
)
{
dev
->
dev
->
board_type
==
BCMA_BOARD_TYPE_BCM943224M93
)
{
delays1
[
0
]
=
0x1
;
delays1
[
0
]
=
0x1
;
delays1
[
5
]
=
0x14
;
delays1
[
5
]
=
0x14
;
}
}
...
@@ -5002,7 +5002,7 @@ static int b43_phy_initn(struct b43_wldev *dev)
...
@@ -5002,7 +5002,7 @@ static int b43_phy_initn(struct b43_wldev *dev)
if
(
sprom
->
boardflags2_lo
&
B43_BFL2_SKWRKFEM_BRD
||
if
(
sprom
->
boardflags2_lo
&
B43_BFL2_SKWRKFEM_BRD
||
(
dev
->
dev
->
board_vendor
==
PCI_VENDOR_ID_APPLE
&&
(
dev
->
dev
->
board_vendor
==
PCI_VENDOR_ID_APPLE
&&
dev
->
dev
->
board_type
==
0x8B
))
dev
->
dev
->
board_type
==
BCMA_BOARD_TYPE_BCM943224M93
))
b43_phy_write
(
dev
,
B43_NPHY_TXREALFD
,
0xA0
);
b43_phy_write
(
dev
,
B43_NPHY_TXREALFD
,
0xA0
);
else
else
b43_phy_write
(
dev
,
B43_NPHY_TXREALFD
,
0xB8
);
b43_phy_write
(
dev
,
B43_NPHY_TXREALFD
,
0xB8
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment