Module Name: src
Committed By: matt
Date: Fri Dec 30 06:43:39 UTC 2011
Modified Files:
src/sys/arch/mips/conf [matt-nb5-mips64]: files.rmixl
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_ehci.c rmixl_ohci.c
rmixl_usbi.c
Log Message:
Change devices name from rmixl_* to xl*.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.16 -r1.1.2.17 src/sys/arch/mips/conf/files.rmixl
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/arch/mips/rmi/rmixl_ehci.c \
src/sys/arch/mips/rmi/rmixl_ohci.c
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/arch/mips/rmi/rmixl_usbi.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/conf/files.rmixl
diff -u src/sys/arch/mips/conf/files.rmixl:1.1.2.16 src/sys/arch/mips/conf/files.rmixl:1.1.2.17
--- src/sys/arch/mips/conf/files.rmixl:1.1.2.16 Wed Dec 28 05:36:10 2011
+++ src/sys/arch/mips/conf/files.rmixl Fri Dec 30 06:43:39 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.rmixl,v 1.1.2.16 2011/12/28 05:36:10 matt Exp $
+# $NetBSD: files.rmixl,v 1.1.2.17 2011/12/30 06:43:39 matt Exp $
#
# Configuration info for RMI XLP, XLR, XLS
#
@@ -46,17 +46,15 @@ file arch/mips/rmi/rmixl_com.c com_rmix
defparam opt_com.h CONSADDR CONSFREQ CONSPEED CONMODE
# PCIe
-device rmixl_pcie: pcibus
-attach rmixl_pcie at obio # XLS
+device xlpcie: pcibus
+attach xlpcie at obio with rmixl_pcie # XLS
+attach xlpcie at mainbus with rmixlp_pcie # XLP
file arch/mips/rmi/rmixl_pcie.c rmixl_pcie needs-flag
-
-device rmixlp_pcie: pcibus
-attach rmixlp_pcie at mainbus # XLP
file arch/mips/rmi/rmixlp_pcie.c rmixlp_pcie needs-flag
# PCI-X
-device rmixl_pcix: pcibus
-attach rmixl_pcix at obio # XLR
+device xlpcix: pcibus
+attach xlpcix at obio with rmixl_pcix # XLR
file arch/mips/rmi/rmixl_pcix.c rmixl_pcix needs-flag
# XLS/XLR Periperal IO Bus to NOR, NAND, and PCMCIA memory controllers
@@ -92,17 +90,17 @@ attach xlpcic at xliobus
file arch/mips/rmi/rmixl_pcic.c xlpcic
# On-chip USB interface
-define rmixl_usbi { [addr=-1], [size=-1], [intr=-1] }
-device rmixl_usbi: rmixl_usbi
-attach rmixl_usbi at obio
+define xlusbi { [addr=-1], [size=-1], [intr=-1] }
+device xlusbi: xlusbi
+attach xlusbi at obio with rmixl_usbi
file arch/mips/rmi/rmixl_usbi.c rmixl_usbi
# On-chip OHCI USB controller
-attach ohci at rmixl_usbi with rmixl_ohci
+attach ohci at xlusbi with rmixl_ohci
file arch/mips/rmi/rmixl_ohci.c rmixl_ohci
# On-chip EHCI USB controller
-attach ehci at rmixl_usbi with rmixl_ehci
+attach ehci at xlusbi with rmixl_ehci
file arch/mips/rmi/rmixl_ehci.c rmixl_ehci
# PCI SDHC controller
@@ -134,3 +132,8 @@ file arch/mips/rmi/rmixl_i2c_pci.c xli2
device xlspi: spibus
attach xlspi at pci with xlspi_pci
file arch/mips/rmi/rmixl_spi_pci.c xlspi_pci
+
+# XL GPIO controller
+device xlgpio: gpiobus
+attach xlgpio at pci with xlgpio_pci
+file arch/mips/rmi/rmixl_gpio_pci.c xlgpio_pci
Index: src/sys/arch/mips/rmi/rmixl_ehci.c
diff -u src/sys/arch/mips/rmi/rmixl_ehci.c:1.1.2.5 src/sys/arch/mips/rmi/rmixl_ehci.c:1.1.2.6
--- src/sys/arch/mips/rmi/rmixl_ehci.c:1.1.2.5 Fri Apr 29 08:26:32 2011
+++ src/sys/arch/mips/rmi/rmixl_ehci.c Fri Dec 30 06:43:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_ehci.c,v 1.1.2.5 2011/04/29 08:26:32 matt Exp $ */
+/* $NetBSD: rmixl_ehci.c,v 1.1.2.6 2011/12/30 06:43:39 matt 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.5 2011/04/29 08:26:32 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_ehci.c,v 1.1.2.6 2011/12/30 06:43:39 matt Exp $");
#include "locators.h"
@@ -122,7 +122,7 @@ rmixl_ehci_attach(device_t parent, devic
EOWRITE2(sc, EHCI_USBINTR, 0);
/* establish interrupt */
- if (usbi->usbi_intr != RMIXL_USBICF_INTR_DEFAULT) {
+ if (usbi->usbi_intr != XLUSBICF_INTR_DEFAULT) {
ih = rmixl_usbi_intr_establish(device_private(parent),
usbi->usbi_intr, ehci_intr, sc);
if (ih == NULL)
Index: src/sys/arch/mips/rmi/rmixl_ohci.c
diff -u src/sys/arch/mips/rmi/rmixl_ohci.c:1.1.2.5 src/sys/arch/mips/rmi/rmixl_ohci.c:1.1.2.6
--- src/sys/arch/mips/rmi/rmixl_ohci.c:1.1.2.5 Fri Apr 29 08:26:33 2011
+++ src/sys/arch/mips/rmi/rmixl_ohci.c Fri Dec 30 06:43:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_ohci.c,v 1.1.2.5 2011/04/29 08:26:33 matt Exp $ */
+/* $NetBSD: rmixl_ohci.c,v 1.1.2.6 2011/12/30 06:43:39 matt 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.5 2011/04/29 08:26:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_ohci.c,v 1.1.2.6 2011/12/30 06:43:39 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -108,7 +108,7 @@ rmixl_ohci_attach(device_t parent, devic
OHCI_ALL_INTRS);
/* establish interrupt */
- if (usbi->usbi_intr != RMIXL_USBICF_INTR_DEFAULT) {
+ if (usbi->usbi_intr != XLUSBICF_INTR_DEFAULT) {
ih = rmixl_usbi_intr_establish(device_private(parent),
usbi->usbi_intr, ohci_intr, sc);
if (ih == NULL)
Index: src/sys/arch/mips/rmi/rmixl_usbi.c
diff -u src/sys/arch/mips/rmi/rmixl_usbi.c:1.1.2.8 src/sys/arch/mips/rmi/rmixl_usbi.c:1.1.2.9
--- src/sys/arch/mips/rmi/rmixl_usbi.c:1.1.2.8 Sat Dec 24 01:57:54 2011
+++ src/sys/arch/mips/rmi/rmixl_usbi.c Fri Dec 30 06:43:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_usbi.c,v 1.1.2.8 2011/12/24 01:57:54 matt Exp $ */
+/* $NetBSD: rmixl_usbi.c,v 1.1.2.9 2011/12/30 06:43:39 matt 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_usbi.c,v 1.1.2.8 2011/12/24 01:57:54 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_usbi.c,v 1.1.2.9 2011/12/30 06:43:39 matt Exp $");
#include "locators.h"
@@ -172,13 +172,13 @@ rmixl_usbi_print(void *aux, const char *
{
struct rmixl_usbi_attach_args *usbi = aux;
- if (usbi->usbi_addr != RMIXL_USBICF_ADDR_DEFAULT) {
+ if (usbi->usbi_addr != XLUSBICF_ADDR_DEFAULT) {
aprint_normal(" addr %#"PRIxBUSADDR, usbi->usbi_addr);
- if (usbi->usbi_size != RMIXL_USBICF_SIZE_DEFAULT)
+ if (usbi->usbi_size != XLUSBICF_SIZE_DEFAULT)
aprint_normal("-%#"PRIxBUSADDR,
usbi->usbi_addr + (usbi->usbi_size - 1));
}
- if (usbi->usbi_intr != RMIXL_USBICF_INTR_DEFAULT)
+ if (usbi->usbi_intr != XLUSBICF_INTR_DEFAULT)
aprint_normal(" intr %d", usbi->usbi_intr);
aprint_normal("\n");
@@ -194,9 +194,9 @@ rmixl_usbi_search(device_t parent, cfdat
usbi.usbi_eb_bst = sc->sc_eb_bst;
usbi.usbi_el_bst = sc->sc_el_bst;
- usbi.usbi_addr = cf->cf_loc[RMIXL_USBICF_ADDR];
- usbi.usbi_size = cf->cf_loc[RMIXL_USBICF_SIZE];
- usbi.usbi_intr = cf->cf_loc[RMIXL_USBICF_INTR];
+ usbi.usbi_addr = cf->cf_loc[XLUSBICF_ADDR];
+ usbi.usbi_size = cf->cf_loc[XLUSBICF_SIZE];
+ usbi.usbi_intr = cf->cf_loc[XLUSBICF_INTR];
usbi.usbi_dmat = sc->sc_dmat;
if (config_match(parent, cf, &usbi) > 0)
