AVRISP programmer project now has a more robust timeout system, allowing for a doubli...

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

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h
index 4607b32..8e5d1b0 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h
@@ -1,21 +1,21 @@
 /*\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
 \r

-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


@@ -42,6 +42,7 @@
                #include <stdio.h>\r
                \r
                #include <LUFA/Drivers/USB/USB.h>\r
                #include <stdio.h>\r
                \r
                #include <LUFA/Drivers/USB/USB.h>\r

+               #include <LUFA/Drivers/Peripheral/SerialStream.h>\r

        \r
                #include "../V2Protocol.h"\r
                #include "XPROGTarget.h"\r
        \r
                #include "../V2Protocol.h"\r
                #include "XPROGTarget.h"\r


@@ -97,16 +98,22 @@
 \r
                #define XPRG_PARAM_NVMBASE                  0x01\r
                #define XPRG_PARAM_EEPPAGESIZE              0x02\r
 \r
                #define XPRG_PARAM_NVMBASE                  0x01\r
                #define XPRG_PARAM_EEPPAGESIZE              0x02\r

+               #define XPRG_PARAM_NVMCMD_REG               0x03 /* Undocumented, Reverse-engineered */\r
+               #define XPRG_PARAM_NVMCSR_REG               0x04 /* Undocumented, Reverse-engineered */\r

                \r
                #define XPRG_PROTOCOL_PDI                   0x00\r
                #define XPRG_PROTOCOL_JTAG                  0x01\r
                \r
                #define XPRG_PROTOCOL_PDI                   0x00\r
                #define XPRG_PROTOCOL_JTAG                  0x01\r

-               #define XPRG_PROTOCOL_TPI                   0x02\r
+               #define XPRG_PROTOCOL_TPI                   0x02 /* Undocumented, Reverse-engineered */\r

                \r
                #define XPRG_PAGEMODE_WRITE                 (1 << 1)\r
                #define XPRG_PAGEMODE_ERASE                 (1 << 0)\r
        \r
        /* External Variables: */\r
                extern uint32_t XPROG_Param_NVMBase;\r
                \r
                #define XPRG_PAGEMODE_WRITE                 (1 << 1)\r
                #define XPRG_PAGEMODE_ERASE                 (1 << 0)\r
        \r
        /* External Variables: */\r
                extern uint32_t XPROG_Param_NVMBase;\r

+               extern uint16_t XPROG_Param_EEPageSize;\r
+               extern uint8_t  XPROG_Param_NVMCSRRegAddr;\r
+               extern uint8_t  XPROG_Param_NVMCMDRegAddr;\r
+               extern uint8_t  XPROG_SelectedProtocol;\r

                \r
        /* Function Prototypes: */\r
                void XPROGProtocol_SetMode(void);\r
                \r
        /* Function Prototypes: */\r
                void XPROGProtocol_SetMode(void);\r