Fixed possible deadlock in the CDC device driver if the USB connection is dropped...

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

diff --git a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c
index 86007da..86318e9 100644 (file)
--- a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c
+++ b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c
@@ -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


@@ -114,18 +114,15 @@ int main(void)
        {
                Programmer_Task();
 
        {
                Programmer_Task();
 

+               #if defined(USB_CAN_BE_HOST)

                if (USB_CurrentMode == USB_MODE_Host)
                if (USB_CurrentMode == USB_MODE_Host)

-               {
-                       #if defined(USB_CAN_BE_HOST)
-                       DiskHost_USBTask();
-                       #endif
-               }
-               else
-               {
-                       #if defined(USB_CAN_BE_DEVICE)
-                       DiskDevice_USBTask();
-                       #endif
-               }
+                 DiskHost_USBTask();
+               #endif
+               
+               #if defined(USB_CAN_BE_DEVICE)
+               if (USB_CurrentMode == USB_MODE_Device)
+                 DiskDevice_USBTask();
+               #endif

 
                USB_USBTask();
        }
 
                USB_USBTask();
        }


@@ -158,6 +155,13 @@ void SetupHardware(void)
        Serial_CreateStream(NULL);
 
        #if defined(USB_CAN_BE_DEVICE)
        Serial_CreateStream(NULL);
 
        #if defined(USB_CAN_BE_DEVICE)

+       /* Check if the Dataflash is working, abort if not */
+       if (!(DataflashManager_CheckDataflashOperation()))
+       {
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+               for(;;);
+       }
+

        /* Clear Dataflash sector protections, if enabled */
        DataflashManager_ResetDataflashProtections();
        #endif
        /* Clear Dataflash sector protections, if enabled */
        DataflashManager_ResetDataflashProtections();
        #endif