Minor documentation adjustments to the demos, projects and bootloaders to ensure...

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

diff --git a/Projects/AVRISP-MKII/Lib/V2ProtocolParams.h b/Projects/AVRISP-MKII/Lib/V2ProtocolParams.h
index 4ef091c..ab47664 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/V2ProtocolParams.h
+++ b/Projects/AVRISP-MKII/Lib/V2ProtocolParams.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -37,20 +37,15 @@
 #define _V2_PROTOCOL_PARAMS_
 
        /* Includes: */
 #define _V2_PROTOCOL_PARAMS_
 
        /* Includes: */

-               #include <LUFA/Common/Common.h>
+               #include <avr/io.h>
+               #include <avr/eeprom.h>
+

                #include <LUFA/Version.h>
 
                #if defined(ADC)
                        #include <LUFA/Drivers/Peripheral/ADC.h>
                #endif
 
                #include <LUFA/Version.h>
 
                #if defined(ADC)
                        #include <LUFA/Drivers/Peripheral/ADC.h>
                #endif
 

-               #if (ARCH == ARCH_AVR8)
-                       #include <avr/io.h>
-                       #include <avr/eeprom.h>
-               #elif (ARCH == ARCH_UC3)
-                       #include <avr32/io.h>           
-               #endif
-

                #include "V2Protocol.h"
                #include "V2ProtocolConstants.h"
                #include "ISP/ISPTarget.h"
                #include "V2Protocol.h"
                #include "V2ProtocolConstants.h"
                #include "ISP/ISPTarget.h"


@@ -65,10 +60,10 @@
                /** Total number of parameters in the parameter table */
                #define TABLE_PARAM_COUNT   (sizeof(ParameterTable) / sizeof(ParameterTable[0]))
                
                /** Total number of parameters in the parameter table */
                #define TABLE_PARAM_COUNT   (sizeof(ParameterTable) / sizeof(ParameterTable[0]))
                

-               #if (ARCH == ARCH_UC3) // TODO: FIXME
-                       #define EEMEM
-                       #define eeprom_read_byte(x) *x
-                       #define eeprom_update_byte(x,y) *x=y
+               #if (!defined(FIRMWARE_VERSION_MINOR) || defined(__DOXYGEN__))
+                       /** Minor firmware version, reported to the host on request; must match the version
+                        *  the host is expecting, or it (may) reject further communications with the programmer. */
+                       #define FIRMWARE_VERSION_MINOR   0x11

                #endif
 
        /* Type Defines: */
                #endif
 
        /* Type Defines: */