aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/iicbus
diff options
context:
space:
mode:
authorIan Lepore <ian@FreeBSD.org>2015-10-09 22:49:50 +0000
committerIan Lepore <ian@FreeBSD.org>2015-10-09 22:49:50 +0000
commitd1e99670ae56b733bfffe627047eb0a552b5ac7e (patch)
treebbb140dc59e21b4f7aac6e3bb75a3e623af290c2 /sys/dev/iicbus
parentd2c05e201f2ad287fd1bc68c9a94f3c23f63224a (diff)
Notes
Diffstat (limited to 'sys/dev/iicbus')
-rw-r--r--sys/dev/iicbus/iicoc.c2
-rw-r--r--sys/dev/iicbus/iiconf.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/iicbus/iicoc.c b/sys/dev/iicbus/iicoc.c
index de17e74ac529..45f1692fa479 100644
--- a/sys/dev/iicbus/iicoc.c
+++ b/sys/dev/iicbus/iicoc.c
@@ -236,7 +236,7 @@ iicoc_detach(device_t dev)
static int
iicoc_start(device_t dev, u_char slave, int timeout)
{
- int error = IIC_EBUSBSY;
+ int error = IIC_EBUSERR;
struct iicoc_softc *sc;
sc = device_get_softc(dev);
diff --git a/sys/dev/iicbus/iiconf.h b/sys/dev/iicbus/iiconf.h
index 092ba8de065e..9ceaeb8bab3c 100644
--- a/sys/dev/iicbus/iiconf.h
+++ b/sys/dev/iicbus/iiconf.h
@@ -82,10 +82,10 @@
* adapter layer errors
*/
#define IIC_NOERR 0x0 /* no error occured */
-#define IIC_EBUSERR 0x1 /* bus error */
+#define IIC_EBUSERR 0x1 /* bus error (hardware not in expected state) */
#define IIC_ENOACK 0x2 /* ack not received until timeout */
#define IIC_ETIMEOUT 0x3 /* timeout */
-#define IIC_EBUSBSY 0x4 /* bus busy */
+#define IIC_EBUSBSY 0x4 /* bus busy (reserved by another client) */
#define IIC_ESTATUS 0x5 /* status error */
#define IIC_EUNDERFLOW 0x6 /* slave ready for more data */
#define IIC_EOVERFLOW 0x7 /* too much data */