diff options
Diffstat (limited to 'src/drivers/usb')
| -rw-r--r-- | src/drivers/usb/console.c | 28 | ||||
| -rw-r--r-- | src/drivers/usb/ehci_debug.h | 8 |
2 files changed, 31 insertions, 5 deletions
diff --git a/src/drivers/usb/console.c b/src/drivers/usb/console.c index c47610a2a3..4f37ef8dfa 100644 --- a/src/drivers/usb/console.c +++ b/src/drivers/usb/console.c @@ -18,12 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA */ -#include <stddef.h> -#include <console/console.h> #include <console/usb.h> #include "ehci_debug.h" -void usbdebug_tx_byte(struct dbgp_pipe *pipe, unsigned char data) +static void usbdebug_tx_byte(struct dbgp_pipe *pipe, unsigned char data) { if (!dbgp_try_get(pipe)) return; @@ -35,7 +33,7 @@ void usbdebug_tx_byte(struct dbgp_pipe *pipe, unsigned char data) dbgp_put(pipe); } -void usbdebug_tx_flush(struct dbgp_pipe *pipe) +static void usbdebug_tx_flush(struct dbgp_pipe *pipe) { if (!dbgp_try_get(pipe)) return; @@ -46,7 +44,7 @@ void usbdebug_tx_flush(struct dbgp_pipe *pipe) dbgp_put(pipe); } -unsigned char usbdebug_rx_byte(struct dbgp_pipe *pipe) +static unsigned char usbdebug_rx_byte(struct dbgp_pipe *pipe) { unsigned char data = 0xff; if (!dbgp_try_get(pipe)) @@ -62,3 +60,23 @@ unsigned char usbdebug_rx_byte(struct dbgp_pipe *pipe) dbgp_put(pipe); return data; } + +void usb_tx_byte(int idx, unsigned char data) +{ + usbdebug_tx_byte(dbgp_console_output(), data); +} + +void usb_tx_flush(int idx) +{ + usbdebug_tx_flush(dbgp_console_output()); +} + +unsigned char usb_rx_byte(int idx) +{ + return usbdebug_rx_byte(dbgp_console_input()); +} + +int usb_can_rx_byte(int idx) +{ + return dbgp_ep_is_active(dbgp_console_input()); +} diff --git a/src/drivers/usb/ehci_debug.h b/src/drivers/usb/ehci_debug.h index 30bf724cb8..39f5f7239a 100644 --- a/src/drivers/usb/ehci_debug.h +++ b/src/drivers/usb/ehci_debug.h @@ -21,6 +21,8 @@ #ifndef _EHCI_DEBUG_H_ #define _EHCI_DEBUG_H_ +#include <types.h> + void usbdebug_re_enable(unsigned ehci_base); void usbdebug_disable(void); @@ -51,4 +53,10 @@ struct dbgp_pipe void dbgp_put(struct dbgp_pipe *pipe); int dbgp_try_get(struct dbgp_pipe *pipe); +struct dbgp_pipe *dbgp_console_output(void); +struct dbgp_pipe *dbgp_console_input(void); +int dbgp_ep_is_active(struct dbgp_pipe *pipe); +int dbgp_bulk_write_x(struct dbgp_pipe *pipe, const char *bytes, int size); +int dbgp_bulk_read_x(struct dbgp_pipe *pipe, void *data, int size); + #endif /* _EHCI_DEBUG_H_ */ |