X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/9b2011455585885748164ab76dfaae76fffb0ff9..53eca61d02f296262011b802e80f145329ace34b:/Projects/Incomplete/StandaloneProgrammer/Lib/ProgrammerConfig.c

diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/ProgrammerConfig.c b/Projects/Incomplete/StandaloneProgrammer/Lib/ProgrammerConfig.c
index 2f3d95ba6..e43556fa1 100644
--- a/Projects/Incomplete/StandaloneProgrammer/Lib/ProgrammerConfig.c
+++ b/Projects/Incomplete/StandaloneProgrammer/Lib/ProgrammerConfig.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2009.
+     Copyright (C) Dean Camera, 2010.
               
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
 
 /*
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
-  Permission to use, copy, modify, and distribute this software
-  and its documentation for any purpose and without fee is hereby
-  granted, provided that the above copyright notice appear in 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 to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  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 
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
@@ -44,7 +44,7 @@ bool ProgrammerConfig_ProcessConfiguration(void)
 
 	if (!(pf_open("CONF.txt") == FR_OK))
 	{
-		fputs(" >> ERROR: CONF.txt File Not Found.\r\n", &USBSerialStream);
+		puts(" >> ERROR: CONF.txt File Not Found.\r\n");
 		return false;
 	}
 	
@@ -53,7 +53,7 @@ bool ProgrammerConfig_ProcessConfiguration(void)
 			
 	do
 	{
-		CurrentLine = fgets(LineBuff, sizeof(LineBuff), &DataflashStream);
+		CurrentLine = fgets(LineBuff, sizeof(LineBuff), &DiskStream);
 		
 		if (CurrentLine)
 		{
@@ -66,12 +66,12 @@ bool ProgrammerConfig_ProcessConfiguration(void)
 		}
 	} while (CurrentLine);
 	
-	fprintf(&USBSerialStream, " >> *** Configuration: ***\r\n");
-	fprintf(&USBSerialStream, " >> Device Signature: 0x%02x 0x%02x 0x%02x 0x%02x\r\n", ProgrammerConfig.SigBytes[0],
-			                                                                           ProgrammerConfig.SigBytes[1],
-			                                                                           ProgrammerConfig.SigBytes[2],
-			                                                                           ProgrammerConfig.SigBytes[3]);
-	fprintf(&USBSerialStream, " >> Programming Speed: %lu Hz\r\n", ProgrammerConfig.ProgrammingSpeed);
+	printf(" >> *** Configuration: ***\r\n");
+	printf(" >> Device Signature: 0x%02x 0x%02x 0x%02x 0x%02x\r\n", ProgrammerConfig.SigBytes[0],
+			                                                        ProgrammerConfig.SigBytes[1],
+			                                                        ProgrammerConfig.SigBytes[2],
+			                                                        ProgrammerConfig.SigBytes[3]);
+	printf(" >> Programming Speed: %lu Hz\r\n", ProgrammerConfig.ProgrammingSpeed);
 	
 	return true;
 }