[commit] r5683 - in trunk/src: console include include/console lib pc80 southbridge/intel/i82801gx southbridge/nvidia/mcp55 southbridge/sis/sis966
Author: myles Date: Wed Aug 4 21:29:11 2010 New Revision: 5683 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5683
Log: Remove warnings from USB debug console code.
Signed-off-by: Myles Watson mylesgw@gmail.com Acked-by: Stefan Reinauer stepan@coresystems.de
Modified: trunk/src/console/usbdebug_console.c trunk/src/include/console/console.h trunk/src/include/usbdebug.h trunk/src/lib/usbdebug.c trunk/src/pc80/usbdebug_serial.c trunk/src/southbridge/intel/i82801gx/i82801gx_usb_debug.c trunk/src/southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c trunk/src/southbridge/sis/sis966/sis966_enable_usbdebug.c
Modified: trunk/src/console/usbdebug_console.c ============================================================================== --- trunk/src/console/usbdebug_console.c Tue Aug 3 17:42:29 2010 (r5682) +++ trunk/src/console/usbdebug_console.c Wed Aug 4 21:29:11 2010 (r5683) @@ -29,20 +29,20 @@ if (!dbg_info.ehci_debug) return;
- diff = dbg_info.ehci_caps - ehci_base; + diff = (unsigned)dbg_info.ehci_caps - ehci_base; dbg_info.ehci_regs -= diff; dbg_info.ehci_debug -= diff; - dbg_info.ehci_caps = ehci_base; + dbg_info.ehci_caps = (void*)ehci_base; }
void set_ehci_debug(unsigned ehci_debug) { - dbg_info.ehci_debug = ehci_debug; + dbg_info.ehci_debug = (void*)ehci_debug; }
unsigned get_ehci_debug(void) { - return dbg_info.ehci_debug; + return (unsigned)dbg_info.ehci_debug; }
static void dbgp_init(void) @@ -61,7 +61,7 @@ static void dbgp_tx_byte(unsigned char data) { if (dbg_info.ehci_debug) - dbgp_bulk_write_x(&dbg_info, &data, 1); + dbgp_bulk_write_x(&dbg_info, (char*)&data, 1); }
static unsigned char dbgp_rx_byte(void) @@ -76,7 +76,7 @@
static int dbgp_tst_byte(void) { - return dbg_info.ehci_debug; + return (int)dbg_info.ehci_debug; }
static const struct console_driver usbdebug_direct_console __console = {
Modified: trunk/src/include/console/console.h ============================================================================== --- trunk/src/include/console/console.h Tue Aug 3 17:42:29 2010 (r5682) +++ trunk/src/include/console/console.h Wed Aug 4 21:29:11 2010 (r5683) @@ -12,6 +12,9 @@ #if CONFIG_CONSOLE_VGA == 1 void vga_console_init(void); #endif +#if CONFIG_USBDEBUG +#include <usbdebug.h> +#endif
struct console_driver { void (*init)(void);
Modified: trunk/src/include/usbdebug.h ============================================================================== --- trunk/src/include/usbdebug.h Tue Aug 3 17:42:29 2010 (r5682) +++ trunk/src/include/usbdebug.h Wed Aug 4 21:29:11 2010 (r5683) @@ -18,6 +18,8 @@ #ifndef USBDEBUG_H #define USBDEBUG_H
+#include <ehci.h> + struct ehci_debug_info { void *ehci_caps; void *ehci_regs; @@ -29,9 +31,14 @@
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); unsigned get_ehci_debug(void); void set_debug_port(unsigned port); +void usbdebug_ram_tx_byte(unsigned char data); +void usbdebug_tx_byte(unsigned char data);
#endif
Modified: trunk/src/lib/usbdebug.c ============================================================================== --- trunk/src/lib/usbdebug.c Tue Aug 3 17:42:29 2010 (r5682) +++ trunk/src/lib/usbdebug.c Wed Aug 4 21:29:11 2010 (r5683) @@ -234,7 +234,7 @@ return dbgp_bulk_read(dbg_info->ehci_debug, dbg_info->devnum, dbg_info->endpoint_in, data, size); }
-static int dbgp_control_msg(struct ehci_dbg_port *ehci_debug, unsigned devnum, int requesttype, int request, +int dbgp_control_msg(struct ehci_dbg_port *ehci_debug, unsigned devnum, int requesttype, int request, int value, int index, void *data, int size) { unsigned pids, addr, ctrl; @@ -323,7 +323,7 @@ return -16;//-EBUSY; }
-static int ehci_wait_for_port(struct ehci_regs *ehci_regs, int port) +int ehci_wait_for_port(struct ehci_regs *ehci_regs, int port) { unsigned status; int ret, reps; @@ -346,6 +346,8 @@ #else #define dbgp_printk(fmt_arg...) do {} while(0) #endif + +#ifdef __PRE_RAM__ static void usbdebug_init(unsigned ehci_bar, unsigned offset, struct ehci_debug_info *info) { struct ehci_caps *ehci_caps; @@ -547,5 +549,6 @@ }
} +#endif
Modified: trunk/src/pc80/usbdebug_serial.c ============================================================================== --- trunk/src/pc80/usbdebug_serial.c Tue Aug 3 17:42:29 2010 (r5682) +++ trunk/src/pc80/usbdebug_serial.c Wed Aug 4 21:29:11 2010 (r5683) @@ -34,7 +34,7 @@ (CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - sizeof(struct ehci_debug_info));
if (dbg_info->ehci_debug) { - dbgp_bulk_write_x(dbg_info, &data, 1); + dbgp_bulk_write_x(dbg_info, (char*)&data, 1); } }
@@ -47,6 +47,6 @@ ((CONFIG_RAMTOP) - sizeof(struct ehci_debug_info));
if (dbg_info->ehci_debug) { - dbgp_bulk_write_x(dbg_info, &data, 1); + dbgp_bulk_write_x(dbg_info, (char*)&data, 1); } }
Modified: trunk/src/southbridge/intel/i82801gx/i82801gx_usb_debug.c ============================================================================== --- trunk/src/southbridge/intel/i82801gx/i82801gx_usb_debug.c Tue Aug 3 17:42:29 2010 (r5682) +++ trunk/src/southbridge/intel/i82801gx/i82801gx_usb_debug.c Wed Aug 4 21:29:11 2010 (r5683) @@ -26,6 +26,8 @@ #define EHCI_PORTSC 0x44 #define EHCI_DEBUG_OFFSET 0xA0
+#include <usbdebug.h> + void set_debug_port(unsigned port) { u32 dbgctl;
Modified: trunk/src/southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c ============================================================================== --- trunk/src/southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c Tue Aug 3 17:42:29 2010 (r5682) +++ trunk/src/southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c Wed Aug 4 21:29:11 2010 (r5683) @@ -31,7 +31,9 @@ #define EHCI_BAR 0xFEF00000 #define EHCI_DEBUG_OFFSET 0x98
-static void set_debug_port(unsigned port) +#include <usbdebug.h> + +void set_debug_port(unsigned port) { uint32_t dword; dword = pci_read_config32(PCI_DEV(0, MCP55_DEVN_BASE+2, 1), 0x74);
Modified: trunk/src/southbridge/sis/sis966/sis966_enable_usbdebug.c ============================================================================== --- trunk/src/southbridge/sis/sis966/sis966_enable_usbdebug.c Tue Aug 3 17:42:29 2010 (r5682) +++ trunk/src/southbridge/sis/sis966/sis966_enable_usbdebug.c Wed Aug 4 21:29:11 2010 (r5683) @@ -31,7 +31,9 @@ #define EHCI_BAR 0xFEF00000 #define EHCI_DEBUG_OFFSET 0x98
-static void set_debug_port(unsigned port) +#include <usbdebug.h> + +void set_debug_port(unsigned port) { uint32_t dword; dword = pci_read_config32(PCI_DEV(0, SIS966_DEVN_BASE+2, 1), 0x74);
-
repository service