Added WIN_LIBUSB_COMPAT compile time option to the AVRISP programmer project to make...

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 370963e..c8eddc1 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -24,6 +24,8 @@
   *  - Standardized the naming scheme given to configuration descriptor sub-elements in the Device mode demos, bootloaders\r
   *    and projects\r
   *  - All Class Driver Host mode demos now correctly set the board LEDs to READY once the enumeration process has completed\r
   *  - Standardized the naming scheme given to configuration descriptor sub-elements in the Device mode demos, bootloaders\r
   *    and projects\r
   *  - All Class Driver Host mode demos now correctly set the board LEDs to READY once the enumeration process has completed\r

+  *  - Added WIN_LIBUSB_COMPAT compile time option to the AVRISP programmer project to make the code compatible with Windows\r
+  *    builds of avrdude at the expense of AVRStudio compatibility\r

   *\r
   *  <b>Fixed:</b>\r
   *  - Fixed software PDI/TPI programming mode in the AVRISP project not correctly toggling just the clock pin\r
   *\r
   *  <b>Fixed:</b>\r
   *  - Fixed software PDI/TPI programming mode in the AVRISP project not correctly toggling just the clock pin\r

diff --git a/Projects/AVRISP-MKII/AVRISP.c b/Projects/AVRISP-MKII/AVRISP.c
index b78923f..ed101b8 100644 (file)
--- a/Projects/AVRISP-MKII/AVRISP.c
+++ b/Projects/AVRISP-MKII/AVRISP.c
@@ -90,12 +90,21 @@ void EVENT_USB_Device_ConfigurationChanged(void)
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
 \r
        /* Setup AVRISP data Endpoints */\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
 \r
        /* Setup AVRISP data Endpoints */\r

-       if (!(Endpoint_ConfigureEndpoint(AVRISP_DATA_EPNUM, EP_TYPE_BULK,\r
+       if (!(Endpoint_ConfigureEndpoint(AVRISP_DATA_OUT_EPNUM, EP_TYPE_BULK,\r

                                             ENDPOINT_DIR_OUT, AVRISP_DATA_EPSIZE,\r
                                         ENDPOINT_BANK_SINGLE)))\r
        {\r
                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
        }\r
                                             ENDPOINT_DIR_OUT, AVRISP_DATA_EPSIZE,\r
                                         ENDPOINT_BANK_SINGLE)))\r
        {\r
                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
        }\r

+\r
+       #if defined(WIN_LIBUSB_COMPAT)\r
+       if (!(Endpoint_ConfigureEndpoint(AVRISP_DATA_IN_EPNUM, EP_TYPE_BULK,\r
+                                            ENDPOINT_DIR_IN, AVRISP_DATA_EPSIZE,\r
+                                        ENDPOINT_BANK_SINGLE)))\r
+       {\r
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+       }\r
+       #endif\r

 }\r
 \r
 /** Processes incoming V2 Protocol commands from the host, returning a response when required. */\r
 }\r
 \r
 /** Processes incoming V2 Protocol commands from the host, returning a response when required. */\r


@@ -105,7 +114,7 @@ void Process_AVRISP_Commands(void)
        if (USB_DeviceState != DEVICE_STATE_Configured)\r
          return;\r
 \r
        if (USB_DeviceState != DEVICE_STATE_Configured)\r
          return;\r
 \r

-       Endpoint_SelectEndpoint(AVRISP_DATA_EPNUM);\r
+       Endpoint_SelectEndpoint(AVRISP_DATA_OUT_EPNUM);\r

        \r
        /* Check to see if a V2 Protocol command has been received */\r
        if (Endpoint_IsOUTReceived())\r
        \r
        /* Check to see if a V2 Protocol command has been received */\r
        if (Endpoint_IsOUTReceived())\r

diff --git a/Projects/AVRISP-MKII/AVRISP.txt b/Projects/AVRISP-MKII/AVRISP.txt
index feccfca..b541257 100644 (file)
--- a/Projects/AVRISP-MKII/AVRISP.txt
+++ b/Projects/AVRISP-MKII/AVRISP.txt
@@ -273,5 +273,12 @@
  *    <td>Define to disable VTARGET sampling and reporting on AVR models with an ADC converter. This will cause the programmer\r
  *        to report a fixed 5V target voltage to the host regardless of the real target voltage.</td>  \r
  *   </tr>\r
  *    <td>Define to disable VTARGET sampling and reporting on AVR models with an ADC converter. This will cause the programmer\r
  *        to report a fixed 5V target voltage to the host regardless of the real target voltage.</td>  \r
  *   </tr>\r

+ *   <tr>\r
+ *    <td>WIN_LIBUSB_COMPAT</td>\r
+ *    <td>Makefile CDEFS</td>\r
+ *    <td>Define to switch to a non-standard endpoint scheme, breaking compatibility with AVRStudio under Windows but making\r
+ *        the code compatible with Windows builds of avrdude using the libUSB driver. Linux platforms are not affected by this\r
+ *        option.\r
+ *   </tr>\r

  *  </table>\r
  */\r
  *  </table>\r
  */\r

diff --git a/Projects/AVRISP-MKII/Descriptors.c b/Projects/AVRISP-MKII/Descriptors.c
index f756e29..af28b4b 100644 (file)
--- a/Projects/AVRISP-MKII/Descriptors.c
+++ b/Projects/AVRISP-MKII/Descriptors.c
@@ -106,7 +106,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                        \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                        \r

-                       .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | AVRISP_DATA_EPNUM),\r
+                       .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | AVRISP_DATA_IN_EPNUM),\r

                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
                        .EndpointSize           = AVRISP_DATA_EPSIZE,\r
                        .PollingIntervalMS      = 0x00\r
                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
                        .EndpointSize           = AVRISP_DATA_EPSIZE,\r
                        .PollingIntervalMS      = 0x00\r


@@ -116,7 +116,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                        \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                        \r

-                       .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | AVRISP_DATA_EPNUM),\r
+                       .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | AVRISP_DATA_OUT_EPNUM),\r

                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
                        .EndpointSize           = AVRISP_DATA_EPSIZE,\r
                        .PollingIntervalMS      = 0x00\r
                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
                        .EndpointSize           = AVRISP_DATA_EPSIZE,\r
                        .PollingIntervalMS      = 0x00\r

diff --git a/Projects/AVRISP-MKII/Descriptors.h b/Projects/AVRISP-MKII/Descriptors.h
index ced4738..9f6a412 100644 (file)
--- a/Projects/AVRISP-MKII/Descriptors.h
+++ b/Projects/AVRISP-MKII/Descriptors.h
@@ -42,11 +42,22 @@
                #include <LUFA/Drivers/USB/USB.h>\r
 \r
        /* Macros: */\r
                #include <LUFA/Drivers/USB/USB.h>\r
 \r
        /* Macros: */\r

-               /** Endpoint number of the AVRISP bidirectional data endpoint. */\r
-               #define AVRISP_DATA_EPNUM              2\r
+               #if !defined(WIN_LIBUSB_COMPAT)\r
+                       /** Endpoint number of the AVRISP data OUT endpoint. */\r
+                       #define AVRISP_DATA_OUT_EPNUM      2\r
+\r
+                       /** Endpoint number of the AVRISP data IN endpoint. */\r
+                       #define AVRISP_DATA_IN_EPNUM       2\r
+               #else\r
+                       /** Endpoint number of the AVRISP data OUT endpoint. */\r
+                       #define AVRISP_DATA_OUT_EPNUM      2\r
+\r
+                       /** Endpoint number of the AVRISP data IN endpoint. */\r
+                       #define AVRISP_DATA_IN_EPNUM       3\r
+               #endif\r

 \r
                /** Size in bytes of the AVRISP data endpoint. */\r
 \r
                /** Size in bytes of the AVRISP data endpoint. */\r

-               #define AVRISP_DATA_EPSIZE             64       \r
+               #define AVRISP_DATA_EPSIZE             64\r

 \r
        /* Type Defines: */\r
                /** Type define for the device configuration descriptor structure. This must be defined in the\r
 \r
        /* Type Defines: */\r
                /** Type define for the device configuration descriptor structure. This must be defined in the\r

diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c b/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c
index 85b31fb..9d0a26c 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c
+++ b/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c
@@ -57,6 +57,7 @@ void ISPProtocol_EnterISPMode(void)
        Endpoint_Read_Stream_LE(&Enter_ISP_Params, sizeof(Enter_ISP_Params), NO_STREAM_CALLBACK);\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_Read_Stream_LE(&Enter_ISP_Params, sizeof(Enter_ISP_Params), NO_STREAM_CALLBACK);\r
 \r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        uint8_t ResponseStatus = STATUS_CMD_FAILED;\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        uint8_t ResponseStatus = STATUS_CMD_FAILED;\r


@@ -117,6 +118,7 @@ void ISPProtocol_LeaveISPMode(void)
        Endpoint_Read_Stream_LE(&Leave_ISP_Params, sizeof(Leave_ISP_Params), NO_STREAM_CALLBACK);\r
        \r
        Endpoint_ClearOUT();\r
        Endpoint_Read_Stream_LE(&Leave_ISP_Params, sizeof(Leave_ISP_Params), NO_STREAM_CALLBACK);\r
        \r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        /* Perform pre-exit delay, release the target /RESET, disable the SPI bus and perform the post-exit delay */\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        /* Perform pre-exit delay, release the target /RESET, disable the SPI bus and perform the post-exit delay */\r


@@ -163,6 +165,7 @@ void ISPProtocol_ProgramMemory(uint8_t V2Command)
        if (Write_Memory_Params.BytesToWrite > sizeof(Write_Memory_Params.ProgData))\r
        {\r
                Endpoint_ClearOUT();\r
        if (Write_Memory_Params.BytesToWrite > sizeof(Write_Memory_Params.ProgData))\r
        {\r
                Endpoint_ClearOUT();\r

+               Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

                Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
                Endpoint_Write_Byte(V2Command);\r
                Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
                Endpoint_Write_Byte(V2Command);\r


@@ -174,6 +177,7 @@ void ISPProtocol_ProgramMemory(uint8_t V2Command)
        Endpoint_Read_Stream_LE(&Write_Memory_Params.ProgData, Write_Memory_Params.BytesToWrite, NO_STREAM_CALLBACK);\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_Read_Stream_LE(&Write_Memory_Params.ProgData, Write_Memory_Params.BytesToWrite, NO_STREAM_CALLBACK);\r
 \r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        uint8_t  ProgrammingStatus = STATUS_CMD_OK;     \r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        uint8_t  ProgrammingStatus = STATUS_CMD_OK;     \r


@@ -305,6 +309,7 @@ void ISPProtocol_ReadMemory(uint8_t V2Command)
        Read_Memory_Params.BytesToRead = SwapEndian_16(Read_Memory_Params.BytesToRead);\r
        \r
        Endpoint_ClearOUT();\r
        Read_Memory_Params.BytesToRead = SwapEndian_16(Read_Memory_Params.BytesToRead);\r
        \r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        Endpoint_Write_Byte(V2Command);\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        Endpoint_Write_Byte(V2Command);\r


@@ -375,6 +380,7 @@ void ISPProtocol_ChipErase(void)
        Endpoint_Read_Stream_LE(&Erase_Chip_Params, sizeof(Erase_Chip_Params), NO_STREAM_CALLBACK);\r
        \r
        Endpoint_ClearOUT();\r
        Endpoint_Read_Stream_LE(&Erase_Chip_Params, sizeof(Erase_Chip_Params), NO_STREAM_CALLBACK);\r
        \r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        uint8_t ResponseStatus = STATUS_CMD_OK;\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        uint8_t ResponseStatus = STATUS_CMD_OK;\r


@@ -410,6 +416,7 @@ void ISPProtocol_ReadFuseLockSigOSCCAL(uint8_t V2Command)
        Endpoint_Read_Stream_LE(&Read_FuseLockSigOSCCAL_Params, sizeof(Read_FuseLockSigOSCCAL_Params), NO_STREAM_CALLBACK);\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_Read_Stream_LE(&Read_FuseLockSigOSCCAL_Params, sizeof(Read_FuseLockSigOSCCAL_Params), NO_STREAM_CALLBACK);\r
 \r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        uint8_t ResponseBytes[4];\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        uint8_t ResponseBytes[4];\r


@@ -440,6 +447,7 @@ void ISPProtocol_WriteFuseLock(uint8_t V2Command)
        Endpoint_Read_Stream_LE(&Write_FuseLockSig_Params, sizeof(Write_FuseLockSig_Params), NO_STREAM_CALLBACK);\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_Read_Stream_LE(&Write_FuseLockSig_Params, sizeof(Write_FuseLockSig_Params), NO_STREAM_CALLBACK);\r
 \r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        /* Send the Fuse or Lock byte program commands as given by the host to the device */\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        /* Send the Fuse or Lock byte program commands as given by the host to the device */\r


@@ -467,6 +475,7 @@ void ISPProtocol_SPIMulti(void)
        Endpoint_Read_Stream_LE(&SPI_Multi_Params.TxData, SPI_Multi_Params.TxBytes, NO_STREAM_CALLBACK);\r
        \r
        Endpoint_ClearOUT();\r
        Endpoint_Read_Stream_LE(&SPI_Multi_Params.TxData, SPI_Multi_Params.TxBytes, NO_STREAM_CALLBACK);\r
        \r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        Endpoint_Write_Byte(CMD_SPI_MULTI);\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        Endpoint_Write_Byte(CMD_SPI_MULTI);\r

diff --git a/Projects/AVRISP-MKII/Lib/V2Protocol.c b/Projects/AVRISP-MKII/Lib/V2Protocol.c
index 3df8045..431f9c2 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/V2Protocol.c
+++ b/Projects/AVRISP-MKII/Lib/V2Protocol.c
@@ -131,6 +131,7 @@ void V2Protocol_ProcessCommand(void)
        }\r
 \r
        Endpoint_WaitUntilReady();\r
        }\r
 \r
        Endpoint_WaitUntilReady();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_OUT_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_OUT);\r
 }\r
 \r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_OUT);\r
 }\r
 \r


@@ -149,6 +150,7 @@ static void V2Protocol_UnknownCommand(const uint8_t V2Command)
        }\r
 \r
        Endpoint_ClearOUT();\r
        }\r
 \r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        Endpoint_Write_Byte(V2Command);\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        Endpoint_Write_Byte(V2Command);\r


@@ -160,6 +162,7 @@ static void V2Protocol_UnknownCommand(const uint8_t V2Command)
 static void V2Protocol_SignOn(void)\r
 {\r
        Endpoint_ClearOUT();\r
 static void V2Protocol_SignOn(void)\r
 {\r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        Endpoint_Write_Byte(CMD_SIGN_ON);\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        Endpoint_Write_Byte(CMD_SIGN_ON);\r


@@ -175,6 +178,7 @@ static void V2Protocol_SignOn(void)
 static void V2Protocol_ResetProtection(void)\r
 {\r
        Endpoint_ClearOUT();\r
 static void V2Protocol_ResetProtection(void)\r
 {\r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        Endpoint_Write_Byte(CMD_RESET_PROTECTION);\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        Endpoint_Write_Byte(CMD_RESET_PROTECTION);\r


@@ -197,6 +201,7 @@ static void V2Protocol_GetSetParam(const uint8_t V2Command)
          ParamValue = Endpoint_Read_Byte();\r
 \r
        Endpoint_ClearOUT();\r
          ParamValue = Endpoint_Read_Byte();\r
 \r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        Endpoint_Write_Byte(V2Command);\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        Endpoint_Write_Byte(V2Command);\r


@@ -230,6 +235,7 @@ static void V2Protocol_LoadAddress(void)
        Endpoint_Read_Stream_BE(&CurrentAddress, sizeof(CurrentAddress), NO_STREAM_CALLBACK);\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_Read_Stream_BE(&CurrentAddress, sizeof(CurrentAddress), NO_STREAM_CALLBACK);\r
 \r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        MustSetAddress = true;\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        MustSetAddress = true;\r

diff --git a/Projects/AVRISP-MKII/Lib/V2Protocol.h b/Projects/AVRISP-MKII/Lib/V2Protocol.h
index 26c42ab..43dee1e 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/V2Protocol.h
+++ b/Projects/AVRISP-MKII/Lib/V2Protocol.h
@@ -72,6 +72,12 @@
 \r
                /** MUX mask for the VTARGET ADC channel number */\r
                #define VTARGET_ADC_CHANNEL_MASK   _GETADCMUXMASK(ADC_CHANNEL, VTARGET_ADC_CHANNEL)\r
 \r
                /** MUX mask for the VTARGET ADC channel number */\r
                #define VTARGET_ADC_CHANNEL_MASK   _GETADCMUXMASK(ADC_CHANNEL, VTARGET_ADC_CHANNEL)\r

+               \r
+               #if !defined(WIN_AVRDUDE_COMPAT)\r
+                       #define SELECT_DATA_OUT_ENDPOINT() Endpoint_SetEndpointDirection(ENDPOINT_DIR_OUT);\r
+               #else\r
+                       #define SELECT_DATA_OUT_ENDPOINT() Endpoint_SelectEndpoint();\r
+               #endif\r

 \r
        /* External Variables: */\r
                extern uint32_t CurrentAddress;\r
 \r
        /* External Variables: */\r
                extern uint32_t CurrentAddress;\r

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c
index 07dce50..ef86e30 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.c
@@ -65,6 +65,7 @@ void XPROGProtocol_SetMode(void)
        Endpoint_Read_Stream_LE(&SetMode_XPROG_Params, sizeof(SetMode_XPROG_Params), NO_STREAM_CALLBACK);\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_Read_Stream_LE(&SetMode_XPROG_Params, sizeof(SetMode_XPROG_Params), NO_STREAM_CALLBACK);\r
 \r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        XPROG_SelectedProtocol = SetMode_XPROG_Params.Protocol;\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        XPROG_SelectedProtocol = SetMode_XPROG_Params.Protocol;\r


@@ -111,6 +112,7 @@ void XPROGProtocol_Command(void)
 static void XPROGProtocol_EnterXPROGMode(void)\r
 {\r
        Endpoint_ClearOUT();\r
 static void XPROGProtocol_EnterXPROGMode(void)\r
 {\r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        bool NVMBusEnabled;\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        bool NVMBusEnabled;\r


@@ -166,6 +168,7 @@ static void XPROGProtocol_EnterXPROGMode(void)
 static void XPROGProtocol_LeaveXPROGMode(void)\r
 {\r
        Endpoint_ClearOUT();\r
 static void XPROGProtocol_LeaveXPROGMode(void)\r
 {\r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)\r


@@ -210,6 +213,7 @@ static void XPROGProtocol_Erase(void)
        Erase_XPROG_Params.Address = SwapEndian_32(Erase_XPROG_Params.Address);\r
 \r
        Endpoint_ClearOUT();\r
        Erase_XPROG_Params.Address = SwapEndian_32(Erase_XPROG_Params.Address);\r
 \r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        uint8_t EraseCommand;\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        uint8_t EraseCommand;\r


@@ -291,6 +295,7 @@ static void XPROGProtocol_WriteMemory(void)
        Endpoint_Read_Stream_LE(&WriteMemory_XPROG_Params.ProgData, WriteMemory_XPROG_Params.Length, NO_STREAM_CALLBACK);\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_Read_Stream_LE(&WriteMemory_XPROG_Params.ProgData, WriteMemory_XPROG_Params.Length, NO_STREAM_CALLBACK);\r
 \r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)\r


@@ -374,6 +379,7 @@ static void XPROGProtocol_ReadMemory(void)
        ReadMemory_XPROG_Params.Length  = SwapEndian_16(ReadMemory_XPROG_Params.Length);\r
 \r
        Endpoint_ClearOUT();\r
        ReadMemory_XPROG_Params.Length  = SwapEndian_16(ReadMemory_XPROG_Params.Length);\r
 \r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        uint8_t ReadBuffer[256];\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
 \r
        uint8_t ReadBuffer[256];\r


@@ -416,6 +422,7 @@ static void XPROGProtocol_ReadCRC(void)
        Endpoint_Read_Stream_LE(&ReadCRC_XPROG_Params, sizeof(ReadCRC_XPROG_Params), NO_STREAM_CALLBACK);\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_Read_Stream_LE(&ReadCRC_XPROG_Params, sizeof(ReadCRC_XPROG_Params), NO_STREAM_CALLBACK);\r
 \r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        uint32_t MemoryCRC;\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        \r
        uint32_t MemoryCRC;\r


@@ -491,6 +498,7 @@ static void XPROGProtocol_SetParam(void)
        }\r
 \r
        Endpoint_ClearOUT();\r
        }\r
 \r
        Endpoint_ClearOUT();\r

+       Endpoint_SelectEndpoint(AVRISP_DATA_IN_EPNUM);\r

        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
                  \r
        Endpoint_Write_Byte(CMD_XPROG);\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
                  \r
        Endpoint_Write_Byte(CMD_XPROG);\r

diff --git a/Projects/AVRISP-MKII/makefile b/Projects/AVRISP-MKII/makefile
index b0b26c2..1ea3b8d 100644 (file)
--- a/Projects/AVRISP-MKII/makefile
+++ b/Projects/AVRISP-MKII/makefile
@@ -199,6 +199,7 @@ CDEFS += -DENABLE_ISP_PROTOCOL
 CDEFS += -DENABLE_XPROG_PROTOCOL\r
 #CDEFS += -DXPROG_VIA_HARDWARE_USART\r
 #CDEFS += -DNO_VTARGET_DETECT\r
 CDEFS += -DENABLE_XPROG_PROTOCOL\r
 #CDEFS += -DXPROG_VIA_HARDWARE_USART\r
 #CDEFS += -DNO_VTARGET_DETECT\r

+#CDEFS += -DWIN_LIBUSB_COMPAT\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r

diff --git a/Projects/XPLAINBridge/AVRISPDescriptors.c b/Projects/XPLAINBridge/AVRISPDescriptors.c
index e191783..30e72e9 100644 (file)
--- a/Projects/XPLAINBridge/AVRISPDescriptors.c
+++ b/Projects/XPLAINBridge/AVRISPDescriptors.c
@@ -106,7 +106,7 @@ AVRISP_USB_Descriptor_Configuration_t PROGMEM AVRISP_ConfigurationDescriptor =
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                        \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                        \r

-                       .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | AVRISP_DATA_EPNUM),\r
+                       .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | AVRISP_DATA_IN_EPNUM),\r

                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
                        .EndpointSize           = AVRISP_DATA_EPSIZE,\r
                        .PollingIntervalMS      = 0x00\r
                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
                        .EndpointSize           = AVRISP_DATA_EPSIZE,\r
                        .PollingIntervalMS      = 0x00\r


@@ -116,7 +116,7 @@ AVRISP_USB_Descriptor_Configuration_t PROGMEM AVRISP_ConfigurationDescriptor =
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                        \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                        \r

-                       .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | AVRISP_DATA_EPNUM),\r
+                       .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | AVRISP_DATA_OUT_EPNUM),\r

                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
                        .EndpointSize           = AVRISP_DATA_EPSIZE,\r
                        .PollingIntervalMS      = 0x00\r
                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
                        .EndpointSize           = AVRISP_DATA_EPSIZE,\r
                        .PollingIntervalMS      = 0x00\r

diff --git a/Projects/XPLAINBridge/AVRISPDescriptors.h b/Projects/XPLAINBridge/AVRISPDescriptors.h
index 7287ce6..2fa1809 100644 (file)
--- a/Projects/XPLAINBridge/AVRISPDescriptors.h
+++ b/Projects/XPLAINBridge/AVRISPDescriptors.h
@@ -42,9 +42,20 @@
                #include <LUFA/Drivers/USB/USB.h>\r
 \r
        /* Macros: */\r
                #include <LUFA/Drivers/USB/USB.h>\r
 \r
        /* Macros: */\r

-               /** Endpoint number of the AVRISP bidirectional data endpoint. */\r
-               #define AVRISP_DATA_EPNUM              2\r
+               #if !defined(LIBUSB_FILTERDRV_COMPAT)\r
+                       /** Endpoint number of the AVRISP data OUT endpoint. */\r
+                       #define AVRISP_DATA_OUT_EPNUM      2\r

 \r
 \r

+                       /** Endpoint number of the AVRISP data IN endpoint. */\r
+                       #define AVRISP_DATA_IN_EPNUM       2\r
+               #else\r
+                       /** Endpoint number of the AVRISP data OUT endpoint. */\r
+                       #define AVRISP_DATA_OUT_EPNUM      2\r
+\r
+                       /** Endpoint number of the AVRISP data IN endpoint. */\r
+                       #define AVRISP_DATA_IN_EPNUM       3\r
+               #endif\r
+               \r

                /** Size in bytes of the AVRISP data endpoint. */\r
                #define AVRISP_DATA_EPSIZE             64       \r
 \r
                /** Size in bytes of the AVRISP data endpoint. */\r
                #define AVRISP_DATA_EPSIZE             64       \r
 \r

diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c
index e5b282e..7ca94b2 100644 (file)
--- a/Projects/XPLAINBridge/XPLAINBridge.c
+++ b/Projects/XPLAINBridge/XPLAINBridge.c
@@ -99,7 +99,7 @@ void AVRISP_Task(void)
        if (USB_DeviceState != DEVICE_STATE_Configured)\r
          return;\r
 \r
        if (USB_DeviceState != DEVICE_STATE_Configured)\r
          return;\r
 \r

-       Endpoint_SelectEndpoint(AVRISP_DATA_EPNUM);\r
+       Endpoint_SelectEndpoint(AVRISP_DATA_OUT_EPNUM);\r

        \r
        /* Check to see if a V2 Protocol command has been received */\r
        if (Endpoint_IsOUTReceived())\r
        \r
        /* Check to see if a V2 Protocol command has been received */\r
        if (Endpoint_IsOUTReceived())\r


@@ -178,18 +178,24 @@ void SetupHardware(void)
 /** Event handler for the library USB Configuration Changed event. */\r
 void EVENT_USB_Device_ConfigurationChanged(void)\r
 {\r
 /** Event handler for the library USB Configuration Changed event. */\r
 void EVENT_USB_Device_ConfigurationChanged(void)\r
 {\r

-       bool EndpointConfigSuccess;\r
+       bool EndpointConfigSuccess = true;\r

 \r
        /* Configure the device endpoints according to the selected mode */\r
        if (CurrentFirmwareMode == MODE_USART_BRIDGE)\r
        {\r
 \r
        /* Configure the device endpoints according to the selected mode */\r
        if (CurrentFirmwareMode == MODE_USART_BRIDGE)\r
        {\r

-               EndpointConfigSuccess = CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);\r
+               EndpointConfigSuccess &= CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);\r

        }\r
        else\r
        {\r
        }\r
        else\r
        {\r

-               EndpointConfigSuccess = Endpoint_ConfigureEndpoint(AVRISP_DATA_EPNUM, EP_TYPE_BULK,\r
-                                                                                                  ENDPOINT_DIR_OUT, AVRISP_DATA_EPSIZE,\r
-                                                                                                  ENDPOINT_BANK_SINGLE);\r
+               EndpointConfigSuccess &= Endpoint_ConfigureEndpoint(AVRISP_DATA_OUT_EPNUM, EP_TYPE_BULK,\r
+                                                                                                   ENDPOINT_DIR_OUT, AVRISP_DATA_EPSIZE,\r
+                                                                                                   ENDPOINT_BANK_SINGLE);\r
+\r
+               #if defined(WIN_LIBUSB_COMPAT)\r
+               EndpointConfigSuccess &= Endpoint_ConfigureEndpoint(AVRISP_DATA_IN_EPNUM, EP_TYPE_BULK,\r
+                                                                   ENDPOINT_DIR_IN, AVRISP_DATA_EPSIZE,\r
+                                                                   ENDPOINT_BANK_SINGLE);\r
+               #endif\r

        }\r
 \r
        if (EndpointConfigSuccess)\r
        }\r
 \r
        if (EndpointConfigSuccess)\r

diff --git a/Projects/XPLAINBridge/XPLAINBridge.txt b/Projects/XPLAINBridge/XPLAINBridge.txt
index f967d3b..cd8efbc 100644 (file)
--- a/Projects/XPLAINBridge/XPLAINBridge.txt
+++ b/Projects/XPLAINBridge/XPLAINBridge.txt
@@ -78,5 +78,12 @@
  *    <td>RingBuff.h</td>\r
  *    <td>Defines the maximum number of bytes which can be buffered in each Ring Buffer.</td>\r
  *   </tr>\r
  *    <td>RingBuff.h</td>\r
  *    <td>Defines the maximum number of bytes which can be buffered in each Ring Buffer.</td>\r
  *   </tr>\r

+ *   <tr>\r
+ *    <td>WIN_LIBUSB_COMPAT</td>\r
+ *    <td>Makefile CDEFS</td>\r
+ *    <td>Define to switch to a non-standard endpoint scheme, breaking compatibility with AVRStudio under Windows but making\r
+ *        the code compatible with Windows builds of avrdude using the libUSB driver. Linux platforms are not affected by this\r
+ *        option.\r
+ *   </tr>\r

  *  </table>\r
  */
\ No newline at end of file
  *  </table>\r
  */
\ No newline at end of file

diff --git a/Projects/XPLAINBridge/makefile b/Projects/XPLAINBridge/makefile
index ba87e8a..dfecaa2 100644 (file)
--- a/Projects/XPLAINBridge/makefile
+++ b/Projects/XPLAINBridge/makefile
@@ -202,6 +202,8 @@ CDEFS += -DAUX_LINE_PIN=PINB
 CDEFS += -DAUX_LINE_DDR=DDRB\r
 CDEFS += -DAUX_LINE_MASK="(1 << 4)"\r
 CDEFS += -DVTARGET_ADC_CHANNEL=2\r
 CDEFS += -DAUX_LINE_DDR=DDRB\r
 CDEFS += -DAUX_LINE_MASK="(1 << 4)"\r
 CDEFS += -DVTARGET_ADC_CHANNEL=2\r

+#CDEFS += -DLIBUSB_FILTERDRV_COMPAT\r
+\r

 \r
 # Place -D or -U options here for ASM sources\r
 ADEFS = -DF_CPU=$(F_CPU)\r
 \r
 # Place -D or -U options here for ASM sources\r
 ADEFS = -DF_CPU=$(F_CPU)\r