Skip to content

Bugfix: CH347_WriteRead #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bugfix: CH347_WriteRead #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions OpenOCD_SourceCode_CH347/src/jtag/drivers/ch347.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@ static void CH347_WriteRead(struct scan_command *cmd, uint8_t *bits,
readLen += tempLength;
DI = BI = 0;
}
int offset = 0, bit_count = 0;
int offset = 0;
if (IsRead && totalReadLength > 0) {
if (ch347.pack_size == STANDARD_PACK && bits && cmd) {
CH347_Flush_Buffer();
Expand All @@ -897,11 +897,9 @@ static void CH347_WriteRead(struct scan_command *cmd, uint8_t *bits,
*/
LOG_DEBUG("fields[%i].in_value[%i], offset: %d",
i, cmd->fields[i].num_bits, offset);
num_bits = cmd->fields[i].num_bits;
if (cmd->fields[i].in_value) {
num_bits = cmd->fields[i].num_bits;

if (ch347.pack_size == LARGER_PACK) {
bit_count += num_bits;
if (cmd->fields[i].in_value)
bit_copy_queued(
&ch347.read_queue,
Expand All @@ -912,12 +910,11 @@ static void CH347_WriteRead(struct scan_command *cmd, uint8_t *bits,

if (num_bits > 7)
ch347.read_idx +=
DIV_ROUND_UP(bit_count,
DIV_ROUND_UP(offset,
8);
offset += num_bits;
} else {
uint8_t *captured = buf_set_buf(
readData, bit_count,
readData, offset,
malloc(DIV_ROUND_UP(num_bits,
8)), 0,
num_bits);
Expand All @@ -938,8 +935,8 @@ static void CH347_WriteRead(struct scan_command *cmd, uint8_t *bits,
num_bits);
free(captured);
}
bit_count += cmd->fields[i].num_bits;
}
offset += num_bits;
}
}

Expand Down