From 9e7806a788f9617d3dd9139a74ab3f7b03eb9581 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Sat, 6 Jul 2013 11:56:49 +0300 Subject: usbdebug: Move ehci_debug_info allocation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move ehci_debug_info allocation from console to lib, as console code was only built for ramstage. Implement dbgp_ehci_info() to return the EHCI context. Alread alias this as dbgp_console_input() and _output() to return the console stream context later on. Change-Id: Id6cc07d62953f0466df61eeb159e22b0e3287d4e Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/3625 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Stefan Reinauer --- src/include/usbdebug.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/include') diff --git a/src/include/usbdebug.h b/src/include/usbdebug.h index fe4ef32a44..e32410ed18 100644 --- a/src/include/usbdebug.h +++ b/src/include/usbdebug.h @@ -60,10 +60,12 @@ void enable_usbdebug(unsigned int port); int dbgp_bulk_write_x(struct ehci_debug_info *dbg_info, const char *bytes, int size); int dbgp_bulk_read_x(struct ehci_debug_info *dbg_info, void *data, int size); void set_debug_port(unsigned port); -int early_usbdebug_init(void); +int usbdebug_init(void); +struct ehci_debug_info *dbgp_ehci_info(void); +#define dbgp_console_output dbgp_ehci_info +#define dbgp_console_input dbgp_ehci_info int dbgp_ep_is_active(struct ehci_debug_info *dbg_info); void usbdebug_tx_byte(struct ehci_debug_info *info, unsigned char data); void usbdebug_tx_flush(struct ehci_debug_info *info); -int usbdebug_init(unsigned ehci_bar, unsigned offset, struct ehci_debug_info *info); #endif -- cgit v1.2.3