aboutsummaryrefslogtreecommitdiffstats
path: root/Projects/AVRISP-MKII/AVRISPDescriptors.h
diff options
context:
space:
mode:
Diffstat (limited to 'Projects/AVRISP-MKII/AVRISPDescriptors.h')
-rw-r--r--Projects/AVRISP-MKII/AVRISPDescriptors.h36
1 files changed, 4 insertions, 32 deletions
diff --git a/Projects/AVRISP-MKII/AVRISPDescriptors.h b/Projects/AVRISP-MKII/AVRISPDescriptors.h
index e80f6adae..04ff20a18 100644
--- a/Projects/AVRISP-MKII/AVRISPDescriptors.h
+++ b/Projects/AVRISP-MKII/AVRISPDescriptors.h
@@ -44,29 +44,12 @@
#include "Config/AppConfig.h"
- /* Preprocessor Checks: */
- #if defined(LIBUSB_DRIVER_COMPAT) && defined(RESET_TOGGLES_LIBUSB_COMPAT)
- #error LIBUSB_DRIVER_COMPAT and RESET_TOGGLES_LIBUSB_COMPAT are mutually exclusive.
- #endif
-
/* Macros: */
/** Endpoint address of the AVRISP data OUT endpoint. */
#define AVRISP_DATA_OUT_EPADDR (ENDPOINT_DIR_OUT | 2)
- /** Endpoint address of the AVRISP data IN endpoint, when in Jungo driver compatibility mode. */
- #define AVRISP_DATA_IN_EPADDR_JUNGO (ENDPOINT_DIR_IN | 2)
-
- /** Endpoint address of the AVRISP data IN endpoint, when in LibUSB driver compatibility mode. */
- #define AVRISP_DATA_IN_EPADDR_LIBUSB (ENDPOINT_DIR_IN | 3)
-
- #if defined(RESET_TOGGLES_LIBUSB_COMPAT)
- #define AVRISP_DATA_IN_EPADDR AVRISP_CurrDataINEndpointAddress
- #elif defined(LIBUSB_DRIVER_COMPAT)
- #define AVRISP_DATA_IN_EPADDR AVRISP_DATA_IN_EPADDR_LIBUSB
- #else
- /** Endpoint address of the AVRISP data IN endpoint. */
- #define AVRISP_DATA_IN_EPADDR AVRISP_DATA_IN_EPADDR_JUNGO
- #endif
+ /** Endpoint address of the AVRISP data IN endpoint. */
+ #define AVRISP_DATA_IN_EPADDR (ENDPOINT_DIR_IN | 2)
/** Size in bytes of the AVRISP data endpoint. */
#define AVRISP_DATA_EPSIZE 64
@@ -107,22 +90,11 @@
AVRISP_STRING_ID_Serial = 3, /**< Serial number string ID */
};
- /* External Variables: */
- #if defined(RESET_TOGGLES_LIBUSB_COMPAT)
- extern uint8_t AVRISP_CurrDataINEndpointAddress;
- #endif
-
/* Function Prototypes: */
uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
const uint16_t wIndex,
- const void** const DescriptorAddress,
- uint8_t* const DescriptorMemorySpace)
- ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3) ATTR_NON_NULL_PTR_ARG(4);
-
- #if defined(RESET_TOGGLES_LIBUSB_COMPAT)
- void CheckExternalReset(void) ATTR_NAKED ATTR_INIT_SECTION(3);
- void UpdateCurrentCompatibilityMode(void);
- #endif
+ const void** const DescriptorAddress)
+ ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
#endif