From 33574eaf6e1efe1f43a89fdbfc94ff5293869187 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Mon, 14 Apr 2008 06:35:25 +0000 Subject: [PATCH] Exclude the frame list rollover interrupt from the interrupts we are interested in. We do not enable this interrupt and if we still "handle" it in our interrupt handler we might prevent the interrupt from reaching the real intended handler in a shared interrupt setup. Not sure if this could have happend at all, but this is more correct in any case. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24965 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/busses/usb/ehci.cpp | 5 ----- src/add-ons/kernel/busses/usb/ehci_hardware.h | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/add-ons/kernel/busses/usb/ehci.cpp b/src/add-ons/kernel/busses/usb/ehci.cpp index 7bb245ef3f..bc8cb48434 100644 --- a/src/add-ons/kernel/busses/usb/ehci.cpp +++ b/src/add-ons/kernel/busses/usb/ehci.cpp @@ -813,11 +813,6 @@ EHCI::Interrupt() acknowledge |= EHCI_USBSTS_PORTCHANGE; } - if (status & EHCI_USBSTS_FLROLLOVER) { - TRACE(("usb_ehci: frame list rolled over\n")); - acknowledge |= EHCI_USBSTS_FLROLLOVER; - } - if (status & EHCI_USBSTS_INTONAA) { TRACE(("usb_ehci: interrupt on async advance\n")); acknowledge |= EHCI_USBSTS_INTONAA; diff --git a/src/add-ons/kernel/busses/usb/ehci_hardware.h b/src/add-ons/kernel/busses/usb/ehci_hardware.h index 112bea8f32..baade2ec0a 100644 --- a/src/add-ons/kernel/busses/usb/ehci_hardware.h +++ b/src/add-ons/kernel/busses/usb/ehci_hardware.h @@ -56,7 +56,7 @@ #define EHCI_USBSTS_PORTCHANGE (1 << 2) // Port Change Detected #define EHCI_USBSTS_USBERRINT (1 << 1) // USB Error Interrupt #define EHCI_USBSTS_USBINT (1 << 0) // USB Interrupt -#define EHCI_USBSTS_INTMASK 0x3f +#define EHCI_USBSTS_INTMASK 0x37 // All except frame list rollover // USB Interrupt Enable Register (EHCI Spec 2.3.3)