| Message ID | 1512357682-8911-3-git-send-email-david@lechnology.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | bluetooth: hci_ll: Get MAC address from NVMEM | expand |
Hi David, > This adds a #define for the vendor-specific HCI command to set the > baudrate instead of using the bare 0xff36 multiple times. > > Signed-off-by: David Lechner <david@lechnology.com> > --- > drivers/bluetooth/hci_ll.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) patch has been applied to bluetooth-next tree. Regards Marcel
On 12/04/2017 12:23 AM, Marcel Holtmann wrote: > Hi David, > >> This adds a #define for the vendor-specific HCI command to set the >> baudrate instead of using the bare 0xff36 multiple times. >> >> Signed-off-by: David Lechner <david@lechnology.com> >> --- >> drivers/bluetooth/hci_ll.c | 10 ++++++++-- >> 1 file changed, 8 insertions(+), 2 deletions(-) > > patch has been applied to bluetooth-next tree. > I am new to the bluetooth tree, so just to be sure... does this mean I should not include this patch in v2 of this series since this patch has been applied?
Hi David, >>> This adds a #define for the vendor-specific HCI command to set the >>> baudrate instead of using the bare 0xff36 multiple times. >>> >>> Signed-off-by: David Lechner <david@lechnology.com> >>> --- >>> drivers/bluetooth/hci_ll.c | 10 ++++++++-- >>> 1 file changed, 8 insertions(+), 2 deletions(-) >> patch has been applied to bluetooth-next tree. > > I am new to the bluetooth tree, so just to be sure... does this mean I should not include this patch in v2 of this series since this patch has been applied? please don’t include already applied patches. Base everything against bluetooth-next tree. Regards Marcel
diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c index 447abea..974a788 100644 --- a/drivers/bluetooth/hci_ll.c +++ b/drivers/bluetooth/hci_ll.c @@ -56,6 +56,9 @@ #include "hci_uart.h" +/* Vendor-specific HCI commands */ +#define HCI_VS_UPDATE_UART_HCI_BAUDRATE 0xff36 + /* HCILL commands */ #define HCILL_GO_TO_SLEEP_IND 0x30 #define HCILL_GO_TO_SLEEP_ACK 0x31 @@ -620,7 +623,7 @@ static int download_firmware(struct ll_device *lldev) case ACTION_SEND_COMMAND: /* action send */ bt_dev_dbg(lldev->hu.hdev, "S"); cmd = (struct hci_command *)action_ptr; - if (cmd->opcode == 0xff36) { + if (cmd->opcode == HCI_VS_UPDATE_UART_HCI_BAUDRATE) { /* ignore remote change * baud rate HCI VS command */ @@ -704,7 +707,10 @@ static int ll_setup(struct hci_uart *hu) speed = 0; if (speed) { - struct sk_buff *skb = __hci_cmd_sync(hu->hdev, 0xff36, sizeof(speed), &speed, HCI_INIT_TIMEOUT); + struct sk_buff *skb; + + skb = __hci_cmd_sync(hu->hdev, HCI_VS_UPDATE_UART_HCI_BAUDRATE, + sizeof(speed), &speed, HCI_INIT_TIMEOUT); if (!IS_ERR(skb)) { kfree_skb(skb); serdev_device_set_baudrate(serdev, speed);
This adds a #define for the vendor-specific HCI command to set the baudrate instead of using the bare 0xff36 multiple times. Signed-off-by: David Lechner <david@lechnology.com> --- drivers/bluetooth/hci_ll.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)