mirror of
https://github.com/torvalds/linux.git
synced 2024-10-30 00:32:38 +00:00
TTY: rfcomm/tty, add tty_port
And use tty from there. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
3d5ea59d35
commit
f60db8c424
@ -48,6 +48,7 @@
|
|||||||
static struct tty_driver *rfcomm_tty_driver;
|
static struct tty_driver *rfcomm_tty_driver;
|
||||||
|
|
||||||
struct rfcomm_dev {
|
struct rfcomm_dev {
|
||||||
|
struct tty_port port;
|
||||||
struct list_head list;
|
struct list_head list;
|
||||||
atomic_t refcnt;
|
atomic_t refcnt;
|
||||||
|
|
||||||
@ -64,7 +65,6 @@ struct rfcomm_dev {
|
|||||||
uint modem_status;
|
uint modem_status;
|
||||||
|
|
||||||
struct rfcomm_dlc *dlc;
|
struct rfcomm_dlc *dlc;
|
||||||
struct tty_struct *tty;
|
|
||||||
wait_queue_head_t wait;
|
wait_queue_head_t wait;
|
||||||
struct work_struct wakeup_task;
|
struct work_struct wakeup_task;
|
||||||
|
|
||||||
@ -252,6 +252,7 @@ static int rfcomm_dev_add(struct rfcomm_dev_req *req, struct rfcomm_dlc *dlc)
|
|||||||
|
|
||||||
atomic_set(&dev->opened, 0);
|
atomic_set(&dev->opened, 0);
|
||||||
|
|
||||||
|
tty_port_init(&dev->port);
|
||||||
init_waitqueue_head(&dev->wait);
|
init_waitqueue_head(&dev->wait);
|
||||||
INIT_WORK(&dev->wakeup_task, rfcomm_tty_wakeup);
|
INIT_WORK(&dev->wakeup_task, rfcomm_tty_wakeup);
|
||||||
|
|
||||||
@ -440,8 +441,8 @@ static int rfcomm_release_dev(void __user *arg)
|
|||||||
rfcomm_dlc_close(dev->dlc, 0);
|
rfcomm_dlc_close(dev->dlc, 0);
|
||||||
|
|
||||||
/* Shut down TTY synchronously before freeing rfcomm_dev */
|
/* Shut down TTY synchronously before freeing rfcomm_dev */
|
||||||
if (dev->tty)
|
if (dev->port.tty)
|
||||||
tty_vhangup(dev->tty);
|
tty_vhangup(dev->port.tty);
|
||||||
|
|
||||||
if (!test_bit(RFCOMM_RELEASE_ONHUP, &dev->flags))
|
if (!test_bit(RFCOMM_RELEASE_ONHUP, &dev->flags))
|
||||||
rfcomm_dev_del(dev);
|
rfcomm_dev_del(dev);
|
||||||
@ -559,7 +560,7 @@ static void rfcomm_dev_data_ready(struct rfcomm_dlc *dlc, struct sk_buff *skb)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
tty = dev->tty;
|
tty = dev->port.tty;
|
||||||
if (!tty || !skb_queue_empty(&dev->pending)) {
|
if (!tty || !skb_queue_empty(&dev->pending)) {
|
||||||
skb_queue_tail(&dev->pending, skb);
|
skb_queue_tail(&dev->pending, skb);
|
||||||
return;
|
return;
|
||||||
@ -585,7 +586,7 @@ static void rfcomm_dev_state_change(struct rfcomm_dlc *dlc, int err)
|
|||||||
wake_up_interruptible(&dev->wait);
|
wake_up_interruptible(&dev->wait);
|
||||||
|
|
||||||
if (dlc->state == BT_CLOSED) {
|
if (dlc->state == BT_CLOSED) {
|
||||||
if (!dev->tty) {
|
if (!dev->port.tty) {
|
||||||
if (test_bit(RFCOMM_RELEASE_ONHUP, &dev->flags)) {
|
if (test_bit(RFCOMM_RELEASE_ONHUP, &dev->flags)) {
|
||||||
/* Drop DLC lock here to avoid deadlock
|
/* Drop DLC lock here to avoid deadlock
|
||||||
* 1. rfcomm_dev_get will take rfcomm_dev_lock
|
* 1. rfcomm_dev_get will take rfcomm_dev_lock
|
||||||
@ -605,7 +606,7 @@ static void rfcomm_dev_state_change(struct rfcomm_dlc *dlc, int err)
|
|||||||
rfcomm_dlc_lock(dlc);
|
rfcomm_dlc_lock(dlc);
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
tty_hangup(dev->tty);
|
tty_hangup(dev->port.tty);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -618,8 +619,8 @@ static void rfcomm_dev_modem_status(struct rfcomm_dlc *dlc, u8 v24_sig)
|
|||||||
BT_DBG("dlc %p dev %p v24_sig 0x%02x", dlc, dev, v24_sig);
|
BT_DBG("dlc %p dev %p v24_sig 0x%02x", dlc, dev, v24_sig);
|
||||||
|
|
||||||
if ((dev->modem_status & TIOCM_CD) && !(v24_sig & RFCOMM_V24_DV)) {
|
if ((dev->modem_status & TIOCM_CD) && !(v24_sig & RFCOMM_V24_DV)) {
|
||||||
if (dev->tty && !C_CLOCAL(dev->tty))
|
if (dev->port.tty && !C_CLOCAL(dev->port.tty))
|
||||||
tty_hangup(dev->tty);
|
tty_hangup(dev->port.tty);
|
||||||
}
|
}
|
||||||
|
|
||||||
dev->modem_status =
|
dev->modem_status =
|
||||||
@ -634,7 +635,7 @@ static void rfcomm_tty_wakeup(struct work_struct *work)
|
|||||||
{
|
{
|
||||||
struct rfcomm_dev *dev = container_of(work, struct rfcomm_dev,
|
struct rfcomm_dev *dev = container_of(work, struct rfcomm_dev,
|
||||||
wakeup_task);
|
wakeup_task);
|
||||||
struct tty_struct *tty = dev->tty;
|
struct tty_struct *tty = dev->port.tty;
|
||||||
if (!tty)
|
if (!tty)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -644,7 +645,7 @@ static void rfcomm_tty_wakeup(struct work_struct *work)
|
|||||||
|
|
||||||
static void rfcomm_tty_copy_pending(struct rfcomm_dev *dev)
|
static void rfcomm_tty_copy_pending(struct rfcomm_dev *dev)
|
||||||
{
|
{
|
||||||
struct tty_struct *tty = dev->tty;
|
struct tty_struct *tty = dev->port.tty;
|
||||||
struct sk_buff *skb;
|
struct sk_buff *skb;
|
||||||
int inserted = 0;
|
int inserted = 0;
|
||||||
|
|
||||||
@ -697,7 +698,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
|
|||||||
|
|
||||||
rfcomm_dlc_lock(dlc);
|
rfcomm_dlc_lock(dlc);
|
||||||
tty->driver_data = dev;
|
tty->driver_data = dev;
|
||||||
dev->tty = tty;
|
dev->port.tty = tty;
|
||||||
rfcomm_dlc_unlock(dlc);
|
rfcomm_dlc_unlock(dlc);
|
||||||
set_bit(RFCOMM_TTY_ATTACHED, &dev->flags);
|
set_bit(RFCOMM_TTY_ATTACHED, &dev->flags);
|
||||||
|
|
||||||
@ -762,7 +763,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
|
|||||||
|
|
||||||
rfcomm_dlc_lock(dev->dlc);
|
rfcomm_dlc_lock(dev->dlc);
|
||||||
tty->driver_data = NULL;
|
tty->driver_data = NULL;
|
||||||
dev->tty = NULL;
|
dev->port.tty = NULL;
|
||||||
rfcomm_dlc_unlock(dev->dlc);
|
rfcomm_dlc_unlock(dev->dlc);
|
||||||
|
|
||||||
if (test_bit(RFCOMM_TTY_RELEASED, &dev->flags)) {
|
if (test_bit(RFCOMM_TTY_RELEASED, &dev->flags)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user