Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87905821 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "radio-iris: Enable bit mask for program service simple"

parents 68e59426 cd978016

drivers/media/radio/radio-iris.c

+2 −2
Original line number Diff line number Diff line
@@ -3508,7 +3508,7 @@ static int iris_vidioc_g_ctrl(struct file *file, void *priv, 
		break;

	case V4L2_CID_PRIVATE_IRIS_RDSGROUP_PROC:

	case V4L2_CID_PRIVATE_IRIS_PSALL:

		ctrl->value = (radio->g_rds_grp_proc_ps << RDS_CONFIG_OFFSET);

		ctrl->value = radio->g_rds_grp_proc_ps;

		break;

	case V4L2_CID_PRIVATE_IRIS_RDSD_BUF:

		ctrl->value = radio->rds_grp.rds_buf_size;
@@ -4361,7 +4361,7 @@ static int iris_vidioc_s_ctrl(struct file *file, void *priv, 
		break;

	case V4L2_CID_PRIVATE_IRIS_PSALL:

		saved_val = radio->g_rds_grp_proc_ps;

		rds_grps_proc = (ctrl->value << RDS_PS_OFFSET);

		rds_grps_proc = (ctrl->value << RDS_PS_SIMPLE_OFFSET);

		radio->g_rds_grp_proc_ps |= rds_grps_proc;

		retval = hci_fm_rds_grps_process(

				&radio->g_rds_grp_proc_ps,

include/uapi/media/radio-iris.h

+2 −0
Original line number Diff line number Diff line
@@ -610,6 +610,8 @@ struct hci_fm_spur_data { 
#define AF_LIST_OFFSET 7

#define RT_A_B_FLAG_OFFSET 4

#define RDS_PS_OFFSET  1

#define RDS_PS_SIMPLE_OFFSET 2



/*FM states*/



enum radio_state_t {