diff --git a/atusb/fw/include/at86rf230.h b/atusb/fw/include/at86rf230.h index a3679b6..4c3ae22 100644 --- a/atusb/fw/include/at86rf230.h +++ b/atusb/fw/include/at86rf230.h @@ -180,7 +180,7 @@ enum { #define PA_EXT_EN (1 << 7) #define IRQ_2_EXT_EN (1 << 6) -#define TX_AUTO_CRC_ON_231 (1 << 5) /* 231 location */ +#define TX_AUTO_CRC_ON (1 << 5) /* 231 location */ #define RX_BL_CTRL (1 << 4) #define SPI_CMD_MODE_SHIFT 2 @@ -198,7 +198,7 @@ enum { /* --- PHY_TX_PWR ---------------------------------------------------------- */ -#define TX_AUTO_CRC_ON (1 << 7) /* 230 location */ +#define TX_AUTO_CRC_ON_230 (1 << 7) /* 230 location */ #define PA_BUF_LT_SHIFT 6 #define PA_BUF_LT_MASK 3 diff --git a/tools/atrf-txrx/atrf-txrx.c b/tools/atrf-txrx/atrf-txrx.c index 75ddebc..2a63071 100644 --- a/tools/atrf-txrx/atrf-txrx.c +++ b/tools/atrf-txrx/atrf-txrx.c @@ -116,14 +116,14 @@ static void set_power(struct atrf_dsc *dsc, double power, int crc) switch (atrf_identify(dsc)) { case artf_at86rf230: atrf_reg_write(dsc, REG_PHY_TX_PWR, - (crc ? TX_AUTO_CRC_ON : 0) | n); + (crc ? TX_AUTO_CRC_ON_230 : 0) | n); break; case artf_at86rf231: tmp = atrf_reg_read(dsc, REG_PHY_TX_PWR); tmp = (tmp & ~TX_PWR_MASK) | n; atrf_reg_write(dsc, REG_PHY_TX_PWR, tmp); atrf_reg_write(dsc, REG_TRX_CTRL_1, - crc ? TX_AUTO_CRC_ON_231 : 0); + crc ? TX_AUTO_CRC_ON : 0); break; default: abort();