From: "Rafał Miłecki" <zajec5@gmail.com>
To: linux-wireless@vger.kernel.org,
"John W. Linville" <linville@tuxdriver.com>
Cc: b43-dev@lists.infradead.org, "Rafał Miłecki" <zajec5@gmail.com>
Subject: [PATCH 2/6] b43: LCN-PHY: put tables functions in correct file
Date: Wed, 31 Aug 2011 23:36:17 +0200 [thread overview]
Message-ID: <1314826581-27852-2-git-send-email-zajec5@gmail.com> (raw)
In-Reply-To: <1314826581-27852-1-git-send-email-zajec5@gmail.com>
Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
---
drivers/net/wireless/b43/phy_lcn.c | 10 ----------
drivers/net/wireless/b43/tables_phy_lcn.c | 17 ++++++++++++++++-
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/drivers/net/wireless/b43/phy_lcn.c b/drivers/net/wireless/b43/phy_lcn.c
index b617e1f..9e57577 100644
--- a/drivers/net/wireless/b43/phy_lcn.c
+++ b/drivers/net/wireless/b43/phy_lcn.c
@@ -137,14 +137,6 @@ static void b43_phy_lcn_afe_set_unset(struct b43_wldev *dev)
b43_phy_write(dev, B43_PHY_LCN_AFE_CTL1, afe_ctl1);
}
-static void b43_phy_lcn_clean_0x18_table(struct b43_wldev *dev)
-{
- u8 i;
-
- for (i = 0; i < 0x80; i++)
- b43_lcntab_write(dev, B43_LCNTAB32(0x18, i), 0x80000);
-}
-
static void b43_phy_lcn_clear_0x07_table(struct b43_wldev *dev)
{
u8 i;
@@ -319,8 +311,6 @@ static int b43_phy_lcn_op_init(struct b43_wldev *dev)
b43_phy_maskset(dev, 0x663, 0xFF00, 0x64);
b43_phy_lcn_tables_init(dev);
- /* TODO: various tables ops here */
- b43_phy_lcn_clean_0x18_table(dev);
b43_phy_lcn_pre_radio_init(dev);
b43_phy_lcn_clear_0x07_table(dev);
diff --git a/drivers/net/wireless/b43/tables_phy_lcn.c b/drivers/net/wireless/b43/tables_phy_lcn.c
index 916d3f1..f74c00a 100644
--- a/drivers/net/wireless/b43/tables_phy_lcn.c
+++ b/drivers/net/wireless/b43/tables_phy_lcn.c
@@ -445,7 +445,7 @@ void b43_lcntab_write_bulk(struct b43_wldev *dev, u32 offset,
#define lcntab_upload(dev, offset, data) do { \
b43_lcntab_write_bulk(dev, offset, ARRAY_SIZE(data), data); \
} while (0)
-void b43_phy_lcn_tables_init(struct b43_wldev *dev)
+static void b43_phy_lcn_upload_static_tables(struct b43_wldev *dev)
{
lcntab_upload(dev, B43_LCNTAB16(0x02, 0), b43_lcntab_0x02);
lcntab_upload(dev, B43_LCNTAB16(0x01, 0), b43_lcntab_0x01);
@@ -462,3 +462,18 @@ void b43_phy_lcn_tables_init(struct b43_wldev *dev)
lcntab_upload(dev, B43_LCNTAB16(0x00, 0), b43_lcntab_0x00);
lcntab_upload(dev, B43_LCNTAB32(0x18, 0), b43_lcntab_0x18);
}
+
+static void b43_phy_lcn_clean_0x18_table(struct b43_wldev *dev)
+{
+ u8 i;
+
+ for (i = 0; i < 0x80; i++)
+ b43_lcntab_write(dev, B43_LCNTAB32(0x18, i), 0x80000);
+}
+
+void b43_phy_lcn_tables_init(struct b43_wldev *dev)
+{
+ b43_phy_lcn_upload_static_tables(dev);
+ /* TODO: various tables ops here */
+ b43_phy_lcn_clean_0x18_table(dev);
+}
--
1.7.3.4
next prev parent reply other threads:[~2011-08-31 21:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-31 21:36 [PATCH 1/6] b43: LCN-PHY: minor fixes Rafał Miłecki
2011-08-31 21:36 ` Rafał Miłecki [this message]
2011-08-31 21:36 ` [PATCH 3/6] b43: LCN-PHY: rewrite 0x7 table at the end of init Rafał Miłecki
2011-08-31 21:36 ` [PATCH 4/6] b43: LCN-PHY: upload additional 0x7 table Rafał Miłecki
2011-08-31 21:36 ` [PATCH 5/6] b43: LCN-PHY: rename functions, get rid of magic names Rafał Miłecki
2011-08-31 21:36 ` [PATCH 6/6] b43: LCN-PHY: add conditions for few operations Rafał Miłecki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1314826581-27852-2-git-send-email-zajec5@gmail.com \
--to=zajec5@gmail.com \
--cc=b43-dev@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).