deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* Change return type of i2c_start() to int.

Browse source 
* Move macros I2C_ENABLE() and I2C_DISABLE() to header file.
This commit is contained in:
bg- 2007-01-12 13:41:57 +00:00
parent f888f4784c
commit c42988b78b
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
platform/sky/dev/i2c.c
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)$Id: i2c.c,v 1.1 2006/09/27 09:43:55 bg- Exp $ * @(#)$Id: i2c.c,v 1.2 2007/01/12 13:41:57 bg- Exp $
*/ */
/* /*
@ -53,12 +53,10 @@
/* /*
* On the Tmote sky access to I2C/SPI/UART0 must always be exclusive. * On the Tmote sky access to I2C/SPI/UART0 must always be exclusive.
*/ */
#define I2C_ENABLE() (i2c_enable())
#define I2C_DISABLE() (i2c_disable())
void i2c_enable(void); void i2c_enable(void);
void i2c_disable(void); void i2c_disable(void);
void i2c_start(void); int i2c_start(void);
unsigned i2c_read(int send_ack); unsigned i2c_read(int send_ack);
int i2c_write(unsigned); int i2c_write(unsigned);
void i2c_stop(void); void i2c_stop(void);
@ -136,16 +134,27 @@ i2c_disable(void)
spi_busy = 0; spi_busy = 0;
} }
void int
i2c_start(void) i2c_start(void)
{ {
SDA_1(); SDA_1();
SCL_1(); SCL_1();
#if 1
SCL_WAIT_FOR_1(); SCL_WAIT_FOR_1();
#else
{
unsigned long n;
for (n = 0; n < 100000 && !SCL_IS_1; n++)
;
if (!SCL_IS_1)
return -1;
}
#endif
delay_4_7us(); delay_4_7us();
SDA_0(); SDA_0();
delay_4us(); delay_4us();
SCL_0(); SCL_0();
return 0;
} }
void void

10
platform/sky/dev/i2c.h
View file

@ -26,15 +26,21 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)$Id: i2c.h,v 1.1 2006/09/27 09:43:55 bg- Exp $ * @(#)$Id: i2c.h,v 1.2 2007/01/12 13:41:57 bg- Exp $
*/ */
#ifndef I2C_H #ifndef I2C_H
#define I2C_H #define I2C_H
/*
* On the Tmote sky access to I2C/SPI/UART0 must always be exclusive.
*/
#define I2C_ENABLE() (i2c_enable())
#define I2C_DISABLE() (i2c_disable())
void i2c_enable(void); void i2c_enable(void);
void i2c_disable(void); void i2c_disable(void);
void i2c_start(void); int i2c_start(void);
void i2c_stop(void); void i2c_stop(void);
int i2c_write(unsigned); int i2c_write(unsigned);