Changeset 21231

Timestamp:

05/24/07 17:45:11 (18 months ago)

Author:

mmu_man

Message:

Added a keep_port_ownership driver setting for EHCI, to allow keeping devices on EHCI instead of giving them up to the 1.0 controller.
Hopefully this will get things working here until OHCI is implemented.

Location:

haiku/trunk/src/add-ons/kernel/busses/usb

Files:

• ehci.cpp (modified) (5 diffs)
• ehci.h (modified) (1 diff)

haiku/trunk/src/add-ons/kernel/busses/usb/ehci.cpp

@@ -11 +11 @@
 #include <USB3.h>
 #include <KernelExport.h>
+#include <driver_settings.h>
 
 #include "ehci.h"
@@ -111 +112 @@
                 fRootHub(NULL),
                 fRootHubAddress(0),
+                fKeepPortOwnership(false),
                 fPortCount(0),
                 fPortResetChange(0),
@@ -122 +124 @@
         TRACE(("usb_ehci: constructing new EHCI Host Controller Driver\n"));
         fInitOK = false;
+
+        void *handle = load_driver_settings("ehci");
+        if (handle) {
+                fKeepPortOwnership = get_driver_boolean_parameter(handle, "keep_port_ownership", false, true);
+                unload_driver_settings(handle);
+        }
 
         // enable busmaster and memory mapped access
@@ -678 +686 @@
         uint32 portStatus = ReadOpReg(portRegister) & EHCI_PORTSC_DATAMASK;
 
-        if (portStatus & EHCI_PORTSC_DMINUS) {
+        if (!fKeepPortOwnership && (portStatus & EHCI_PORTSC_DMINUS)) {
                 TRACE(("usb_ehci: lowspeed device connected, giving up port ownership\n"));
                 // there is a lowspeed device connected.
@@ -702 +710 @@
         }
 
-        if ((portStatus & EHCI_PORTSC_ENABLE) == 0) {
+        if (!fKeepPortOwnership && (portStatus & EHCI_PORTSC_ENABLE) == 0) {
                 TRACE(("usb_ehci: fullspeed device connected, giving up port ownership\n"));
                 // the port was not enabled, this means that no high speed device is

haiku/trunk/src/add-ons/kernel/busses/usb/ehci.h

@@ -157 +157 @@
 
                 // Port management
+                bool                                            fKeepPortOwnership;
                 uint8                                           fPortCount;
                 uint16                                          fPortResetChange;