From owner-p4-projects@FreeBSD.ORG Sat Apr 18 15:14:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 380581065AEC; Sat, 18 Apr 2009 15:14:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9C7BC1065AD6 for ; Sat, 18 Apr 2009 15:14:49 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8912D8FC12 for ; Sat, 18 Apr 2009 15:14:49 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3IFEncl041186 for ; Sat, 18 Apr 2009 15:14:49 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3IFEnU3041184 for perforce@freebsd.org; Sat, 18 Apr 2009 15:14:49 GMT (envelope-from lulf@FreeBSD.org) Date: Sat, 18 Apr 2009 15:14:49 GMT Message-Id: <200904181514.n3IFEnU3041184@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 160784 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Apr 2009 15:14:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=160784 Change 160784 by lulf@lulf_carrot on 2009/04/18 15:13:54 - s/atmel/ATMEL on macros - Move non-at91 specific headers out. Affected files ... .. //depot/projects/avr32/src/sys/arm/at91/at91_mci.c#3 delete .. //depot/projects/avr32/src/sys/arm/at91/at91_mcireg.h#2 delete .. //depot/projects/avr32/src/sys/arm/at91/at91_pdcreg.h#2 delete .. //depot/projects/avr32/src/sys/dev/mmc/atmel_mci.c#4 edit .. //depot/projects/avr32/src/sys/dev/mmc/atmel_mcireg.h#1 add .. //depot/projects/avr32/src/sys/dev/mmc/atmel_pdcreg.h#1 add Differences ... ==== //depot/projects/avr32/src/sys/dev/mmc/atmel_mci.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/atmel/at91_mci.c,v 1.13 2009/01/21 17:39:11 imp Exp $"); +__FBSDID("$FreeBSD$"); #include #include @@ -53,10 +53,8 @@ #include #include #include -#include -#include -#include -#include +#include +#include #include #include #include @@ -110,14 +108,14 @@ static int atmel_mci_activate(device_t dev); static void atmel_mci_deactivate(device_t dev); -#define atmel_MCI_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) -#define atmel_MCI_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) -#define atmel_MCI_LOCK_INIT(_sc) \ +#define ATMEL_MCI_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) +#define ATMEL_MCI_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) +#define ATMEL_MCI_LOCK_INIT(_sc) \ mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->dev), \ "mci", MTX_DEF) -#define atmel_MCI_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); -#define atmel_MCI_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); -#define atmel_MCI_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); +#define ATMEL_MCI_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); +#define ATMEL_MCI_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); +#define ATMEL_MCI_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); static void atmel_mci_pdc_disable(struct atmel_mci_softc *sc) @@ -175,7 +173,7 @@ if (err) goto out; - atmel_MCI_LOCK_INIT(sc); + ATMEL_MCI_LOCK_INIT(sc); /* * Allocate DMA tags and maps @@ -198,7 +196,7 @@ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, NULL, atmel_mci_intr, sc, &sc->intrhand); if (err) { - atmel_MCI_LOCK_DESTROY(sc); + ATMEL_MCI_LOCK_DESTROY(sc); goto out; } mci_clockfreq = devclk_get_rate(dev); @@ -347,10 +345,10 @@ if (!data) { // The no data case is fairly simple atmel_mci_pdc_disable(sc); - printf("CMDR %x ARGR %x\n", cmdr, cmd->arg); + //avr32_debug("CMDR %x ARGR %x\n", cmdr, cmd->arg); WR4(sc, MCI_ARGR, cmd->arg); WR4(sc, MCI_CMDR, cmdr); - WR4(sc, MCI_IER, 0xffffffff); //MCI_SR_ERROR | MCI_SR_CMDRDY); + WR4(sc, MCI_IER, MCI_SR_ERROR | MCI_SR_CMDRDY); return; } if (data->flags & MMC_DATA_READ) @@ -451,18 +449,18 @@ { struct atmel_mci_softc *sc = device_get_softc(brdev); - atmel_MCI_LOCK(sc); + ATMEL_MCI_LOCK(sc); // XXX do we want to be able to queue up multiple commands? // XXX sounds like a good idea, but all protocols are sync, so // XXX maybe the idea is naive... if (sc->req != NULL) { - atmel_MCI_UNLOCK(sc); + ATMEL_MCI_UNLOCK(sc); return EBUSY; } sc->req = req; sc->flags = 0; atmel_mci_start(sc); - atmel_MCI_UNLOCK(sc); + ATMEL_MCI_UNLOCK(sc); return (0); } @@ -478,11 +476,11 @@ struct atmel_mci_softc *sc = device_get_softc(brdev); int err = 0; - atmel_MCI_LOCK(sc); + ATMEL_MCI_LOCK(sc); while (sc->bus_busy) msleep(sc, &sc->sc_mtx, PZERO, "mciah", hz / 5); sc->bus_busy++; - atmel_MCI_UNLOCK(sc); + ATMEL_MCI_UNLOCK(sc); return (err); } @@ -491,10 +489,10 @@ { struct atmel_mci_softc *sc = device_get_softc(brdev); - atmel_MCI_LOCK(sc); + ATMEL_MCI_LOCK(sc); sc->bus_busy--; wakeup(sc); - atmel_MCI_UNLOCK(sc); + ATMEL_MCI_UNLOCK(sc); return (0); } @@ -539,7 +537,7 @@ int i, done = 0; struct mmc_command *cmd; - atmel_MCI_LOCK(sc); + ATMEL_MCI_LOCK(sc); sr = RD4(sc, MCI_SR) & RD4(sc, MCI_IMR); // printf("i 0x%x\n", sr); cmd = sc->curcmd; @@ -612,7 +610,7 @@ } atmel_mci_start(sc); } - atmel_MCI_UNLOCK(sc); + ATMEL_MCI_UNLOCK(sc); } static int