Commit 308dbb7a authored by Stefan Schmidt's avatar Stefan Schmidt Committed by Marcel Holtmann

ieee802154: atusb: implement .set_cca_mode ops callback

Catching up with the stack here and implement CCA mode setting.
Signed-off-by: default avatarStefan Schmidt <stefan@osg.samsung.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 0f4715c8
...@@ -478,6 +478,39 @@ static const s32 atusb_ed_levels[ATUSB_MAX_ED_LEVELS + 1] = { ...@@ -478,6 +478,39 @@ static const s32 atusb_ed_levels[ATUSB_MAX_ED_LEVELS + 1] = {
-7100, -6900, -6700, -6500, -6300, -6100, -7100, -6900, -6700, -6500, -6300, -6100,
}; };
static int
atusb_set_cca_mode(struct ieee802154_hw *hw, const struct wpan_phy_cca *cca)
{
struct atusb *atusb = hw->priv;
u8 val;
/* mapping 802.15.4 to driver spec */
switch (cca->mode) {
case NL802154_CCA_ENERGY:
val = 1;
break;
case NL802154_CCA_CARRIER:
val = 2;
break;
case NL802154_CCA_ENERGY_CARRIER:
switch (cca->opt) {
case NL802154_CCA_OPT_ENERGY_CARRIER_AND:
val = 3;
break;
case NL802154_CCA_OPT_ENERGY_CARRIER_OR:
val = 0;
break;
default:
return -EINVAL;
}
break;
default:
return -EINVAL;
}
return atusb_write_subreg(atusb, SR_CCA_MODE, val);
}
static int static int
atusb_set_cca_ed_level(struct ieee802154_hw *hw, s32 mbm) atusb_set_cca_ed_level(struct ieee802154_hw *hw, s32 mbm)
{ {
...@@ -545,6 +578,7 @@ static struct ieee802154_ops atusb_ops = { ...@@ -545,6 +578,7 @@ static struct ieee802154_ops atusb_ops = {
.stop = atusb_stop, .stop = atusb_stop,
.set_hw_addr_filt = atusb_set_hw_addr_filt, .set_hw_addr_filt = atusb_set_hw_addr_filt,
.set_txpower = atusb_set_txpower, .set_txpower = atusb_set_txpower,
.set_cca_mode = atusb_set_cca_mode,
.set_cca_ed_level = atusb_set_cca_ed_level, .set_cca_ed_level = atusb_set_cca_ed_level,
.set_csma_params = atusb_set_csma_params, .set_csma_params = atusb_set_csma_params,
.set_promiscuous_mode = atusb_set_promiscuous_mode, .set_promiscuous_mode = atusb_set_promiscuous_mode,
...@@ -677,11 +711,19 @@ static int atusb_probe(struct usb_interface *interface, ...@@ -677,11 +711,19 @@ static int atusb_probe(struct usb_interface *interface,
hw->flags = IEEE802154_HW_TX_OMIT_CKSUM | IEEE802154_HW_AFILT | hw->flags = IEEE802154_HW_TX_OMIT_CKSUM | IEEE802154_HW_AFILT |
IEEE802154_HW_PROMISCUOUS | IEEE802154_HW_CSMA_PARAMS; IEEE802154_HW_PROMISCUOUS | IEEE802154_HW_CSMA_PARAMS;
hw->phy->flags = WPAN_PHY_FLAG_TXPOWER | WPAN_PHY_FLAG_CCA_ED_LEVEL; hw->phy->flags = WPAN_PHY_FLAG_TXPOWER | WPAN_PHY_FLAG_CCA_ED_LEVEL |
WPAN_PHY_FLAG_CCA_MODE;
hw->phy->supported.cca_modes = BIT(NL802154_CCA_ENERGY) |
BIT(NL802154_CCA_CARRIER) | BIT(NL802154_CCA_ENERGY_CARRIER);
hw->phy->supported.cca_opts = BIT(NL802154_CCA_OPT_ENERGY_CARRIER_AND) |
BIT(NL802154_CCA_OPT_ENERGY_CARRIER_OR);
hw->phy->supported.cca_ed_levels = atusb_ed_levels; hw->phy->supported.cca_ed_levels = atusb_ed_levels;
hw->phy->supported.cca_ed_levels_size = ARRAY_SIZE(atusb_ed_levels); hw->phy->supported.cca_ed_levels_size = ARRAY_SIZE(atusb_ed_levels);
hw->phy->cca.mode = NL802154_CCA_ENERGY;
hw->phy->current_page = 0; hw->phy->current_page = 0;
hw->phy->current_channel = 11; /* reset default */ hw->phy->current_channel = 11; /* reset default */
hw->phy->supported.channels[0] = 0x7FFF800; hw->phy->supported.channels[0] = 0x7FFF800;
......
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