From owner-cvs-src@FreeBSD.ORG  Fri Apr 25 02:14:54 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CDA68106566B;
	Fri, 25 Apr 2008 02:14:54 +0000 (UTC) (envelope-from imp@bsdimp.com)
Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85])
	by mx1.freebsd.org (Postfix) with ESMTP id 9553C8FC1A;
	Fri, 25 Apr 2008 02:14:54 +0000 (UTC) (envelope-from imp@bsdimp.com)
Received: from localhost (localhost [127.0.0.1])
	by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id m3P2BY7b013034;
	Thu, 24 Apr 2008 20:11:34 -0600 (MDT) (envelope-from imp@bsdimp.com)
Date: Thu, 24 Apr 2008 20:12:38 -0600 (MDT)
Message-Id: <20080424.201238.-1876858660.imp@bsdimp.com>
To: jhb@freebsd.org
From: "M. Warner Losh" <imp@bsdimp.com>
In-Reply-To: <200804241559.26710.jhb@freebsd.org>
References: <8764A4AA-DE86-43A6-B161-3159DE7E5AB8@mac.com>
	<20080424162722.GB66545@alchemy.franken.de>
	<200804241559.26710.jhb@freebsd.org>
X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: src-committers@freebsd.org, peter@wemm.org, cvs-src@freebsd.org,
	xcllnt@mac.com, cvs-all@freebsd.org, marius@alchemy.franken.de
Subject: Re: cvs commit: src/sys/amd64/amd64 machdep.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 25 Apr 2008 02:14:54 -0000

In message: <200804241559.26710.jhb@freebsd.org>
            John Baldwin <jhb@freebsd.org> writes:
: --- //depot/projects/smpng/sys/dev/sio/sio.c	2008/01/21 18:58:30
: +++ //depot/user/jhb/intr/dev/sio/sio.c	2008/04/24 14:51:42
: @@ -85,6 +85,11 @@
:  #endif
:  #include <dev/ic/ns16550.h>
:  
: +#if defined(__i386__) || defined(__amd64__)
: +#define	PROBE_IRQ
: +#include <machine/intr_machdep.h>
: +#endif
: +
:  #define	LOTS_OF_EVENTS	64	/* helps separate urgent events from input */
:  
:  #ifdef COM_MULTIPORT

noprobe is true for all busses except isa and cbus.  So really, you
could make this patch a lot simpler.

Index: sio.c
===================================================================
RCS file: /cache/ncvs/src/sys/dev/sio/sio.c,v
retrieving revision 1.473
diff -u -r1.473 sio.c
--- sio.c	25 Dec 2007 17:51:57 -0000	1.473
+++ sio.c	25 Apr 2008 02:11:08 -0000
@@ -430,8 +430,10 @@
 	int		fn;
 	device_t	idev;
 	Port_t		iobase;
+#ifdef	DEV_ISA
 	intrmask_t	irqmap[4];
 	intrmask_t	irqs;
+#endif
 	u_char		mcr_image;
 	int		result;
 	u_long		xirq;
@@ -700,9 +702,10 @@
 			device_set_softc(dev, NULL);
 			free(com, M_DEVBUF);
 		}
-		return (result == 0 ? BUS_PROBE_DEFAULT + 1 : result);
+		return (result == 0 ? BUS_PROBE_DEFAULT - 1 : result);
 	}
 
+#ifdef	DEV_ISA
 	/*
 	 * Check that
 	 *	o the CFCR, IER and MCR in UART hold the values written to them
@@ -777,7 +780,10 @@
 		device_set_softc(dev, NULL);
 		free(com, M_DEVBUF);
 	}
-	return (result == 0 ? BUS_PROBE_DEFAULT + 1 : result);
+	return (result == 0 ? BUS_PROBE_DEFAULT - 1 : result);
+#else
+	return (BUS_PROBE_DEFAULT - 1);
+#endif
 }
 
 #ifdef COM_ESP


Warner