diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2016-01-02 17:22:18 +1100 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2016-01-02 17:22:18 +1100 |
| commit | 25b2027544a69a31d11573631b21ff41a6e89784 (patch) | |
| tree | 571716c9e6f524e89fb6f104c413f57425fd24f7 /Demos/Device/LowLevel | |
| parent | 2fcd50ada8e0916d1ed5addb2567b4bfcee8497c (diff) | |
| parent | a86b502294ebda621fa8f3cce20a8238ea15eebc (diff) | |
| download | lufa-25b2027544a69a31d11573631b21ff41a6e89784.tar.gz lufa-25b2027544a69a31d11573631b21ff41a6e89784.tar.bz2 lufa-25b2027544a69a31d11573631b21ff41a6e89784.zip | |
Merge branch 'master' into dmbs
Diffstat (limited to 'Demos/Device/LowLevel')
| -rw-r--r-- | Demos/Device/LowLevel/RNDISEthernet/Lib/ProtocolDecoders.c | 2 | ||||
| -rw-r--r-- | Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/ProtocolDecoders.c b/Demos/Device/LowLevel/RNDISEthernet/Lib/ProtocolDecoders.c index cc4e96132..e1d41ebde 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/ProtocolDecoders.c +++ b/Demos/Device/LowLevel/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/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.c b/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.c index 08ec74aa9..be13ce277 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.c +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.c @@ -380,7 +380,7 @@ static bool ProcessNDISSet(uint32_t OId, void* SetData, uint16_t SetSize) CurrPacketFilter = *((uint32_t*)SetData); /* Set the RNDIS state to initialized if the packet filter is non-zero */ - CurrRNDISState = ((CurrPacketFilter) ? RNDIS_Data_Initialized : RNDIS_Data_Initialized); + CurrRNDISState = ((CurrPacketFilter) ? RNDIS_Data_Initialized : RNDIS_Initialized); return true; case OID_802_3_MULTICAST_LIST: |