diff options
author | Simon Sandström <simon@nikanor.nu> | 2017-12-06 21:42:20 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-06 22:07:23 +0100 |
commit | 966debe09eae5124e05b9c1374efa3610dccdc2a (patch) | |
tree | f012fb696c61aafcab149d6608281d6d8fe2903c /drivers/staging/pi433/pi433_if.c | |
parent | staging: pi433: Split rf69_set_crc_enabled into two functions (diff) | |
download | linux-dev-966debe09eae5124e05b9c1374efa3610dccdc2a.tar.xz linux-dev-966debe09eae5124e05b9c1374efa3610dccdc2a.zip |
staging: pi433: Split rf69_set_sync_enabled into two functions
Splits rf69_set_sync_enabled(dev, enabled) into
rf69_enable_sync(dev) and rf69_disable_sync(dev).
Signed-off-by: Simon Sandström <simon@nikanor.nu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/pi433/pi433_if.c')
-rw-r--r-- | drivers/staging/pi433/pi433_if.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c index 614eec7dd904..fb500d062df8 100644 --- a/drivers/staging/pi433/pi433_if.c +++ b/drivers/staging/pi433/pi433_if.c @@ -197,13 +197,20 @@ rf69_set_rx_cfg(struct pi433_device *dev, struct pi433_rx_cfg *rx_cfg) /* packet config */ /* enable */ - SET_CHECKED(rf69_set_sync_enable(dev->spi, rx_cfg->enable_sync)); if (rx_cfg->enable_sync == OPTION_ON) { + ret = rf69_enable_sync(dev->spi); + if (ret < 0) + return ret; + SET_CHECKED(rf69_set_fifo_fill_condition(dev->spi, afterSyncInterrupt)); } else { + ret = rf69_disable_sync(dev->spi); + if (ret < 0) + return ret; + SET_CHECKED(rf69_set_fifo_fill_condition(dev->spi, always)); } if (rx_cfg->enable_length_byte == OPTION_ON) { @@ -281,7 +288,17 @@ rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg) { SET_CHECKED(rf69_set_preamble_length(dev->spi, 0)); } - SET_CHECKED(rf69_set_sync_enable (dev->spi, tx_cfg->enable_sync)); + + if (tx_cfg->enable_sync == OPTION_ON) { + ret = rf69_enable_sync(dev->spi); + if (ret < 0) + return ret; + } else { + ret = rf69_disable_sync(dev->spi); + if (ret < 0) + return ret; + } + if (tx_cfg->enable_length_byte == OPTION_ON) { ret = rf69_set_packet_format(dev->spi, packetLengthVar); if (ret < 0) |