ignore prescaler bits in i2c status

[rsbs2] / bmc / i2c.c

diff --git a/bmc/i2c.c b/bmc/i2c.c
index e479fd32e50092ca5ceef796913a881a603d2c3a..6ffa31f826ea2225f6a5907758b14dd03044471b 100644 (file)
--- a/bmc/i2c.c
+++ b/bmc/i2c.c
@@ -9,7 +9,7 @@
 #define TWCR_NACK TWCR = (1<<TWEN)|(1<<TWIE)|(1<<TWINT)|(0<<TWEA)|(0<<TWSTA)|(0<<TWSTO)|(0<<TWWC);
 #define TWCR_RESET TWCR = (1<<TWEN)|(1<<TWIE)|(1<<TWINT)|(1<<TWEA)|(0<<TWSTA)|(1<<TWSTO)|(0<<TWWC);  
 
-volatile unsigned char i2c_databuf[12];
+volatile unsigned char i2c_databuf[24];
 volatile uint8_t i2c_len = 0x00;
 static volatile uint8_t i2c_pos = 0x00;
 volatile uint8_t i2c_done = 0x00;
@@ -55,10 +55,9 @@ void i2c_send(unsigned char *buf, int len)
        }
 
        TWCR = ((1<<TWINT) | (1<<TWEN) | (1<<TWSTO));
-       while(!(TWCR & (1<<TWSTO))) {}
+       while(TWCR & (1<<TWSTO)) {}
 
-#if 1
-       /* Timing problem... */
+#ifdef DEBUG
        printf("I2C Data sent\n");
 #endif
 
@@ -73,7 +72,7 @@ ISR (TWI_vect, ISR_BLOCK)
        if (i2c_done)
                TWCR_RESET;
 
-       switch (TW_STATUS) {
+       switch (TW_STATUS & 0xf8) {
                case TW_SR_SLA_ACK:
 #ifdef DEBUG
                        printf("I2C: Slave 0x%02x adressed\n", TWDR);
@@ -88,6 +87,11 @@ ISR (TWI_vect, ISR_BLOCK)
 #ifdef DEBUG
                        printf("I2C: Data received: 0x%02x\n", TWDR);
 #endif
+                       if (i2c_pos >= sizeof(i2c_databuf)) {
+                               TWCR_RESET;
+                               i2c_pos = 0x00;
+                               break;
+                       }
                        i2c_databuf[i2c_pos] = TWDR;
                        i2c_pos++;
                        TWCR_ACK;
@@ -104,7 +108,9 @@ ISR (TWI_vect, ISR_BLOCK)
                        break;
 
                default:
-                       printf("I2C: Unimplemented status 0x%02x\n", TW_STATUS);
+#ifdef DEBUG
+                       printf("I2C: Unimplemented status 0x%02x\n", (TW_STATUS & 0xf8));
+#endif
                        TWCR_RESET;
                        break;
        }