From owner-p4-projects@FreeBSD.ORG  Tue Apr 11 00:59:53 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 43F7916A403; Tue, 11 Apr 2006 00:59:53 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1BC0516A400
	for <perforce@freebsd.org>; Tue, 11 Apr 2006 00:59:53 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 674AA43D6A
	for <perforce@freebsd.org>; Tue, 11 Apr 2006 00:59:47 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3B0xleT051447
	for <perforce@freebsd.org>; Tue, 11 Apr 2006 00:59:47 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3B0xkKp051429
	for perforce@freebsd.org; Tue, 11 Apr 2006 00:59:46 GMT
	(envelope-from marcel@freebsd.org)
Date: Tue, 11 Apr 2006 00:59:46 GMT
Message-Id: <200604110059.k3B0xkKp051429@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 94962 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Apr 2006 00:59:53 -0000

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

Change 94962 by marcel@marcel_nfs on 2006/04/11 00:59:26

	override the serdev I/F methods for ihand() and ipend() for the
	puc(4) attachment.

Affected files ...

.. //depot/projects/uart/dev/uart/uart_bus.h#46 edit
.. //depot/projects/uart/dev/uart/uart_bus_puc.c#12 edit
.. //depot/projects/uart/dev/uart/uart_core.c#53 edit

Differences ...

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

@@ -140,6 +140,7 @@
 int uart_bus_attach(device_t dev);
 int uart_bus_detach(device_t dev);
 serdev_intr_t *uart_bus_ihand(device_t dev, int ipend);
+int uart_bus_ipend(device_t dev);
 int uart_bus_probe(device_t dev, int regshft, int rclk, int rid, int chan);
 int uart_bus_sysdev(device_t dev);
 

==== //depot/projects/uart/dev/uart/uart_bus_puc.c#12 (text+ko) ====

@@ -1,4 +1,5 @@
 /*-
+ * Copyright (c) 2006 Marcel Moolenaar.  All rights reserved.
  * Copyright (c) 2002 JF Hay.  All rights reserved.
  * Copyright (c) 2001 M. Warner Losh.  All rights reserved.
  *
@@ -36,6 +37,9 @@
 #include <sys/rman.h>
 #include <machine/resource.h>
 
+#include <sys/serial.h>
+#include <serdev_if.h>
+
 #include <dev/pci/pcivar.h>
 #include <dev/puc/pucvar.h>
 
@@ -49,6 +53,9 @@
 	DEVMETHOD(device_probe,		uart_puc_probe),
 	DEVMETHOD(device_attach,	uart_bus_attach),
 	DEVMETHOD(device_detach,	uart_bus_detach),
+	/* Serdev interface */
+	DEVMETHOD(serdev_ihand,		uart_bus_ihand),
+	DEVMETHOD(serdev_ipend,		uart_bus_ipend),
 	{ 0, 0 }
 };
 

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

@@ -267,6 +267,15 @@
 }
 
 int
+uart_bus_ipend(device_t dev)
+{
+	struct uart_softc *sc;
+
+	sc = device_get_softc(dev);
+	return (UART_IPEND(sc));
+}
+
+int
 uart_bus_sysdev(device_t dev)
 {
 	struct uart_softc *sc;