The incomplete StandaloneProgrammer project now uses Host and Device Mass storage classes, so that program data can either be loaded onto the device's Dataflash storage, or read off an attached USB memory stick.
The USB target family and allowable USB mode tokens are now public and documented (USB_CAN_BE_*, USB_SERIES_*_AVR). The SCSI_Request_Sense_Response_t and SCSI_Inquiry_Response_t type defines are now part of the Mass Storage Class driver common defines, rather than being defined in the Host mode Class driver section only. The USB_MODE_HOST token is now defined even when host mode is not available. Added missing CDC_Host_CreateBlockingStream() function code to the CDC Host Class driver.pull/1469/head
Dean Camera
15 years ago
parent
6e867f7d9b
commit
aaa0bed556
File diff suppressed because one or more lines are too long
@ -0,0 +1,104 @@
|
|||||||
|
/*
|
||||||
|
LUFA Library
|
||||||
|
Copyright (C) Dean Camera, 2009.
|
||||||
|
|
||||||
|
dean [at] fourwalledcubicle [dot] com
|
||||||
|
www.fourwalledcubicle.com
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com)
|
||||||
|
|
||||||
|
Permission to use, copy, modify, and distribute this software
|
||||||
|
and its documentation for any purpose and without fee is hereby
|
||||||
|
granted, provided that the above copyright notice appear in all
|
||||||
|
copies and that both that the copyright notice and this
|
||||||
|
permission notice and warranty disclaimer appear in supporting
|
||||||
|
documentation, and that the name of the author not be used in
|
||||||
|
advertising or publicity pertaining to distribution of the
|
||||||
|
software without specific, written prior permission.
|
||||||
|
|
||||||
|
The author disclaim 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
|
||||||
|
whatsoever resulting from loss of use, data or profits, whether
|
||||||
|
in an action of contract, negligence or other tortious action,
|
||||||
|
arising out of or in connection with the use or performance of
|
||||||
|
this software.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "DiskDevice.h"
|
||||||
|
|
||||||
|
#if defined(USB_CAN_BE_DEVICE)
|
||||||
|
/** LUFA Mass Storage Class driver interface configuration and state information. This structure is
|
||||||
|
* passed to all Mass Storage Class driver functions, so that multiple instances of the same class
|
||||||
|
* within a device can be differentiated from one another.
|
||||||
|
*/
|
||||||
|
USB_ClassInfo_MS_Device_t DiskDevice_MS_Interface =
|
||||||
|
{
|
||||||
|
.Config =
|
||||||
|
{
|
||||||
|
.InterfaceNumber = 0,
|
||||||
|
|
||||||
|
.DataINEndpointNumber = MASS_STORAGE_IN_EPNUM,
|
||||||
|
.DataINEndpointSize = MASS_STORAGE_IO_EPSIZE,
|
||||||
|
.DataINEndpointDoubleBank = false,
|
||||||
|
|
||||||
|
.DataOUTEndpointNumber = MASS_STORAGE_OUT_EPNUM,
|
||||||
|
.DataOUTEndpointSize = MASS_STORAGE_IO_EPSIZE,
|
||||||
|
.DataOUTEndpointDoubleBank = false,
|
||||||
|
|
||||||
|
.TotalLUNs = 1,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
void DiskDevice_USBTask(void)
|
||||||
|
{
|
||||||
|
MS_Device_USBTask(&DiskDevice_MS_Interface);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Event handler for the library USB Connection event. */
|
||||||
|
void EVENT_USB_Device_Connect(void)
|
||||||
|
{
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Event handler for the library USB Disconnection event. */
|
||||||
|
void EVENT_USB_Device_Disconnect(void)
|
||||||
|
{
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Event handler for the library USB Configuration Changed event. */
|
||||||
|
void EVENT_USB_Device_ConfigurationChanged(void)
|
||||||
|
{
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_READY);
|
||||||
|
|
||||||
|
if (!(MS_Device_ConfigureEndpoints(&DiskDevice_MS_Interface)))
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|
||||||
|
|
||||||
|
pf_mount(&DiskFATState);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Event handler for the library USB Unhandled Control Request event. */
|
||||||
|
void EVENT_USB_Device_UnhandledControlRequest(void)
|
||||||
|
{
|
||||||
|
MS_Device_ProcessControlRequest(&DiskDevice_MS_Interface);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Mass Storage class driver callback function the reception of SCSI commands from the host, which must be processed.
|
||||||
|
*
|
||||||
|
* \param[in] MSInterfaceInfo Pointer to the Mass Storage class interface configuration structure being referenced
|
||||||
|
*/
|
||||||
|
bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)
|
||||||
|
{
|
||||||
|
bool CommandSuccess;
|
||||||
|
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_BUSY);
|
||||||
|
CommandSuccess = SCSI_DecodeSCSICommand(MSInterfaceInfo);
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_READY);
|
||||||
|
|
||||||
|
return CommandSuccess;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
@ -0,0 +1,61 @@
|
|||||||
|
/*
|
||||||
|
LUFA Library
|
||||||
|
Copyright (C) Dean Camera, 2009.
|
||||||
|
|
||||||
|
dean [at] fourwalledcubicle [dot] com
|
||||||
|
www.fourwalledcubicle.com
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com)
|
||||||
|
|
||||||
|
Permission to use, copy, modify, and distribute this software
|
||||||
|
and its documentation for any purpose and without fee is hereby
|
||||||
|
granted, provided that the above copyright notice appear in all
|
||||||
|
copies and that both that the copyright notice and this
|
||||||
|
permission notice and warranty disclaimer appear in supporting
|
||||||
|
documentation, and that the name of the author not be used in
|
||||||
|
advertising or publicity pertaining to distribution of the
|
||||||
|
software without specific, written prior permission.
|
||||||
|
|
||||||
|
The author disclaim 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
|
||||||
|
whatsoever resulting from loss of use, data or profits, whether
|
||||||
|
in an action of contract, negligence or other tortious action,
|
||||||
|
arising out of or in connection with the use or performance of
|
||||||
|
this software.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** \file
|
||||||
|
*
|
||||||
|
* Header file for DiskDevice.c.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _DISK_DEVICE_H_
|
||||||
|
#define _DISK_DEVICE_H_
|
||||||
|
|
||||||
|
/* Includes: */
|
||||||
|
#include <avr/io.h>
|
||||||
|
|
||||||
|
#include "Descriptors.h"
|
||||||
|
#include "StandaloneProgrammer.h"
|
||||||
|
|
||||||
|
#include <LUFA/Drivers/USB/USB.h>
|
||||||
|
#include <LUFA/Drivers/Board/LEDs.h>
|
||||||
|
#include <LUFA/Drivers/USB/Class/MassStorage.h>
|
||||||
|
|
||||||
|
/* Function Prototypes: */
|
||||||
|
#if defined(USB_CAN_BE_DEVICE)
|
||||||
|
void DiskDevice_USBTask(void);
|
||||||
|
|
||||||
|
void EVENT_USB_Device_Connect(void);
|
||||||
|
void EVENT_USB_Device_Disconnect(void);
|
||||||
|
void EVENT_USB_Device_ConfigurationChanged(void);
|
||||||
|
void EVENT_USB_Device_UnhandledControlRequest(void);
|
||||||
|
|
||||||
|
bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
@ -0,0 +1,130 @@
|
|||||||
|
/*
|
||||||
|
LUFA Library
|
||||||
|
Copyright (C) Dean Camera, 2009.
|
||||||
|
|
||||||
|
dean [at] fourwalledcubicle [dot] com
|
||||||
|
www.fourwalledcubicle.com
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com)
|
||||||
|
|
||||||
|
Permission to use, copy, modify, and distribute this software
|
||||||
|
and its documentation for any purpose and without fee is hereby
|
||||||
|
granted, provided that the above copyright notice appear in all
|
||||||
|
copies and that both that the copyright notice and this
|
||||||
|
permission notice and warranty disclaimer appear in supporting
|
||||||
|
documentation, and that the name of the author not be used in
|
||||||
|
advertising or publicity pertaining to distribution of the
|
||||||
|
software without specific, written prior permission.
|
||||||
|
|
||||||
|
The author disclaim 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
|
||||||
|
whatsoever resulting from loss of use, data or profits, whether
|
||||||
|
in an action of contract, negligence or other tortious action,
|
||||||
|
arising out of or in connection with the use or performance of
|
||||||
|
this software.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "DiskHost.h"
|
||||||
|
|
||||||
|
#if defined(USB_CAN_BE_HOST)
|
||||||
|
/** LUFA Mass Storage Class driver interface configuration and state information. This structure is
|
||||||
|
* passed to all Mass Storage Class driver functions, so that multiple instances of the same class
|
||||||
|
* within a device can be differentiated from one another.
|
||||||
|
*/
|
||||||
|
USB_ClassInfo_MS_Host_t DiskHost_MS_Interface =
|
||||||
|
{
|
||||||
|
.Config =
|
||||||
|
{
|
||||||
|
.DataINPipeNumber = 1,
|
||||||
|
.DataINPipeDoubleBank = false,
|
||||||
|
|
||||||
|
.DataOUTPipeNumber = 2,
|
||||||
|
.DataOUTPipeDoubleBank = false,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
void DiskHost_USBTask(void)
|
||||||
|
{
|
||||||
|
if (USB_HostState == HOST_STATE_Addressed)
|
||||||
|
{
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
|
||||||
|
|
||||||
|
uint16_t ConfigDescriptorSize;
|
||||||
|
uint8_t ConfigDescriptorData[512];
|
||||||
|
|
||||||
|
if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
|
||||||
|
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
|
||||||
|
{
|
||||||
|
printf("ERROR - GetConfig\r\n");
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|
||||||
|
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (MS_Host_ConfigurePipes(&DiskHost_MS_Interface,
|
||||||
|
ConfigDescriptorSize, ConfigDescriptorData) != MS_ENUMERROR_NoError)
|
||||||
|
{
|
||||||
|
printf("ERROR - Pipes\r\n");
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|
||||||
|
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
|
||||||
|
{
|
||||||
|
printf("ERROR - SetConfig\r\n");
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|
||||||
|
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t MaxLUNIndex;
|
||||||
|
if (MS_Host_GetMaxLUN(&DiskHost_MS_Interface, &MaxLUNIndex))
|
||||||
|
{
|
||||||
|
printf("ERROR - MaxLUN\r\n");
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|
||||||
|
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (MS_Host_ResetMSInterface(&DiskHost_MS_Interface))
|
||||||
|
{
|
||||||
|
printf("ERROR - ResetMS\r\n");
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|
||||||
|
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
SCSI_Request_Sense_Response_t SenseData;
|
||||||
|
if (MS_Host_RequestSense(&DiskHost_MS_Interface, 0, &SenseData) != 0)
|
||||||
|
{
|
||||||
|
printf("ERROR - Sense\r\n");
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
|
||||||
|
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
pf_mount(&DiskFATState);
|
||||||
|
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_READY);
|
||||||
|
USB_HostState = HOST_STATE_Configured;
|
||||||
|
}
|
||||||
|
|
||||||
|
MS_Host_USBTask(&DiskHost_MS_Interface);
|
||||||
|
}
|
||||||
|
|
||||||
|
void EVENT_USB_Host_DeviceAttached(void)
|
||||||
|
{
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
|
||||||
|
}
|
||||||
|
|
||||||
|
void EVENT_USB_Host_DeviceUnattached(void)
|
||||||
|
{
|
||||||
|
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
@ -0,0 +1,62 @@
|
|||||||
|
/*
|
||||||
|
LUFA Library
|
||||||
|
Copyright (C) Dean Camera, 2009.
|
||||||
|
|
||||||
|
dean [at] fourwalledcubicle [dot] com
|
||||||
|
www.fourwalledcubicle.com
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com)
|
||||||
|
|
||||||
|
Permission to use, copy, modify, and distribute this software
|
||||||
|
and its documentation for any purpose and without fee is hereby
|
||||||
|
granted, provided that the above copyright notice appear in all
|
||||||
|
copies and that both that the copyright notice and this
|
||||||
|
permission notice and warranty disclaimer appear in supporting
|
||||||
|
documentation, and that the name of the author not be used in
|
||||||
|
advertising or publicity pertaining to distribution of the
|
||||||
|
software without specific, written prior permission.
|
||||||
|
|
||||||
|
The author disclaim 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
|
||||||
|
whatsoever resulting from loss of use, data or profits, whether
|
||||||
|
in an action of contract, negligence or other tortious action,
|
||||||
|
arising out of or in connection with the use or performance of
|
||||||
|
this software.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** \file
|
||||||
|
*
|
||||||
|
* Header file for DiskHost.c.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _DISK_HOST_H_
|
||||||
|
#define _DISK_HOST_H_
|
||||||
|
|
||||||
|
/* Includes: */
|
||||||
|
#include <avr/io.h>
|
||||||
|
|
||||||
|
#include "Descriptors.h"
|
||||||
|
#include "StandaloneProgrammer.h"
|
||||||
|
|
||||||
|
#include <LUFA/Drivers/USB/USB.h>
|
||||||
|
#include <LUFA/Drivers/Board/LEDs.h>
|
||||||
|
#include <LUFA/Drivers/USB/Class/MassStorage.h>
|
||||||
|
|
||||||
|
/* External Variables: */
|
||||||
|
#if defined(USB_CAN_BE_HOST)
|
||||||
|
extern USB_ClassInfo_MS_Host_t DiskHost_MS_Interface;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Function Prototypes: */
|
||||||
|
#if defined(USB_CAN_BE_HOST)
|
||||||
|
void DiskHost_USBTask(void);
|
||||||
|
|
||||||
|
void EVENT_USB_Host_DeviceAttached(void);
|
||||||
|
void EVENT_USB_Host_DeviceUnattached(void);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
Loading…
Reference in new issue