The unified diff between revisions [b85a3bbc..] and [dea51752..] is displayed below. It can also be downloaded as a raw diff.
This diff has been restricted to the following files: 'i2c.c'
# # old_revision [b85a3bbccc40f21e02f50101af764be93eeb9538] # new_revision [dea51752ff3061ddca80de6685b04dac53ac77e1] # # patch "i2c.c" # from [aa38cfd51b998ec3960be6052827278b26edcc40] # to [b6b9ee4258edaf778f2fc0602e206e9e47d38496] # ============================================================ --- i2c.c aa38cfd51b998ec3960be6052827278b26edcc40 +++ i2c.c b6b9ee4258edaf778f2fc0602e206e9e47d38496 @@ -25,17 +25,12 @@ void init_i2c(void) { IREG(I2CONSET) = 0x40; /* Enable I2C ready for Master Tx */ /* Set up for just under 400kHz */ -#if 0 +#ifdef I2C_FAST IWREG(I2SCLL) = (25 * 100); IWREG(I2SCLH) = (12 * 100); #else -# if 0 - IWREG(I2SCLL) = 1475; /* ~5kHz */ - IWREG(I2SCLH) = 1475; -# else IWREG(I2SCLL) = 73; /* ~100kHz */ IWREG(I2SCLH) = 73; -# endif #endif } @@ -79,7 +74,7 @@ bool i2c_send_address(int addr, bool wri return i2c_send_data((addr<<1) + (write?0:1)); } -bool i2c_send_data(int data) +bool i2c_send_data(unsigned int data) { IREG(I2DAT) = data; IREG(I2CONCLR) = STAFLAG | STOFLAG | SIFLAG; @@ -94,7 +89,7 @@ bool i2c_send_data(int data) } } -bool i2c_receive_data(int *data, bool last) +bool i2c_receive_data(unsigned int *data, bool last) { if (!last) IREG(I2CONSET) = AAFLAG;