diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-09-22 07:26:48 -0400 |
---|---|---|
committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-11-06 06:23:41 -0500 |
commit | a0b4a738e0e03f5e0d6ca366560f9a48e5adf83a (patch) | |
tree | 8063be3ae88a2bef6377cdf913b2432d9805c48b /net/ieee802154/wpan-class.c | |
parent | 375bb0e04b618d0c425b0ea492d16cf71eb94905 (diff) |
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: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Diffstat (limited to 'net/ieee802154/wpan-class.c')
-rw-r--r-- | net/ieee802154/wpan-class.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/net/ieee802154/wpan-class.c b/net/ieee802154/wpan-class.c index 68ccde63155b..0c51f85aa591 100644 --- a/net/ieee802154/wpan-class.c +++ b/net/ieee802154/wpan-class.c | |||
@@ -40,12 +40,30 @@ static ssize_t name ## _show(struct device *dev, \ | |||
40 | 40 | ||
41 | MASTER_SHOW(current_channel, "%d"); | 41 | MASTER_SHOW(current_channel, "%d"); |
42 | MASTER_SHOW(current_page, "%d"); | 42 | MASTER_SHOW(current_page, "%d"); |
43 | MASTER_SHOW(channels_supported, "%#x"); | ||
44 | MASTER_SHOW_COMPLEX(transmit_power, "%d +- %d dB", | 43 | MASTER_SHOW_COMPLEX(transmit_power, "%d +- %d dB", |
45 | ((signed char) (phy->transmit_power << 2)) >> 2, | 44 | ((signed char) (phy->transmit_power << 2)) >> 2, |
46 | (phy->transmit_power >> 6) ? (phy->transmit_power >> 6) * 3 : 1 ); | 45 | (phy->transmit_power >> 6) ? (phy->transmit_power >> 6) * 3 : 1 ); |
47 | MASTER_SHOW(cca_mode, "%d"); | 46 | MASTER_SHOW(cca_mode, "%d"); |
48 | 47 | ||
48 | static ssize_t channels_supported_show(struct device *dev, | ||
49 | struct device_attribute *attr, char *buf) | ||
50 | { | ||
51 | struct wpan_phy *phy = container_of(dev, struct wpan_phy, dev); | ||
52 | int ret; | ||
53 | int i, len = 0; | ||
54 | |||
55 | mutex_lock(&phy->pib_lock); | ||
56 | for (i = 0; i < 32; i++) { | ||
57 | ret = snprintf(buf + len, PAGE_SIZE - len, | ||
58 | "%#09x\n", phy->channels_supported[i]); | ||
59 | if (ret < 0) | ||
60 | break; | ||
61 | len += ret; | ||
62 | } | ||
63 | mutex_unlock(&phy->pib_lock); | ||
64 | return len; | ||
65 | } | ||
66 | |||
49 | static struct device_attribute pmib_attrs[] = { | 67 | static struct device_attribute pmib_attrs[] = { |
50 | __ATTR_RO(current_channel), | 68 | __ATTR_RO(current_channel), |
51 | __ATTR_RO(current_page), | 69 | __ATTR_RO(current_page), |