lkml.org 
[lkml]   [2017]   [Dec]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 06/11] staging: pi433: Split rf69_set_crc_enabled into two functions
    Date
    Splits rf69_set_crc_enabled(dev, enabled) into
    rf69_enable_crc(dev) and rf69_disable_crc(dev).

    Signed-off-by: Simon Sandström <simon@nikanor.nu>
    ---
    drivers/staging/pi433/pi433_if.c | 22 ++++++++++++++++++++--
    drivers/staging/pi433/rf69.c | 18 ++++++------------
    drivers/staging/pi433/rf69.h | 4 ++--
    3 files changed, 28 insertions(+), 16 deletions(-)

    diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c
    index 2ae19ac565d1..614eec7dd904 100644
    --- a/drivers/staging/pi433/pi433_if.c
    +++ b/drivers/staging/pi433/pi433_if.c
    @@ -216,7 +216,16 @@ rf69_set_rx_cfg(struct pi433_device *dev, struct pi433_rx_cfg *rx_cfg)
    return ret;
    }
    SET_CHECKED(rf69_set_adressFiltering(dev->spi, rx_cfg->enable_address_filtering));
    - SET_CHECKED(rf69_set_crc_enable (dev->spi, rx_cfg->enable_crc));
    +
    + if (rx_cfg->enable_crc == OPTION_ON) {
    + ret = rf69_enable_crc(dev->spi);
    + if (ret < 0)
    + return ret;
    + } else {
    + ret = rf69_disable_crc(dev->spi);
    + if (ret < 0)
    + return ret;
    + }

    /* lengths */
    SET_CHECKED(rf69_set_sync_size(dev->spi, rx_cfg->sync_length));
    @@ -282,7 +291,16 @@ rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg)
    if (ret < 0)
    return ret;
    }
    - SET_CHECKED(rf69_set_crc_enable (dev->spi, tx_cfg->enable_crc));
    +
    + if (tx_cfg->enable_crc == OPTION_ON) {
    + ret = rf69_enable_crc(dev->spi);
    + if (ret < 0)
    + return ret;
    + } else {
    + ret = rf69_disable_crc(dev->spi);
    + if (ret < 0)
    + return ret;
    + }

    /* configure sync, if enabled */
    if (tx_cfg->enable_sync == OPTION_ON) {
    diff --git a/drivers/staging/pi433/rf69.c b/drivers/staging/pi433/rf69.c
    index b19bca8a0f26..612d59f61f88 100644
    --- a/drivers/staging/pi433/rf69.c
    +++ b/drivers/staging/pi433/rf69.c
    @@ -822,20 +822,14 @@ int rf69_set_packet_format(struct spi_device *spi, enum packetFormat packetForma
    }
    }

    -int rf69_set_crc_enable(struct spi_device *spi,
    - enum option_on_off option_on_off)
    +int rf69_enable_crc(struct spi_device *spi)
    {
    - #ifdef DEBUG
    - dev_dbg(&spi->dev, "set: crc enable");
    - #endif
    + return WRITE_REG(REG_PACKETCONFIG1, (READ_REG(REG_PACKETCONFIG1) | MASK_PACKETCONFIG1_CRC_ON));
    +}

    - switch (option_on_off) {
    - case OPTION_ON: return WRITE_REG(REG_PACKETCONFIG1, (READ_REG(REG_PACKETCONFIG1) | MASK_PACKETCONFIG1_CRC_ON));
    - case OPTION_OFF: return WRITE_REG(REG_PACKETCONFIG1, (READ_REG(REG_PACKETCONFIG1) & ~MASK_PACKETCONFIG1_CRC_ON));
    - default:
    - dev_dbg(&spi->dev, "set: illegal input param");
    - return -EINVAL;
    - }
    +int rf69_disable_crc(struct spi_device *spi)
    +{
    + return WRITE_REG(REG_PACKETCONFIG1, (READ_REG(REG_PACKETCONFIG1) & ~MASK_PACKETCONFIG1_CRC_ON));
    }

    int rf69_set_adressFiltering(struct spi_device *spi, enum addressFiltering addressFiltering)
    diff --git a/drivers/staging/pi433/rf69.h b/drivers/staging/pi433/rf69.h
    index 1cb6db33d6fe..9428dee97de7 100644
    --- a/drivers/staging/pi433/rf69.h
    +++ b/drivers/staging/pi433/rf69.h
    @@ -66,8 +66,8 @@ int rf69_set_sync_size(struct spi_device *spi, u8 sync_size);
    int rf69_set_sync_tolerance(struct spi_device *spi, u8 syncTolerance);
    int rf69_set_sync_values(struct spi_device *spi, u8 syncValues[8]);
    int rf69_set_packet_format(struct spi_device *spi, enum packetFormat packetFormat);
    -int rf69_set_crc_enable(struct spi_device *spi,
    - enum option_on_off option_on_off);
    +int rf69_enable_crc(struct spi_device *spi);
    +int rf69_disable_crc(struct spi_device *spi);
    int rf69_set_adressFiltering(struct spi_device *spi, enum addressFiltering addressFiltering);
    int rf69_set_payload_length(struct spi_device *spi, u8 payloadLength);
    u8 rf69_get_payload_length(struct spi_device *spi);
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-12-05 23:12    [W:3.902 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site