PERFORCE change 106612 for review

[Matt Jacob]

http://perforce.freebsd.org/chv.cgi?CH=106612

Change 106612 by mjacob at newisp on 2006/09/24 19:23:24

	Fix compile errors at least.

Affected files ...

.. //depot/projects/newisp/dev/isp/isp_sbus.c#4 edit

Differences ...

==== //depot/projects/newisp/dev/isp/isp_sbus.c#4 (text+ko) ====

@@ -51,8 +51,10 @@
 
 #include <dev/isp/isp_freebsd.h>
 
-static uint32_t isp_sbus_rd_reg(ispsoftc_t *, int);
-static void isp_sbus_wr_reg(ispsoftc_t *, int, uint32_t);
+static uint32_t
+isp_sbus_rd_reg(ispsoftc_t *, int);
+static void
+isp_sbus_wr_reg(ispsoftc_t *, int, uint32_t);
 static int
 isp_sbus_rd_isr(ispsoftc_t *, uint32_t *, uint32_t *, uint32_t *);
 static int isp_sbus_mbxdma(ispsoftc_t *);
@@ -394,7 +396,7 @@
 isp_sbus_intr(void *arg)
 {
 	ispsoftc_t *isp = arg;
-	uint16_t isr, sema, mbox;
+	uint32_t isr, sema, mbox;
 
 	ISP_LOCK(isp);
 	isp->isp_intcnt++;
@@ -417,8 +419,7 @@
 	bus_space_read_2(sbc->sbus_st, sbc->sbus_sh, off)
 
 static int
-isp_sbus_rd_isr(ispsoftc_t *isp, uint16_t *isrp,
-    uint16_t *semap, uint16_t *mbp)
+isp_sbus_rd_isr(ispsoftc_t *isp, uint32_t *isrp, uint32_t *semap, uint32_t *mbp)
 {
 	struct isp_sbussoftc *sbc = (struct isp_sbussoftc *) isp;
 	uint16_t isr, sema;
@@ -438,7 +439,7 @@
 	return (1);
 }
 
-static uint16_t
+static uint32_t
 isp_sbus_rd_reg(ispsoftc_t *isp, int regoff)
 {
 	uint16_t rval;
@@ -452,7 +453,7 @@
 }
 
 static void
-isp_sbus_wr_reg(ispsoftc_t *isp, int regoff, uint16_t val)
+isp_sbus_wr_reg(ispsoftc_t *isp, int regoff, uint32_t val)
 {
 	struct isp_sbussoftc *sbs = (struct isp_sbussoftc *) isp;
 	int offset = sbs->sbus_poff[(regoff & _BLK_REG_MASK) >> _BLK_REG_SHFT];
@@ -605,8 +606,8 @@
 	ispsoftc_t *isp;
 	void *cmd_token;
 	void *rq;
-	uint16_t *nxtip;
-	uint16_t optr;
+	uint32_t *nxtip;
+	uint32_t optr;
 	int error;
 } mush_t;
 
@@ -721,7 +722,7 @@
 
 static int
 isp_sbus_dmasetup(ispsoftc_t *isp, struct ccb_scsiio *csio, ispreq_t *rq,
-	uint16_t *nxtip, uint16_t optr)
+	uint32_t *nxtip, uint32_t optr)
 {
 	struct isp_sbussoftc *sbs = (struct isp_sbussoftc *)isp;
 	ispreq_t *qep;
@@ -822,7 +823,7 @@
 }
 
 static void
-isp_sbus_dmateardown(ispsoftc_t *isp, XS_T *xs, uint16_t handle)
+isp_sbus_dmateardown(ispsoftc_t *isp, XS_T *xs, uint32_t handle)
 {
 	struct isp_sbussoftc *sbs = (struct isp_sbussoftc *)isp;
 	bus_dmamap_t *dp = &sbs->dmaps[isp_handle_index(handle)];