X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/f1b6ddb7107fd9534cc6a8d6ab2d46f349d9cdb7..c31fdbd03eee95660d65adb0f1bf7c0c397fd435:/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c?ds=sidebyside

diff --git a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c
index 1f9f8391d..86318e9cb 100644
--- a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c
+++ b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c
@@ -114,18 +114,15 @@ int main(void)
 	{
 		Programmer_Task();
 
+		#if defined(USB_CAN_BE_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();
 	}
@@ -158,6 +155,13 @@ void SetupHardware(void)
 	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