Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Firewire: fix more warnings.

This commit is contained in:
PulkoMandy 2014-10-28 08:49:18 +01:00
parent 6879e9df77
commit 438d564c08
3 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/add-ons/kernel/bus_managers/firewire/firewire.cpp
View File

@ -2102,7 +2102,7 @@ fw_rcv(struct fw_rcv_buf *rb)
if(bind == NULL){
device_printf(rb->fc->bdev, "%s: "
"Unknown service addr 0x%04x:0x%08x %s(%x)"
" src=0x%x data=%lx\n",
" src=0x%x data=%" B_PRIu32 "\n",
__func__,
fp->mode.wreqq.dest_hi,
fp->mode.wreqq.dest_lo,

82
src/add-ons/kernel/bus_managers/firewire/fwohcireg.h
View File

@ -36,48 +36,48 @@
*/
#define PCI_CBMEM PCIR_BAR(0)
#define FW_VENDORID_NATSEMI 0x100B
#define FW_VENDORID_NEC 0x1033
#define FW_VENDORID_SIS 0x1039
#define FW_VENDORID_TI 0x104c
#define FW_VENDORID_SONY 0x104d
#define FW_VENDORID_VIA 0x1106
#define FW_VENDORID_RICOH 0x1180
#define FW_VENDORID_APPLE 0x106b
#define FW_VENDORID_LUCENT 0x11c1
#define FW_VENDORID_INTEL 0x8086
#define FW_VENDORID_ADAPTEC 0x9004
#define FW_VENDORID_SUN 0x108e
#define FW_VENDORID_NATSEMI 0x100Bu
#define FW_VENDORID_NEC 0x1033u
#define FW_VENDORID_SIS 0x1039u
#define FW_VENDORID_TI 0x104cu
#define FW_VENDORID_SONY 0x104du
#define FW_VENDORID_VIA 0x1106u
#define FW_VENDORID_RICOH 0x1180u
#define FW_VENDORID_APPLE 0x106bu
#define FW_VENDORID_LUCENT 0x11c1u
#define FW_VENDORID_INTEL 0x8086u
#define FW_VENDORID_ADAPTEC 0x9004u
#define FW_VENDORID_SUN 0x108eu
#define FW_DEVICE_CS4210 (0x000f << 16)
#define FW_DEVICE_UPD861 (0x0063 << 16)
#define FW_DEVICE_UPD871 (0x00ce << 16)
#define FW_DEVICE_UPD72870 (0x00cd << 16)
#define FW_DEVICE_UPD72873 (0x00e7 << 16)
#define FW_DEVICE_UPD72874 (0x00f2 << 16)
#define FW_DEVICE_TITSB22 (0x8009U << 16)
#define FW_DEVICE_TITSB23 (0x8019U << 16)
#define FW_DEVICE_TITSB26 (0x8020U << 16)
#define FW_DEVICE_TITSB43 (0x8021U << 16)
#define FW_DEVICE_TITSB43A (0x8023U << 16)
#define FW_DEVICE_TITSB43AB23 (0x8024U << 16)
#define FW_DEVICE_TITSB82AA2 (0x8025U << 16)
#define FW_DEVICE_TITSB43AB21 (0x8026U << 16)
#define FW_DEVICE_TIPCI4410A (0x8017U << 16)
#define FW_DEVICE_TIPCI4450 (0x8011U << 16)
#define FW_DEVICE_TIPCI4451 (0x8027U << 16)
#define FW_DEVICE_CXD1947 (0x8009U << 16)
#define FW_DEVICE_CXD3222 (0x8039U << 16)
#define FW_DEVICE_VT6306 (0x3044 << 16)
#define FW_DEVICE_R5C551 (0x0551 << 16)
#define FW_DEVICE_R5C552 (0x0552 << 16)
#define FW_DEVICE_PANGEA (0x0030 << 16)
#define FW_DEVICE_UNINORTH (0x0031 << 16)
#define FW_DEVICE_AIC5800 (0x5800 << 16)
#define FW_DEVICE_FW322 (0x5811 << 16)
#define FW_DEVICE_7007 (0x7007 << 16)
#define FW_DEVICE_82372FB (0x7605 << 16)
#define FW_DEVICE_PCIO2FW (0x1102 << 16)
#define FW_DEVICE_CS4210 (0x000fu << 16)
#define FW_DEVICE_UPD861 (0x0063u << 16)
#define FW_DEVICE_UPD871 (0x00ceu << 16)
#define FW_DEVICE_UPD72870 (0x00cdu << 16)
#define FW_DEVICE_UPD72873 (0x00e7u << 16)
#define FW_DEVICE_UPD72874 (0x00f2u << 16)
#define FW_DEVICE_TITSB22 (0x8009u << 16)
#define FW_DEVICE_TITSB23 (0x8019u << 16)
#define FW_DEVICE_TITSB26 (0x8020u << 16)
#define FW_DEVICE_TITSB43 (0x8021u << 16)
#define FW_DEVICE_TITSB43A (0x8023u << 16)
#define FW_DEVICE_TITSB43AB23 (0x8024u << 16)
#define FW_DEVICE_TITSB82AA2 (0x8025u << 16)
#define FW_DEVICE_TITSB43AB21 (0x8026u << 16)
#define FW_DEVICE_TIPCI4410A (0x8017u << 16)
#define FW_DEVICE_TIPCI4450 (0x8011u << 16)
#define FW_DEVICE_TIPCI4451 (0x8027u << 16)
#define FW_DEVICE_CXD1947 (0x8009u << 16)
#define FW_DEVICE_CXD3222 (0x8039u << 16)
#define FW_DEVICE_VT6306 (0x3044u << 16)
#define FW_DEVICE_R5C551 (0x0551u << 16)
#define FW_DEVICE_R5C552 (0x0552u << 16)
#define FW_DEVICE_PANGEA (0x0030u << 16)
#define FW_DEVICE_UNINORTH (0x0031u << 16)
#define FW_DEVICE_AIC5800 (0x5800u << 16)
#define FW_DEVICE_FW322 (0x5811u << 16)
#define FW_DEVICE_7007 (0x7007u << 16)
#define FW_DEVICE_82372FB (0x7605u << 16)
#define FW_DEVICE_PCIO2FW (0x1102u << 16)
#define PCI_INTERFACE_OHCI 0x10

12
src/add-ons/kernel/bus_managers/firewire/util.c
View File

@ -65,7 +65,7 @@ alloc_mem(void **virt, void **phy, size_t size, uint32 protection,
*virt = virtadr;
if (phy)
*phy = (void*)(addr_t)pe.address;
TRACE("area = %ld, size = %ld, virt = %p, phy = %" B_PRIxPHYSADDR "\n", area, size, virtadr,
TRACE("area = %" B_PRId32 ", size = %ld, virt = %p, phy = %" B_PRIxPHYSADDR "\n", area, size, virtadr,
pe.address);
return area;
}
@ -83,22 +83,22 @@ map_mem(void **virt, void *phy, size_t size, uint32 protection,
TRACE("mapping physical address %p with %ld bytes for %s\n", phy, size,
name);
offset = (uint32)phy & (B_PAGE_SIZE - 1);
offset = (intptr_t)phy & (B_PAGE_SIZE - 1);
phyadr = (char *)phy - offset;
size = round_to_pagesize(size + offset);
area = map_physical_memory(name, (addr_t)phyadr, size,
B_ANY_KERNEL_BLOCK_ADDRESS, protection, &mapadr);
if (area < B_OK) {
ERROR("mapping '%s' failed, error 0x%lx (%s)\n", name, area,
ERROR("mapping '%s' failed, error 0x%" B_PRIx32 " (%s)\n", name, area,
strerror(area));
return area;
}
*virt = (char *)mapadr + offset;
TRACE("physical = %p, virtual = %p, offset = %ld, phyadr = %p, mapadr = "
"%p, size = %ld, area = 0x%08lx\n", phy, *virt, offset, phyadr, mapadr,
size, area);
TRACE("physical = %p, virtual = %p, offset = %" B_PRId32 ", phyadr = %p, "
"mapadr = %p, size = %ld, area = 0x%08" B_PRIx32 "\n", phy, *virt,
offset, phyadr, mapadr, size, area);
return area;
}