From: Frederic Danis <frederic.danis@linux.intel.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH v2 3/5] Bluetooth: hci_uart: Support operational speed during setup
Date: Thu, 7 May 2015 16:24:57 +0200 [thread overview]
Message-ID: <1431008699-6419-3-git-send-email-frederic.danis@linux.intel.com> (raw)
In-Reply-To: <1431008699-6419-1-git-send-email-frederic.danis@linux.intel.com>
Add default and operational speeds.
Change to operational speed as soon as possible.
Signed-off-by: Frederic Danis <frederic.danis@linux.intel.com>
---
drivers/bluetooth/hci_ldisc.c | 26 ++++++++++++++++++++++++++
drivers/bluetooth/hci_uart.h | 4 ++++
2 files changed, 30 insertions(+)
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 2b5d946..071f09c 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -265,11 +265,37 @@ static int hci_uart_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
return 0;
}
+void hci_uart_set_baudrate(struct hci_uart *hu, unsigned long speed)
+{
+ struct tty_struct *tty = hu->tty;
+ struct ktermios ktermios;
+
+ ktermios = tty->termios;
+ ktermios.c_cflag &= ~CBAUD;
+ ktermios.c_cflag |= BOTHER;
+ tty_termios_encode_baud_rate(&ktermios, speed, speed);
+
+ tty_set_termios(tty, &ktermios);
+
+ BT_DBG("%s: New tty speed: %d", hu->hdev->name, tty->termios.c_ispeed);
+}
+
static int hci_uart_setup(struct hci_dev *hdev)
{
struct hci_uart *hu = hci_get_drvdata(hdev);
struct hci_rp_read_local_version *ver;
struct sk_buff *skb;
+ int err;
+
+ if (hu->proto->default_speed)
+ hci_uart_set_baudrate(hu, hu->proto->default_speed);
+
+ if (hu->proto->set_baudrate && hu->proto->operational_speed) {
+ err = hu->proto->set_baudrate(hu, hu->proto->operational_speed);
+ if (err)
+ return err;
+ hci_uart_set_baudrate(hu, hu->proto->operational_speed);
+ }
if (hu->proto->setup)
return hu->proto->setup(hu);
diff --git a/drivers/bluetooth/hci_uart.h b/drivers/bluetooth/hci_uart.h
index 72120a5..572ac04 100644
--- a/drivers/bluetooth/hci_uart.h
+++ b/drivers/bluetooth/hci_uart.h
@@ -58,10 +58,13 @@ struct hci_uart;
struct hci_uart_proto {
unsigned int id;
const char *name;
+ unsigned long default_speed;
+ unsigned long operational_speed;
int (*open)(struct hci_uart *hu);
int (*close)(struct hci_uart *hu);
int (*flush)(struct hci_uart *hu);
int (*setup)(struct hci_uart *hu);
+ int (*set_baudrate)(struct hci_uart *hu, int speed);
int (*recv)(struct hci_uart *hu, const void *data, int len);
int (*enqueue)(struct hci_uart *hu, struct sk_buff *skb);
struct sk_buff *(*dequeue)(struct hci_uart *hu);
@@ -96,6 +99,7 @@ int hci_uart_register_proto(const struct hci_uart_proto *p);
int hci_uart_unregister_proto(const struct hci_uart_proto *p);
int hci_uart_tx_wakeup(struct hci_uart *hu);
int hci_uart_init_ready(struct hci_uart *hu);
+void hci_uart_set_baudrate(struct hci_uart *hu, unsigned long speed);
#ifdef CONFIG_BT_HCIUART_H4
int h4_init(void);
--
1.9.1
next prev parent reply other threads:[~2015-05-07 14:24 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-07 14:24 [PATCH v2 1/5] Bluetooth: hci_core: return cmd status in __hci_cmd_sync() Frederic Danis
2015-05-07 14:24 ` [PATCH v2 2/5] Bluetooth: btbcm: Add BCM4324B3 UART device Frederic Danis
2015-05-07 16:19 ` Marcel Holtmann
2015-05-13 14:10 ` Frederic Danis
2015-05-07 14:24 ` Frederic Danis [this message]
2015-05-07 16:13 ` [PATCH v2 3/5] Bluetooth: hci_uart: Support operational speed during setup Marcel Holtmann
2015-05-07 14:24 ` [PATCH v2 4/5] Bluetooth: btbcm: Split setup() function Frederic Danis
2015-05-07 16:22 ` Marcel Holtmann
2015-05-15 14:11 ` Frederic Danis
2015-05-15 17:17 ` Marcel Holtmann
2015-05-07 14:24 ` [PATCH v2 5/5] Bluetooth: btbcm: Add bcm_set_baudrate() Frederic Danis
2015-05-07 16:16 ` Marcel Holtmann
2015-05-07 16:11 ` [PATCH v2 1/5] Bluetooth: hci_core: return cmd status in __hci_cmd_sync() Marcel Holtmann
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=1431008699-6419-3-git-send-email-frederic.danis@linux.intel.com \
--to=frederic.danis@linux.intel.com \
--cc=linux-bluetooth@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.