X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/071e02c6b6b4837fa9cf0b6d4c749994e02638d7..c31fdbd03eee95660d65adb0f1bf7c0c397fd435:/Projects/AVRISP-MKII/Descriptors.h

diff --git a/Projects/AVRISP-MKII/Descriptors.h b/Projects/AVRISP-MKII/Descriptors.h
index 7415d8138..1b140f30d 100644
--- a/Projects/AVRISP-MKII/Descriptors.h
+++ b/Projects/AVRISP-MKII/Descriptors.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2012.
+
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in
   all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
@@ -32,7 +32,7 @@
  *
  *  Header file for Descriptors.c.
  */
- 
+
 #ifndef _DESCRIPTORS_H_
 #define _DESCRIPTORS_H_
 
@@ -42,18 +42,15 @@
 		#include <LUFA/Drivers/USB/USB.h>
 
 	/* Macros: */
-		#if !defined(LIBUSB_FILTERDRV_COMPAT)
-			/** Endpoint number of the AVRISP data OUT endpoint. */
-			#define AVRISP_DATA_OUT_EPNUM      2
+		#if !defined(LIBUSB_DRIVER_COMPAT) || defined(__DOXYGEN__)
+			/** Endpoint address of the AVRISP data OUT endpoint. */
+			#define AVRISP_DATA_OUT_EPADDR     (ENDPOINT_DIR_OUT | 2)
 
-			/** Endpoint number of the AVRISP data IN endpoint. */
-			#define AVRISP_DATA_IN_EPNUM       2
+			/** Endpoint address of the AVRISP data IN endpoint. */
+			#define AVRISP_DATA_IN_EPADDR      (ENDPOINT_DIR_IN  | 2)
 		#else
-			/** Endpoint number of the AVRISP data OUT endpoint. */
-			#define AVRISP_DATA_OUT_EPNUM      2
-
-			/** Endpoint number of the AVRISP data IN endpoint. */
-			#define AVRISP_DATA_IN_EPNUM       3
+			#define AVRISP_DATA_OUT_EPADDR     (ENDPOINT_DIR_OUT | 2)
+			#define AVRISP_DATA_IN_EPADDR      (ENDPOINT_DIR_IN  | 3)
 		#endif
 
 		/** Size in bytes of the AVRISP data endpoint. */
@@ -67,13 +64,18 @@
 		typedef struct
 		{
 			USB_Descriptor_Configuration_Header_t    Config;
+
+			// Atmel AVRISP-MKII Interface
 			USB_Descriptor_Interface_t               AVRISP_Interface;
 			USB_Descriptor_Endpoint_t                AVRISP_DataInEndpoint;
 			USB_Descriptor_Endpoint_t                AVRISP_DataOutEndpoint;
 		} USB_Descriptor_Configuration_t;
 
 	/* Function Prototypes: */
-		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
-											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+		                                    const uint8_t wIndex,
+		                                    const void** const DescriptorAddress)
+		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
 
 #endif
+