提交 c6f2c47b 编写于 作者: M Marek Belisko 提交者: Greg Kroah-Hartman

staging: ft1000: lines over 80 characters corrected.

Signed-off-by: NMarek Belisko <marek.belisko@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 0f570d8c
...@@ -68,7 +68,8 @@ int ft1000_poll_thread(void *arg) ...@@ -68,7 +68,8 @@ int ft1000_poll_thread(void *arg)
// Notes: // Notes:
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static int ft1000_probe(struct usb_interface *interface, const struct usb_device_id *id) static int ft1000_probe(struct usb_interface *interface,
const struct usb_device_id *id)
{ {
struct usb_host_interface *iface_desc; struct usb_host_interface *iface_desc;
struct usb_endpoint_descriptor *endpoint; struct usb_endpoint_descriptor *endpoint;
...@@ -92,7 +93,8 @@ static int ft1000_probe(struct usb_interface *interface, const struct usb_device ...@@ -92,7 +93,8 @@ static int ft1000_probe(struct usb_interface *interface, const struct usb_device
dev = interface_to_usbdev(interface); dev = interface_to_usbdev(interface);
DEBUG("ft1000_probe: usb device descriptor info:\n"); DEBUG("ft1000_probe: usb device descriptor info:\n");
DEBUG("ft1000_probe: number of configuration is %d\n", dev->descriptor.bNumConfigurations); DEBUG("ft1000_probe: number of configuration is %d\n",
dev->descriptor.bNumConfigurations);
ft1000dev->dev = dev; ft1000dev->dev = dev;
ft1000dev->status = 0; ft1000dev->status = 0;
...@@ -106,32 +108,52 @@ static int ft1000_probe(struct usb_interface *interface, const struct usb_device ...@@ -106,32 +108,52 @@ static int ft1000_probe(struct usb_interface *interface, const struct usb_device
numaltsetting = interface->num_altsetting; numaltsetting = interface->num_altsetting;
DEBUG("ft1000_probe: number of alt settings is :%d\n", numaltsetting); DEBUG("ft1000_probe: number of alt settings is :%d\n", numaltsetting);
iface_desc = interface->cur_altsetting; iface_desc = interface->cur_altsetting;
DEBUG("ft1000_probe: number of endpoints is %d\n", iface_desc->desc.bNumEndpoints); DEBUG("ft1000_probe: number of endpoints is %d\n",
DEBUG("ft1000_probe: descriptor type is %d\n", iface_desc->desc.bDescriptorType); iface_desc->desc.bNumEndpoints);
DEBUG("ft1000_probe: interface number is %d\n", iface_desc->desc.bInterfaceNumber); DEBUG("ft1000_probe: descriptor type is %d\n",
DEBUG("ft1000_probe: alternatesetting is %d\n", iface_desc->desc.bAlternateSetting); iface_desc->desc.bDescriptorType);
DEBUG("ft1000_probe: interface class is %d\n", iface_desc->desc.bInterfaceClass); DEBUG("ft1000_probe: interface number is %d\n",
iface_desc->desc.bInterfaceNumber);
DEBUG("ft1000_probe: alternatesetting is %d\n",
iface_desc->desc.bAlternateSetting);
DEBUG("ft1000_probe: interface class is %d\n",
iface_desc->desc.bInterfaceClass);
DEBUG("ft1000_probe: control endpoint info:\n"); DEBUG("ft1000_probe: control endpoint info:\n");
DEBUG("ft1000_probe: descriptor0 type -- %d\n", iface_desc->endpoint[0].desc.bmAttributes); DEBUG("ft1000_probe: descriptor0 type -- %d\n",
DEBUG("ft1000_probe: descriptor1 type -- %d\n", iface_desc->endpoint[1].desc.bmAttributes); iface_desc->endpoint[0].desc.bmAttributes);
DEBUG("ft1000_probe: descriptor2 type -- %d\n", iface_desc->endpoint[2].desc.bmAttributes); DEBUG("ft1000_probe: descriptor1 type -- %d\n",
iface_desc->endpoint[1].desc.bmAttributes);
DEBUG("ft1000_probe: descriptor2 type -- %d\n",
iface_desc->endpoint[2].desc.bmAttributes);
for (i = 0; i < iface_desc->desc.bNumEndpoints; i++) { for (i = 0; i < iface_desc->desc.bNumEndpoints; i++) {
endpoint = (struct usb_endpoint_descriptor *)&iface_desc->endpoint[i].desc; endpoint =
(struct usb_endpoint_descriptor *)&iface_desc->endpoint[i].
desc;
DEBUG("endpoint %d\n", i); DEBUG("endpoint %d\n", i);
DEBUG("bEndpointAddress=%x, bmAttributes=%x\n", endpoint->bEndpointAddress, endpoint->bmAttributes); DEBUG("bEndpointAddress=%x, bmAttributes=%x\n",
if ((endpoint->bEndpointAddress & USB_DIR_IN) && ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK)) { endpoint->bEndpointAddress, endpoint->bmAttributes);
ft1000dev->bulk_in_endpointAddr = endpoint->bEndpointAddress; if ((endpoint->bEndpointAddress & USB_DIR_IN)
DEBUG("ft1000_probe: in: %d\n", endpoint->bEndpointAddress); && ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
USB_ENDPOINT_XFER_BULK)) {
ft1000dev->bulk_in_endpointAddr =
endpoint->bEndpointAddress;
DEBUG("ft1000_probe: in: %d\n",
endpoint->bEndpointAddress);
} }
if (!(endpoint->bEndpointAddress & USB_DIR_IN) && ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK)) { if (!(endpoint->bEndpointAddress & USB_DIR_IN)
ft1000dev->bulk_out_endpointAddr = endpoint->bEndpointAddress; && ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
DEBUG("ft1000_probe: out: %d\n", endpoint->bEndpointAddress); USB_ENDPOINT_XFER_BULK)) {
ft1000dev->bulk_out_endpointAddr =
endpoint->bEndpointAddress;
DEBUG("ft1000_probe: out: %d\n",
endpoint->bEndpointAddress);
} }
} }
DEBUG("bulk_in=%d, bulk_out=%d\n", ft1000dev->bulk_in_endpointAddr, ft1000dev->bulk_out_endpointAddr); DEBUG("bulk_in=%d, bulk_out=%d\n", ft1000dev->bulk_in_endpointAddr,
ft1000dev->bulk_out_endpointAddr);
ret = request_firmware(&dsp_fw, "ft3000.img", &dev->dev); ret = request_firmware(&dsp_fw, "ft3000.img", &dev->dev);
if (ret < 0) { if (ret < 0) {
...@@ -164,7 +186,8 @@ static int ft1000_probe(struct usb_interface *interface, const struct usb_device ...@@ -164,7 +186,8 @@ static int ft1000_probe(struct usb_interface *interface, const struct usb_device
} }
gPollingfailed = FALSE; gPollingfailed = FALSE;
pft1000info->pPollThread = kthread_run(ft1000_poll_thread, ft1000dev, "ft1000_poll"); pft1000info->pPollThread =
kthread_run(ft1000_poll_thread, ft1000dev, "ft1000_poll");
msleep(500); msleep(500);
while (!pft1000info->CardReady) { while (!pft1000info->CardReady) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册