X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/071e02c6b6b4837fa9cf0b6d4c749994e02638d7..c37fd0ef91c58003eab6f3a5461d970ea1a22602:/Projects/AVRISP-MKII/AVRISP.c

diff --git a/Projects/AVRISP-MKII/AVRISP.c b/Projects/AVRISP-MKII/AVRISP.c
index 88403b269..33ea07b52 100644
--- a/Projects/AVRISP-MKII/AVRISP.c
+++ b/Projects/AVRISP-MKII/AVRISP.c
@@ -42,16 +42,14 @@
 int main(void)
 {
 	SetupHardware();
+	V2Protocol_Init();
 	
 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
 	sei();
 
 	for (;;)
 	{
-		Process_AVRISP_Commands();
-		
-		V2Params_UpdateParamValues();
-		
+		AVRISP_Task();
 		USB_USBTask();
 	}
 }
@@ -69,7 +67,6 @@ void SetupHardware(void)
 	/* Hardware Initialization */
 	LEDs_Init();
 	USB_Init();
-	V2Protocol_Init();
 }
 
 /** Event handler for the library USB Connection event. */
@@ -92,15 +89,15 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 
 	/* Setup AVRISP data Endpoints */
 	if (!(Endpoint_ConfigureEndpoint(AVRISP_DATA_OUT_EPNUM, EP_TYPE_BULK,
-		                             ENDPOINT_DIR_OUT, AVRISP_DATA_EPSIZE,
+	                                 ENDPOINT_DIR_OUT, AVRISP_DATA_EPSIZE,
 	                                 ENDPOINT_BANK_SINGLE)))
 	{
 		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 	}
 
-	#if defined(LIBUSB_FILTERDRV_COMPAT)
+	#if defined(LIBUSB_DRIVER_COMPAT)
 	if (!(Endpoint_ConfigureEndpoint(AVRISP_DATA_IN_EPNUM, EP_TYPE_BULK,
-		                             ENDPOINT_DIR_IN, AVRISP_DATA_EPSIZE,
+	                                 ENDPOINT_DIR_IN, AVRISP_DATA_EPSIZE,
 	                                 ENDPOINT_BANK_SINGLE)))
 	{
 		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
@@ -109,12 +106,14 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 }
 
 /** Processes incoming V2 Protocol commands from the host, returning a response when required. */
-void Process_AVRISP_Commands(void)
+void AVRISP_Task(void)
 {
 	/* Device must be connected and configured for the task to run */
 	if (USB_DeviceState != DEVICE_STATE_Configured)
 	  return;
 
+	V2Params_UpdateParamValues();
+
 	Endpoint_SelectEndpoint(AVRISP_DATA_OUT_EPNUM);
 	
 	/* Check to see if a V2 Protocol command has been received */