Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 May 2007 23:04:17 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 119939 for review
Message-ID:  <200705162304.l4GN4HMu051695@repoman.freebsd.org>

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

Change 119939 by imp@imp_lighthouse on 2007/05/16 23:04:10

	Try harder.

Affected files ...

.. //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile#2 edit
.. //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile.inc#3 edit
.. //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile.inc0#6 edit
.. //depot/projects/arm/src/sys/arm/at91/at91_pio.c#28 edit
.. //depot/projects/arm/src/sys/arm/at91/uart_bus_at91usart.c#10 edit
.. //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#11 edit
.. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#42 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/boot2/tsc_board.c#8 edit
.. //depot/projects/arm/src/sys/conf/options.arm#22 edit
.. //depot/projects/arm/src/sys/dev/ath/if_ath.c#26 edit
.. //depot/projects/arm/src/sys/dev/mmc/mmc.c#23 edit
.. //depot/projects/arm/src/sys/kern/subr_bus.c#20 edit
.. //depot/projects/arm/src/sys/modules/Makefile#43 edit
.. //depot/projects/usb/src/sys/dev/usb/ugen.c#15 edit
.. //depot/user/imp/freebsd-imp/usr.sbin/pccard/Makefile#4 edit
.. //depot/user/imp/newcard/dev/usb/umass.c#71 edit
.. //depot/user/imp/newcard/dev/usb/usbdevs#126 edit

Differences ...

==== //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile#2 (text+ko) ====


==== //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile.inc#3 (text+ko) ====


==== //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile.inc0#6 (text+ko) ====

@@ -6,7 +6,7 @@
 
 VERSION=	"2.15 [FreeBSD] 2004-05-23"
 
-TARGET_ARCH?=	${MACHINE_CPU}
+TARGET_ARCH?=	${MACHINE_ARCH}
 .if ${TARGET_ARCH} == "amd64"
 BINUTILS_ARCH=x86_64
 .else

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

@@ -240,7 +240,7 @@
 	/* Reading the status also clears the interrupt */
 	status = RD4(sc, PIO_ISR) & RD4(sc, PIO_IMR);
 	if (status == 0)
-		return;
+		return (FILTER_STRAY);
 	AT91_PIO_LOCK(sc);
 	i = 0;
 	while (status) {

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


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

@@ -79,6 +79,10 @@
 	di->parity = UART_PARITY_NONE;
 	uart_bus_space_io = &at91_bs_tag;
 	uart_bus_space_mem = NULL;
+#if 0
 	/* Check the environment for overrides */
 	return (uart_getenv(devtype, di, class));
+#else
+	return 0;
+#endif
 }

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


==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/tsc_board.c#8 (text+ko) ====

@@ -11,10 +11,6 @@
 
 unsigned char mac[6] = { 0x42, 0x53, 0x44, 0, 0, 1 };
 
-#define KLUDGE_STRAP
-#define TSC_FPGA
-
-#ifdef TSC_FPGA
 #include "at91rm9200.h"
 #include "spi_flash.h"
 #include "fpga.h"
@@ -38,6 +34,7 @@
 	int len, off, i, offset;
 	char *addr = buffer;
 
+	printf("Loading fpga...");
 	len = FPGA_LEN;
 	offset = FPGA_OFFSET;
 	for (i = 0; i < len; i+= FLASH_PAGE_SIZE) {
@@ -48,92 +45,40 @@
 	fpga_clear(&main_fpga);
 	fpga_write_bytes(&main_fpga, addr, len);
 	fpga_done(&main_fpga);
+	printf("done\n");
 }
-#endif
 
 static void
 MacFromEE()
 {	
-#if 0
 	uint32_t sig;
-#ifdef KLUDGE_STRAP
-	uint8_t euid64[8] = { 0x00, 0x30, 0x96, 0x20,
-			      0x00, 0x00, 0x00, 0x03 };
-#endif
 
-#ifdef KLUDGE_STRAP
-	printf("writing...\n");
-	sig = 0xaa55aa55;
-	EEWrite(0, (uint8_t *)&sig, sizeof(sig));
-	printf("euid64\n");
-	EEWrite(48, euid64, sizeof(euid64));
-	printf("done\n");
-#endif
 	sig = 0;
 	EERead(0, (uint8_t *)&sig, sizeof(sig));
 	if (sig != 0xaa55aa55)
 		return;
 	EERead(48, mac, 3);
 	EERead(48+5, mac+3, 3);
-#else
-	mac[0] = 0;
-	mac[1] = 0x30;
-	mac[2] = 0x96;
-	mac[3] = 0;
-	mac[4] = 0;
-	mac[5] = 3;
-#endif
 	printf("MAC %x:%x:%x:%x:%x:%x\n", mac[0],
 	  mac[1], mac[2], mac[3], mac[4], mac[5]);
 }
 
-#ifdef XMODEM_DL
-#define FLASH_OFFSET (0 * FLASH_PAGE_SIZE)
-#define FPGA_OFFSET  (15 * FLASH_PAGE_SIZE)
-#define FPGA_LEN     (212608)
-#define KERNEL_OFFSET (220 * FLASH_PAGE_SIZE)
-#define KERNEL_LEN (6 * 1024 * FLASH_PAGE_SIZE)
-
-static void
-UpdateFlash(int offset)
-{
-	char *addr = (char *)0x20000000 + (1 << 20); /* Load to base + 1MB */
-	int len, i, off;
-
-	while ((len = xmodem_rx(addr)) == -1)
-		continue;
-	printf("\nDownloaded %u bytes.\n", len);
-	for (i = 0; i < len; i+= FLASH_PAGE_SIZE) {
-		off = i + offset;
-		SPI_WriteFlash(off, addr + i, FLASH_PAGE_SIZE);
-	}
-}
 void
 Update(void)
 {
-	UpdateFlash(FLASH_OFFSET);
 }
 
-#else
-void
-Update(void)
-{
-}
-#endif
-
 void
 board_init(void)
 {
-#ifdef TSC_FPGA
-    SPI_InitFlash();
-    fpga_load();
-#endif
-    EEInit();
-    MacFromEE();
-    EMAC_Init();
-    sdcard_init();
-    EMAC_SetMACAddress(mac);
-
+	while (!sdcard_init())
+		printf("Probing for SD card...\n");
+	SPI_InitFlash();
+	fpga_load();
+	EEInit();
+	MacFromEE();
+	EMAC_Init();
+	EMAC_SetMACAddress(mac);
 }
 
 #include "../bootspi/ee.c"

==== //depot/projects/arm/src/sys/conf/options.arm#22 (text+ko) ====

@@ -8,6 +8,9 @@
 CPU_SA1100		opt_global.h
 CPU_SA1110		opt_global.h
 CPU_ARM9		opt_global.h
+CPU_ARM9E		opt_global.h
+CPU_ARM10		opt_global.h
+CPU_ARM11		opt_global.h
 CPU_XSCALE_80321	opt_global.h
 CPU_XSCALE_80219	opt_global.h
 CPU_XSCALE_IXP425	opt_global.h

==== //depot/projects/arm/src/sys/dev/ath/if_ath.c#26 (text+ko) ====

@@ -653,6 +653,7 @@
 		__func__, ifp->if_flags);
 
 	ath_stop(ifp);
+	printf("bpfdetach\n");
 	bpfdetach(ifp);
 	/* 
 	 * NB: the order of these is important:
@@ -666,17 +667,23 @@
 	 *   it last
 	 * Other than that, it's straightforward...
 	 */
+	printf("ieee80211_ifdetach\n");
 	ieee80211_ifdetach(&sc->sc_ic);
 #ifdef ATH_TX99_DIAG
 	if (sc->sc_tx99 != NULL)
 		sc->sc_tx99->detach(sc->sc_tx99);
 #endif
 	taskqueue_free(sc->sc_tq);
+printf("ath_rate_detach\n");
 	ath_rate_detach(sc->sc_rc);
+printf("ath_desc_free\n");
 	ath_desc_free(sc);
+printf("ath_tx_cleanup\n");
 	ath_tx_cleanup(sc);
+printf("ath_hal_detach\n");
 	ath_hal_detach(sc->sc_ah);
 	if_free(ifp);
+	printf("ath_Detach returns\n");
 
 	return 0;
 }
@@ -1046,6 +1053,7 @@
 		if (sc->sc_tx99 != NULL)
 			sc->sc_tx99->stop(sc->sc_tx99);
 #endif
+		printf("b4 new_state\n");
 		ieee80211_new_state(ic, IEEE80211_S_INIT, -1);
 		ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 		ifp->if_timer = 0;
@@ -1056,8 +1064,10 @@
 					!sc->sc_ledon);
 				sc->sc_blinking = 0;
 			}
+			printf("hal_intrset\n");
 			ath_hal_intrset(ah, 0);
 		}
+		printf("ath_draintxq\n");
 		ath_draintxq(sc);
 		if (!sc->sc_invalid) {
 			ath_stoprecv(sc);
@@ -1065,8 +1075,10 @@
 		} else
 			sc->sc_rxlink = NULL;
 		IFQ_DRV_PURGE(&ifp->if_snd);
+		printf("ath_beacon_free\n");
 		ath_beacon_free(sc);
 	}
+	printf("ath_stop returns\n");
 }
 
 static void
@@ -2285,6 +2297,7 @@
 	struct ath_buf *bf;
 
 	STAILQ_FOREACH(bf, &sc->sc_bbuf, bf_list) {
+		printf("feeing bf %p\n", bf);
 		if (bf->bf_m != NULL) {
 			bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap);
 			m_freem(bf->bf_m);
@@ -3326,9 +3339,11 @@
 ath_tx_cleanupq(struct ath_softc *sc, struct ath_txq *txq)
 {
 
-	ath_hal_releasetxqueue(sc->sc_ah, txq->axq_qnum);
+	printf("Releasing...");
+/*	ath_hal_releasetxqueue(sc->sc_ah, txq->axq_qnum); */
 	ATH_TXQ_LOCK_DESTROY(txq);
 	sc->sc_txqsetup &= ~(1<<txq->axq_qnum);
+	printf("done");
 }
 
 /*
@@ -3340,9 +3355,12 @@
 	int i;
 
 	ATH_TXBUF_LOCK_DESTROY(sc);
-	for (i = 0; i < HAL_NUM_TX_QUEUES; i++)
+	for (i = 0; i < HAL_NUM_TX_QUEUES; i++) {
+		printf("%d: ", i);
 		if (ATH_TXQ_SETUP(sc, i))
 			ath_tx_cleanupq(sc, &sc->sc_txq[i]);
+		printf("\n");
+	}
 	ATH_TXQ_LOCK_DESTROY(&sc->sc_mcastq);
 }
 

==== //depot/projects/arm/src/sys/dev/mmc/mmc.c#23 (text+ko) ====

@@ -347,7 +347,7 @@
 	cmd.arg = ocr;
 	cmd.flags = MMC_RSP_R3 | MMC_CMD_BCR;
 
-	for (i = 0; i < 10; i++) {
+	for (i = 0; i < 100; i++) {
 		err = mmc_wait_for_app_cmd(sc, 0, &cmd, CMD_RETRIES);
 		if (err != MMC_ERR_NONE)
 			break;

==== //depot/projects/arm/src/sys/kern/subr_bus.c#20 (text+ko) ====


==== //depot/projects/arm/src/sys/modules/Makefile#43 (text+ko) ====

@@ -15,7 +15,6 @@
 	aic7xxx \
 	aio \
 	${_amd} \
-	amr \
 	${_an} \
 	${_aout} \
 	${_apm} \

==== //depot/projects/usb/src/sys/dev/usb/ugen.c#15 (text+ko) ====

@@ -55,8 +55,8 @@
 #include <sys/filio.h>
 #include <sys/tty.h>
 #include <sys/file.h>
-#include <sys/vnode.h>
 #include <sys/poll.h>
+#include <sys/uio.h>
 
 #include <dev/usb/usb_port.h>
 #include <dev/usb/usb.h>
@@ -1008,6 +1008,7 @@
 			        /* let application process data */
 			        break;
 			    }
+#if 0
 			    if(flag & IO_NDELAY)
 			    {
 			        if(n)
@@ -1016,7 +1017,7 @@
 				}
 				break;
 			    }
-
+#endif
 			    /* wait for data */
 
 			    sce->state |= (UGEN_RD_SLP|UGEN_RD_WUP);
@@ -1233,7 +1234,7 @@
 				 */
 				usbd_transfer_start(sce->xfer_out[0]);
 				usbd_transfer_start(sce->xfer_out[1]);
-
+#if 0
 				if(flag & IO_NDELAY)
 				{
 					if(n)
@@ -1242,7 +1243,7 @@
 					}
 					break;
 				}
-
+#endif
 				sce->state |= (UGEN_WR_SLP|UGEN_WR_WUP);
 
 				error = mtx_sleep(sce, &sc->sc_mtx, (PZERO|PCATCH),

==== //depot/user/imp/freebsd-imp/usr.sbin/pccard/Makefile#4 (text+ko) ====

@@ -1,6 +1,6 @@
 # Makefile for pccardc/pccardd.
 # $FreeBSD: src/usr.sbin/pccard/Makefile,v 1.8 2006/10/18 21:09:43 imp Exp $
 
-SUBDIR=	dumpcis
+SUBDIR=
 
 .include <bsd.subdir.mk>

==== //depot/user/imp/newcard/dev/usb/umass.c#71 (text+ko) ====

@@ -129,6 +129,7 @@
 
 #include <cam/cam_periph.h>
 
+#define USB_DEBUG
 #ifdef USB_DEBUG
 #define DIF(m, x)	if (umassdebug & (m)) do { x ; } while (0)
 #define	DPRINTF(m, x)	if (umassdebug & (m)) logprintf x
@@ -142,7 +143,7 @@
 #define UDMASS_CBI	0x00400000	/* CBI transfers */
 #define UDMASS_WIRE	(UDMASS_BBB|UDMASS_CBI)
 #define UDMASS_ALL	0xffff0000	/* all of the above */
-int umassdebug = 0;
+int umassdebug = UDMASS_ALL;
 SYSCTL_NODE(_hw_usb, OID_AUTO, umass, CTLFLAG_RW, 0, "USB umass");
 SYSCTL_INT(_hw_usb_umass, OID_AUTO, debug, CTLFLAG_RW,
 	   &umassdebug, 0, "umass debug level");

==== //depot/user/imp/newcard/dev/usb/usbdevs#126 (text+ko) ====




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