staging: pi433: fix CamelCase for flag enum (1cd41fc3) · Commits · 戴 / test

drivers/staging/pi433/pi433_if.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -443,7 +443,7 @@ pi433_receive(void *data)
		return retval;

		/* now check RSSI, if low wait for getting high (RSSI interrupt) */
		while (!rf69_get_flag(dev->spi, rssiExceededThreshold)) {
		while (!rf69_get_flag(dev->spi, rssi_exceeded_threshold)) {
		/* allow tx to interrupt us while waiting for high RSSI */
		dev->interrupt_rx_allowed = true;
		wake_up_interruptible(&dev->tx_wait_queue);
		@@ -452,7 +452,7 @@ pi433_receive(void *data)
		dev_dbg(dev->dev, "rx: going to wait for high RSSI level");
		retval = wait_event_interruptible(dev->rx_wait_queue,
		rf69_get_flag(dev->spi,
		rssiExceededThreshold));
		rssi_exceeded_threshold));
		if (retval) /* wait was interrupted */
		goto abort;
		dev->interrupt_rx_allowed = false;

drivers/staging/pi433/rf69.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -545,21 +545,21 @@ int rf69_set_dio_mapping(struct spi_device *spi, u8 DIONumber, u8 value)
		bool rf69_get_flag(struct spi_device *spi, enum flag flag)
		{
		switch (flag) {
		case modeSwitchCompleted:
		case mode_switch_completed:
		return (rf69_read_reg(spi, REG_IRQFLAGS1) & MASK_IRQFLAGS1_MODE_READY);
		case readyToReceive:
		case ready_to_receive:
		return (rf69_read_reg(spi, REG_IRQFLAGS1) & MASK_IRQFLAGS1_RX_READY);
		case readyToSend:
		case ready_to_send:
		return (rf69_read_reg(spi, REG_IRQFLAGS1) & MASK_IRQFLAGS1_TX_READY);
		case pllLocked:
		case pll_locked:
		return (rf69_read_reg(spi, REG_IRQFLAGS1) & MASK_IRQFLAGS1_PLL_LOCK);
		case rssiExceededThreshold:
		case rssi_exceeded_threshold:
		return (rf69_read_reg(spi, REG_IRQFLAGS1) & MASK_IRQFLAGS1_RSSI);
		case timeout:
		return (rf69_read_reg(spi, REG_IRQFLAGS1) & MASK_IRQFLAGS1_TIMEOUT);
		case automode:
		return (rf69_read_reg(spi, REG_IRQFLAGS1) & MASK_IRQFLAGS1_AUTOMODE);
		case syncAddressMatch:
		case sync_address_match:
		return (rf69_read_reg(spi, REG_IRQFLAGS1) & MASK_IRQFLAGS1_SYNC_ADDRESS_MATCH);
		case fifo_full:
		return (rf69_read_reg(spi, REG_IRQFLAGS2) & MASK_IRQFLAGS2_FIFO_FULL);
		@@ -571,13 +571,13 @@ bool rf69_get_flag(struct spi_device *spi, enum flag flag)
		return (rf69_read_reg(spi, REG_IRQFLAGS2) & MASK_IRQFLAGS2_FIFO_LEVEL);
		case fifo_overrun:
		return (rf69_read_reg(spi, REG_IRQFLAGS2) & MASK_IRQFLAGS2_FIFO_OVERRUN);
		case packetSent:
		case packet_sent:
		return (rf69_read_reg(spi, REG_IRQFLAGS2) & MASK_IRQFLAGS2_PACKET_SENT);
		case payload_ready:
		return (rf69_read_reg(spi, REG_IRQFLAGS2) & MASK_IRQFLAGS2_PAYLOAD_READY);
		case crcOk:
		case crc_ok:
		return (rf69_read_reg(spi, REG_IRQFLAGS2) & MASK_IRQFLAGS2_CRC_OK);
		case batteryLow:
		case battery_low:
		return (rf69_read_reg(spi, REG_IRQFLAGS2) & MASK_IRQFLAGS2_LOW_BAT);
		default: return false;
		}

drivers/staging/pi433/rf69_enum.h

+9 −9

Original line number	Diff line number	Diff line
		@@ -94,23 +94,23 @@ enum threshold_decrement {
		};

		enum flag {
		modeSwitchCompleted,
		readyToReceive,
		readyToSend,
		pllLocked,
		rssiExceededThreshold,
		mode_switch_completed,
		ready_to_receive,
		ready_to_send,
		pll_locked,
		rssi_exceeded_threshold,
		timeout,
		automode,
		syncAddressMatch,
		sync_address_match,
		fifo_full,
		// fifo_not_empty, collision with next enum; replaced by following enum...
		fifo_empty,
		fifo_level_below_threshold,
		fifo_overrun,
		packetSent,
		packet_sent,
		payload_ready,
		crcOk,
		batteryLow
		crc_ok,
		battery_low
		};

		enum fifo_fill_condition {

Admin message