ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Converted Host mode demos to schedulerless. Fixed host mode broken due to earlier Start-of-frame event experiments.

Browse source
This commit is contained in:
Dean Camera 2009-06-08 07:34:16 +00:00
parent 33a0184749
commit ac70ddd0a1
39 changed files with 405 additions and 838 deletions
Download patch file Download diff file Expand all files Collapse all files

108
Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
View file

@ -36,13 +36,6 @@
#include "MassStorageHost.h"
/* Scheduler Task List */
TASK_LIST
{
{ .Task = USB_USBTask , .TaskStatus = TASK_STOP },
{ .Task = USB_MassStore_Host , .TaskStatus = TASK_STOP },
};
/* Globals */
/** Index of the highest available LUN (Logical Unit) in the attached Mass Storage Device */
uint8_t MassStore_MaxLUNIndex;
@ -52,6 +45,23 @@ uint8_t MassStore_MaxLUNIndex;
* starts the scheduler to run the application tasks.
*/
int main(void)
{
SetupHardware();
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"Mass Storage Host Demo running.\r\n" ESC_INVERSE_OFF));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
for (;;)
{
MassStorage_Task();
USB_USBTask();
}
}
/** Configures the board hardware and chip peripherals for the demo's functionality. */
void SetupHardware(void)
{
/* Disable watchdog if enabled by bootloader/fuses */
MCUSR &= ~(1 << WDRF);
@ -64,22 +74,6 @@ int main(void)
SerialStream_Init(9600, false);
LEDs_Init();
Buttons_Init();
/* Indicate USB not ready */
UpdateStatus(Status_USBNotReady);
/* Start-up message */
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"MassStore Host Demo running.\r\n" ESC_INVERSE_OFF));
/* Initialize Scheduler so that it can be used */
Scheduler_Init();
/* Initialize USB Subsystem */
USB_Init();
/* Scheduling routine never returns, so put this last in the main function */
Scheduler_Start();
}
/** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
@ -88,10 +82,7 @@ int main(void)
void EVENT_USB_DeviceAttached(void)
{
puts_P(PSTR("Device Attached.\r\n"));
UpdateStatus(Status_USBEnumerating);
/* Start USB management task to enumerate the device */
Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);
LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
}
/** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and
@ -99,12 +90,8 @@ void EVENT_USB_DeviceAttached(void)
*/
void EVENT_USB_DeviceUnattached(void)
{
/* Stop USB management and Mass Storage tasks */
Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);
Scheduler_SetTaskMode(USB_MassStore_Host, TASK_STOP);
puts_P(PSTR("\r\nDevice Unattached.\r\n"));
UpdateStatus(Status_USBNotReady);
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
}
/** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully
@ -112,11 +99,7 @@ void EVENT_USB_DeviceUnattached(void)
*/
void EVENT_USB_DeviceEnumerationComplete(void)
{
/* Once device is fully enumerated, start the Mass Storage Host task */
Scheduler_SetTaskMode(USB_MassStore_Host, TASK_RUN);
/* Indicate device enumeration complete */
UpdateStatus(Status_USBReady);
LEDs_SetAllLEDs(LEDMASK_USB_READY);
}
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
@ -127,7 +110,7 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));
printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
UpdateStatus(Status_HardwareError);
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
for(;;);
}
@ -141,13 +124,13 @@ void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t Su
printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);
printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);
UpdateStatus(Status_EnumerationError);
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
}
/** Task to set the configuration of the attached device after it has been enumerated, and to read in blocks from
* the device and print them to the serial port.
*/
TASK(USB_MassStore_Host)
void MassStorage_Task(void)
{
uint8_t ErrorCode;
@ -174,7 +157,7 @@ TASK(USB_MassStore_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error via status LEDs */
UpdateStatus(Status_EnumerationError);
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */
while (USB_IsConnected);
@ -197,7 +180,7 @@ TASK(USB_MassStore_Host)
printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);
/* Indicate error via status LEDs */
UpdateStatus(Status_EnumerationError);
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */
while (USB_IsConnected);
@ -210,7 +193,7 @@ TASK(USB_MassStore_Host)
break;
case HOST_STATE_Ready:
/* Indicate device busy via the status LEDs */
UpdateStatus(Status_Busy);
LEDs_SetAllLEDs(LEDMASK_USB_BUSY);
/* Send the request, display error and wait for device detach if request fails */
if ((ErrorCode = MassStore_GetMaxLUN(&MassStore_MaxLUNIndex)) != HOST_SENDCONTROL_Successful)
@ -354,7 +337,7 @@ TASK(USB_MassStore_Host)
}
/* Indicate device no longer busy */
UpdateStatus(Status_USBReady);
LEDs_SetAllLEDs(LEDMASK_USB_READY);
/* Wait until USB device disconnected */
while (USB_IsConnected);
@ -363,41 +346,6 @@ TASK(USB_MassStore_Host)
}
}
/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to
* log to a serial port, or anything else that is suitable for status updates.
*
* \param CurrentStatus Current status of the system, from the MassStorageHost_StatusCodes_t enum
*/
void UpdateStatus(uint8_t CurrentStatus)
{
uint8_t LEDMask = LEDS_NO_LEDS;
/* Set the LED mask to the appropriate LED mask based on the given status code */
switch (CurrentStatus)
{
case Status_USBNotReady:
LEDMask = (LEDS_LED1);
break;
case Status_USBEnumerating:
LEDMask = (LEDS_LED1 | LEDS_LED2);
break;
case Status_USBReady:
LEDMask = (LEDS_LED2);
break;
case Status_EnumerationError:
case Status_HardwareError:
case Status_SCSICommandError:
LEDMask = (LEDS_LED1 | LEDS_LED3);
break;
case Status_Busy:
LEDMask = (LEDS_LED1 | LEDS_LED4);
break;
}
/* Set the board LEDs to the new LED mask */
LEDs_SetAllLEDs(LEDMask);
}
/** Indicates that a communication error has occurred with the attached Mass Storage Device,
* printing error codes to the serial port and waiting until the device is removed before
* continuing.
@ -424,7 +372,7 @@ void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t Erro
Pipe_Freeze();
/* Indicate device error via the status LEDs */
UpdateStatus(Status_SCSICommandError);
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
/* Wait until USB device disconnected */
while (USB_IsConnected);