Update copyright year to 2010.
[pub/USBasp.git] / Projects / Incomplete / StandaloneProgrammer / Lib / ProgrammerConfig.c
index 2f3d95b..e43556f 100644 (file)
@@ -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
@@ -44,7 +44,7 @@ bool ProgrammerConfig_ProcessConfiguration(void)
 \r
        if (!(pf_open("CONF.txt") == FR_OK))\r
        {\r
 \r
        if (!(pf_open("CONF.txt") == FR_OK))\r
        {\r
-               fputs(" >> ERROR: CONF.txt File Not Found.\r\n", &USBSerialStream);\r
+               puts(" >> ERROR: CONF.txt File Not Found.\r\n");\r
                return false;\r
        }\r
        \r
                return false;\r
        }\r
        \r
@@ -53,7 +53,7 @@ bool ProgrammerConfig_ProcessConfiguration(void)
                        \r
        do\r
        {\r
                        \r
        do\r
        {\r
-               CurrentLine = fgets(LineBuff, sizeof(LineBuff), &DataflashStream);\r
+               CurrentLine = fgets(LineBuff, sizeof(LineBuff), &DiskStream);\r
                \r
                if (CurrentLine)\r
                {\r
                \r
                if (CurrentLine)\r
                {\r
@@ -66,12 +66,12 @@ bool ProgrammerConfig_ProcessConfiguration(void)
                }\r
        } while (CurrentLine);\r
        \r
                }\r
        } while (CurrentLine);\r
        \r
-       fprintf(&USBSerialStream, " >> *** Configuration: ***\r\n");\r
-       fprintf(&USBSerialStream, " >> Device Signature: 0x%02x 0x%02x 0x%02x 0x%02x\r\n", ProgrammerConfig.SigBytes[0],\r
-                                                                                                  ProgrammerConfig.SigBytes[1],\r
-                                                                                                  ProgrammerConfig.SigBytes[2],\r
-                                                                                                  ProgrammerConfig.SigBytes[3]);\r
-       fprintf(&USBSerialStream, " >> Programming Speed: %lu Hz\r\n", ProgrammerConfig.ProgrammingSpeed);\r
+       printf(" >> *** Configuration: ***\r\n");\r
+       printf(" >> Device Signature: 0x%02x 0x%02x 0x%02x 0x%02x\r\n", ProgrammerConfig.SigBytes[0],\r
+                                                                               ProgrammerConfig.SigBytes[1],\r
+                                                                               ProgrammerConfig.SigBytes[2],\r
+                                                                               ProgrammerConfig.SigBytes[3]);\r
+       printf(" >> Programming Speed: %lu Hz\r\n", ProgrammerConfig.ProgrammingSpeed);\r
        \r
        return true;\r
 }\r
        \r
        return true;\r
 }\r