From owner-cvs-src@FreeBSD.ORG  Mon Jul  5 20:37:42 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id B2DA316A4CE; Mon,  5 Jul 2004 20:37:42 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id B100843D41; Mon,  5 Jul 2004 20:37:42 +0000 (GMT)
	(envelope-from phk@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i65Kbgxp089134;
	Mon, 5 Jul 2004 20:37:42 GMT
	(envelope-from phk@repoman.freebsd.org)
Received: (from phk@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i65KbgTO089133;
	Mon, 5 Jul 2004 20:37:42 GMT
	(envelope-from phk)
Message-Id: <200407052037.i65KbgTO089133@repoman.freebsd.org>
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Mon, 5 Jul 2004 20:37:42 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/i386/isa isa_dma.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jul 2004 20:37:42 -0000

phk         2004-07-05 20:37:42 UTC

  FreeBSD src repository

  Modified files:
    sys/i386/isa         isa_dma.c 
  Log:
  Something funny happened on the way to the floppy driver today...
  
  When two drivers share an ISA DMA channel, they both call isa_dmainit()
  and the second call fails if DIAGNOSTIC is on.
  
  If isa_dmainit() was already called successfully, just return silently.
  
  This only works if both drivers agree on the bounce buffer size,
  but since sharing DMA is usually only possible on very special
  hardware and then typically only for devices of the same type (which
  would have multiple instances of the same device driver), this is
  not a problem in practice.
  
  Revision  Changes    Path
  1.16      +11 -3     src/sys/i386/isa/isa_dma.c