diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-08-12 10:23:33 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-08-12 10:23:33 -0700 |
| commit | 32c40b5f5956d29e3be1fc3c94a213f8f0d68f42 (patch) | |
| tree | 3e059559d9b1d80e807a114240052b2947684e87 /firmware/microblaze/usrp2p | |
| parent | dfafbd5f2dbf0758df33d10922eec3c1a37dd32b (diff) | |
| download | uhd-32c40b5f5956d29e3be1fc3c94a213f8f0d68f42.tar.gz uhd-32c40b5f5956d29e3be1fc3c94a213f8f0d68f42.tar.bz2 uhd-32c40b5f5956d29e3be1fc3c94a213f8f0d68f42.zip | |
Working support for multiple UARTs.
Default behavior (printf, gets, etc.) routes to DEFAULT_UART, set in hal_uart.h. Use fputstr() to print to other UARTs. Bring
fgets() from hal_io.c out in hal_io.h if you want to read data from other UARTs.
Still blocking. No interrupt-driven stuff yet.
Diffstat (limited to 'firmware/microblaze/usrp2p')
| -rw-r--r-- | firmware/microblaze/usrp2p/memory_map.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/firmware/microblaze/usrp2p/memory_map.h b/firmware/microblaze/usrp2p/memory_map.h index b69cc59bd..addcf67d4 100644 --- a/firmware/microblaze/usrp2p/memory_map.h +++ b/firmware/microblaze/usrp2p/memory_map.h @@ -779,12 +779,10 @@ typedef struct { volatile uint32_t rxlevel; // Number of available elements in the FIFO for reads volatile uint32_t txchar; // Write characters to be sent here volatile uint32_t rxchar; // Read received characters here + volatile uint32_t x[3]; //padding to reach 32B } uart_regs_t; -#define uart_regs_0 ((uart_regs_t *) UART_BASE) -#define uart_regs_1 ((uart_regs_t *) UART_BASE + 0x0020) -#define uart_regs_2 ((uart_regs_t *) UART_BASE + 0x0040) -#define uart_regs_3 ((uart_regs_t *) UART_BASE + 0x0060) +#define uart_regs ((uart_regs_t *) UART_BASE) /////////////////////////////////////////////////// // ATR Controller, Slave 11 |