diff options
| author | Bill Paul <wpaul@FreeBSD.org> | 1999-07-09 17:36:23 +0000 |
|---|---|---|
| committer | Bill Paul <wpaul@FreeBSD.org> | 1999-07-09 17:36:23 +0000 |
| commit | 05919c5b73ece38272da8b880dac92e05a7df2d5 (patch) | |
| tree | 53eccfb37112d218172c24aecf95b2a6f697f97b | |
| parent | 29a751bf4ecebc133932f811193282e24da33032 (diff) | |
Notes
| -rw-r--r-- | sys/dev/sk/if_sk.c | 6 | ||||
| -rw-r--r-- | sys/dev/sk/if_skreg.h | 5 | ||||
| -rw-r--r-- | sys/pci/if_sk.c | 6 | ||||
| -rw-r--r-- | sys/pci/if_skreg.h | 5 |
4 files changed, 10 insertions, 12 deletions
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c index fab98b203de0..7fdc2688166f 100644 --- a/sys/dev/sk/if_sk.c +++ b/sys/dev/sk/if_sk.c @@ -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_sk.c,v 1.48 1999/07/06 21:37:42 wpaul Exp $ + * $Id: if_sk.c,v 1.1 1999/07/09 04:29:50 wpaul Exp $ */ /* @@ -99,7 +99,7 @@ #ifndef lint static const char rcsid[] = - "$Id: if_sk.c,v 1.48 1999/07/06 21:37:42 wpaul Exp $"; + "$Id: if_sk.c,v 1.1 1999/07/09 04:29:50 wpaul Exp $"; #endif static struct sk_type sk_devs[] = { @@ -1195,7 +1195,7 @@ sk_attach(config_id, unit) } if (!pci_map_port(config_id, SK_PCI_LOIO, - (u_short *)&(sc->sk_bhandle))) { + (pci_port_t *)&(sc->sk_bhandle))) { printf ("skc%d: couldn't map ports\n", unit); goto fail; } diff --git a/sys/dev/sk/if_skreg.h b/sys/dev/sk/if_skreg.h index e5dca1ccb7bd..34aef2ed11d8 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.32 1999/07/06 22:07:40 wpaul Exp $ + * $Id: if_skreg.h,v 1.1 1999/07/09 04:29:51 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_sk.c b/sys/pci/if_sk.c index fab98b203de0..7fdc2688166f 100644 --- a/sys/pci/if_sk.c +++ b/sys/pci/if_sk.c @@ -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_sk.c,v 1.48 1999/07/06 21:37:42 wpaul Exp $ + * $Id: if_sk.c,v 1.1 1999/07/09 04:29:50 wpaul Exp $ */ /* @@ -99,7 +99,7 @@ #ifndef lint static const char rcsid[] = - "$Id: if_sk.c,v 1.48 1999/07/06 21:37:42 wpaul Exp $"; + "$Id: if_sk.c,v 1.1 1999/07/09 04:29:50 wpaul Exp $"; #endif static struct sk_type sk_devs[] = { @@ -1195,7 +1195,7 @@ sk_attach(config_id, unit) } if (!pci_map_port(config_id, SK_PCI_LOIO, - (u_short *)&(sc->sk_bhandle))) { + (pci_port_t *)&(sc->sk_bhandle))) { printf ("skc%d: couldn't map ports\n", unit); goto fail; } diff --git a/sys/pci/if_skreg.h b/sys/pci/if_skreg.h index e5dca1ccb7bd..34aef2ed11d8 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.32 1999/07/06 22:07:40 wpaul Exp $ + * $Id: if_skreg.h,v 1.1 1999/07/09 04:29:51 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 |