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

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

Merge "msm: ultrasound: Add Sync Gesture data format"

parents 3e9b471e 9ac80d41

arch/arm/mach-msm/qdsp6v2/ultrasound/q6usm.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#define FORMAT_USPS_EPOS	0x00000000

#define FORMAT_USRAW		0x00000001

#define FORMAT_USPROX		0x00000002

#define FORMAT_USRAW_SYNC	0x00000003

#define INVALID_FORMAT		0xffffffff



#define IN			0x000

arch/arm/mach-msm/qdsp6v2/ultrasound/q6usm_b.c

+3 −0
Original line number Diff line number Diff line
@@ -628,6 +628,9 @@ static uint32_t q6usm_ext2int_format(uint32_t ext_format) 
	case FORMAT_USPROX:

		int_format = US_PROX_FORMAT_V2;

		break;

	case FORMAT_USRAW_SYNC:

		int_format = US_RAW_SYNC_FORMAT;

		break;

	default:

		pr_err("%s: Invalid format[%d]\n", __func__, ext_format);

		break;

include/sound/apr_audio-v2.h

+1 −0
Original line number Diff line number Diff line
@@ -6993,5 +6993,6 @@ struct afe_svc_cmd_set_clip_bank_selection { 
#define US_POINT_EPOS_FORMAT_V2 0x0001272D

#define US_RAW_FORMAT_V2        0x0001272C

#define US_PROX_FORMAT_V2       0x0001272E

#define US_RAW_SYNC_FORMAT      0x0001272F



#endif /*_APR_AUDIO_V2_H_ */