summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-09 21:04:23 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-09 21:04:23 -0700
commit7fbd15f9b42f2c30ceeb94776a111d0c28669e0c (patch)
treea196404c795091aae4254c9d479dce1c0653e4c5
parent1989425a3aed215f1accd5d8019b18b345166a63 (diff)
parentf1d23ed8218ca5afaf178a6495253dbb7fc98f57 (diff)
downloadop-kernel-dev-7fbd15f9b42f2c30ceeb94776a111d0c28669e0c.zip
op-kernel-dev-7fbd15f9b42f2c30ceeb94776a111d0c28669e0c.tar.gz
Merge branch 'rs485fix' of git://www.jni.nu/cris
* 'rs485fix' of git://www.jni.nu/cris: CRIS: ioctl for getting RS485 information
-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 35bbc18..076c078 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 31f1723..3062644 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