/*\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
- 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
#include "Lib/SCSI.h"\r
#include "Lib/DataflashManager.h"\r
\r
- #include <LUFA/Version.h> // Library Version Information\r
- #include <LUFA/Drivers/USB/USB.h> // USB Functionality\r
- #include <LUFA/Drivers/Board/LEDs.h> // LEDs driver\r
- #include <LUFA/Drivers/Board/Dataflash.h> // Dataflash chip driver\r
- #include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management\r
+ #include <LUFA/Version.h>\r
+ #include <LUFA/Drivers/USB/USB.h>\r
+ #include <LUFA/Drivers/Board/LEDs.h>\r
+ #include <LUFA/Drivers/Board/Dataflash.h>\r
\r
/* Macros: */\r
/** Mass Storage Class specific request to reset the Mass Storage interface, ready for the next command. */\r
/** Total number of Logical Units (drives) in the device. The total device capacity is shared equally between\r
* each drive - this can be set to any positive non-zero amount.\r
*/\r
- #define TOTAL_LUNS 2\r
+ #define TOTAL_LUNS 1\r
\r
/** Blocks in each LUN, calculated from the total capacity divided by the total number of Logical Units in the device. */\r
#define LUN_MEDIA_BLOCKS (VIRTUAL_MEMORY_BLOCKS / TOTAL_LUNS) \r
/** Mask for a Command Block Wrapper's flags attribute to specify a command with data sent from device-to-host. */\r
#define COMMAND_DIRECTION_DATA_IN (1 << 7)\r
\r
+ /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r
+ #define LEDMASK_USB_NOTREADY LEDS_LED1\r
+\r
+ /** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */\r
+ #define LEDMASK_USB_ENUMERATING (LEDS_LED2 | LEDS_LED3)\r
+\r
+ /** LED mask for the library LED driver, to indicate that the USB interface is ready. */\r
+ #define LEDMASK_USB_READY (LEDS_LED2 | LEDS_LED4)\r
+\r
+ /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */\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
+ \r
/* Type defines: */\r
/** Type define for a Command Block Wrapper, used in the Mass Storage Bulk-Only Transport protocol. */\r
typedef struct\r
Command_Fail = 1, /**< Command failed to complete - host may check the exact error via a SCSI REQUEST SENSE command */\r
Phase_Error = 2 /**< Command failed due to being invalid in the current phase */\r
};\r
-\r
- /** Enum for the possible status codes for passing to the UpdateStatus() function. */\r
- enum MassStorage_StatusCodes_t\r
- {\r
- Status_USBNotReady = 0, /**< USB is not ready (disconnected from a USB host) */\r
- Status_USBEnumerating = 1, /**< USB interface is enumerating */\r
- Status_USBReady = 2, /**< USB interface is connected and ready */\r
- Status_CommandBlockError = 3, /**< Processing a SCSI command block from the host */\r
- Status_ProcessingCommandBlock = 4, /**< Error during the processing of a SCSI command block from the host */\r
- };\r
\r
/* Global Variables: */\r
extern CommandBlockWrapper_t CommandBlock;\r
extern CommandStatusWrapper_t CommandStatus;\r
extern volatile bool IsMassStoreReset;\r
-\r
- /* Task Definitions: */\r
- TASK(USB_MassStorage);\r
\r
/* Function Prototypes: */\r
- void EVENT_USB_Connect(void);\r
- void EVENT_USB_Disconnect(void);\r
- void EVENT_USB_ConfigurationChanged(void);\r
- void EVENT_USB_UnhandledControlPacket(void);\r
-\r
- void UpdateStatus(uint8_t CurrentStatus);\r
+ void SetupHardware(void);\r
+ void MassStorage_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
#if defined(INCLUDE_FROM_MASSSTORAGE_C)\r
static bool ReadInCommandBlock(void);\r
projects / pub / USBasp.git / blobdiff