some cleaning

[protos/imu.git] / i2c_helper.c

diff --git a/i2c_helper.c b/i2c_helper.c
index de929ae..255aaec 100644 (file)
--- a/i2c_helper.c
+++ b/i2c_helper.c
@@ -1,32 +1,29 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <scheduler.h>
 #include <timer.h>
 
 #include <aversive/wait.h>
 #include <uart.h>
-#include <i2c.h>
-
-
 
+#include "i2cm_sw.h"
 
 uint8_t read_reg(uint8_t address_dev, uint8_t address_reg, uint8_t * value)
 {
        uint8_t err = 0;
-       err = i2c_send(address_dev, &address_reg, 1, I2C_CTRL_SYNC);
+       err = i2cm_send(address_dev, &address_reg, 1);
        if (err) {
-               printf("i2c error\r\n");
+               printf("read reg: i2c error send\r\n");
                return err;
        }
-       err = i2c_recv(address_dev, 1, I2C_CTRL_SYNC);
+       err = i2cm_recv(address_dev, 1);
        if (err) {
-               printf("i2c error\r\n");
+               printf("read reg: i2c error recv\r\n");
                return err;
        }
-       err = i2c_get_recv_buffer(value, 1);
+       err = i2cm_get_recv_buffer(value, 1);
        if (err != 1) {
-               printf("i2c error\r\n");
+               printf("read reg: i2c error get recv\r\n");
                return 0xff;
        }
        return 0;
@@ -34,23 +31,24 @@ uint8_t read_reg(uint8_t address_dev, uint8_t address_reg, uint8_t * value)
 }
 
 
-uint8_t read_reg_len(uint8_t address_dev, uint8_t address_reg, uint8_t * values, uint8_t len)
+uint8_t read_reg_len(uint8_t address_dev, uint8_t address_reg,
+       uint8_t *values, uint8_t len)
 {
        uint8_t err = 0;
-       err = i2c_send(address_dev, &address_reg, 1, I2C_CTRL_SYNC);
+       err = i2cm_send(address_dev, &address_reg, 1);
        if (err) {
-               printf("i2c error\r\n");
+               printf("read reg len: i2c error send\r\n");
                return err;
        }
-       err = i2c_recv(address_dev, len, I2C_CTRL_SYNC);
+       err = i2cm_recv(address_dev, len);
        if (err) {
-               printf("i2c error\r\n");
+               printf("read reg len: i2c error recv\r\n");
                return err;
        }
-       err = i2c_get_recv_buffer(values, len);
+       err = i2cm_get_recv_buffer(values, len);
        if (err != len) {
-               printf("i2c error\r\n");
-               return 0xDD;
+               printf("read reg len: i2c error get recv\r\n");
+               return 0xFF;
        }
        return 0;