From 187574cf691a28c022868e1533d5540937dc9556 Mon Sep 17 00:00:00 2001 From: Salvatore Benedetto Date: Fri, 23 Nov 2007 14:01:17 +0000 Subject: [PATCH] * Small clean up git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22985 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/busses/usb/uhci.cpp | 10 +++++----- src/add-ons/kernel/busses/usb/uhci.h | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/add-ons/kernel/busses/usb/uhci.cpp b/src/add-ons/kernel/busses/usb/uhci.cpp index fcf6207654..50501f7826 100644 --- a/src/add-ons/kernel/busses/usb/uhci.cpp +++ b/src/add-ons/kernel/busses/usb/uhci.cpp @@ -12,7 +12,6 @@ #include #include #include -#include #include "uhci.h" @@ -34,7 +33,7 @@ uhci_std_ops(int32 op, ...) } return B_OK; -} +} host_controller_info uhci_module = { @@ -318,7 +317,7 @@ UHCI::UHCI(pci_info *info, Stack *stack) fRegisterBase = sPCIModule->read_pci_config(fPCIInfo->bus, fPCIInfo->device, fPCIInfo->function, PCI_memory_base, 4); 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) { 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 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]; if (!fFirstIsochronousDescriptor) { TRACE_ERROR(("usb_uhci: cannot allocate memory\n")); @@ -564,7 +563,8 @@ UHCI::SubmitTransfer(Transfer *transfer) if (transfer->TransferPipe()->DeviceAddress() == fRootHubAddress) 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) return SubmitRequest(transfer); diff --git a/src/add-ons/kernel/busses/usb/uhci.h b/src/add-ons/kernel/busses/usb/uhci.h index 9225c0a379..ffc3230b17 100644 --- a/src/add-ons/kernel/busses/usb/uhci.h +++ b/src/add-ons/kernel/busses/usb/uhci.h @@ -232,6 +232,7 @@ static pci_module_info *sPCIModule; UHCIRootHub *fRootHub; uint8 fRootHubAddress; uint8 fPortResetChange; + };