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

Commit 6671f8a5 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 a4ff3e32 bdbf4329

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

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

#define FORMAT_USRAW		0x00000001

#define FORMAT_USPROX		0x00000002

#define FORMAT_USRAW_SYNC	0x00000003

#define FORMAT_USGES_SYNC	0x00000003

#define FORMAT_USRAW_SYNC	0x00000004

#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
@@ -644,6 +644,9 @@ static uint32_t q6usm_ext2int_format(uint32_t ext_format) 
	case FORMAT_USPROX:

		int_format = US_PROX_FORMAT_V2;

		break;

	case FORMAT_USGES_SYNC:

		int_format = US_GES_SYNC_FORMAT;

		break;

	case FORMAT_USRAW_SYNC:

		int_format = US_RAW_SYNC_FORMAT;

		break;

include/sound/apr_audio-v2.h

+1 −0
Original line number Diff line number Diff line
@@ -7214,5 +7214,6 @@ struct afe_svc_cmd_set_clip_bank_selection { 
#define US_RAW_FORMAT_V2        0x0001272C

#define US_PROX_FORMAT_V2       0x0001272E

#define US_RAW_SYNC_FORMAT      0x0001272F

#define US_GES_SYNC_FORMAT      0x00012730



#endif /*_APR_AUDIO_V2_H_ */