acknowledge all interrupts when sending, fixes a crash...

[rsbs2] / bmc / i2c.c

diff --git a/bmc/i2c.c b/bmc/i2c.c
index 6ffa31f826ea2225f6a5907758b14dd03044471b..f0816f0021cefb1e6a514508e9ec169e501455de 100644 (file)
--- a/bmc/i2c.c
+++ b/bmc/i2c.c
@@ -21,7 +21,11 @@ void i2c_init()
        TWDR = 0x00;
        TWCR &= ~((1<<TWSTA) | (1<<TWSTO));
        TWCR |= ((1<<TWEA) | (1<<TWEN) | (1<<TWIE)); 
+#ifdef __AVR_ATmega16__
        PORTC = 0x03;
+#else
+#error "Don't know how to set pullups for this chip, please add support"
+#endif
 }
 
 void i2c_send(unsigned char *buf, int len)
@@ -35,34 +39,47 @@ void i2c_send(unsigned char *buf, int len)
        TWCR = ((1<<TWINT) | (1<<TWSTA) | (1<<TWEN)); /* Send start */
 
        while(!(TWCR & (1<<TWINT))) {}
-       if ((TW_STATUS & 0xf8) != TW_START)
+       if (TW_STATUS != TW_START) {
+#ifdef DEBUG
+               printf("I2C: error sending START\n");
+#endif
                goto out;
+       }
 
        TWDR = buf[0]; /* SLA_W */
        TWCR = ((1<<TWINT) | (1<<TWEN));
 
        while(!(TWCR & (1<<TWINT))) {}
-       if ((TW_STATUS & 0xf8) != TW_MT_SLA_ACK)
-               goto out;
+       if (TW_STATUS != TW_MT_SLA_ACK) {
+#ifdef DEBUG
+               printf("I2C: error sending SLA_W\n");
+#endif
+               goto out2;
+       }
        
        for(i = 1; i < len; i++) {
                TWDR = buf[i]; /* Send Data */
                TWCR = ((1<<TWINT) | (1<<TWEN));
 
                while(!(TWCR & (1<<TWINT))) {}
-               if ((TW_STATUS & 0xf8) != TW_MT_DATA_ACK)
-                       goto out;
+               if (TW_STATUS != TW_MT_DATA_ACK) {
+#ifdef DEBUG
+                       printf("I2C: error sending DATA byte %d\n", i);
+#endif
+                       goto out2;
+               }
        }
 
-       TWCR = ((1<<TWINT) | (1<<TWEN) | (1<<TWSTO));
-       while(TWCR & (1<<TWSTO)) {}
-
 #ifdef DEBUG
        printf("I2C Data sent\n");
 #endif
 
+out2:
+       TWCR = ((1<<TWINT) | (1<<TWEN) | (1<<TWSTO));
+       while(TWCR & (1<<TWSTO)) {}
+
+       TWCR = (1<<TWINT) | (1<<TWEN);
 out:   
-       TWDR = 0x00;
        TWCR = old_TWCR;
        SREG = old_SREG;
 }
@@ -72,7 +89,7 @@ ISR (TWI_vect, ISR_BLOCK)
        if (i2c_done)
                TWCR_RESET;
 
-       switch (TW_STATUS & 0xf8) {
+       switch (TW_STATUS) {
                case TW_SR_SLA_ACK:
 #ifdef DEBUG
                        printf("I2C: Slave 0x%02x adressed\n", TWDR);
@@ -107,9 +124,16 @@ ISR (TWI_vect, ISR_BLOCK)
                        TWCR_RESET;
                        break;
 
+               case TW_NO_INFO:
+#ifdef DEBUG
+                       printf("I2C: TW_NO_INFO received status 0x%2x\n", TW_STATUS);
+#endif
+                       TWCR |= (1<<TWINT);
+                       break;
+
                default:
 #ifdef DEBUG
-                       printf("I2C: Unimplemented status 0x%02x\n", (TW_STATUS & 0xf8));
+                       printf("I2C: Unimplemented status 0x%02x\n", TW_STATUS);
 #endif
                        TWCR_RESET;
                        break;