Make sure that the NVM bus/controller busy waits in the AVRISP MKII clone project...

[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 33a5827..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
 /*\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
               \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
 \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
 \r
 /** \file\r
  *\r

- *  Header file for PDITarget.c.\r
+ *  Header file for XPROGTarget.c.\r

  */\r
 \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
 \r
        /* Includes: */\r
                #include <avr/io.h>\r


@@ -58,7 +58,7 @@
        /* Defines: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
                        #define XPROG_VIA_HARDWARE_USART\r
        /* 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_PORT     PORTB\r
                        #define BITBANG_PDIDATA_DDR      DDRB\r
                        #define BITBANG_PDIDATA_PIN      PINB\r


@@ -80,8 +80,11 @@
                        #define BITBANG_TPICLOCK_MASK    (1 << 1)\r
                #endif\r
                \r
                        #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
                /** Number of cycles between each clock when software USART mode is used */\r

-               #define BITS_BETWEEN_USART_CLOCKS  200\r
+               #define BITS_BETWEEN_USART_CLOCKS  100\r

                \r
                /** Total number of bits in a single USART frame */\r
                #define BITS_IN_USART_FRAME        12\r
                \r
                /** Total number of bits in a single USART frame */\r
                #define BITS_IN_USART_FRAME        12\r


@@ -131,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_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
                \r
        /* Function Prototypes: */\r
                void    XPROGTarget_EnableTargetPDI(void);\r