PERFORCE change 31918 for review
Marcel Moolenaar
marcel at FreeBSD.org
Tue May 27 00:42:32 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=31918
Change 31918 by marcel at marcel_nfs on 2003/05/27 00:41:31
IFC @31917
Affected files ...
.. //depot/projects/ia64/sys/alpha/alpha/busdma_machdep.c#15 integrate
.. //depot/projects/ia64/sys/alpha/include/bus.h#10 integrate
.. //depot/projects/ia64/sys/amd64/amd64/busdma_machdep.c#3 integrate
.. //depot/projects/ia64/sys/amd64/include/bus_dma.h#4 integrate
.. //depot/projects/ia64/sys/dev/advansys/advansys.c#5 integrate
.. //depot/projects/ia64/sys/dev/advansys/adwcam.c#5 integrate
.. //depot/projects/ia64/sys/dev/aha/aha.c#8 integrate
.. //depot/projects/ia64/sys/dev/ahb/ahb.c#6 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.c#10 integrate
.. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.c#10 integrate
.. //depot/projects/ia64/sys/dev/amd/amd.c#3 integrate
.. //depot/projects/ia64/sys/dev/buslogic/bt.c#8 integrate
.. //depot/projects/ia64/sys/dev/dpt/dpt_scsi.c#8 integrate
.. //depot/projects/ia64/sys/dev/ida/ida.c#10 integrate
.. //depot/projects/ia64/sys/dev/mpt/mpt_freebsd.c#7 integrate
.. //depot/projects/ia64/sys/dev/trm/trm.c#7 integrate
.. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#18 integrate
.. //depot/projects/ia64/sys/i386/include/bus_dma.h#6 integrate
.. //depot/projects/ia64/sys/ia64/ia64/busdma_machdep.c#13 integrate
.. //depot/projects/ia64/sys/ia64/ia64/exception.s#25 integrate
.. //depot/projects/ia64/sys/ia64/ia64/unwind.c#7 integrate
.. //depot/projects/ia64/sys/ia64/include/bus.h#11 integrate
.. //depot/projects/ia64/sys/powerpc/include/bus.h#10 integrate
.. //depot/projects/ia64/sys/powerpc/powerpc/busdma_machdep.c#13 integrate
.. //depot/projects/ia64/sys/sparc64/include/bus.h#14 integrate
.. //depot/projects/ia64/sys/sparc64/pci/psycho.c#23 integrate
.. //depot/projects/ia64/sys/sparc64/sbus/sbus.c#14 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/bus_machdep.c#17 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/iommu.c#17 integrate
Differences ...
==== //depot/projects/ia64/sys/alpha/alpha/busdma_machdep.c#15 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.36 2003/05/26 04:00:51 scottl Exp $
+ * $FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.37 2003/05/27 04:59:56 scottl Exp $
*/
#include <sys/param.h>
@@ -769,7 +769,7 @@
}
void
-_bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, int op)
+_bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op)
{
struct bounce_page *bpage;
==== //depot/projects/ia64/sys/alpha/include/bus.h#10 (text+ko) ====
@@ -67,7 +67,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.19 2003/05/26 04:00:51 scottl Exp $ */
+/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.20 2003/05/27 04:59:56 scottl Exp $ */
#ifndef _ALPHA_BUS_H_
#define _ALPHA_BUS_H_
@@ -482,6 +482,7 @@
/*
* Operations performed by bus_dmamap_sync().
*/
+typedef int bus_dmasync_op_t;
#define BUS_DMASYNC_PREREAD 1
#define BUS_DMASYNC_POSTREAD 2
#define BUS_DMASYNC_PREWRITE 4
@@ -615,7 +616,7 @@
/*
* Perform a syncronization operation on the given map.
*/
-void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, int);
+void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t);
#define bus_dmamap_sync(dmat, dmamap, op) \
if ((dmamap) != NULL) \
_bus_dmamap_sync(dmat, dmamap, op)
==== //depot/projects/ia64/sys/amd64/amd64/busdma_machdep.c#3 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.44 2003/05/26 04:00:51 scottl Exp $
+ * $FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.45 2003/05/27 04:59:56 scottl Exp $
*/
#include <sys/param.h>
@@ -702,7 +702,7 @@
}
void
-_bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, int op)
+_bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op)
{
struct bounce_page *bpage;
==== //depot/projects/ia64/sys/amd64/include/bus_dma.h#4 (text+ko) ====
@@ -67,7 +67,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.20 2003/05/26 04:00:51 scottl Exp $ */
+/* $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.21 2003/05/27 04:59:56 scottl Exp $ */
#ifndef _AMD64_BUS_DMA_H_
#define _AMD64_BUS_DMA_H_
@@ -91,6 +91,7 @@
/*
* Operations performed by bus_dmamap_sync().
*/
+typedef int bus_dmasync_op_t;
#define BUS_DMASYNC_PREREAD 1
#define BUS_DMASYNC_POSTREAD 2
#define BUS_DMASYNC_PREWRITE 4
@@ -224,7 +225,7 @@
/*
* Perform a syncronization operation on the given map.
*/
-void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, int);
+void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t);
#define bus_dmamap_sync(dmat, dmamap, op) \
if ((dmamap) != NULL) \
_bus_dmamap_sync(dmat, dmamap, op)
==== //depot/projects/ia64/sys/dev/advansys/advansys.c#5 (text+ko) ====
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/advansys/advansys.c,v 1.23 2003/04/10 23:50:05 mux Exp $
+ * $FreeBSD: src/sys/dev/advansys/advansys.c,v 1.24 2003/05/27 04:59:56 scottl Exp $
*/
/*
* Ported from:
@@ -568,7 +568,7 @@
scsiq.q2.vm_id = 0;
if (nsegments != 0) {
- int op;
+ bus_dmasync_op_t op;
scsiq.q1.data_addr = dm_segs->ds_addr;
scsiq.q1.data_cnt = dm_segs->ds_len;
@@ -1130,7 +1130,7 @@
LIST_REMOVE(&ccb->ccb_h, sim_links.le);
untimeout(adv_timeout, ccb, ccb->ccb_h.timeout_ch);
if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
- int op;
+ bus_dmasync_op_t op;
if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN)
op = BUS_DMASYNC_POSTREAD;
==== //depot/projects/ia64/sys/dev/advansys/adwcam.c#5 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/advansys/adwcam.c,v 1.14 2003/04/10 23:50:05 mux Exp $
+ * $FreeBSD: src/sys/dev/advansys/adwcam.c,v 1.15 2003/05/27 04:59:56 scottl Exp $
*/
/*
* Ported from:
@@ -255,7 +255,7 @@
}
if (nseg != 0) {
- int op;
+ bus_dmasync_op_t op;
acb->queue.data_addr = dm_segs[0].ds_addr;
acb->queue.data_cnt = ccb->csio.dxfer_len;
@@ -1334,7 +1334,7 @@
ccb = acb->ccb;
untimeout(adwtimeout, acb, ccb->ccb_h.timeout_ch);
if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
- int op;
+ bus_dmasync_op_t op;
if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN)
op = BUS_DMASYNC_POSTREAD;
==== //depot/projects/ia64/sys/dev/aha/aha.c#8 (text+ko) ====
@@ -55,7 +55,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/aha/aha.c,v 1.46 2003/04/10 23:50:05 mux Exp $
+ * $FreeBSD: src/sys/dev/aha/aha.c,v 1.47 2003/05/27 04:59:56 scottl Exp $
*/
#include <sys/param.h>
@@ -1115,7 +1115,7 @@
if (nseg != 0) {
aha_sg_t *sg;
bus_dma_segment_t *end_seg;
- int op;
+ bus_dmasync_op_t op;
end_seg = dm_segs + nseg;
@@ -1254,7 +1254,7 @@
}
if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
- int op;
+ bus_dmasync_op_t op;
if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN)
op = BUS_DMASYNC_POSTREAD;
==== //depot/projects/ia64/sys/dev/ahb/ahb.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ahb/ahb.c,v 1.27 2003/04/10 23:50:05 mux Exp $
+ * $FreeBSD: src/sys/dev/ahb/ahb.c,v 1.28 2003/05/27 04:59:56 scottl Exp $
*/
#include <sys/param.h>
@@ -788,7 +788,7 @@
LIST_REMOVE(&ccb->ccb_h, sim_links.le);
if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
- int op;
+ bus_dmasync_op_t op;
if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN)
op = BUS_DMASYNC_POSTREAD;
@@ -912,7 +912,7 @@
if (nseg != 0) {
ahb_sg_t *sg;
bus_dma_segment_t *end_seg;
- int op;
+ bus_dmasync_op_t op;
end_seg = dm_segs + nseg;
==== //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.c#10 (text+ko) ====
@@ -31,7 +31,7 @@
*
* $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.c#26 $
*
- * $FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.c,v 1.11 2003/05/04 00:20:07 gibbs Exp $
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.c,v 1.12 2003/05/27 04:59:57 scottl Exp $
*/
#include <dev/aic7xxx/aic79xx_osm.h>
@@ -215,7 +215,7 @@
untimeout(ahd_timeout, (caddr_t)scb, ccb->ccb_h.timeout_ch);
if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
- /*XXX bus_dmasync_op_t*/int op;
+ bus_dmasync_op_t op;
if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN)
op = BUS_DMASYNC_POSTREAD;
@@ -1056,7 +1056,7 @@
scb->sg_count = 0;
if (nsegments != 0) {
void *sg;
- /*bus_dmasync_op_t*/int op;
+ bus_dmasync_op_t op;
u_int i;
/* Copy the segments into our SG list */
==== //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.c#10 (text+ko) ====
@@ -30,7 +30,7 @@
*
* $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic7xxx_osm.c#12 $
*
- * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.c,v 1.34 2003/05/03 23:55:38 gibbs Exp $
+ * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.c,v 1.35 2003/05/27 04:59:57 scottl Exp $
*/
#include <dev/aic7xxx/aic7xxx_osm.h>
@@ -284,7 +284,7 @@
untimeout(ahc_timeout, (caddr_t)scb, ccb->ccb_h.timeout_ch);
if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
- /*XXX bus_dmasync_op_t*/int op;
+ bus_dmasync_op_t op;
if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN)
op = BUS_DMASYNC_POSTREAD;
@@ -1107,7 +1107,7 @@
if (nsegments != 0) {
struct ahc_dma_seg *sg;
bus_dma_segment_t *end_seg;
- /*XXX bus_dmasync_op_t*/int op;
+ bus_dmasync_op_t op;
end_seg = dm_segs + nsegments;
==== //depot/projects/ia64/sys/dev/amd/amd.c#3 (text+ko) ====
@@ -30,7 +30,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*********************************************************************
- * $FreeBSD: src/sys/dev/amd/amd.c,v 1.17 2003/04/10 23:50:05 mux Exp $
+ * $FreeBSD: src/sys/dev/amd/amd.c,v 1.18 2003/05/27 04:59:57 scottl Exp $
*/
/*
@@ -328,7 +328,7 @@
if (nseg != 0) {
struct amd_sg *sg;
bus_dma_segment_t *end_seg;
- int op;
+ bus_dmasync_op_t op;
end_seg = dm_segs + nseg;
@@ -1888,7 +1888,7 @@
("SRBdone - TagNumber %d\n", pSRB->TagNumber));
if ((pccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
- int op;
+ bus_dmasync_op_t op;
if ((pccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN)
op = BUS_DMASYNC_POSTREAD;
==== //depot/projects/ia64/sys/dev/buslogic/bt.c#8 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/buslogic/bt.c,v 1.37 2003/04/10 23:50:05 mux Exp $
+ * $FreeBSD: src/sys/dev/buslogic/bt.c,v 1.38 2003/05/27 04:59:57 scottl Exp $
*/
/*
@@ -1471,7 +1471,7 @@
if (nseg != 0) {
bt_sg_t *sg;
bus_dma_segment_t *end_seg;
- int op;
+ bus_dmasync_op_t op;
end_seg = dm_segs + nseg;
@@ -1608,7 +1608,7 @@
}
if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
- int op;
+ bus_dmasync_op_t op;
if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN)
op = BUS_DMASYNC_POSTREAD;
==== //depot/projects/ia64/sys/dev/dpt/dpt_scsi.c#8 (text+ko) ====
@@ -43,7 +43,7 @@
* arrays that span controllers (Wow!).
*/
-#ident "$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.41 2003/04/10 23:50:05 mux Exp $"
+#ident "$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.42 2003/05/27 04:59:57 scottl Exp $"
#define _DPT_C_
@@ -746,7 +746,7 @@
if (nseg != 0) {
dpt_sg_t *sg;
bus_dma_segment_t *end_seg;
- int op;
+ bus_dmasync_op_t op;
end_seg = dm_segs + nseg;
@@ -1695,7 +1695,7 @@
ccb = dccb->ccb;
untimeout(dpttimeout, dccb, ccb->ccb_h.timeout_ch);
if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
- int op;
+ bus_dmasync_op_t op;
if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN)
op = BUS_DMASYNC_POSTREAD;
==== //depot/projects/ia64/sys/dev/ida/ida.c#10 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ida/ida.c,v 1.26 2003/04/10 23:50:06 mux Exp $
+ * $FreeBSD: src/sys/dev/ida/ida.c,v 1.27 2003/05/27 04:59:57 scottl Exp $
*/
/*
@@ -324,7 +324,7 @@
{
struct ida_hardware_qcb *hwqcb;
struct ida_qcb *qcb;
- int op;
+ bus_dmasync_op_t op;
int s, error;
s = splbio();
@@ -377,7 +377,7 @@
{
struct ida_hardware_qcb *hwqcb;
struct ida_qcb *qcb;
- int op;
+ bus_dmasync_op_t op;
struct bio *bp;
bp = bioq_first(&ida->bio_queue);
@@ -501,7 +501,7 @@
* finish up command
*/
if (qcb->flags & DMA_DATA_TRANSFER) {
- int op;
+ bus_dmasync_op_t op;
op = qcb->flags & DMA_DATA_IN ?
BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE;
==== //depot/projects/ia64/sys/dev/mpt/mpt_freebsd.c#7 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/mpt/mpt_freebsd.c,v 1.9 2003/04/10 23:50:06 mux Exp $ */
+/* $FreeBSD: src/sys/dev/mpt/mpt_freebsd.c,v 1.10 2003/05/27 04:59:57 scottl Exp $ */
/*
* FreeBSD/CAM specific routines for LSI '909 FC adapters.
* FreeBSD Version.
@@ -224,7 +224,7 @@
if (nseg > MPT_NSGL_FIRST(mpt)) {
int i, nleft = nseg;
u_int32_t flags;
- int op;
+ bus_dmamap_sync_t op;
SGE_CHAIN32 *ce;
mpt_req->DataLength = ccb->csio.dxfer_len;
@@ -305,7 +305,7 @@
} else if (nseg > 0) {
int i;
u_int32_t flags;
- int op;
+ bus_dmamap_sync_t op;
mpt_req->DataLength = ccb->csio.dxfer_len;
flags = MPI_SGE_FLAGS_SIMPLE_ELEMENT;
@@ -878,7 +878,7 @@
untimeout(mpttimeout, ccb, ccb->ccb_h.timeout_ch);
if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
- int op;
+ bus_dmamap_sync_t op;
if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) {
op = BUS_DMASYNC_POSTREAD;
==== //depot/projects/ia64/sys/dev/trm/trm.c#7 (text+ko) ====
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/trm/trm.c,v 1.7 2003/04/10 23:50:06 mux Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/trm/trm.c,v 1.8 2003/05/27 04:59:58 scottl Exp $");
#include <sys/param.h>
@@ -2504,7 +2504,7 @@
target_id = pSRB->pccb->ccb_h.target_id;
target_lun = pSRB->pccb->ccb_h.target_lun;
if ((pccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
- int op;
+ bus_dmasync_op_t op;
if ((pccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN)
op = BUS_DMASYNC_POSTREAD;
else
==== //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#18 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.44 2003/05/26 04:00:51 scottl Exp $
+ * $FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.45 2003/05/27 04:59:58 scottl Exp $
*/
#include <sys/param.h>
@@ -702,7 +702,7 @@
}
void
-_bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, int op)
+_bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op)
{
struct bounce_page *bpage;
==== //depot/projects/ia64/sys/i386/include/bus_dma.h#6 (text+ko) ====
@@ -67,7 +67,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD: src/sys/i386/include/bus_dma.h,v 1.19 2003/05/26 04:00:51 scottl Exp $ */
+/* $FreeBSD: src/sys/i386/include/bus_dma.h,v 1.20 2003/05/27 04:59:58 scottl Exp $ */
#ifndef _I386_BUS_DMA_H_
#define _I386_BUS_DMA_H_
@@ -91,6 +91,7 @@
/*
* Operations performed by bus_dmamap_sync().
*/
+typedef int bus_dmasync_op_t;
#define BUS_DMASYNC_PREREAD 1
#define BUS_DMASYNC_POSTREAD 2
#define BUS_DMASYNC_PREWRITE 4
@@ -224,7 +225,7 @@
/*
* Perform a syncronization operation on the given map.
*/
-void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, int);
+void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t);
#define bus_dmamap_sync(dmat, dmamap, op) \
if ((dmamap) != NULL) \
_bus_dmamap_sync(dmat, dmamap, op)
==== //depot/projects/ia64/sys/ia64/ia64/busdma_machdep.c#13 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/ia64/ia64/busdma_machdep.c,v 1.23 2003/04/10 23:03:33 mux Exp $
+ * $FreeBSD: src/sys/ia64/ia64/busdma_machdep.c,v 1.24 2003/05/27 04:59:58 scottl Exp $
*/
#include <sys/param.h>
@@ -765,7 +765,7 @@
}
void
-_bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, int op)
+_bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op)
{
struct bounce_page *bpage;
==== //depot/projects/ia64/sys/ia64/ia64/exception.s#25 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/ia64/ia64/exception.s,v 1.45 2003/05/24 20:51:55 marcel Exp $
+ * $FreeBSD: src/sys/ia64/ia64/exception.s,v 1.46 2003/05/27 07:10:58 marcel Exp $
*/
#include <machine/asm.h>
@@ -1125,6 +1125,7 @@
}
{ .mmi
alloc r15=ar.pfs,0,0,2,0
+ ;;
flushrs
mov out0=11
;;
==== //depot/projects/ia64/sys/ia64/ia64/unwind.c#7 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/ia64/ia64/unwind.c,v 1.6 2003/05/16 21:26:41 marcel Exp $
+ * $FreeBSD: src/sys/ia64/ia64/unwind.c,v 1.7 2003/05/27 01:15:16 marcel Exp $
*/
#include <sys/param.h>
@@ -61,7 +61,7 @@
unw_alloc(size_t sz)
{
- return (malloc(sz, M_UNWIND, M_WAITOK));
+ return (malloc(sz, M_UNWIND, M_NOWAIT));
}
static void
==== //depot/projects/ia64/sys/ia64/include/bus.h#11 (text+ko) ====
@@ -67,7 +67,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD: src/sys/ia64/include/bus.h,v 1.10 2003/04/29 09:50:03 marcel Exp $ */
+/* $FreeBSD: src/sys/ia64/include/bus.h,v 1.11 2003/05/27 04:59:58 scottl Exp $ */
#ifndef _MACHINE_BUS_H_
#define _MACHINE_BUS_H_
@@ -864,6 +864,7 @@
/*
* Operations performed by bus_dmamap_sync().
*/
+typedef int bus_dmasync_op_t;
#define BUS_DMASYNC_PREREAD 1
#define BUS_DMASYNC_POSTREAD 2
#define BUS_DMASYNC_PREWRITE 4
@@ -998,7 +999,7 @@
*/
void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, int);
static __inline void
-bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t dmamap, int op)
+bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t dmamap, bus_dmasync_op_t op)
{
if ((dmamap) != NULL)
_bus_dmamap_sync(dmat, dmamap, op);
==== //depot/projects/ia64/sys/powerpc/include/bus.h#10 (text+ko) ====
@@ -66,7 +66,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $NetBSD: bus.h,v 1.9.4.1 2000/06/30 16:27:30 simonb Exp $
- * $FreeBSD: src/sys/powerpc/include/bus.h,v 1.9 2003/04/18 02:38:10 grehan Exp $
+ * $FreeBSD: src/sys/powerpc/include/bus.h,v 1.10 2003/05/27 04:59:58 scottl Exp $
*/
#ifndef _MACPPC_BUS_H_
@@ -756,6 +756,7 @@
/*
* Operations performed by bus_dmamap_sync().
*/
+typedef int bus_dmasync_op_t;
#define BUS_DMASYNC_PREREAD 1
#define BUS_DMASYNC_POSTREAD 2
#define BUS_DMASYNC_PREWRITE 4
@@ -888,7 +889,7 @@
/*
* Perform a syncronization operation on the given map.
*/
-void bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, int);
+void bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t);
/*
* Release the mapping held by map.
==== //depot/projects/ia64/sys/powerpc/powerpc/busdma_machdep.c#13 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/busdma_machdep.c,v 1.14 2003/04/19 02:18:51 grehan Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/busdma_machdep.c,v 1.15 2003/05/27 04:59:58 scottl Exp $");
/*
* MacPPC bus dma support routines
@@ -521,7 +521,7 @@
}
void
-bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, int op)
+bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op)
{
return;
==== //depot/projects/ia64/sys/sparc64/include/bus.h#14 (text+ko) ====
@@ -69,7 +69,7 @@
* and
* from: FreeBSD: src/sys/alpha/include/bus.h,v 1.9 2001/01/09
*
- * $FreeBSD: src/sys/sparc64/include/bus.h,v 1.24 2003/05/26 04:00:52 scottl Exp $
+ * $FreeBSD: src/sys/sparc64/include/bus.h,v 1.25 2003/05/27 04:59:59 scottl Exp $
*/
#ifndef _MACHINE_BUS_H_
@@ -905,6 +905,7 @@
struct mbuf;
struct uio;
+typedef int bus_dmasync_op_t;
#define BUS_DMASYNC_PREREAD 1
#define BUS_DMASYNC_POSTREAD 2
#define BUS_DMASYNC_PREWRITE 4
@@ -975,7 +976,7 @@
bus_dmamap_t, struct uio *, bus_dmamap_callback2_t *, void *, int);
void (*dt_dmamap_unload)(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t);
void (*dt_dmamap_sync)(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t,
- int);
+ bus_dmasync_op_t);
/*
* DMA memory utility functions.
@@ -1080,7 +1081,8 @@
sparc64_dmamap_unload((t), (t), (p))
static __inline void
-sparc64_dmamap_sync(bus_dma_tag_t pt, bus_dma_tag_t dt, bus_dmamap_t m, int op)
+sparc64_dmamap_sync(bus_dma_tag_t pt, bus_dma_tag_t dt, bus_dmamap_t m,
+ bus_dmasync_op_t op)
{
bus_dma_tag_t lt;
==== //depot/projects/ia64/sys/sparc64/pci/psycho.c#23 (text+ko) ====
@@ -28,7 +28,7 @@
*
* from: NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp
*
- * $FreeBSD: src/sys/sparc64/pci/psycho.c,v 1.33 2003/05/26 04:00:52 scottl Exp $
+ * $FreeBSD: src/sys/sparc64/pci/psycho.c,v 1.34 2003/05/27 04:59:59 scottl Exp $
*/
/*
@@ -111,7 +111,8 @@
static int psycho_dmamap_load_uio(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t,
struct uio *, bus_dmamap_callback2_t *, void *, int);
static void psycho_dmamap_unload(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t);
-static void psycho_dmamap_sync(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, int);
+static void psycho_dmamap_sync(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t,
+ bus_dmasync_op_t);
static int psycho_dmamem_alloc(bus_dma_tag_t, bus_dma_tag_t, void **, int,
bus_dmamap_t *);
static void psycho_dmamem_free(bus_dma_tag_t, bus_dma_tag_t, void *,
@@ -1402,7 +1403,7 @@
static void
psycho_dmamap_sync(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map,
- int op)
+ bus_dmasync_op_t op)
{
struct psycho_softc *sc;
==== //depot/projects/ia64/sys/sparc64/sbus/sbus.c#14 (text+ko) ====
@@ -100,7 +100,7 @@
* from: @(#)sbus.c 8.1 (Berkeley) 6/11/93
* from: NetBSD: sbus.c,v 1.46 2001/10/07 20:30:41 eeh Exp
*
- * $FreeBSD: src/sys/sparc64/sbus/sbus.c,v 1.18 2003/05/26 04:00:52 scottl Exp $
+ * $FreeBSD: src/sys/sparc64/sbus/sbus.c,v 1.19 2003/05/27 04:59:59 scottl Exp $
*/
/*
@@ -242,7 +242,8 @@
static int sbus_dmamap_load_uio(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t,
struct uio *, bus_dmamap_callback2_t *, void *, int);
static void sbus_dmamap_unload(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t);
-static void sbus_dmamap_sync(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, int);
+static void sbus_dmamap_sync(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t,
+ bus_dmasync_op_t);
static int sbus_dmamem_alloc(bus_dma_tag_t, bus_dma_tag_t, void **, int,
bus_dmamap_t *);
static void sbus_dmamem_free(bus_dma_tag_t, bus_dma_tag_t, void *,
@@ -979,7 +980,7 @@
static void
sbus_dmamap_sync(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map,
- int op)
+ bus_dmasync_op_t op)
{
struct sbus_softc *sc = (struct sbus_softc *)pdmat->dt_cookie;
==== //depot/projects/ia64/sys/sparc64/sparc64/bus_machdep.c#17 (text+ko) ====
@@ -106,7 +106,7 @@
* and
* from: FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.24 2001/08/15
*
- * $FreeBSD: src/sys/sparc64/sparc64/bus_machdep.c,v 1.29 2003/05/26 16:59:00 scottl Exp $
+ * $FreeBSD: src/sys/sparc64/sparc64/bus_machdep.c,v 1.30 2003/05/27 04:59:59 scottl Exp $
*/
#include <sys/param.h>
@@ -169,7 +169,8 @@
static int nexus_dmamap_load_uio(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t,
struct uio *, bus_dmamap_callback2_t *, void *, int);
static void nexus_dmamap_unload(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t);
-static void nexus_dmamap_sync(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, int);
+static void nexus_dmamap_sync(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t,
+ bus_dmasync_op_t);
static int nexus_dmamem_alloc(bus_dma_tag_t, bus_dma_tag_t, void **, int,
bus_dmamap_t *);
static void nexus_dmamem_free(bus_dma_tag_t, bus_dma_tag_t, void *,
@@ -548,7 +549,7 @@
*/
static void
nexus_dmamap_sync(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map,
- int op)
+ bus_dmasync_op_t op)
{
/*
==== //depot/projects/ia64/sys/sparc64/sparc64/iommu.c#17 (text+ko) ====
@@ -106,7 +106,7 @@
* from: @(#)sbus.c 8.1 (Berkeley) 6/11/93
* from: NetBSD: iommu.c,v 1.42 2001/08/06 22:02:58 eeh Exp
*
- * $FreeBSD: src/sys/sparc64/sparc64/iommu.c,v 1.27 2003/05/26 16:59:00 scottl Exp $
+ * $FreeBSD: src/sys/sparc64/sparc64/iommu.c,v 1.28 2003/05/27 04:59:59 scottl Exp $
*/
/*
@@ -992,7 +992,7 @@
void
iommu_dvmamap_sync(bus_dma_tag_t pt, bus_dma_tag_t dt, struct iommu_state *is,
- bus_dmamap_t map, int op)
+ bus_dmamap_t map, bus_dmasync_op_t op)
{
struct bus_dmamap_res *r;
vm_offset_t va;
More information about the p4-projects
mailing list