diff options
-rw-r--r-- | sys/dev/sk/if_skreg.h | 5 | ||||
-rw-r--r-- | sys/dev/ti/if_tireg.h | 7 | ||||
-rw-r--r-- | sys/pci/if_axreg.h | 5 | ||||
-rw-r--r-- | sys/pci/if_skreg.h | 5 | ||||
-rw-r--r-- | sys/pci/if_tireg.h | 7 | ||||
-rw-r--r-- | sys/pci/if_tlreg.h | 5 |
6 files changed, 14 insertions, 20 deletions
diff --git a/sys/dev/sk/if_skreg.h b/sys/dev/sk/if_skreg.h index eebffcd..f03aeff 100644 --- a/sys/dev/sk/if_skreg.h +++ b/sys/dev/sk/if_skreg.h @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_skreg.h,v 1.33 1999/07/14 21:48:19 wpaul Exp $ + * $Id: if_skreg.h,v 1.5 1999/07/23 02:06:56 wpaul Exp $ */ /* @@ -1167,6 +1167,5 @@ struct sk_if_softc { #ifdef __alpha__ #undef vtophys -#define vtophys(va) (pmap_kextract(((vm_offset_t) (va))) \ - + 1*1024*1024*1024) +#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)va) #endif diff --git a/sys/dev/ti/if_tireg.h b/sys/dev/ti/if_tireg.h index 0b2cf10..95db390 100644 --- a/sys/dev/ti/if_tireg.h +++ b/sys/dev/ti/if_tireg.h @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_tireg.h,v 1.46 1999/07/05 19:20:31 wpaul Exp wpaul $ + * $Id: if_tireg.h,v 1.6 1999/07/23 02:10:11 wpaul Exp $ */ /* @@ -1176,9 +1176,8 @@ struct ti_softc { TI_CLRBIT(sc, TI_MISC_LOCAL_CTL, TI_MLC_EE_TXEN); /* Disable xmit. */ \ TI_CLRBIT(sc, TI_MISC_LOCAL_CTL, TI_MLC_EE_CLK); /* Pull clock low again */ + #ifdef __alpha__ #undef vtophys -#define vtophys(va) (pmap_kextract(((vm_offset_t) (va))) \ - + 1*1024*1024*1024) +#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)va) #endif - diff --git a/sys/pci/if_axreg.h b/sys/pci/if_axreg.h index 02dc782..294d2ce 100644 --- a/sys/pci/if_axreg.h +++ b/sys/pci/if_axreg.h @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_axreg.h,v 1.5 1999/04/08 17:42:47 wpaul Exp $ + * $Id: if_axreg.h,v 1.6 1999/05/06 15:32:43 wpaul Exp $ */ /* @@ -567,6 +567,5 @@ struct ax_softc { #ifdef __alpha__ #undef vtophys -#define vtophys(va) (pmap_kextract(((vm_offset_t) (va))) \ - + 1*1024*1024*1024) +#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)va) #endif diff --git a/sys/pci/if_skreg.h b/sys/pci/if_skreg.h index eebffcd..f03aeff 100644 --- a/sys/pci/if_skreg.h +++ b/sys/pci/if_skreg.h @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_skreg.h,v 1.33 1999/07/14 21:48:19 wpaul Exp $ + * $Id: if_skreg.h,v 1.5 1999/07/23 02:06:56 wpaul Exp $ */ /* @@ -1167,6 +1167,5 @@ struct sk_if_softc { #ifdef __alpha__ #undef vtophys -#define vtophys(va) (pmap_kextract(((vm_offset_t) (va))) \ - + 1*1024*1024*1024) +#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)va) #endif diff --git a/sys/pci/if_tireg.h b/sys/pci/if_tireg.h index 0b2cf10..95db390 100644 --- a/sys/pci/if_tireg.h +++ b/sys/pci/if_tireg.h @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_tireg.h,v 1.46 1999/07/05 19:20:31 wpaul Exp wpaul $ + * $Id: if_tireg.h,v 1.6 1999/07/23 02:10:11 wpaul Exp $ */ /* @@ -1176,9 +1176,8 @@ struct ti_softc { TI_CLRBIT(sc, TI_MISC_LOCAL_CTL, TI_MLC_EE_TXEN); /* Disable xmit. */ \ TI_CLRBIT(sc, TI_MISC_LOCAL_CTL, TI_MLC_EE_CLK); /* Pull clock low again */ + #ifdef __alpha__ #undef vtophys -#define vtophys(va) (pmap_kextract(((vm_offset_t) (va))) \ - + 1*1024*1024*1024) +#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)va) #endif - diff --git a/sys/pci/if_tlreg.h b/sys/pci/if_tlreg.h index 33fd834..6047dfc 100644 --- a/sys/pci/if_tlreg.h +++ b/sys/pci/if_tlreg.h @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_tlreg.h,v 1.9 1999/03/31 04:04:14 wpaul Exp $ + * $Id: if_tlreg.h,v 1.11 1999/07/23 02:06:57 wpaul Exp $ */ @@ -812,6 +812,5 @@ struct tl_stats { #ifdef __alpha__ #undef vtophys -#define vtophys(va) (pmap_kextract(((vm_offset_t) (va))) \ - + 1*1024*1024*1024) +#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)va) #endif |