Skip to content
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

cmd: jtag: Fix build failure on GCC9 #65

Merged
merged 1 commit into from
Oct 17, 2024
Merged

cmd: jtag: Fix build failure on GCC9 #65

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
18 changes: 12 additions & 6 deletions src/cmd/jtag.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,13 @@ static int run_openocd_bitbang_server(struct jtag *jtag, uint16_t port)
logi("New connection from %s\n", inet_ntoa(client_addr.sin_addr));

while (true) {
int rc;
uint8_t state;
uint8_t tdo;
uint8_t tdi;
uint8_t tms;
uint8_t tck;

char command = 0;
ssize_t n = read(client_fd, &command, 1);
if (n <= 0) {
Expand All @@ -93,8 +100,7 @@ static int run_openocd_bitbang_server(struct jtag *jtag, uint16_t port)
break;
/* Read state */
case 'R':
uint8_t tdo = 0;
int rc = jtag_bitbang_get(jtag, &tdo);
rc = jtag_bitbang_get(jtag, &tdo);
if (rc < 0) {
loge("jtag_bitbang_get() failed\n");
return 1;
Expand All @@ -115,11 +121,11 @@ static int run_openocd_bitbang_server(struct jtag *jtag, uint16_t port)
return 1;
/* Data requests */
case '0'...'7':
uint8_t state = command - '0';
state = command - '0';

uint8_t tdi = !!(state & 1);
uint8_t tms = !!(state & 2);
uint8_t tck = !!(state & 4);
tdi = !!(state & 1);
tms = !!(state & 2);
tck = !!(state & 4);

rc = jtag_bitbang_set(jtag, tck, tms, tdi);
if (rc < 0) {
Expand Down
Loading