Module Name: src
Committed By: thorpej
Date: Mon Dec 23 02:39:47 UTC 2019
Modified Files:
src/sys/dev/i2c: at24cxx.c
Log Message:
seeprom_bootstrap_read(): no need to hard-code I2C_F_POLL here because
the i2c code will ensure it's there if the system is cold.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/i2c/at24cxx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/i2c/at24cxx.c
diff -u src/sys/dev/i2c/at24cxx.c:1.33 src/sys/dev/i2c/at24cxx.c:1.34
--- src/sys/dev/i2c/at24cxx.c:1.33 Fri Nov 29 04:59:15 2019
+++ src/sys/dev/i2c/at24cxx.c Mon Dec 23 02:39:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: at24cxx.c,v 1.33 2019/11/29 04:59:15 hkenken Exp $ */
+/* $NetBSD: at24cxx.c,v 1.34 2019/12/23 02:39:47 thorpej Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at24cxx.c,v 1.33 2019/11/29 04:59:15 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at24cxx.c,v 1.34 2019/12/23 02:39:47 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -416,7 +416,7 @@ seeprom_bootstrap_read(i2c_tag_t tag, in
/* We are very forgiving about devsize during bootstrap. */
cmdlen = (devsize >= 4096) ? 2 : 1;
- if (iic_acquire_bus(tag, I2C_F_POLL) != 0)
+ if (iic_acquire_bus(tag, 0) != 0)
return (-1);
while (len) {
@@ -432,7 +432,7 @@ seeprom_bootstrap_read(i2c_tag_t tag, in
/* Read a single byte. */
if (iic_exec(tag, I2C_OP_READ_WITH_STOP, addr,
cmdbuf, cmdlen, rvp, 1, I2C_F_POLL)) {
- iic_release_bus(tag, I2C_F_POLL);
+ iic_release_bus(tag, 0);
return (-1);
}
@@ -441,6 +441,6 @@ seeprom_bootstrap_read(i2c_tag_t tag, in
offset++;
}
- iic_release_bus(tag, I2C_F_POLL);
+ iic_release_bus(tag, 0);
return (0);
}
