Added include guard for dmbs modules. Fix https://github.com/abcminiuser/dmbs/issues...

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

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c b/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
index fdba4e9..5bf8e49 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2015.
+     Copyright (C) Dean Camera, 2017.

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

-  Copyright 2015  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2017  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


@@ -461,6 +461,10 @@ bool XMEGANVM_EraseMemory(const uint8_t EraseCommand,
        if (!(XMEGANVM_WaitWhileNVMBusBusy()))
          return false;
 
        if (!(XMEGANVM_WaitWhileNVMBusBusy()))
          return false;
 

+       /* Wait until the NVM controller is no longer busy */
+       if (!(XMEGANVM_WaitWhileNVMControllerBusy()))
+         return false;
+

        return true;
 }
 
        return true;
 }