Merge "media: dvb: Remove dependency on qseecom driver" (816741d0) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/dvb/demux/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		config DVB_MPQ_DEMUX
		tristate "DVB Demux Device"
		depends on DVB_MPQ && ION && ION_MSM && QSEECOM
		depends on DVB_MPQ && ION && ION_MSM
		default n

		help

drivers/media/platform/msm/dvb/demux/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ obj-$(CONFIG_DVB_MPQ_DEMUX) += mpq-dmx-hw-plugin.o

		mpq-dmx-hw-plugin-y := mpq_dmx_plugin_common.o

		mpq-dmx-hw-plugin-y += mpq_sdmx.o
		mpq-dmx-hw-plugin-$(CONFIG_QSEECOM) += mpq_sdmx.o

		mpq-dmx-hw-plugin-$(CONFIG_DVB_MPQ_TSPP1) += mpq_dmx_plugin_tspp_v1.o

drivers/media/platform/msm/dvb/demux/mpq_sdmx.h

+93 −0

Original line number	Diff line number	Diff line
		@@ -229,6 +229,8 @@ struct sdmx_filter_status {
		u32 status_indicators;
		};

		#ifdef CONFIG_QSEECOM

		int sdmx_open_session(int *session_handle);

		int sdmx_close_session(int session_handle);
		@@ -269,4 +271,95 @@ int sdmx_reset_dbg_counters(int session_handle);

		int sdmx_set_log_level(int session_handle, enum sdmx_log_level level);

		#else

		static inline int sdmx_open_session(int *session_handle)
		{
		return SDMX_STATUS_GENERAL_FAILURE;
		}

		static inline int sdmx_close_session(int session_handle)
		{
		return SDMX_STATUS_GENERAL_FAILURE;
		}

		static inline int sdmx_get_version(int session_handle, int32_t *version)
		{
		return SDMX_STATUS_GENERAL_FAILURE;
		}

		static inline int sdmx_set_session_cfg(int session_handle,
		enum sdmx_proc_mode proc_mode,
		enum sdmx_inp_mode inp_mode, enum sdmx_pkt_format pkt_format,
		u8 odd_scramble_bits, u8 even_scramble_bits)
		{
		return SDMX_STATUS_GENERAL_FAILURE;
		}

		static inline int sdmx_add_filter(int session_handle, u16 pid,
		enum sdmx_filter filter_type,
		struct sdmx_buff_descr *meta_data_buf, enum sdmx_buf_mode data_buf_mode,
		u32 num_data_bufs, struct sdmx_data_buff_descr *data_bufs,
		int *filter_handle, enum sdmx_raw_out_format ts_out_format, u32 flags)
		{
		return SDMX_STATUS_GENERAL_FAILURE;
		}

		static inline int sdmx_remove_filter(int session_handle, int filter_handle)
		{
		return SDMX_STATUS_GENERAL_FAILURE;
		}

		static inline int sdmx_set_kl_ind(int session_handle, u16 pid,
		u32 key_ladder_index)
		{
		return SDMX_STATUS_GENERAL_FAILURE;
		}

		static inline int sdmx_add_raw_pid(int session_handle, int filter_handle,
		u16 pid)
		{
		return SDMX_STATUS_GENERAL_FAILURE;
		}

		static inline int sdmx_remove_raw_pid(int session_handle, int filter_handle,
		u16 pid)
		{
		return SDMX_STATUS_GENERAL_FAILURE;
		}

		static inline int sdmx_process(int session_handle, u8 flags,
		struct sdmx_buff_descr *input_buf_desc,
		u32 input_fill_count, u32 input_read_offset,
		u32 *error_indicators,
		u32 *status_indicators,
		u32 num_filters,
		struct sdmx_filter_status *filter_status)
		{
		*status_indicators = 0;
		*error_indicators = 0;
		return SDMX_STATUS_GENERAL_FAILURE;
		}

		static inline int sdmx_get_dbg_counters(int session_handle,
		struct sdmx_session_dbg_counters *session_counters,
		u32 *num_filters,
		struct sdmx_filter_dbg_counters *filter_counters)
		{
		return SDMX_STATUS_GENERAL_FAILURE;
		}

		static inline int sdmx_reset_dbg_counters(int session_handle)
		{
		return SDMX_STATUS_GENERAL_FAILURE;
		}

		static inline int sdmx_set_log_level(int session_handle,
		enum sdmx_log_level level)
		{
		return SDMX_STATUS_GENERAL_FAILURE;
		}

		#endif

		#endif /* _MPQ_SDMX_H */