CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi

[Cliff Neighbors]

Module Name:    src
Committed By:   cliff
Date:           Fri Jan 29 00:23:18 UTC 2010

Modified Files:
        src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_ehci.c rmixl_ohci.c

Log Message:
- use rmixl_probe_4 to match


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/mips/rmi/rmixl_ehci.c \
    src/sys/arch/mips/rmi/rmixl_ohci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/mips/rmi/rmixl_ehci.c
diff -u src/sys/arch/mips/rmi/rmixl_ehci.c:1.1.2.2 src/sys/arch/mips/rmi/rmixl_ehci.c:1.1.2.3
--- src/sys/arch/mips/rmi/rmixl_ehci.c:1.1.2.2	Sun Jan  3 08:37:07 2010
+++ src/sys/arch/mips/rmi/rmixl_ehci.c	Fri Jan 29 00:23:18 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: rmixl_ehci.c,v 1.1.2.2 2010/01/03 08:37:07 cliff Exp $	*/
+/*	$NetBSD: rmixl_ehci.c,v 1.1.2.3 2010/01/29 00:23:18 cliff Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_ehci.c,v 1.1.2.2 2010/01/03 08:37:07 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_ehci.c,v 1.1.2.3 2010/01/29 00:23:18 cliff Exp $");
 
 #include "locators.h"
 
@@ -66,7 +66,8 @@
 	struct rmixl_usbi_attach_args *usbi = aux;
 
         if (usbi->usbi_addr == (RMIXL_IO_DEV_USB_A + RMIXL_USB_HOST_EHCI_BASE))
-                return 1;
+                return rmixl_probe_4((volatile uint32_t *)
+			RMIXL_IOREG_VADDR(usbi->usbi_addr));
 
         return 0;
 }
Index: src/sys/arch/mips/rmi/rmixl_ohci.c
diff -u src/sys/arch/mips/rmi/rmixl_ohci.c:1.1.2.2 src/sys/arch/mips/rmi/rmixl_ohci.c:1.1.2.3
--- src/sys/arch/mips/rmi/rmixl_ohci.c:1.1.2.2	Sun Jan  3 08:37:07 2010
+++ src/sys/arch/mips/rmi/rmixl_ohci.c	Fri Jan 29 00:23:18 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: rmixl_ohci.c,v 1.1.2.2 2010/01/03 08:37:07 cliff Exp $	*/
+/*	$NetBSD: rmixl_ohci.c,v 1.1.2.3 2010/01/29 00:23:18 cliff Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include "locators.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_ohci.c,v 1.1.2.2 2010/01/03 08:37:07 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_ohci.c,v 1.1.2.3 2010/01/29 00:23:18 cliff Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -67,7 +67,8 @@
 
         if ((usbi->usbi_addr == (RMIXL_IO_DEV_USB_A+RMIXL_USB_HOST_0HCI0_BASE))
         ||  (usbi->usbi_addr == (RMIXL_IO_DEV_USB_A+RMIXL_USB_HOST_0HCI1_BASE)))
-                return 1;
+                return rmixl_probe_4((volatile uint32_t *)
+			RMIXL_IOREG_VADDR(usbi->usbi_addr));
 
         return 0;
 }