PERFORCE change 92323 for review

[Marcel Moolenaar]

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

Change 92323 by marcel at marcel_nfs on 2006/02/24 05:46:45

	IFC @92322

Affected files ...

.. //depot/projects/uart/dev/uart/uart_bus.h#38 integrate
.. //depot/projects/uart/dev/uart/uart_bus_ebus.c#13 integrate
.. //depot/projects/uart/dev/uart/uart_core.c#44 integrate
.. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#36 integrate
.. //depot/projects/uart/dev/uart/uart_dev_sab82532.c#38 integrate
.. //depot/projects/uart/dev/uart/uart_dev_z8530.c#26 integrate

Differences ...

==== //depot/projects/uart/dev/uart/uart_bus.h#38 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/uart/uart_bus.h,v 1.10 2006/02/24 02:42:26 marcel Exp $
+ * $FreeBSD: src/sys/dev/uart/uart_bus.h,v 1.11 2006/02/24 05:40:17 marcel Exp $
  */
 
 #ifndef _DEV_UART_BUS_H_
@@ -48,11 +48,6 @@
 #define	UART_STAT_OVERRUN	0x0400
 #define	UART_STAT_PARERR	0x0800
 
-#define	UART_SIGMASK_DTE	(SER_DTR | SER_RTS)
-#define	UART_SIGMASK_DCE	(SER_DSR | SER_CTS | SER_DCD | SER_RI)
-#define	UART_SIGMASK_STATE	(UART_SIGMASK_DTE | UART_SIGMASK_DCE)
-#define	UART_SIGMASK_DELTA	(UART_SIGMASK_STATE << 8)
-
 #ifdef UART_PPS_ON_CTS
 #define	UART_SIG_DPPS		SER_DCTS
 #define	UART_SIG_PPS		SER_CTS

==== //depot/projects/uart/dev/uart/uart_bus_ebus.c#13 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_ebus.c,v 1.9 2006/02/04 23:27:16 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_ebus.c,v 1.10 2006/02/24 05:36:44 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -66,6 +66,7 @@
 	const char *nm, *cmpt;
 	struct uart_softc *sc;
 	struct uart_devinfo dummy;
+	int error;
 
 	sc = device_get_softc(dev);
 	sc->sc_class = NULL;
@@ -101,7 +102,8 @@
 	}
 	if (!strcmp(nm, "se") || !strcmp(cmpt, "sab82532")) {
 		sc->sc_class = &uart_sab82532_class;
-		return (uart_bus_probe(dev, 0, 0, 0, 1));
+		error = uart_bus_probe(dev, 0, 0, 0, 1);
+		return ((error <= 0) ? BUS_PROBE_GENERIC : error);
 	}
 
 	return (ENXIO);

==== //depot/projects/uart/dev/uart/uart_core.c#44 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.16 2006/02/24 02:42:26 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_core.c,v 1.17 2006/02/24 05:40:17 marcel Exp $");
 
 #ifndef KLD_MODULE
 #include "opt_comconsole.h"
@@ -182,7 +182,7 @@
 	 */
 	do {
 		old = sc->sc_ttypend;
-		new = old & ~UART_SIGMASK_STATE;
+		new = old & ~SER_MASK_STATE;
 		new |= sig & SER_INT_SIGMASK;
 		new |= SER_INT_SIGCHG;
 	} while (!atomic_cmpset_32(&sc->sc_ttypend, old, new));

==== //depot/projects/uart/dev/uart/uart_dev_ns8250.c#36 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.15 2006/02/24 02:42:26 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.16 2006/02/24 05:40:17 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -460,7 +460,7 @@
 		SIGCHG(msr & MSR_CTS, sig, SER_CTS, SER_DCTS);
 		SIGCHG(msr & MSR_DCD, sig, SER_DCD, SER_DDCD);
 		SIGCHG(msr & MSR_RI,  sig, SER_RI,  SER_DRI);
-		new = sig & ~UART_SIGMASK_DELTA;
+		new = sig & ~SER_MASK_DELTA;
 	} while (!atomic_cmpset_32(&sc->sc_hwsig, old, new));
 	return (sig);
 }

==== //depot/projects/uart/dev/uart/uart_dev_sab82532.c#38 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.11 2006/02/24 02:42:26 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.12 2006/02/24 05:40:17 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -470,7 +470,7 @@
 		}
 		SIGCHG(pvr, sig, SER_DSR, SER_DDSR);
 		mtx_unlock_spin(&sc->sc_hwmtx);
-		new = sig & ~UART_SIGMASK_DELTA;
+		new = sig & ~SER_MASK_DELTA;
 	} while (!atomic_cmpset_32(&sc->sc_hwsig, old, new));
 	return (sig);
 }

==== //depot/projects/uart/dev/uart/uart_dev_z8530.c#26 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.13 2006/02/24 02:42:26 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.14 2006/02/24 05:40:17 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -354,7 +354,7 @@
 		SIGCHG(bes & BES_CTS, sig, SER_CTS, SER_DCTS);
 		SIGCHG(bes & BES_DCD, sig, SER_DCD, SER_DDCD);
 		SIGCHG(bes & BES_SYNC, sig, SER_DSR, SER_DDSR);
-		new = sig & ~UART_SIGMASK_DELTA;
+		new = sig & ~SER_MASK_DELTA;
 	} while (!atomic_cmpset_32(&sc->sc_hwsig, old, new));
 	return (sig);
 }
@@ -439,7 +439,7 @@
 		SIGCHG(bes & BES_CTS, sig, SER_CTS, SER_DCTS);
 		SIGCHG(bes & BES_DCD, sig, SER_DCD, SER_DDCD);
 		SIGCHG(bes & BES_SYNC, sig, SER_DSR, SER_DDSR);
-		if (sig & UART_SIGMASK_DELTA)
+		if (sig & SER_MASK_DELTA)
 			ipend |= SER_INT_SIGCHG;
 		src = uart_getmreg(bas, RR_SRC);
 		if (src & SRC_OVR) {