Polishing 3

Do some polishing

Author: ExtremeGTX

subsys/usb/device_next/class/usbd_mtp.c

@@ -132,7 +132,7 @@ static int usbd_mtp_control_to_host(struct usbd_class_data *c_data,
 
 	//FIXME: Handle Cancel transaction properly
 	// Reply to host with the status
-	mtp_control_handler(mtp_ctx, setup->bRequest, buf);
+	mtp_control_to_host(mtp_ctx, setup->bRequest, buf);
 
 	return 0;
 }
@@ -144,12 +144,12 @@ static int usbd_mtp_control_to_dev(struct usbd_class_data *c_data,
 	struct mtp_data *data = usbd_class_get_private(c_data);
 	struct mtp_context *mtp_ctx = &data->mtp_ctx;
 
-	LOG_WRN("%s: Class request 0x%x (Recipient: %x)", __func__,
+	LOG_DBG("%s: Class request 0x%x (Recipient: %x)", __func__,
 		setup->bRequest, setup->RequestType.recipient);
 
 	//FIXME: Handle Cancel transaction properly
 	// here transaction is canceled without any reply back
-	mtp_control_handler(mtp_ctx, setup->bRequest, buf);
+	mtp_control_to_dev(mtp_ctx, setup->bRequest, buf);
 
 	return 0;
 }

subsys/usb/device_next/class/usbd_mtp_class.c

@@ -934,7 +934,6 @@ MTP_CMD_HANDLER(MTP_OP_GET_OBJECT)
 		}
 		net_buf_add_mem(buf, ctx->filebuf, read);
 
-		ctx->cmd = MTP_OP_GET_OBJECT;
 		ctx->filestate.total_size = filesize;
 		ctx->filestate.transferred = read;
 		DEV_TO_HOST_SET_PENDING_PACKET(ctx, continue_get_object);
@@ -986,7 +985,6 @@ MTP_CMD_HANDLER(MTP_OP_SEND_OBJECT_INFO)
 				fs_obj->storage_id = dest_storage_id;
 
 				LOG_DBG("New ObjID:  0x%08x", fs_obj->ID);
-				ctx->cmd = MTP_OP_SEND_OBJECT;
 			} else {
 				LOG_ERR("No file handle avaiable %u",
 					storage[dest_storage_id].files_count);
@@ -1123,6 +1121,7 @@ static int continue_send_object(struct mtp_context* ctx, struct net_buf *buf_in)
 	fs_write(&ctx->filestate.file, buf_in->data, buf_in->len);
 	LOG_DBG("EXTRA: Data len: %u out of %u", ctx->filestate.transferred,
 		ctx->filestate.total_size);
+
 	if (ctx->filestate.transferred >= ctx->filestate.total_size) {
 		fs_close(&ctx->filestate.file);
 		LOG_DBG("Sending Confirmation after reciving data (Total len: %u)",
@@ -1241,16 +1240,15 @@ int mtp_commands_handler(struct mtp_context* ctx, struct net_buf *buf_in, struct
 		if (ret >= 0) {
 			if (ret == 1) {
 				ctx->pending_fn(ctx, buf_resp);
-				return buf_resp->len;
 			}
-			return 0;
+			return buf_resp->len;
 		} else {
 			LOG_ERR("Failed to handle extra data");
 			return -EINVAL;
 		}
 	}
 
-	ctx->cmd = mtp_command->hdr.code;
+	ctx->op_code = mtp_command->hdr.code;
 	LOG_DBG(GREEN "[%s]" RESET, mtp_code_to_string(mtp_command->hdr.code));
 
 	switch (mtp_command->hdr.code) {
@@ -1306,15 +1304,14 @@ int mtp_commands_handler(struct mtp_context* ctx, struct net_buf *buf_in, struct
 	return buf_resp->len;
 }
 
-int mtp_control_handler(struct mtp_context* ctx, uint8_t request, struct net_buf *buf)
+int mtp_control_to_host(struct mtp_context* ctx, uint8_t request, struct net_buf *const buf)
 {
 	struct mtp_device_status_t dev_status;
-	static bool canceled = false;
 	switch (request)
 	{
 		case MTP_REQUEST_GET_DEVICE_STATUS:
 			LOG_WRN("MTP_REQUEST_GET_DEVICE_STATUS");
-			if (canceled){
+			if (ctx->op_canceled){
 				dev_status.len = 6;
 				dev_status.code = MTP_RESP_TRANSACTION_CANCELLED;
 				dev_status.epIn = 0x81;
@@ -1325,16 +1322,29 @@ int mtp_control_handler(struct mtp_context* ctx, uint8_t request, struct net_buf
 				dev_status.code = MTP_RESP_OK;
 				net_buf_add_mem(buf, &dev_status, dev_status.len);
 			}
-			canceled = false;
+
+			ctx->op_canceled = false;
+			break;
+		default:
+			LOG_ERR("Unknown Host request 0x%x!", request);
 			break;
 
+	}
+
+	return 0;
+}
+
+int mtp_control_to_dev(struct mtp_context* ctx, uint8_t request, const struct net_buf *const buf)
+{
+	switch (request)
+	{
 		case MTP_REQUEST_CANCEL:
 			LOG_WRN("Closing incomplete file %s", ctx->filestate.filepath);
 			if (strlen(ctx->filestate.filepath) > 0) {
 				fs_close(&ctx->filestate.file);
 
 				/* Delete the opened file only when downloading from Host */
-				if (ctx->cmd == MTP_OP_SEND_OBJECT) {
+				if (ctx->op_code == MTP_OP_SEND_OBJECT) {
 					fs_unlink(ctx->filestate.filepath);
 				}
 
@@ -1344,7 +1354,7 @@ int mtp_control_handler(struct mtp_context* ctx, uint8_t request, struct net_buf
 			DEV_TO_HOST_SET_PENDING_PACKET(ctx, NULL);
 			HOST_TO_DEV_SET_CONT_DATA_HANDLER(ctx,  NULL);
 
-			canceled = true;
+			ctx->op_canceled = true;
 			break;
 
 		case MTP_REQUEST_DEVICE_RESET:
@@ -1353,7 +1363,7 @@ int mtp_control_handler(struct mtp_context* ctx, uint8_t request, struct net_buf
 			break;
 
 		default:
-			LOG_ERR("Unknown request 0x%x!", request);
+			LOG_ERR("Unknown Dev request 0x%x!", request);
 			break;
 	}
 
@@ -1389,6 +1399,10 @@ static void mtp_reset(struct mtp_context* ctx)
 		storage[i].files_count = 0;
 	}
 	ctx->session_opened = false;
+	ctx->op_code = 0;
+	ctx->op_canceled = false;
+	HOST_TO_DEV_SET_CONT_DATA_HANDLER(ctx, NULL);
+	DEV_TO_HOST_SET_PENDING_PACKET(ctx, NULL);
 }
 
 int mtp_init(struct mtp_context* ctx, const char *manufacturer, const char *model, const char *device_version,

subsys/usb/device_next/class/usbd_mtp_class.h

@@ -13,9 +13,10 @@
 
 struct mtp_context {
 	bool session_opened;
+	bool op_canceled;
+	uint16_t op_code;
 	uint16_t max_packet_size;
 	uint8_t filebuf[512]; /* Use USB HS MPS */
-	uint16_t cmd;
 
 	bool more_data_needed;
 	int (*extra_data_fn)(struct mtp_context* ctx, struct net_buf *buf_in);