hrev48539 adds 1 changeset to branch 'master' old head: 4cfa5b2dd6ce2bf9f9e0fea6dd00f08c8847dfbd new head: 7dc8098ada07aa48c35f30638d89c49d7ff84fca overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=7dc8098+%5E4cfa5b2 ---------------------------------------------------------------------------- 7dc8098: XHCI USB: Add port routing for Intel WildcaPoint USB device. * from FreeBSD. [ Jérôme Duval <jerome.duval@xxxxxxxxx> ] ---------------------------------------------------------------------------- Revision: hrev48539 Commit: 7dc8098ada07aa48c35f30638d89c49d7ff84fca URL: http://cgit.haiku-os.org/haiku/commit/?id=7dc8098 Author: Jérôme Duval <jerome.duval@xxxxxxxxx> Date: Sun Dec 21 20:24:01 2014 UTC ---------------------------------------------------------------------------- 2 files changed, 5 insertions(+), 2 deletions(-) src/add-ons/kernel/busses/usb/xhci.cpp | 6 ++++-- src/add-ons/kernel/busses/usb/xhci_hardware.h | 1 + ---------------------------------------------------------------------------- diff --git a/src/add-ons/kernel/busses/usb/xhci.cpp b/src/add-ons/kernel/busses/usb/xhci.cpp index 41e7188..2dc8bbc 100644 --- a/src/add-ons/kernel/busses/usb/xhci.cpp +++ b/src/add-ons/kernel/busses/usb/xhci.cpp @@ -244,7 +244,8 @@ XHCI::XHCI(pci_info *info, Stack *stack) && (fPCIInfo->device_id == PCI_DEVICE_INTEL_PANTHER_POINT_XHCI || fPCIInfo->device_id == PCI_DEVICE_INTEL_LYNX_POINT_XHCI || fPCIInfo->device_id == PCI_DEVICE_INTEL_LYNX_POINT_LP_XHCI - || fPCIInfo->device_id == PCI_DEVICE_INTEL_BAYTRAIL_XHCI)) { + || fPCIInfo->device_id == PCI_DEVICE_INTEL_BAYTRAIL_XHCI + || fPCIInfo->device_id == PCI_DEVICE_INTEL_WILDCAT_POINT_XHCI)) { TRACE("Intel xHC Controller\n"); TRACE("Looking for EHCI owned ports\n"); @@ -508,7 +509,8 @@ XHCI::Start() && (fPCIInfo->device_id == PCI_DEVICE_INTEL_PANTHER_POINT_XHCI || fPCIInfo->device_id == PCI_DEVICE_INTEL_LYNX_POINT_XHCI || fPCIInfo->device_id == PCI_DEVICE_INTEL_LYNX_POINT_LP_XHCI - || fPCIInfo->device_id == PCI_DEVICE_INTEL_BAYTRAIL_XHCI)) { + || fPCIInfo->device_id == PCI_DEVICE_INTEL_BAYTRAIL_XHCI + || fPCIInfo->device_id == PCI_DEVICE_INTEL_WILDCAT_POINT_XHCI)) { WriteRunReg32(XHCI_IMOD(0), 0x000003f8); // 4000 irq/s } else { WriteRunReg32(XHCI_IMOD(0), 0x000001f4); // 8000 irq/s diff --git a/src/add-ons/kernel/busses/usb/xhci_hardware.h b/src/add-ons/kernel/busses/usb/xhci_hardware.h index 42546ec..25b23d0 100644 --- a/src/add-ons/kernel/busses/usb/xhci_hardware.h +++ b/src/add-ons/kernel/busses/usb/xhci_hardware.h @@ -16,6 +16,7 @@ #define PCI_DEVICE_INTEL_LYNX_POINT_XHCI 0x8c31 #define PCI_DEVICE_INTEL_LYNX_POINT_LP_XHCI 0x9c31 #define PCI_DEVICE_INTEL_BAYTRAIL_XHCI 0x0f35 +#define PCI_DEVICE_INTEL_WILDCAT_POINT_XHCI 0x8cb1 // Intel quirks registers in PCI config #define XHCI_INTEL_USB3PRM 0xdc // USB 3.0 Port Routing Mask