removed:

        CLBYTES PD_SHIFT PGSHIFT NBPG PGOFSET CLSIZELOG2 CLSIZE pdei()
        ptei() kvtopte() ptetov() ispt() ptetoav() &c &c
new:
        NPDEPG

Major macro cleanup.

4 files changed, 20 insertions, 16 deletions

diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index 072e184..73832f2 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_de.c,v 1.43 1996/02/06 18:51:23 wollman Exp $
+ * $Id: if_de.c,v 1.44 1996/03/23 19:29:09 fenner Exp $
  *
  */
 
@@ -1301,7 +1301,7 @@ tulip_start(
 	do {
 	    int len = m0->m_len;
 	    caddr_t addr = mtod(m0, caddr_t);
-	    unsigned clsize = CLBYTES - (((u_long) addr) & (CLBYTES-1));
+	    unsigned clsize = PAGE_SIZE - (((u_long) addr) & (PAGE_SIZE-1));
 
 	    next_m0 = m0->m_next;
 	    while (len > 0) {
@@ -1340,7 +1340,7 @@ tulip_start(
 		d_status = TULIP_DSTS_OWNER;
 		len -= slen;
 		addr += slen;
-		clsize = CLBYTES;
+		clsize = PAGE_SIZE;
 	    }
 	} while ((m0 = next_m0) != NULL);
 
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index f9b8257..cebdcb7 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: ncr.c,v 1.69 1996/03/31 03:17:50 gibbs Exp $
+**  $Id: ncr.c,v 1.70 1996/04/07 17:32:33 bde Exp $
 **
 **  Device driver for the   NCR 53C810   PCI-SCSI-Controller.
 **
@@ -147,10 +147,10 @@
 
 /*
 **    The maximum transfer length (should be >= 64k).
-**    MUST NOT be greater than (MAX_SCATTER-1) * NBPG.
+**    MUST NOT be greater than (MAX_SCATTER-1) * PAGE_SIZE.
 */
 
-#define MAX_SIZE  ((MAX_SCATTER-1) * (long) NBPG)
+#define MAX_SIZE  ((MAX_SCATTER-1) * (long) PAGE_SIZE)
 
 /*
 **	other
@@ -1254,7 +1254,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 
 static char ident[] =
-	"\n$Id: ncr.c,v 1.69 1996/03/31 03:17:50 gibbs Exp $\n";
+	"\n$Id: ncr.c,v 1.70 1996/04/07 17:32:33 bde Exp $\n";
 
 static u_long	ncr_version = NCR_VERSION	* 11
 	+ (u_long) sizeof (struct ncb)	*  7
@@ -6425,7 +6425,7 @@ static	int	ncr_scatter
 
 	free = MAX_SCATTER - 1;
 
-	if (vaddr & (NBPG-1)) free -= datalen / NBPG;
+	if (vaddr & (PAGE_SIZE-1)) free -= datalen / PAGE_SIZE;
 
 	if (free>1)
 		while ((chunk * free >= 2 * datalen) && (chunk>=1024))
@@ -6454,7 +6454,7 @@ static	int	ncr_scatter
 			/*
 			**	continue this segment
 			*/
-			pnext = (paddr & (~(NBPG - 1))) + NBPG;
+			pnext = (paddr & (~(PAGE_SIZE - 1))) + PAGE_SIZE;
 
 			/*
 			**	Compute max size
diff --git a/sys/pci/pdq_os.h b/sys/pci/pdq_os.h
index 6176a09..7968d0e 100644
--- a/sys/pci/pdq_os.h
+++ b/sys/pci/pdq_os.h
@@ -21,9 +21,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pdq_os.h,v 1.5 1995/12/07 12:47:43 davidg Exp $
+ * $Id: pdq_os.h,v 1.6 1996/01/30 22:59:57 mpp Exp $
  *
  * $Log: pdq_os.h,v $
+ * Revision 1.6  1996/01/30  22:59:57  mpp
+ * Fix a bunch of spelling errors in the comment fields of
+ * a bunch of system include files.
+ *
  * Revision 1.5  1995/12/07 12:47:43  davidg
  * Untangled the vm.h include file spaghetti.
  *
@@ -97,7 +101,7 @@
 #define	PDQ_OS_PREFIX			"%s%d: "
 #define	PDQ_OS_PREFIX_ARGS		pdq->pdq_os_name, pdq->pdq_unit
 
-#define	PDQ_OS_PAGESIZE			NBPG
+#define	PDQ_OS_PAGESIZE			PAGE_SIZE
 #define	PDQ_OS_USEC_DELAY(n)		DELAY(n)
 #define	PDQ_OS_MEMZERO(p, n)		bzero((caddr_t)(p), (n))
 #define	PDQ_OS_VA_TO_PA(p)		vtophys(p)
diff --git a/sys/pci/wd82371.c b/sys/pci/wd82371.c
index e92248c..72ceb19 100644
--- a/sys/pci/wd82371.c
+++ b/sys/pci/wd82371.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: wd82371.c,v 1.2 1996/01/30 19:04:09 wollman Exp $
+ *	$Id: wd82371.c,v 1.3 1996/04/07 17:39:17 bde Exp $
  */
 
 #include "pci.h"
@@ -189,11 +189,11 @@ piix_dmasetup(void *xcp, char *vaddr, u_long count, int dir)
 	 * Deal with transfers that don't start on a page
 	 * boundary.
 	 */
-	pgresid = (u_long)vaddr % NBPG;
+	pgresid = (u_long)vaddr % PAGE_SIZE;
 	if (pgresid) {
 		prd[i].prd_base = vtophys(vaddr);
-		if (count >= (NBPG - pgresid))
-			prd[i].prd_count = NBPG - pgresid;
+		if (count >= (PAGE_SIZE - pgresid))
+			prd[i].prd_count = PAGE_SIZE - pgresid;
 		else
 			prd[i].prd_count = count;
 		vaddr += prd[i].prd_count;
@@ -210,7 +210,7 @@ piix_dmasetup(void *xcp, char *vaddr, u_long count, int dir)
 		u_long phys, n;
 
 		phys = vtophys(vaddr);
-		n = (count > NBPG) ? NBPG : count;
+		n = (count > PAGE_SIZE) ? PAGE_SIZE : count;
 		/*
 		 * If the current page is physically contiguous with
 		 * whatever we have in the previous PRD, just tack it