From owner-svn-src-all@FreeBSD.ORG  Thu Feb  5 19:31:56 2009
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 0F02A1065677;
	Thu,  5 Feb 2009 19:31:56 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D79AD8FC1A;
	Thu,  5 Feb 2009 19:31:55 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n15JVtht036037;
	Thu, 5 Feb 2009 19:31:55 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n15JVtnO036035;
	Thu, 5 Feb 2009 19:31:55 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200902051931.n15JVtnO036035@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 5 Feb 2009 19:31:55 +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: r188173 - head/sys/dev/ppc
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, 05 Feb 2009 19:31:57 -0000

Author: imp
Date: Thu Feb  5 19:31:55 2009
New Revision: 188173
URL: http://svn.freebsd.org/changeset/base/188173

Log:
  reset_epp and ecp_sync both return int.

Modified:
  head/sys/dev/ppc/ppc.c
  head/sys/dev/ppc/ppcvar.h

Modified: head/sys/dev/ppc/ppc.c
==============================================================================
--- head/sys/dev/ppc/ppc.c	Thu Feb  5 19:30:55 2009	(r188172)
+++ head/sys/dev/ppc/ppc.c	Thu Feb  5 19:31:55 2009	(r188173)
@@ -115,7 +115,7 @@ static char *ppc_epp_protocol[] = { " (E
 /*
  * ppc_ecp_sync()		XXX
  */
-void
+int
 ppc_ecp_sync(device_t dev)
 {
 	int i, r;
@@ -123,22 +123,22 @@ ppc_ecp_sync(device_t dev)
 
 	PPC_ASSERT_LOCKED(ppc);
 	if (!(ppc->ppc_avm & PPB_ECP) && !(ppc->ppc_dtm & PPB_ECP))
-		return;
+		return 0;
 
 	r = r_ecr(ppc);
 	if ((r & 0xe0) != PPC_ECR_EPP)
-		return;
+		return 0;
 
 	for (i = 0; i < 100; i++) {
 		r = r_ecr(ppc);
 		if (r & 0x1)
-			return;
+			return 0;
 		DELAY(100);
 	}
 
 	device_printf(dev, "ECP sync failed as data still present in FIFO.\n");
 
-	return;
+	return 0;
 }
 
 /*
@@ -1613,7 +1613,7 @@ ppc_write(device_t dev, char *buf, int l
 	return (EINVAL);
 }
 
-void
+int
 ppc_reset_epp(device_t dev)
 {
 	struct ppc_data *ppc = DEVTOSOFTC(dev);
@@ -1621,7 +1621,7 @@ ppc_reset_epp(device_t dev)
 	PPC_ASSERT_LOCKED(ppc);
 	ppc_reset_epp_timeout(ppc);
 
-	return;
+	return 0;
 }
 
 int

Modified: head/sys/dev/ppc/ppcvar.h
==============================================================================
--- head/sys/dev/ppc/ppcvar.h	Thu Feb  5 19:30:55 2009	(r188172)
+++ head/sys/dev/ppc/ppcvar.h	Thu Feb  5 19:31:55 2009	(r188173)
@@ -44,8 +44,8 @@ struct resource *ppc_alloc_resource(devi
     int *rid, u_long start, u_long end, u_long count, u_int flags);
 int ppc_release_resource(device_t bus, device_t child, int type, int rid,
     struct resource *r);
-void ppc_reset_epp(device_t);
-void ppc_ecp_sync(device_t);
+int ppc_reset_epp(device_t);
+int ppc_ecp_sync(device_t);
 int ppc_setmode(device_t, int);
 
 extern devclass_t ppc_devclass;