[commit] r5587 - in trunk/src: lib mainboard/getac/p470 mainboard/gigabyte/ga_2761gxdk mainboard/gigabyte/m57sli mainboard/intel/d945gclf mainboard/kontron/986lcd-m mainboard/msi/ms7260 mainboard/m...

[repository service]

Author: stepan
Date: Tue May 25 18:35:51 2010
New Revision: 5587
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5587

Log:
fix most usbdebug warnings and fix function names.
Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified:
   trunk/src/lib/usbdebug.c
   trunk/src/mainboard/getac/p470/romstage.c
   trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
   trunk/src/mainboard/gigabyte/m57sli/romstage.c
   trunk/src/mainboard/intel/d945gclf/romstage.c
   trunk/src/mainboard/kontron/986lcd-m/romstage.c
   trunk/src/mainboard/msi/ms7260/romstage.c
   trunk/src/mainboard/msi/ms9652_fam10/romstage.c
   trunk/src/mainboard/nvidia/l1_2pvv/romstage.c
   trunk/src/mainboard/roda/rk886ex/romstage.c
   trunk/src/mainboard/tyan/s2912/romstage.c
   trunk/src/mainboard/tyan/s2912_fam10/romstage.c
   trunk/src/pc80/usbdebug_serial.c
   trunk/src/southbridge/amd/sb600/sb600_enable_usbdebug.c
   trunk/src/southbridge/amd/sb700/sb700_enable_usbdebug.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/lib/usbdebug.c
==============================================================================
--- trunk/src/lib/usbdebug.c	Tue May 25 18:17:45 2010	(r5586)
+++ trunk/src/lib/usbdebug.c	Tue May 25 18:35:51 2010	(r5587)
@@ -83,7 +83,7 @@
    unsigned ctrl;
    int loop = 0x100000;
    do {
-		ctrl = read32(&ehci_debug->control);
+		ctrl = read32((unsigned long)&ehci_debug->control);
    	/* Stop when the transaction is finished */
    	if (ctrl & DBGP_DONE)
    		break;
@@ -94,7 +94,7 @@
    /* Now that we have observed the completed transaction,
     * clear the done bit.
     */
-	write32(&ehci_debug->control, ctrl | DBGP_DONE);
+	write32((unsigned long)&ehci_debug->control, ctrl | DBGP_DONE);
    return (ctrl & DBGP_ERROR) ? -DBGP_ERRCODE(ctrl) : DBGP_LEN(ctrl);
 }

@@ -119,9 +119,9 @@

int loop = 3;
 retry:
-	write32(&ehci_debug->control, ctrl | DBGP_GO);
+	write32((unsigned long)&ehci_debug->control, ctrl | DBGP_GO);
    ret = dbgp_wait_until_complete(ehci_debug);
-	pids = read32(&ehci_debug->pids);
+	pids = read32((unsigned long)&ehci_debug->pids);
    lpid = DBGP_PID_GET(pids);

if (ret < 0)
@@ -151,8 +151,8 @@
    	lo |= bytes[i] << (8*i);
    for (; i < 8 && i < size; i++)
    	hi |= bytes[i] << (8*(i - 4));
-	write32(&ehci_debug->data03, lo);
-	write32(&ehci_debug->data47, hi);
+	write32((unsigned long)&ehci_debug->data03, lo);
+	write32((unsigned long)&ehci_debug->data47, hi);
 }

static void dbgp_get_data(struct ehci_dbg_port *ehci_debug, void *buf, int size)
@@ -160,8 +160,8 @@
    unsigned char *bytes = buf;
    unsigned lo, hi;
    int i;
-	lo = read32(&ehci_debug->data03);
-	hi = read32(&ehci_debug->data47);
+	lo = read32((unsigned long)&ehci_debug->data03);
+	hi = read32((unsigned long)&ehci_debug->data47);
    for (i = 0; i < 4 && i < size; i++)
    	bytes[i] = (lo >> (8*i)) & 0xff;
    for (; i < 8 && i < size; i++)
@@ -177,17 +177,17 @@

addr = DBGP_EPADDR(devnum, endpoint);

-	pids = read32(&ehci_debug->pids);
+	pids = read32((unsigned long)&ehci_debug->pids);
    pids = DBGP_PID_UPDATE(pids, USB_PID_OUT);

-	ctrl = read32(&ehci_debug->control);
+	ctrl = read32((unsigned long)&ehci_debug->control);
    ctrl = DBGP_LEN_UPDATE(ctrl, size);
    ctrl |= DBGP_OUT;
    ctrl |= DBGP_GO;

dbgp_set_data(ehci_debug, bytes, size);
-	write32(&ehci_debug->address, addr);
-	write32(&ehci_debug->pids, pids);
+	write32((unsigned long)&ehci_debug->address, addr);
+	write32((unsigned long)&ehci_debug->pids, pids);

ret = dbgp_wait_until_done(ehci_debug, ctrl);
    if (ret < 0) {
@@ -211,16 +211,16 @@

addr = DBGP_EPADDR(devnum, endpoint);

-	pids = read32(&ehci_debug->pids);
+	pids = read32((unsigned long)&ehci_debug->pids);
    pids = DBGP_PID_UPDATE(pids, USB_PID_IN);

-	ctrl = read32(&ehci_debug->control);
+	ctrl = read32((unsigned long)&ehci_debug->control);
    ctrl = DBGP_LEN_UPDATE(ctrl, size);
    ctrl &= ~DBGP_OUT;
    ctrl |= DBGP_GO;

-	write32(&ehci_debug->address, addr);
-	write32(&ehci_debug->pids, pids);
+	write32((unsigned long)&ehci_debug->address, addr);
+	write32((unsigned long)&ehci_debug->pids, pids);
    ret = dbgp_wait_until_done(ehci_debug, ctrl);
    if (ret < 0)
    	return ret;
@@ -256,15 +256,15 @@
    pids = DBGP_PID_SET(USB_PID_DATA0, USB_PID_SETUP);
    addr = DBGP_EPADDR(devnum, 0);

-	ctrl = read32(&ehci_debug->control);
+	ctrl = read32((unsigned long)&ehci_debug->control);
    ctrl = DBGP_LEN_UPDATE(ctrl, sizeof(req));
    ctrl |= DBGP_OUT;
    ctrl |= DBGP_GO;

/* Send the setup message */
    dbgp_set_data(ehci_debug, &req, sizeof(req));
-	write32(&ehci_debug->address, addr);
-	write32(&ehci_debug->pids, pids);
+	write32((unsigned long)&ehci_debug->address, addr);
+	write32((unsigned long)&ehci_debug->pids, pids);
    ret = dbgp_wait_until_done(ehci_debug, ctrl);
    if (ret < 0)
    	return ret;
@@ -282,25 +282,25 @@
    int loop;

/* Reset the usb debug port */
-	portsc = read32(&ehci_regs->port_status[port - 1]);
+	portsc = read32((unsigned long)&ehci_regs->port_status[port - 1]);
    portsc &= ~PORT_PE;
    portsc |= PORT_RESET;
-	write32(&ehci_regs->port_status[port - 1], portsc);
+	write32((unsigned long)&ehci_regs->port_status[port - 1], portsc);

delay = HUB_ROOT_RESET_TIME;
    for (delay_time = 0; delay_time < HUB_RESET_TIMEOUT;
         delay_time += delay) {
    	dbgp_mdelay(delay);

-		portsc = read32(&ehci_regs->port_status[port - 1]);
+		portsc = read32((unsigned long)&ehci_regs->port_status[port - 1]);
    	if (portsc & PORT_RESET) {
    		/* force reset to complete */
    		loop = 2;
-			write32(&ehci_regs->port_status[port - 1],
+			write32((unsigned long)&ehci_regs->port_status[port - 1],
    				portsc & ~(PORT_RWC_BITS | PORT_RESET));
    		do {
    			dbgp_mdelay(delay);
-				portsc = read32(&ehci_regs->port_status[port - 1]);
+				portsc = read32((unsigned long)&ehci_regs->port_status[port - 1]);
    			delay_time += delay;
    		} while ((portsc & PORT_RESET) && (--loop > 0));
    		if (!loop) {
@@ -329,7 +329,7 @@
    int ret, reps;
    for (reps = 0; reps < 3; reps++) {
    	dbgp_mdelay(100);
-		status = read32(&ehci_regs->status);
+		status = read32((unsigned long)&ehci_regs->status);
    	if (status & STS_PCD) {
    		ret = ehci_reset_port(ehci_regs, port);
    		if (ret == 0)
@@ -346,7 +346,7 @@
 #else
 #define dbgp_printk(fmt_arg...)   do {} while(0)
 #endif
-static void usbdebug_direct_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_regs *ehci_regs;
@@ -356,7 +356,6 @@
    struct usb_debug_descriptor dbgp_desc;
    unsigned ctrl, devnum;
    int ret;
-	unsigned delay_time, delay;
    int loop;

unsigned cmd,  status, portsc, hcs_params, debug_port, n_ports, new_debug_port;
@@ -366,16 +365,18 @@
    unsigned playtimes = 3;

ehci_caps  = (struct ehci_caps *)ehci_bar;
-	ehci_regs  = (struct ehci_regs *)(ehci_bar + HC_LENGTH(read32(&ehci_caps->hc_capbase)));
+	ehci_regs  = (struct ehci_regs *)(ehci_bar + HC_LENGTH(read32((unsigned long)&ehci_caps->hc_capbase)));
    ehci_debug = (struct ehci_dbg_port *)(ehci_bar + offset);

info->ehci_debug = (void *)0;

+	new_debug_port = 0;
+
 try_next_time:
    port_map_tried = 0;

try_next_port:
-	hcs_params = read32(&ehci_caps->hcs_params);
+	hcs_params = read32((unsigned long)&ehci_caps->hcs_params);
    debug_port = HCS_DEBUG_PORT(hcs_params);
    n_ports    = HCS_N_PORTS(hcs_params);

@@ -385,7 +386,7 @@

#if 1
         for (i = 1; i <= n_ports; i++) {
-                portsc = read32(&ehci_regs->port_status[i-1]);
+                portsc = read32((unsigned long)&ehci_regs->port_status[i-1]);
                 dbgp_printk("PORTSC #%d: %08x\n", i, portsc);
         }
 #endif
@@ -400,11 +401,11 @@

/* Reset the EHCI controller */
    loop = 10;
-	cmd = read32(&ehci_regs->command);
+	cmd = read32((unsigned long)&ehci_regs->command);
    cmd |= CMD_RESET;
-	write32(&ehci_regs->command, cmd);
+	write32((unsigned long)&ehci_regs->command, cmd);
    do {
-		cmd = read32(&ehci_regs->command);
+		cmd = read32((unsigned long)&ehci_regs->command);
    } while ((cmd & CMD_RESET) && (--loop > 0));

if(!loop)
@@ -413,24 +414,24 @@
    	dbgp_printk("EHCI controller reset successfully.\n");

/* Claim ownership, but do not enable yet */
-	ctrl = read32(&ehci_debug->control);
+	ctrl = read32((unsigned long)&ehci_debug->control);
    ctrl |= DBGP_OWNER;
    ctrl &= ~(DBGP_ENABLED | DBGP_INUSE);
-	write32(&ehci_debug->control, ctrl);
+	write32((unsigned long)&ehci_debug->control, ctrl);

/* Start the ehci running */
-	cmd = read32(&ehci_regs->command);
+	cmd = read32((unsigned long)&ehci_regs->command);
    cmd &= ~(CMD_LRESET | CMD_IAAD | CMD_PSE | CMD_ASE | CMD_RESET);
    cmd |= CMD_RUN;
-	write32(&ehci_regs->command, cmd);
+	write32((unsigned long)&ehci_regs->command, cmd);

/* Ensure everything is routed to the EHCI */
-	write32(&ehci_regs->configured_flag, FLAG_CF);
+	write32((unsigned long)&ehci_regs->configured_flag, FLAG_CF);

/* Wait until the controller is no longer halted */
    loop = 10;
    do {
-		status = read32(&ehci_regs->status);
+		status = read32((unsigned long)&ehci_regs->status);
    } while ((status & STS_HALT) && (--loop>0));

if(!loop) {
@@ -448,21 +449,21 @@
    dbgp_printk("EHCI done waiting for port.\n");

/* Enable the debug port */
-	ctrl = read32(&ehci_debug->control);
+	ctrl = read32((unsigned long)&ehci_debug->control);
    ctrl |= DBGP_CLAIM;
-	write32(&ehci_debug->control, ctrl);
-	ctrl = read32(&ehci_debug->control);
+	write32((unsigned long)&ehci_debug->control, ctrl);
+	ctrl = read32((unsigned long)&ehci_debug->control);
    if ((ctrl & DBGP_CLAIM) != DBGP_CLAIM) {
    	dbgp_printk("No device in EHCI debug port.\n");
-		write32(&ehci_debug->control, ctrl & ~DBGP_CLAIM);
+		write32((unsigned long)&ehci_debug->control, ctrl & ~DBGP_CLAIM);
    	goto err;
    }
    dbgp_printk("EHCI debug port enabled.\n");

/* Completely transfer the debug device to the debug controller */
-	portsc = read32(&ehci_regs->port_status[debug_port - 1]);
+	portsc = read32((unsigned long)&ehci_regs->port_status[debug_port - 1]);
    portsc &= ~PORT_PE;
-	write32(&ehci_regs->port_status[debug_port - 1], portsc);
+	write32((unsigned long)&ehci_regs->port_status[debug_port - 1], portsc);

dbgp_mdelay(100);

@@ -529,9 +530,9 @@
    return;
 err:
    /* Things didn't work so remove my claim */
-	ctrl = read32(&ehci_debug->control);
+	ctrl = read32((unsigned long)&ehci_debug->control);
    ctrl &= ~(DBGP_CLAIM | DBGP_OUT);
-	write32((unsigned long)&ehci_debug->control, ctrl);
+	write32((unsigned long)(unsigned long)&ehci_debug->control, ctrl);

next_debug_port:
    port_map_tried |= (1<<(debug_port-1));

Modified: trunk/src/mainboard/getac/p470/romstage.c
==============================================================================
--- trunk/src/mainboard/getac/p470/romstage.c	Tue May 25 18:17:45 2010	(r5586)
+++ trunk/src/mainboard/getac/p470/romstage.c	Tue May 25 18:35:51 2010	(r5587)
@@ -321,8 +321,8 @@
    uart_init();

#if CONFIG_USBDEBUG_DIRECT
-	i82801gx_enable_usbdebug_direct(DBGP_DEFAULT);
-	early_usbdebug_direct_init();
+	i82801gx_enable_usbdebug(DBGP_DEFAULT);
+	early_usbdebug_init();
 #endif
    console_init();

Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
==============================================================================
--- trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c	Tue May 25 18:17:45 2010	(r5586)
+++ trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c	Tue May 25 18:35:51 2010	(r5587)
@@ -200,8 +200,8 @@
    report_bist_failure(bist);

#if CONFIG_USBDEBUG_DIRECT
-	sis966_enable_usbdebug_direct(DBGP_DEFAULT);
-	early_usbdebug_direct_init();
+	sis966_enable_usbdebug(DBGP_DEFAULT);
+	early_usbdebug_init();
 #endif
         console_init();
    printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);

Modified: trunk/src/mainboard/gigabyte/m57sli/romstage.c
==============================================================================
--- trunk/src/mainboard/gigabyte/m57sli/romstage.c	Tue May 25 18:17:45 2010	(r5586)
+++ trunk/src/mainboard/gigabyte/m57sli/romstage.c	Tue May 25 18:35:51 2010	(r5587)
@@ -213,8 +213,8 @@
    report_bist_failure(bist);

#if CONFIG_USBDEBUG_DIRECT
-	mcp55_enable_usbdebug_direct(DBGP_DEFAULT);
-	early_usbdebug_direct_init();
+	mcp55_enable_usbdebug(DBGP_DEFAULT);
+	early_usbdebug_init();
 #endif
         console_init();
    printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);

Modified: trunk/src/mainboard/intel/d945gclf/romstage.c
==============================================================================
--- trunk/src/mainboard/intel/d945gclf/romstage.c	Tue May 25 18:17:45 2010	(r5586)
+++ trunk/src/mainboard/intel/d945gclf/romstage.c	Tue May 25 18:35:51 2010	(r5587)
@@ -237,8 +237,8 @@
    uart_init();

#if CONFIG_USBDEBUG_DIRECT
-	i82801gx_enable_usbdebug_direct(DBGP_DEFAULT);
-	early_usbdebug_direct_init();
+	i82801gx_enable_usbdebug(DBGP_DEFAULT);
+	early_usbdebug_init();
 #endif

console_init();

Modified: trunk/src/mainboard/kontron/986lcd-m/romstage.c
==============================================================================
--- trunk/src/mainboard/kontron/986lcd-m/romstage.c	Tue May 25 18:17:45 2010	(r5586)
+++ trunk/src/mainboard/kontron/986lcd-m/romstage.c	Tue May 25 18:35:51 2010	(r5587)
@@ -381,8 +381,8 @@
    uart_init();

#if CONFIG_USBDEBUG_DIRECT
-	i82801gx_enable_usbdebug_direct(DBGP_DEFAULT);
-	early_usbdebug_direct_init();
+	i82801gx_enable_usbdebug(DBGP_DEFAULT);
+	early_usbdebug_init();
 #endif

console_init();

Modified: trunk/src/mainboard/msi/ms7260/romstage.c
==============================================================================
--- trunk/src/mainboard/msi/ms7260/romstage.c	Tue May 25 18:17:45 2010	(r5586)
+++ trunk/src/mainboard/msi/ms7260/romstage.c	Tue May 25 18:35:51 2010	(r5587)
@@ -182,8 +182,8 @@
    uart_init();
    report_bist_failure(bist); /* Halt upon BIST failure. */
 #if CONFIG_USBDEBUG_DIRECT
-	mcp55_enable_usbdebug_direct(DBGP_DEFAULT);
-	early_usbdebug_direct_init();
+	mcp55_enable_usbdebug(DBGP_DEFAULT);
+	early_usbdebug_init();
 #endif
    console_init();

Modified: trunk/src/mainboard/msi/ms9652_fam10/romstage.c
==============================================================================
--- trunk/src/mainboard/msi/ms9652_fam10/romstage.c	Tue May 25 18:17:45 2010	(r5586)
+++ trunk/src/mainboard/msi/ms9652_fam10/romstage.c	Tue May 25 18:35:51 2010	(r5587)
@@ -186,8 +186,8 @@
    report_bist_failure(bist);

#if CONFIG_USBDEBUG_DIRECT
-	mcp55_enable_usbdebug_direct(DBGP_DEFAULT);
-	early_usbdebug_direct_init();
+	mcp55_enable_usbdebug(DBGP_DEFAULT);
+	early_usbdebug_init();
 #endif

val = cpuid_eax(1);

Modified: trunk/src/mainboard/nvidia/l1_2pvv/romstage.c
==============================================================================
--- trunk/src/mainboard/nvidia/l1_2pvv/romstage.c	Tue May 25 18:17:45 2010	(r5586)
+++ trunk/src/mainboard/nvidia/l1_2pvv/romstage.c	Tue May 25 18:35:51 2010	(r5587)
@@ -199,8 +199,8 @@
    report_bist_failure(bist);

#if CONFIG_USBDEBUG_DIRECT
-	mcp55_enable_usbdebug_direct(DBGP_DEFAULT);
-	early_usbdebug_direct_init();
+	mcp55_enable_usbdebug(DBGP_DEFAULT);
+	early_usbdebug_init();
 #endif
    console_init();
    printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);

Modified: trunk/src/mainboard/roda/rk886ex/romstage.c
==============================================================================
--- trunk/src/mainboard/roda/rk886ex/romstage.c	Tue May 25 18:17:45 2010	(r5586)
+++ trunk/src/mainboard/roda/rk886ex/romstage.c	Tue May 25 18:35:51 2010	(r5587)
@@ -291,8 +291,8 @@
    uart_init();

#if CONFIG_USBDEBUG_DIRECT
-	i82801gx_enable_usbdebug_direct(DBGP_DEFAULT);
-	early_usbdebug_direct_init();
+	i82801gx_enable_usbdebug(DBGP_DEFAULT);
+	early_usbdebug_init();
 #endif

console_init();

Modified: trunk/src/mainboard/tyan/s2912/romstage.c
==============================================================================
--- trunk/src/mainboard/tyan/s2912/romstage.c	Tue May 25 18:17:45 2010	(r5586)
+++ trunk/src/mainboard/tyan/s2912/romstage.c	Tue May 25 18:35:51 2010	(r5587)
@@ -193,8 +193,8 @@
    report_bist_failure(bist);

#if CONFIG_USBDEBUG_DIRECT
-	mcp55_enable_usbdebug_direct(DBGP_DEFAULT);
-	early_usbdebug_direct_init();
+	mcp55_enable_usbdebug(DBGP_DEFAULT);
+	early_usbdebug_init();
 #endif
    console_init();
    printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);

Modified: trunk/src/mainboard/tyan/s2912_fam10/romstage.c
==============================================================================
--- trunk/src/mainboard/tyan/s2912_fam10/romstage.c	Tue May 25 18:17:45 2010	(r5586)
+++ trunk/src/mainboard/tyan/s2912_fam10/romstage.c	Tue May 25 18:35:51 2010	(r5587)
@@ -181,8 +181,8 @@
    report_bist_failure(bist);

#if CONFIG_USBDEBUG_DIRECT
-	mcp55_enable_usbdebug_direct(DBGP_DEFAULT);
-	early_usbdebug_direct_init();
+	mcp55_enable_usbdebug(DBGP_DEFAULT);
+	early_usbdebug_init();
 #endif

val = cpuid_eax(1);

Modified: trunk/src/pc80/usbdebug_serial.c
==============================================================================
--- trunk/src/pc80/usbdebug_serial.c	Tue May 25 18:17:45 2010	(r5586)
+++ trunk/src/pc80/usbdebug_serial.c	Tue May 25 18:35:51 2010	(r5587)
@@ -17,15 +17,15 @@

#include "../lib/usbdebug.c"

-static void early_usbdebug_direct_init(void)
+static void early_usbdebug_init(void)
 {
    struct ehci_debug_info *dbg_info = (struct ehci_debug_info *)
        (CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - sizeof(struct ehci_debug_info));

-	usbdebug_direct_init(EHCI_BAR, EHCI_DEBUG_OFFSET, dbg_info);
+	usbdebug_init(EHCI_BAR, EHCI_DEBUG_OFFSET, dbg_info);
 }

-void usbdebug_direct_tx_byte(unsigned char data)
+void usbdebug_tx_byte(unsigned char data)
 {
    struct ehci_debug_info *dbg_info;

@@ -38,7 +38,7 @@
    }
 }

-void usbdebug_direct_ram_tx_byte(unsigned char data)
+void usbdebug_ram_tx_byte(unsigned char data)
 {
    struct ehci_debug_info *dbg_info;

Modified: trunk/src/southbridge/amd/sb600/sb600_enable_usbdebug.c
==============================================================================
--- trunk/src/southbridge/amd/sb600/sb600_enable_usbdebug.c	Tue May 25 18:17:45 2010	(r5586)
+++ trunk/src/southbridge/amd/sb600/sb600_enable_usbdebug.c	Tue May 25 18:35:51 2010	(r5587)
@@ -27,7 +27,7 @@
 #define EHCI_BAR 0xFEF00000
 #define EHCI_DEBUG_OFFSET 0xE0

-static void sb600_enable_usbdebug_direct(u32 port)
+static void sb600_enable_usbdebug(u32 port)
 {
    set_debug_port(port);
    pci_write_config32(PCI_DEV(0, SB600_DEVN_BASE + 0x13, 5),

Modified: trunk/src/southbridge/amd/sb700/sb700_enable_usbdebug.c
==============================================================================
--- trunk/src/southbridge/amd/sb700/sb700_enable_usbdebug.c	Tue May 25 18:17:45 2010	(r5586)
+++ trunk/src/southbridge/amd/sb700/sb700_enable_usbdebug.c	Tue May 25 18:35:51 2010	(r5587)
@@ -27,7 +27,7 @@
 #define EHCI_BAR 0xFEF00000
 #define EHCI_DEBUG_OFFSET 0xE0

-static void sb700_enable_usbdebug_direct(u32 port)
+static void sb700_enable_usbdebug(u32 port)
 {
    set_debug_port(port);
    pci_write_config32(PCI_DEV(0, SB700_DEVN_BASE + 0x13, 5),

Modified: trunk/src/southbridge/intel/i82801gx/i82801gx_usb_debug.c
==============================================================================
--- trunk/src/southbridge/intel/i82801gx/i82801gx_usb_debug.c	Tue May 25 18:17:45 2010	(r5586)
+++ trunk/src/southbridge/intel/i82801gx/i82801gx_usb_debug.c	Tue May 25 18:35:51 2010	(r5587)
@@ -36,7 +36,7 @@
    write32(EHCI_BAR + EHCI_DEBUG_OFFSET, dbgctl);
 }

-static void i82801gx_enable_usbdebug_direct(unsigned port)
+static void i82801gx_enable_usbdebug(unsigned port)
 {
    pci_write_config32(PCI_DEV(0, 0x1d, 7), EHCI_BAR_INDEX, EHCI_BAR);
    pci_write_config8(PCI_DEV(0, 0x1d, 7), 0x04, 0x2); // Memory Space Enable

Modified: trunk/src/southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c
==============================================================================
--- trunk/src/southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c	Tue May 25 18:17:45 2010	(r5586)
+++ trunk/src/southbridge/nvidia/mcp55/mcp55_enable_usbdebug.c	Tue May 25 18:35:51 2010	(r5587)
@@ -41,7 +41,7 @@

}

-static void mcp55_enable_usbdebug_direct(unsigned port)
+static void mcp55_enable_usbdebug(unsigned port)
 {
    set_debug_port(port);
    pci_write_config32(PCI_DEV(0, MCP55_DEVN_BASE+2, 1), EHCI_BAR_INDEX, EHCI_BAR);

Modified: trunk/src/southbridge/sis/sis966/sis966_enable_usbdebug.c
==============================================================================
--- trunk/src/southbridge/sis/sis966/sis966_enable_usbdebug.c	Tue May 25 18:17:45 2010	(r5586)
+++ trunk/src/southbridge/sis/sis966/sis966_enable_usbdebug.c	Tue May 25 18:35:51 2010	(r5587)
@@ -41,7 +41,7 @@

}

-static void sis966_enable_usbdebug_direct(unsigned port)
+static void sis966_enable_usbdebug(unsigned port)
 {
    set_debug_port(port);
    pci_write_config32(PCI_DEV(0, SIS966_DEVN_BASE+2, 1), EHCI_BAR_INDEX, EHCI_BAR);