summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Engraf <david.engraf@sysgo.com>2011-01-20 23:05:17 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-01-20 23:11:56 -0800
commit48c27016e18f8608c12b7516515ad773093198d8 (patch)
tree18d46f8b955f5f83248dbb4de449feb559f9b103
parentb0f05aadf1516c166ba301b7a535bc9429ce1961 (diff)
downloadlinux-stable-48c27016e18f8608c12b7516515ad773093198d8.tar.gz
linux-stable-48c27016e18f8608c12b7516515ad773093198d8.tar.bz2
linux-stable-48c27016e18f8608c12b7516515ad773093198d8.zip
Input: serio - allow registered drivers to get status flag
Parse and pass the status byte information to the registered serio drivers as well as the data bytes. Signed-off-by: David Engraf<david.engraf@sysgo.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r--drivers/input/serio/serport.c24
1 files changed, 20 insertions, 4 deletions
diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c
index 6e362de3f412..8755f5f3ad37 100644
--- a/drivers/input/serio/serport.c
+++ b/drivers/input/serio/serport.c
@@ -116,14 +116,15 @@ static void serport_ldisc_close(struct tty_struct *tty)
/*
* serport_ldisc_receive() is called by the low level tty driver when characters
- * are ready for us. We forward the characters, one by one to the 'interrupt'
- * routine.
+ * are ready for us. We forward the characters and flags, one by one to the
+ * 'interrupt' routine.
*/
static void serport_ldisc_receive(struct tty_struct *tty, const unsigned char *cp, char *fp, int count)
{
struct serport *serport = (struct serport*) tty->disc_data;
unsigned long flags;
+ unsigned int ch_flags;
int i;
spin_lock_irqsave(&serport->lock, flags);
@@ -131,8 +132,23 @@ static void serport_ldisc_receive(struct tty_struct *tty, const unsigned char *c
if (!test_bit(SERPORT_ACTIVE, &serport->flags))
goto out;
- for (i = 0; i < count; i++)
- serio_interrupt(serport->serio, cp[i], 0);
+ for (i = 0; i < count; i++) {
+ switch (fp[i]) {
+ case TTY_FRAME:
+ ch_flags = SERIO_FRAME;
+ break;
+
+ case TTY_PARITY:
+ ch_flags = SERIO_PARITY;
+ break;
+
+ default:
+ ch_flags = 0;
+ break;
+ }
+
+ serio_interrupt(serport->serio, cp[i], ch_flags);
+ }
out:
spin_unlock_irqrestore(&serport->lock, flags);