gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-17 05:02:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dmbs

Browse Source
This commit is contained in:
Dean Camera 2016-01-02 17:22:18 +11:00
commit 25b2027544
8 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Bootloaders/HID/HostLoaderApp/hid_bootloader_cli.c
View File

@ -921,15 +921,16 @@ void ihex_get_data(int addr, int len, unsigned char *bytes)
int printf_verbose(const char *format, ...)
{
va_list ap;
int r;
int r = 0;
va_start(ap, format);
if (verbose) {
r = vprintf(format, ap);
fflush(stdout);
return r;
}
return 0;
va_end(ap);
return r;
}
void delay(double seconds)
@ -948,6 +949,8 @@ void die(const char *str, ...)
va_start(ap, str);
vfprintf(stderr, str, ap);
fprintf(stderr, "\n");
va_end(ap);
exit(1);
}

2
Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c
View File

@ -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"));

2
Demos/Device/LowLevel/RNDISEthernet/Lib/ProtocolDecoders.c
View File

@ -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"));

2
Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.c
View File

@ -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:

4
LUFA/DoxygenPages/ChangeLog.txt
View File

@ -13,6 +13,10 @@
* parameter, instead of uint16_t (thanks to Matlo)
* - Fixed broken USE_RAM_DESCRIPTORS compile time option when the FIXED_NUM_CONFIGURATIONS compile time option is not enabled
* 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 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
* <b>New:</b>

2
LUFA/DoxygenPages/SoftwareBootloaderJump.txt
View File

@ -31,7 +31,7 @@
*
* uint32_t Boot_Key ATTR_NO_INIT;
*
* #define MAGIC_BOOT_KEY 0xDC42ACCA
* #define MAGIC_BOOT_KEY 0xBADCAFE5
* #define BOOTLOADER_START_ADDRESS ((FLASH_SIZE_BYTES - BOOTLOADER_SEC_SIZE_BYTES) >> 1)
*
* void Bootloader_Jump_Check(void) ATTR_INIT_SECTION(3);

4
LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.c
View File

@ -88,8 +88,10 @@ void Serial_SendString(const char* StringPtr)
void Serial_SendData(const void* Buffer,
uint16_t Length)
{
uint8_t* CurrByte = (uint8_t*)Buffer;
while (Length--)
Serial_SendByte(*((uint8_t*)Buffer++));
Serial_SendByte(*(CurrByte++));
}
void Serial_CreateStream(FILE* Stream)

4
LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c
View File

@ -91,8 +91,10 @@ void Serial_SendData(USART_t* const USART,
const void* Buffer,
uint16_t Length)
{
uint8_t* CurrByte = (uint8_t*)Buffer;
while (Length--)
Serial_SendByte(USART, *((uint8_t*)Buffer++));
Serial_SendByte(USART, *(CurrByte++));
}
void Serial_CreateStream(USART_t* USART, FILE* Stream)