Get rid of the remaining vm_offset_t in pci drivers.

7 files changed, 16 insertions, 16 deletions

diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index 65809a09afa..5bf51d3bcc4 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bge.c,v 1.17 2002/11/26 06:01:28 nate Exp $	*/
+/*	$OpenBSD: if_bge.c,v 1.18 2003/01/15 06:31:24 art Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2001
@@ -639,8 +639,8 @@ bge_jfree(buf, size, arg)
 
 	/* calculate the slot this buffer belongs to */
 
-	i = ((vm_offset_t)buf
-	     - (vm_offset_t)sc->bge_cdata.bge_jumbo_buf) / BGE_JLEN;
+	i = ((vaddr_t)buf
+	     - (vaddr_t)sc->bge_cdata.bge_jumbo_buf) / BGE_JLEN;
 
 	if ((i < 0) || (i >= BGE_JSLOTS))
 		panic("bge_jfree: asked to free buffer that we don't manage!");
@@ -1047,7 +1047,7 @@ bge_blockinit(sc)
 {
 	struct bge_rcb		*rcb;
 	struct bge_rcb_opaque	*rcbo;
-	vm_offset_t		rcb_addr;
+	vaddr_t			rcb_addr;
 	int			i;
 
 	/*
diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c
index 3b52d48b07c..f68d46b2597 100644
--- a/sys/dev/pci/if_nge.c
+++ b/sys/dev/pci/if_nge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nge.c,v 1.24 2002/11/26 06:01:28 nate Exp $	*/
+/*	$OpenBSD: if_nge.c,v 1.25 2003/01/15 06:31:24 art Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -1682,7 +1682,7 @@ nge_encap(sc, m_head, txidx)
 				return(ENOBUFS);
 			f = &sc->nge_ldata->nge_tx_list[frag];
 			f->nge_ctl = NGE_CMDSTS_MORE | m->m_len;
-			f->nge_ptr = vtophys(mtod(m, vm_offset_t));
+			f->nge_ptr = vtophys(mtod(m, vaddr_t));
 			DPRINTFN(7,("%s: f->nge_ptr=%#x\n",
 				    sc->sc_dv.dv_xname, f->nge_ptr));
 			if (cnt != 0)
diff --git a/sys/dev/pci/if_sf.c b/sys/dev/pci/if_sf.c
index 45a2dd2e275..5649c231277 100644
--- a/sys/dev/pci/if_sf.c
+++ b/sys/dev/pci/if_sf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sf.c,v 1.18 2002/11/19 18:40:17 jason Exp $ */
+/*	$OpenBSD: if_sf.c,v 1.19 2003/01/15 06:31:24 art Exp $ */
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -1162,7 +1162,7 @@ int sf_encap(sc, c, m_head)
 			if (frag == 0)
 				f->sf_pktlen = m_head->m_pkthdr.len;
 			f->sf_fraglen = m->m_len;
-			f->sf_addr = vtophys(mtod(m, vm_offset_t));
+			f->sf_addr = vtophys(mtod(m, vaddr_t));
 			frag++;
 		}
 	}
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index 449bf29feb7..70016c37cd4 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sk.c,v 1.26 2002/11/26 06:01:28 nate Exp $	*/
+/*	$OpenBSD: if_sk.c,v 1.27 2003/01/15 06:31:24 art Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -1224,7 +1224,7 @@ int sk_encap(sc_if, m_head, txidx)
 			    (sc_if->sk_cdata.sk_tx_cnt + cnt)) < 2)
 				return(ENOBUFS);
 			f = &sc_if->sk_rdata->sk_tx_ring[frag];
-			f->sk_data_lo = vtophys(mtod(m, vm_offset_t));
+			f->sk_data_lo = vtophys(mtod(m, vaddr_t));
 			f->sk_ctl = m->m_len | SK_OPCODE_DEFAULT;
 			if (cnt == 0)
 				f->sk_ctl |= SK_TXCTL_FIRSTFRAG;
diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c
index 7ceb645127d..2592822dc6c 100644
--- a/sys/dev/pci/if_ste.c
+++ b/sys/dev/pci/if_ste.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ste.c,v 1.17 2002/11/19 18:40:17 jason Exp $ */
+/*	$OpenBSD: if_ste.c,v 1.18 2003/01/15 06:31:24 art Exp $ */
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -1389,7 +1389,7 @@ int ste_encap(sc, c, m_head)
 				break;
 			total_len += m->m_len;
 			f = &c->ste_ptr->ste_frags[frag];
-			f->ste_addr = vtophys(mtod(m, vm_offset_t));
+			f->ste_addr = vtophys(mtod(m, vaddr_t));
 			f->ste_len = m->m_len;
 			frag++;
 		}
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index dba8b329874..763e5539256 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tl.c,v 1.28 2002/07/08 14:48:57 itojun Exp $	*/
+/*	$OpenBSD: if_tl.c,v 1.29 2003/01/15 06:31:24 art Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -1479,7 +1479,7 @@ int tl_encap(sc, c, m_head)
 				break;
 			total_len+= m->m_len;
 			c->tl_ptr->tl_frag[frag].tlist_dadr =
-				vtophys(mtod(m, vm_offset_t));
+				vtophys(mtod(m, vaddr_t));
 			c->tl_ptr->tl_frag[frag].tlist_dcnt = m->m_len;
 			frag++;
 		}
diff --git a/sys/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c
index 1f4d8b53fbf..19aef5700aa 100644
--- a/sys/dev/pci/if_wb.c
+++ b/sys/dev/pci/if_wb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wb.c,v 1.19 2002/11/19 18:40:17 jason Exp $	*/
+/*	$OpenBSD: if_wb.c,v 1.20 2003/01/15 06:31:24 art Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -1353,7 +1353,7 @@ int wb_encap(sc, c, m_head)
 			} else
 				f->wb_status = WB_TXSTAT_OWN;
 			f->wb_next = vtophys(&c->wb_ptr->wb_frag[frag + 1]);
-			f->wb_data = vtophys(mtod(m, vm_offset_t));
+			f->wb_data = vtophys(mtod(m, vaddr_t));
 			frag++;
 		}
 	}