hrev49845 adds 2 changesets to branch 'master'
old head: 894640da2d6cceea1be0dd6a6112a0088de166ae
new head: ac7f52fc91b427afa7fc79243354ab0118d1758a
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=ac7f52fc91b4+%5E894640da2d6c
----------------------------------------------------------------------------
81768f44e75a: XHCI USB: include in the Haiku package, only enabled two devices
for now.
ac7f52fc91b4: app_server: fix x86_64 build.
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 19 insertions(+), 12 deletions(-)
build/jam/packages/Haiku | 5 +++--
src/add-ons/kernel/busses/usb/xhci.cpp | 10 ++++++++++
src/servers/app/drawing/AlphaMaskCache.cpp | 16 ++++++----------
############################################################################
Commit: 81768f44e75a5a187083215266cf382f2cf4e14d
URL: http://cgit.haiku-os.org/haiku/commit/?id=81768f44e75a
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Mon Nov 9 18:26:33 2015 UTC
XHCI USB: include in the Haiku package, only enabled two devices
for now.
----------------------------------------------------------------------------
diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku
index 147f3f5..2f6a054 100644
--- a/build/jam/packages/Haiku
+++ b/build/jam/packages/Haiku
@@ -40,7 +40,8 @@ if $(HAIKU_ATA_STACK) = 1 {
AddFilesToPackage add-ons kernel busses random : virtio_rng ;
AddFilesToPackage add-ons kernel busses scsi : ahci virtio_scsi ;
-AddFilesToPackage add-ons kernel busses usb : <usb>uhci <usb>ohci <usb>ehci ;
+AddFilesToPackage add-ons kernel busses usb : <usb>uhci <usb>ohci <usb>ehci
+ <usb>xhci ;
AddFilesToPackage add-ons kernel busses virtio : virtio_pci ;
AddFilesToPackage add-ons kernel console : vga_text ;
AddFilesToPackage add-ons kernel debugger
@@ -205,7 +206,7 @@ AddBootModuleSymlinksToPackage
openpic@ppc
packagefs pci
scsi scsi_cd scsi_disk scsi_periph silicon_image_3112
- usb usb_disk <usb>ehci <usb>ohci <usb>uhci
+ usb usb_disk <usb>ehci <usb>ohci <usb>uhci <usb>xhci
virtio virtio_block virtio_pci virtio_scsi
;
diff --git a/src/add-ons/kernel/busses/usb/xhci.cpp
b/src/add-ons/kernel/busses/usb/xhci.cpp
index 2dc8bbc..e6b6354 100644
--- a/src/add-ons/kernel/busses/usb/xhci.cpp
+++ b/src/add-ons/kernel/busses/usb/xhci.cpp
@@ -775,6 +775,16 @@ XHCI::AddTo(Stack *stack)
continue;
}
+ // whitelists a few devices for the time being
+ switch ((item->vendor_id << 16) | item->device_id) {
+ case 0x10330194: // Nec Corporation
uPD720200
+ case 0x1b731009: // Fresco Logic FL1009
+ break;
+ default:
+ TRACE_MODULE_ERROR("found device but
unsupported\n");
+ continue;
+ }
+
TRACE_MODULE("found device at IRQ %u\n",
item->u.h0.interrupt_line);
XHCI *bus = new(std::nothrow) XHCI(item, stack);
############################################################################
Revision: hrev49845
Commit: ac7f52fc91b427afa7fc79243354ab0118d1758a
URL: http://cgit.haiku-os.org/haiku/commit/?id=ac7f52fc91b4
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Sat Nov 14 18:37:08 2015 UTC
app_server: fix x86_64 build.
----------------------------------------------------------------------------
diff --git a/src/servers/app/drawing/AlphaMaskCache.cpp
b/src/servers/app/drawing/AlphaMaskCache.cpp
index dcaa212..5cd60ed 100644
--- a/src/servers/app/drawing/AlphaMaskCache.cpp
+++ b/src/servers/app/drawing/AlphaMaskCache.cpp
@@ -173,16 +173,12 @@ AlphaMaskCache::_FindUncachedPreviousMasks(AlphaMask*
mask, bool reference)
void
AlphaMaskCache::_PrintAndResetStatistics()
{
- debug_printf("AlphaMaskCache statistics: size=%4ld bytes=%4ld
lower=%4ld "
- "total=%4ld too_large=%4ld replaced=%4ld hit=%4ld miss=%4ld\n",
- fShapeMasks.size(),
- fCurrentCacheBytes,
- fLowerMaskReferencedCount,
- fShapeMasks.size() + fLowerMaskReferencedCount,
- fTooLargeMaskCount,
- fMasksReplacedCount,
- fHitCount,
- fMissCount);
+ debug_printf("AlphaMaskCache statistics: size=%" B_PRIuSIZE " bytes=%"
+ B_PRIuSIZE " lower=%4" B_PRIu32 " total=%" B_PRIuSIZE "
too_large=%4"
+ B_PRIu32 " replaced=%4" B_PRIu32 " hit=%4" B_PRIu32 " miss=%4"
B_PRIu32
+ "\n", fShapeMasks.size(), fCurrentCacheBytes,
fLowerMaskReferencedCount,
+ fShapeMasks.size() + fLowerMaskReferencedCount,
fTooLargeMaskCount,
+ fMasksReplacedCount, fHitCount, fMissCount);
fTooLargeMaskCount = 0;
fMasksReplacedCount = 0;
fHitCount = 0;
