srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

Revert "runtime/i2c: more conservative timings" 

This reverts commit 799c2c77c4.
This commit is contained in:
Sebastien Bourdeauducq 2016-03-25 14:55:40 +08:00
parent e9ca125976
commit b190581102
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artiq/runtime/i2c.c
View File

@ -139,7 +139,6 @@ int i2c_write(int busno, int b)
for(i=7;i>=0;i--) { for(i=7;i>=0;i--) {
/* Set SCL low and set our bit on SDA */ /* Set SCL low and set our bit on SDA */
i2c_scl_o(busno, 0); i2c_scl_o(busno, 0);
i2c_halfperiod(); /* make sure SCL has settled low */
i2c_sda_oe(busno, b & (1 << i) ? 0 : 1); i2c_sda_oe(busno, b & (1 << i) ? 0 : 1);
i2c_halfperiod(); i2c_halfperiod();
/* Set SCL high ; data is shifted on the rising edge of SCL */ /* Set SCL high ; data is shifted on the rising edge of SCL */
@ -149,9 +148,8 @@ int i2c_write(int busno, int b)
/* Check ack */ /* Check ack */
/* Set SCL low, then release SDA so that the I2C target can respond */ /* Set SCL low, then release SDA so that the I2C target can respond */
i2c_scl_o(busno, 0); i2c_scl_o(busno, 0);
i2c_halfperiod(); /* make sure SCL has settled low */
i2c_sda_oe(busno, 0);
i2c_halfperiod(); i2c_halfperiod();
i2c_sda_oe(busno, 0);
/* Set SCL high and check for ack */ /* Set SCL high and check for ack */
i2c_scl_o(busno, 1); i2c_scl_o(busno, 1);
i2c_halfperiod(); i2c_halfperiod();
@ -184,7 +182,6 @@ int i2c_read(int busno, int ack)
/* Send ack */ /* Send ack */
/* Set SCL low and pull SDA low when acking */ /* Set SCL low and pull SDA low when acking */
i2c_scl_o(busno, 0); i2c_scl_o(busno, 0);
i2c_halfperiod(); /* make sure SCL has settled low */
if(ack) if(ack)
i2c_sda_oe(busno, 1); i2c_sda_oe(busno, 1);
i2c_halfperiod(); i2c_halfperiod();