sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove warnings from USB debug console code.

Browse Source 
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5683 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Myles Watson
2010-08-04 19:29:11 +00:00
parent 8c4f31b3b5
commit 127e976ec2
8 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/console/usbdebug_console.c
View File

@ -29,20 +29,20 @@ void set_ehci_base(unsigned ehci_base)
if (!dbg_info.ehci_debug) if (!dbg_info.ehci_debug)
return; return;
diff = dbg_info.ehci_caps - ehci_base; diff = (unsigned)dbg_info.ehci_caps - ehci_base;
dbg_info.ehci_regs -= diff; dbg_info.ehci_regs -= diff;
dbg_info.ehci_debug -= 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) 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) unsigned get_ehci_debug(void)
{ {
return dbg_info.ehci_debug; return (unsigned)dbg_info.ehci_debug;
} }
static void dbgp_init(void) static void dbgp_init(void)
@ -61,7 +61,7 @@ static void dbgp_init(void)
static void dbgp_tx_byte(unsigned char data) static void dbgp_tx_byte(unsigned char data)
{ {
if (dbg_info.ehci_debug) 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) static unsigned char dbgp_rx_byte(void)
@ -76,7 +76,7 @@ static unsigned char dbgp_rx_byte(void)
static int dbgp_tst_byte(void) 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 = { static const struct console_driver usbdebug_direct_console __console = {

3
src/include/console/console.h
View File

@ -12,6 +12,9 @@ int console_tst_byte(void);
#if CONFIG_CONSOLE_VGA == 1 #if CONFIG_CONSOLE_VGA == 1
void vga_console_init(void); void vga_console_init(void);
#endif #endif
#if CONFIG_USBDEBUG
#include <usbdebug.h>
#endif
struct console_driver { struct console_driver {
void (*init)(void); void (*init)(void);

7
src/include/usbdebug.h
View File

@ -18,6 +18,8 @@
#ifndef USBDEBUG_H #ifndef USBDEBUG_H
#define USBDEBUG_H #define USBDEBUG_H
#include <ehci.h>
struct ehci_debug_info { struct ehci_debug_info {
void *ehci_caps; void *ehci_caps;
void *ehci_regs; void *ehci_regs;
@ -29,9 +31,14 @@ struct ehci_debug_info {
int dbgp_bulk_write_x(struct ehci_debug_info *dbg_info, const char *bytes, int size); 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_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_base(unsigned ehci_base);
void set_ehci_debug(unsigned ehci_deug); void set_ehci_debug(unsigned ehci_deug);
unsigned get_ehci_debug(void); unsigned get_ehci_debug(void);
void set_debug_port(unsigned port); void set_debug_port(unsigned port);
void usbdebug_ram_tx_byte(unsigned char data);
void usbdebug_tx_byte(unsigned char data);
#endif #endif

7
src/lib/usbdebug.c
View File

@ -234,7 +234,7 @@ int dbgp_bulk_read_x(struct ehci_debug_info *dbg_info, void *data, int size)
return dbgp_bulk_read(dbg_info->ehci_debug, dbg_info->devnum, dbg_info->endpoint_in, data, size); 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) int value, int index, void *data, int size)
{ {
unsigned pids, addr, ctrl; unsigned pids, addr, ctrl;
@ -323,7 +323,7 @@ static int ehci_reset_port(struct ehci_regs *ehci_regs, int port)
return -16;//-EBUSY; 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; unsigned status;
int ret, reps; int ret, reps;
@ -346,6 +346,8 @@ static int ehci_wait_for_port(struct ehci_regs *ehci_regs, int port)
#else #else
#define dbgp_printk(fmt_arg...) do {} while(0) #define dbgp_printk(fmt_arg...) do {} while(0)
#endif #endif
#ifdef __PRE_RAM__
static void usbdebug_init(unsigned ehci_bar, unsigned offset, struct ehci_debug_info *info) static void usbdebug_init(unsigned ehci_bar, unsigned offset, struct ehci_debug_info *info)
{ {
struct ehci_caps *ehci_caps; struct ehci_caps *ehci_caps;
@ -547,5 +549,6 @@ next_debug_port:
} }
} }
#endif

4
src/pc80/usbdebug_serial.c
View File

@ -34,7 +34,7 @@ void usbdebug_tx_byte(unsigned char data)
(CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - sizeof(struct ehci_debug_info)); (CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - sizeof(struct ehci_debug_info));
if (dbg_info->ehci_debug) { 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 @@ void usbdebug_ram_tx_byte(unsigned char data)
((CONFIG_RAMTOP) - sizeof(struct ehci_debug_info)); ((CONFIG_RAMTOP) - sizeof(struct ehci_debug_info));
if (dbg_info->ehci_debug) { if (dbg_info->ehci_debug) {
dbgp_bulk_write_x(dbg_info, &data, 1); dbgp_bulk_write_x(dbg_info, (char*)&data, 1);
} }
} }

2
src/southbridge/intel/i82801gx/i82801gx_usb_debug.c
View File

@ -26,6 +26,8 @@
#define EHCI_PORTSC 0x44 #define EHCI_PORTSC 0x44
#define EHCI_DEBUG_OFFSET 0xA0 #define EHCI_DEBUG_OFFSET 0xA0
#include <usbdebug.h>
void set_debug_port(unsigned port) void set_debug_port(unsigned port)
{ {
u32 dbgctl; u32 dbgctl;

4
src/southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c
View File

@ -31,7 +31,9 @@
#define EHCI_BAR 0xFEF00000 #define EHCI_BAR 0xFEF00000
#define EHCI_DEBUG_OFFSET 0x98 #define EHCI_DEBUG_OFFSET 0x98
static void set_debug_port(unsigned port) #include <usbdebug.h>
void set_debug_port(unsigned port)
{ {
uint32_t dword; uint32_t dword;
dword = pci_read_config32(PCI_DEV(0, MCP55_DEVN_BASE+2, 1), 0x74); dword = pci_read_config32(PCI_DEV(0, MCP55_DEVN_BASE+2, 1), 0x74);

4
src/southbridge/sis/sis966/sis966_enable_usbdebug.c
View File

@ -31,7 +31,9 @@
#define EHCI_BAR 0xFEF00000 #define EHCI_BAR 0xFEF00000
#define EHCI_DEBUG_OFFSET 0x98 #define EHCI_DEBUG_OFFSET 0x98
static void set_debug_port(unsigned port) #include <usbdebug.h>
void set_debug_port(unsigned port)
{ {
uint32_t dword; uint32_t dword;
dword = pci_read_config32(PCI_DEV(0, SIS966_DEVN_BASE+2, 1), 0x74); dword = pci_read_config32(PCI_DEV(0, SIS966_DEVN_BASE+2, 1), 0x74);