fish

1 files changed, 24 insertions, 24 deletions

diff --git a/app/i2c.c b/app/i2c.c
index db60931..89249d0 100644
--- a/app/i2c.c
+++ b/app/i2c.c
@@ -9,7 +9,7 @@
 #define I2C_BB_DELAY do { delay_us(1); } while (0)
 
 int
-i2c1_bb (int scl, int sda)
+i2c_bb (int scl, int sda)
 {
   if (scl)
     gpio_set (GPIO_SCL, SCL);
@@ -26,62 +26,62 @@ i2c1_bb (int scl, int sda)
 
 
 void
-i2c1_bb_start (void)
+i2c_bb_start (void)
 {
-  i2c1_bb (1, 1);
+  i2c_bb (1, 1);
   I2C_BB_DELAY;
-  i2c1_bb (1, 0);
+  i2c_bb (1, 0);
   I2C_BB_DELAY;
-  i2c1_bb (0, 0);
+  i2c_bb (0, 0);
   I2C_BB_DELAY;
 }
 
 
 void
-i2c1_bb_stop (void)
+i2c_bb_stop (void)
 {
-  i2c1_bb (0, 0);
+  i2c_bb (0, 0);
   I2C_BB_DELAY;
-  i2c1_bb (1, 0);
+  i2c_bb (1, 0);
   I2C_BB_DELAY;
-  i2c1_bb (1, 1);
+  i2c_bb (1, 1);
   I2C_BB_DELAY;
 }
 
 int
-i2c1_bb_send_data (uint8_t v)
+i2c_bb_send_data (uint8_t v)
 {
   int c;
 
 
   for (c = 0x80; c; c >>= 1)
     {
-      i2c1_bb (0, c & v);
+      i2c_bb (0, c & v);
       I2C_BB_DELAY;
-      i2c1_bb (1, c & v);
+      i2c_bb (1, c & v);
       I2C_BB_DELAY;
-      i2c1_bb (0, c & v);
+      i2c_bb (0, c & v);
       I2C_BB_DELAY;
     }
 
-  i2c1_bb (0, 1);
+  i2c_bb (0, 1);
   I2C_BB_DELAY;
-  i2c1_bb (1, 1);
+  i2c_bb (1, 1);
   I2C_BB_DELAY;
-  c = i2c1_bb (1, 1);
-  i2c1_bb (0, 1);
+  c = i2c_bb (1, 1);
+  i2c_bb (0, 1);
 
   return c;
 }
 
 
 int
-i2c1_bb_start_transaction (uint8_t a, int wnr)
+i2c_bb_start_transaction (uint8_t a, int wnr)
 {
   int ret;
 
-  i2c1_bb_start ();
-  ret = i2c1_bb_send_data (a << 1 | ! !(wnr));
+  i2c_bb_start ();
+  ret = i2c_bb_send_data (a << 1 | ! !(wnr));
 
 
   return ret;
@@ -89,7 +89,7 @@ i2c1_bb_start_transaction (uint8_t a, int wnr)
 
 #if 0
 void
-i2c1_bb_scan (void)
+i2c_bb_scan (void)
 {
   int i, r;
 
@@ -118,15 +118,15 @@ i2c1_bb_scan (void)
 #endif
 
 void
-i2c1_bb_init (void)
+i2c_bb_init (void)
 {
   gpio_set_mode (GPIO_SCL, GPIO_MODE_OUTPUT_50_MHZ,
                  GPIO_CNF_OUTPUT_OPENDRAIN, SCL);
   gpio_set_mode (GPIO_SDA, GPIO_MODE_OUTPUT_50_MHZ,
                  GPIO_CNF_OUTPUT_OPENDRAIN, SDA);
 
-  i2c1_bb_start ();
-  i2c1_bb_stop ();
+  i2c_bb_start ();
+  i2c_bb_stop ();
 
 
 }