summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsakumisu <[email protected]>2022-05-25 11:00:35 +0800
committersakumisu <[email protected]>2022-05-25 11:00:35 +0800
commitfea07e007926c8c3de2c599ad1ad2501e9a2f4cc (patch)
tree58f9ad373748122a92296be7bd9eaef5f9fd8e42
parentbdbf3cb6708eb5f85758f8692feb2c0e5e960df6 (diff)
add video_entity_info struct
-rw-r--r--class/video/usbd_video.c16
-rw-r--r--class/video/usbd_video.h4
2 files changed, 13 insertions, 7 deletions
diff --git a/class/video/usbd_video.c b/class/video/usbd_video.c
index da605354..f1813eaf 100644
--- a/class/video/usbd_video.c
+++ b/class/video/usbd_video.c
@@ -23,6 +23,12 @@
#include "usbd_core.h"
#include "usbd_video.h"
+struct video_entity_info {
+ uint8_t bDescriptorSubtype;
+ uint8_t bEntityId;
+ uint16_t wTerminalType;
+};
+
struct usbd_video_cfg_priv {
struct video_probe_and_commit_controls probe;
struct video_probe_and_commit_controls commit;
@@ -722,20 +728,20 @@ static void video_notify_handler(uint8_t event, void *arg)
}
}
-void usbd_video_add_interface(usbd_class_t *class, usbd_interface_t *intf)
+void usbd_video_add_interface(usbd_class_t *devclass, usbd_interface_t *intf)
{
static usbd_class_t *last_class = NULL;
- if (last_class != class) {
- last_class = class;
- usbd_class_register(class);
+ if (last_class != devclass) {
+ last_class = devclass;
+ usbd_class_register(devclass);
}
intf->class_handler = video_class_request_handler;
intf->custom_handler = NULL;
intf->vendor_handler = NULL;
intf->notify_handler = video_notify_handler;
- usbd_class_add_interface(class, intf);
+ usbd_class_add_interface(devclass, intf);
if (usbd_video_cfg.vcintf == 0xff) {
usbd_video_cfg.vcintf = intf->intf_num;
diff --git a/class/video/usbd_video.h b/class/video/usbd_video.h
index 28208ead..b0615cbd 100644
--- a/class/video/usbd_video.h
+++ b/class/video/usbd_video.h
@@ -29,14 +29,14 @@
extern "C" {
#endif
-void usbd_video_add_interface(usbd_class_t *class, usbd_interface_t *intf);
+void usbd_video_add_interface(usbd_class_t *devclass, usbd_interface_t *intf);
void usbd_video_open(uint8_t intf);
void usbd_video_close(uint8_t intf);
void usbd_video_probe_and_commit_controls_init(uint32_t dwFrameInterval, uint32_t dwMaxVideoFrameSize, uint32_t dwMaxPayloadTransferSize);
uint32_t usbd_video_mjpeg_payload_fill(uint8_t *input, uint32_t input_len, uint8_t *output, uint32_t *out_len);
void usbd_video_mjpeg_payload_header_toggle(uint8_t *output, uint32_t packets);
-
+void usbd_video_sof_callback(void);
#ifdef __cplusplus
}