X-Git-Url: http://git.droids-corp.org/?p=protos%2Fimu.git;a=blobdiff_plain;f=i2cm_sw.c;h=a7da2b560f14f1aa6d5fe7e26e51511516f84be8;hp=0b17452b838e24722252e925360e810f4a798bba;hb=950c56ac3c1e5651f54965700f385076ab63c8ea;hpb=7ac29ab17eb2281971ba376a061312b5283e4f45 diff --git a/i2cm_sw.c b/i2cm_sw.c index 0b17452..a7da2b5 100644 --- 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; @@ -136,9 +136,6 @@ uint8_t i2cm_send_byte(uint8_t byte) I2CM_DELAY(); mask >>=1; - // delay needed ? - //I2CM_DELAY(); - // clock High I2C_HIGH(I2CM_SCL_PORT, I2CM_SCL_BIT); I2CM_DELAY(); @@ -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; - (void)ctrl; /* ignored */ - 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 i2cm_recv(uint8_t addr, uint8_t len) { uint8_t i; uint8_t err = 0; - (void)ctrl; /* ignored */ - 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 i2cm_get_recv_buffer(uint8_t* buf, uint8_t len) { uint8_t i; for (i=0; i