From: Maxim Levitsky <maximlevitsky@gmail.com>
To: lirc-list@lists.sourceforge.net
Cc: "Jarod Wilson" <jarod@wilsonet.com>,
"David Härdeman" <david@hardeman.nu>,
mchehab@infradead.org, linux-input@vger.kernel.org,
"Maxim Levitsky" <maximlevitsky@gmail.com>
Subject: [PATCH 8/8] IR: ene_ir: add support for carrier reports
Date: Mon, 6 Sep 2010 01:22:44 +0300 [thread overview]
Message-ID: <1283725364-4053-9-git-send-email-maximlevitsky@gmail.com> (raw)
In-Reply-To: <1283725364-4053-1-git-send-email-maximlevitsky@gmail.com>
Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
---
drivers/media/IR/ene_ir.c | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/drivers/media/IR/ene_ir.c b/drivers/media/IR/ene_ir.c
index dc32509..f1ee153 100644
--- a/drivers/media/IR/ene_ir.c
+++ b/drivers/media/IR/ene_ir.c
@@ -192,10 +192,11 @@ static int ene_hw_detect(struct ene_device *dev)
/* Sense current received carrier */
void ene_rx_sense_carrier(struct ene_device *dev)
{
+ DEFINE_IR_RAW_EVENT(ev);
+
+ int carrier, duty_cycle;
int period = ene_read_reg(dev, ENE_CIRCAR_PRD);
int hperiod = ene_read_reg(dev, ENE_CIRCAR_HPRD);
- int carrier, duty_cycle;
-
if (!(period & ENE_CIRCAR_PRD_VALID))
return;
@@ -208,13 +209,16 @@ void ene_rx_sense_carrier(struct ene_device *dev)
dbg("RX: hardware carrier period = %02x", period);
dbg("RX: hardware carrier pulse period = %02x", hperiod);
-
carrier = 2000000 / period;
duty_cycle = (hperiod * 100) / period;
dbg("RX: sensed carrier = %d Hz, duty cycle %d%%",
- carrier, duty_cycle);
-
- /* TODO: Send carrier & duty cycle to IR layer */
+ carrier, duty_cycle);
+ if (dev->carrier_detect_enabled) {
+ ev.carrier_report = true;
+ ev.carrier = carrier;
+ ev.duty_cycle = duty_cycle;
+ ir_raw_event_store(dev->idev, &ev);
+ }
}
/* this enables/disables the CIR RX engine */
@@ -728,7 +732,7 @@ static irqreturn_t ene_isr(int irq, void *data)
dbg_verbose("RX interrupt");
- if (dev->carrier_detect_enabled || debug)
+ if (dev->hw_learning_and_tx_capable)
ene_rx_sense_carrier(dev);
/* On hardware that don't support extra buffer we need to trust
@@ -903,6 +907,23 @@ static int ene_set_learning_mode(void *data, int enable)
return 0;
}
+static int ene_set_carrier_report(void *data, int enable)
+{
+ struct ene_device *dev = (struct ene_device *)data;
+ unsigned long flags;
+
+ if (enable == dev->carrier_detect_enabled)
+ return 0;
+
+ spin_lock_irqsave(&dev->hw_lock, flags);
+ dev->carrier_detect_enabled = enable;
+ ene_rx_disable(dev);
+ ene_rx_setup(dev);
+ ene_rx_enable(dev);
+ spin_unlock_irqrestore(&dev->hw_lock, flags);
+ return 0;
+}
+
/* outside interface: enable or disable idle mode */
static void ene_rx_set_idle(void *data, bool idle)
{
@@ -1032,7 +1053,7 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
ir_props->s_tx_mask = ene_set_tx_mask;
ir_props->s_tx_carrier = ene_set_tx_carrier;
ir_props->s_tx_duty_cycle = ene_set_tx_duty_cycle;
- /* ir_props->s_carrier_report = ene_set_carrier_report; */
+ ir_props->s_carrier_report = ene_set_carrier_report;
}
ene_setup_hw_buffer(dev);
--
1.7.0.4
next prev parent reply other threads:[~2010-09-05 22:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-05 22:22 [PATCH 0/8 V4] Many fixes for in-kernel decoding and for the ENE driver Maxim Levitsky
2010-09-05 22:22 ` [PATCH 1/8] IR: plug races in IR raw thread Maxim Levitsky
2010-09-05 22:22 ` [PATCH 2/8] IR: make sure we register the input device when it is safe to do so Maxim Levitsky
2010-09-05 22:22 ` [PATCH 3/8] IR: fix duty cycle capability Maxim Levitsky
2010-09-05 22:22 ` [PATCH 4/8] IR: fix keys beeing stuck down forever Maxim Levitsky
2010-09-05 22:22 ` [PATCH 5/8] IR: extend MCE keymap Maxim Levitsky
2010-09-05 22:22 ` [PATCH 6/8] IR: ene_ir: updates Maxim Levitsky
2010-09-05 22:22 ` [PATCH 7/8] IR: extend ir_raw_event and do refactoring Maxim Levitsky
2010-09-05 22:22 ` Maxim Levitsky [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-09-06 21:26 [PATCH 0/8 V5] Many fixes for in-kernel decoding and for the ENE driver Maxim Levitsky
2010-09-06 21:26 ` [PATCH 8/8] IR: ene_ir: add support for carrier reports Maxim Levitsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1283725364-4053-9-git-send-email-maximlevitsky@gmail.com \
--to=maximlevitsky@gmail.com \
--cc=david@hardeman.nu \
--cc=jarod@wilsonet.com \
--cc=linux-input@vger.kernel.org \
--cc=lirc-list@lists.sourceforge.net \
--cc=mchehab@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).