aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2015-12-22 22:36:23 +1100
committerDean Camera <dean@fourwalledcubicle.com>2015-12-22 22:36:23 +1100
commita86b502294ebda621fa8f3cce20a8238ea15eebc (patch)
treeabe7bd6f864869994b2b4ba3862cd997240ebc5d
parentd0161e0a9bbc8d1a059a32e1c21fdd201cce1f3c (diff)
downloadlufa-a86b502294ebda621fa8f3cce20a8238ea15eebc.tar.gz
lufa-a86b502294ebda621fa8f3cce20a8238ea15eebc.tar.bz2
lufa-a86b502294ebda621fa8f3cce20a8238ea15eebc.zip
Fix additional void pointer arithmetic in the class driver RNDIS demo.
-rw-r--r--Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c2
-rw-r--r--LUFA/DoxygenPages/ChangeLog.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c
index 57e71cb77..c9db1f0ee 100644
--- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c
+++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c
@@ -244,7 +244,7 @@ void DecodeUDPHeader(void* InDataStart)
void DecodeDHCPHeader(void* InDataStart)
{
#if !defined(NO_DECODE_DHCP)
- uint8_t* DHCPOptions = (InDataStart + sizeof(DHCP_Header_t));
+ uint8_t* DHCPOptions = ((uint8_t*)InDataStart + sizeof(DHCP_Header_t));
printf_P(PSTR(" \\\r\n DHCP\r\n"));
diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt
index 36c5bf9c8..16102fb95 100644
--- a/LUFA/DoxygenPages/ChangeLog.txt
+++ b/LUFA/DoxygenPages/ChangeLog.txt
@@ -15,7 +15,7 @@
* in a user application (thanks to Matlo)
* - Fixed missing \c va_end() calls in the HID bootloader CLI app which could cause portability issues
* - Fixed void pointer arithmetic in the \c Serial_SendData() functions for AVR8 and XMEGA architectures
- * - Fixed void pointer arithmetic in the low level RNDIS demo protocol decoders
+ * - Fixed void pointer arithmetic in the low level and class driver RNDIS demo protocol decoders
* - Fixed low level RNDIS demo incorrectly setting the RNDIS state when a null packet filter was requested
*
* \section Sec_ChangeLog151115 Version 151115