From owner-p4-projects@FreeBSD.ORG Sun Sep 24 19:23:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CACC16A415; Sun, 24 Sep 2006 19:23:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 01D1A16A40F for ; Sun, 24 Sep 2006 19:23:55 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A815143D46 for ; Sun, 24 Sep 2006 19:23:54 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8OJNsd4062951 for ; Sun, 24 Sep 2006 19:23:54 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8OJNs6Q062948 for perforce@freebsd.org; Sun, 24 Sep 2006 19:23:54 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 24 Sep 2006 19:23:54 GMT Message-Id: <200609241923.k8OJNs6Q062948@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 106612 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Sep 2006 19:23:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=106612 Change 106612 by mjacob@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 -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)];