mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-09-10 17:15:43 +00:00
Fixed USB_GetHIDReportSize() returning the number of bits in the specified report instead of bytes.
Moved the USB_GetHIDReportItemInfo() calls into the main report item passing loop in the *HostWithParser demos - it is fast enough not to effect performance, and avoids duplicate code. Make Webserver project report the LUFA version as part of the HTTP header.
This commit is contained in:
@@ -167,10 +167,6 @@ bool TINYNVM_WriteMemory(const uint16_t WriteAddress, uint8_t* WriteBuffer, uint
|
||||
|
||||
while (WriteLength)
|
||||
{
|
||||
/* Wait until the NVM controller is no longer busy */
|
||||
if (!(TINYNVM_WaitWhileNVMControllerBusy()))
|
||||
return false;
|
||||
|
||||
/* Write the low byte of data to the target */
|
||||
XPROGTarget_SendByte(TPI_CMD_SST | TPI_POINTER_INDIRECT_PI);
|
||||
XPROGTarget_SendByte(*(WriteBuffer++));
|
||||
@@ -179,6 +175,10 @@ bool TINYNVM_WriteMemory(const uint16_t WriteAddress, uint8_t* WriteBuffer, uint
|
||||
XPROGTarget_SendByte(TPI_CMD_SST | TPI_POINTER_INDIRECT_PI);
|
||||
XPROGTarget_SendByte(*(WriteBuffer++));
|
||||
|
||||
/* Wait until the NVM controller is no longer busy */
|
||||
if (!(TINYNVM_WaitWhileNVMControllerBusy()))
|
||||
return false;
|
||||
|
||||
/* Need to decrement the write length twice, since we read out a whole word */
|
||||
WriteLength -= 2;
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
* given location, and gives extra connection information.
|
||||
*/
|
||||
char PROGMEM HTTP200Header[] = "HTTP/1.1 200 OK\r\n"
|
||||
"Server: LUFA RNDIS\r\n"
|
||||
"Server: LUFA " LUFA_VERSION_STRING "\r\n"
|
||||
"Connection: close\r\n"
|
||||
"MIME-version: 1.0\r\n"
|
||||
"Content-Type: ";
|
||||
@@ -50,7 +50,7 @@ char PROGMEM HTTP200Header[] = "HTTP/1.1 200 OK\r\n"
|
||||
* given URL is invalid, and gives extra error information.
|
||||
*/
|
||||
char PROGMEM HTTP404Header[] = "HTTP/1.1 404 Not Found\r\n"
|
||||
"Server: LUFA RNDIS\r\n"
|
||||
"Server: LUFA " LUFA_VERSION_STRING "\r\n"
|
||||
"Connection: close\r\n"
|
||||
"MIME-version: 1.0\r\n"
|
||||
"Content-Type: text/plain\r\n\r\n"
|
||||
|
||||
@@ -40,6 +40,8 @@
|
||||
#include <avr/pgmspace.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <LUFA/Version.h>
|
||||
|
||||
#include <uip.h>
|
||||
#include <ff.h>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user