diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-11-11 09:09:39 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-11-11 09:09:39 +0000 |
| commit | 04774208b6d4131466a2b5e44af314252ab1734e (patch) | |
| tree | daf57c62f20881434ca23f2972e5ebee8c0eaf15 /LUFA/Drivers | |
| parent | 5de364163f5a7597ba2f54e37cdea493fbd1e7ff (diff) | |
| download | lufa-04774208b6d4131466a2b5e44af314252ab1734e.tar.gz lufa-04774208b6d4131466a2b5e44af314252ab1734e.tar.bz2 lufa-04774208b6d4131466a2b5e44af314252ab1734e.zip | |
Minor code cleanups for clarity.
Diffstat (limited to 'LUFA/Drivers')
| -rw-r--r-- | LUFA/Drivers/Peripheral/SerialStream.c | 5 | ||||
| -rw-r--r-- | LUFA/Drivers/Peripheral/SerialStream.h | 6 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/DevChapter9.c | 27 |
3 files changed, 19 insertions, 19 deletions
diff --git a/LUFA/Drivers/Peripheral/SerialStream.c b/LUFA/Drivers/Peripheral/SerialStream.c index fec5f7314..f8839c9b4 100644 --- a/LUFA/Drivers/Peripheral/SerialStream.c +++ b/LUFA/Drivers/Peripheral/SerialStream.c @@ -28,18 +28,19 @@ this software.
*/
+#define INCLUDE_FROM_SERIALSTREAM_C
#include "SerialStream.h"
FILE USARTStream = FDEV_SETUP_STREAM(SerialStream_TxByte, SerialStream_RxByte, _FDEV_SETUP_RW);
-int SerialStream_TxByte(char DataByte, FILE *Stream)
+static int SerialStream_TxByte(char DataByte, FILE *Stream)
{
Serial_TxByte(DataByte);
return 0;
}
-int SerialStream_RxByte(FILE *Stream)
+static int SerialStream_RxByte(FILE *Stream)
{
return Serial_RxByte();
}
diff --git a/LUFA/Drivers/Peripheral/SerialStream.h b/LUFA/Drivers/Peripheral/SerialStream.h index 293fda076..d93ea529e 100644 --- a/LUFA/Drivers/Peripheral/SerialStream.h +++ b/LUFA/Drivers/Peripheral/SerialStream.h @@ -70,8 +70,10 @@ extern FILE USARTStream;
/* Function Prototypes: */
- int SerialStream_TxByte(char DataByte, FILE *Stream) ATTR_NON_NULL_PTR_ARG(2);
- int SerialStream_RxByte(FILE *Stream) ATTR_NON_NULL_PTR_ARG(1);
+ #if defined(INCLUDE_FROM_SERIALSTREAM_C)
+ static int SerialStream_TxByte(char DataByte, FILE *Stream) ATTR_NON_NULL_PTR_ARG(2);
+ static int SerialStream_RxByte(FILE *Stream) ATTR_NON_NULL_PTR_ARG(1);
+ #endif
#endif
/* Public Interface - May be used in end-application: */
diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c index bb6104fec..6e7b2c718 100644 --- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c +++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c @@ -129,11 +129,11 @@ static void USB_Device_SetAddress(void) return;
}
- UDADDR = ((1 << ADDEN) | DeviceAddress);
-
if (DeviceAddress)
USB_DeviceState = DEVICE_STATE_Addressed;
+ UDADDR = ((1 << ADDEN) | DeviceAddress);
+
return;
}
@@ -192,10 +192,7 @@ static void USB_Device_SetConfiguration(void) Endpoint_ClearStatusStage();
- if (USB_ConfigurationNumber)
- USB_DeviceState = DEVICE_STATE_Configured;
- else
- USB_DeviceState = DEVICE_STATE_Addressed;
+ USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;
EVENT_USB_Device_ConfigurationChanged();
}
@@ -225,10 +222,10 @@ static void USB_Device_GetInternalSerialDescriptor(void) int16_t UnicodeString[20];
} SignatureDescriptor;
- SignatureDescriptor.Header.Size = sizeof(SignatureDescriptor);
- SignatureDescriptor.Header.Type = DTYPE_String;
+ SignatureDescriptor.Header.Type = DTYPE_String;
+ SignatureDescriptor.Header.Size = sizeof(SignatureDescriptor);
- uint8_t SigReadAddress = 0x0E;
+ uint8_t SigReadAddress = 0x0E;
for (uint8_t SerialCharNum = 0; SerialCharNum < 20; SerialCharNum++)
{
@@ -358,16 +355,16 @@ static void USB_Device_ClearSetFeature(void) if (Endpoint_IsEnabled())
{
- if (USB_ControlRequest.bRequest == REQ_ClearFeature)
+ if (USB_ControlRequest.bRequest == REQ_SetFeature)
{
- Endpoint_ClearStall();
- Endpoint_ResetFIFO(EndpointIndex);
- Endpoint_ResetDataToggle();
+ Endpoint_StallTransaction();
}
else
{
- Endpoint_StallTransaction();
- }
+ Endpoint_ClearStall();
+ Endpoint_ResetFIFO(EndpointIndex);
+ Endpoint_ResetDataToggle();
+ }
}
}
|