Add ASF provider manifest file and adjust VSIX packing to compress the library contents.

[pub/USBasp.git] / Demos / Device / LowLevel / MassStorage / MassStorage.c

diff --git a/Demos/Device/LowLevel/MassStorage/MassStorage.c b/Demos/Device/LowLevel/MassStorage/MassStorage.c
index 16344c7..2243b7f 100644 (file)
--- a/Demos/Device/LowLevel/MassStorage/MassStorage.c
+++ b/Demos/Device/LowLevel/MassStorage/MassStorage.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2013.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  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


@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 

-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this

   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages


@@ -55,7 +55,7 @@ int main(void)
        SetupHardware();
 
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
        SetupHardware();
 
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

-       sei();
+       GlobalInterruptEnable();

 
        for (;;)
        {
 
        for (;;)
        {


@@ -80,6 +80,13 @@ void SetupHardware(void)
        Dataflash_Init();
        USB_Init();
 
        Dataflash_Init();
        USB_Init();
 

+       /* Check if the Dataflash is working, abort if not */
+       if (!(DataflashManager_CheckDataflashOperation()))
+       {
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+               for(;;);
+       }
+

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


@@ -111,10 +118,8 @@ void EVENT_USB_Device_ConfigurationChanged(void)
        bool ConfigSuccess = true;
 
        /* Setup Mass Storage Data Endpoints */
        bool ConfigSuccess = true;
 
        /* Setup Mass Storage Data Endpoints */

-       ConfigSuccess &= Endpoint_ConfigureEndpoint(MASS_STORAGE_IN_EPNUM,  EP_TYPE_BULK, ENDPOINT_DIR_IN,
-                                                   MASS_STORAGE_IO_EPSIZE, ENDPOINT_BANK_SINGLE);
-       ConfigSuccess &= Endpoint_ConfigureEndpoint(MASS_STORAGE_OUT_EPNUM, EP_TYPE_BULK, ENDPOINT_DIR_OUT,
-                                                   MASS_STORAGE_IO_EPSIZE, ENDPOINT_BANK_SINGLE);
+       ConfigSuccess &= Endpoint_ConfigureEndpoint(MASS_STORAGE_IN_EPADDR,  EP_TYPE_BULK, MASS_STORAGE_IO_EPSIZE, 1);
+       ConfigSuccess &= Endpoint_ConfigureEndpoint(MASS_STORAGE_OUT_EPADDR, EP_TYPE_BULK, MASS_STORAGE_IO_EPSIZE, 1);

 
        /* Indicate endpoint configuration success or failure */
        LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR);
 
        /* Indicate endpoint configuration success or failure */
        LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR);


@@ -146,7 +151,7 @@ void EVENT_USB_Device_ControlRequest(void)
                                Endpoint_ClearSETUP();
 
                                /* Indicate to the host the number of supported LUNs (virtual disks) on the device */
                                Endpoint_ClearSETUP();
 
                                /* Indicate to the host the number of supported LUNs (virtual disks) on the device */

-                               Endpoint_Write_Byte(TOTAL_LUNS - 1);
+                               Endpoint_Write_8(TOTAL_LUNS - 1);

 
                                Endpoint_ClearIN();
                                Endpoint_ClearStatusStage();
 
                                Endpoint_ClearIN();
                                Endpoint_ClearStatusStage();


@@ -173,7 +178,7 @@ void MassStorage_Task(void)
 
                /* Check direction of command, select Data IN endpoint if data is from the device */
                if (CommandBlock.Flags & MS_COMMAND_DIR_DATA_IN)
 
                /* Check direction of command, select Data IN endpoint if data is from the device */
                if (CommandBlock.Flags & MS_COMMAND_DIR_DATA_IN)

-                 Endpoint_SelectEndpoint(MASS_STORAGE_IN_EPNUM);
+                 Endpoint_SelectEndpoint(MASS_STORAGE_IN_EPADDR);

 
                /* Decode the received SCSI command, set returned status code */
                CommandStatus.Status = SCSI_DecodeSCSICommand() ? MS_SCSI_COMMAND_Pass : MS_SCSI_COMMAND_Fail;
 
                /* Decode the received SCSI command, set returned status code */
                CommandStatus.Status = SCSI_DecodeSCSICommand() ? MS_SCSI_COMMAND_Pass : MS_SCSI_COMMAND_Fail;


@@ -199,13 +204,13 @@ void MassStorage_Task(void)
        if (IsMassStoreReset)
        {
                /* Reset the data endpoint banks */
        if (IsMassStoreReset)
        {
                /* Reset the data endpoint banks */

-               Endpoint_ResetFIFO(MASS_STORAGE_OUT_EPNUM);
-               Endpoint_ResetFIFO(MASS_STORAGE_IN_EPNUM);
+               Endpoint_ResetEndpoint(MASS_STORAGE_OUT_EPADDR);
+               Endpoint_ResetEndpoint(MASS_STORAGE_IN_EPADDR);

 
 

-               Endpoint_SelectEndpoint(MASS_STORAGE_OUT_EPNUM);
+               Endpoint_SelectEndpoint(MASS_STORAGE_OUT_EPADDR);

                Endpoint_ClearStall();
                Endpoint_ResetDataToggle();
                Endpoint_ClearStall();
                Endpoint_ResetDataToggle();

-               Endpoint_SelectEndpoint(MASS_STORAGE_IN_EPNUM);
+               Endpoint_SelectEndpoint(MASS_STORAGE_IN_EPADDR);

                Endpoint_ClearStall();
                Endpoint_ResetDataToggle();
 
                Endpoint_ClearStall();
                Endpoint_ResetDataToggle();
 


@@ -221,20 +226,24 @@ void MassStorage_Task(void)
  */
 static bool ReadInCommandBlock(void)
 {
  */
 static bool ReadInCommandBlock(void)
 {

+       uint16_t BytesTransferred;
+

        /* Select the Data Out endpoint */
        /* Select the Data Out endpoint */

-       Endpoint_SelectEndpoint(MASS_STORAGE_OUT_EPNUM);
+       Endpoint_SelectEndpoint(MASS_STORAGE_OUT_EPADDR);

 
        /* Abort if no command has been sent from the host */
        if (!(Endpoint_IsOUTReceived()))
          return false;
 
        /* Read in command block header */
 
        /* Abort if no command has been sent from the host */
        if (!(Endpoint_IsOUTReceived()))
          return false;
 
        /* Read in command block header */

-       Endpoint_Read_Stream_LE(&CommandBlock, (sizeof(CommandBlock) - sizeof(CommandBlock.SCSICommandData)),
-                               StreamCallback_AbortOnMassStoreReset);
-
-       /* Check if the current command is being aborted by the host */
-       if (IsMassStoreReset)
-         return false;
+       BytesTransferred = 0;
+       while (Endpoint_Read_Stream_LE(&CommandBlock, (sizeof(CommandBlock) - sizeof(CommandBlock.SCSICommandData)),
+                                      &BytesTransferred) == ENDPOINT_RWSTREAM_IncompleteTransfer)
+       {
+               /* Check if the current command is being aborted by the host */
+               if (IsMassStoreReset)
+                 return false;
+       }

 
        /* Verify the command block - abort if invalid */
        if ((CommandBlock.Signature         != MS_CBW_SIGNATURE) ||
 
        /* Verify the command block - abort if invalid */
        if ((CommandBlock.Signature         != MS_CBW_SIGNATURE) ||


@@ -245,20 +254,21 @@ static bool ReadInCommandBlock(void)
        {
                /* Stall both data pipes until reset by host */
                Endpoint_StallTransaction();
        {
                /* Stall both data pipes until reset by host */
                Endpoint_StallTransaction();

-               Endpoint_SelectEndpoint(MASS_STORAGE_IN_EPNUM);
+               Endpoint_SelectEndpoint(MASS_STORAGE_IN_EPADDR);

                Endpoint_StallTransaction();
 
                return false;
        }
 
        /* Read in command block command data */
                Endpoint_StallTransaction();
 
                return false;
        }
 
        /* Read in command block command data */

-       Endpoint_Read_Stream_LE(&CommandBlock.SCSICommandData,
-                               CommandBlock.SCSICommandLength,
-                               StreamCallback_AbortOnMassStoreReset);
-
-       /* Check if the current command is being aborted by the host */
-       if (IsMassStoreReset)
-         return false;
+       BytesTransferred = 0;
+       while (Endpoint_Read_Stream_LE(&CommandBlock.SCSICommandData, CommandBlock.SCSICommandLength,
+                                      &BytesTransferred) == ENDPOINT_RWSTREAM_IncompleteTransfer)
+       {
+               /* Check if the current command is being aborted by the host */
+               if (IsMassStoreReset)
+                 return false;
+       }

 
        /* Finalize the stream transfer to send the last packet */
        Endpoint_ClearOUT();
 
        /* Finalize the stream transfer to send the last packet */
        Endpoint_ClearOUT();


@@ -271,8 +281,10 @@ static bool ReadInCommandBlock(void)
  */
 static void ReturnCommandStatus(void)
 {
  */
 static void ReturnCommandStatus(void)
 {

+       uint16_t BytesTransferred;
+

        /* Select the Data Out endpoint */
        /* Select the Data Out endpoint */

-       Endpoint_SelectEndpoint(MASS_STORAGE_OUT_EPNUM);
+       Endpoint_SelectEndpoint(MASS_STORAGE_OUT_EPADDR);

 
        /* While data pipe is stalled, wait until the host issues a control request to clear the stall */
        while (Endpoint_IsStalled())
 
        /* While data pipe is stalled, wait until the host issues a control request to clear the stall */
        while (Endpoint_IsStalled())


@@ -283,7 +295,7 @@ static void ReturnCommandStatus(void)
        }
 
        /* Select the Data In endpoint */
        }
 
        /* Select the Data In endpoint */

-       Endpoint_SelectEndpoint(MASS_STORAGE_IN_EPNUM);
+       Endpoint_SelectEndpoint(MASS_STORAGE_IN_EPADDR);

 
        /* While data pipe is stalled, wait until the host issues a control request to clear the stall */
        while (Endpoint_IsStalled())
 
        /* While data pipe is stalled, wait until the host issues a control request to clear the stall */
        while (Endpoint_IsStalled())


@@ -294,27 +306,16 @@ static void ReturnCommandStatus(void)
        }
 
        /* Write the CSW to the endpoint */
        }
 
        /* Write the CSW to the endpoint */

-       Endpoint_Write_Stream_LE(&CommandStatus, sizeof(CommandStatus),
-                                 StreamCallback_AbortOnMassStoreReset);
-
-       /* Check if the current command is being aborted by the host */
-       if (IsMassStoreReset)
-         return;
+       BytesTransferred = 0;
+       while (Endpoint_Write_Stream_LE(&CommandStatus, sizeof(CommandStatus),
+                                       &BytesTransferred) == ENDPOINT_RWSTREAM_IncompleteTransfer)
+       {
+               /* Check if the current command is being aborted by the host */
+               if (IsMassStoreReset)
+                 return;
+       }

 
        /* Finalize the stream transfer to send the last packet */
        Endpoint_ClearIN();
 }
 
 
        /* Finalize the stream transfer to send the last packet */
        Endpoint_ClearIN();
 }
 

-/** Stream callback function for the Endpoint stream read and write functions. This callback will abort the current stream transfer
- *  if a Mass Storage Reset request has been issued to the control endpoint.
- */
-uint8_t StreamCallback_AbortOnMassStoreReset(void)
-{
-       /* Abort if a Mass Storage reset command was received */
-       if (IsMassStoreReset)
-         return STREAMCALLBACK_Abort;
-
-       /* Continue with the current stream operation */
-       return STREAMCALLBACK_Continue;
-}
-