From 458b6f4b9019c0fe051acd386b3fce0bc712212c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 29 Aug 2006 13:57:55 +0000 Subject: [PATCH] fixed warnings git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18693 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/busses/usb/uhci.cpp | 4 ++-- src/add-ons/kernel/busses/usb/uhci_rh.cpp | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/add-ons/kernel/busses/usb/uhci.cpp b/src/add-ons/kernel/busses/usb/uhci.cpp index 1ddfdeda8a..6e6fcbcd12 100644 --- a/src/add-ons/kernel/busses/usb/uhci.cpp +++ b/src/add-ons/kernel/busses/usb/uhci.cpp @@ -340,11 +340,11 @@ 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%08x\n", fRegisterBase)); + TRACE_ERROR(("usb_uhci: iospace offset: 0x%08lx\n", fRegisterBase)); if (fRegisterBase == 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 diff --git a/src/add-ons/kernel/busses/usb/uhci_rh.cpp b/src/add-ons/kernel/busses/usb/uhci_rh.cpp index 64193d65bc..b4e6e6a8ad 100644 --- a/src/add-ons/kernel/busses/usb/uhci_rh.cpp +++ b/src/add-ons/kernel/busses/usb/uhci_rh.cpp @@ -98,21 +98,28 @@ static uhci_root_hub_string_s sUHCIRootHubStrings[3] = { { 4, // Descriptor length USB_DESCRIPTOR_STRING, // Descriptor type - 0x0409 // Supported language IDs (English US) + { + 0x0409 // Supported language IDs (English US) + } }, { 12, // Descriptor length 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 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' + } } };