mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 14:14:37 +00:00
staging: pi433: Rename enum modShaping in rf69_enum.h
Renames enum modShaping and its values to get rid of checkpatch.pl warnings: "Avoid CamelCase: <modShaping>". Signed-off-by: Simon Sandström <simon@nikanor.nu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
d7b8943cf4
commit
494b11b662
5 changed files with 21 additions and 20 deletions
|
@ -260,7 +260,7 @@ rf69_set_tx_cfg(struct pi433_device *dev, struct pi433_tx_cfg *tx_cfg)
|
|||
SET_CHECKED(rf69_set_modulation (dev->spi, tx_cfg->modulation));
|
||||
SET_CHECKED(rf69_set_deviation (dev->spi, tx_cfg->dev_frequency));
|
||||
SET_CHECKED(rf69_set_pa_ramp (dev->spi, tx_cfg->pa_ramp));
|
||||
SET_CHECKED(rf69_set_modulation_shaping(dev->spi, tx_cfg->modShaping));
|
||||
SET_CHECKED(rf69_set_modulation_shaping(dev->spi, tx_cfg->mod_shaping));
|
||||
SET_CHECKED(rf69_set_tx_start_condition(dev->spi, tx_cfg->tx_start_condition));
|
||||
|
||||
/* packet format enable */
|
||||
|
|
|
@ -63,7 +63,7 @@ struct pi433_tx_cfg {
|
|||
__u16 bit_rate;
|
||||
__u32 dev_frequency;
|
||||
enum modulation modulation;
|
||||
enum modShaping modShaping;
|
||||
enum mod_shaping mod_shaping;
|
||||
|
||||
enum paRamp pa_ramp;
|
||||
|
||||
|
|
|
@ -133,27 +133,28 @@ enum modulation rf69_get_modulation(struct spi_device *spi)
|
|||
}
|
||||
}
|
||||
|
||||
int rf69_set_modulation_shaping(struct spi_device *spi, enum modShaping modShaping)
|
||||
int rf69_set_modulation_shaping(struct spi_device *spi,
|
||||
enum mod_shaping mod_shaping)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
dev_dbg(&spi->dev, "set: mod shaping");
|
||||
#endif
|
||||
|
||||
if (rf69_get_modulation(spi) == FSK) {
|
||||
switch (modShaping) {
|
||||
case shapingOff: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_NONE);
|
||||
case shaping1_0: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_1_0);
|
||||
case shaping0_5: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_0_3);
|
||||
case shaping0_3: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_0_5);
|
||||
switch (mod_shaping) {
|
||||
case SHAPING_OFF: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_NONE);
|
||||
case SHAPING_1_0: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_1_0);
|
||||
case SHAPING_0_5: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_0_3);
|
||||
case SHAPING_0_3: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_0_5);
|
||||
default:
|
||||
dev_dbg(&spi->dev, "set: illegal input param");
|
||||
return -EINVAL;
|
||||
}
|
||||
} else {
|
||||
switch (modShaping) {
|
||||
case shapingOff: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_NONE);
|
||||
case shapingBR: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_BR);
|
||||
case shaping2BR: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_2BR);
|
||||
switch (mod_shaping) {
|
||||
case SHAPING_OFF: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_NONE);
|
||||
case SHAPING_BR: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_BR);
|
||||
case SHAPING_2BR: return rf69_read_mod_write(spi, REG_DATAMODUL, MASK_DATAMODUL_MODULATION_SHAPE, DATAMODUL_MODULATION_SHAPE_2BR);
|
||||
default:
|
||||
dev_dbg(&spi->dev, "set: illegal input param");
|
||||
return -EINVAL;
|
||||
|
|
|
@ -29,7 +29,7 @@ int rf69_set_mode(struct spi_device *spi, enum mode mode);
|
|||
int rf69_set_data_mode(struct spi_device *spi, enum dataMode dataMode);
|
||||
int rf69_set_modulation(struct spi_device *spi, enum modulation modulation);
|
||||
enum modulation rf69_get_modulation(struct spi_device *spi);
|
||||
int rf69_set_modulation_shaping(struct spi_device *spi, enum modShaping modShaping);
|
||||
int rf69_set_modulation_shaping(struct spi_device *spi, enum mod_shaping mod_shaping);
|
||||
int rf69_set_bit_rate(struct spi_device *spi, u16 bitRate);
|
||||
int rf69_set_deviation(struct spi_device *spi, u32 deviation);
|
||||
int rf69_set_frequency(struct spi_device *spi, u32 frequency);
|
||||
|
|
|
@ -42,13 +42,13 @@ enum modulation {
|
|||
FSK
|
||||
};
|
||||
|
||||
enum modShaping {
|
||||
shapingOff,
|
||||
shaping1_0,
|
||||
shaping0_5,
|
||||
shaping0_3,
|
||||
shapingBR,
|
||||
shaping2BR
|
||||
enum mod_shaping {
|
||||
SHAPING_OFF,
|
||||
SHAPING_1_0,
|
||||
SHAPING_0_5,
|
||||
SHAPING_0_3,
|
||||
SHAPING_BR,
|
||||
SHAPING_2BR
|
||||
};
|
||||
|
||||
enum paRamp {
|
||||
|
|
Loading…
Reference in a new issue