Skip to content

Commit

Permalink
Bluetooth: Set hdev->dev_type based on Marvell device type
Browse files Browse the repository at this point in the history
Get the device type from MODULE_BRINGUP_REQ command response.

Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Bing Zhao authored and Marcel Holtmann committed May 10, 2010
1 parent 6406160 commit f120c6b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/bluetooth/btmrvl_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ struct btmrvl_device {
void *card;
struct hci_dev *hcidev;

u8 dev_type;

u8 tx_dnld_rdy;

u8 psmode;
Expand Down
9 changes: 9 additions & 0 deletions drivers/bluetooth/btmrvl_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,13 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
((event->data[2] == MODULE_BROUGHT_UP) ||
(event->data[2] == MODULE_ALREADY_UP)) ?
"Bring-up succeed" : "Bring-up failed");

if (event->length > 3)
priv->btmrvl_dev.dev_type = event->data[3];
else
priv->btmrvl_dev.dev_type = HCI_BREDR;

BT_DBG("dev_type: %d", priv->btmrvl_dev.dev_type);
} else if (priv->btmrvl_dev.sendcmdflag &&
event->data[1] == MODULE_SHUTDOWN_REQ) {
BT_DBG("EVENT:%s", (event->data[2]) ?
Expand Down Expand Up @@ -549,6 +556,8 @@ int btmrvl_register_hdev(struct btmrvl_private *priv)

btmrvl_send_module_cfg_cmd(priv, MODULE_BRINGUP_REQ);

hdev->dev_type = priv->btmrvl_dev.dev_type;

ret = hci_register_dev(hdev);
if (ret < 0) {
BT_ERR("Can not register HCI device");
Expand Down

0 comments on commit f120c6b

Please sign in to comment.