Add extra LUFA TAR archive export exclusions.

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

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.h b/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.h
index 11f7932..a8704df 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.h
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.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,17 +37,12 @@
 #define _XMEGA_NVM_
 
        /* Includes: */
 #define _XMEGA_NVM_
 
        /* Includes: */

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

                #include <stdbool.h>
 
                #include <stdbool.h>
 

+               #include <LUFA/Common/Common.h>
+

                #include "XPROGProtocol.h"
                #include "XPROGTarget.h"
 
                #include "XPROGProtocol.h"
                #include "XPROGTarget.h"
 


@@ -61,7 +56,7 @@
                #endif
 
        /* Defines: */
                #endif
 
        /* Defines: */

-               #define XMEGA_CRC_LENGTH                     3
+               #define XMEGA_CRC_LENGTH_BYTES               3

 
                #define XMEGA_NVM_REG_ADDR0                  0x00
                #define XMEGA_NVM_REG_ADDR1                  0x01
 
                #define XMEGA_NVM_REG_ADDR0                  0x00
                #define XMEGA_NVM_REG_ADDR1                  0x01


@@ -75,6 +70,8 @@
                #define XMEGA_NVM_REG_INTCTRL                0x0D
                #define XMEGA_NVM_REG_STATUS                 0x0F
                #define XMEGA_NVM_REG_LOCKBITS               0x10
                #define XMEGA_NVM_REG_INTCTRL                0x0D
                #define XMEGA_NVM_REG_STATUS                 0x0F
                #define XMEGA_NVM_REG_LOCKBITS               0x10

+               
+               #define XMEGA_NVM_BIT_CTRLA_CMDEX            (1 << 0)

 
                #define XMEGA_NVM_CMD_NOOP                   0x00
                #define XMEGA_NVM_CMD_CHIPERASE              0x40
 
                #define XMEGA_NVM_CMD_NOOP                   0x00
                #define XMEGA_NVM_CMD_CHIPERASE              0x40