PERFORCE change 94374 for review

[Warner Losh]

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

Change 94374 by imp at 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