Fix SoftUART.c not compiling due to accidental check in of changes not yet complete...

[pub/USBasp.git] / Projects / Incomplete / StandaloneProgrammer / StandaloneProgrammer.c

diff --git a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c
index 4b019bd..9627d1b 100644 (file)
--- a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c
+++ b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c
@@ -1,7 +1,7 @@
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.

-              
+

   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */


@@ -9,13 +9,13 @@
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
 /*
   Copyright 2010  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


@@ -67,7 +67,7 @@ void EVENT_USB_UIDChange(void)
 }
 #endif
 
 }
 #endif
 

-/** Task to determine if the user is wishes to start the programming sequence, and if so executes the 
+/** Task to determine if the user is wishes to start the programming sequence, and if so executes the

  *  required functions to program the attached target (if any) with the files loaded to the Dataflash.
  */
 void Programmer_Task(void)
  *  required functions to program the attached target (if any) with the files loaded to the Dataflash.
  */
 void Programmer_Task(void)


@@ -80,7 +80,7 @@ void Programmer_Task(void)
                        HasAttempted = true;
                else
                        return;
                        HasAttempted = true;
                else
                        return;

-                       
+

                puts("==== PROGRAMMING CYCLE STARTED ====\r\n");
 
                #if defined(USB_CAN_BE_BOTH)
                puts("==== PROGRAMMING CYCLE STARTED ====\r\n");
 
                #if defined(USB_CAN_BE_BOTH)


@@ -113,7 +113,7 @@ int main(void)
        for (;;)
        {
                Programmer_Task();
        for (;;)
        {
                Programmer_Task();

-                 
+

                if (USB_CurrentMode == USB_MODE_HOST)
                {
                        #if defined(USB_CAN_BE_HOST)
                if (USB_CurrentMode == USB_MODE_HOST)
                {
                        #if defined(USB_CAN_BE_HOST)


@@ -126,7 +126,7 @@ int main(void)
                        DiskDevice_USBTask();
                        #endif
                }
                        DiskDevice_USBTask();
                        #endif
                }

-               
+

                USB_USBTask();
        }
 }
                USB_USBTask();
        }
 }


@@ -159,3 +159,4 @@ void SetupHardware(void)
        DataflashManager_ResetDataflashProtections();
        #endif
 }
        DataflashManager_ResetDataflashProtections();
        #endif
 }

+