wpan-phy: allow specifying a per-page channel mask

IEEE 802.15.4-2006 defines channel pages that hold channels (max 32 pages,
27 channels per page). Allow the driver to specify supported channels
on pages, other than the first one.
Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
parent 375bb0e0
...@@ -356,7 +356,7 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev) ...@@ -356,7 +356,7 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev)
dev->addr_len); dev->addr_len);
memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
phy->channels_supported = (1 << 27) - 1; phy->channels_supported[0] = (1 << 27) - 1;
phy->transmit_power = 0xbf; phy->transmit_power = 0xbf;
dev->netdev_ops = &fake_ops; dev->netdev_ops = &fake_ops;
......
...@@ -34,7 +34,7 @@ struct wpan_phy { ...@@ -34,7 +34,7 @@ struct wpan_phy {
*/ */
u8 current_channel; u8 current_channel;
u8 current_page; u8 current_page;
u32 channels_supported; u32 channels_supported[32];
u8 transmit_power; u8 transmit_power;
u8 cca_mode; u8 cca_mode;
......
...@@ -40,12 +40,30 @@ static ssize_t name ## _show(struct device *dev, \ ...@@ -40,12 +40,30 @@ static ssize_t name ## _show(struct device *dev, \
MASTER_SHOW(current_channel, "%d"); MASTER_SHOW(current_channel, "%d");
MASTER_SHOW(current_page, "%d"); MASTER_SHOW(current_page, "%d");
MASTER_SHOW(channels_supported, "%#x");
MASTER_SHOW_COMPLEX(transmit_power, "%d +- %d dB", MASTER_SHOW_COMPLEX(transmit_power, "%d +- %d dB",
((signed char) (phy->transmit_power << 2)) >> 2, ((signed char) (phy->transmit_power << 2)) >> 2,
(phy->transmit_power >> 6) ? (phy->transmit_power >> 6) * 3 : 1 ); (phy->transmit_power >> 6) ? (phy->transmit_power >> 6) * 3 : 1 );
MASTER_SHOW(cca_mode, "%d"); MASTER_SHOW(cca_mode, "%d");
static ssize_t channels_supported_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct wpan_phy *phy = container_of(dev, struct wpan_phy, dev);
int ret;
int i, len = 0;
mutex_lock(&phy->pib_lock);
for (i = 0; i < 32; i++) {
ret = snprintf(buf + len, PAGE_SIZE - len,
"%#09x\n", phy->channels_supported[i]);
if (ret < 0)
break;
len += ret;
}
mutex_unlock(&phy->pib_lock);
return len;
}
static struct device_attribute pmib_attrs[] = { static struct device_attribute pmib_attrs[] = {
__ATTR_RO(current_channel), __ATTR_RO(current_channel),
__ATTR_RO(current_page), __ATTR_RO(current_page),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment