specchioriflesso/USB_Host_Shield_2.0
1
Fork 0
mirror of https://github.com/felis/USB_Host_Shield_2.0.git synced 2024-03-22 11:31:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix reading of data with offset

Browse source
This commit is contained in:
gyojir 2019-01-04 01:34:32 +09:00
parent a361b72680
commit e2fb519611
2 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
hidescriptorparser.cpp
View file

@ -1510,19 +1510,12 @@ uint8_t ReportDescParser2::ParseItem(uint8_t **pp, uint16_t *pcntdn) {
void ReportDescParser2::OnInputItem(uint8_t itm) { void ReportDescParser2::OnInputItem(uint8_t itm) {
uint8_t byte_offset = (totalSize >> 3); // calculate offset to the next unhandled byte i = (int)(totalCount / 8); uint8_t byte_offset = (totalSize >> 3); // calculate offset to the next unhandled byte i = (int)(totalCount / 8);
uint32_t tmp = (byte_offset << 3);
uint8_t bit_offset = totalSize - tmp; // number of bits in the current byte already handled
uint8_t *p = pBuf + byte_offset; // current byte pointer uint8_t *p = pBuf + byte_offset; // current byte pointer
if(bit_offset)
*p >>= bit_offset;
uint8_t usage = useMin; uint8_t usage = useMin;
bool print_usemin_usemax = ((useMin < useMax) && ((itm & 3) == 2) && pfUsage) ? true : false; bool print_usemin_usemax = ((useMin < useMax) && ((itm & 3) == 2) && pfUsage) ? true : false;
uint8_t bits_of_byte = 8;
// for each field in field array defined by rptCount // for each field in field array defined by rptCount
for(uint8_t field = 0; field < rptCount; field++, usage++) { for(uint8_t field = 0; field < rptCount; field++, usage++) {
@ -1543,30 +1536,27 @@ void ReportDescParser2::OnInputItem(uint8_t itm) {
// bits_to_copy - number of bits to copy to result buffer // bits_to_copy - number of bits to copy to result buffer
// for each bit in a field // for each bit in a field
for(uint8_t bits_left = rptSize, bits_to_copy = 0; bits_left; for(uint8_t bits_left = rptSize, bits_to_copy = 0, index = 0; bits_left;
bits_left -= bits_to_copy) { bits_left -= bits_to_copy) {
bits_to_copy = (bits_left > bits_of_byte) ? bits_of_byte : bits_left;
result.dwResult <<= bits_to_copy; // Result buffer is shifted by the number of bits to be copied into it
uint8_t val = *p; uint8_t val = *p;
val >>= (8 - bits_of_byte); // Shift by the number of bits already processed val >>= (8 - bits_of_byte); // Shift by the number of bits already processed
mask = 0; bits_to_copy = (bits_left > bits_of_byte) ? bits_of_byte : bits_left;
mask = 0;
for(uint8_t j = bits_to_copy; j; j--) { for(uint8_t j = bits_to_copy; j; j--) {
mask <<= 1; mask <<= 1;
mask |= 1; mask |= 1;
} }
result.bResult[0] = (result.bResult[0] | (val & mask)); result.bResult[index] = (result.bResult[index] | (val & mask));
bits_of_byte -= bits_to_copy; bits_of_byte -= bits_to_copy;
if(bits_of_byte < 1) { if(bits_of_byte < 1) {
bits_of_byte = 8; bits_of_byte = 8;
p++; p++;
index++;
} }
} }
PrintByteValue(result.dwResult); PrintByteValue(result.dwResult);

4
hidescriptorparser.h
View file

@ -156,6 +156,8 @@ class ReportDescParser2 : public ReportDescParserBase {
uint8_t *pBuf; // Report buffer pointer uint8_t *pBuf; // Report buffer pointer
uint8_t bLen; // Report length uint8_t bLen; // Report length
uint8_t bits_of_byte;
protected: protected:
// Method should be defined here if virtual. // Method should be defined here if virtual.
virtual uint8_t ParseItem(uint8_t **pp, uint16_t *pcntdn); virtual uint8_t ParseItem(uint8_t **pp, uint16_t *pcntdn);
@ -163,7 +165,7 @@ protected:
public: public:
ReportDescParser2(uint16_t len, uint8_t *pbuf) : ReportDescParser2(uint16_t len, uint8_t *pbuf) :
ReportDescParserBase(), rptId(0), useMin(0), useMax(0), fieldCount(0), pBuf(pbuf), bLen(len) { ReportDescParserBase(), rptId(0), useMin(0), useMax(0), fieldCount(0), pBuf(pbuf), bLen(len), bits_of_byte(8) {
}; };
}; };