Revert "[Feature][T8TSK-250][ADBD]add adb debug patch"
This reverts commit 0300fcc023c83b5b569b0c0799aff58cfd65dd39.
Reason for revert: <INSERT REASONING HERE>
Change-Id: I82e92daf5003f885c4732744291c57425ef27642
diff --git a/src/devtools/adb/transport_usb.c b/src/devtools/adb/transport_usb.c
index edc7620..3d19803 100644
--- a/src/devtools/adb/transport_usb.c
+++ b/src/devtools/adb/transport_usb.c
@@ -48,40 +48,28 @@
static int remote_read(apacket *p, atransport *t)
{
- int ret = 0;
- while (true) {
- ret = usb_read(t->usb, &p->msg, sizeof(amessage));
- if(ret < -1){
- D("remote usb: terminated (message) due to suspended, ret=%d, retry read\n", ret);
- continue;
- } else if (ret) { // not zero
- D("remote usb: read terminated (message)\n");
+ if(usb_read(t->usb, &p->msg, sizeof(amessage))){
+ D("remote usb: read terminated (message)\n");
+ return -1;
+ }
+
+ fix_endians(p);
+
+ if(check_header(p)) {
+ D("remote usb: check_header failed\n");
+ return -1;
+ }
+
+ if(p->msg.data_length) {
+ if(usb_read(t->usb, p->data, p->msg.data_length)){
+ D("remote usb: terminated (data)\n");
return -1;
}
+ }
- fix_endians(p);
-
- if(check_header(p)) {
- D("remote usb: check_header failed\n");
- return -1;
- }
-
- if(p->msg.data_length) {
- ret = usb_read(t->usb, p->data, p->msg.data_length);
- if(ret < -1){
- D("remote usb: terminated (data) due to suspended, ret=%d, retry read\n", ret);
- continue;
- } else if (ret) { // not zero
- D("remote usb: terminated (data)\n");
- return -1;
- }
- }
-
- if(check_data(p)) {
- D("remote usb: check_data failed\n");
- return -1;
- }
- break;
+ if(check_data(p)) {
+ D("remote usb: check_data failed\n");
+ return -1;
}
return 0;