Device mode class driver callbacks are now fired before the control request status...

[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 127c826..a9114e1 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.h
+++ b/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.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


@@ -66,17 +66,6 @@
                #define PROG_MODE_PAGED_READYBUSY_MASK  (1 << 6)\r
                #define PROG_MODE_COMMIT_PAGE_MASK      (1 << 7)\r
 \r
                #define PROG_MODE_PAGED_READYBUSY_MASK  (1 << 6)\r
                #define PROG_MODE_COMMIT_PAGE_MASK      (1 << 7)\r
 \r

-       /* Inline Functions: */\r
-               /** Blocking delay for a given number of milliseconds.\r
-                *\r
-                *  \param[in] DelayMS  Number of milliseconds to delay for\r
-                */\r
-               static inline void ISPProtocol_DelayMS(uint8_t DelayMS)\r
-               {\r
-                       while (DelayMS--)\r
-                         _delay_ms(1);\r
-               }\r
-\r

        /* Function Prototypes: */\r
                void ISPProtocol_EnterISPMode(void);\r
                void ISPProtocol_LeaveISPMode(void);\r
        /* Function Prototypes: */\r
                void ISPProtocol_EnterISPMode(void);\r
                void ISPProtocol_LeaveISPMode(void);\r


@@ -86,5 +75,5 @@
                void ISPProtocol_ReadFuseLockSigOSCCAL(const uint8_t V2Command);\r
                void ISPProtocol_WriteFuseLock(const uint8_t V2Command);\r
                void ISPProtocol_SPIMulti(void);\r
                void ISPProtocol_ReadFuseLockSigOSCCAL(const uint8_t V2Command);\r
                void ISPProtocol_WriteFuseLock(const uint8_t V2Command);\r
                void ISPProtocol_SPIMulti(void);\r

-\r
+               void ISPProtocol_DelayMS(uint8_t DelayMS);\r

 #endif\r
 #endif\r