Fixed AVRISP PDI race condition where the guard time between direction changes could...

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

diff --git a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c
index afe3b3a..572d6b8 100644 (file)
--- a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c
+++ b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c
@@ -9,13 +9,13 @@
 /*\r
   Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\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
+  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


@@ -37,68 +37,16 @@
 #define  INCLUDE_FROM_STANDALONEPROG_C\r
 #include "StandaloneProgrammer.h"\r
 \r
 #define  INCLUDE_FROM_STANDALONEPROG_C\r
 #include "StandaloneProgrammer.h"\r
 \r

-/** LUFA Mass Storage Class driver interface configuration and state information. This structure is\r
- *  passed to all Mass Storage Class driver functions, so that multiple instances of the same class\r
- *  within a device can be differentiated from one another.\r
- */\r
-USB_ClassInfo_MS_Device_t Disk_MS_Interface =\r
-       {\r
-               .Config =\r
-                       {\r
-                               .InterfaceNumber           = 0,\r
-\r
-                               .DataINEndpointNumber      = MASS_STORAGE_IN_EPNUM,\r
-                               .DataINEndpointSize        = MASS_STORAGE_IO_EPSIZE,\r
-                               .DataINEndpointDoubleBank  = false,\r
-\r
-                               .DataOUTEndpointNumber     = MASS_STORAGE_OUT_EPNUM,\r
-                               .DataOUTEndpointSize       = MASS_STORAGE_IO_EPSIZE,\r
-                               .DataOUTEndpointDoubleBank = false,\r
-\r
-                               .TotalLUNs                 = 1,\r
-                       },\r
-       };\r
-       \r
-/** LUFA CDC Class driver interface configuration and state information. This structure is\r
- *  passed to all CDC Class driver functions, so that multiple instances of the same class\r
- *  within a device can be differentiated from one another.\r
- */\r
-USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =\r
-       {\r
-               .Config =\r
-                       {\r
-                               .ControlInterfaceNumber         = 0,\r
-\r
-                               .DataINEndpointNumber           = CDC_TX_EPNUM,\r
-                               .DataINEndpointSize             = CDC_TXRX_EPSIZE,\r
-                               .DataINEndpointDoubleBank       = false,\r
-\r
-                               .DataOUTEndpointNumber          = CDC_RX_EPNUM,\r
-                               .DataOUTEndpointSize            = CDC_TXRX_EPSIZE,\r
-                               .DataOUTEndpointDoubleBank      = false,\r
-\r
-                               .NotificationEndpointNumber     = CDC_NOTIFICATION_EPNUM,\r
-                               .NotificationEndpointSize       = CDC_NOTIFICATION_EPSIZE,\r
-                               .NotificationEndpointDoubleBank = false,\r
-                       },\r
-       };\r
-\r
-/** Standard file stream for the CDC interface when set up, so that the virtual CDC COM port can be\r
- *  used like any regular character stream in the C APIs\r
- */\r
-FILE USBSerialStream;\r
-\r
-/** Standard file stream for the currently open file on the dataflash disk. */\r
-FILE DataflashStream = FDEV_SETUP_STREAM(NULL, Dataflash_getchar, _FDEV_SETUP_READ);\r
+/** Standard file stream for the currently open file on the disk. */\r
+FILE DiskStream = FDEV_SETUP_STREAM(NULL, Disk_getchar, _FDEV_SETUP_READ);\r

 \r
 /** Petite FAT Fs structure to hold the internal state of the FAT driver for the dataflash contents. */\r
 \r
 /** Petite FAT Fs structure to hold the internal state of the FAT driver for the dataflash contents. */\r

-FATFS DataflashData;\r
-\r
+FATFS DiskFATState;\r

 \r
 /** Stream character fetching routine for the FAT driver so that characters from the currently open file can be\r
  *  read in sequence when applied to a stdio stream.\r
  */\r
 \r
 /** Stream character fetching routine for the FAT driver so that characters from the currently open file can be\r
  *  read in sequence when applied to a stdio stream.\r
  */\r

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

 {\r
        char ReadByte;\r
        WORD ByteWasRead;\r
 {\r
        char ReadByte;\r
        WORD ByteWasRead;\r


@@ -109,6 +57,16 @@ static int Dataflash_getchar(FILE* Stream)
        return (ByteWasRead ? ReadByte : _FDEV_EOF);\r
 }\r
 \r
        return (ByteWasRead ? ReadByte : _FDEV_EOF);\r
 }\r
 \r

+#if defined(USB_CAN_BE_BOTH)\r
+/** Event to handle mode changes in the library, to clear the FAT library's drive state structure when transitioning\r
+ *  between modes. This ensures that the library always works with current disk data.\r
+ */\r
+void EVENT_USB_UIDChange(void)\r
+{\r
+       pf_mount(&DiskFATState);\r
+}\r
+#endif\r
+\r

 /** Task to determine if the user is wishes to start the programming sequence, and if so executes the \r
  *  required functions to program the attached target (if any) with the files loaded to the dataflash.\r
  */\r
 /** Task to determine if the user is wishes to start the programming sequence, and if so executes the \r
  *  required functions to program the attached target (if any) with the files loaded to the dataflash.\r
  */\r


@@ -122,16 +80,19 @@ void Programmer_Task(void)
                        HasAttempted = true;\r
                else\r
                        return;\r
                        HasAttempted = true;\r
                else\r
                        return;\r

-               \r
-               fputs("==== PROGRAMMING CYCLE STARTED ====\r\n", &USBSerialStream);\r
+                       \r
+               puts("==== PROGRAMMING CYCLE STARTED ====\r\n");\r

 \r
 \r

-               fputs("Reading Configuration File...\r\n", &USBSerialStream);\r
-               \r
+               #if defined(USB_CAN_BE_BOTH)\r
+               printf("Using %s Drive...\r\n", (USB_CurrentMode == USB_MODE_HOST) ? "External" : "Internal");\r
+               #endif\r
+\r
+               puts("Reading Configuration File...\r\n");\r

                if (!(ProgrammerConfig_ProcessConfiguration()))\r
                  goto EndOfProgCycle;\r
 \r
                EndOfProgCycle:\r
                if (!(ProgrammerConfig_ProcessConfiguration()))\r
                  goto EndOfProgCycle;\r
 \r
                EndOfProgCycle:\r

-               fputs("==== PROGRAMMING CYCLE FINISHED ====\r\n", &USBSerialStream);\r
+               puts("==== PROGRAMMING CYCLE FINISHED ====\r\n");\r

        }\r
        else\r
        {\r
        }\r
        else\r
        {\r


@@ -146,21 +107,25 @@ int main(void)
 {\r
        SetupHardware();\r
 \r
 {\r
        SetupHardware();\r
 \r

-       /* Create a regular character stream for the interface so that it can be used with the stdio.h functions */\r
-       CDC_Device_CreateStream(&VirtualSerial_CDC_Interface, &USBSerialStream);\r
-\r

        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 \r
        for (;;)\r
        {\r
                Programmer_Task();\r
                  \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 \r
        for (;;)\r
        {\r
                Programmer_Task();\r
                  \r

-               /* Must throw away unused bytes from the host, or it will lock up while waiting for the device */\r
-               while (CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface))\r
-                 CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);\r
-\r
-               CDC_Device_USBTask(&VirtualSerial_CDC_Interface);\r
-               MS_Device_USBTask(&Disk_MS_Interface);\r
+               if (USB_CurrentMode == USB_MODE_HOST)\r
+               {\r
+                       #if defined(USB_CAN_BE_HOST)\r
+                       DiskHost_USBTask();\r
+                       #endif\r
+               }\r
+               else\r
+               {\r
+                       #if defined(USB_CAN_BE_DEVICE)\r
+                       DiskDevice_USBTask();\r
+                       #endif\r
+               }\r
+               \r

                USB_USBTask();\r
        }\r
 }\r
                USB_USBTask();\r
        }\r
 }\r


@@ -176,59 +141,20 @@ void SetupHardware(void)
        clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r
        clock_prescale_set(clock_div_1);\r
 \r
        /* Hardware Initialization */\r

+       #if defined(USB_CAN_BE_BOTH)\r
+       USB_Init(USB_MODE_UID);\r
+       #else\r
+       USB_Init();\r
+       #endif\r
+\r

        LEDs_Init();\r
        SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_SCK_LEAD_FALLING | SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);\r
        Dataflash_Init();\r
        LEDs_Init();\r
        SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_SCK_LEAD_FALLING | SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);\r
        Dataflash_Init();\r

-       USB_Init();\r

        Buttons_Init();\r
        Buttons_Init();\r

-       pf_mount(&DataflashData);\r
+       SerialStream_Init(9600, true);\r

 \r
 \r

+       #if defined(USB_CAN_BE_DEVICE)\r

        /* Clear Dataflash sector protections, if enabled */\r
        DataflashManager_ResetDataflashProtections();\r
        /* Clear Dataflash sector protections, if enabled */\r
        DataflashManager_ResetDataflashProtections();\r

-}\r
-\r
-/** Event handler for the library USB Connection event. */\r
-void EVENT_USB_Device_Connect(void)\r
-{\r
-       LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
-}\r
-\r
-/** Event handler for the library USB Disconnection event. */\r
-void EVENT_USB_Device_Disconnect(void)\r
-{\r
-       LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
-}\r
-\r
-/** Event handler for the library USB Configuration Changed event. */\r
-void EVENT_USB_Device_ConfigurationChanged(void)\r
-{\r
-       LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
-\r
-       if (!(MS_Device_ConfigureEndpoints(&Disk_MS_Interface)))\r
-         LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
-\r
-       if (!(CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface)))\r
-         LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
-}\r
-\r
-/** Event handler for the library USB Unhandled Control Request event. */\r
-void EVENT_USB_Device_UnhandledControlRequest(void)\r
-{\r
-       MS_Device_ProcessControlRequest(&Disk_MS_Interface);\r
-       CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);\r
-}\r
-\r
-/** Mass Storage class driver callback function the reception of SCSI commands from the host, which must be processed.\r
- *\r
- *  \param[in] MSInterfaceInfo  Pointer to the Mass Storage class interface configuration structure being referenced\r
- */\r
-bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)\r
-{\r
-       bool CommandSuccess;\r
-       \r
-       LEDs_SetAllLEDs(LEDMASK_USB_BUSY);\r
-       CommandSuccess = SCSI_DecodeSCSICommand(MSInterfaceInfo);\r
-       LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
-       \r
-       return CommandSuccess;\r
+       #endif\r

 }\r
 }\r