From owner-freebsd-mips@FreeBSD.ORG Fri Jul 15 12:55:47 2011
Return-Path: <owner-freebsd-mips@FreeBSD.ORG>
Delivered-To: freebsd-mips@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 066E9106564A
for <freebsd-mips@freebsd.org>; Fri, 15 Jul 2011 12:55:47 +0000 (UTC)
(envelope-from ray@dlink.ua)
Received: from dlink.ua (smtp.dlink.ua [193.138.187.146])
by mx1.freebsd.org (Postfix) with ESMTP id 839EC8FC08
for <freebsd-mips@freebsd.org>; Fri, 15 Jul 2011 12:55:46 +0000 (UTC)
Received: from gw-lan1.kiev.dlink.ua ([192.168.10.10] helo=terran.dlink.ua)
by dlink.ua with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.63) (envelope-from <ray@dlink.ua>) id 1QhhPL-0002Mj-Gf
for freebsd-mips@freebsd.org; Fri, 15 Jul 2011 15:22:15 +0300
Date: Fri, 15 Jul 2011 15:22:10 +0300
From: Aleksandr Rybalko <ray@dlink.ua>
To: freebsd-mips@freebsd.org
Message-Id: <20110715152210.88db1c98.ray@dlink.ua>
Organization: D-Link
X-Mailer: Sylpheed 2.7.1 (GTK+ 2.20.1; i386-portbld-freebsd8.0)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: dev/flash patch
X-BeenThere: freebsd-mips@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting FreeBSD to MIPS <freebsd-mips.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-mips>,
<mailto:freebsd-mips-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-mips>
List-Post: <mailto:freebsd-mips@freebsd.org>
List-Help: <mailto:freebsd-mips-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-mips>,
<mailto:freebsd-mips-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Jul 2011 12:55:47 -0000
Hi all,
I have proposal to tidy mx25l driver, since he have macro's that called
M25PXX_*. That name match a real(world known) name, but seems renaming
whole driver is bigger pain than use well known for our users.
Please let me know, if someone have objections or opinion differ from
my.
Patch:
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Index: sys/dev/flash/mx25l.c
===================================================================
--- sys/dev/flash/mx25l.c (revision 223926)
+++ sys/dev/flash/mx25l.c (working copy)
@@ -79,14 +79,14 @@
unsigned int sc_flags;
};
-#define M25PXX_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx)
-#define M25PXX_UNLOCK(_sc) mtx_unlock(&
(_sc)->sc_mtx) -#define M25PXX_LOCK_INIT(_sc) \
+#define MX25L_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx)
+#define MX25L_UNLOCK(_sc) mtx_unlock(&
(_sc)->sc_mtx) +#define MX25L_LOCK_INIT(_sc) \
mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->sc_dev), \
"mx25l", MTX_DEF)
-#define M25PXX_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx);
-#define M25PXX_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx,
MA_OWNED); -#define M25PXX_ASSERT_UNLOCKED(_sc) mtx_assert
(&_sc->sc_mtx, MA_NOTOWNED); +#define MX25L_LOCK_DESTROY(_sc)
mtx_destroy(&_sc->sc_mtx); +#define MX25L_ASSERT_LOCKED(_sc)
mtx_assert(&_sc->sc_mtx, MA_OWNED); +#define MX25L_ASSERT_UNLOCKED(_sc)
mtx_assert(&_sc->sc_mtx, MA_NOTOWNED);
/* disk routines */
static int mx25l_open(struct disk *dp);
@@ -356,7 +356,7 @@
sc = device_get_softc(dev);
sc->sc_dev = dev;
- M25PXX_LOCK_INIT(sc);
+ MX25L_LOCK_INIT(sc);
ident = mx25l_get_device_ident(sc);
if (ident == NULL)
@@ -427,10 +427,10 @@
struct mx25l_softc *sc;
sc = (struct mx25l_softc *)bp->bio_disk->d_drv1;
- M25PXX_LOCK(sc);
+ MX25L_LOCK(sc);
bioq_disksort(&sc->sc_bio_queue, bp);
wakeup(sc);
- M25PXX_UNLOCK(sc);
+ MX25L_UNLOCK(sc);
}
static void
@@ -442,14 +442,14 @@
for (;;) {
dev = sc->sc_dev;
- M25PXX_LOCK(sc);
+ MX25L_LOCK(sc);
do {
bp = bioq_first(&sc->sc_bio_queue);
if (bp == NULL)
msleep(sc, &sc->sc_mtx, PRIBIO,
"jobqueue", 0); } while (bp == NULL);
bioq_remove(&sc->sc_bio_queue, bp);
- M25PXX_UNLOCK(sc);
+ MX25L_UNLOCK(sc);
switch (bp->bio_cmd) {
case BIO_READ:
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
--
Alexandr Rybalko <ray@dlink.ua>
aka Alex RAY <ray@ddteam.net>