On Sat, 21 Feb 2009 21:22:22 -0500 Andy Walls <awalls@xxxxxxxxx> wrote: > Mauro, > > Please pull from: > > http://linuxtv.org/hug/~awalls/cx18 > > for the following: > > cx18: Disable AC3 controls as the firmware doesn't support AC3 > cx18: Increment version number due to significant changes for v4l2_subdevs > cx18: Get rid of unused variables related to video output > cx18: Change log lines for internal subdevs and fix tveeprom reads + strncpy(c.name, "cx18 tveeprom tmp", sizeof(c.name)); + c.name[sizeof(c.name)-1] = '\0'; Please use strlcpy() instead. > cx18: Fix a memory leak of buffers used for sliced VBI insertion > cx18: Convert GPIO connected functions to act as v4l2_subdevices > cx18: Convert I2C devices to v4l2_subdevices > cx18, v4l2-chip-ident: Finish conversion of AV decoder core to v4l2_subdev > cx18: Slim down instance handling, build names from v4l2_device.name > cx18: Convert the integrated A/V decoder core interface to a v4l2_subdev > > This is the conversion of cx18 to the new v4l_device/v4l2_subdev > framework, along with a few minor changes. (Note, I added a new value > in v4l2-chip-ident, outside of the cx18 directory.) > > This set of changes will conflict with Hans' recent pull request that > affects cx18-av-core.c. If your merge tools can't detect that the code > Hans intends to patch simply differs in position by about 20 lines, then > Hans' changes to cx18-av-core.c still should be easy enough to merge by > hand. There were some merge conflicts. I've fixed it by hand, but I suspect that you'll need to properly tune the default values for v4l2_ctrl_query_fill(). Please review my last patch and fix it accordingly with the limits of each V4L2_CID. Cheers, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html