Updated the AVRISP-MKII Clone programmer project to be compatible with the latest...

[pub/USBasp.git] / LUFA / Drivers / Peripheral / AVR8 / TWI_AVR8.c

diff --git a/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c b/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c
index d6db37d..34e6415 100644 (file)
--- a/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c
+++ b/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -119,9 +119,9 @@ bool TWI_ReceiveByte(uint8_t* const Byte,
        TWCR = TWCRMask;
        while (!(TWCR & (1 << TWINT)));
        *Byte = TWDR;
        TWCR = TWCRMask;
        while (!(TWCR & (1 << TWINT)));
        *Byte = TWDR;

-       
+

        uint8_t Status = (TWSR & TW_STATUS_MASK);
        uint8_t Status = (TWSR & TW_STATUS_MASK);

-       
+

        return ((LastByte) ? (Status == TW_MR_DATA_NACK) : (Status == TW_MR_DATA_ACK));
 }
 
        return ((LastByte) ? (Status == TW_MR_DATA_NACK) : (Status == TW_MR_DATA_ACK));
 }
 


@@ -133,19 +133,19 @@ uint8_t TWI_ReadPacket(const uint8_t SlaveAddress,
                        uint8_t Length)
 {
        uint8_t ErrorCode;
                        uint8_t Length)
 {
        uint8_t ErrorCode;

-       
+

        if ((ErrorCode = TWI_StartTransmission((SlaveAddress & TWI_DEVICE_ADDRESS_MASK) | TWI_ADDRESS_WRITE,
                                               TimeoutMS)) == TWI_ERROR_NoError)
        {
                while (InternalAddressLen--)
                {
                        if (!(TWI_SendByte(*(InternalAddress++))))
        if ((ErrorCode = TWI_StartTransmission((SlaveAddress & TWI_DEVICE_ADDRESS_MASK) | TWI_ADDRESS_WRITE,
                                               TimeoutMS)) == TWI_ERROR_NoError)
        {
                while (InternalAddressLen--)
                {
                        if (!(TWI_SendByte(*(InternalAddress++))))

-                       {                               
+                       {

                                ErrorCode = TWI_ERROR_SlaveNAK;
                                break;
                        }
                }
                                ErrorCode = TWI_ERROR_SlaveNAK;
                                break;
                        }
                }

-               
+

                if ((ErrorCode = TWI_StartTransmission((SlaveAddress & TWI_DEVICE_ADDRESS_MASK) | TWI_ADDRESS_READ,
                                                                                           TimeoutMS)) == TWI_ERROR_NoError)
                {
                if ((ErrorCode = TWI_StartTransmission((SlaveAddress & TWI_DEVICE_ADDRESS_MASK) | TWI_ADDRESS_READ,
                                                                                           TimeoutMS)) == TWI_ERROR_NoError)
                {


@@ -157,11 +157,11 @@ uint8_t TWI_ReadPacket(const uint8_t SlaveAddress,
                                        break;
                                }
                        }
                                        break;
                                }
                        }

-                       
+

                        TWI_StopTransmission();
                }
        }
                        TWI_StopTransmission();
                }
        }

-       
+

        return ErrorCode;
 }
 
        return ErrorCode;
 }
 


@@ -180,7 +180,7 @@ uint8_t TWI_WritePacket(const uint8_t SlaveAddress,
                while (InternalAddressLen--)
                {
                        if (!(TWI_SendByte(*(InternalAddress++))))
                while (InternalAddressLen--)
                {
                        if (!(TWI_SendByte(*(InternalAddress++))))

-                       {                               
+                       {

                                ErrorCode = TWI_ERROR_SlaveNAK;
                                break;
                        }
                                ErrorCode = TWI_ERROR_SlaveNAK;
                                break;
                        }


@@ -194,9 +194,10 @@ uint8_t TWI_WritePacket(const uint8_t SlaveAddress,
                                break;
                        }
                }
                                break;
                        }
                }

-               
+

                TWI_StopTransmission();
        }
                TWI_StopTransmission();
        }

-       
+

        return ErrorCode;
 }
        return ErrorCode;
 }

+