From: Johan Hedberg <johan.hedberg@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 02/18 v2] Bluetooth: Add basic state tracking to Three-wire UART driver
Date: Mon, 16 Jul 2012 16:12:03 +0300 [thread overview]
Message-ID: <1342444339-1627-2-git-send-email-johan.hedberg@gmail.com> (raw)
In-Reply-To: <1342444339-1627-1-git-send-email-johan.hedberg@gmail.com>
From: Johan Hedberg <johan.hedberg@intel.com>
This patch adds basic state tracking and socket buffer handling to the
Three-wire UART (H5) HCI driver.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
drivers/bluetooth/hci_h5.c | 96 ++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 92 insertions(+), 4 deletions(-)
diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
index 6353d00..6b7ec64 100644
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -30,14 +30,48 @@
#include "hci_uart.h"
+struct h5 {
+ struct sk_buff_head unack; /* Unack'ed packets queue */
+ struct sk_buff_head rel; /* Reliable packets queue */
+ struct sk_buff_head unrel; /* Unreliable packets queue */
+
+ struct sk_buff *rx_skb;
+
+ bool txack_req;
+
+ u8 msgq_txseq;
+};
+
static int h5_open(struct hci_uart *hu)
{
- return -ENOSYS;
+ struct h5 *h5;
+
+ BT_DBG("hu %p", hu);
+
+ h5 = kzalloc(sizeof(*h5), GFP_KERNEL);
+ if (!h5)
+ return -ENOMEM;
+
+ hu->priv = h5;
+
+ skb_queue_head_init(&h5->unack);
+ skb_queue_head_init(&h5->rel);
+ skb_queue_head_init(&h5->unrel);
+
+ return 0;
}
static int h5_close(struct hci_uart *hu)
{
- return -ENOSYS;
+ struct h5 *h5 = hu->priv;
+
+ skb_queue_purge(&h5->unack);
+ skb_queue_purge(&h5->rel);
+ skb_queue_purge(&h5->unrel);
+
+ kfree(h5);
+
+ return 0;
}
static int h5_recv(struct hci_uart *hu, void *data, int count)
@@ -47,17 +81,71 @@ static int h5_recv(struct hci_uart *hu, void *data, int count)
static int h5_enqueue(struct hci_uart *hu, struct sk_buff *skb)
{
- return -ENOSYS;
+ struct h5 *h5 = hu->priv;
+
+ if (skb->len > 0xfff) {
+ BT_ERR("Packet too long (%u bytes)", skb->len);
+ kfree_skb(skb);
+ return 0;
+ }
+
+ switch (bt_cb(skb)->pkt_type) {
+ case HCI_ACLDATA_PKT:
+ case HCI_COMMAND_PKT:
+ skb_queue_tail(&h5->rel, skb);
+ break;
+
+ case HCI_SCODATA_PKT:
+ skb_queue_tail(&h5->unrel, skb);
+ break;
+
+ default:
+ BT_ERR("Unknown packet type %u", bt_cb(skb)->pkt_type);
+ kfree_skb(skb);
+ break;
+ }
+
+ return 0;
+}
+
+static struct sk_buff *h5_prepare_pkt(struct h5 *h5, struct sk_buff *skb)
+{
+ h5->txack_req = false;
+ return NULL;
+}
+
+static struct sk_buff *h5_prepare_ack(struct h5 *h5)
+{
+ h5->txack_req = false;
+ return NULL;
}
static struct sk_buff *h5_dequeue(struct hci_uart *hu)
{
+ struct h5 *h5 = hu->priv;
+ struct sk_buff *skb, *nskb;
+
+ if ((skb = skb_dequeue(&h5->unrel)) != NULL) {
+ nskb = h5_prepare_pkt(h5, skb);
+ if (nskb) {
+ kfree_skb(skb);
+ return nskb;
+ }
+
+ skb_queue_head(&h5->unrel, skb);
+ BT_ERR("Could not dequeue pkt because alloc_skb failed");
+ }
+
+ if (h5->txack_req)
+ return h5_prepare_ack(h5);
+
return NULL;
}
static int h5_flush(struct hci_uart *hu)
{
- return -ENOSYS;
+ BT_DBG("hu %p", hu);
+ return 0;
}
static struct hci_uart_proto h5p = {
--
1.7.10.4
next prev parent reply other threads:[~2012-07-16 13:12 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-16 13:12 [PATCH 01/18 v2] Bluetooth: Initial skeleton for Three-wire UART (H5) support Johan Hedberg
2012-07-16 13:12 ` Johan Hedberg [this message]
2012-07-16 13:12 ` [PATCH 03/18 v2] Bluetooth: Add initial reliable packet support for Three-wire UART Johan Hedberg
2012-07-16 13:12 ` [PATCH 04/18 v2] Bluetooth: Add basic packet parsing to Three-wire UART driver Johan Hedberg
2012-07-16 13:12 ` [PATCH 05/18 v2] Bluetooth: Add initial packet sending support to Three-wire UART Johan Hedberg
2012-07-16 13:12 ` [PATCH 06/18 v2] Bluetooth: Add Three-wire header value convenience macros Johan Hedberg
2012-07-16 13:12 ` [PATCH 07/18 v2] Bluetooth: Fix/implement Three-wire reliable packet sending Johan Hedberg
2012-07-16 13:12 ` [PATCH 08/18 v2] Bluetooth: Add support for Three-wire Link Control packets Johan Hedberg
2012-07-16 13:12 ` [PATCH 09/18 v2] Bluetooth: Simplify hci_uart_tty_close logic Johan Hedberg
2012-07-16 13:12 ` [PATCH 10/18 v2] Bluetooth: Add delayed init sequence support for UART controllers Johan Hedberg
2012-07-16 13:12 ` [PATCH 11/18 v2] Bluetooth: Use delayed init for Three-wire UART Johan Hedberg
2012-07-16 13:12 ` [PATCH 12/18 v2] Bluetooth: Improve rx debug logs " Johan Hedberg
2012-07-16 13:12 ` [PATCH 13/18 v2] Bluetooth: Add initial sleep support to " Johan Hedberg
2012-07-16 13:12 ` [PATCH 14/18 v2] Bluetooth: Add initialization tracking to HCI Three-wire driver Johan Hedberg
2012-07-16 13:12 ` [PATCH 15/18 v2] Bluetooth: Implement proper low-power support for Three-wire UART Johan Hedberg
2012-07-16 13:12 ` [PATCH 16/18 v2] Bluetooth: Remove unnecessary h5_build_pkt function Johan Hedberg
2012-07-16 13:12 ` [PATCH 17/18 v2] Bluetooth: Improve Three-wire UART configuration handling Johan Hedberg
2012-07-16 13:12 ` [PATCH 18/18 v2] Bluetooth: Introduce a flags variable to Three-wire UART state Johan Hedberg
2012-07-17 17:51 ` Gustavo Padovan
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=1342444339-1627-2-git-send-email-johan.hedberg@gmail.com \
--to=johan.hedberg@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).