Removed software PDI/TPI emulation from the AVRISP-MKII clone project, as it was...

[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 ff0be48..65ec11b 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
@@ -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
@@ -54,35 +54,10 @@
                                #define ENABLE_XPROG_PROTOCOL\r
                        #endif\r
                #endif\r
-\r
-       /* Defines: */\r
-               #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
-                       #define XPROG_VIA_HARDWARE_USART\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    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
-                       #define BITBANG_TPIDATA_PIN      PINB\r
-                       #define BITBANG_TPIDATA_MASK     (1 << 3)\r
-                               \r
-                       #define BITBANG_TPICLOCK_PORT    PORTB\r
-                       #define BITBANG_TPICLOCK_DDR     DDRB\r
-                       #define BITBANG_TPICLOCK_PIN     PINB\r
-                       #define BITBANG_TPICLOCK_MASK    (1 << 1)\r
-               #endif\r
-               \r
-               /** Number of cycles between each clock when software USART mode is used */\r
-               #define BITS_BETWEEN_USART_CLOCKS  200\r
                \r
+               /** Serial carrier TPI/PDI speed when hardware TPI/PDI mode is used */\r
+               #define XPROG_HARDWARE_SPEED       1000000\r
+\r
                /** Total number of bits in a single USART frame */\r
                #define BITS_IN_USART_FRAME        12\r
                \r
@@ -131,7 +106,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