From owner-svn-src-all@FreeBSD.ORG  Fri Dec 10 22:20:12 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6AD3510656C3;
	Fri, 10 Dec 2010 22:20:12 +0000 (UTC)
	(envelope-from joerg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 25C358FC08;
	Fri, 10 Dec 2010 22:20:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBAMKCja087317;
	Fri, 10 Dec 2010 22:20:12 GMT (envelope-from joerg@svn.freebsd.org)
Received: (from joerg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBAMKCXb087315;
	Fri, 10 Dec 2010 22:20:12 GMT (envelope-from joerg@svn.freebsd.org)
Message-Id: <201012102220.oBAMKCXb087315@svn.freebsd.org>
From: Joerg Wunsch <joerg@FreeBSD.org>
Date: Fri, 10 Dec 2010 22:20:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216364 - head/sys/dev/ieee488
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Dec 2010 22:20:12 -0000

Author: joerg
Date: Fri Dec 10 22:20:11 2010
New Revision: 216364
URL: http://svn.freebsd.org/changeset/base/216364

Log:
  Implement more of __ibsta: END and SRQI status bits (taken out of the
  uPD7210 IRQ status).
  
  MFC after:	1 week

Modified:
  head/sys/dev/ieee488/ibfoo.c

Modified: head/sys/dev/ieee488/ibfoo.c
==============================================================================
--- head/sys/dev/ieee488/ibfoo.c	Fri Dec 10 21:45:10 2010	(r216363)
+++ head/sys/dev/ieee488/ibfoo.c	Fri Dec 10 22:20:11 2010	(r216364)
@@ -333,6 +333,14 @@ gpib_ib_wait_xfer(struct upd7210 *u, str
 			break;
 		}
 	}
+	if ((u->rreg[ISR1] & IXR1_ENDRX) != 0) {
+		ib->ap->__retval |= END;
+		ib->ap->__ibsta |= END;
+	}
+	if ((u->rreg[ISR2] & IXR2_SRQI) != 0) {
+		ib->ap->__retval |= SRQI;
+		ib->ap->__ibsta |= SRQI;
+	}
 	ib->mode = BUSY;
 	ib->buf = NULL;
 	upd7210_wr(u, IMR1, 0);