* [PATCH RFC 01/11] dvb_usb_v2: make remote controller optional
@ 2012-12-10 0:45 Antti Palosaari
2012-12-10 0:45 ` [PATCH RFC 02/11] rtl28xxu: " Antti Palosaari
` (10 more replies)
0 siblings, 11 replies; 18+ messages in thread
From: Antti Palosaari @ 2012-12-10 0:45 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Make it possible to compile dvb_usb_v2 driver without the remote
controller (RC-core).
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/usb/dvb-usb-v2/Kconfig | 3 ++-
drivers/media/usb/dvb-usb-v2/dvb_usb.h | 9 +++++++++
drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 12 ++++++++++++
3 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig
index 834bfec..60f4240 100644
--- a/drivers/media/usb/dvb-usb-v2/Kconfig
+++ b/drivers/media/usb/dvb-usb-v2/Kconfig
@@ -1,6 +1,6 @@
config DVB_USB_V2
tristate "Support for various USB DVB devices v2"
- depends on DVB_CORE && USB && I2C && RC_CORE
+ depends on DVB_CORE && USB && I2C
help
By enabling this you will be able to choose the various supported
USB1.1 and USB2.0 DVB devices.
@@ -113,6 +113,7 @@ config DVB_USB_IT913X
config DVB_USB_LME2510
tristate "LME DM04/QQBOX DVB-S USB2.0 support"
depends on DVB_USB_V2
+ depends on RC_CORE
select DVB_TDA10086 if MEDIA_SUBDRV_AUTOSELECT
select DVB_TDA826X if MEDIA_SUBDRV_AUTOSELECT
select DVB_STV0288 if MEDIA_SUBDRV_AUTOSELECT
diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb.h b/drivers/media/usb/dvb-usb-v2/dvb_usb.h
index 059291b..e2678a7 100644
--- a/drivers/media/usb/dvb-usb-v2/dvb_usb.h
+++ b/drivers/media/usb/dvb-usb-v2/dvb_usb.h
@@ -400,4 +400,13 @@ extern int dvb_usbv2_reset_resume(struct usb_interface *);
extern int dvb_usbv2_generic_rw(struct dvb_usb_device *, u8 *, u16, u8 *, u16);
extern int dvb_usbv2_generic_write(struct dvb_usb_device *, u8 *, u16);
+/* stub implementations that will be never called when RC-core is disabled */
+#if !defined(CONFIG_RC_CORE) && !defined(CONFIG_RC_CORE_MODULE)
+#define rc_repeat(args...)
+#define rc_keydown(args...)
+#define rc_keydown_notimeout(args...)
+#define rc_keyup(args...)
+#define rc_g_keycode_from_table(args...) 0
+#endif
+
#endif
diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
index 671b4fa..94f134c 100644
--- a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
+++ b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
@@ -102,6 +102,7 @@ static int dvb_usbv2_i2c_exit(struct dvb_usb_device *d)
return 0;
}
+#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
static void dvb_usb_read_remote_control(struct work_struct *work)
{
struct dvb_usb_device *d = container_of(work,
@@ -202,6 +203,17 @@ static int dvb_usbv2_remote_exit(struct dvb_usb_device *d)
return 0;
}
+#else
+static int dvb_usbv2_remote_init(struct dvb_usb_device *d)
+{
+ return 0;
+}
+
+static int dvb_usbv2_remote_exit(struct dvb_usb_device *d)
+{
+ return 0;
+}
+#endif
static void dvb_usb_data_complete(struct usb_data_stream *stream, u8 *buf,
size_t len)
--
1.7.11.7
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH RFC 02/11] rtl28xxu: make remote controller optional
2012-12-10 0:45 [PATCH RFC 01/11] dvb_usb_v2: make remote controller optional Antti Palosaari
@ 2012-12-10 0:45 ` Antti Palosaari
2012-12-10 0:45 ` [PATCH RFC 03/11] anysee: " Antti Palosaari
` (9 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Antti Palosaari @ 2012-12-10 0:45 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Do not compile remote controller when RC-core is disabled by Kconfig.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
index eddda69..9a68903 100644
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
@@ -1125,7 +1125,7 @@ err:
return ret;
}
-
+#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
static int rtl2831u_rc_query(struct dvb_usb_device *d)
{
int ret, i;
@@ -1208,7 +1208,11 @@ static int rtl2831u_get_rc_config(struct dvb_usb_device *d,
return 0;
}
+#else
+ #define rtl2831u_get_rc_config NULL
+#endif
+#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
static int rtl2832u_rc_query(struct dvb_usb_device *d)
{
int ret, i;
@@ -1280,6 +1284,9 @@ static int rtl2832u_get_rc_config(struct dvb_usb_device *d,
return 0;
}
+#else
+ #define rtl2832u_get_rc_config NULL
+#endif
static const struct dvb_usb_device_properties rtl2831u_props = {
.driver_name = KBUILD_MODNAME,
--
1.7.11.7
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH RFC 03/11] anysee: make remote controller optional
2012-12-10 0:45 [PATCH RFC 01/11] dvb_usb_v2: make remote controller optional Antti Palosaari
2012-12-10 0:45 ` [PATCH RFC 02/11] rtl28xxu: " Antti Palosaari
@ 2012-12-10 0:45 ` Antti Palosaari
2012-12-10 0:45 ` [PATCH RFC 04/11] af9015: " Antti Palosaari
` (8 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Antti Palosaari @ 2012-12-10 0:45 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Do not compile remote controller when RC-core is disabled by Kconfig.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/usb/dvb-usb-v2/anysee.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/media/usb/dvb-usb-v2/anysee.c b/drivers/media/usb/dvb-usb-v2/anysee.c
index d05c5b5..5f45037 100644
--- a/drivers/media/usb/dvb-usb-v2/anysee.c
+++ b/drivers/media/usb/dvb-usb-v2/anysee.c
@@ -1019,6 +1019,7 @@ static int anysee_tuner_attach(struct dvb_usb_adapter *adap)
return ret;
}
+#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
static int anysee_rc_query(struct dvb_usb_device *d)
{
u8 buf[] = {CMD_GET_IR_CODE};
@@ -1054,6 +1055,9 @@ static int anysee_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc)
return 0;
}
+#else
+ #define anysee_get_rc_config NULL
+#endif
static int anysee_ci_read_attribute_mem(struct dvb_ca_en50221 *ci, int slot,
int addr)
--
1.7.11.7
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH RFC 04/11] af9015: make remote controller optional
2012-12-10 0:45 [PATCH RFC 01/11] dvb_usb_v2: make remote controller optional Antti Palosaari
2012-12-10 0:45 ` [PATCH RFC 02/11] rtl28xxu: " Antti Palosaari
2012-12-10 0:45 ` [PATCH RFC 03/11] anysee: " Antti Palosaari
@ 2012-12-10 0:45 ` Antti Palosaari
2012-12-10 0:45 ` [PATCH RFC 05/11] af9035: " Antti Palosaari
` (7 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Antti Palosaari @ 2012-12-10 0:45 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Do not compile remote controller when RC-core is disabled by Kconfig.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/usb/dvb-usb-v2/af9015.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/media/usb/dvb-usb-v2/af9015.c b/drivers/media/usb/dvb-usb-v2/af9015.c
index 943d934..51505d1 100644
--- a/drivers/media/usb/dvb-usb-v2/af9015.c
+++ b/drivers/media/usb/dvb-usb-v2/af9015.c
@@ -1156,6 +1156,7 @@ error:
return ret;
}
+#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
struct af9015_rc_setup {
unsigned int id;
char *rc_codes;
@@ -1312,6 +1313,9 @@ static int af9015_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc)
return 0;
}
+#else
+ #define af9015_get_rc_config NULL
+#endif
/* interface 0 is used by DVB-T receiver and
interface 1 is for remote controller (HID) */
--
1.7.11.7
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH RFC 05/11] af9035: make remote controller optional
2012-12-10 0:45 [PATCH RFC 01/11] dvb_usb_v2: make remote controller optional Antti Palosaari
` (2 preceding siblings ...)
2012-12-10 0:45 ` [PATCH RFC 04/11] af9015: " Antti Palosaari
@ 2012-12-10 0:45 ` Antti Palosaari
2012-12-10 0:45 ` [PATCH RFC 06/11] az6007: " Antti Palosaari
` (6 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Antti Palosaari @ 2012-12-10 0:45 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Do not compile remote controller when RC-core is disabled by Kconfig.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/usb/dvb-usb-v2/af9035.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index ea37b5c..19b1394 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -1146,6 +1146,7 @@ err:
return ret;
}
+#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
static int af9035_rc_query(struct dvb_usb_device *d)
{
unsigned int key;
@@ -1220,6 +1221,9 @@ err:
return ret;
}
+#else
+ #define af9035_get_rc_config NULL
+#endif
/* interface 0 is used by DVB-T receiver and
interface 1 is for remote controller (HID) */
--
1.7.11.7
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH RFC 06/11] az6007: make remote controller optional
2012-12-10 0:45 [PATCH RFC 01/11] dvb_usb_v2: make remote controller optional Antti Palosaari
` (3 preceding siblings ...)
2012-12-10 0:45 ` [PATCH RFC 05/11] af9035: " Antti Palosaari
@ 2012-12-10 0:45 ` Antti Palosaari
2012-12-10 17:22 ` Mauro Carvalho Chehab
2012-12-10 0:45 ` [PATCH RFC 07/11] it913x: " Antti Palosaari
` (5 subsequent siblings)
10 siblings, 1 reply; 18+ messages in thread
From: Antti Palosaari @ 2012-12-10 0:45 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari, Mauro Carvalho Chehab
Do not compile remote controller when RC-core is disabled by Kconfig.
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/usb/dvb-usb-v2/az6007.c | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/drivers/media/usb/dvb-usb-v2/az6007.c b/drivers/media/usb/dvb-usb-v2/az6007.c
index d75dbf2..3b33f1e 100644
--- a/drivers/media/usb/dvb-usb-v2/az6007.c
+++ b/drivers/media/usb/dvb-usb-v2/az6007.c
@@ -189,6 +189,7 @@ static int az6007_streaming_ctrl(struct dvb_frontend *fe, int onoff)
return az6007_write(d, 0xbc, onoff, 0, NULL, 0);
}
+#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
/* remote control stuff (does not work with my box) */
static int az6007_rc_query(struct dvb_usb_device *d)
{
@@ -215,6 +216,20 @@ static int az6007_rc_query(struct dvb_usb_device *d)
return 0;
}
+static int az6007_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc)
+{
+ pr_debug("Getting az6007 Remote Control properties\n");
+
+ rc->allowed_protos = RC_BIT_NEC;
+ rc->query = az6007_rc_query;
+ rc->interval = 400;
+
+ return 0;
+}
+#else
+ #define az6007_get_rc_config NULL
+#endif
+
static int az6007_ci_read_attribute_mem(struct dvb_ca_en50221 *ca,
int slot,
int address)
@@ -822,17 +837,6 @@ static void az6007_usb_disconnect(struct usb_interface *intf)
dvb_usbv2_disconnect(intf);
}
-static int az6007_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc)
-{
- pr_debug("Getting az6007 Remote Control properties\n");
-
- rc->allowed_protos = RC_BIT_NEC;
- rc->query = az6007_rc_query;
- rc->interval = 400;
-
- return 0;
-}
-
static int az6007_download_firmware(struct dvb_usb_device *d,
const struct firmware *fw)
{
--
1.7.11.7
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH RFC 07/11] it913x: make remote controller optional
2012-12-10 0:45 [PATCH RFC 01/11] dvb_usb_v2: make remote controller optional Antti Palosaari
` (4 preceding siblings ...)
2012-12-10 0:45 ` [PATCH RFC 06/11] az6007: " Antti Palosaari
@ 2012-12-10 0:45 ` Antti Palosaari
2013-01-01 21:16 ` Antti Palosaari
2013-01-02 3:24 ` Fabio Estevam
2012-12-10 0:45 ` [PATCH RFC 08/11] it913x: remove unused define and increase module version Antti Palosaari
` (4 subsequent siblings)
10 siblings, 2 replies; 18+ messages in thread
From: Antti Palosaari @ 2012-12-10 0:45 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari, Malcolm Priestley
Do not compile remote controller when RC-core is disabled by Kconfig.
Cc: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/usb/dvb-usb-v2/it913x.c | 36 +++++++++++++++++++----------------
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/drivers/media/usb/dvb-usb-v2/it913x.c b/drivers/media/usb/dvb-usb-v2/it913x.c
index 4720428..5dc352b 100644
--- a/drivers/media/usb/dvb-usb-v2/it913x.c
+++ b/drivers/media/usb/dvb-usb-v2/it913x.c
@@ -308,6 +308,7 @@ static struct i2c_algorithm it913x_i2c_algo = {
};
/* Callbacks for DVB USB */
+#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
#define IT913X_POLL 250
static int it913x_rc_query(struct dvb_usb_device *d)
{
@@ -334,6 +335,25 @@ static int it913x_rc_query(struct dvb_usb_device *d)
return ret;
}
+static int it913x_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc)
+{
+ struct it913x_state *st = d->priv;
+
+ if (st->proprietary_ir == false) {
+ rc->map_name = NULL;
+ return 0;
+ }
+
+ rc->allowed_protos = RC_BIT_NEC;
+ rc->query = it913x_rc_query;
+ rc->interval = 250;
+
+ return 0;
+}
+#else
+ #define it913x_get_rc_config NULL
+#endif
+
/* Firmware sets raw */
static const char fw_it9135_v1[] = FW_IT9135_V1;
static const char fw_it9135_v2[] = FW_IT9135_V2;
@@ -695,22 +715,6 @@ static int it913x_frontend_attach(struct dvb_usb_adapter *adap)
}
/* DVB USB Driver */
-static int it913x_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc)
-{
- struct it913x_state *st = d->priv;
-
- if (st->proprietary_ir == false) {
- rc->map_name = NULL;
- return 0;
- }
-
- rc->allowed_protos = RC_BIT_NEC;
- rc->query = it913x_rc_query;
- rc->interval = 250;
-
- return 0;
-}
-
static int it913x_get_adapter_count(struct dvb_usb_device *d)
{
struct it913x_state *st = d->priv;
--
1.7.11.7
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH RFC 08/11] it913x: remove unused define and increase module version
2012-12-10 0:45 [PATCH RFC 01/11] dvb_usb_v2: make remote controller optional Antti Palosaari
` (5 preceding siblings ...)
2012-12-10 0:45 ` [PATCH RFC 07/11] it913x: " Antti Palosaari
@ 2012-12-10 0:45 ` Antti Palosaari
2012-12-10 19:02 ` Malcolm Priestley
2012-12-10 0:45 ` [PATCH RFC 09/11] dvb_usb_v2: remove rc-core stub implementations Antti Palosaari
` (3 subsequent siblings)
10 siblings, 1 reply; 18+ messages in thread
From: Antti Palosaari @ 2012-12-10 0:45 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari, Malcolm Priestley
Cc: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/usb/dvb-usb-v2/it913x.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/media/usb/dvb-usb-v2/it913x.c b/drivers/media/usb/dvb-usb-v2/it913x.c
index 5dc352b..3d20e38 100644
--- a/drivers/media/usb/dvb-usb-v2/it913x.c
+++ b/drivers/media/usb/dvb-usb-v2/it913x.c
@@ -309,7 +309,6 @@ static struct i2c_algorithm it913x_i2c_algo = {
/* Callbacks for DVB USB */
#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
-#define IT913X_POLL 250
static int it913x_rc_query(struct dvb_usb_device *d)
{
u8 ibuf[4];
@@ -801,7 +800,7 @@ module_usb_driver(it913x_driver);
MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>");
MODULE_DESCRIPTION("it913x USB 2 Driver");
-MODULE_VERSION("1.32");
+MODULE_VERSION("1.33");
MODULE_LICENSE("GPL");
MODULE_FIRMWARE(FW_IT9135_V1);
MODULE_FIRMWARE(FW_IT9135_V2);
--
1.7.11.7
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH RFC 09/11] dvb_usb_v2: remove rc-core stub implementations
2012-12-10 0:45 [PATCH RFC 01/11] dvb_usb_v2: make remote controller optional Antti Palosaari
` (6 preceding siblings ...)
2012-12-10 0:45 ` [PATCH RFC 08/11] it913x: remove unused define and increase module version Antti Palosaari
@ 2012-12-10 0:45 ` Antti Palosaari
2012-12-10 0:45 ` [PATCH RFC 10/11] dvb_usb_v2: use dummy function defines instead stub functions Antti Palosaari
` (2 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Antti Palosaari @ 2012-12-10 0:45 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Those are not needed anymore as all dvb-usb-v2 drivers has proper
dependency checks for RC-core.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/usb/dvb-usb-v2/dvb_usb.h | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb.h b/drivers/media/usb/dvb-usb-v2/dvb_usb.h
index e2678a7..059291b 100644
--- a/drivers/media/usb/dvb-usb-v2/dvb_usb.h
+++ b/drivers/media/usb/dvb-usb-v2/dvb_usb.h
@@ -400,13 +400,4 @@ extern int dvb_usbv2_reset_resume(struct usb_interface *);
extern int dvb_usbv2_generic_rw(struct dvb_usb_device *, u8 *, u16, u8 *, u16);
extern int dvb_usbv2_generic_write(struct dvb_usb_device *, u8 *, u16);
-/* stub implementations that will be never called when RC-core is disabled */
-#if !defined(CONFIG_RC_CORE) && !defined(CONFIG_RC_CORE_MODULE)
-#define rc_repeat(args...)
-#define rc_keydown(args...)
-#define rc_keydown_notimeout(args...)
-#define rc_keyup(args...)
-#define rc_g_keycode_from_table(args...) 0
-#endif
-
#endif
--
1.7.11.7
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH RFC 10/11] dvb_usb_v2: use dummy function defines instead stub functions
2012-12-10 0:45 [PATCH RFC 01/11] dvb_usb_v2: make remote controller optional Antti Palosaari
` (7 preceding siblings ...)
2012-12-10 0:45 ` [PATCH RFC 09/11] dvb_usb_v2: remove rc-core stub implementations Antti Palosaari
@ 2012-12-10 0:45 ` Antti Palosaari
2012-12-10 0:45 ` [PATCH RFC 11/11] dvb_usb_v2: change rc polling active/deactive logic Antti Palosaari
2013-01-06 12:11 ` [PATCH RFC 01/11] dvb_usb_v2: make remote controller optional Mauro Carvalho Chehab
10 siblings, 0 replies; 18+ messages in thread
From: Antti Palosaari @ 2012-12-10 0:45 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
I think it is better (cheaper) to use dummy defines for functions
that has no meaning when remote controller is disabled by Kconfig.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
index 94f134c..1330c64 100644
--- a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
+++ b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
@@ -204,15 +204,8 @@ static int dvb_usbv2_remote_exit(struct dvb_usb_device *d)
return 0;
}
#else
-static int dvb_usbv2_remote_init(struct dvb_usb_device *d)
-{
- return 0;
-}
-
-static int dvb_usbv2_remote_exit(struct dvb_usb_device *d)
-{
- return 0;
-}
+ #define dvb_usbv2_remote_init(args...) 0
+ #define dvb_usbv2_remote_exit(args...)
#endif
static void dvb_usb_data_complete(struct usb_data_stream *stream, u8 *buf,
--
1.7.11.7
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH RFC 11/11] dvb_usb_v2: change rc polling active/deactive logic
2012-12-10 0:45 [PATCH RFC 01/11] dvb_usb_v2: make remote controller optional Antti Palosaari
` (8 preceding siblings ...)
2012-12-10 0:45 ` [PATCH RFC 10/11] dvb_usb_v2: use dummy function defines instead stub functions Antti Palosaari
@ 2012-12-10 0:45 ` Antti Palosaari
2013-01-06 12:11 ` [PATCH RFC 01/11] dvb_usb_v2: make remote controller optional Mauro Carvalho Chehab
10 siblings, 0 replies; 18+ messages in thread
From: Antti Palosaari @ 2012-12-10 0:45 UTC (permalink / raw)
To: linux-media; +Cc: Antti Palosaari
Use own flag to mark when rc polling is active/deactive and make
decisions, like start/stop polling on suspend/resume, against that.
Signed-off-by: Antti Palosaari <crope@iki.fi>
---
drivers/media/usb/dvb-usb-v2/dvb_usb.h | 3 ++-
drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 10 +++++++---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb.h b/drivers/media/usb/dvb-usb-v2/dvb_usb.h
index 059291b..3cac8bd 100644
--- a/drivers/media/usb/dvb-usb-v2/dvb_usb.h
+++ b/drivers/media/usb/dvb-usb-v2/dvb_usb.h
@@ -347,6 +347,7 @@ struct dvb_usb_adapter {
* @props: device properties
* @name: device name
* @rc_map: name of rc codes table
+ * @rc_polling_active: set when RC polling is active
* @udev: pointer to the device's struct usb_device
* @intf: pointer to the device's usb interface
* @rc: remote controller configuration
@@ -364,7 +365,7 @@ struct dvb_usb_device {
const struct dvb_usb_device_properties *props;
const char *name;
const char *rc_map;
-
+ bool rc_polling_active;
struct usb_device *udev;
struct usb_interface *intf;
struct dvb_usb_rc rc;
diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
index 1330c64..95968d3 100644
--- a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
+++ b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
@@ -113,13 +113,16 @@ static void dvb_usb_read_remote_control(struct work_struct *work)
* When the parameter has been set to 1 via sysfs while the
* driver was running, or when bulk mode is enabled after IR init.
*/
- if (dvb_usbv2_disable_rc_polling || d->rc.bulk_mode)
+ if (dvb_usbv2_disable_rc_polling || d->rc.bulk_mode) {
+ d->rc_polling_active = false;
return;
+ }
ret = d->rc.query(d);
if (ret < 0) {
dev_err(&d->udev->dev, "%s: rc.query() failed=%d\n",
KBUILD_MODNAME, ret);
+ d->rc_polling_active = false;
return; /* stop polling */
}
@@ -183,6 +186,7 @@ static int dvb_usbv2_remote_init(struct dvb_usb_device *d)
d->rc.interval);
schedule_delayed_work(&d->rc_query_work,
msecs_to_jiffies(d->rc.interval));
+ d->rc_polling_active = true;
}
return 0;
@@ -964,7 +968,7 @@ int dvb_usbv2_suspend(struct usb_interface *intf, pm_message_t msg)
dev_dbg(&d->udev->dev, "%s:\n", __func__);
/* stop remote controller poll */
- if (d->rc.query && !d->rc.bulk_mode)
+ if (d->rc_polling_active)
cancel_delayed_work_sync(&d->rc_query_work);
for (i = MAX_NO_OF_ADAPTER_PER_DEVICE - 1; i >= 0; i--) {
@@ -1011,7 +1015,7 @@ static int dvb_usbv2_resume_common(struct dvb_usb_device *d)
}
/* start remote controller poll */
- if (d->rc.query && !d->rc.bulk_mode)
+ if (d->rc_polling_active)
schedule_delayed_work(&d->rc_query_work,
msecs_to_jiffies(d->rc.interval));
--
1.7.11.7
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH RFC 06/11] az6007: make remote controller optional
2012-12-10 0:45 ` [PATCH RFC 06/11] az6007: " Antti Palosaari
@ 2012-12-10 17:22 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2012-12-10 17:22 UTC (permalink / raw)
To: Antti Palosaari; +Cc: linux-media
Em 09-12-2012 22:45, Antti Palosaari escreveu:
> Do not compile remote controller when RC-core is disabled by Kconfig.
>
> Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
> Signed-off-by: Antti Palosaari <crope@iki.fi>
Seems OK for me.
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
> ---
> drivers/media/usb/dvb-usb-v2/az6007.c | 26 +++++++++++++++-----------
> 1 file changed, 15 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/media/usb/dvb-usb-v2/az6007.c b/drivers/media/usb/dvb-usb-v2/az6007.c
> index d75dbf2..3b33f1e 100644
> --- a/drivers/media/usb/dvb-usb-v2/az6007.c
> +++ b/drivers/media/usb/dvb-usb-v2/az6007.c
> @@ -189,6 +189,7 @@ static int az6007_streaming_ctrl(struct dvb_frontend *fe, int onoff)
> return az6007_write(d, 0xbc, onoff, 0, NULL, 0);
> }
>
> +#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
> /* remote control stuff (does not work with my box) */
> static int az6007_rc_query(struct dvb_usb_device *d)
> {
> @@ -215,6 +216,20 @@ static int az6007_rc_query(struct dvb_usb_device *d)
> return 0;
> }
>
> +static int az6007_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc)
> +{
> + pr_debug("Getting az6007 Remote Control properties\n");
> +
> + rc->allowed_protos = RC_BIT_NEC;
> + rc->query = az6007_rc_query;
> + rc->interval = 400;
> +
> + return 0;
> +}
> +#else
> + #define az6007_get_rc_config NULL
> +#endif
> +
> static int az6007_ci_read_attribute_mem(struct dvb_ca_en50221 *ca,
> int slot,
> int address)
> @@ -822,17 +837,6 @@ static void az6007_usb_disconnect(struct usb_interface *intf)
> dvb_usbv2_disconnect(intf);
> }
>
> -static int az6007_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc)
> -{
> - pr_debug("Getting az6007 Remote Control properties\n");
> -
> - rc->allowed_protos = RC_BIT_NEC;
> - rc->query = az6007_rc_query;
> - rc->interval = 400;
> -
> - return 0;
> -}
> -
> static int az6007_download_firmware(struct dvb_usb_device *d,
> const struct firmware *fw)
> {
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH RFC 08/11] it913x: remove unused define and increase module version
2012-12-10 0:45 ` [PATCH RFC 08/11] it913x: remove unused define and increase module version Antti Palosaari
@ 2012-12-10 19:02 ` Malcolm Priestley
0 siblings, 0 replies; 18+ messages in thread
From: Malcolm Priestley @ 2012-12-10 19:02 UTC (permalink / raw)
To: Antti Palosaari; +Cc: linux-media
On Mon, 2012-12-10 at 02:45 +0200, Antti Palosaari wrote:
> Cc: Malcolm Priestley <tvboxspy@gmail.com>
> Signed-off-by: Antti Palosaari <crope@iki.fi>
> ---
Acked-by: Malcolm Priestley <tvboxspy@gmail.com>
> drivers/media/usb/dvb-usb-v2/it913x.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/media/usb/dvb-usb-v2/it913x.c b/drivers/media/usb/dvb-usb-v2/it913x.c
> index 5dc352b..3d20e38 100644
> --- a/drivers/media/usb/dvb-usb-v2/it913x.c
> +++ b/drivers/media/usb/dvb-usb-v2/it913x.c
> @@ -309,7 +309,6 @@ static struct i2c_algorithm it913x_i2c_algo = {
>
> /* Callbacks for DVB USB */
> #if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
> -#define IT913X_POLL 250
> static int it913x_rc_query(struct dvb_usb_device *d)
> {
> u8 ibuf[4];
> @@ -801,7 +800,7 @@ module_usb_driver(it913x_driver);
>
> MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>");
> MODULE_DESCRIPTION("it913x USB 2 Driver");
> -MODULE_VERSION("1.32");
> +MODULE_VERSION("1.33");
> MODULE_LICENSE("GPL");
> MODULE_FIRMWARE(FW_IT9135_V1);
> MODULE_FIRMWARE(FW_IT9135_V2);
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH RFC 07/11] it913x: make remote controller optional
2012-12-10 0:45 ` [PATCH RFC 07/11] it913x: " Antti Palosaari
@ 2013-01-01 21:16 ` Antti Palosaari
2013-01-02 3:24 ` Fabio Estevam
1 sibling, 0 replies; 18+ messages in thread
From: Antti Palosaari @ 2013-01-01 21:16 UTC (permalink / raw)
To: Malcolm Priestley; +Cc: linux-media
Care to Ack that one too?
regards
Antti
On 12/10/2012 02:45 AM, Antti Palosaari wrote:
> Do not compile remote controller when RC-core is disabled by Kconfig.
>
> Cc: Malcolm Priestley <tvboxspy@gmail.com>
> Signed-off-by: Antti Palosaari <crope@iki.fi>
> ---
> drivers/media/usb/dvb-usb-v2/it913x.c | 36 +++++++++++++++++++----------------
> 1 file changed, 20 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/media/usb/dvb-usb-v2/it913x.c b/drivers/media/usb/dvb-usb-v2/it913x.c
> index 4720428..5dc352b 100644
> --- a/drivers/media/usb/dvb-usb-v2/it913x.c
> +++ b/drivers/media/usb/dvb-usb-v2/it913x.c
> @@ -308,6 +308,7 @@ static struct i2c_algorithm it913x_i2c_algo = {
> };
>
> /* Callbacks for DVB USB */
> +#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
> #define IT913X_POLL 250
> static int it913x_rc_query(struct dvb_usb_device *d)
> {
> @@ -334,6 +335,25 @@ static int it913x_rc_query(struct dvb_usb_device *d)
> return ret;
> }
>
> +static int it913x_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc)
> +{
> + struct it913x_state *st = d->priv;
> +
> + if (st->proprietary_ir == false) {
> + rc->map_name = NULL;
> + return 0;
> + }
> +
> + rc->allowed_protos = RC_BIT_NEC;
> + rc->query = it913x_rc_query;
> + rc->interval = 250;
> +
> + return 0;
> +}
> +#else
> + #define it913x_get_rc_config NULL
> +#endif
> +
> /* Firmware sets raw */
> static const char fw_it9135_v1[] = FW_IT9135_V1;
> static const char fw_it9135_v2[] = FW_IT9135_V2;
> @@ -695,22 +715,6 @@ static int it913x_frontend_attach(struct dvb_usb_adapter *adap)
> }
>
> /* DVB USB Driver */
> -static int it913x_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc)
> -{
> - struct it913x_state *st = d->priv;
> -
> - if (st->proprietary_ir == false) {
> - rc->map_name = NULL;
> - return 0;
> - }
> -
> - rc->allowed_protos = RC_BIT_NEC;
> - rc->query = it913x_rc_query;
> - rc->interval = 250;
> -
> - return 0;
> -}
> -
> static int it913x_get_adapter_count(struct dvb_usb_device *d)
> {
> struct it913x_state *st = d->priv;
>
--
http://palosaari.fi/
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH RFC 07/11] it913x: make remote controller optional
2012-12-10 0:45 ` [PATCH RFC 07/11] it913x: " Antti Palosaari
2013-01-01 21:16 ` Antti Palosaari
@ 2013-01-02 3:24 ` Fabio Estevam
2013-01-02 10:44 ` Antti Palosaari
1 sibling, 1 reply; 18+ messages in thread
From: Fabio Estevam @ 2013-01-02 3:24 UTC (permalink / raw)
To: Antti Palosaari; +Cc: linux-media, Malcolm Priestley
On Sun, Dec 9, 2012 at 10:45 PM, Antti Palosaari <crope@iki.fi> wrote:
> Do not compile remote controller when RC-core is disabled by Kconfig.
>
> Cc: Malcolm Priestley <tvboxspy@gmail.com>
> Signed-off-by: Antti Palosaari <crope@iki.fi>
> ---
> drivers/media/usb/dvb-usb-v2/it913x.c | 36 +++++++++++++++++++----------------
> 1 file changed, 20 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/media/usb/dvb-usb-v2/it913x.c b/drivers/media/usb/dvb-usb-v2/it913x.c
> index 4720428..5dc352b 100644
> --- a/drivers/media/usb/dvb-usb-v2/it913x.c
> +++ b/drivers/media/usb/dvb-usb-v2/it913x.c
> @@ -308,6 +308,7 @@ static struct i2c_algorithm it913x_i2c_algo = {
> };
>
> /* Callbacks for DVB USB */
> +#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
Maybe you could use:
#if IS_ENABLED(CONFIG_RC_CORE)
Regards,
Fabio Estevam
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH RFC 07/11] it913x: make remote controller optional
2013-01-02 3:24 ` Fabio Estevam
@ 2013-01-02 10:44 ` Antti Palosaari
0 siblings, 0 replies; 18+ messages in thread
From: Antti Palosaari @ 2013-01-02 10:44 UTC (permalink / raw)
To: Fabio Estevam; +Cc: linux-media, Malcolm Priestley
On 01/02/2013 05:24 AM, Fabio Estevam wrote:
> On Sun, Dec 9, 2012 at 10:45 PM, Antti Palosaari <crope@iki.fi> wrote:
>> Do not compile remote controller when RC-core is disabled by Kconfig.
>>
>> Cc: Malcolm Priestley <tvboxspy@gmail.com>
>> Signed-off-by: Antti Palosaari <crope@iki.fi>
>> ---
>> drivers/media/usb/dvb-usb-v2/it913x.c | 36 +++++++++++++++++++----------------
>> 1 file changed, 20 insertions(+), 16 deletions(-)
>>
>> diff --git a/drivers/media/usb/dvb-usb-v2/it913x.c b/drivers/media/usb/dvb-usb-v2/it913x.c
>> index 4720428..5dc352b 100644
>> --- a/drivers/media/usb/dvb-usb-v2/it913x.c
>> +++ b/drivers/media/usb/dvb-usb-v2/it913x.c
>> @@ -308,6 +308,7 @@ static struct i2c_algorithm it913x_i2c_algo = {
>> };
>>
>> /* Callbacks for DVB USB */
>> +#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
>
> Maybe you could use:
>
> #if IS_ENABLED(CONFIG_RC_CORE)
>
> Regards,
>
> Fabio Estevam
Thanks for the pointing that macro. I will sent new patch top of that
serie which replaces all "defined(CONFIG_RC_CORE) ||
defined(CONFIG_RC_CORE_MODULE)" with "IS_ENABLED(CONFIG_RC_CORE)" what I
added.
regards
Antti
--
http://palosaari.fi/
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH RFC 01/11] dvb_usb_v2: make remote controller optional
2012-12-10 0:45 [PATCH RFC 01/11] dvb_usb_v2: make remote controller optional Antti Palosaari
` (9 preceding siblings ...)
2012-12-10 0:45 ` [PATCH RFC 11/11] dvb_usb_v2: change rc polling active/deactive logic Antti Palosaari
@ 2013-01-06 12:11 ` Mauro Carvalho Chehab
2013-01-06 12:16 ` Mauro Carvalho Chehab
10 siblings, 1 reply; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2013-01-06 12:11 UTC (permalink / raw)
To: Antti Palosaari; +Cc: linux-media
Em Mon, 10 Dec 2012 02:45:25 +0200
Antti Palosaari <crope@iki.fi> escreveu:
> Make it possible to compile dvb_usb_v2 driver without the remote
> controller (RC-core).
>
> Signed-off-by: Antti Palosaari <crope@iki.fi>
> ---
> drivers/media/usb/dvb-usb-v2/Kconfig | 3 ++-
> drivers/media/usb/dvb-usb-v2/dvb_usb.h | 9 +++++++++
> drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 12 ++++++++++++
> 3 files changed, 23 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig
> index 834bfec..60f4240 100644
> --- a/drivers/media/usb/dvb-usb-v2/Kconfig
> +++ b/drivers/media/usb/dvb-usb-v2/Kconfig
> @@ -1,6 +1,6 @@
> config DVB_USB_V2
> tristate "Support for various USB DVB devices v2"
> - depends on DVB_CORE && USB && I2C && RC_CORE
> + depends on DVB_CORE && USB && I2C
> help
> By enabling this you will be able to choose the various supported
> USB1.1 and USB2.0 DVB devices.
> @@ -113,6 +113,7 @@ config DVB_USB_IT913X
> config DVB_USB_LME2510
> tristate "LME DM04/QQBOX DVB-S USB2.0 support"
> depends on DVB_USB_V2
> + depends on RC_CORE
> select DVB_TDA10086 if MEDIA_SUBDRV_AUTOSELECT
> select DVB_TDA826X if MEDIA_SUBDRV_AUTOSELECT
> select DVB_STV0288 if MEDIA_SUBDRV_AUTOSELECT
> diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb.h b/drivers/media/usb/dvb-usb-v2/dvb_usb.h
> index 059291b..e2678a7 100644
> --- a/drivers/media/usb/dvb-usb-v2/dvb_usb.h
> +++ b/drivers/media/usb/dvb-usb-v2/dvb_usb.h
> @@ -400,4 +400,13 @@ extern int dvb_usbv2_reset_resume(struct usb_interface *);
> extern int dvb_usbv2_generic_rw(struct dvb_usb_device *, u8 *, u16, u8 *, u16);
> extern int dvb_usbv2_generic_write(struct dvb_usb_device *, u8 *, u16);
>
> +/* stub implementations that will be never called when RC-core is disabled */
> +#if !defined(CONFIG_RC_CORE) && !defined(CONFIG_RC_CORE_MODULE)
> +#define rc_repeat(args...)
> +#define rc_keydown(args...)
> +#define rc_keydown_notimeout(args...)
> +#define rc_keyup(args...)
> +#define rc_g_keycode_from_table(args...) 0
> +#endif
> +
Those stub seem to be miss-placed: they belong to rc-core, and not to dvb-usb-v2.
So, those changes should be, instead, at: include/media/rc-core.h
> #endif
> diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
> index 671b4fa..94f134c 100644
> --- a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
> +++ b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
> @@ -102,6 +102,7 @@ static int dvb_usbv2_i2c_exit(struct dvb_usb_device *d)
> return 0;
> }
>
> +#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
> static void dvb_usb_read_remote_control(struct work_struct *work)
> {
> struct dvb_usb_device *d = container_of(work,
> @@ -202,6 +203,17 @@ static int dvb_usbv2_remote_exit(struct dvb_usb_device *d)
>
> return 0;
> }
> +#else
> +static int dvb_usbv2_remote_init(struct dvb_usb_device *d)
> +{
> + return 0;
> +}
> +
> +static int dvb_usbv2_remote_exit(struct dvb_usb_device *d)
> +{
> + return 0;
> +}
> +#endif
>
> static void dvb_usb_data_complete(struct usb_data_stream *stream, u8 *buf,
> size_t len)
--
Cheers,
Mauro
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH RFC 01/11] dvb_usb_v2: make remote controller optional
2013-01-06 12:11 ` [PATCH RFC 01/11] dvb_usb_v2: make remote controller optional Mauro Carvalho Chehab
@ 2013-01-06 12:16 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2013-01-06 12:16 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: Antti Palosaari, linux-media
Em Sun, 6 Jan 2013 10:11:29 -0200
Mauro Carvalho Chehab <mchehab@redhat.com> escreveu:
> Em Mon, 10 Dec 2012 02:45:25 +0200
> Antti Palosaari <crope@iki.fi> escreveu:
>
> > Make it possible to compile dvb_usb_v2 driver without the remote
> > controller (RC-core).
> >
> > Signed-off-by: Antti Palosaari <crope@iki.fi>
> > ---
> > drivers/media/usb/dvb-usb-v2/Kconfig | 3 ++-
> > drivers/media/usb/dvb-usb-v2/dvb_usb.h | 9 +++++++++
> > drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 12 ++++++++++++
> > 3 files changed, 23 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig
> > index 834bfec..60f4240 100644
> > --- a/drivers/media/usb/dvb-usb-v2/Kconfig
> > +++ b/drivers/media/usb/dvb-usb-v2/Kconfig
> > @@ -1,6 +1,6 @@
> > config DVB_USB_V2
> > tristate "Support for various USB DVB devices v2"
> > - depends on DVB_CORE && USB && I2C && RC_CORE
> > + depends on DVB_CORE && USB && I2C
> > help
> > By enabling this you will be able to choose the various supported
> > USB1.1 and USB2.0 DVB devices.
> > @@ -113,6 +113,7 @@ config DVB_USB_IT913X
> > config DVB_USB_LME2510
> > tristate "LME DM04/QQBOX DVB-S USB2.0 support"
> > depends on DVB_USB_V2
> > + depends on RC_CORE
> > select DVB_TDA10086 if MEDIA_SUBDRV_AUTOSELECT
> > select DVB_TDA826X if MEDIA_SUBDRV_AUTOSELECT
> > select DVB_STV0288 if MEDIA_SUBDRV_AUTOSELECT
> > diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb.h b/drivers/media/usb/dvb-usb-v2/dvb_usb.h
> > index 059291b..e2678a7 100644
> > --- a/drivers/media/usb/dvb-usb-v2/dvb_usb.h
> > +++ b/drivers/media/usb/dvb-usb-v2/dvb_usb.h
> > @@ -400,4 +400,13 @@ extern int dvb_usbv2_reset_resume(struct usb_interface *);
> > extern int dvb_usbv2_generic_rw(struct dvb_usb_device *, u8 *, u16, u8 *, u16);
> > extern int dvb_usbv2_generic_write(struct dvb_usb_device *, u8 *, u16);
> >
> > +/* stub implementations that will be never called when RC-core is disabled */
> > +#if !defined(CONFIG_RC_CORE) && !defined(CONFIG_RC_CORE_MODULE)
> > +#define rc_repeat(args...)
> > +#define rc_keydown(args...)
> > +#define rc_keydown_notimeout(args...)
> > +#define rc_keyup(args...)
> > +#define rc_g_keycode_from_table(args...) 0
> > +#endif
> > +
>
> Those stub seem to be miss-placed: they belong to rc-core, and not to dvb-usb-v2.
> So, those changes should be, instead, at: include/media/rc-core.h
Hmm.. you removed those later. Ok, I'll apply this series, but I'll then add an
additional patch at the end putting the above at rc-core.h, as it may help with
other drivers.
--
Cheers,
Mauro
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2013-01-06 12:17 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-10 0:45 [PATCH RFC 01/11] dvb_usb_v2: make remote controller optional Antti Palosaari
2012-12-10 0:45 ` [PATCH RFC 02/11] rtl28xxu: " Antti Palosaari
2012-12-10 0:45 ` [PATCH RFC 03/11] anysee: " Antti Palosaari
2012-12-10 0:45 ` [PATCH RFC 04/11] af9015: " Antti Palosaari
2012-12-10 0:45 ` [PATCH RFC 05/11] af9035: " Antti Palosaari
2012-12-10 0:45 ` [PATCH RFC 06/11] az6007: " Antti Palosaari
2012-12-10 17:22 ` Mauro Carvalho Chehab
2012-12-10 0:45 ` [PATCH RFC 07/11] it913x: " Antti Palosaari
2013-01-01 21:16 ` Antti Palosaari
2013-01-02 3:24 ` Fabio Estevam
2013-01-02 10:44 ` Antti Palosaari
2012-12-10 0:45 ` [PATCH RFC 08/11] it913x: remove unused define and increase module version Antti Palosaari
2012-12-10 19:02 ` Malcolm Priestley
2012-12-10 0:45 ` [PATCH RFC 09/11] dvb_usb_v2: remove rc-core stub implementations Antti Palosaari
2012-12-10 0:45 ` [PATCH RFC 10/11] dvb_usb_v2: use dummy function defines instead stub functions Antti Palosaari
2012-12-10 0:45 ` [PATCH RFC 11/11] dvb_usb_v2: change rc polling active/deactive logic Antti Palosaari
2013-01-06 12:11 ` [PATCH RFC 01/11] dvb_usb_v2: make remote controller optional Mauro Carvalho Chehab
2013-01-06 12:16 ` Mauro Carvalho Chehab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).