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

fixed warnings

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18693 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2006-08-29 13:57:55 +00:00
parent 80e19d62c5
commit 458b6f4b90
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/usb/uhci.cpp
+2 -2
View File
@@ -340,11 +340,11 @@ 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%08x\n", fRegisterBase)); TRACE_ERROR(("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];
TRACE_ERROR(("usb_uhci: register base: 0x%08x\n", fRegisterBase)); TRACE_ERROR(("usb_uhci: register base: 0x%08lx\n", fRegisterBase));
} }
// enable pci address access // enable pci address access
src/add-ons/kernel/busses/usb/uhci_rh.cpp
+12 -5
View File
@@ -98,21 +98,28 @@ static uhci_root_hub_string_s sUHCIRootHubStrings[3] = {
{ {
4, // Descriptor length 4, // Descriptor length
USB_DESCRIPTOR_STRING, // Descriptor type USB_DESCRIPTOR_STRING, // Descriptor type
0x0409 // Supported language IDs (English US) {
0x0409 // Supported language IDs (English US)
}
}, },
{ {
12, // Descriptor length 12, // Descriptor length
USB_DESCRIPTOR_STRING, // Descriptor type USB_DESCRIPTOR_STRING, // Descriptor type
'H', 'A', 'I', 'K', 'U', ' ', // Characters {
'I', 'n', 'c', '.' 'H', 'A', 'I', 'K', 'U', ' ', // Characters
'I', 'n', 'c', '.'
}
}, },
{ {
26, // Descriptor length 26, // Descriptor length
USB_DESCRIPTOR_STRING, // Descriptor type USB_DESCRIPTOR_STRING, // Descriptor type
'U', 'H', 'C', 'I', ' ', 'R', // Characters {
'o', 'o', 't', 'H', 'u', 'b' 'U', 'H', 'C', 'I', ' ', 'R', // Characters
'o', 'o', 't', 'H', 'u', 'b'
}
} }
}; };