mfulz_github/qmk_firmware
1
0
Fork 1
mirror of https://github.com/mfulz/qmk_firmware.git synced 2025-10-31 05:12:33 +01:00
Code Issues Projects Releases Wiki Activity

Minor bugfixes / missed compile stuff.

Browse Source
This commit is contained in:
Michael Janssen 2013-07-31 21:47:41 -05:00
parent a403b12b8d
commit d557744503
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
LUFA/Drivers/Peripheral/XMEGA/TWI_XMEGA.c
View File

@ -50,17 +50,17 @@ uint8_t TWI_StartTransmission(TWI_t *twi,
// Case 1: Arbitration lost. Try again. (or error) // Case 1: Arbitration lost. Try again. (or error)
twi->MASTER.ADDR = SlaveAddress; twi->MASTER.ADDR = SlaveAddress;
} }
else if (twi->STATUS & (TWI_MASTER_WIF_bm | TWI_MASTER_RXACK_bm)) else if (twi->MASTER.STATUS & (TWI_MASTER_WIF_bm | TWI_MASTER_RXACK_bm))
{ {
// Case 2: No response from slave. // Case 2: No response from slave.
return TWI_ERROR_SlaveResponseTimeout; return TWI_ERROR_SlaveResponseTimeout;
} }
else if (twi->STATUS & (TWI_MASTER_WIF_bm)) else if (twi->MASTER.STATUS & (TWI_MASTER_WIF_bm))
{ {
// Case 3: Slave ACK the Write. Ready! // Case 3: Slave ACK the Write. Ready!
return TWI_ERROR_NoError; return TWI_ERROR_NoError;
} }
else if (twi->STATUS & (TWI_MASTER_RIF_bm)) else if (twi->MASTER.STATUS & (TWI_MASTER_RIF_bm))
{ {
// Case 4: Slave ACK the Read. Ready! (a byte will be read) // Case 4: Slave ACK the Read. Ready! (a byte will be read)
return TWI_ERROR_NoError; return TWI_ERROR_NoError;
@ -73,10 +73,10 @@ uint8_t TWI_StartTransmission(TWI_t *twi,
if (!(TimeoutRemaining)) { if (!(TimeoutRemaining)) {
if (twi->MASTER.STATUS & TWI_MASTER_CLKHOLD_bm) { if (twi->MASTER.STATUS & TWI_MASTER_CLKHOLD_bm) {
// Release the bus if we're holding it. // Release the bus if we're holding it.
twi->CTRLC = TWI_MASTER_CMD_STOP_gc; twi->MASTER.CTRLC = TWI_MASTER_CMD_STOP_gc;
} }
return TWI_ERROR_BusCaptureTimeout;
} }
return TWI_ERROR_BusCaptureTimeout;
} }
bool TWI_SendByte(TWI_t *twi, const uint8_t Byte) bool TWI_SendByte(TWI_t *twi, const uint8_t Byte)
@ -87,7 +87,7 @@ bool TWI_SendByte(TWI_t *twi, const uint8_t Byte)
return (twi->MASTER.STATUS & TWI_MASTER_WIF_bm) & !(twi->MASTER.STATUS & TWI_MASTER_RXACK_bm); return (twi->MASTER.STATUS & TWI_MASTER_WIF_bm) & !(twi->MASTER.STATUS & TWI_MASTER_RXACK_bm);
} }
bool TWI_ReceiveByte(uint8_t* const Byte, bool TWI_ReceiveByte(TWI_t *twi, uint8_t* const Byte,
const bool LastByte) const bool LastByte)
{ {
// If we're here, we should already be reading. Wait if we haven't read yet. // If we're here, we should already be reading. Wait if we haven't read yet.
@ -95,7 +95,7 @@ bool TWI_ReceiveByte(uint8_t* const Byte,
return false; return false;
} }
while (!(twi->MASTER.STATUS & TWI_MASTER_RIF_bm)); while (!(twi->MASTER.STATUS & TWI_MASTER_RIF_bm));
*byte = twi->MASTER.DATA; *Byte = twi->MASTER.DATA;
if (LastByte) if (LastByte)
twi->MASTER.CTRLC = TWI_MASTER_ACKACT_bm | TWI_MASTER_CMD_RECVTRANS_gc; twi->MASTER.CTRLC = TWI_MASTER_ACKACT_bm | TWI_MASTER_CMD_RECVTRANS_gc;
else else