Oops - don't reset AVRISP-MKII timeout in XPROG mode, as this is synchronous serial...

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

diff --git a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c
index 9627d1b..1f9f839 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, 2010.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
 
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  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


@@ -31,7 +31,7 @@
 /** \file
  *
  *  Main source file for the Standalone Programmer project. This file contains the main tasks of
 /** \file
  *
  *  Main source file for the Standalone Programmer project. This file contains the main tasks of

- *  the demo and is responsible for the initial application hardware configuration.
+ *  the project and is responsible for the initial application hardware configuration.

  */
 
 #define  INCLUDE_FROM_STANDALONEPROG_C
  */
 
 #define  INCLUDE_FROM_STANDALONEPROG_C


@@ -84,7 +84,7 @@ void Programmer_Task(void)
                puts("==== PROGRAMMING CYCLE STARTED ====\r\n");
 
                #if defined(USB_CAN_BE_BOTH)
                puts("==== PROGRAMMING CYCLE STARTED ====\r\n");
 
                #if defined(USB_CAN_BE_BOTH)

-               printf("Using %s Drive...\r\n", (USB_CurrentMode == USB_MODE_HOST) ? "External" : "Internal");
+               printf("Using %s Drive...\r\n", (USB_CurrentMode == USB_MODE_Host) ? "External" : "Internal");

                #endif
 
                puts("Reading Configuration File...\r\n");
                #endif
 
                puts("Reading Configuration File...\r\n");


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

-               if (USB_CurrentMode == USB_MODE_HOST)
+               if (USB_CurrentMode == USB_MODE_Host)

                {
                        #if defined(USB_CAN_BE_HOST)
                        DiskHost_USBTask();
                {
                        #if defined(USB_CAN_BE_HOST)
                        DiskHost_USBTask();


@@ -152,7 +152,10 @@ void SetupHardware(void)
        SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_SCK_LEAD_FALLING | SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);
        Dataflash_Init();
        Buttons_Init();
        SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_SCK_LEAD_FALLING | SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);
        Dataflash_Init();
        Buttons_Init();

-       SerialStream_Init(9600, true);
+       Serial_Init(9600, true);
+
+       /* Create a stdio stream for the serial port for stdin and stdout */
+       Serial_CreateStream(NULL);

 
        #if defined(USB_CAN_BE_DEVICE)
        /* Clear Dataflash sector protections, if enabled */
 
        #if defined(USB_CAN_BE_DEVICE)
        /* Clear Dataflash sector protections, if enabled */