diff options
Diffstat (limited to 'drivers/staging/vt6656/usbpipe.c')
| -rw-r--r-- | drivers/staging/vt6656/usbpipe.c | 99 |
1 files changed, 15 insertions, 84 deletions
diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index fd2355e34fb0..a32785cb9d18 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -107,10 +107,7 @@ s_nsControlInUsbIoCompleteWrite( /*--------------------- Export Functions --------------------------*/ - - -NTSTATUS -PIPEnsControlOutAsyn( +int PIPEnsControlOutAsyn( PSDevice pDevice, BYTE byRequest, WORD wValue, @@ -119,8 +116,7 @@ PIPEnsControlOutAsyn( PBYTE pbyBuffer ) { - NTSTATUS ntStatus; - + int ntStatus; if (MP_TEST_FLAG(pDevice, fMP_DISCONNECTED)) return STATUS_FAILURE; @@ -156,12 +152,7 @@ PIPEnsControlOutAsyn( return ntStatus; } - - - - -NTSTATUS -PIPEnsControlOut( +int PIPEnsControlOut( PSDevice pDevice, BYTE byRequest, WORD wValue, @@ -170,10 +161,9 @@ PIPEnsControlOut( PBYTE pbyBuffer ) { - NTSTATUS ntStatus = 0; + int ntStatus = 0; int ii; - if (MP_TEST_FLAG(pDevice, fMP_DISCONNECTED)) return STATUS_FAILURE; @@ -219,11 +209,7 @@ PIPEnsControlOut( return STATUS_SUCCESS; } - - - -NTSTATUS -PIPEnsControlIn( +int PIPEnsControlIn( PSDevice pDevice, BYTE byRequest, WORD wValue, @@ -232,7 +218,7 @@ PIPEnsControlIn( PBYTE pbyBuffer ) { - NTSTATUS ntStatus = 0; + int ntStatus = 0; int ii; if (MP_TEST_FLAG(pDevice, fMP_DISCONNECTED)) @@ -360,13 +346,9 @@ s_nsControlInUsbIoCompleteRead( * Return Value: STATUS_INSUFFICIENT_RESOURCES or result of IoCallDriver * */ -NTSTATUS -PIPEnsInterruptRead( - PSDevice pDevice - ) +int PIPEnsInterruptRead(PSDevice pDevice) { - NTSTATUS ntStatus = STATUS_FAILURE; - + int ntStatus = STATUS_FAILURE; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsStartInterruptUsbRead()\n"); @@ -381,29 +363,6 @@ PIPEnsInterruptRead( // Now that we have created the urb, we will send a // request to the USB device object. // -#if 0 //reserve int URB submit - usb_fill_int_urb(pDevice->pInterruptURB, - pDevice->usb, - usb_rcvintpipe(pDevice->usb, 1), - (void *) pDevice->intBuf.pDataBuf, - MAX_INTERRUPT_SIZE, - s_nsInterruptUsbIoCompleteRead, - pDevice, - pDevice->int_interval - ); -#else //replace int URB submit by bulk transfer -#ifndef Safe_Close - usb_fill_int_urb(pDevice->pInterruptURB, - pDevice->usb, - usb_rcvintpipe(pDevice->usb, 1), - (void *) pDevice->intBuf.pDataBuf, - MAX_INTERRUPT_SIZE, - s_nsInterruptUsbIoCompleteRead, - pDevice, - pDevice->int_interval - ); -#else - pDevice->pInterruptURB->interval = pDevice->int_interval; usb_fill_bulk_urb(pDevice->pInterruptURB, @@ -413,8 +372,6 @@ usb_fill_bulk_urb(pDevice->pInterruptURB, MAX_INTERRUPT_SIZE, s_nsInterruptUsbIoCompleteRead, pDevice); -#endif -#endif ntStatus = usb_submit_urb(pDevice->pInterruptURB, GFP_ATOMIC); if (ntStatus != 0) { @@ -448,8 +405,7 @@ s_nsInterruptUsbIoCompleteRead( { PSDevice pDevice; - NTSTATUS ntStatus; - + int ntStatus; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsInterruptUsbIoCompleteRead\n"); // @@ -495,13 +451,6 @@ s_nsInterruptUsbIoCompleteRead( if (pDevice->fKillEventPollingThread != TRUE) { - #if 0 //reserve int URB submit - ntStatus = usb_submit_urb(urb, GFP_ATOMIC); - if (ntStatus != 0) { - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Re-Submit int URB failed %d\n", ntStatus); - } - #else //replace int URB submit by bulk transfer - #ifdef Safe_Close usb_fill_bulk_urb(pDevice->pInterruptURB, pDevice->usb, usb_rcvbulkpipe(pDevice->usb, 1), @@ -514,11 +463,6 @@ s_nsInterruptUsbIoCompleteRead( if (ntStatus != 0) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Submit int URB failed %d\n", ntStatus); } - - #else - tasklet_schedule(&pDevice->EventWorkItem); - #endif -#endif } // // We return STATUS_MORE_PROCESSING_REQUIRED so that the completion @@ -540,13 +484,9 @@ s_nsInterruptUsbIoCompleteRead( * Return Value: STATUS_INSUFFICIENT_RESOURCES or result of IoCallDriver * */ -NTSTATUS -PIPEnsBulkInUsbRead( - PSDevice pDevice, - PRCB pRCB - ) +int PIPEnsBulkInUsbRead(PSDevice pDevice, PRCB pRCB) { - NTSTATUS ntStatus= 0; + int ntStatus = 0; struct urb *pUrb; @@ -616,9 +556,7 @@ s_nsBulkInUsbIoCompleteRead( unsigned long bytesRead; BOOL bIndicateReceive = FALSE; BOOL bReAllocSkb = FALSE; - NTSTATUS status; - - + int status; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsBulkInUsbIoCompleteRead\n"); status = urb->status; @@ -628,9 +566,7 @@ s_nsBulkInUsbIoCompleteRead( pDevice->ulBulkInError++; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BULK In failed %d\n", status); - #ifdef Calcu_LinkQual pDevice->scStatistic.RxFcsErrCnt ++; - #endif //todo...xxxxxx // if (status == USBD_STATUS_CRC) { // pDevice->ulBulkInContCRCError++; @@ -644,9 +580,7 @@ s_nsBulkInUsbIoCompleteRead( pDevice->ulBulkInContCRCError = 0; pDevice->ulBulkInBytesRead += bytesRead; - #ifdef Calcu_LinkQual pDevice->scStatistic.RxOkCnt ++; - #endif } @@ -690,7 +624,7 @@ PIPEnsSendBulkOut( PUSB_SEND_CONTEXT pContext ) { - NTSTATUS status; + int status; struct urb *pUrb; @@ -771,7 +705,7 @@ s_nsBulkOutIoCompleteWrite( ) { PSDevice pDevice; - NTSTATUS status; + int status; CONTEXT_TYPE ContextType; unsigned long ulBufLen; PUSB_SEND_CONTEXT pContext; @@ -803,10 +737,7 @@ s_nsBulkOutIoCompleteWrite( DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Write %d bytes\n",(int)ulBufLen); pDevice->ulBulkOutBytesWrite += ulBufLen; pDevice->ulBulkOutContCRCError = 0; - //2007-0115-06<Add>by MikeLiu - #ifdef TxInSleep - pDevice->nTxDataTimeCout = 0; - #endif + pDevice->nTxDataTimeCout = 0; } else { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BULK Out failed %d\n", status); |