use CTC unit to generate correct timings for power/reset

[rsbs2] / bmc / i2c.c

diff --git a/bmc/i2c.c b/bmc/i2c.c
index f081991ad34c5c1b5a449b147fc527afe77af976..92c00cc2ea5d71a6995f509a09bfa376a9b662c8 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)
@@ -72,7 +76,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);
@@ -87,6 +91,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 +113,7 @@ ISR (TWI_vect, ISR_BLOCK)
 
                default:
 #ifdef DEBUG
-                       printf("I2C: Unimplemented status 0x%02x\n", TW_STATUS);
+                       printf("I2C: Unimplemented status 0x%02x\n", (TW_STATUS & 0xf8));
 #endif
                        TWCR_RESET;
                        break;