diff options
author | Nick Foster <nick@nerdnetworks.org> | 2010-11-17 18:31:21 -0800 |
---|---|---|
committer | Nick Foster <nick@nerdnetworks.org> | 2010-11-17 18:31:21 -0800 |
commit | 95cf7753c175e868d1aacaad378bfe74d9454200 (patch) | |
tree | 2eef9c811655d7a1b4d0fb020db7fa5125a2adc7 /firmware/microblaze/lib/hal_io.h | |
parent | 81c9f77306dc82f250bfb2871b8bd7db67a40085 (diff) | |
parent | 89ae5f3f651cff22226e2b2c0ce0ed796dad4c71 (diff) | |
download | uhd-95cf7753c175e868d1aacaad378bfe74d9454200.tar.gz uhd-95cf7753c175e868d1aacaad378bfe74d9454200.tar.bz2 uhd-95cf7753c175e868d1aacaad378bfe74d9454200.zip |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into flow_ctrl
Conflicts:
host/lib/transport/udp_simple.cpp
host/lib/usrp/usrp2/mboard_impl.cpp
host/lib/usrp/usrp2/usrp2_iface.cpp
host/lib/usrp/usrp2/usrp2_regs.hpp
Diffstat (limited to 'firmware/microblaze/lib/hal_io.h')
-rw-r--r-- | firmware/microblaze/lib/hal_io.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/firmware/microblaze/lib/hal_io.h b/firmware/microblaze/lib/hal_io.h index c67d96c62..950f8d591 100644 --- a/firmware/microblaze/lib/hal_io.h +++ b/firmware/microblaze/lib/hal_io.h @@ -20,10 +20,15 @@ #define INCLUDED_HAL_IO_H #include "memory_map.h" +#include "hal_uart.h" void hal_io_init(void); void hal_finish(); char *gets(char * const s); +int fputstr(hal_uart_name_t u, const char *s); +int fnputstr(hal_uart_name_t u, const char *s, int len); +int fngets(hal_uart_name_t u, char * const s, int len); +int fngets_timeout(hal_uart_name_t u, char * const s, int len); /* * ------------------------------------------------------------------------ |