From owner-p4-projects@FreeBSD.ORG  Sat Nov 25 10:53:42 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E96C916A415; Sat, 25 Nov 2006 10:53:41 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 94BA716A407
	for <perforce@FreeBSD.org>; Sat, 25 Nov 2006 10:53:41 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 613C943D58
	for <perforce@FreeBSD.org>; Sat, 25 Nov 2006 10:52:54 +0000 (GMT)
	(envelope-from gonzo@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 kAPArfhD036868
	for <perforce@FreeBSD.org>; Sat, 25 Nov 2006 10:53:41 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAPArfaJ036863
	for perforce@freebsd.org; Sat, 25 Nov 2006 10:53:41 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Sat, 25 Nov 2006 10:53:41 GMT
Message-Id: <200611251053.kAPArfaJ036863@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 110511 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Nov 2006 10:53:42 -0000

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

Change 110511 by gonzo@gonzo_hq on 2006/11/25 10:53:04

	o Disable DMA for gxemul by returning ENOENT from bus_dma_tag_create.
	    This makes sence for gxemul but should be fixed ASAP when real
	    hardware step into game.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/busdma_machdep.c#3 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips/busdma_machdep.c#3 (text+ko) ====

@@ -111,6 +111,9 @@
 	vm_offset_t		_wsize;
 };
 
+/* XXXMIPS: waith with DMA till real hardware will be used */
+#define NO_DMA
+
 #define DMAMAP_LINEAR		0x1
 #define DMAMAP_MBUF		0x2
 #define DMAMAP_UIO		0x4
@@ -189,6 +192,7 @@
  * with the tag are meant to never be defered.
  * XXX Should have a way to identify which driver is responsible here.
  */
+#ifndef NO_DMA
 static void
 dflt_lock(void *arg, bus_dma_lock_op_t op)
 {
@@ -198,6 +202,7 @@
 	printf("DRIVER_ERROR: busdma dflt_lock called\n");
 #endif
 }
+#endif
 
 static __inline bus_dmamap_t
 _busdma_alloc_dmamap(void)
@@ -238,6 +243,7 @@
 		   bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc,
 		   void *lockfuncarg, bus_dma_tag_t *dmat)
 {
+#ifndef NO_DMA
 	bus_dma_tag_t newtag;
 	int error = 0;
 
@@ -311,6 +317,9 @@
 	CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d",
 	    __func__, newtag, (newtag != NULL ? newtag->flags : 0), error);
 	return (error);
+#else 
+	return ENOSYS;
+#endif
 
 }