Fixed Set/Clear Feature requests directed to a non-configured endpoint not returning...

[pub/USBasp.git] / Projects / AVRISP-MKII / Lib / XPROG / XPROGTarget.h

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
index f4c3b7b..7166c10 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
@@ -1,13 +1,13 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
 \r
   Permission to use, copy, modify, distribute, and sell this \r
   software and its documentation for any purpose is hereby granted\r
@@ -30,11 +30,11 @@
 \r
 /** \file\r
  *\r
- *  Header file for PDITarget.c.\r
+ *  Header file for XPROGTarget.c.\r
  */\r
 \r
-#ifndef _PDI_TARGET_\r
-#define _PDI_TARGET_\r
+#ifndef _XPROG_TARGET_\r
+#define _XPROG_TARGET_\r
 \r
        /* Includes: */\r
                #include <avr/io.h>\r
@@ -44,6 +44,7 @@
                #include <LUFA/Common/Common.h>\r
                \r
                #include "../V2Protocol.h"\r
+               #include "XPROGProtocol.h"\r
        \r
        /* Preprocessor Checks: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
@@ -57,16 +58,16 @@
        /* Defines: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
                        #define XPROG_VIA_HARDWARE_USART\r
-               #else\r
+               #else           \r
                        #define BITBANG_PDIDATA_PORT     PORTB\r
                        #define BITBANG_PDIDATA_DDR      DDRB\r
                        #define BITBANG_PDIDATA_PIN      PINB\r
                        #define BITBANG_PDIDATA_MASK     (1 << 3)\r
                        \r
-                       #define BITBANG_PDICLOCK_PORT    RESET_LINE_PORT\r
-                       #define BITBANG_PDICLOCK_DDR     RESET_LINE_DDR\r
-                       #define BITBANG_PDICLOCK_PIN     RESET_LINE_PIN\r
-                       #define BITBANG_PDICLOCK_MASK    RESET_LINE_MASK\r
+                       #define BITBANG_PDICLOCK_PORT    AUX_LINE_PORT\r
+                       #define BITBANG_PDICLOCK_DDR     AUX_LINE_DDR\r
+                       #define BITBANG_PDICLOCK_PIN     AUX_LINE_PIN\r
+                       #define BITBANG_PDICLOCK_MASK    AUX_LINE_MASK\r
 \r
                        #define BITBANG_TPIDATA_PORT     PORTB\r
                        #define BITBANG_TPIDATA_DDR      DDRB\r
@@ -79,6 +80,9 @@
                        #define BITBANG_TPICLOCK_MASK    (1 << 1)\r
                #endif\r
                \r
+               /** Serial carrier TPI/PDI speed when hardware TPI/PDI mode is used */\r
+               #define XPROG_HARDWARE_SPEED       500000\r
+\r
                /** Number of cycles between each clock when software USART mode is used */\r
                #define BITS_BETWEEN_USART_CLOCKS  100\r
                \r
@@ -130,7 +134,7 @@
                #define TPI_NVMENABLE_KEY          (uint8_t[]){0x12, 0x89, 0xAB, 0x45, 0xCD, 0xD8, 0x88, 0xFF}\r
 \r
                #define TPI_POINTER_INDIRECT       0\r
-               #define TPI_POINTER_INDIRECT_PI    (1 << 2)\r
+               #define TPI_POINTER_INDIRECT_PI    4\r
                \r
        /* Function Prototypes: */\r
                void    XPROGTarget_EnableTargetPDI(void);\r
@@ -141,5 +145,10 @@
                uint8_t XPROGTarget_ReceiveByte(void);\r
                void    XPROGTarget_SendBreak(void);\r
                bool    XPROGTarget_WaitWhileNVMBusBusy(void);\r
+               \r
+               #if defined(INCLUDE_FROM_XPROGTARGET_C)\r
+                       static void XPROGTarget_SetTxMode(void);\r
+                       static void XPROGTarget_SetRxMode(void);\r
+               #endif\r
 \r
 #endif\r