diff options
| author | Bdale Garbee <bdale@gag.com> | 2019-01-02 22:23:04 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2019-01-02 22:23:04 -0700 |
| commit | b340cbf1403a5f5b181a215935f713a50da8e5e4 (patch) | |
| tree | 8c0d2afbe8168c29584e0d568b80353fdf555883 /src/drivers/ao_cc1120.c | |
| parent | 1da4b57545233f2f2afd350bd8aed4ef7bb0c844 (diff) | |
| parent | 95ffec073b0758801df04a77eca0bd2bc6e57e35 (diff) | |
Merge branch 'branch-1.9' into debian
Diffstat (limited to 'src/drivers/ao_cc1120.c')
| -rw-r--r-- | src/drivers/ao_cc1120.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/drivers/ao_cc1120.c b/src/drivers/ao_cc1120.c index 2f091485..b1a13778 100644 --- a/src/drivers/ao_cc1120.c +++ b/src/drivers/ao_cc1120.c @@ -208,7 +208,7 @@ ao_radio_fifo_write_fixed(uint8_t data, uint8_t len) static uint8_t ao_radio_int_pin(void) { - return ao_gpio_get(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN, AO_CC1120_INT); + return ao_gpio_get(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN); } #if CC1120_DEBUG @@ -805,8 +805,7 @@ ao_radio_test_cmd(void) static uint8_t radio_on; ao_cmd_white(); if (ao_cmd_lex_c != '\n') { - ao_cmd_decimal(); - mode = (uint8_t) ao_cmd_lex_u32; + mode = ao_cmd_decimal(); } mode++; if ((mode & 2) && !radio_on) { @@ -1066,7 +1065,7 @@ ao_radio_rx_wait(void) } uint8_t -ao_radio_recv(__xdata void *d, uint8_t size, uint8_t timeout) +ao_radio_recv(void *d, uint8_t size, uint8_t timeout) { uint8_t len; uint8_t radio_rssi = 0; |