Skip to content

Commit

Permalink
wpan-phy: allow specifying a per-page channel mask
Browse files Browse the repository at this point in the history
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: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  • Loading branch information
lumag committed Nov 6, 2009
1 parent 375bb0e commit a0b4a73
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/ieee802154/fakehard.c
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev)
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;

dev->netdev_ops = &fake_ops;
Expand Down
2 changes: 1 addition & 1 deletion include/net/wpan-phy.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ struct wpan_phy {
*/
u8 current_channel;
u8 current_page;
u32 channels_supported;
u32 channels_supported[32];
u8 transmit_power;
u8 cca_mode;

Expand Down
20 changes: 19 additions & 1 deletion net/ieee802154/wpan-class.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,30 @@ static ssize_t name ## _show(struct device *dev, \

MASTER_SHOW(current_channel, "%d");
MASTER_SHOW(current_page, "%d");
MASTER_SHOW(channels_supported, "%#x");
MASTER_SHOW_COMPLEX(transmit_power, "%d +- %d dB",
((signed char) (phy->transmit_power << 2)) >> 2,
(phy->transmit_power >> 6) ? (phy->transmit_power >> 6) * 3 : 1 );
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[] = {
__ATTR_RO(current_channel),
__ATTR_RO(current_page),
Expand Down

0 comments on commit a0b4a73

Please sign in to comment.