Use USBD_MAX_BULK_MPS as filebuf size

Author: ExtremeGTX

subsys/usb/device_next/class/usbd_mtp.c

@@ -78,7 +78,7 @@ static uint8_t mtp_get_bulk_in(struct usbd_class_data *const c_data)
 	struct mtp_data *data = usbd_class_get_private(c_data);
 	struct mtp_desc *desc = data->desc;
 
-	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED && usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
 		return desc->if0_hs_in_ep.bEndpointAddress;
 	}
 
@@ -91,7 +91,7 @@ static uint8_t mtp_get_bulk_out(struct usbd_class_data *const c_data)
 	struct mtp_data *data = usbd_class_get_private(c_data);
 	struct mtp_desc *desc = data->desc;
 
-	if (usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED && usbd_bus_speed(uds_ctx) == USBD_SPEED_HS) {
 		return desc->if0_hs_out_ep.bEndpointAddress;
 	}
 
@@ -278,7 +278,7 @@ static void *usbd_mtp_get_desc(struct usbd_class_data *const c_data, const enum
 {
 	struct mtp_data *data = usbd_class_get_private(c_data);
 
-	if (speed == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED && speed == USBD_SPEED_HS) {
 		return data->hs_desc;
 	}
 
@@ -296,7 +296,7 @@ static int usbd_mtp_init(struct usbd_class_data *c_data)
 	struct usb_device_descriptor *usbd_desc;
 	struct usbd_desc_node *d_nd;
 
-	if (usbd_bus_speed(c_data->uds_ctx) == USBD_SPEED_HS) {
+	if (USBD_SUPPORTS_HIGH_SPEED && usbd_bus_speed(c_data->uds_ctx) == USBD_SPEED_HS) {
 		usbd_desc = (struct usb_device_descriptor *)c_data->uds_ctx->hs_desc;
 	} else {
 		usbd_desc = (struct usb_device_descriptor *)c_data->uds_ctx->fs_desc;

subsys/usb/device_next/class/usbd_mtp_class.c

@@ -845,7 +845,7 @@ static int continue_get_object(struct mtp_context* ctx, struct net_buf *buf)
 	int len = 0;
 	int total_chunks = (ctx->filestate.total_size / ctx->max_packet_size);
 
-	memset(ctx->filebuf, 0x00, 512);
+	memset(ctx->filebuf, 0x00, sizeof(ctx->filebuf));
 
 	if (ctx->filestate.transferred < ctx->filestate.total_size) {
 		len = MIN(ctx->max_packet_size,

subsys/usb/device_next/class/usbd_mtp_class.h

@@ -8,6 +8,7 @@
 #define _USBD_MTP_CLASS_H_
 
 #include <zephyr/fs/fs.h>
+#include <zephyr/usb/usbd.h>
 
 #define MAX_PATH_LEN             128
 
@@ -16,7 +17,7 @@ struct mtp_context {
 	bool op_canceled;
 	uint16_t op_code;
 	uint16_t max_packet_size;
-	uint8_t filebuf[512]; /* Use USB HS MPS */
+	uint8_t filebuf[USBD_MAX_BULK_MPS];
 
 	bool more_data_needed;
 	int (*extra_data_fn)(struct mtp_context* ctx, struct net_buf *buf_in);
@@ -37,7 +38,8 @@ bool mtp_packet_pending(struct mtp_context* ctx);
 bool mtp_needs_more_data(struct mtp_context* ctx, struct net_buf *buf);
 int mtp_commands_handler(struct mtp_context* ctx, struct net_buf *buf_in, struct net_buf *buf);
 int mtp_get_pending_packet(struct mtp_context* ctx, struct net_buf *buf);
-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);
+int mtp_control_to_dev(struct mtp_context* ctx, uint8_t request, const struct net_buf *const buf);
 int mtp_init(struct mtp_context* ctx, const char *manufacturer, const char *model, const char *device_version, const char *serial_number);
 
 #endif /* _USBD_MTP_CLASS_H_ */