This patch adds a new at86rf2xx_chip_data structure which holds device
specific attributes. Instead of runtime decisions "if (is212())" we set
callbacks/attributes while device detection.
Signed-off-by: Alexander Aring <alex.ar...@gmail.com>
---
drivers/net/ieee802154/at86rf2xx.c | 56 +++++++++++++++++++++++---------------
1 file changed, 34 insertions(+), 22 deletions(-)
diff --git a/drivers/net/ieee802154/at86rf2xx.c
b/drivers/net/ieee802154/at86rf2xx.c
index aeec941..24c5de0 100644
--- a/drivers/net/ieee802154/at86rf2xx.c
+++ b/drivers/net/ieee802154/at86rf2xx.c
@@ -38,12 +38,18 @@
#include <net/mac802154.h>
#include <net/wpan-phy.h>
+struct at86rf2xx_local;
+/* at86rf2xx chip depend data.
+ * All timings are in us.
+ */
+struct at86rf2xx_chip_data {
+ int rssi_base_val;
+ int (*set_channel)(struct at86rf2xx_local *, int, int);
+};
+
struct at86rf2xx_local {
struct spi_device *spi;
- u8 part;
- u8 vers;
-
u8 buf[2];
struct mutex bmux;
@@ -56,16 +62,11 @@ struct at86rf2xx_local {
spinlock_t lock;
bool irq_busy;
bool is_tx;
- bool tx_aret;
- int rssi_base_val;
+ struct at86rf2xx_chip_data *data;
+ bool tx_aret;
};
-static bool is_rf212(struct at86rf2xx_local *local)
-{
- return local->part == 7;
-}
-
#define RG_TRX_STATUS (0x01)
#define SR_TRX_STATUS 0x01, 0x1f, 0
#define SR_RESERVED_01_3 0x01, 0x20, 5
@@ -595,8 +596,6 @@ at86rf2xx_stop(struct ieee802154_dev *dev)
static int
at86rf23x_set_channel(struct at86rf2xx_local *lp, int page, int channel)
{
- lp->rssi_base_val = -91;
-
return at86rf2xx_write_subreg(lp, SR_CHANNEL, channel);
}
@@ -614,10 +613,10 @@ at86rf212_set_channel(struct at86rf2xx_local *lp, int
page, int channel)
if (page == 0) {
rc = at86rf2xx_write_subreg(lp, SR_BPSK_QPSK, 0);
- lp->rssi_base_val = -100;
+ lp->data->rssi_base_val = -100;
} else {
rc = at86rf2xx_write_subreg(lp, SR_BPSK_QPSK, 1);
- lp->rssi_base_val = -98;
+ lp->data->rssi_base_val = -98;
}
if (rc < 0)
return rc;
@@ -639,10 +638,7 @@ at86rf2xx_channel(struct ieee802154_dev *dev, int page,
int channel)
return -EINVAL;
}
- if (is_rf212(lp))
- rc = at86rf212_set_channel(lp, page, channel);
- else
- rc = at86rf23x_set_channel(lp, page, channel);
+ rc = lp->data->set_channel(lp, page, channel);
if (rc < 0)
return rc;
@@ -827,10 +823,10 @@ at86rf2xx_set_cca_ed_level(struct ieee802154_dev *dev,
s32 level)
struct at86rf2xx_local *lp = dev->priv;
int desens_steps;
- if (level < lp->rssi_base_val || level > 30)
+ if (level < lp->data->rssi_base_val || level > 30)
return -EINVAL;
- desens_steps = (level - lp->rssi_base_val) * 100 / 207;
+ desens_steps = (level - lp->data->rssi_base_val) * 100 / 207;
return at86rf2xx_write_subreg(lp, SR_CCA_ED_THRES, desens_steps);
}
@@ -889,6 +885,21 @@ static struct ieee802154_ops at86rf2xx_ops = {
.set_frame_retries = at86rf2xx_set_frame_retries,
};
+static struct at86rf2xx_chip_data at86rf233_data = {
+ .set_channel = at86rf23x_set_channel,
+ .rssi_base_val = -91,
+};
+
+static struct at86rf2xx_chip_data at86rf231_data = {
+ .set_channel = at86rf23x_set_channel,
+ .rssi_base_val = -91,
+};
+
+static struct at86rf2xx_chip_data at86rf212_data = {
+ .set_channel = at86rf212_set_channel,
+ .rssi_base_val = -100,
+};
+
static void at86rf2xx_irqwork(struct work_struct *work)
{
struct at86rf2xx_local *lp =
@@ -1061,8 +1072,6 @@ at86rf2xx_detect_device(struct at86rf2xx_local *lp)
return -EINVAL;
}
- lp->part = part;
- lp->vers = version;
lp->dev->extra_tx_headroom = 0;
lp->dev->flags = IEEE802154_HW_OMIT_CKSUM | IEEE802154_HW_AACK |
IEEE802154_HW_TXPOWER | IEEE802154_HW_CSMA;
@@ -1074,11 +1083,13 @@ at86rf2xx_detect_device(struct at86rf2xx_local *lp)
break;
case 3:
chip = "at86rf231";
+ lp->data = &at86rf231_data;
lp->dev->phy->channels_supported[0] = 0x7FFF800;
break;
case 7:
chip = "at86rf212";
if (version == 1) {
+ lp->data = &at86rf212_data;
lp->dev->flags |= IEEE802154_HW_LBT;
lp->dev->phy->channels_supported[0] = 0x00007FF;
lp->dev->phy->channels_supported[2] = 0x00007FF;
@@ -1088,6 +1099,7 @@ at86rf2xx_detect_device(struct at86rf2xx_local *lp)
break;
case 11:
chip = "at86rf233";
+ lp->data = &at86rf233_data;
lp->dev->phy->channels_supported[0] = 0x7FFF800;
break;
default:
--
2.0.0
------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
_______________________________________________
Linux-zigbee-devel mailing list
Linux-zigbee-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-zigbee-devel
