leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] siano: allow compiling it without RC support

Browse Source 
Remote controller support should be optional on all drivers.

Make it optional at Siano's driver.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2012-10-17 16:59:01 -03:00
parent 2c76a12ae9
commit fdd1eeb49d
6 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/common/Kconfig
View File

@ -1,3 +1,10 @@
# 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"

10
drivers/media/common/siano/Kconfig
View File

@ -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.

3
drivers/media/common/siano/Makefile
View File

@ -1,6 +1,7 @@
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)

9
drivers/media/common/siano/smsir.h
View File

@ -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__ */

1
drivers/media/mmc/siano/Kconfig
View File

@ -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

1
drivers/media/usb/siano/Kconfig
View File

@ -5,6 +5,7 @@
config SMS_USB_DRV
tristate "Siano SMS1xxx based MDTV receiver"
depends on DVB_CORE && RC_CORE && HAS_DMA
select MEDIA_COMMON_OPTIONS
---help---
Choose if you would like to have Siano's support for USB interface