diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-09-02 11:27:37 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-09-02 11:27:37 -0700 |
| commit | 83912104a9c1ab3631f755a4d98ee86e195db690 (patch) | |
| tree | 4c7ba7da761b1b9b5508bffdb77b9e0696ff46ae /firmware | |
| parent | 670eeda6e4c9ff2ab81f4e387bce49ea4dc79dcc (diff) | |
| parent | 065065e90ce970f8eed0941ded6ae4377e649c2b (diff) | |
| download | uhd-83912104a9c1ab3631f755a4d98ee86e195db690.tar.gz uhd-83912104a9c1ab3631f755a4d98ee86e195db690.tar.bz2 uhd-83912104a9c1ab3631f755a4d98ee86e195db690.zip | |
Merge branch 'UHD-3.9.LTS' into maint
This provides the GPS fixes.
Conflicts:
host/CMakeLists.txt
tools/debs/upload_debs.sh
Diffstat (limited to 'firmware')
| -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; } |