Update UC3 platform driver support to use the bitmasks defined in the header files...

[pub/USBasp.git] / Projects / AVRISP-MKII / Lib / ISP / ISPProtocol.h

diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.h b/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.h
index c983f49..213ce5c 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.h
+++ b/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2011.
+

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  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
   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
   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
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -39,22 +39,22 @@
        /* Includes: */
                #include <avr/io.h>
                #include <util/delay.h>
        /* Includes: */
                #include <avr/io.h>
                #include <util/delay.h>

-               
+

                #include <LUFA/Drivers/USB/USB.h>
 
                #include "../V2Protocol.h"
                #include <LUFA/Drivers/USB/USB.h>
 
                #include "../V2Protocol.h"

-               
+

        /* Preprocessor Checks: */
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
                        #undef ENABLE_ISP_PROTOCOL
        /* Preprocessor Checks: */
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
                        #undef ENABLE_ISP_PROTOCOL

-                       
+

                        #if !defined(ENABLE_XPROG_PROTOCOL)
                                #define ENABLE_XPROG_PROTOCOL
                        #endif
                #endif
 
        /* Macros: */
                        #if !defined(ENABLE_XPROG_PROTOCOL)
                                #define ENABLE_XPROG_PROTOCOL
                        #endif
                #endif
 
        /* Macros: */

-               /** Mask for the reading or writing of the high byte in a FLASH word when issuing a low-level programming command */
+               /** Mask for the reading or writing of the high byte in a FLASH word when issuing a low-level programming command. */

                #define READ_WRITE_HIGH_BYTE_MASK       (1 << 3)
 
                #define PROG_MODE_PAGED_WRITES_MASK     (1 << 0)
                #define READ_WRITE_HIGH_BYTE_MASK       (1 << 3)
 
                #define PROG_MODE_PAGED_WRITES_MASK     (1 << 0)


@@ -77,3 +77,4 @@
                void ISPProtocol_SPIMulti(void);
                void ISPProtocol_DelayMS(uint8_t DelayMS);
 #endif
                void ISPProtocol_SPIMulti(void);
                void ISPProtocol_DelayMS(uint8_t DelayMS);
 #endif

+