From ac3f544e6d9d390ef14616e2d49badad1b5241d8 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Thu, 8 Sep 2005 18:41:50 +0000
Subject: [PATCH] fix compilation with debugging on.

---
 sys/dev/pcmcia/if_ray.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/sys/dev/pcmcia/if_ray.c b/sys/dev/pcmcia/if_ray.c
index 6cba18813a5e..50bd3610c553 100644
--- a/sys/dev/pcmcia/if_ray.c
+++ b/sys/dev/pcmcia/if_ray.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ray.c,v 1.57 2005/05/30 04:28:49 christos Exp $	*/
+/*	$NetBSD: if_ray.c,v 1.58 2005/09/08 18:41:50 christos Exp $	*/
 
 /*
  * Copyright (c) 2000 Christian E. Hopps
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.57 2005/05/30 04:28:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.58 2005/09/08 18:41:50 christos Exp $");
 
 #include "opt_inet.h"
 #include "bpfilter.h"
@@ -1739,8 +1739,8 @@ ray_fill_in_tx_ccs(sc, pktlen, i, pi)
 	if (pi != RAY_CCS_LINK_NULL)
 		SRAM_WRITE_FIELD_1(sc, RAY_GET_CCS(pi), ray_cmd_tx, c_link, i);
 
-	RAY_DPRINTF(("%s: ray_alloc_tx_ccs bufp 0x%lx idx %d pidx %d \n",
-	    sc->sc_xname, bufp, i, pi));
+	RAY_DPRINTF(("%s: ray_alloc_tx_ccs bufp 0x%llx idx %u pidx %u\n",
+	    sc->sc_xname, (unsigned long long)bufp, i, pi));
 
 	return (bufp + RAY_TX_PHY_SIZE);
 }
@@ -1866,9 +1866,9 @@ ray_check_ccs(arg)
 		case RAY_CMD_UPDATE_MCAST:
 		case RAY_CMD_UPDATE_PARAMS:
 			stat = SRAM_READ_FIELD_1(sc, ccs, ray_cmd, c_status);
-			RAY_DPRINTF(("%s: check ccs idx %d ccs 0x%lx "
-			    "cmd 0x%x stat %d\n", sc->sc_xname, i,
-			    ccs, cmd, stat));
+			RAY_DPRINTF(("%s: check ccs idx %u ccs 0x%llx "
+			    "cmd 0x%x stat %u\n", sc->sc_xname, i,
+			    (unsigned long long)ccs, cmd, stat));
 			goto breakout;
 		}
 	}
@@ -1947,8 +1947,8 @@ ray_ccs_done(sc, ccs)
 	cmd = SRAM_READ_FIELD_1(sc, ccs, ray_cmd, c_cmd);
 	stat = SRAM_READ_FIELD_1(sc, ccs, ray_cmd, c_status);
 
-	RAY_DPRINTF(("%s: ray_ccs_done idx %ld cmd 0x%x stat %d\n",
-	    sc->sc_xname, RAY_GET_INDEX(ccs), cmd, stat));
+	RAY_DPRINTF(("%s: ray_ccs_done idx %llu cmd 0x%x stat %u\n",
+	    sc->sc_xname, (unsigned long long)RAY_GET_INDEX(ccs), cmd, stat));
 
 	rcmd = 0;
 	switch (cmd) {
@@ -2048,8 +2048,8 @@ ray_rccs_intr(sc, ccs)
 	cmd = SRAM_READ_FIELD_1(sc, ccs, ray_cmd, c_cmd);
 	stat = SRAM_READ_FIELD_1(sc, ccs, ray_cmd, c_status);
 
-	RAY_DPRINTF(("%s: ray_rccs_intr idx %ld cmd 0x%x stat %d\n",
-	    sc->sc_xname, RAY_GET_INDEX(ccs), cmd, stat));
+	RAY_DPRINTF(("%s: ray_rccs_intr idx %llu cmd 0x%x stat %u\n",
+	    sc->sc_xname, (unsigned long long)RAY_GET_INDEX(ccs), cmd, stat));
 
 	rcmd = 0;
 	switch (cmd) {
@@ -2168,8 +2168,8 @@ ray_free_ccs(sc, ccs)
 {
 	u_int8_t stat;
 
-	RAY_DPRINTF(("%s: free_ccs idx %ld\n", sc->sc_xname,
-	    RAY_GET_INDEX(ccs)));
+	RAY_DPRINTF(("%s: free_ccs idx %llu\n", sc->sc_xname,
+	    (unsigned long long)RAY_GET_INDEX(ccs)));
 
 	stat = SRAM_READ_FIELD_1(sc, ccs, ray_cmd, c_status);
 	SRAM_WRITE_FIELD_1(sc, ccs, ray_cmd, c_status, RAY_CCS_STATUS_FREE);