diff options
Diffstat (limited to 'LUFA/Drivers/USB/Class/Device')
| -rw-r--r-- | LUFA/Drivers/USB/Class/Device/Audio.h | 14 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Class/Device/CDC.c | 4 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Class/Device/HID.c | 6 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Class/Device/MassStorage.c | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/LUFA/Drivers/USB/Class/Device/Audio.h b/LUFA/Drivers/USB/Class/Device/Audio.h index cf63c65b0..a50bd97cc 100644 --- a/LUFA/Drivers/USB/Class/Device/Audio.h +++ b/LUFA/Drivers/USB/Class/Device/Audio.h @@ -203,7 +203,7 @@ (void)AudioInterfaceInfo; - Sample = Endpoint_Read_Byte(); + Sample = Endpoint_Read_8(); if (!(Endpoint_BytesInEndpoint())) Endpoint_ClearOUT(); @@ -228,7 +228,7 @@ (void)AudioInterfaceInfo; - Sample = (int16_t)Endpoint_Read_Word_LE(); + Sample = (int16_t)Endpoint_Read_16_LE(); if (!(Endpoint_BytesInEndpoint())) Endpoint_ClearOUT(); @@ -253,7 +253,7 @@ (void)AudioInterfaceInfo; - Sample = (((uint32_t)Endpoint_Read_Byte() << 16) | Endpoint_Read_Word_LE()); + Sample = (((uint32_t)Endpoint_Read_8() << 16) | Endpoint_Read_16_LE()); if (!(Endpoint_BytesInEndpoint())) Endpoint_ClearOUT(); @@ -274,7 +274,7 @@ static inline void Audio_Device_WriteSample8(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo, const int8_t Sample) { - Endpoint_Write_Byte(Sample); + Endpoint_Write_8(Sample); if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpointSize) Endpoint_ClearIN(); @@ -293,7 +293,7 @@ static inline void Audio_Device_WriteSample16(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo, const int16_t Sample) { - Endpoint_Write_Word_LE(Sample); + Endpoint_Write_16_LE(Sample); if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpointSize) Endpoint_ClearIN(); @@ -312,8 +312,8 @@ static inline void Audio_Device_WriteSample24(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo, const int32_t Sample) { - Endpoint_Write_Word_LE(Sample); - Endpoint_Write_Byte(Sample >> 16); + Endpoint_Write_16_LE(Sample); + Endpoint_Write_8(Sample >> 16); if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpointSize) Endpoint_ClearIN(); diff --git a/LUFA/Drivers/USB/Class/Device/CDC.c b/LUFA/Drivers/USB/Class/Device/CDC.c index 9204f1bf0..7398ce6c3 100644 --- a/LUFA/Drivers/USB/Class/Device/CDC.c +++ b/LUFA/Drivers/USB/Class/Device/CDC.c @@ -188,7 +188,7 @@ uint8_t CDC_Device_SendByte(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, return ErrorCode; } - Endpoint_Write_Byte(Data); + Endpoint_Write_8(Data); return ENDPOINT_READYWAIT_NoError; } @@ -256,7 +256,7 @@ int16_t CDC_Device_ReceiveByte(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInf if (Endpoint_IsOUTReceived()) { if (Endpoint_BytesInEndpoint()) - ReceivedByte = Endpoint_Read_Byte(); + ReceivedByte = Endpoint_Read_8(); if (!(Endpoint_BytesInEndpoint())) Endpoint_ClearOUT(); diff --git a/LUFA/Drivers/USB/Class/Device/HID.c b/LUFA/Drivers/USB/Class/Device/HID.c index 505b66ec4..40351cc5d 100644 --- a/LUFA/Drivers/USB/Class/Device/HID.c +++ b/LUFA/Drivers/USB/Class/Device/HID.c @@ -94,7 +94,7 @@ void HID_Device_ProcessControlRequest(USB_ClassInfo_HID_Device_t* const HIDInter if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE)) { Endpoint_ClearSETUP(); - Endpoint_Write_Byte(HIDInterfaceInfo->State.UsingReportProtocol); + Endpoint_Write_8(HIDInterfaceInfo->State.UsingReportProtocol); Endpoint_ClearIN(); Endpoint_ClearStatusStage(); } @@ -124,7 +124,7 @@ void HID_Device_ProcessControlRequest(USB_ClassInfo_HID_Device_t* const HIDInter if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE)) { Endpoint_ClearSETUP(); - Endpoint_Write_Byte(HIDInterfaceInfo->State.IdleCount >> 2); + Endpoint_Write_8(HIDInterfaceInfo->State.IdleCount >> 2); Endpoint_ClearIN(); Endpoint_ClearStatusStage(); } @@ -182,7 +182,7 @@ void HID_Device_USBTask(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo) Endpoint_SelectEndpoint(HIDInterfaceInfo->Config.ReportINEndpointNumber); if (ReportID) - Endpoint_Write_Byte(ReportID); + Endpoint_Write_8(ReportID); Endpoint_Write_Stream_LE(ReportINData, ReportINSize, NULL); diff --git a/LUFA/Drivers/USB/Class/Device/MassStorage.c b/LUFA/Drivers/USB/Class/Device/MassStorage.c index a3dcb1c68..efc9cd4b3 100644 --- a/LUFA/Drivers/USB/Class/Device/MassStorage.c +++ b/LUFA/Drivers/USB/Class/Device/MassStorage.c @@ -61,7 +61,7 @@ void MS_Device_ProcessControlRequest(USB_ClassInfo_MS_Device_t* const MSInterfac if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE)) { Endpoint_ClearSETUP(); - Endpoint_Write_Byte(MSInterfaceInfo->Config.TotalLUNs - 1); + Endpoint_Write_8(MSInterfaceInfo->Config.TotalLUNs - 1); Endpoint_ClearIN(); Endpoint_ClearStatusStage(); } |