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

Commit fdd1eeb4 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] siano: allow compiling it without RC support 



Remote controller support should be optional on all drivers.

Make it optional at Siano's driver.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2c76a12a

drivers/media/common/Kconfig

+7 −0
Original line number Diff line number Diff line 
# Used by common drivers, when they need to ask questions

config MEDIA_COMMON_OPTIONS

	bool



comment "common driver options"

	depends on MEDIA_COMMON_OPTIONS



source "drivers/media/common/b2c2/Kconfig"

source "drivers/media/common/saa7146/Kconfig"

source "drivers/media/common/siano/Kconfig"

drivers/media/common/siano/Kconfig

+9 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


config SMS_SIANO_MDTV

	tristate

	depends on DVB_CORE && RC_CORE && HAS_DMA

	depends on DVB_CORE && HAS_DMA

	depends on SMS_USB_DRV || SMS_SDIO_DRV

	default y

	---help---
@@ -15,3 +15,11 @@ config SMS_SIANO_MDTV 


	  Further documentation on this driver can be found on the WWW

	  at http://www.siano-ms.com/

config SMS_SIANO_RC

	bool "Enable Remote Controller support for Siano devices"

	depends on SMS_SIANO_MDTV && RC_CORE

	depends on SMS_USB_DRV || SMS_SDIO_DRV

	depends on MEDIA_COMMON_OPTIONS

	default y

	---help---

	  Choose Y to select Remote Controller support for Siano driver.

drivers/media/common/siano/Makefile

+2 −1
Original line number Diff line number Diff line 
smsmdtv-objs := smscoreapi.o sms-cards.o smsendian.o smsir.o

smsmdtv-objs := smscoreapi.o sms-cards.o smsendian.o



obj-$(CONFIG_SMS_SIANO_MDTV) += smsmdtv.o smsdvb.o

obj-$(CONFIG_SMS_SIANO_RC) += smsir.o



ccflags-y += -Idrivers/media/dvb-core

ccflags-y += $(extra-cflags-y) $(extra-cflags-m)

drivers/media/common/siano/smsir.h

+9 −0
Original line number Diff line number Diff line
@@ -46,10 +46,19 @@ struct ir_t { 
	u32 controller;

};



#ifdef CONFIG_SMS_SIANO_RC

int sms_ir_init(struct smscore_device_t *coredev);

void sms_ir_exit(struct smscore_device_t *coredev);

void sms_ir_event(struct smscore_device_t *coredev,

			const char *buf, int len);

#else

inline static int sms_ir_init(struct smscore_device_t *coredev) {

	return 0;

}

inline static void sms_ir_exit(struct smscore_device_t *coredev) {};

inline static void sms_ir_event(struct smscore_device_t *coredev,

			const char *buf, int len) {};

#endif



#endif /* __SMS_IR_H__ */

drivers/media/mmc/siano/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,5 +6,6 @@ config SMS_SDIO_DRV 
	tristate "Siano SMS1xxx based MDTV via SDIO interface"

	depends on DVB_CORE && RC_CORE && HAS_DMA

	depends on MMC

	select MEDIA_COMMON_OPTIONS

	---help---

	  Choose if you would like to have Siano's support for SDIO interface