Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

iio.h here needs to be synced to upstream kernel. #1130

Closed
rgetz opened this issue Jan 24, 2024 · 2 comments · Fixed by #1132
Closed

iio.h here needs to be synced to upstream kernel. #1130

rgetz opened this issue Jan 24, 2024 · 2 comments · Fixed by #1132

Comments

@rgetz
Copy link
Contributor

rgetz commented Jan 24, 2024 

looking for iio_chan_type
Differences in iio_chan_type
none
looking for iio_modifier
Differences in iio_modifier
--- /tmp/libiio_iio_modifier	2024-01-24 13:07:49.996757506 +0000
+++ /tmp/kernel_iio_modifier	2024-01-24 13:07:49.996757506 +0000
@@ -35,6 +35,8 @@
 	IIO_MOD_CO2,
 	IIO_MOD_VOC,
 	IIO_MOD_LIGHT_UV,
+	IIO_MOD_LIGHT_UVA,
+	IIO_MOD_LIGHT_UVB,
 	IIO_MOD_LIGHT_DUV,
 	IIO_MOD_PM1,
 	IIO_MOD_PM2P5,
difference between upstream kernel types.h and iio.h in iio_modifier
looking for iio_event_type
Differences in iio_event_type
none
looking for iio_event_direction
Differences in iio_event_direction
none

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/linux/iio/types.h includes those two.

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/iio/industrialio-core.c
says names should be:

[IIO_MOD_LIGHT_UVA] = "uva",
[IIO_MOD_LIGHT_UVB] = "uvb",
@rgetz
Copy link
Contributor Author

rgetz commented Jan 24, 2024

Looks like (correctly) they should be added to the end, not in the middle...

https://lore.kernel.org/all/20240123-uva_uvb_fix-v1-1-5b9c25d50d90@gmail.com/T/

pcercuei added a commit that referenced this issue Jan 25, 2024
@pcercuei
iio.h: Add IIO_MOD_LIGHT_UVA/UVB modifiers
32a64cd 
Add the IIO_MOD_LIGHT_UVA and IIO_MOD_LIGHT_UVB modifiers that will be
introduced in Linux v6.8.

Note that Linux v6.8-rc1 added those entries in the middle of the
iio_modifier enum (which is wrong as it breaks ABI), but it will be
fixed for the regular v6.8 release.

Fixes #1130.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
@pcercuei pcercuei mentioned this issue Jan 25, 2024
Merged
@rgetz
Copy link
Contributor Author

rgetz commented Jan 25, 2024

Closing based on #1132

@rgetz rgetz closed this as completed Jan 25, 2024
pcercuei added a commit that referenced this issue Jan 25, 2024
@pcercuei
iio.h: Add IIO_MOD_LIGHT_UVA/UVB modifiers
1af94f2 
Add the IIO_MOD_LIGHT_UVA and IIO_MOD_LIGHT_UVB modifiers that will be
introduced in Linux v6.8.

Note that Linux v6.8-rc1 added those entries in the middle of the
iio_modifier enum (which is wrong as it breaks ABI), but it will be
fixed for the regular v6.8 release.

Fixes #1130.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

iio.h: Add IIO_MOD_LIGHT_UVA/UVB modifiers analogdevicesinc/libiio
1 participant
@rgetz