From owner-p4-projects@FreeBSD.ORG  Sat Apr  1 00:58:28 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 A7CD016A420; Sat,  1 Apr 2006 00:58:28 +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 2D6F816A401
	for <perforce@freebsd.org>; Sat,  1 Apr 2006 00:58:28 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EFFAE43D45
	for <perforce@freebsd.org>; Sat,  1 Apr 2006 00:58:27 +0000 (GMT)
	(envelope-from imp@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 k310wQbJ041770
	for <perforce@freebsd.org>; Sat, 1 Apr 2006 00:58:27 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k310wQJ1041764
	for perforce@freebsd.org; Sat, 1 Apr 2006 00:58:26 GMT
	(envelope-from imp@freebsd.org)
Date: Sat, 1 Apr 2006 00:58:26 GMT
Message-Id: <200604010058.k310wQJ1041764@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 94374 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: Sat, 01 Apr 2006 00:58:29 -0000

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

Change 94374 by imp@imp_Speedy on 2006/04/01 00:57:58

	Compile!

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#8 edit
.. //depot/projects/arm/src/sys/arm/conf/KB920X#25 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#8 (text+ko) ====

@@ -42,6 +42,8 @@
 #include <arm/at91/at91_twireg.h>
 #include <arm/at91/at91_twiio.h>
 
+#include "iicbus_if.h"
+
 struct at91_twi_softc
 {
 	device_t dev;			/* Myself */
@@ -431,17 +433,11 @@
 static int
 at91_twi_start(device_t dev, u_char slave, int timeout)
 {
-	struct at91_twi_softc *sc = device_get_softc(dev);
-	int error = 0;
-
-	return (0);
-error:
-	at91_twi_stop(dev);
-	return (error);
+	return EIO;
 }
 
 static int
-at91_write(device_t dev, char *buf, int len, int *sent, int timeout /* us */)
+at91_twi_write(device_t dev, char *buf, int len, int *sent, int timeout /* us */)
 {
 	return EIO;
 }
@@ -466,7 +462,7 @@
 	DEVMETHOD(device_detach,	at91_twi_detach),
 
 	/* iicbus interface */
-	DEVMETHOD(iicbus_callback,	iicbus_null_callback),
+//	DEVMETHOD(iicbus_callback,	iicbus_null_callback),
 	DEVMETHOD(iicbus_repeated_start, at91_twi_repeated_start),
 	DEVMETHOD(iicbus_start,		at91_twi_start),
 	DEVMETHOD(iicbus_stop,		at91_twi_stop),

==== //depot/projects/arm/src/sys/arm/conf/KB920X#25 (text+ko) ====

@@ -97,3 +97,6 @@
 device		at91_twi		# TWI: Two Wire Interface
 device		at91_spi		# SPI:
 device		at91_ssc
+# iic
+device		iic
+device		iicbus