Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Erik Strand
lufa
Commits
43b9d552
Commit
43b9d552
authored
Jan 30, 2011
by
Dean Camera
Browse files
Renamed all driver termination *_ShutDown() functions to the more logical name *_Disable().
parent
9051d3be
Changes
37
Hide whitespace changes
Inline
Side-by-side
Demos/Host/LowLevel/MouseHost/MouseHost.c
View file @
43b9d552
...
...
@@ -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. */
void
EVENT_USB_Host_HostError
(
const
uint8_t
ErrorCode
)
{
USB_
ShutDown
();
USB_
Disable
();
printf_P
(
PSTR
(
ESC_FG_RED
"Host Mode Error
\r\n
"
" -- Error Code %d
\r\n
"
ESC_FG_WHITE
),
ErrorCode
);
...
...
Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c
View file @
43b9d552
...
...
@@ -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. */
void
EVENT_USB_Host_HostError
(
const
uint8_t
ErrorCode
)
{
USB_
ShutDown
();
USB_
Disable
();
printf_P
(
PSTR
(
ESC_FG_RED
"Host Mode Error
\r\n
"
" -- Error Code %d
\r\n
"
ESC_FG_WHITE
),
ErrorCode
);
...
...
Demos/Host/LowLevel/PrinterHost/PrinterHost.c
View file @
43b9d552
...
...
@@ -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. */
void
EVENT_USB_Host_HostError
(
const
uint8_t
ErrorCode
)
{
USB_
ShutDown
();
USB_
Disable
();
printf_P
(
PSTR
(
ESC_FG_RED
"Host Mode Error
\r\n
"
" -- Error Code %d
\r\n
"
ESC_FG_WHITE
),
ErrorCode
);
...
...
Demos/Host/LowLevel/RNDISEthernetHost/RNDISEthernetHost.c
View file @
43b9d552
...
...
@@ -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. */
void
EVENT_USB_Host_HostError
(
const
uint8_t
ErrorCode
)
{
USB_
ShutDown
();
USB_
Disable
();
printf_P
(
PSTR
(
ESC_FG_RED
"Host Mode Error
\r\n
"
" -- Error Code %d
\r\n
"
ESC_FG_WHITE
),
ErrorCode
);
...
...
Demos/Host/LowLevel/StillImageHost/StillImageHost.c
View file @
43b9d552
...
...
@@ -104,7 +104,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. */
void
EVENT_USB_Host_HostError
(
const
uint8_t
ErrorCode
)
{
USB_
ShutDown
();
USB_
Disable
();
printf_P
(
PSTR
(
ESC_FG_RED
"Host Mode Error
\r\n
"
" -- Error Code %d
\r\n
"
ESC_FG_WHITE
),
ErrorCode
);
...
...
Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.c
View file @
43b9d552
...
...
@@ -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. */
void
EVENT_USB_Host_HostError
(
const
uint8_t
ErrorCode
)
{
USB_
ShutDown
();
USB_
Disable
();
printf_P
(
PSTR
(
ESC_FG_RED
"Host Mode Error
\r\n
"
" -- Error Code %d
\r\n
"
ESC_FG_WHITE
),
ErrorCode
);
...
...
LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
View file @
43b9d552
...
...
@@ -421,8 +421,8 @@
/** Turns off the ADC. If this is called, any further ADC operations will require a call to
* \ref ADC_Init() before the ADC can be used again.
*/
static
inline
void
ADC_
ShutDown
(
void
)
ATTR_ALWAYS_INLINE
;
static
inline
void
ADC_
ShutDown
(
void
)
static
inline
void
ADC_
Disable
(
void
)
ATTR_ALWAYS_INLINE
;
static
inline
void
ADC_
Disable
(
void
)
{
ADCSRA
=
0
;
}
...
...
LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h
View file @
43b9d552
...
...
@@ -175,8 +175,8 @@
/** Turns off the TWI driver hardware. If this is called, any further TWI operations will require a call to
* \ref TWI_Init() before the TWI can be used again.
*/
static
inline
void
TWI_
ShutDown
(
void
)
ATTR_ALWAYS_INLINE
;
static
inline
void
TWI_
ShutDown
(
void
)
static
inline
void
TWI_
Disable
(
void
)
ATTR_ALWAYS_INLINE
;
static
inline
void
TWI_
Disable
(
void
)
{
TWCR
&=
~
(
1
<<
TWEN
);
}
...
...
LUFA/Drivers/Peripheral/SPI.h
View file @
43b9d552
...
...
@@ -172,7 +172,7 @@
}
/** Turns off the SPI driver, disabling and returning used hardware to their default configuration. */
static
inline
void
SPI_
ShutDown
(
void
)
static
inline
void
SPI_
Disable
(
void
)
{
DDRB
&=
~
((
1
<<
1
)
|
(
1
<<
2
));
PORTB
&=
~
((
1
<<
0
)
|
(
1
<<
3
));
...
...
LUFA/Drivers/Peripheral/Serial.h
View file @
43b9d552
...
...
@@ -145,7 +145,7 @@
}
/** Turns off the USART driver, disabling and returning used hardware to their default configuration. */
static
inline
void
Serial_
ShutDown
(
void
)
static
inline
void
Serial_
Disable
(
void
)
{
UCSR1B
=
0
;
UCSR1A
=
0
;
...
...
LUFA/Drivers/USB/LowLevel/USBController.c
View file @
43b9d552
...
...
@@ -83,7 +83,7 @@ void USB_Init(
USB_ResetInterface
();
}
void
USB_
ShutDown
(
void
)
void
USB_
Disable
(
void
)
{
USB_INT_DisableAllInterrupts
();
USB_INT_ClearAllInterrupts
();
...
...
LUFA/Drivers/USB/LowLevel/USBController.h
View file @
43b9d552
...
...
@@ -292,7 +292,7 @@
* memory, endpoints and pipes. When turned off, no USB functionality can be used until the interface
* is restarted with the \ref USB_Init() function.
*/
void
USB_
ShutDown
(
void
);
void
USB_
Disable
(
void
);
/** Resets the interface, when already initialized. This will re-enumerate the device if already connected
* to a host, or re-enumerate an already attached device when in host mode.
...
...
LUFA/ManPages/ChangeLog.txt
View file @
43b9d552
...
...
@@ -48,6 +48,7 @@
* value if no character is received (to remain consistent with the CDC class driver byte reception routines)
* - Renamed the PRNT_Host_SendString(), CDC_Host_SendString() and CDC_Device_SendString() functions to *_SendData(), and
* added new versions of the *_SendString() routines that expect a null terminated string instead
* - Renamed all driver termination *_ShutDown() functions to the more logical name *_Disable()
* - Library Applications:
* - Changed the XPLAINBridge software UART to use the regular timer CTC mode instead of the alternative CTC mode
* via the Input Capture register, to reduce user confusion
...
...
LUFA/ManPages/SoftwareBootloaderJump.txt
View file @
43b9d552
...
...
@@ -44,8 +44,8 @@
*
* void Jump_To_Bootloader(void)
* {
* // If USB is used, detach from the bus
* USB_
ShutDown
();
* // If USB is used, detach from the bus
and reset it
* USB_
Disable
();
*
* // Disable all interrupts
* cli();
...
...
Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c
View file @
43b9d552
...
...
@@ -172,7 +172,7 @@ void ISPTarget_DisableTargetISP(void)
{
if
(
HardwareSPIMode
)
{
SPI_
ShutDown
();
SPI_
Disable
();
}
else
{
...
...
Projects/MissileLauncher/MissileLauncher.c
View file @
43b9d552
...
...
@@ -204,7 +204,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. */
void
EVENT_USB_Host_HostError
(
const
uint8_t
ErrorCode
)
{
USB_
ShutDown
();
USB_
Disable
();
LEDs_SetAllLEDs
(
LEDMASK_USB_ERROR
);
for
(;;);
...
...
Projects/Webserver/USBHostMode.c
View file @
43b9d552
...
...
@@ -163,7 +163,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. */
void
EVENT_USB_Host_HostError
(
const
uint8_t
ErrorCode
)
{
USB_
ShutDown
();
USB_
Disable
();
LEDs_SetAllLEDs
(
LEDMASK_USB_ERROR
);
for
(;;);
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment