aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA/Drivers
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2011-01-30 23:12:06 +0000
committerDean Camera <dean@fourwalledcubicle.com>2011-01-30 23:12:06 +0000
commit43b9d552bb0a32c5cd5f9fa72a8cb3c871ad5ef3 (patch)
tree3eec94c1a0d57fb84c0678d10f1012d234e532a7 /LUFA/Drivers
parent9051d3beb0c5c4ec1e33749d8f806f5492fbe742 (diff)
downloadlufa-43b9d552bb0a32c5cd5f9fa72a8cb3c871ad5ef3.tar.gz
lufa-43b9d552bb0a32c5cd5f9fa72a8cb3c871ad5ef3.tar.bz2
lufa-43b9d552bb0a32c5cd5f9fa72a8cb3c871ad5ef3.zip
Renamed all driver termination *_ShutDown() functions to the more logical name *_Disable().
Diffstat (limited to 'LUFA/Drivers')
-rw-r--r--LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h4
-rw-r--r--LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h4
-rw-r--r--LUFA/Drivers/Peripheral/SPI.h2
-rw-r--r--LUFA/Drivers/Peripheral/Serial.h2
-rw-r--r--LUFA/Drivers/USB/LowLevel/USBController.c2
-rw-r--r--LUFA/Drivers/USB/LowLevel/USBController.h2
6 files changed, 8 insertions, 8 deletions
diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
index 5f4b034ef..ddeb53aa3 100644
--- a/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
+++ b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
@@ -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;
}
diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h b/LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h
index 499fc4d99..c8293f5ac 100644
--- a/LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h
+++ b/LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h
@@ -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);
}
diff --git a/LUFA/Drivers/Peripheral/SPI.h b/LUFA/Drivers/Peripheral/SPI.h
index b764810a7..0b8b17e1d 100644
--- a/LUFA/Drivers/Peripheral/SPI.h
+++ b/LUFA/Drivers/Peripheral/SPI.h
@@ -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));
diff --git a/LUFA/Drivers/Peripheral/Serial.h b/LUFA/Drivers/Peripheral/Serial.h
index f276479ae..e7c2fa065 100644
--- a/LUFA/Drivers/Peripheral/Serial.h
+++ b/LUFA/Drivers/Peripheral/Serial.h
@@ -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;
diff --git a/LUFA/Drivers/USB/LowLevel/USBController.c b/LUFA/Drivers/USB/LowLevel/USBController.c
index 91f9acd4e..f41b5cc11 100644
--- a/LUFA/Drivers/USB/LowLevel/USBController.c
+++ b/LUFA/Drivers/USB/LowLevel/USBController.c
@@ -83,7 +83,7 @@ void USB_Init(
USB_ResetInterface();
}
-void USB_ShutDown(void)
+void USB_Disable(void)
{
USB_INT_DisableAllInterrupts();
USB_INT_ClearAllInterrupts();
diff --git a/LUFA/Drivers/USB/LowLevel/USBController.h b/LUFA/Drivers/USB/LowLevel/USBController.h
index 5511fa573..f35c52da9 100644
--- a/LUFA/Drivers/USB/LowLevel/USBController.h
+++ b/LUFA/Drivers/USB/LowLevel/USBController.h
@@ -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.