diff options
| author | Stefan Reinauer <reinauer@google.com> | 2011-01-28 08:05:54 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2011-01-28 08:05:54 +0000 |
| commit | 16ce01b0d8414a7250fcf142a966ff22c153e85f (patch) | |
| tree | 38c48e5b4d32349b8661c97ac8c00ee7c29d4f48 /src/include | |
| parent | 36ade67007e0e93fb36a982f87e91bf12e2ed869 (diff) | |
This patch gets usbdebug console working in romstage.
- actually hook up usbdebug in printk/print_ for romstage
- make usbdebug.c more similar to the Linux kernel version it was
originally derived from.
- increase retries and timing for usbdebug init (at least one chipset
seems to need this)
- src/pc80/usbdebug_serial.c is not needed
- some small console cleanups
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Acked-by: Patrick Georgi <patrick.georgi@secunet.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6315 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/console/console.h | 4 | ||||
| -rw-r--r-- | src/include/usbdebug.h | 14 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/include/console/console.h b/src/include/console/console.h index b2811e4547..004ff44bca 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -149,6 +149,7 @@ int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, #define print_info_hex32(HEX) printk(BIOS_INFO, "%08x", (HEX)) #define print_debug_hex32(HEX) printk(BIOS_DEBUG, "%08x", (HEX)) #define print_spew_hex32(HEX) printk(BIOS_SPEW, "%08x", (HEX)) + #else /* __ROMCC__ */ @@ -357,9 +358,6 @@ static void print_spew(const char *str) { __console_tx_string(BIOS_SPEW, str); } #define print_spew_hex32(HEX) __console_tx_hex32(BIOS_SPEW, HEX) #endif -#endif - -#ifdef __ROMCC__ /* if included by romcc, include the sources, too. romcc can't use prototypes */ #include <console/console.c> #include <console/post.c> diff --git a/src/include/usbdebug.h b/src/include/usbdebug.h index 710675f4d4..281ccde826 100644 --- a/src/include/usbdebug.h +++ b/src/include/usbdebug.h @@ -27,22 +27,18 @@ struct ehci_debug_info { void *ehci_caps; void *ehci_regs; void *ehci_debug; - unsigned devnum; - unsigned endpoint_out; - unsigned endpoint_in; + u32 devnum; + u32 endpoint_out; + u32 endpoint_in; }; 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); -int dbgp_control_msg(struct ehci_dbg_port *ehci_debug, unsigned devnum, int requesttype, int request, - int value, int index, void *data, int size); -int ehci_wait_for_port(struct ehci_regs *ehci_regs, int port); void set_ehci_base(unsigned ehci_base); -void set_ehci_debug(unsigned ehci_deug); +void set_ehci_debug(unsigned ehci_debug); unsigned get_ehci_debug(void); void set_debug_port(unsigned port); -void early_usbdebug_init(void); -void usbdebug_ram_tx_byte(unsigned char data); +int early_usbdebug_init(void); void usbdebug_tx_byte(unsigned char data); #endif |