i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Small clean up

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22985 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Salvatore Benedetto
2007-11-23 14:01:17 +00:00
parent 684f9b91a8
commit 187574cf69
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/usb/uhci.cpp
+5 -5
View File
@@ -12,7 +12,6 @@
#include <PCI.h> #include <PCI.h>
#include <USB3.h> #include <USB3.h>
#include <KernelExport.h> #include <KernelExport.h>
#include <stdlib.h>
#include "uhci.h" #include "uhci.h"
@@ -34,7 +33,7 @@ uhci_std_ops(int32 op, ...)
} }
return B_OK; return B_OK;
} }
host_controller_info uhci_module = { host_controller_info uhci_module = {
@@ -318,7 +317,7 @@ UHCI::UHCI(pci_info *info, Stack *stack)
fRegisterBase = sPCIModule->read_pci_config(fPCIInfo->bus, fRegisterBase = sPCIModule->read_pci_config(fPCIInfo->bus,
fPCIInfo->device, fPCIInfo->function, PCI_memory_base, 4); fPCIInfo->device, fPCIInfo->function, PCI_memory_base, 4);
fRegisterBase &= PCI_address_io_mask; fRegisterBase &= PCI_address_io_mask;
TRACE_ERROR(("usb_uhci: iospace offset: 0x%08lx\n", fRegisterBase)); TRACE(("usb_uhci: iospace offset: 0x%08lx\n", fRegisterBase));
if (fRegisterBase == 0) { if (fRegisterBase == 0) {
fRegisterBase = fPCIInfo->u.h0.base_registers[0]; fRegisterBase = fPCIInfo->u.h0.base_registers[0];
@@ -395,7 +394,7 @@ UHCI::UHCI(pci_info *info, Stack *stack)
// Create the array that will keep bandwidth information // Create the array that will keep bandwidth information
fFrameBandwidth = new(std::nothrow) uint16[NUMBER_OF_FRAMES]; fFrameBandwidth = new(std::nothrow) uint16[NUMBER_OF_FRAMES];
// create lists for managing isochronous transfer descriptors // Create lists for managing isochronous transfer descriptors
fFirstIsochronousDescriptor = new(std::nothrow) uhci_td *[NUMBER_OF_FRAMES]; fFirstIsochronousDescriptor = new(std::nothrow) uhci_td *[NUMBER_OF_FRAMES];
if (!fFirstIsochronousDescriptor) { if (!fFirstIsochronousDescriptor) {
TRACE_ERROR(("usb_uhci: cannot allocate memory\n")); TRACE_ERROR(("usb_uhci: cannot allocate memory\n"));
@@ -564,7 +563,8 @@ UHCI::SubmitTransfer(Transfer *transfer)
if (transfer->TransferPipe()->DeviceAddress() == fRootHubAddress) if (transfer->TransferPipe()->DeviceAddress() == fRootHubAddress)
return fRootHub->ProcessTransfer(this, transfer); return fRootHub->ProcessTransfer(this, transfer);
TRACE(("usb_uhci: submit transfer called for device %d\n", transfer->TransferPipe()->DeviceAddress())); TRACE(("usb_uhci: submit transfer called for device %d\n",
transfer->TransferPipe()->DeviceAddress()));
if (transfer->TransferPipe()->Type() & USB_OBJECT_CONTROL_PIPE) if (transfer->TransferPipe()->Type() & USB_OBJECT_CONTROL_PIPE)
return SubmitRequest(transfer); return SubmitRequest(transfer);
src/add-ons/kernel/busses/usb/uhci.h
+1
View File
@@ -232,6 +232,7 @@ static pci_module_info *sPCIModule;
UHCIRootHub *fRootHub; UHCIRootHub *fRootHub;
uint8 fRootHubAddress; uint8 fRootHubAddress;
uint8 fPortResetChange; uint8 fPortResetChange;
}; };