summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaudio Scordino <claudio@evidence.eu.com>2010-05-31 10:19:09 +0200
committerJesper Nilsson <jesper.nilsson@axis.com>2010-08-09 14:10:32 +0200
commitf1d23ed8218ca5afaf178a6495253dbb7fc98f57 (patch)
treee80045aba944222321ea47ba1dd8a5a2fc741348
parent9fe6206f400646a2322096b56c59891d530e8d51 (diff)
downloadblackbird-op-linux-f1d23ed8218ca5afaf178a6495253dbb7fc98f57.tar.gz
blackbird-op-linux-f1d23ed8218ca5afaf178a6495253dbb7fc98f57.zip
CRIS: ioctl for getting RS485 information
Add ioctl to CRIS serial driver to get RS485 data from user-space. Signed-off-by: Claudio Scordino <claudio@evidence.eu.com> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
-rw-r--r--arch/cris/include/asm/ioctls.h1
-rw-r--r--drivers/serial/crisv10.c11
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/cris/include/asm/ioctls.h b/arch/cris/include/asm/ioctls.h
index 35bbc181598a..076c07824eb6 100644
--- a/arch/cris/include/asm/ioctls.h
+++ b/arch/cris/include/asm/ioctls.h
@@ -77,6 +77,7 @@
#define TIOCSERSETRS485 0x5461 /* enable rs-485 (deprecated) */
#define TIOCSERWRRS485 0x5462 /* write rs-485 */
#define TIOCSRS485 0x5463 /* enable rs-485 */
+#define TIOCGRS485 0x542E /* get rs-485 */
/* Used for packet mode */
#define TIOCPKT_DATA 0
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 31f172397af3..30626440a062 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -3724,6 +3724,17 @@ rs_ioctl(struct tty_struct *tty, struct file * file,
return e100_enable_rs485(tty, &rs485data);
}
+ case TIOCGRS485:
+ {
+ struct serial_rs485 *rs485data =
+ &(((struct e100_serial *)tty->driver_data)->rs485);
+ /* This is the ioctl to get RS485 data from user-space */
+ if (copy_to_user((struct serial_rs485 *) arg,
+ rs485data,
+ sizeof(serial_rs485)))
+ return -EFAULT;
+ break;
+ }
case TIOCSERWRRS485:
{
OpenPOWER on IntegriCloud