Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e61ef499 authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Gustavo Padovan
Browse files

Bluetooth: Split ctrl init to BREDR and AMP parts 



Current controller initialization is moved tp bredr_init and new
function added amp_init to handle later AMP init sequence. Current
AMP init sequence include Reset and Read Local Version.

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 27bf8882

net/bluetooth/hci_core.c

+46 −18
Original line number Diff line number Diff line
@@ -193,27 +193,12 @@ static void hci_reset_req(struct hci_dev *hdev, unsigned long opt) 
	hci_send_cmd(hdev, HCI_OP_RESET, 0, NULL);

}



static void hci_init_req(struct hci_dev *hdev, unsigned long opt)

static void bredr_init(struct hci_dev *hdev)

{

	struct hci_cp_delete_stored_link_key cp;

	struct sk_buff *skb;

	__le16 param;

	__u8 flt_type;



	BT_DBG("%s %ld", hdev->name, opt);



	/* Driver initialization */



	/* Special commands */

	while ((skb = skb_dequeue(&hdev->driver_init))) {

		bt_cb(skb)->pkt_type = HCI_COMMAND_PKT;

		skb->dev = (void *) hdev;



		skb_queue_tail(&hdev->cmd_q, skb);

		queue_work(hdev->workqueue, &hdev->cmd_work);

	}

	skb_queue_purge(&hdev->driver_init);



	/* Mandatory initialization */



	/* Reset */
@@ -258,6 +243,49 @@ static void hci_init_req(struct hci_dev *hdev, unsigned long opt) 
	hci_send_cmd(hdev, HCI_OP_DELETE_STORED_LINK_KEY, sizeof(cp), &cp);

}



static void amp_init(struct hci_dev *hdev)

{

	/* Reset */

	hci_send_cmd(hdev, HCI_OP_RESET, 0, NULL);



	/* Read Local Version */

	hci_send_cmd(hdev, HCI_OP_READ_LOCAL_VERSION, 0, NULL);

}



static void hci_init_req(struct hci_dev *hdev, unsigned long opt)

{

	struct sk_buff *skb;



	BT_DBG("%s %ld", hdev->name, opt);



	/* Driver initialization */



	/* Special commands */

	while ((skb = skb_dequeue(&hdev->driver_init))) {

		bt_cb(skb)->pkt_type = HCI_COMMAND_PKT;

		skb->dev = (void *) hdev;



		skb_queue_tail(&hdev->cmd_q, skb);

		queue_work(hdev->workqueue, &hdev->cmd_work);

	}

	skb_queue_purge(&hdev->driver_init);



	switch (hdev->dev_type) {

	case HCI_BREDR:

		bredr_init(hdev);

		break;



	case HCI_AMP:

		amp_init(hdev);

		break;



	default:

		BT_ERR("Unknown device type %d", hdev->dev_type);

		break;

	}



}



static void hci_le_init_req(struct hci_dev *hdev, unsigned long opt)

{

	BT_DBG("%s", hdev->name);

net/bluetooth/hci_event.c

+3 −0
Original line number Diff line number Diff line
@@ -556,6 +556,9 @@ static void hci_set_le_support(struct hci_dev *hdev) 


static void hci_setup(struct hci_dev *hdev)

{

	if (hdev->dev_type != HCI_BREDR)

		return;



	hci_setup_event_mask(hdev);



	if (hdev->hci_ver > BLUETOOTH_VER_1_1)