From 820f359d7e08f920875f8eb0385dcf4b68bda718 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Fri, 2 Jul 1999 04:17:16 +0000
Subject: [PATCH] Change the cast in pci_map_port() from u_short * to
 pci_port_t * so it compiles cleanly on the Alpha.  (On the alpha, the port
 type is an int, not a short). Cast a couple of pointers to ints via
 'uintptr_t' rather than 'unsigned int' since uintptr_t is long (64 bit) on
 Alpha, as are pointers.

---
 sys/dev/vr/if_vr.c |  6 +++---
 sys/pci/if_al.c    |  6 +++---
 sys/pci/if_ax.c    |  8 ++++----
 sys/pci/if_mx.c    |  8 ++++----
 sys/pci/if_pn.c    | 10 +++++-----
 sys/pci/if_rl.c    |  6 +++---
 sys/pci/if_tl.c    | 10 +++++-----
 sys/pci/if_vr.c    |  6 +++---
 sys/pci/if_wb.c    |  6 +++---
 sys/pci/if_xl.c    |  6 +++---
 10 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index 725a9ee30936..1aca3f9305c8 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.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_vr.c,v 1.10 1999/04/24 20:14:01 peter Exp $
+ *	$Id: if_vr.c,v 1.11 1999/05/09 17:07:03 peter Exp $
  */
 
 /*
@@ -97,7 +97,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_vr.c,v 1.10 1999/04/24 20:14:01 peter Exp $";
+	"$Id: if_vr.c,v 1.11 1999/05/09 17:07:03 peter Exp $";
 #endif
 
 /*
@@ -966,7 +966,7 @@ vr_attach(config_id, unit)
 	}
 
 	if (!pci_map_port(config_id, VR_PCI_LOIO,
-					(u_int16_t *)(&sc->vr_bhandle))) {
+					(pci_port_t *)(&sc->vr_bhandle))) {
 		printf ("vr%d: couldn't map ports\n", unit);
 		goto fail;
 	}
diff --git a/sys/pci/if_al.c b/sys/pci/if_al.c
index ca278ca7873f..64f7e174a453 100644
--- a/sys/pci/if_al.c
+++ b/sys/pci/if_al.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_al.c,v 1.13 1999/05/26 22:48:16 wpaul Exp $
+ *	$Id: if_al.c,v 1.4 1999/05/26 22:56:22 wpaul Exp $
  */
 
 /*
@@ -90,7 +90,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_al.c,v 1.13 1999/05/26 22:48:16 wpaul Exp $";
+	"$Id: if_al.c,v 1.4 1999/05/26 22:56:22 wpaul Exp $";
 #endif
 
 /*
@@ -901,7 +901,7 @@ al_attach(config_id, unit)
 	}
 
 	if (!pci_map_port(config_id, AL_PCI_LOIO,
-					(u_short *)&(sc->al_bhandle))) {
+					(pci_port_t *)&(sc->al_bhandle))) {
 		printf ("al%d: couldn't map ports\n", unit);
 		goto fail;
         }
diff --git a/sys/pci/if_ax.c b/sys/pci/if_ax.c
index affe5f83ef1f..413ab2c6a577 100644
--- a/sys/pci/if_ax.c
+++ b/sys/pci/if_ax.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_ax.c,v 1.8 1999/04/24 20:13:59 peter Exp $
+ *	$Id: if_ax.c,v 1.9 1999/05/09 17:06:48 peter Exp $
  */
 
 /*
@@ -87,7 +87,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_ax.c,v 1.8 1999/04/24 20:13:59 peter Exp $";
+	"$Id: if_ax.c,v 1.9 1999/05/09 17:06:48 peter Exp $";
 #endif
 
 /*
@@ -1146,7 +1146,7 @@ ax_attach(config_id, unit)
 	}
 
 	if (!pci_map_port(config_id, AX_PCI_LOIO,
-					(u_short *)&(sc->ax_bhandle))) {
+					(pci_port_t *)&(sc->ax_bhandle))) {
 		printf ("ax%d: couldn't map ports\n", unit);
 		goto fail;
         }
@@ -1206,7 +1206,7 @@ ax_attach(config_id, unit)
 	}
 
 	sc->ax_ldata = (struct ax_list_data *)sc->ax_ldata_ptr;
-	round = (unsigned int)sc->ax_ldata_ptr & 0xF;
+	round = (uintptr_t)sc->ax_ldata_ptr & 0xF;
 	roundptr = sc->ax_ldata_ptr;
 	for (i = 0; i < 8; i++) {
 		if (round % 8) {
diff --git a/sys/pci/if_mx.c b/sys/pci/if_mx.c
index 0cdba3b195ec..e05448d39c50 100644
--- a/sys/pci/if_mx.c
+++ b/sys/pci/if_mx.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_mx.c,v 1.44 1999/06/16 16:17:22 wpaul Exp $
+ *	$Id: if_mx.c,v 1.19 1999/06/16 16:27:30 wpaul Exp $
  */
 
 /*
@@ -94,7 +94,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_mx.c,v 1.44 1999/06/16 16:17:22 wpaul Exp $";
+	"$Id: if_mx.c,v 1.19 1999/06/16 16:27:30 wpaul Exp $";
 #endif
 
 /*
@@ -1376,7 +1376,7 @@ mx_attach(config_id, unit)
 	}
 
 	if (!pci_map_port(config_id, MX_PCI_LOIO,
-					(u_short *)&(sc->mx_bhandle))) {
+					(pci_port_t *)&(sc->mx_bhandle))) {
 		printf ("mx%d: couldn't map ports\n", unit);
 		goto fail;
         }
@@ -1458,7 +1458,7 @@ mx_attach(config_id, unit)
 	}
 
 	sc->mx_ldata = (struct mx_list_data *)sc->mx_ldata_ptr;
-	round = (unsigned int)sc->mx_ldata_ptr & 0xF;
+	round = (uintptr_t)sc->mx_ldata_ptr & 0xF;
 	roundptr = sc->mx_ldata_ptr;
 	for (i = 0; i < 8; i++) {
 		if (round % 8) {
diff --git a/sys/pci/if_pn.c b/sys/pci/if_pn.c
index 9b1c5800cbb2..1aea367f168b 100644
--- a/sys/pci/if_pn.c
+++ b/sys/pci/if_pn.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_pn.c,v 1.20 1999/05/26 23:08:04 gallatin Exp $
+ *	$Id: if_pn.c,v 1.21 1999/05/28 18:43:10 wpaul Exp $
  */
 
 /*
@@ -97,7 +97,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_pn.c,v 1.20 1999/05/26 23:08:04 gallatin Exp $";
+	"$Id: if_pn.c,v 1.21 1999/05/28 18:43:10 wpaul Exp $";
 #endif
 
 
@@ -1041,7 +1041,7 @@ pn_attach(config_id, unit)
 	}
 
 	if (!pci_map_port(config_id, PN_PCI_LOIO,
-					(u_short *)&(sc->pn_bhandle))) {
+					(pci_port_t *)&(sc->pn_bhandle))) {
 		printf ("pn%d: couldn't map ports\n", unit);
 		goto fail;
 	}
@@ -1104,7 +1104,7 @@ pn_attach(config_id, unit)
 	}
 
 	sc->pn_ldata = (struct pn_list_data *)sc->pn_ldata_ptr;
-	round = (unsigned int)sc->pn_ldata_ptr & 0xF;
+	round = (uintptr_t)sc->pn_ldata_ptr & 0xF;
 	roundptr = sc->pn_ldata_ptr;
 	for (i = 0; i < 8; i++) {
 		if (round % 8) {
@@ -1419,7 +1419,7 @@ static void pn_rx_bug_war(sc, cur_rx)
 		ptr--;
 
 	/* Round off. */
-	if ((u_int32_t)(ptr) & 0x3)
+	if ((uintptr_t)(ptr) & 0x3)
 		ptr -= 1;
 
 	/* Now find the start of the frame. */
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 5b0ac24c9fab..4a2035a68c1a 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.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_rl.c,v 1.32 1999/06/19 20:01:32 wpaul Exp wpaul $
+ *	$Id: if_rl.c,v 1.17 1999/06/19 20:17:37 wpaul Exp $
  */
 
 /*
@@ -127,7 +127,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_rl.c,v 1.32 1999/06/19 20:01:32 wpaul Exp wpaul $";
+	"$Id: if_rl.c,v 1.17 1999/06/19 20:17:37 wpaul Exp $";
 #endif
 
 /*
@@ -1076,7 +1076,7 @@ rl_attach(config_id, unit)
 	}
 
 	if (!pci_map_port(config_id, RL_PCI_LOIO,
-				(u_int16_t *)&(sc->rl_bhandle))) {
+				(pci_port_t *)&(sc->rl_bhandle))) {
 		printf ("rl%d: couldn't map ports\n", unit);
 		goto fail;
 	}
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index 604b0c09f252..322ecf43599c 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.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_tl.c,v 1.31 1999/05/06 18:13:08 peter Exp $
+ *	$Id: if_tl.c,v 1.32 1999/05/09 17:07:01 peter Exp $
  */
 
 /*
@@ -221,7 +221,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_tl.c,v 1.31 1999/05/06 18:13:08 peter Exp $";
+	"$Id: if_tl.c,v 1.32 1999/05/09 17:07:01 peter Exp $";
 #endif
 
 /*
@@ -1562,9 +1562,9 @@ tl_attach(config_id, unit)
 	}
 
 	if (!pci_map_port(config_id, TL_PCI_LOIO,
-	    (u_short *)&(sc->tl_bhandle))) {
+	    (pci_port_t *)&(sc->tl_bhandle))) {
 		if (!pci_map_port(config_id, TL_PCI_LOMEM,
-		    (u_short *)&(sc->tl_bhandle))) {
+		    (pci_port_t *)&(sc->tl_bhandle))) {
 			printf ("tl%d: couldn't map ports\n", unit);
 			goto fail;
 		}
@@ -1642,7 +1642,7 @@ tl_attach(config_id, unit)
 	 * allow that.
 	 */
 	sc->tl_ldata = (struct tl_list_data *)sc->tl_ldata_ptr;
-	round = (unsigned int)sc->tl_ldata_ptr & 0xF;
+	round = (uintptr_t)sc->tl_ldata_ptr & 0xF;
 	roundptr = sc->tl_ldata_ptr;
 	for (i = 0; i < 8; i++) {
 		if (round % 8) {
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index 725a9ee30936..1aca3f9305c8 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.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_vr.c,v 1.10 1999/04/24 20:14:01 peter Exp $
+ *	$Id: if_vr.c,v 1.11 1999/05/09 17:07:03 peter Exp $
  */
 
 /*
@@ -97,7 +97,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_vr.c,v 1.10 1999/04/24 20:14:01 peter Exp $";
+	"$Id: if_vr.c,v 1.11 1999/05/09 17:07:03 peter Exp $";
 #endif
 
 /*
@@ -966,7 +966,7 @@ vr_attach(config_id, unit)
 	}
 
 	if (!pci_map_port(config_id, VR_PCI_LOIO,
-					(u_int16_t *)(&sc->vr_bhandle))) {
+					(pci_port_t *)(&sc->vr_bhandle))) {
 		printf ("vr%d: couldn't map ports\n", unit);
 		goto fail;
 	}
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index 3dd216c15204..5d51c3cc02e7 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.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_wb.c,v 1.9 1999/05/09 17:07:05 peter Exp $
+ *	$Id: if_wb.c,v 1.10 1999/05/13 20:36:00 wpaul Exp $
  */
 
 /*
@@ -121,7 +121,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_wb.c,v 1.9 1999/05/09 17:07:05 peter Exp $";
+	"$Id: if_wb.c,v 1.10 1999/05/13 20:36:00 wpaul Exp $";
 #endif
 
 /*
@@ -1092,7 +1092,7 @@ wb_attach(config_id, unit)
 	}
 
 	if (!pci_map_port(config_id, WB_PCI_LOIO,
-					(u_int16_t *)&(sc->wb_bhandle))) {
+					(pci_port_t *)&(sc->wb_bhandle))) {
 		printf ("wb%d: couldn't map ports\n", unit);
 		goto fail;
 	}
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index 25ffed73d1fc..4dcdbc4d7106 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.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_xl.c,v 1.39 1999/05/30 18:11:47 wpaul Exp $
+ *	$Id: if_xl.c,v 1.40 1999/06/01 19:04:23 wpaul Exp $
  */
 
 /*
@@ -160,7 +160,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_xl.c,v 1.39 1999/05/30 18:11:47 wpaul Exp $";
+	"$Id: if_xl.c,v 1.40 1999/06/01 19:04:23 wpaul Exp $";
 #endif
 
 /*
@@ -1464,7 +1464,7 @@ xl_attach(config_id, unit)
 	}
 
 	if (!pci_map_port(config_id, XL_PCI_LOIO,
-				(u_short *)&(sc->xl_bhandle))) {
+				(pci_port_t *)&(sc->xl_bhandle))) {
 		printf ("xl%d: couldn't map port\n", unit);
 		printf ("xl%d: WARNING: check your BIOS and "
 		    "set 'Plug & Play OS' to 'no'\n", unit);