adapt to msg api change

JIRA: RTOS-792
phoenix-rtos · Mar 21, 2024 · cd8cb2a · cd8cb2a
1 parent 6da7630
commit cd8cb2a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/libusb/driver.c b/libusb/driver.c
@@ -113,7 +113,7 @@ static int usb_urbSubmitSync(usb_urb_t *urb, void *data)
 	if ((ret = msgSend(usbdrv_common.port, &msg)) != 0)
 		return ret;
 
-	return msg.o.io.err;
+	return msg.o.err;
 }
 
 

diff --git a/usb/usb.c b/usb/usb.c
@@ -219,7 +219,7 @@ static void usb_urbSyncCompleted(usb_transfer_t *t)
 
 	msg.type = mtDevCtl;
 	msg.pid = t->pid;
-	msg.o.io.err = (t->error != 0) ? -t->error : t->transferred;
+	msg.o.err = (t->error != 0) ? -t->error : t->transferred;
 
 	if (t->direction == usb_dir_in)
 		msg.o.data = t->buffer;
@@ -265,17 +265,17 @@ static void usb_msgthr(void *arg)
 		resp = 1;
 		switch (msg.type) {
 			case mtRead:
-				msg.o.io.err = usb_devsList(msg.o.data, msg.o.size);
+				msg.o.err = usb_devsList(msg.o.data, msg.o.size);
 				break;
 			case mtDevCtl:
 				umsg = (usb_msg_t *)msg.i.raw;
 				switch (umsg->type) {
 					case usb_msg_connect:
-						msg.o.io.err = usb_handleConnect(&msg, &umsg->connect);
+						msg.o.err = usb_handleConnect(&msg, &umsg->connect);
 						break;
 					case usb_msg_open:
 						if (usb_handleOpen(&umsg->open, &msg) != 0)
-							msg.o.io.err = -1;
+							msg.o.err = -1;
 						break;
 					case usb_msg_urb:
 						ret = usb_handleUrb(&msg, port, rid);
@@ -284,20 +284,20 @@ static void usb_msgthr(void *arg)
 							resp = 0;
 						}
 						else {
-							msg.o.io.err = ret;
+							msg.o.err = ret;
 						}
 						break;
 					case usb_msg_urbcmd:
-						msg.o.io.err = usb_handleUrbcmd(&msg);
+						msg.o.err = usb_handleUrbcmd(&msg);
 						break;
 					default:
-						msg.o.io.err = -EINVAL;
+						msg.o.err = -EINVAL;
 						USB_LOG("usb: unsupported usb_msg type: %d\n", umsg->type);
 						break;
 				}
 				break;
 			default:
-				msg.o.io.err = -EINVAL;
+				msg.o.err = -EINVAL;
 				USB_LOG("usb: unsupported msg type\n");
 		}