A RetroSearch Logo

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Search Query:

Showing content from https://github.com/openocd-org/openocd/commit/3b78b5c1db68841fdc18ee48b6011f4affff2bfd below:

split error and returned value · openocd-org/openocd@3b78b5c · GitHub

@@ -414,13 +414,13 @@ static int kitprog_set_protocol(uint8_t protocol)

 414 414

int transferred;

 415 415

char status = PROGRAMMER_NOK_NACK;

 416 416 417 -

transferred = jtag_libusb_control_transfer(kitprog_handle->usb_handle,

 417 +

int retval = jtag_libusb_control_transfer(kitprog_handle->usb_handle,

 418 418

LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE,

 419 419

CONTROL_TYPE_WRITE,

 420 420

(CONTROL_MODE_SET_PROGRAMMER_PROTOCOL << 8) | CONTROL_COMMAND_PROGRAM,

 421 -

protocol, &status, 1, 0);

 421 +

protocol, &status, 1, 0, &transferred);

 422 422 423 -

if (transferred == 0) {

 423 +

if (retval != ERROR_OK || transferred == 0) {

 424 424

LOG_DEBUG("Zero bytes transferred");

 425 425

return ERROR_FAIL;

 426 426

}

@@ -440,11 +440,11 @@ static int kitprog_get_status(void)

 440 440 441 441

/* Try a maximum of three times */

 442 442

for (int i = 0; (i < 3) && (transferred == 0); i++) {

 443 -

transferred = jtag_libusb_control_transfer(kitprog_handle->usb_handle,

 443 +

jtag_libusb_control_transfer(kitprog_handle->usb_handle,

 444 444

LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE,

 445 445

CONTROL_TYPE_READ,

 446 446

(CONTROL_MODE_POLL_PROGRAMMER_STATUS << 8) | CONTROL_COMMAND_PROGRAM,

 447 -

0, &status, 1, 0);

 447 +

0, &status, 1, 0, &transferred);

 448 448

jtag_sleep(1000);

 449 449

}

 450 450

@@ -466,13 +466,13 @@ static int kitprog_set_unknown(void)

 466 466

int transferred;

 467 467

char status = PROGRAMMER_NOK_NACK;

 468 468 469 -

transferred = jtag_libusb_control_transfer(kitprog_handle->usb_handle,

 469 +

int retval = jtag_libusb_control_transfer(kitprog_handle->usb_handle,

 470 470

LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE,

 471 471

CONTROL_TYPE_WRITE,

 472 472

(0x03 << 8) | 0x04,

 473 -

0, &status, 1, 0);

 473 +

0, &status, 1, 0, &transferred);

 474 474 475 -

if (transferred == 0) {

 475 +

if (retval != ERROR_OK || transferred == 0) {

 476 476

LOG_DEBUG("Zero bytes transferred");

 477 477

return ERROR_FAIL;

 478 478

}

@@ -491,13 +491,13 @@ static int kitprog_acquire_psoc(uint8_t psoc_type, uint8_t acquire_mode,

 491 491

int transferred;

 492 492

char status = PROGRAMMER_NOK_NACK;

 493 493 494 -

transferred = jtag_libusb_control_transfer(kitprog_handle->usb_handle,

 494 +

int retval = jtag_libusb_control_transfer(kitprog_handle->usb_handle,

 495 495

LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE,

 496 496

CONTROL_TYPE_WRITE,

 497 497

(CONTROL_MODE_ACQUIRE_SWD_TARGET << 8) | CONTROL_COMMAND_PROGRAM,

 498 -

(max_attempts << 8) | (acquire_mode << 4) | psoc_type, &status, 1, 0);

 498 +

(max_attempts << 8) | (acquire_mode << 4) | psoc_type, &status, 1, 0, &transferred);

 499 499 500 -

if (transferred == 0) {

 500 +

if (retval != ERROR_OK || transferred == 0) {

 501 501

LOG_DEBUG("Zero bytes transferred");

 502 502

return ERROR_FAIL;

 503 503

}

@@ -515,13 +515,13 @@ static int kitprog_reset_target(void)

 515 515

int transferred;

 516 516

char status = PROGRAMMER_NOK_NACK;

 517 517 518 -

transferred = jtag_libusb_control_transfer(kitprog_handle->usb_handle,

 518 +

int retval = jtag_libusb_control_transfer(kitprog_handle->usb_handle,

 519 519

LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE,

 520 520

CONTROL_TYPE_WRITE,

 521 521

(CONTROL_MODE_RESET_TARGET << 8) | CONTROL_COMMAND_PROGRAM,

 522 -

0, &status, 1, 0);

 522 +

0, &status, 1, 0, &transferred);

 523 523 524 -

if (transferred == 0) {

 524 +

if (retval != ERROR_OK || transferred == 0) {

 525 525

LOG_DEBUG("Zero bytes transferred");

 526 526

return ERROR_FAIL;

 527 527

}

@@ -539,13 +539,13 @@ static int kitprog_swd_sync(void)

 539 539

int transferred;

 540 540

char status = PROGRAMMER_NOK_NACK;

 541 541 542 -

transferred = jtag_libusb_control_transfer(kitprog_handle->usb_handle,

 542 +

int retval = jtag_libusb_control_transfer(kitprog_handle->usb_handle,

 543 543

LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE,

 544 544

CONTROL_TYPE_WRITE,

 545 545

(CONTROL_MODE_SYNCHRONIZE_TRANSFER << 8) | CONTROL_COMMAND_PROGRAM,

 546 -

0, &status, 1, 0);

 546 +

0, &status, 1, 0, &transferred);

 547 547 548 -

if (transferred == 0) {

 548 +

if (retval != ERROR_OK || transferred == 0) {

 549 549

LOG_DEBUG("Zero bytes transferred");

 550 550

return ERROR_FAIL;

 551 551

}

@@ -563,13 +563,13 @@ static int kitprog_swd_seq(uint8_t seq_type)

 563 563

int transferred;

 564 564

char status = PROGRAMMER_NOK_NACK;

 565 565 566 -

transferred = jtag_libusb_control_transfer(kitprog_handle->usb_handle,

 566 +

int retval = jtag_libusb_control_transfer(kitprog_handle->usb_handle,

 567 567

LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE,

 568 568

CONTROL_TYPE_WRITE,

 569 569

(CONTROL_MODE_SEND_SWD_SEQUENCE << 8) | CONTROL_COMMAND_PROGRAM,

 570 -

seq_type, &status, 1, 0);

 570 +

seq_type, &status, 1, 0, &transferred);

 571 571 572 -

if (transferred == 0) {

 572 +

if (retval != ERROR_OK || transferred == 0) {

 573 573

LOG_DEBUG("Zero bytes transferred");

 574 574

return ERROR_FAIL;

 575 575

}

RetroSearch is an open source project built by @garambo | Open a GitHub Issue

Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo

HTML: 3.2 | Encoding: UTF-8 | Version: 0.7.4