diff options
-rw-r--r-- | drivers/staging/pi433/Documentation/pi433.txt | 12 | ||||
-rw-r--r-- | drivers/staging/pi433/pi433_if.c | 6 | ||||
-rw-r--r-- | drivers/staging/pi433/rf69.c | 6 | ||||
-rw-r--r-- | drivers/staging/pi433/rf69_enum.h | 6 |
4 files changed, 15 insertions, 15 deletions
diff --git a/drivers/staging/pi433/Documentation/pi433.txt b/drivers/staging/pi433/Documentation/pi433.txt index 3313dff3c37e..2e8835bf2c9a 100644 --- a/drivers/staging/pi433/Documentation/pi433.txt +++ b/drivers/staging/pi433/Documentation/pi433.txt @@ -232,12 +232,12 @@ rf params: amount of bytes that were requested by the read request. Attention: should be used in combination with sync, only enable_address_filtering; - filteringOff - no address filtering will take place - nodeAddress - all telegrams, not matching the node - address will be internally discarded - nodeOrBroadcastAddress - all telegrams, neither matching the - node, nor the broadcast address will - be internally discarded + filtering_off - no address filtering will take place + node_address - all telegrams, not matching the node + address will be internally discarded + node_or_broadcast_address - all telegrams, neither matching the + node, nor the broadcast address will + be internally discarded Attention: Sync option must be enabled in order to use this feature enable_crc optionOn - a crc will be calculated over the payload of diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c index 730200597218..88da91d31e61 100644 --- a/drivers/staging/pi433/pi433_if.c +++ b/drivers/staging/pi433/pi433_if.c @@ -257,7 +257,7 @@ rf69_set_rx_cfg(struct pi433_device *dev, struct pi433_rx_cfg *rx_cfg) payload_length = rx_cfg->fixed_message_length; if (rx_cfg->enable_length_byte == OPTION_ON) payload_length++; - if (rx_cfg->enable_address_filtering != filteringOff) + if (rx_cfg->enable_address_filtering != filtering_off) payload_length++; ret = rf69_set_payload_length(dev->spi, payload_length); if (ret < 0) @@ -274,7 +274,7 @@ rf69_set_rx_cfg(struct pi433_device *dev, struct pi433_rx_cfg *rx_cfg) if (ret < 0) return ret; } - if (rx_cfg->enable_address_filtering != filteringOff) { + if (rx_cfg->enable_address_filtering != filtering_off) { ret = rf69_set_node_address(dev->spi, rx_cfg->node_address); if (ret < 0) return ret; @@ -502,7 +502,7 @@ pi433_receive(void *data) } /* address byte enabled? */ - if (dev->rx_cfg.enable_address_filtering != filteringOff) { + if (dev->rx_cfg.enable_address_filtering != filtering_off) { u8 dummy; bytes_total--; diff --git a/drivers/staging/pi433/rf69.c b/drivers/staging/pi433/rf69.c index a73a3d2c0685..f419a3d4485b 100644 --- a/drivers/staging/pi433/rf69.c +++ b/drivers/staging/pi433/rf69.c @@ -687,11 +687,11 @@ int rf69_disable_crc(struct spi_device *spi) int rf69_set_address_filtering(struct spi_device *spi, enum address_filtering address_filtering) { switch (address_filtering) { - case filteringOff: + case filtering_off: return rf69_read_mod_write(spi, REG_PACKETCONFIG1, MASK_PACKETCONFIG1_ADDRESSFILTERING, PACKETCONFIG1_ADDRESSFILTERING_OFF); - case nodeAddress: + case node_address: return rf69_read_mod_write(spi, REG_PACKETCONFIG1, MASK_PACKETCONFIG1_ADDRESSFILTERING, PACKETCONFIG1_ADDRESSFILTERING_NODE); - case nodeOrBroadcastAddress: + case node_or_broadcast_address: return rf69_read_mod_write(spi, REG_PACKETCONFIG1, MASK_PACKETCONFIG1_ADDRESSFILTERING, PACKETCONFIG1_ADDRESSFILTERING_NODEBROADCAST); default: dev_dbg(&spi->dev, "set: illegal input param"); diff --git a/drivers/staging/pi433/rf69_enum.h b/drivers/staging/pi433/rf69_enum.h index d82d2be88cbd..43990e74db85 100644 --- a/drivers/staging/pi433/rf69_enum.h +++ b/drivers/staging/pi433/rf69_enum.h @@ -129,9 +129,9 @@ enum tx_start_condition { }; enum address_filtering { - filteringOff, - nodeAddress, - nodeOrBroadcastAddress + filtering_off, + node_address, + node_or_broadcast_address }; enum dagc { |