Oops - PDI handshake delay was too long, causing the device's /RESET functionality...

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

diff --git a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h
index 196b7ca..5623945 100644 (file)
--- a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h
+++ b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h
@@ -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
-\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
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\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


@@ -42,7 +42,8 @@
                #include <avr/power.h>\r
                #include <stdio.h>\r
 \r
                #include <avr/power.h>\r
                #include <stdio.h>\r
 \r

-               #include "Descriptors.h"\r
+               #include "DiskDevice.h"\r
+               #include "DiskHost.h"\r

 \r
                #include "Lib/SCSI.h"\r
                #include "Lib/DataflashManager.h"\r
 \r
                #include "Lib/SCSI.h"\r
                #include "Lib/DataflashManager.h"\r


@@ -50,11 +51,8 @@
                #include "Lib/PetiteFATFs/pff.h"\r
 \r
                #include <LUFA/Version.h>\r
                #include "Lib/PetiteFATFs/pff.h"\r
 \r
                #include <LUFA/Version.h>\r

-               #include <LUFA/Drivers/Board/LEDs.h>\r

                #include <LUFA/Drivers/Board/Buttons.h>\r
                #include <LUFA/Drivers/Board/Buttons.h>\r

-               #include <LUFA/Drivers/USB/USB.h>\r
-               #include <LUFA/Drivers/USB/Class/MassStorage.h>
-               #include <LUFA/Drivers/USB/Class/CDC.h>\r
+               #include <LUFA/Drivers/Peripheral/SerialStream.h>\r

 \r
        /* Macros: */\r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r
 \r
        /* Macros: */\r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r


@@ -70,25 +68,20 @@
                #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r
 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is busy. */\r
                #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r
 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is busy. */\r

-               #define LEDMASK_USB_BUSY         (LEDS_LED2)\r
+               #define LEDMASK_USB_BUSY          LEDS_LED2\r

                \r
        /* External Variables: */\r
                \r
        /* External Variables: */\r

-               extern FILE USBSerialStream;\r
-               extern FILE DataflashStream;\r
+               extern FILE DiskStream;\r
+               extern FATFS DiskFATState;\r

        \r
        /* Function Prototypes: */\r
                #if defined(INCLUDE_FROM_STANDALONEPROG_C)\r
        \r
        /* Function Prototypes: */\r
                #if defined(INCLUDE_FROM_STANDALONEPROG_C)\r

-                       static int Dataflash_getchar(FILE* Stream);\r
+                       static int Disk_getchar(FILE* Stream);\r

                #endif\r
                \r
                #endif\r
                \r

+               void EVENT_USB_UIDChange(void);\r
+               \r

                void SetupHardware(void);\r
                void Programmer_Task(void);\r
                void SetupHardware(void);\r
                void Programmer_Task(void);\r

-\r
-               void EVENT_USB_Device_Connect(void);\r
-               void EVENT_USB_Device_Disconnect(void);\r
-               void EVENT_USB_Device_ConfigurationChanged(void);\r
-               void EVENT_USB_Device_UnhandledControlRequest(void);\r
-\r
-               bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);\r
-\r
+               \r

 #endif\r
 #endif\r