Changeset 62953 in vbox for trunk/src/VBox/Devices/USB/usbip
- Timestamp:
- Aug 4, 2016 7:30:48 AM (9 years ago)
- svn:sync-xref-src-repo-rev:
- 109556
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/USB/usbip/USBProxyDevice-usbip.cpp
r62502 r62953 590 590 return VERR_INVALID_STATE; 591 591 } 592 593 LogFlowFunc(("i32Status=%d\n", i32Status)); 594 return VERR_INVALID_STATE; 592 /* not reached */ 595 593 } 596 594 … … 614 612 return VUSBSTATUS_DNR; 615 613 } 616 617 return VUSBSTATUS_DNR; 614 /* not reached */ 618 615 } 619 616 … … 1316 1313 char bRead = 0; 1317 1314 size_t cbRead = 0; 1318 1319 1315 int rc = RTPipeRead(pProxyDevUsbIp->hPipeR, &bRead, 1, &cbRead); 1320 Assert(RT_SUCCESS(rc) && cbRead == 1); 1316 Assert(RT_SUCCESS(rc) && cbRead == 1); NOREF(rc); 1321 1317 1322 1318 return bRead; … … 1327 1323 */ 1328 1324 1325 /** 1326 * @interface_method_impl{USBPROXYBACK,pfnOpen} 1327 */ 1329 1328 static DECLCALLBACK(int) usbProxyUsbIpOpen(PUSBPROXYDEV pProxyDev, const char *pszAddress, void *pvBackend) 1330 1329 { 1330 RT_NOREF(pvBackend); 1331 1331 LogFlowFunc(("pProxyDev=%p pszAddress=%s, pvBackend=%p\n", pProxyDev, pszAddress, pvBackend)); 1332 1332 … … 1387 1387 } 1388 1388 1389 1390 /** 1391 * @interface_method_impl{USBPROXYBACK,pfnClose} 1392 */ 1389 1393 static DECLCALLBACK(void) usbProxyUsbIpClose(PUSBPROXYDEV pProxyDev) 1390 1394 { … … 1438 1442 } 1439 1443 1444 1445 /** 1446 * @interface_method_impl{USBPROXYBACK,pfnReset} 1447 */ 1440 1448 static DECLCALLBACK(int) usbProxyUsbIpReset(PUSBPROXYDEV pProxyDev, bool fResetOnLinux) 1441 1449 { … … 1464 1472 } 1465 1473 1474 1475 /** 1476 * @interface_method_impl{USBPROXYBACK,pfnSetConfig} 1477 */ 1466 1478 static DECLCALLBACK(int) usbProxyUsbIpSetConfig(PUSBPROXYDEV pProxyDev, int iCfg) 1467 1479 { … … 1479 1491 } 1480 1492 1481 static DECLCALLBACK(int) usbProxyUsbIpClaimInterface(PUSBPROXYDEV pProxyDev, int ifnum) 1482 { 1483 LogFlowFunc(("pProxyDev=%s ifnum=%#x\n", pProxyDev->pUsbIns->pszName, ifnum)); 1493 1494 /** 1495 * @interface_method_impl{USBPROXYBACK,pfnClaimInterface} 1496 */ 1497 static DECLCALLBACK(int) usbProxyUsbIpClaimInterface(PUSBPROXYDEV pProxyDev, int iIf) 1498 { 1499 RT_NOREF(pProxyDev, iIf); 1500 LogFlowFunc(("pProxyDev=%s iIf=%#x\n", pProxyDev->pUsbIns->pszName, iIf)); 1484 1501 return VINF_SUCCESS; 1485 1502 } 1486 1503 1487 static DECLCALLBACK(int) usbProxyUsbIpReleaseInterface(PUSBPROXYDEV pProxyDev, int ifnum) 1488 { 1489 LogFlowFunc(("pProxyDev=%s ifnum=%#x\n", pProxyDev->pUsbIns->pszName, ifnum)); 1504 1505 /** 1506 * @interface_method_impl{USBPROXYBACK,pfnReleaseInterface} 1507 */ 1508 static DECLCALLBACK(int) usbProxyUsbIpReleaseInterface(PUSBPROXYDEV pProxyDev, int iIf) 1509 { 1510 RT_NOREF(pProxyDev, iIf); 1511 LogFlowFunc(("pProxyDev=%s iIf=%#x\n", pProxyDev->pUsbIns->pszName, iIf)); 1490 1512 return VINF_SUCCESS; 1491 1513 } 1492 1514 1493 static DECLCALLBACK(int) usbProxyUsbIpSetInterface(PUSBPROXYDEV pProxyDev, int ifnum, int setting) 1494 { 1495 LogFlowFunc(("pProxyDev=%p ifnum=%#x setting=%#x\n", pProxyDev, ifnum, setting)); 1515 1516 /** 1517 * @interface_method_impl{USBPROXYBACK,pfnSetInterface} 1518 */ 1519 static DECLCALLBACK(int) usbProxyUsbIpSetInterface(PUSBPROXYDEV pProxyDev, int iIf, int setting) 1520 { 1521 LogFlowFunc(("pProxyDev=%p iIf=%#x setting=%#x\n", pProxyDev, iIf, setting)); 1496 1522 1497 1523 PUSBPROXYDEVUSBIP pProxyDevUsbIp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVUSBIP); … … 1501 1527 Setup.bRequest = 0x0b; /* SET_INTERFACE */ 1502 1528 Setup.wValue = setting; 1503 Setup.wIndex = i fnum;1529 Setup.wIndex = iIf; 1504 1530 Setup.wLength = 0; 1505 1531 return usbProxyUsbIpCtrlUrbExchangeSync(pProxyDevUsbIp, &Setup); 1506 1532 } 1507 1533 1534 1535 /** 1536 * @interface_method_impl{USBPROXYBACK,pfnClearHaltedEndpoint} 1537 */ 1508 1538 static DECLCALLBACK(int) usbProxyUsbIpClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int iEp) 1509 1539 { … … 1521 1551 } 1522 1552 1553 1554 /** 1555 * @interface_method_impl{USBPROXYBACK,pfnUrbQueue} 1556 */ 1523 1557 static DECLCALLBACK(int) usbProxyUsbIpUrbQueue(PUSBPROXYDEV pProxyDev, PVUSBURB pUrb) 1524 1558 { … … 1544 1578 } 1545 1579 1580 1581 /** 1582 * @interface_method_impl{USBPROXYBACK,pfnUrbReap} 1583 */ 1546 1584 static DECLCALLBACK(PVUSBURB) usbProxyUsbIpUrbReap(PUSBPROXYDEV pProxyDev, RTMSINTERVAL cMillies) 1547 1585 { … … 1605 1643 } 1606 1644 1645 1646 /** 1647 * @interface_method_impl{USBPROXYBACK,pfnUrbCancel} 1648 */ 1607 1649 static DECLCALLBACK(int) usbProxyUsbIpUrbCancel(PUSBPROXYDEV pProxyDev, PVUSBURB pUrb) 1608 1650 { … … 1634 1676 } 1635 1677 1678 1679 /** 1680 * @interface_method_impl{USBPROXYBACK,pfnWakeup} 1681 */ 1636 1682 static DECLCALLBACK(int) usbProxyUsbIpWakeup(PUSBPROXYDEV pProxyDev) 1637 1683 { … … 1641 1687 return usbProxyReaperKick(pProxyDevUsbIp, USBIP_REAPER_WAKEUP_REASON_EXTERNAL); 1642 1688 } 1689 1643 1690 1644 1691 /**
Note:
See TracChangeset
for help on using the changeset viewer.