diff options
| -rw-r--r-- | drivers/bluetooth/Kconfig | 16 | ||||
| -rw-r--r-- | drivers/bluetooth/hci_usb.c | 24 |
2 files changed, 16 insertions, 24 deletions
diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig index 30d099c33aee..593f49396baf 100644 --- a/drivers/bluetooth/Kconfig +++ b/drivers/bluetooth/Kconfig @@ -13,22 +13,14 @@ config BT_HCIUSB Say Y here to compile support for Bluetooth USB devices into the kernel or say M to compile it as module (hci_usb). -config BT_USB_SCO - bool "SCO over HCI USB support" +config BT_HCIUSB_SCO + bool "SCO (voice) support" depends on BT_HCIUSB help This option enables the SCO support in the HCI USB driver. You need this - to transmit voice data with your Bluetooth USB device. - Say Y here to compile support for SCO over HCI USB. + to transmit voice data with your Bluetooth USB device. -config BT_USB_ZERO_PACKET - bool "USB zero packet support" - depends on BT_HCIUSB - help - This option is provided only as a work around for buggy Bluetooth USB - devices. Do _not_ enable it unless you know for sure that your device - requires zero packets. - Most people should say N here. + Say Y here to compile support for SCO over HCI USB. config BT_HCIUART tristate "HCI UART driver" diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c index da8f273ad60d..4511511cb475 100644 --- a/drivers/bluetooth/hci_usb.c +++ b/drivers/bluetooth/hci_usb.c @@ -62,7 +62,7 @@ #define BT_DMP( A... ) #endif -#ifndef CONFIG_BT_USB_ZERO_PACKET +#ifndef CONFIG_BT_HCIUSB_ZERO_PACKET #undef URB_ZERO_PACKET #define URB_ZERO_PACKET 0 #endif @@ -140,7 +140,7 @@ static inline struct _urb *__get_completed(struct hci_usb *husb, int type) return _urb_dequeue(__completed_q(husb, type)); } -#ifdef CONFIG_BT_USB_SCO +#ifdef CONFIG_BT_HCIUSB_SCO static void __fill_isoc_desc(struct urb *urb, int len, int mtu) { int offset = 0, i; @@ -238,7 +238,7 @@ static int hci_usb_bulk_rx_submit(struct hci_usb *husb) return err; } -#ifdef CONFIG_BT_USB_SCO +#ifdef CONFIG_BT_HCIUSB_SCO static int hci_usb_isoc_rx_submit(struct hci_usb *husb) { struct _urb *_urb; @@ -307,7 +307,7 @@ static int hci_usb_open(struct hci_dev *hdev) for (i = 0; i < HCI_MAX_BULK_RX; i++) hci_usb_bulk_rx_submit(husb); -#ifdef CONFIG_BT_USB_SCO +#ifdef CONFIG_BT_HCIUSB_SCO if (husb->isoc_iface) for (i = 0; i < HCI_MAX_ISOC_RX; i++) hci_usb_isoc_rx_submit(husb); @@ -473,7 +473,7 @@ static inline int hci_usb_send_bulk(struct hci_usb *husb, struct sk_buff *skb) return __tx_submit(husb, _urb); } -#ifdef CONFIG_BT_USB_SCO +#ifdef CONFIG_BT_HCIUSB_SCO static inline int hci_usb_send_isoc(struct hci_usb *husb, struct sk_buff *skb) { struct _urb *_urb = __get_completed(husb, skb->pkt_type); @@ -524,7 +524,7 @@ static void hci_usb_tx_process(struct hci_usb *husb) skb_queue_head(q, skb); } -#ifdef CONFIG_BT_USB_SCO +#ifdef CONFIG_BT_HCIUSB_SCO /* Process SCO queue */ q = __transmit_q(husb, HCI_SCODATA_PKT); if (atomic_read(__pending_tx(husb, HCI_SCODATA_PKT)) < HCI_MAX_ISOC_TX && @@ -583,7 +583,7 @@ static int hci_usb_send_frame(struct sk_buff *skb) hdev->stat.acl_tx++; break; -#ifdef CONFIG_BT_USB_SCO +#ifdef CONFIG_BT_HCIUSB_SCO case HCI_SCODATA_PKT: hdev->stat.sco_tx++; break; @@ -633,7 +633,7 @@ static inline int __recv_frame(struct hci_usb *husb, int type, void *data, int c } else return -EILSEQ; break; -#ifdef CONFIG_BT_USB_SCO +#ifdef CONFIG_BT_HCIUSB_SCO case HCI_SCODATA_PKT: if (count >= HCI_SCO_HDR_SIZE) { struct hci_sco_hdr *h = data; @@ -698,7 +698,7 @@ static void hci_usb_rx_complete(struct urb *urb, struct pt_regs *regs) goto resubmit; if (_urb->type == HCI_SCODATA_PKT) { -#ifdef CONFIG_BT_USB_SCO +#ifdef CONFIG_BT_HCIUSB_SCO int i; for (i=0; i < urb->number_of_packets; i++) { BT_DBG("desc %d status %d offset %d len %d", i, @@ -833,7 +833,7 @@ int hci_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) bulk_out_ep[i] = ep; break; -#ifdef CONFIG_BT_USB_SCO +#ifdef CONFIG_BT_HCIUSB_SCO case USB_ENDPOINT_XFER_ISOC: if (ep->desc.wMaxPacketSize < size || a > 2) break; @@ -859,7 +859,7 @@ int hci_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) goto done; } -#ifdef CONFIG_BT_USB_SCO +#ifdef CONFIG_BT_HCIUSB_SCO if (!isoc_in_ep[1] || !isoc_out_ep[1]) { BT_DBG("Isoc endpoints not found"); isoc_iface = NULL; @@ -883,7 +883,7 @@ int hci_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) else husb->ctrl_req = HCI_CTRL_REQ; -#ifdef CONFIG_BT_USB_SCO +#ifdef CONFIG_BT_HCIUSB_SCO if (isoc_iface) { BT_DBG("isoc ifnum %d alts %d", isoc_ifnum, isoc_alts); if (usb_set_interface(udev, isoc_ifnum, isoc_alts)) { |