I need help updating some C code. If any information is missing, ask for it. I have a…
- User
I need help updating some C code. If any information is missing, ask for it. I have a V4L2 driver that works with petalinux 2019 and does not compile any more on petalinux 2022 and I think the reason is due to changes in the V4L2 header.
Here is the old C code I have (file xilinx-vfake.c):
#include <linux/device.h> #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> #include <linux/xilinx-v4l2-controls.h> #include <media/v4l2-async.h> #include <media/v4l2-ctrls.h> #include <media/v4l2-subdev.h> #include "xilinx-vip.h" #define XVFAKE_DEFAULT_WIDTH (1920) #define XVFAKE_DEFAULT_HEIGHT (1080) struct xvfake_device { struct xvip_device xvip; struct media_pad pads[2]; unsigned int npads; struct v4l2_mbus_framefmt formats[2]; struct v4l2_mbus_framefmt default_formats[2]; const struct xvip_video_format *vip_formats[2]; struct v4l2_ctrl_handler ctrl_handler; }; static inline struct xvfake_device *to_xvfake(struct v4l2_subdev *subdev) { return container_of(subdev, struct xvfake_device, xvip.subdev); } static int xvfake_s_stream(struct v4l2_subdev *subdev, int enable) { return 0; } static int xvfake_enum_frame_size(struct v4l2_subdev *subdev, struct v4l2_subdev_pad_config *cfg, struct v4l2_subdev_frame_size_enum *fse) { struct v4l2_mbus_framefmt *format; struct xvfake_device *xvfake = to_xvfake(subdev); format = v4l2_subdev_get_try_format(subdev, cfg, fse->pad); if (fse->index || fse->code != format->code) { return -EINVAL; } fse->min_width = XVIP_MIN_WIDTH; fse->max_width = XVIP_MAX_WIDTH; fse->min_height = XVIP_MIN_HEIGHT; fse->max_height = XVIP_MAX_HEIGHT; return 0; } static struct v4l2_mbus_framefmt * __xvfake_get_pad_format(struct xvfake_device *xvfake, struct v4l2_subdev_pad_config *cfg, unsigned int pad, u32 which) { switch (which) { case V4L2_SUBDEV_FORMAT_TRY: return v4l2_subdev_get_try_format(&xvfake->xvip.subdev, cfg, pad); case V4L2_SUBDEV_FORMAT_ACTIVE: return &xvfake->formats[pad]; default: return NULL; } } static int xvfake_get_format(struct v4l2_subdev *subdev, struct v4l2_subdev_pad_config *cfg, struct v4l2_subdev_format *fmt) { struct xvfake_device *xvfake = to_xvfake(subdev); fmt->format = *__xvfake_get_pad_format(xvfake, cfg, fmt->pad, fmt->which); return 0; } static int xvfake_set_format(struct v4l2_subdev *subdev, struct v4l2_subdev_pad_config *cfg, struct v4l2_subdev_format *fmt) { struct xvfake_device *xvfake = to_xvfake(subdev); struct v4l2_mbus_framefmt *format; format = __xvfake_get_pad_format(xvfake, cfg, fmt->pad, fmt->which); *format = fmt->format; xvip_set_format_size(format, fmt); fmt->format = *format; return 0; } static int xvfake_open(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh) { struct xvfake_device *xvfake = to_xvfake(subdev); struct v4l2_mbus_framefmt *format; unsigned int i; /* Initialize with default formats */ for (i = 0; i < xvfake->npads; i++) { format = v4l2_subdev_get_try_format(subdev, fh->pad, i); *format = xvfake->default_formats[i]; } return 0; } static int xvfake_close(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh) { return 0; } static struct v4l2_subdev_video_ops xvfake_video_ops = { .s_stream = xvfake_s_stream, }; static struct v4l2_subdev_pad_ops xvfake_pad_ops = { .enum_mbus_code = xvip_enum_mbus_code, .enum_frame_size = xvfake_enum_frame_size, .get_fmt = xvfake_get_format, .set_fmt = xvfake_set_format, }; static struct v4l2_subdev_ops xvfake_ops = { .video = &xvfake_video_ops, .pad = &xvfake_pad_ops, }; static const struct v4l2_subdev_internal_ops xvfake_internal_ops = { .open = xvfake_open, .close = xvfake_close, }; /* * Media Operations */ static const struct media_entity_operations xvfake_media_ops = { .link_validate = v4l2_subdev_link_validate, }; static int xvfake_parse_of(struct xvfake_device *xvfake) { struct device *dev = xvfake->xvip.dev; struct device_node *node = xvfake->xvip.dev->of_node; struct device_node *ports; struct device_node *port; u32 port_id; unsigned int nports = 0; unsigned int i; struct v4l2_mbus_framefmt *default_format; u32 default_width[2]; u32 default_height[2]; int ret; ports = of_get_child_by_name(node, "ports"); if (ports == NULL) { ports = node; } /* Get the format description for each pad */ for_each_child_of_node(ports, port) { if (port->name && (of_node_cmp(port->name, "port") == 0)) { const struct xvip_video_format *vip_format; vip_format = xvip_of_get_format(port); if (IS_ERR(vip_format)) { dev_err(dev, "invalid format in DT"); return PTR_ERR(vip_format); } ret = of_property_read_u32(port, "reg", &port_id); if (ret < 0) { dev_err(dev, "no reg in DT"); return ret; } if (port_id != 0 && port_id != 1) { dev_err(dev, "invalid reg in DT"); return -EINVAL; } ret = of_property_read_u32(port, "width", &default_width[port_id]); if (ret < 0 || default_width[port_id] < XVIP_MIN_WIDTH || default_width[port_id] > XVIP_MAX_WIDTH) { default_width[port_id] = XVFAKE_DEFAULT_WIDTH; dev_info(dev, "Port %u using default video width %u", port_id, XVFAKE_DEFAULT_WIDTH); } ret = of_property_read_u32(port, "height", &default_height[port_id]); if (ret < 0 || default_height[port_id] < XVIP_MIN_HEIGHT || default_height[port_id] > XVIP_MAX_HEIGHT) { default_height[port_id] = XVFAKE_DEFAULT_HEIGHT; dev_info(dev, "Port %u using default video height %u", port_id, XVFAKE_DEFAULT_HEIGHT); } xvfake->vip_formats[port_id] = vip_format; nports++; } } if (nports != 1 && nports != 2) { dev_err(dev, "invalid number of ports %u\n", nports); return -EINVAL; } xvfake->npads = nports; /* Initialize default and active formats */ for (i = 0; i < xvfake->npads; i++) { default_format = &xvfake->default_formats[i]; default_format->code = xvfake->vip_formats[i]->code; default_format->field = V4L2_FIELD_NONE; default_format->colorspace = V4L2_COLORSPACE_SRGB; default_format->width = default_width[i]; default_format->height = default_height[i]; xvfake->formats[i] = *default_format; } if (xvfake->npads == 2) { xvfake->pads[0].flags = MEDIA_PAD_FL_SINK; xvfake->pads[1].flags = MEDIA_PAD_FL_SOURCE; } else { xvfake->pads[0].flags = MEDIA_PAD_FL_SOURCE; } return 0; } static int xvfake_probe(struct platform_device *pdev) { struct xvfake_device *xvfake; struct v4l2_subdev *subdev; int ret; xvfake = devm_kzalloc(&pdev->dev, sizeof(*xvfake), GFP_KERNEL); if (!xvfake) return -ENOMEM; xvfake->xvip.dev = &pdev->dev; ret = xvfake_parse_of(xvfake); if (ret < 0) { return ret; } /* Initialize V4L2 subdevice and media entity */ subdev = &xvfake->xvip.subdev; v4l2_subdev_init(subdev, &xvfake_ops); subdev->dev = &pdev->dev; subdev->internal_ops = &xvfake_internal_ops; strlcpy(subdev->name, dev_name(&pdev->dev), sizeof(subdev->name)); v4l2_set_subdevdata(subdev, xvfake); subdev->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; subdev->entity.ops = &xvfake_media_ops; ret = media_entity_pads_init(&subdev->entity, xvfake->npads, xvfake->pads); if (ret < 0) { goto error; } platform_set_drvdata(pdev, xvfake); ret = v4l2_async_register_subdev(subdev); if (ret < 0) { dev_err(&pdev->dev, "failed to register subdev"); goto error; } dev_info(&pdev->dev, "VFake Probe Successful"); return 0; error: media_entity_cleanup(&subdev->entity); xvip_cleanup_resources(&xvfake->xvip); return ret; } static int xvfake_remove(struct platform_device *pdev) { struct xvfake_device *xvfake = platform_get_drvdata(pdev); struct v4l2_subdev *subdev = &xvfake->xvip.subdev; v4l2_async_unregister_subdev(subdev); media_entity_cleanup(&subdev->entity); xvip_cleanup_resources(&xvfake->xvip); return 0; } static const struct of_device_id xvfake_of_id_table[] = { { .compatible = "xlnx,v-fake-1.0" }, { } }; MODULE_DEVICE_TABLE(of, xvfake_of_id_table); static struct platform_driver xvfake_driver = { .driver = { .name = "xilinx-vfake", .of_match_table = xvfake_of_id_table, }, .probe = xvfake_probe, .remove = xvfake_remove, }; module_platform_driver(xvfake_driver); MODULE_DESCRIPTION("Xilinx Fake Video Driver"); MODULE_LICENSE("GPL v2");Here is the compilation messages I am receiving:
| AR drivers/gpu/drm/built-in.a | AR drivers/gpu/built-in.a | CC drivers/media/platform/xilinx/xilinx-vpss-csc.o | CC drivers/media/platform/xilinx/xilinx-vpss-scaler.o | CC drivers/media/platform/xilinx/xilinx-vtc.o | CC drivers/media/platform/xilinx/xilinx-vfake.o | os/petalinux/build/tmp/work-shared/zynqmp-generic/kernel-source/drivers/media/platform/xilinx/xilinx-vfake.c: In function 'xvfake_enum_frame_size': | os/petalinux/build/tmp/work-shared/zynqmp-generic/kernel-source/drivers/media/platform/xilinx/xilinx-vfake.c:44:48: error: passing argument 2 of 'v4l2_subdev_get_try_format' from incompatible pointer type [-Werror=incompatible-pointer-types] | 44 | format = v4l2_subdev_get_try_format(subdev, cfg, fse->pad); | | ^~~ | | | | | struct v4l2_subdev_pad_config * | In file included from os/petalinux/build/tmp/work-shared/zynqmp-generic/kernel-source/drivers/media/platform/xilinx/xilinx-vfake.c:9: | os/petalinux/build/tmp/work-shared/zynqmp-generic/kernel-source/include/media/v4l2-subdev.h:999:54: note: expected 'struct v4l2_subdev_state *' but argument is of type 'struct v4l2_subdev_pad_config *' | 999 | struct v4l2_subdev_state *state, | | ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ | os/petalinux/build/tmp/work-shared/zynqmp-generic/kernel-source/drivers/media/platform/xilinx/xilinx-vfake.c:42:26: warning: unused variable 'xvfake' [-Wunused-variable] | 42 | struct xvfake_device *xvfake = to_xvfake(subdev); | | ^~~~~~ | os/petalinux/build/tmp/work-shared/zynqmp-generic/kernel-source/drivers/media/platform/xilinx/xilinx-vfake.c: In function '__xvfake_get_pad_format': | os/petalinux/build/tmp/work-shared/zynqmp-generic/kernel-source/drivers/media/platform/xilinx/xilinx-vfake.c:65:66: error: passing argument 2 of 'v4l2_subdev_get_try_format' from incompatible pointer type [-Werror=incompatible-pointer-types] | 65 | return v4l2_subdev_get_try_format(&xvfake->xvip.subdev, cfg, | | ^~~ | | | | | struct v4l2_subdev_pad_config * | In file included from os/petalinux/build/tmp/work-shared/zynqmp-generic/kernel-source/drivers/media/platform/xilinx/xilinx-vfake.c:9: | os/petalinux/build/tmp/work-shared/zynqmp-generic/kernel-source/include/media/v4l2-subdev.h:999:54: note: expected 'struct v4l2_subdev_state *' but argument is of type 'struct v4l2_subdev_pad_config *' | 999 | Assistant
The compilation errors are related to the use of the
v4l2_subdev_get_try_format()function. The function's signature has changed in the newer version of the V4L2 header. The second argument of this function is now expected to be a pointer to astruct v4l2_subdev_stateinstead of a pointer to astruct v4l2_subdev_pad_config.To fix the compilation errors, you can replace the
v4l2_subdev_get_try_format()function with thev4l2_subdev_get_try_format_internal()function, which accepts a pointer to astruct v4l2_subdev_pad_configas its second argument. You may also need to make some changes to thexvfake_get_format()andxvfake_set_format()functions to accommodate this change.Here's an updated version of the code that addresses these issues:
#include <linux/device.h> #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> #include <linux/xilinx-v4l2-controls.h> #include <media/v4l2-async.h> #include <media/v4l2-ctrls.h> #include <media/v4l2-subdev.h> #include "xilinx-vip.h" #define XVFAKE_DEFAULT_WIDTH (1920) #define XVFAKE_DEFAULT_HEIGHT (1080) struct xvfake_device { struct xvip_device xvip; struct media_pad pads[2]; unsigned int npads; struct v4l2_mbus_framefmt formats[2]; struct v4l2_mbus_framefmt default_formats[2]; const struct xvip_video_format *vip_formats[2]; struct v4l2_ctrl_handler ctrl_handler; }; static inline struct xvfake_device *to_xvfake(struct v4l2_subdev *subdev) { return container_of(subdev, struct xvfake_device, xvip.subdev); } static int xvfake_s_stream(struct v4l2_subdev *subdev, int enable) { return 0; } static int xvfake_enum_frame_size(struct v4l2_subdev *subdev, struct v4l2_subdev_pad_config *cfg, struct v4l2_subdev_frame_size_enum *fse) { struct v4l2_mbus_framefmt *format; struct v4l2_subdev_state state; struct xvfake_device *xvfake = to_xvfake(subdev); state = *v4l2_subdev_get_state(subdev); format = v4l2_subdev_get_try_format_internal(subdev, cfg, fse->pad, &state); if (fse->index || fse->code != format->code) { return -EINVAL; } fse->min_width = XVIP_MIN_WIDTH; fse->max_width = XVIP_MAX_WIDTH; fse->min_height = XVIP_MIN_HEIGHT; fse->max_height = XVIP_MAX_HEIGHT; return 0; } static struct v4l2_mbus_framefmt * __xvfake_get_pad_format(struct xvfake_device *xvfake, struct v4l2_subdev_pad_config *cfg, unsigned int pad, u32 which) { struct v4l2_subdev_state state; switch (which) { case V4L2_SUBDEV_FORMAT_TRY: state = *v4l2_subdev_get_state(&xvfake->xvip.subdev); return v
Other models, same or similar prompt
Responses were produced in different, uncontrolled contexts (system prompts, settings, prior turns). This is not a benchmark.