Commit 43b9d552 authored by Dean Camera's avatar Dean Camera
Browse files

Renamed all driver termination *_ShutDown() functions to the more logical name *_Disable().

parent 9051d3be
...@@ -155,7 +155,7 @@ void SetupHardware(void) ...@@ -155,7 +155,7 @@ void SetupHardware(void)
void ResetHardware(void) void ResetHardware(void)
{ {
/* Shut down the USB subsystem */ /* Shut down the USB subsystem */
USB_ShutDown(); USB_Disable();
/* Relocate the interrupt vector table back to the application section */ /* Relocate the interrupt vector table back to the application section */
MCUCR = (1 << IVCE); MCUCR = (1 << IVCE);
......
...@@ -81,7 +81,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void) ...@@ -81,7 +81,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
void EVENT_USB_Host_HostError(const uint8_t ErrorCode) void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_Disable();
printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode); " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
......
...@@ -219,7 +219,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void) ...@@ -219,7 +219,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
void EVENT_USB_Host_HostError(const uint8_t ErrorCode) void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_Disable();
printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode); " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
......
...@@ -211,7 +211,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void) ...@@ -211,7 +211,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
void EVENT_USB_Host_HostError(const uint8_t ErrorCode) void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_Disable();
printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode); " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
......
...@@ -237,7 +237,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void) ...@@ -237,7 +237,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
void EVENT_USB_Host_HostError(const uint8_t ErrorCode) void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_Disable();
printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode); " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
......
...@@ -243,7 +243,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void) ...@@ -243,7 +243,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
void EVENT_USB_Host_HostError(const uint8_t ErrorCode) void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_Disable();
printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode); " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
......
...@@ -280,7 +280,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void) ...@@ -280,7 +280,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
void EVENT_USB_Host_HostError(const uint8_t ErrorCode) void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_Disable();
printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode); " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
......
...@@ -198,7 +198,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void) ...@@ -198,7 +198,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
void EVENT_USB_Host_HostError(const uint8_t ErrorCode) void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_Disable();
printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode); " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
......
...@@ -228,7 +228,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void) ...@@ -228,7 +228,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
void EVENT_USB_Host_HostError(const uint8_t ErrorCode) void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_Disable();
printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode); " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
......
...@@ -202,7 +202,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void) ...@@ -202,7 +202,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
void EVENT_USB_Host_HostError(const uint8_t ErrorCode) void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_Disable();
printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode); " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
......
...@@ -227,7 +227,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void) ...@@ -227,7 +227,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
void EVENT_USB_Host_HostError(const uint8_t ErrorCode) void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_Disable();
printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode); " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
......
...@@ -196,7 +196,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void) ...@@ -196,7 +196,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
void EVENT_USB_Host_HostError(const uint8_t ErrorCode) void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_Disable();
printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode); " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
......
...@@ -172,7 +172,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void) ...@@ -172,7 +172,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
void EVENT_USB_Host_HostError(const uint8_t ErrorCode) void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_Disable();
printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode); " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
......
...@@ -114,7 +114,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void) ...@@ -114,7 +114,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
void EVENT_USB_Host_HostError(const uint8_t ErrorCode) void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_Disable();
printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode); " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
......
...@@ -103,7 +103,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void) ...@@ -103,7 +103,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
void EVENT_USB_Host_HostError(const uint8_t ErrorCode) void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_Disable();
printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode); " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
......
...@@ -103,7 +103,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void) ...@@ -103,7 +103,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
void EVENT_USB_Host_HostError(const uint8_t ErrorCode) void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_Disable();
printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode); " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
......
...@@ -103,7 +103,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void) ...@@ -103,7 +103,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
void EVENT_USB_Host_HostError(const uint8_t ErrorCode) void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_Disable();
printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode); " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
......
...@@ -103,7 +103,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void) ...@@ -103,7 +103,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
void EVENT_USB_Host_HostError(const uint8_t ErrorCode) void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_Disable();
printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode); " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
......
...@@ -105,7 +105,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void) ...@@ -105,7 +105,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
void EVENT_USB_Host_HostError(const uint8_t ErrorCode) void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_Disable();
printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode); " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
......
...@@ -108,7 +108,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void) ...@@ -108,7 +108,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
void EVENT_USB_Host_HostError(const uint8_t ErrorCode) void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_Disable();
printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode); " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment