diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-09-05 11:47:55 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-09-05 11:47:55 -0700 |
| commit | bb95d96ad8cdcdb3f12ef62231c1b0f9dcd7ebfd (patch) | |
| tree | 4eb7fc68e2e04c6e47d68629a3e147bed65ddd2b /firmware/usrp3 | |
| parent | 2262316abdfcb0cbe7c4a99290d85e1da84811e8 (diff) | |
| parent | 83912104a9c1ab3631f755a4d98ee86e195db690 (diff) | |
| download | uhd-bb95d96ad8cdcdb3f12ef62231c1b0f9dcd7ebfd.tar.gz uhd-bb95d96ad8cdcdb3f12ef62231c1b0f9dcd7ebfd.tar.bz2 uhd-bb95d96ad8cdcdb3f12ef62231c1b0f9dcd7ebfd.zip | |
Merge branch 'maint'
Diffstat (limited to 'firmware/usrp3')
| -rw-r--r-- | firmware/usrp3/x300/x300_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/firmware/usrp3/x300/x300_main.c b/firmware/usrp3/x300/x300_main.c index 42ee3248b..f255fe96c 100644 --- a/firmware/usrp3/x300/x300_main.c +++ b/firmware/usrp3/x300/x300_main.c @@ -344,12 +344,12 @@ static void handle_uarts(void) static uint32_t rxoffset = 0; for (int rxch = wb_uart_getc(UART0_BASE); rxch != -1; rxch = wb_uart_getc(UART0_BASE)) { - rxoffset++; const int shift = ((rxoffset%4) * 8); static uint32_t rxword32 = 0; if (shift == 0) rxword32 = 0; rxword32 |= ((uint32_t) rxch & 0xFF) << shift; rxpool[(rxoffset/4) % NUM_POOL_WORDS32] = rxword32; + rxoffset++; shmem[X300_FW_SHMEM_UART_RX_INDEX] = rxoffset; } |