git.droids-corp.org
/
protos
/
imu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add missing sd_log.[ch] files
[protos/imu.git]
/
i2cm_sw.c
diff --git
a/i2cm_sw.c
b/i2cm_sw.c
index
8c8e238
..
a7da2b5
100644
(file)
--- a/
i2cm_sw.c
+++ b/
i2cm_sw.c
@@
-112,7
+112,7
@@
void i2cm_register_event(void (*func)(i2cm_state state))
}
}
-uint8_t i2cm_send_byte(uint8_t byte)
+
static
uint8_t i2cm_send_byte(uint8_t byte)
{
uint8_t mask;
uint8_t err = 0;
{
uint8_t mask;
uint8_t err = 0;
@@
-136,9
+136,6
@@
uint8_t i2cm_send_byte(uint8_t byte)
I2CM_DELAY();
mask >>=1;
I2CM_DELAY();
mask >>=1;
- // delay needed ?
- //I2CM_DELAY();
-
// clock High
I2C_HIGH(I2CM_SCL_PORT, I2CM_SCL_BIT);
I2CM_DELAY();
// clock High
I2C_HIGH(I2CM_SCL_PORT, I2CM_SCL_BIT);
I2CM_DELAY();
@@
-160,8
+157,8
@@
uint8_t i2cm_send_byte(uint8_t byte)
I2CM_DELAY();
while ( bit_is_clear(PIN(I2CM_SCL_PORT), I2CM_SCL_BIT) );// slave handshake
I2CM_DELAY();
while ( bit_is_clear(PIN(I2CM_SCL_PORT), I2CM_SCL_BIT) );// slave handshake
- // receive ACK
- if (bit_is_set(
I2CM_SDA_PORT
, I2CM_SDA_BIT))
+ //
we should
receive ACK
+ if (bit_is_set(
PIN(I2CM_SDA_PORT)
, I2CM_SDA_BIT))
err = I2CM_SENT_NO_ACK;
// clock low
err = I2CM_SENT_NO_ACK;
// clock low
@@
-282,14
+279,11
@@
uint8_t i2cm_receive_byte(uint8_t last)
}
}
-
-uint8_t i2c_send(uint8_t addr, uint8_t* data, uint8_t len, uint8_t ctrl)
+uint8_t i2cm_send(uint8_t addr, uint8_t* data, uint8_t len)
{
uint8_t i;
uint8_t err = 0;
{
uint8_t i;
uint8_t err = 0;
- (void)ctrl; /* ignored */
-
err = i2cm_send_start((addr<<1) | 0);
if (err)
return err;
err = i2cm_send_start((addr<<1) | 0);
if (err)
return err;
@@
-305,15
+299,13
@@
uint8_t i2c_send(uint8_t addr, uint8_t* data, uint8_t len, uint8_t ctrl)
}
}
-uint8_t i2c_buf[0x20];
+uint8_t i2c_buf[0x20];
/* XXX */
-uint8_t i2c
_recv(uint8_t addr, uint8_t len, uint8_t ctrl
)
+uint8_t i2c
m_recv(uint8_t addr, uint8_t len
)
{
uint8_t i;
uint8_t err = 0;
{
uint8_t i;
uint8_t err = 0;
- (void)ctrl; /* ignored */
-
err = i2cm_send_start((addr<<1) | 1);
if (err)
return err;
err = i2cm_send_start((addr<<1) | 1);
if (err)
return err;
@@
-331,12
+323,10
@@
uint8_t i2c_recv(uint8_t addr, uint8_t len, uint8_t ctrl)
}
}
-uint8_t i2c_get_recv_buffer(uint8_t* buf, uint8_t len)
+uint8_t i2c
m
_get_recv_buffer(uint8_t* buf, uint8_t len)
{
uint8_t i;
for (i=0; i<len; i++)
buf[i] = i2c_buf[i];
return len;
}
{
uint8_t i;
for (i=0; i<len; i++)
buf[i] = i2c_buf[i];
return len;
}
-
-