I2C master mode implemented and more decoding

[rsbs2] / bmc / i2c.c

diff --git a/bmc/i2c.c b/bmc/i2c.c
index 4ada02e6c011ebf1cfd0e33c73563d2861885e05..6550c92fc62b084bc6d572cc8ae90b046e3d9045 100644 (file)
--- a/bmc/i2c.c
+++ b/bmc/i2c.c
@@ -2,7 +2,7 @@
 #include <avr/interrupt.h>
 #include <stdio.h>
 #include "i2c.h"
 #include <avr/interrupt.h>
 #include <stdio.h>
 #include "i2c.h"

-#include "bmc.h"
+#include "ipmb.h"

 
 #define TWCR_ACK TWCR = (1<<TWEN)|(1<<TWIE)|(1<<TWINT)|(1<<TWEA)|(0<<TWSTA)|(0<<TWSTO)|(0<<TWWC);  
 #define TWCR_NACK TWCR = (1<<TWEN)|(1<<TWIE)|(1<<TWINT)|(0<<TWEA)|(0<<TWSTA)|(0<<TWSTO)|(0<<TWWC);
 
 #define TWCR_ACK TWCR = (1<<TWEN)|(1<<TWIE)|(1<<TWINT)|(1<<TWEA)|(0<<TWSTA)|(0<<TWSTO)|(0<<TWWC);  
 #define TWCR_NACK TWCR = (1<<TWEN)|(1<<TWIE)|(1<<TWINT)|(0<<TWEA)|(0<<TWSTA)|(0<<TWSTO)|(0<<TWWC);


@@ -21,6 +21,47 @@ void i2c_init()
        PORTC = 0x03;
 }
 
        PORTC = 0x03;
 }
 

+void i2c_send(unsigned char *buf, int len)
+{
+       uint8_t old_TWCR = TWCR;
+       uint8_t old_SREG = SREG;
+       int i;
+
+       cli();
+
+       TWCR = ((1<<TWINT) | (1<<TWSTA) | (1<<TWEN)); /* Send start */
+
+       while(!(TWCR & (1<<TWINT))) {}
+       if ((TW_STATUS & 0xf8) != TW_START)
+               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;
+       
+       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;
+       }
+
+       TWCR = ((1<<TWINT) | (1<<TWEN) | (1<<TWSTO));
+
+       printf("I2C Data sent 0x%02x\n", TW_STATUS);
+
+
+out:   
+       TWDR = 0x00;
+       TWCR = old_TWCR;
+       SREG = old_SREG;
+}
+

 ISR (TWI_vect, ISR_BLOCK)
 {
        switch (TW_STATUS) {
 ISR (TWI_vect, ISR_BLOCK)
 {
        switch (TW_STATUS) {


@@ -47,7 +88,7 @@ ISR (TWI_vect, ISR_BLOCK)
 #ifdef DEBUG
                        printf("I2C: STOP received\n");
 #endif
 #ifdef DEBUG
                        printf("I2C: STOP received\n");
 #endif

-                       decode_bmc_cmd((unsigned char*)databuf, pos);
+                       decode_ipmb_pkt((unsigned char*)databuf, pos);

                        pos = 0x00;
                        TWCR_RESET;
                        break;
                        pos = 0x00;
                        TWCR_RESET;
                        break;