Add a new RFCOMM service callback for when new data has been received on a valid...

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

diff --git a/Projects/AVRISP-MKII/AVRISP.c b/Projects/AVRISP-MKII/AVRISP.c
index 81c1385..33ea07b 100644 (file)
--- a/Projects/AVRISP-MKII/AVRISP.c
+++ b/Projects/AVRISP-MKII/AVRISP.c
@@ -42,15 +42,14 @@
 int main(void)
 {
        SetupHardware();
 int main(void)
 {
        SetupHardware();

+       V2Protocol_Init();

        
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
        sei();
 
        for (;;)
        {
        
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
        sei();
 
        for (;;)
        {

-               Process_AVRISP_Commands();
-               V2Params_UpdateParamValues();
-               
+               AVRISP_Task();

                USB_USBTask();
        }
 }
                USB_USBTask();
        }
 }


@@ -68,7 +67,6 @@ void SetupHardware(void)
        /* Hardware Initialization */
        LEDs_Init();
        USB_Init();
        /* Hardware Initialization */
        LEDs_Init();
        USB_Init();

-       V2Protocol_Init();

 }
 
 /** Event handler for the library USB Connection event. */
 }
 
 /** Event handler for the library USB Connection event. */


@@ -91,7 +89,7 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 
        /* Setup AVRISP data Endpoints */
        if (!(Endpoint_ConfigureEndpoint(AVRISP_DATA_OUT_EPNUM, EP_TYPE_BULK,
 
        /* 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);
                                         ENDPOINT_BANK_SINGLE)))
        {
                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);


@@ -99,7 +97,7 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 
        #if defined(LIBUSB_DRIVER_COMPAT)
        if (!(Endpoint_ConfigureEndpoint(AVRISP_DATA_IN_EPNUM, EP_TYPE_BULK,
 
        #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);
                                         ENDPOINT_BANK_SINGLE)))
        {
                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);


@@ -108,12 +106,14 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 }
 
 /** Processes incoming V2 Protocol commands from the host, returning a response when required. */
 }
 
 /** 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;
 
 {
        /* 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 */
        Endpoint_SelectEndpoint(AVRISP_DATA_OUT_EPNUM);
        
        /* Check to see if a V2 Protocol command has been received */