From owner-svn-src-all@FreeBSD.ORG  Thu Jul  1 18:51:18 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 6C2D81065675;
	Thu,  1 Jul 2010 18:51:18 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5BBF18FC19;
	Thu,  1 Jul 2010 18:51:18 +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 o61IpI2E054348;
	Thu, 1 Jul 2010 18:51:18 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o61IpI9r054345;
	Thu, 1 Jul 2010 18:51:18 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201007011851.o61IpI9r054345@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 1 Jul 2010 18:51:18 +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: r209634 - head/sys/x86/isa
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: Thu, 01 Jul 2010 18:51:18 -0000

Author: mav
Date: Thu Jul  1 18:51:18 2010
New Revision: 209634
URL: http://svn.freebsd.org/changeset/base/209634

Log:
  Rework r209456:
  Instead of using fake rid (which ISA doesn't like), delete untrusted
  IRQ resource and let it be recreated.

Modified:
  head/sys/x86/isa/atrtc.c
  head/sys/x86/isa/clock.c

Modified: head/sys/x86/isa/atrtc.c
==============================================================================
--- head/sys/x86/isa/atrtc.c	Thu Jul  1 17:46:12 2010	(r209633)
+++ head/sys/x86/isa/atrtc.c	Thu Jul  1 18:51:18 2010	(r209634)
@@ -259,7 +259,8 @@ atrtc_attach(device_t dev)
 	if (!atrtcclock_disable &&
 	    (resource_int_value(device_get_name(dev), device_get_unit(dev),
 	     "clock", &i) != 0 || i != 0)) {
-	    	sc->intr_rid = -1;
+		sc->intr_rid = 0;
+		bus_delete_resource(dev, SYS_RES_IRQ, sc->intr_rid);
 		if (!(sc->intr_res = bus_alloc_resource(dev, SYS_RES_IRQ,
 		    &sc->intr_rid, 8, 8, 1, RF_ACTIVE))) {
 			device_printf(dev,"Can't map interrupt.\n");

Modified: head/sys/x86/isa/clock.c
==============================================================================
--- head/sys/x86/isa/clock.c	Thu Jul  1 17:46:12 2010	(r209633)
+++ head/sys/x86/isa/clock.c	Thu Jul  1 18:51:18 2010	(r209634)
@@ -535,7 +535,8 @@ attimer_attach(device_t dev)
 	tc_init(&sc->tc);
 	if (resource_int_value(device_get_name(dev), device_get_unit(dev),
 	    "clock", &i) != 0 || i != 0) {
-	    	sc->intr_rid = -1;
+	    	sc->intr_rid = 0;
+		bus_delete_resource(dev, SYS_RES_IRQ, sc->intr_rid);
 		if (!(sc->intr_res = bus_alloc_resource(dev, SYS_RES_IRQ,
 		    &sc->intr_rid, 0, 0, 1, RF_ACTIVE))) {
 			device_printf(dev,"Can't map interrupt.\n");