* [PATCH for v4.5] media.h: increase the spacing between function ranges
@ 2016-02-11 14:28 Hans Verkuil
2016-02-15 11:10 ` Sakari Ailus
2016-02-29 2:21 ` Laurent Pinchart
0 siblings, 2 replies; 4+ messages in thread
From: Hans Verkuil @ 2016-02-11 14:28 UTC (permalink / raw)
To: linux-media, Laurent Pinchart, Mauro Carvalho Chehab
Each function range is quite narrow and especially for connectors this
will pose a problem. Increase the function ranges while we still can and
move the connector range to the end so that range is practically limitless.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
include/uapi/linux/media.h | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index c9eb42a..a300a33 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h
@@ -72,21 +72,11 @@ struct media_device_info {
#define MEDIA_ENT_F_DTV_NET_DECAP (MEDIA_ENT_F_BASE + 4)
/*
- * Connectors
- */
-/* It is a responsibility of the entity drivers to add connectors and links */
-#define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 21)
-#define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 22)
-#define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 23)
-/* For internal test signal generators and other debug connectors */
-#define MEDIA_ENT_F_CONN_TEST (MEDIA_ENT_F_BASE + 24)
-
-/*
* I/O entities
*/
-#define MEDIA_ENT_F_IO_DTV (MEDIA_ENT_F_BASE + 31)
-#define MEDIA_ENT_F_IO_VBI (MEDIA_ENT_F_BASE + 32)
-#define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 33)
+#define MEDIA_ENT_F_IO_DTV (MEDIA_ENT_F_BASE + 1001)
+#define MEDIA_ENT_F_IO_VBI (MEDIA_ENT_F_BASE + 1002)
+#define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 1003)
/*
* Analog TV IF-PLL decoders
@@ -94,8 +84,18 @@ struct media_device_info {
* It is a responsibility of the master/bridge drivers to create links
* for MEDIA_ENT_F_IF_VID_DECODER and MEDIA_ENT_F_IF_AUD_DECODER.
*/
-#define MEDIA_ENT_F_IF_VID_DECODER (MEDIA_ENT_F_BASE + 41)
-#define MEDIA_ENT_F_IF_AUD_DECODER (MEDIA_ENT_F_BASE + 42)
+#define MEDIA_ENT_F_IF_VID_DECODER (MEDIA_ENT_F_BASE + 2001)
+#define MEDIA_ENT_F_IF_AUD_DECODER (MEDIA_ENT_F_BASE + 2002)
+
+/*
+ * Connectors
+ */
+/* It is a responsibility of the entity drivers to add connectors and links */
+#define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 10001)
+#define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 10002)
+#define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 10003)
+/* For internal test signal generators and other debug connectors */
+#define MEDIA_ENT_F_CONN_TEST (MEDIA_ENT_F_BASE + 10004)
/*
* Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and
--
2.7.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH for v4.5] media.h: increase the spacing between function ranges
2016-02-11 14:28 [PATCH for v4.5] media.h: increase the spacing between function ranges Hans Verkuil
@ 2016-02-15 11:10 ` Sakari Ailus
2016-02-29 2:21 ` Laurent Pinchart
1 sibling, 0 replies; 4+ messages in thread
From: Sakari Ailus @ 2016-02-15 11:10 UTC (permalink / raw)
To: Hans Verkuil; +Cc: linux-media, Laurent Pinchart, Mauro Carvalho Chehab
Hi Hans,
On Thu, Feb 11, 2016 at 03:28:55PM +0100, Hans Verkuil wrote:
> Each function range is quite narrow and especially for connectors this
> will pose a problem. Increase the function ranges while we still can and
> move the connector range to the end so that range is practically limitless.
>
> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
> ---
> include/uapi/linux/media.h | 30 +++++++++++++++---------------
> 1 file changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
> index c9eb42a..a300a33 100644
> --- a/include/uapi/linux/media.h
> +++ b/include/uapi/linux/media.h
> @@ -72,21 +72,11 @@ struct media_device_info {
> #define MEDIA_ENT_F_DTV_NET_DECAP (MEDIA_ENT_F_BASE + 4)
>
> /*
> - * Connectors
> - */
> -/* It is a responsibility of the entity drivers to add connectors and links */
> -#define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 21)
> -#define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 22)
> -#define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 23)
> -/* For internal test signal generators and other debug connectors */
> -#define MEDIA_ENT_F_CONN_TEST (MEDIA_ENT_F_BASE + 24)
> -
> -/*
> * I/O entities
> */
> -#define MEDIA_ENT_F_IO_DTV (MEDIA_ENT_F_BASE + 31)
> -#define MEDIA_ENT_F_IO_VBI (MEDIA_ENT_F_BASE + 32)
> -#define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 33)
> +#define MEDIA_ENT_F_IO_DTV (MEDIA_ENT_F_BASE + 1001)
> +#define MEDIA_ENT_F_IO_VBI (MEDIA_ENT_F_BASE + 1002)
> +#define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 1003)
>
> /*
> * Analog TV IF-PLL decoders
> @@ -94,8 +84,18 @@ struct media_device_info {
> * It is a responsibility of the master/bridge drivers to create links
> * for MEDIA_ENT_F_IF_VID_DECODER and MEDIA_ENT_F_IF_AUD_DECODER.
> */
> -#define MEDIA_ENT_F_IF_VID_DECODER (MEDIA_ENT_F_BASE + 41)
> -#define MEDIA_ENT_F_IF_AUD_DECODER (MEDIA_ENT_F_BASE + 42)
> +#define MEDIA_ENT_F_IF_VID_DECODER (MEDIA_ENT_F_BASE + 2001)
> +#define MEDIA_ENT_F_IF_AUD_DECODER (MEDIA_ENT_F_BASE + 2002)
> +
> +/*
> + * Connectors
> + */
> +/* It is a responsibility of the entity drivers to add connectors and links */
> +#define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 10001)
> +#define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 10002)
> +#define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 10003)
> +/* For internal test signal generators and other debug connectors */
> +#define MEDIA_ENT_F_CONN_TEST (MEDIA_ENT_F_BASE + 10004)
>
> /*
> * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and
We have MEDIA_ENT_F_BASE used for all of these at the moment while we have
plenty of room in the 32-bit space. How about adding a new base for each
group, after MEDIA_ENT_F_OLD_SUBDEV_BASE? Each range would have 2^16 items.
What do you think?
--
Kind regards,
Sakari Ailus
e-mail: sakari.ailus@iki.fi XMPP: sailus@retiisi.org.uk
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH for v4.5] media.h: increase the spacing between function ranges
2016-02-11 14:28 [PATCH for v4.5] media.h: increase the spacing between function ranges Hans Verkuil
2016-02-15 11:10 ` Sakari Ailus
@ 2016-02-29 2:21 ` Laurent Pinchart
2016-02-29 7:52 ` Hans Verkuil
1 sibling, 1 reply; 4+ messages in thread
From: Laurent Pinchart @ 2016-02-29 2:21 UTC (permalink / raw)
To: Hans Verkuil; +Cc: linux-media, Mauro Carvalho Chehab
Hi Hans,
Thank you for the patch.
On Thursday 11 February 2016 15:28:55 Hans Verkuil wrote:
> Each function range is quite narrow and especially for connectors this
> will pose a problem. Increase the function ranges while we still can and
> move the connector range to the end so that range is practically limitless.
>
> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
It looks like this got applied without taking Sakari's comments into account.
Furthermore, I believe the IDs you use below will be confusing, as the base is
a hex value and the offset a decimal value. It would making debugging much
easier if both used hex values.
> ---
> include/uapi/linux/media.h | 30 +++++++++++++++---------------
> 1 file changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
> index c9eb42a..a300a33 100644
> --- a/include/uapi/linux/media.h
> +++ b/include/uapi/linux/media.h
> @@ -72,21 +72,11 @@ struct media_device_info {
> #define MEDIA_ENT_F_DTV_NET_DECAP (MEDIA_ENT_F_BASE + 4)
>
> /*
> - * Connectors
> - */
> -/* It is a responsibility of the entity drivers to add connectors and links
> */ -#define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 21)
> -#define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 22)
> -#define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 23)
> -/* For internal test signal generators and other debug connectors */
> -#define MEDIA_ENT_F_CONN_TEST (MEDIA_ENT_F_BASE + 24)
> -
> -/*
> * I/O entities
> */
> -#define MEDIA_ENT_F_IO_DTV (MEDIA_ENT_F_BASE + 31)
> -#define MEDIA_ENT_F_IO_VBI (MEDIA_ENT_F_BASE + 32)
> -#define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 33)
> +#define MEDIA_ENT_F_IO_DTV (MEDIA_ENT_F_BASE + 1001)
> +#define MEDIA_ENT_F_IO_VBI (MEDIA_ENT_F_BASE + 1002)
> +#define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 1003)
>
> /*
> * Analog TV IF-PLL decoders
> @@ -94,8 +84,18 @@ struct media_device_info {
> * It is a responsibility of the master/bridge drivers to create links
> * for MEDIA_ENT_F_IF_VID_DECODER and MEDIA_ENT_F_IF_AUD_DECODER.
> */
> -#define MEDIA_ENT_F_IF_VID_DECODER (MEDIA_ENT_F_BASE + 41)
> -#define MEDIA_ENT_F_IF_AUD_DECODER (MEDIA_ENT_F_BASE + 42)
> +#define MEDIA_ENT_F_IF_VID_DECODER (MEDIA_ENT_F_BASE + 2001)
> +#define MEDIA_ENT_F_IF_AUD_DECODER (MEDIA_ENT_F_BASE + 2002)
> +
> +/*
> + * Connectors
> + */
> +/* It is a responsibility of the entity drivers to add connectors and links
> */ +#define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 10001)
> +#define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 10002)
> +#define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 10003)
> +/* For internal test signal generators and other debug connectors */
> +#define MEDIA_ENT_F_CONN_TEST (MEDIA_ENT_F_BASE + 10004)
>
> /*
> * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH for v4.5] media.h: increase the spacing between function ranges
2016-02-29 2:21 ` Laurent Pinchart
@ 2016-02-29 7:52 ` Hans Verkuil
0 siblings, 0 replies; 4+ messages in thread
From: Hans Verkuil @ 2016-02-29 7:52 UTC (permalink / raw)
To: Laurent Pinchart; +Cc: linux-media, Mauro Carvalho Chehab
On 02/29/2016 03:21 AM, Laurent Pinchart wrote:
> Hi Hans,
>
> Thank you for the patch.
>
> On Thursday 11 February 2016 15:28:55 Hans Verkuil wrote:
>> Each function range is quite narrow and especially for connectors this
>> will pose a problem. Increase the function ranges while we still can and
>> move the connector range to the end so that range is practically limitless.
>>
>> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
>
> It looks like this got applied without taking Sakari's comments into account.
I saw that, but I think the ranges are large enough so I didn't change it.
> Furthermore, I believe the IDs you use below will be confusing, as the base is
> a hex value and the offset a decimal value. It would making debugging much
> easier if both used hex values.
That's a good point. I'll make a patch to convert it to hex (add 0x).
Regards,
Hans
>
>> ---
>> include/uapi/linux/media.h | 30 +++++++++++++++---------------
>> 1 file changed, 15 insertions(+), 15 deletions(-)
>>
>> diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
>> index c9eb42a..a300a33 100644
>> --- a/include/uapi/linux/media.h
>> +++ b/include/uapi/linux/media.h
>> @@ -72,21 +72,11 @@ struct media_device_info {
>> #define MEDIA_ENT_F_DTV_NET_DECAP (MEDIA_ENT_F_BASE + 4)
>>
>> /*
>> - * Connectors
>> - */
>> -/* It is a responsibility of the entity drivers to add connectors and links
>> */ -#define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 21)
>> -#define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 22)
>> -#define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 23)
>> -/* For internal test signal generators and other debug connectors */
>> -#define MEDIA_ENT_F_CONN_TEST (MEDIA_ENT_F_BASE + 24)
>> -
>> -/*
>> * I/O entities
>> */
>> -#define MEDIA_ENT_F_IO_DTV (MEDIA_ENT_F_BASE + 31)
>> -#define MEDIA_ENT_F_IO_VBI (MEDIA_ENT_F_BASE + 32)
>> -#define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 33)
>> +#define MEDIA_ENT_F_IO_DTV (MEDIA_ENT_F_BASE + 1001)
>> +#define MEDIA_ENT_F_IO_VBI (MEDIA_ENT_F_BASE + 1002)
>> +#define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 1003)
>>
>> /*
>> * Analog TV IF-PLL decoders
>> @@ -94,8 +84,18 @@ struct media_device_info {
>> * It is a responsibility of the master/bridge drivers to create links
>> * for MEDIA_ENT_F_IF_VID_DECODER and MEDIA_ENT_F_IF_AUD_DECODER.
>> */
>> -#define MEDIA_ENT_F_IF_VID_DECODER (MEDIA_ENT_F_BASE + 41)
>> -#define MEDIA_ENT_F_IF_AUD_DECODER (MEDIA_ENT_F_BASE + 42)
>> +#define MEDIA_ENT_F_IF_VID_DECODER (MEDIA_ENT_F_BASE + 2001)
>> +#define MEDIA_ENT_F_IF_AUD_DECODER (MEDIA_ENT_F_BASE + 2002)
>> +
>> +/*
>> + * Connectors
>> + */
>> +/* It is a responsibility of the entity drivers to add connectors and links
>> */ +#define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 10001)
>> +#define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 10002)
>> +#define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 10003)
>> +/* For internal test signal generators and other debug connectors */
>> +#define MEDIA_ENT_F_CONN_TEST (MEDIA_ENT_F_BASE + 10004)
>>
>> /*
>> * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-02-29 7:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-11 14:28 [PATCH for v4.5] media.h: increase the spacing between function ranges Hans Verkuil
2016-02-15 11:10 ` Sakari Ailus
2016-02-29 2:21 ` Laurent Pinchart
2016-02-29 7:52 ` Hans Verkuil
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox