X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/blobdiff_plain/da7751cb0539c2ecb03ff66d05904626052e06e3..a44532dcb9a05fa29eaed0728cd0543750e47081:/bmc/i2c.c

diff --git a/bmc/i2c.c b/bmc/i2c.c
index e479fd3..c5f587b 100644
--- 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
 
@@ -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:
+#ifdef DEBUG
 			printf("I2C: Unimplemented status 0x%02x\n", TW_STATUS);
+#endif
 			TWCR_RESET;
 			break;
 	}