Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 15 Feb 2006 00:10:35 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 91773 for review
Message-ID:  <200602150010.k1F0AZT3049823@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=91773

Change 91773 by imp@imp_Speedy on 2006/02/15 00:09:48

	Add usb to config file, tweaks to ohci and checkpoint

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/at91_pmcreg.h#1 add
.. //depot/projects/arm/src/sys/arm/at91/files.at91rm92#11 edit
.. //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#5 edit
.. //depot/projects/arm/src/sys/arm/conf/KB920X#19 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/files.at91rm92#11 (text+ko) ====

@@ -2,16 +2,16 @@
 arm/arm/cpufunc_asm_arm9.S	standard
 arm/arm/irq_dispatch.S		standard
 arm/at91/at91.c			standard
+arm/at91/at91_pmc.c		standard
 arm/at91/at91_st.c		standard
-arm/at91/uart_bus_at91usart.c	optional	uart
-arm/at91/uart_cpu_at91rm9200usart.c	optional	uart
-arm/at91/uart_dev_at91usart.c	optional	uart
-arm/at91/if_ate.c		optional	ate
 arm/at91/at91_mci.c		optional	at91_mci
 arm/at91/at91_pio.c		optional	at91_pio
-arm/at91/at91_pmc.c		optional	at91_pmc
 arm/at91/at91_ssc.c		optional	at91_ssc
 arm/at91/at91_spi.c		optional	at91_spi
 arm/at91/at91_twi.c		optional	at91_twi
 arm/at91/at91_udp.c		optional	at91_udp
+arm/at91/if_ate.c		optional	ate
 arm/at91/ohci_atmelarm.c	optional	ohci
+arm/at91/uart_bus_at91usart.c	optional	uart
+arm/at91/uart_cpu_at91rm9200usart.c	optional	uart
+arm/at91/uart_dev_at91usart.c	optional	uart

==== //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#5 (text+ko) ====

@@ -69,7 +69,6 @@
 	sc->io_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
 	    RF_ACTIVE);
 	if (sc->io_res == NULL) {
-	    printf("1\n");
 		err = ENOMEM;
 		goto error;
 	}
@@ -80,13 +79,11 @@
 	sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	    RF_ACTIVE);
 	if (sc->irq_res == NULL) {
-	    printf("2\n");
 		err = ENOMEM;
 		goto error;
 	}
 	sc->sc_bus.bdev = device_add_child(dev, "usb", -1);
 	if (sc->sc_bus.bdev == NULL) {
-	    printf("3\n");
 		err = ENOMEM;
 		goto error;
 	}
@@ -95,7 +92,6 @@
 	err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_BIO, ohci_intr, sc,
 	    &sc->ih);
 	if (err) {
-	    printf("4\n");
 		err = ENXIO;
 		goto error;
 	}

==== //depot/projects/arm/src/sys/arm/conf/KB920X#19 (text+ko) ====

@@ -73,6 +73,13 @@
 device		mii
 device		lxtphy
 
+# USB support
+device		ohci		# OHCI PCI->USB interface
+device		usb		# USB Bus (required)
+device		umass		# Disks/Mass storage - Requires scbus and da
+device		scbus		# SCSI bus (required for SCSI)
+device		da		# Direct Access (disks)
+
 # Debugging for use in -current
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602150010.k1F0AZT3049823>