drivers: video: accept VIDEO_EP_ALL where VIDEO_EP_IN/OUT is given

josuah · nashif · commit c0f8658254a5 · 2024-08-24T07:17:03.000-04:00
The current video drivers did not allow VIDEO_EP_ALL to be selected,
as used by video_stream_stop().

This adds the VIDEO_EP_ALL to each video driver that filtered endpoints.

Signed-off-by: Josuah Demangeon &lt;me@josuah.net&gt;
diff --git a/drivers/video/video_mcux_csi.c b/drivers/video/video_mcux_csi.c
@@ -155,7 +155,7 @@ static int video_mcux_csi_set_fmt(const struct device *dev, enum video_endpoint_
 	status_t ret;
 	struct video_format format = *fmt;
 
-	if (!bpp || ep != VIDEO_EP_OUT) {
+	if (bpp == 0 || (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL)) {
 		return -EINVAL;
 	}
 
@@ -198,7 +198,7 @@ static int video_mcux_csi_get_fmt(const struct device *dev, enum video_endpoint_
 {
 	const struct video_mcux_csi_config *config = dev->config;
 
-	if (fmt == NULL || ep != VIDEO_EP_OUT) {
+	if (fmt == NULL || (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL)) {
 		return -EINVAL;
 	}
 
@@ -288,7 +288,7 @@ static int video_mcux_csi_enqueue(const struct device *dev, enum video_endpoint_
 	unsigned int to_read;
 	status_t ret;
 
-	if (ep != VIDEO_EP_OUT) {
+	if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {
 		return -EINVAL;
 	}
 
@@ -311,7 +311,7 @@ static int video_mcux_csi_dequeue(const struct device *dev, enum video_endpoint_
 {
 	struct video_mcux_csi_data *data = dev->data;
 
-	if (ep != VIDEO_EP_OUT) {
+	if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {
 		return -EINVAL;
 	}
 
@@ -355,7 +355,7 @@ static int video_mcux_csi_get_caps(const struct device *dev, enum video_endpoint
 	const struct video_mcux_csi_config *config = dev->config;
 	int err = -ENODEV;
 
-	if (ep != VIDEO_EP_OUT) {
+	if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {
 		return -EINVAL;
 	}
 
diff --git a/drivers/video/video_mcux_mipi_csi2rx.c b/drivers/video/video_mcux_mipi_csi2rx.c
@@ -132,7 +132,7 @@ static int mipi_csi2rx_get_fmt(const struct device *dev, enum video_endpoint_id
 {
 	const struct mipi_csi2rx_config *config = dev->config;
 
-	if (fmt == NULL || ep != VIDEO_EP_OUT) {
+	if (fmt == NULL || (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL)) {
 		return -EINVAL;
 	}
 
@@ -175,7 +175,7 @@ static int mipi_csi2rx_get_caps(const struct device *dev, enum video_endpoint_id
 {
 	const struct mipi_csi2rx_config *config = dev->config;
 
-	if (ep != VIDEO_EP_OUT) {
+	if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {
 		return -EINVAL;
 	}
 
diff --git a/drivers/video/video_stm32_dcmi.c b/drivers/video/video_stm32_dcmi.c
@@ -215,7 +215,7 @@ static int video_stm32_dcmi_set_fmt(const struct device *dev,
 	struct video_stm32_dcmi_data *data = dev->data;
 	unsigned int bpp = video_pix_fmt_bpp(fmt->pixelformat);
 
-	if (!bpp || ep != VIDEO_EP_OUT) {
+	if (bpp == 0 || (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL)) {
 		return -EINVAL;
 	}
 
@@ -238,7 +238,7 @@ static int video_stm32_dcmi_get_fmt(const struct device *dev,
 	struct video_stm32_dcmi_data *data = dev->data;
 	const struct video_stm32_dcmi_config *config = dev->config;
 
-	if ((fmt == NULL) || (ep != VIDEO_EP_OUT)) {
+	if (fmt == NULL || (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL)) {
 		return -EINVAL;
 	}
 
@@ -310,7 +310,7 @@ static int video_stm32_dcmi_enqueue(const struct device *dev,
 	struct video_stm32_dcmi_data *data = dev->data;
 	const uint32_t buffer_size = data->pitch * data->height;
 
-	if (ep != VIDEO_EP_OUT) {
+	if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {
 		return -EINVAL;
 	}
 
@@ -332,7 +332,7 @@ static int video_stm32_dcmi_dequeue(const struct device *dev,
 {
 	struct video_stm32_dcmi_data *data = dev->data;
 
-	if (ep != VIDEO_EP_OUT) {
+	if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {
 		return -EINVAL;
 	}
 
@@ -351,7 +351,7 @@ static int video_stm32_dcmi_get_caps(const struct device *dev,
 	const struct video_stm32_dcmi_config *config = dev->config;
 	int ret = -ENODEV;
 
-	if (ep != VIDEO_EP_OUT) {
+	if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {
 		return -EINVAL;
 	}
 
diff --git a/drivers/video/video_sw_generator.c b/drivers/video/video_sw_generator.c
@@ -52,7 +52,7 @@ static int video_sw_generator_set_fmt(const struct device *dev, enum video_endpo
 	struct video_sw_generator_data *data = dev->data;
 	int i = 0;
 
-	if (ep != VIDEO_EP_OUT) {
+	if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {
 		return -EINVAL;
 	}
 
@@ -79,7 +79,7 @@ static int video_sw_generator_get_fmt(const struct device *dev, enum video_endpo
 {
 	struct video_sw_generator_data *data = dev->data;
 
-	if (ep != VIDEO_EP_OUT) {
+	if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {
 		return -EINVAL;
 	}
 
@@ -171,7 +171,7 @@ static int video_sw_generator_enqueue(const struct device *dev, enum video_endpo
 {
 	struct video_sw_generator_data *data = dev->data;
 
-	if (ep != VIDEO_EP_OUT) {
+	if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {
 		return -EINVAL;
 	}
 
@@ -185,7 +185,7 @@ static int video_sw_generator_dequeue(const struct device *dev, enum video_endpo
 {
 	struct video_sw_generator_data *data = dev->data;
 
-	if (ep != VIDEO_EP_OUT) {
+	if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {
 		return -EINVAL;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ static int video_mcux_csi_set_fmt(const struct device *dev, enum video_endpoint_`
`155`	`155`	`status_t ret;`
`156`	`156`	`struct video_format format = *fmt;`
`157`	`157`
`158`		`- if (!bpp \|\| ep != VIDEO_EP_OUT) {`
	`158`	`+ if (bpp == 0 \|\| (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL)) {`
`159`	`159`	`return -EINVAL;`
`160`	`160`	`}`
`161`	`161`
`@@ -198,7 +198,7 @@ static int video_mcux_csi_get_fmt(const struct device *dev, enum video_endpoint_`
`198`	`198`	`{`
`199`	`199`	`const struct video_mcux_csi_config *config = dev->config;`
`200`	`200`
`201`		`- if (fmt == NULL \|\| ep != VIDEO_EP_OUT) {`
	`201`	`+ if (fmt == NULL \|\| (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL)) {`
`202`	`202`	`return -EINVAL;`
`203`	`203`	`}`
`204`	`204`
`@@ -288,7 +288,7 @@ static int video_mcux_csi_enqueue(const struct device *dev, enum video_endpoint_`
`288`	`288`	`unsigned int to_read;`
`289`	`289`	`status_t ret;`
`290`	`290`
`291`		`- if (ep != VIDEO_EP_OUT) {`
	`291`	`+ if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {`
`292`	`292`	`return -EINVAL;`
`293`	`293`	`}`
`294`	`294`
`@@ -311,7 +311,7 @@ static int video_mcux_csi_dequeue(const struct device *dev, enum video_endpoint_`
`311`	`311`	`{`
`312`	`312`	`struct video_mcux_csi_data *data = dev->data;`
`313`	`313`
`314`		`- if (ep != VIDEO_EP_OUT) {`
	`314`	`+ if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {`
`315`	`315`	`return -EINVAL;`
`316`	`316`	`}`
`317`	`317`
`@@ -355,7 +355,7 @@ static int video_mcux_csi_get_caps(const struct device *dev, enum video_endpoint`
`355`	`355`	`const struct video_mcux_csi_config *config = dev->config;`
`356`	`356`	`int err = -ENODEV;`
`357`	`357`
`358`		`- if (ep != VIDEO_EP_OUT) {`
	`358`	`+ if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {`
`359`	`359`	`return -EINVAL;`
`360`	`360`	`}`
`361`	`361`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ static int mipi_csi2rx_get_fmt(const struct device *dev, enum video_endpoint_id`
`132`	`132`	`{`
`133`	`133`	`const struct mipi_csi2rx_config *config = dev->config;`
`134`	`134`
`135`		`- if (fmt == NULL \|\| ep != VIDEO_EP_OUT) {`
	`135`	`+ if (fmt == NULL \|\| (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL)) {`
`136`	`136`	`return -EINVAL;`
`137`	`137`	`}`
`138`	`138`
`@@ -175,7 +175,7 @@ static int mipi_csi2rx_get_caps(const struct device *dev, enum video_endpoint_id`
`175`	`175`	`{`
`176`	`176`	`const struct mipi_csi2rx_config *config = dev->config;`
`177`	`177`
`178`		`- if (ep != VIDEO_EP_OUT) {`
	`178`	`+ if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {`
`179`	`179`	`return -EINVAL;`
`180`	`180`	`}`
`181`	`181`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ static int video_stm32_dcmi_set_fmt(const struct device *dev,`
`215`	`215`	`struct video_stm32_dcmi_data *data = dev->data;`
`216`	`216`	`unsigned int bpp = video_pix_fmt_bpp(fmt->pixelformat);`
`217`	`217`
`218`		`- if (!bpp \|\| ep != VIDEO_EP_OUT) {`
	`218`	`+ if (bpp == 0 \|\| (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL)) {`
`219`	`219`	`return -EINVAL;`
`220`	`220`	`}`
`221`	`221`
`@@ -238,7 +238,7 @@ static int video_stm32_dcmi_get_fmt(const struct device *dev,`
`238`	`238`	`struct video_stm32_dcmi_data *data = dev->data;`
`239`	`239`	`const struct video_stm32_dcmi_config *config = dev->config;`
`240`	`240`
`241`		`- if ((fmt == NULL) \|\| (ep != VIDEO_EP_OUT)) {`
	`241`	`+ if (fmt == NULL \|\| (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL)) {`
`242`	`242`	`return -EINVAL;`
`243`	`243`	`}`
`244`	`244`
`@@ -310,7 +310,7 @@ static int video_stm32_dcmi_enqueue(const struct device *dev,`
`310`	`310`	`struct video_stm32_dcmi_data *data = dev->data;`
`311`	`311`	`const uint32_t buffer_size = data->pitch * data->height;`
`312`	`312`
`313`		`- if (ep != VIDEO_EP_OUT) {`
	`313`	`+ if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {`
`314`	`314`	`return -EINVAL;`
`315`	`315`	`}`
`316`	`316`
`@@ -332,7 +332,7 @@ static int video_stm32_dcmi_dequeue(const struct device *dev,`
`332`	`332`	`{`
`333`	`333`	`struct video_stm32_dcmi_data *data = dev->data;`
`334`	`334`
`335`		`- if (ep != VIDEO_EP_OUT) {`
	`335`	`+ if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {`
`336`	`336`	`return -EINVAL;`
`337`	`337`	`}`
`338`	`338`
`@@ -351,7 +351,7 @@ static int video_stm32_dcmi_get_caps(const struct device *dev,`
`351`	`351`	`const struct video_stm32_dcmi_config *config = dev->config;`
`352`	`352`	`int ret = -ENODEV;`
`353`	`353`
`354`		`- if (ep != VIDEO_EP_OUT) {`
	`354`	`+ if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {`
`355`	`355`	`return -EINVAL;`
`356`	`356`	`}`
`357`	`357`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ static int video_sw_generator_set_fmt(const struct device *dev, enum video_endpo`
`52`	`52`	`struct video_sw_generator_data *data = dev->data;`
`53`	`53`	`int i = 0;`
`54`	`54`
`55`		`- if (ep != VIDEO_EP_OUT) {`
	`55`	`+ if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {`
`56`	`56`	`return -EINVAL;`
`57`	`57`	`}`
`58`	`58`
`@@ -79,7 +79,7 @@ static int video_sw_generator_get_fmt(const struct device *dev, enum video_endpo`
`79`	`79`	`{`
`80`	`80`	`struct video_sw_generator_data *data = dev->data;`
`81`	`81`
`82`		`- if (ep != VIDEO_EP_OUT) {`
	`82`	`+ if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {`
`83`	`83`	`return -EINVAL;`
`84`	`84`	`}`
`85`	`85`
`@@ -171,7 +171,7 @@ static int video_sw_generator_enqueue(const struct device *dev, enum video_endpo`
`171`	`171`	`{`
`172`	`172`	`struct video_sw_generator_data *data = dev->data;`
`173`	`173`
`174`		`- if (ep != VIDEO_EP_OUT) {`
	`174`	`+ if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {`
`175`	`175`	`return -EINVAL;`
`176`	`176`	`}`
`177`	`177`
`@@ -185,7 +185,7 @@ static int video_sw_generator_dequeue(const struct device *dev, enum video_endpo`
`185`	`185`	`{`
`186`	`186`	`struct video_sw_generator_data *data = dev->data;`
`187`	`187`
`188`		`- if (ep != VIDEO_EP_OUT) {`
	`188`	`+ if (ep != VIDEO_EP_OUT && ep != VIDEO_EP_ALL) {`
`189`	`189`	`return -EINVAL;`
`190`	`190`	`}`
`191`	`191`