rvtr/twl_wrapsdk
1
Fork 0
mirror of https://github.com/rvtr/twl_wrapsdk.git synced 2025-10-31 06:11:10 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

small fix

Browse Source 
git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/twl_wrapsdk/trunk@266 4ee2a332-4b2b-5046-8439-1ba90f034370
This commit is contained in:
yutaka 2007-08-31 09:53:54 +00:00
parent f9dffc8721
commit 084fd9e0d4
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
build/libraries/i2c/ARM7/src/i2c_instruction.c
View File

@ -28,10 +28,12 @@
#endif #endif
#ifdef PRINT_DEBUG_MINI #ifdef PRINT_DEBUG_MINI
#include <nitro/os/common/printf.h> #include <nitro/os/common/printf.h>
#define DBG_PRINT_FUNC() OS_TPrintf("%s(0x%02X, 0x%02X, ...);\n", __func__, deviceAddrTable[id], reg) #define DBG_PRINT_FUNC() OS_TPrintf("%s(0x%02X, 0x%02X);\n", __func__, deviceAddrTable[id], reg)
#define DBG_PRINT_FUNC1(data) OS_TPrintf("%s(0x%02X, 0x%02X, 0x%02X, ...);\n", __func__, deviceAddrTable[id], reg, (data))
#define DBG_PRINT_ERR() OS_TPrintf(" Failed(%d) @ %d\n", error, r) #define DBG_PRINT_ERR() OS_TPrintf(" Failed(%d) @ %d\n", error, r)
#else #else
#define DBG_PRINT_FUNC() ((void)0) #define DBG_PRINT_FUNC() ((void)0)
#define DBG_PRINT_FUNC1(data) ((void)0)
#define DBG_PRINT_ERR() ((void)0) #define DBG_PRINT_ERR() ((void)0)
#endif #endif
@ -133,13 +135,14 @@ static inline void I2Ci_SetData( u8 data )
static inline u8 I2Ci_GetData( void ) static inline u8 I2Ci_GetData( void )
{ {
I2Ci_Wait();
DBG_PRINTF("(%02X)", reg_EXI_I2CD); DBG_PRINTF("(%02X)", reg_EXI_I2CD);
return reg_EXI_I2CD; return reg_EXI_I2CD;
} }
static inline BOOL I2Ci_GetResult( void ) static inline BOOL I2Ci_GetResult( void )
{ {
I2Ci_WaitEx(); I2Ci_Wait();
DBG_PRINTF("%c", (reg_EXI_I2CCNT & REG_EXI_I2CCNT_ACK_MASK) ? '.' : '*'); DBG_PRINTF("%c", (reg_EXI_I2CCNT & REG_EXI_I2CCNT_ACK_MASK) ? '.' : '*');
return (BOOL)((reg_EXI_I2CCNT & REG_EXI_I2CCNT_ACK_MASK) >> REG_EXI_I2CCNT_ACK_SHIFT); return (BOOL)((reg_EXI_I2CCNT & REG_EXI_I2CCNT_ACK_MASK) >> REG_EXI_I2CCNT_ACK_SHIFT);
} }
@ -192,14 +195,12 @@ static inline void I2Ci_ReceiveLast( void )
static inline u8 I2Ci_WaitReceiveMiddle( void ) static inline u8 I2Ci_WaitReceiveMiddle( void )
{ {
I2Ci_ReceiveMiddle(); I2Ci_ReceiveMiddle();
I2Ci_WaitEx();
return I2Ci_GetData(); return I2Ci_GetData();
} }
static inline u8 I2Ci_WaitReceiveLast( void ) static inline u8 I2Ci_WaitReceiveLast( void )
{ {
I2Ci_ReceiveLast(); I2Ci_ReceiveLast();
I2Ci_WaitEx();
return I2Ci_GetData(); return I2Ci_GetData();
} }
@ -207,16 +208,12 @@ static inline u8 I2Ci_WaitReceiveLast( void )
static inline BOOL I2Ci_SendMiddle16( u16 data ) static inline BOOL I2Ci_SendMiddle16( u16 data )
{ {
BOOL rHi = I2Ci_SendMiddle( (u8)(data >> 8) ); return I2Ci_SendMiddle( (u8)(data >> 8) ) & I2Ci_SendMiddle( (u8)(data & 0xFF) );
BOOL rLo = I2Ci_SendMiddle( (u8)(data & 0xFF) );
return (rHi && rLo);
} }
static inline BOOL I2Ci_SendLast16( u16 data ) static inline BOOL I2Ci_SendLast16( u16 data )
{ {
BOOL rHi = I2Ci_SendMiddle( (u8)(data >> 8) ); return I2Ci_SendMiddle( (u8)(data >> 8) ) & I2Ci_SendLast( (u8)(data & 0xFF) );
BOOL rLo = I2Ci_SendLast( (u8)(data & 0xFF) );
return (rHi && rLo);
} }
static inline u16 I2Ci_WaitReceiveMiddle16( void ) static inline u16 I2Ci_WaitReceiveMiddle16( void )
@ -440,7 +437,7 @@ BOOL I2Ci_WriteRegister( I2CSlave id, u8 reg, u8 data )
{ {
int r; int r;
int error; int error;
DBG_PRINT_FUNC(); DBG_PRINT_FUNC1(data);
for (r = 0; r < RETRY_COUNT; r++) for (r = 0; r < RETRY_COUNT; r++)
{ {
error = 0; error = 0;
@ -466,7 +463,7 @@ BOOL I2Ci_WriteRegister16( I2CSlave id, u16 reg, u16 data )
{ {
int r; int r;
int error; int error;
DBG_PRINT_FUNC(); DBG_PRINT_FUNC1(data);
for (r = 0; r < RETRY_COUNT; r++) for (r = 0; r < RETRY_COUNT; r++)
{ {
error = 0; error = 0;
@ -575,7 +572,7 @@ BOOL I2Ci_VerifyRegister( I2CSlave id, u8 reg, u8 data )
int r; int r;
int error; int error;
BOOL result; BOOL result;
DBG_PRINT_FUNC(); DBG_PRINT_FUNC1(data);
for (r = 0; r < RETRY_COUNT; r++) for (r = 0; r < RETRY_COUNT; r++)
{ {
error = 0; error = 0;
@ -606,7 +603,7 @@ BOOL I2Ci_VerifyRegisterSC( I2CSlave id, u8 reg, u8 data )
int r; int r;
int error; int error;
BOOL result; BOOL result;
DBG_PRINT_FUNC(); DBG_PRINT_FUNC1(data);
for (r = 0; r < RETRY_COUNT; r++) for (r = 0; r < RETRY_COUNT; r++)
{ {
error = 0; error = 0;
@ -637,7 +634,7 @@ BOOL I2Ci_VerifyRegister16( I2CSlave id, u16 reg, u16 data )
int r; int r;
int error; int error;
BOOL result; BOOL result;
DBG_PRINT_FUNC(); DBG_PRINT_FUNC1(data);
for (r = 0; r < RETRY_COUNT; r++) for (r = 0; r < RETRY_COUNT; r++)
{ {
error = 0; error = 0;
@ -671,7 +668,7 @@ BOOL I2Ci_WriteRegisters( I2CSlave id, u8 reg, const u8 *bufp, size_t size )
int r; int r;
int error; int error;
const u8 *ptr; const u8 *ptr;
DBG_PRINT_FUNC(); DBG_PRINT_FUNC1(bufp[0]);
for (r = 0; r < RETRY_COUNT; r++) for (r = 0; r < RETRY_COUNT; r++)
{ {
error = 0; error = 0;
@ -704,7 +701,7 @@ BOOL I2Ci_WriteRegisters16( I2CSlave id, u16 reg, const u16 *bufp, size_t size )
int r; int r;
int error; int error;
const u16 *ptr; const u16 *ptr;
DBG_PRINT_FUNC(); DBG_PRINT_FUNC1(bufp[0]);
for (r = 0; r < RETRY_COUNT; r++) for (r = 0; r < RETRY_COUNT; r++)
{ {
error = 0; error = 0;
@ -859,7 +856,7 @@ BOOL I2Ci_VerifyRegisters( I2CSlave id, u8 reg, const u8 *bufp, size_t size )
int error; int error;
const u8 *ptr; const u8 *ptr;
BOOL result; BOOL result;
DBG_PRINT_FUNC(); DBG_PRINT_FUNC1(bufp[0]);
for (r = 0; r < RETRY_COUNT; r++) for (r = 0; r < RETRY_COUNT; r++)
{ {
error = 0; error = 0;
@ -899,7 +896,7 @@ BOOL I2Ci_VerifyRegistersSC( I2CSlave id, u8 reg, const u8 *bufp, size_t size )
int error; int error;
const u8 *ptr; const u8 *ptr;
BOOL result; BOOL result;
DBG_PRINT_FUNC(); DBG_PRINT_FUNC1(bufp[0]);
for (r = 0; r < RETRY_COUNT; r++) for (r = 0; r < RETRY_COUNT; r++)
{ {
error = 0; error = 0;
@ -939,7 +936,7 @@ BOOL I2Ci_VerifyRegisters16( I2CSlave id, u16 reg, const u16 *bufp, size_t size
int error; int error;
const u16 *ptr; const u16 *ptr;
BOOL result; BOOL result;
DBG_PRINT_FUNC(); DBG_PRINT_FUNC1(bufp[0]);
for (r = 0; r < RETRY_COUNT; r++) for (r = 0; r < RETRY_COUNT; r++)
{ {
error = 0; error = 0;