Altered all endpoint/pipe stream transfers so that the new BytesProcessed parameter...

[pub/USBasp.git] / Projects / AVRISP-MKII / Lib / V2Protocol.c

diff --git a/Projects/AVRISP-MKII/Lib/V2Protocol.c b/Projects/AVRISP-MKII/Lib/V2Protocol.c
index 3ee3ebd..f6ea477 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/V2Protocol.c
+++ b/Projects/AVRISP-MKII/Lib/V2Protocol.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

 
   dean [at] fourwalledcubicle [dot] com
 
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  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


@@ -61,11 +61,15 @@ void V2Protocol_Init(void)
        #endif
 
        /* Timeout timer initialization (10ms period) */
        #endif
 
        /* Timeout timer initialization (10ms period) */

-       OCR0A  = ((F_CPU / 1024) / 100);
+       OCR0A  = (((F_CPU / 1024) / 100) - 1);

        TCCR0A = (1 << WGM01);
        TIMSK0 = (1 << OCIE0A);
 
        V2Params_LoadNonVolatileParamValues();
        TCCR0A = (1 << WGM01);
        TIMSK0 = (1 << OCIE0A);
 
        V2Params_LoadNonVolatileParamValues();

+       
+       #if defined(ENABLE_ISP_PROTOCOL)
+       ISPTarget_ConfigureRescueClock();
+       #endif

 }
 
 /** Master V2 Protocol packet handler, for received V2 Protocol packets from a connected host.
 }
 
 /** Master V2 Protocol packet handler, for received V2 Protocol packets from a connected host.


@@ -181,7 +185,7 @@ static void V2Protocol_SignOn(void)
        Endpoint_Write_Byte(CMD_SIGN_ON);
        Endpoint_Write_Byte(STATUS_CMD_OK);
        Endpoint_Write_Byte(sizeof(PROGRAMMER_ID) - 1);
        Endpoint_Write_Byte(CMD_SIGN_ON);
        Endpoint_Write_Byte(STATUS_CMD_OK);
        Endpoint_Write_Byte(sizeof(PROGRAMMER_ID) - 1);

-       Endpoint_Write_Stream_LE(PROGRAMMER_ID, (sizeof(PROGRAMMER_ID) - 1), NO_STREAM_CALLBACK);
+       Endpoint_Write_Stream_LE(PROGRAMMER_ID, (sizeof(PROGRAMMER_ID) - 1), NULL);

        Endpoint_ClearIN();
 }
 
        Endpoint_ClearIN();
 }
 


@@ -245,7 +249,7 @@ static void V2Protocol_GetSetParam(const uint8_t V2Command)
  */
 static void V2Protocol_LoadAddress(void)
 {
  */
 static void V2Protocol_LoadAddress(void)
 {

-       Endpoint_Read_Stream_BE(&CurrentAddress, sizeof(CurrentAddress), NO_STREAM_CALLBACK);
+       Endpoint_Read_Stream_BE(&CurrentAddress, sizeof(CurrentAddress), NULL);

 
        Endpoint_ClearOUT();
        Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);
 
        Endpoint_ClearOUT();
        Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);