diff options
| author | Can Erkin Acar <canacar@cvs.openbsd.org> | 2004-10-30 15:48:16 +0000 |
|---|---|---|
| committer | Can Erkin Acar <canacar@cvs.openbsd.org> | 2004-10-30 15:48:16 +0000 |
| commit | 17f05c9c30249a157d57728492dd228d655c1b69 (patch) | |
| tree | bb907900313d8c274ae0a3e55bd46cd11ee4afed /sys | |
| parent | 604250d7b14516744bb6928280f71b9a42263aa4 (diff) | |
vaddr_t casts for vtophys, works on amd64, enabled in GENERIC
patch submitted and tested by Steffen Schütz, schuetz.steffen at melle de
ok tedu@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_ste.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 39dc1683b3a..198ec21e615 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.32 2004/10/13 03:58:07 brad Exp $ +# $OpenBSD: GENERIC,v 1.33 2004/10/30 15:48:15 canacar Exp $ # # GENERIC -- everything that's currently supported # @@ -274,7 +274,7 @@ vr* at pci? # VIA Rhine ethernet #wb* at pci? # Winbond W89C840F ethernet sf* at pci? # Adaptec AIC-6915 ethernet sis* at pci? # SiS 900/7016 ethernet -#ste* at pci? # Sundance ST201 ethernet +ste* at pci? # Sundance ST201 ethernet dc* at pci? # 21143, "tulip" clone ethernet #dc* at cardbus? # 21143, "tulip" clone ethernet ti* at pci? # Alteon Tigon 1Gb ethernet diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c index b013a358708..30e0849451c 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.25 2004/09/23 17:45:16 brad Exp $ */ +/* $OpenBSD: if_ste.c,v 1.26 2004/10/30 15:48:15 canacar Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -1014,7 +1014,7 @@ int ste_newbuf(sc, c, m) c->ste_mbuf = m_new; c->ste_ptr->ste_status = 0; - c->ste_ptr->ste_frag.ste_addr = vtophys(mtod(m_new, caddr_t)); + c->ste_ptr->ste_frag.ste_addr = vtophys(mtod(m_new, vaddr_t)); c->ste_ptr->ste_frag.ste_len = 1536 | STE_FRAG_LAST; return(0); @@ -1038,12 +1038,12 @@ int ste_init_rx_list(sc) cd->ste_rx_chain[i].ste_next = &cd->ste_rx_chain[0]; ld->ste_rx_list[i].ste_next = - vtophys(&ld->ste_rx_list[0]); + vtophys((vaddr_t)&ld->ste_rx_list[0]); } else { cd->ste_rx_chain[i].ste_next = &cd->ste_rx_chain[i + 1]; ld->ste_rx_list[i].ste_next = - vtophys(&ld->ste_rx_list[i + 1]); + vtophys((vaddr_t)&ld->ste_rx_list[i + 1]); } ld->ste_rx_list[i].ste_status = 0; } @@ -1064,7 +1064,7 @@ void ste_init_tx_list(sc) ld = sc->ste_ldata; for (i = 0; i < STE_TX_LIST_CNT; i++) { cd->ste_tx_chain[i].ste_ptr = &ld->ste_tx_list[i]; - cd->ste_tx_chain[i].ste_phys = vtophys(&ld->ste_tx_list[i]); + cd->ste_tx_chain[i].ste_phys = vtophys((vaddr_t)&ld->ste_tx_list[i]); if (i == (STE_TX_LIST_CNT - 1)) cd->ste_tx_chain[i].ste_next = &cd->ste_tx_chain[0]; @@ -1148,7 +1148,7 @@ void ste_init(xsc) STE_SETBIT4(sc, STE_DMACTL, STE_DMACTL_RXDMA_STALL); ste_wait(sc); CSR_WRITE_4(sc, STE_RX_DMALIST_PTR, - vtophys(&sc->ste_ldata->ste_rx_list[0])); + vtophys((vaddr_t)&sc->ste_ldata->ste_rx_list[0])); STE_SETBIT4(sc, STE_DMACTL, STE_DMACTL_RXDMA_UNSTALL); STE_SETBIT4(sc, STE_DMACTL, STE_DMACTL_RXDMA_UNSTALL); @@ -1457,7 +1457,7 @@ void ste_start(ifp) ste_wait(sc); CSR_WRITE_4(sc, STE_TX_DMALIST_PTR, - vtophys(&sc->ste_ldata->ste_tx_list[0])); + vtophys((vaddr_t)&sc->ste_ldata->ste_tx_list[0])); /* Set TX polling interval to start TX engine */ CSR_WRITE_1(sc, STE_TX_DMAPOLL_PERIOD, 64); |