From owner-p4-projects@FreeBSD.ORG  Tue Jun 19 00:29:35 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 28F9D1065672; Tue, 19 Jun 2012 00:29:35 +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 D4531106566B
	for <perforce@freebsd.org>; Tue, 19 Jun 2012 00:29:34 +0000 (UTC)
	(envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id BCC858FC1F
	for <perforce@freebsd.org>; Tue, 19 Jun 2012 00:29:34 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q5J0TY9N041527
	for <perforce@freebsd.org>; Tue, 19 Jun 2012 00:29:34 GMT
	(envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5J0TY7n041524
	for perforce@freebsd.org; Tue, 19 Jun 2012 00:29:34 GMT
	(envelope-from brooks@freebsd.org)
Date: Tue, 19 Jun 2012 00:29:34 GMT
Message-Id: <201206190029.q5J0TY7n041524@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 213107 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Jun 2012 00:29:35 -0000

http://p4web.freebsd.org/@@213107?ac=10

Change 213107 by brooks@brooks_ecr_current on 2012/06/19 00:28:56

	Allow non-PAGE_SIZE sized and aligned regions as long as they are
	smaller than a page.  This allows us to provide trivial access to things
	like the buttons and switches bytes.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/avgen/altera_avgen.c#4 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/avgen/altera_avgen.c#4 (text+ko) ====

@@ -382,16 +382,18 @@
 		device_printf(dev, "couldn't map memory\n");
 		return (ENXIO);
 	}
-	if (rman_get_size(sc->avg_res) % PAGE_SIZE != 0) {
-		device_printf(dev,
-		    "memory region not even multiple of page size\n");
-		error = ENXIO;
-		goto error;
-	}
-	if (rman_get_start(sc->avg_res) % PAGE_SIZE != 0) {
-		device_printf(dev, "memory region not page-aligned\n");
-		error = ENXIO;
-		goto error;
+	if (rman_get_size(sc->avg_res) >= PAGE_SIZE) {
+		if (rman_get_size(sc->avg_res) % PAGE_SIZE != 0) {
+			device_printf(dev,
+			    "memory region not even multiple of page size\n");
+			error = ENXIO;
+			goto error;
+		}
+		if (rman_get_start(sc->avg_res) % PAGE_SIZE != 0) {
+			device_printf(dev, "memory region not page-aligned\n");
+			error = ENXIO;
+			goto error;
+		}
 	}
 
 	/* Device node allocation. */