From b0341b286b2c30281e6bcb83aad6aa963b102cbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Fri, 25 May 2007 19:23:14 +0000
Subject: [PATCH] Revert r21231 as it's supposedly not possible. Someone
 implement OHCI then pleazzze!

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21241 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/kernel/busses/usb/ehci.cpp | 12 ++----------
 src/add-ons/kernel/busses/usb/ehci.h   |  1 -
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/add-ons/kernel/busses/usb/ehci.cpp b/src/add-ons/kernel/busses/usb/ehci.cpp
index 42a8a3a33a..875d3e4134 100644
--- a/src/add-ons/kernel/busses/usb/ehci.cpp
+++ b/src/add-ons/kernel/busses/usb/ehci.cpp
@@ -10,7 +10,6 @@
 #include <PCI.h>
 #include <USB3.h>
 #include <KernelExport.h>
-#include <driver_settings.h>
 
 #include "ehci.h"
 
@@ -111,7 +110,6 @@ EHCI::EHCI(pci_info *info, Stack *stack)
 		fFreeListHead(NULL),
 		fRootHub(NULL),
 		fRootHubAddress(0),
-		fKeepPortOwnership(false),
 		fPortCount(0),
 		fPortResetChange(0),
 		fPortSuspendChange(0)
@@ -124,12 +122,6 @@ EHCI::EHCI(pci_info *info, Stack *stack)
 	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
 	uint16 command = sPCIModule->read_pci_config(fPCIInfo->bus,
 		fPCIInfo->device, fPCIInfo->function, PCI_command, 2);
@@ -685,7 +677,7 @@ EHCI::ResetPort(uint8 index)
 	uint32 portRegister = EHCI_PORTSC + index * sizeof(uint32);
 	uint32 portStatus = ReadOpReg(portRegister) & EHCI_PORTSC_DATAMASK;
 
-	if (!fKeepPortOwnership && (portStatus & EHCI_PORTSC_DMINUS)) {
+	if (portStatus & EHCI_PORTSC_DMINUS) {
 		TRACE(("usb_ehci: lowspeed device connected, giving up port ownership\n"));
 		// there is a lowspeed device connected.
 		// we give the ownership to a companion controller.
@@ -709,7 +701,7 @@ EHCI::ResetPort(uint8 index)
 		return B_ERROR;
 	}
 
-	if (!fKeepPortOwnership && (portStatus & EHCI_PORTSC_ENABLE) == 0) {
+	if ((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
 		// attached to this port. we give up ownership to a companion controler
diff --git a/src/add-ons/kernel/busses/usb/ehci.h b/src/add-ons/kernel/busses/usb/ehci.h
index c90a4284bf..b4a789c788 100644
--- a/src/add-ons/kernel/busses/usb/ehci.h
+++ b/src/add-ons/kernel/busses/usb/ehci.h
@@ -156,7 +156,6 @@ static	pci_module_info				*sPCIModule;
 		uint8						fRootHubAddress;
 
 		// Port management
-		bool						fKeepPortOwnership;
 		uint8						fPortCount;
 		uint16						fPortResetChange;
 		uint16						fPortSuspendChange;