diff options
| author | Michael Brown | 2008-11-19 03:22:56 +0100 |
|---|---|---|
| committer | Michael Brown | 2008-11-19 20:15:44 +0100 |
| commit | b59e0cc56eb6d5f3b6f934722931f6919309ffd2 (patch) | |
| tree | 0e74a023207232f7911e1ccb9abdf6454dea70f5 /src/drivers/infiniband/arbel.c | |
| parent | [libgcc] Make __libgcc architecture-specific (diff) | |
| download | ipxe-b59e0cc56eb6d5f3b6f934722931f6919309ffd2.tar.gz ipxe-b59e0cc56eb6d5f3b6f934722931f6919309ffd2.tar.xz ipxe-b59e0cc56eb6d5f3b6f934722931f6919309ffd2.zip | |
[i386] Change [u]int32_t to [unsigned] int, rather than [unsigned] long
This brings us in to line with Linux definitions, and also simplifies
adding x86_64 support since both platforms have 2-byte shorts, 4-byte
ints and 8-byte long longs.
Diffstat (limited to 'src/drivers/infiniband/arbel.c')
| -rw-r--r-- | src/drivers/infiniband/arbel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/drivers/infiniband/arbel.c b/src/drivers/infiniband/arbel.c index e516031ba..7d5099547 100644 --- a/src/drivers/infiniband/arbel.c +++ b/src/drivers/infiniband/arbel.c @@ -992,7 +992,7 @@ static void arbel_ring_doorbell ( struct arbel *arbel, union arbelprm_doorbell_register *db_reg, unsigned int offset ) { - DBGC2 ( arbel, "Arbel %p ringing doorbell %08lx:%08lx at %lx\n", + DBGC2 ( arbel, "Arbel %p ringing doorbell %08x:%08x at %lx\n", arbel, db_reg->dword[0], db_reg->dword[1], virt_to_phys ( arbel->uar + offset ) ); @@ -1182,7 +1182,7 @@ static int arbel_complete ( struct ib_device *ibdev, if ( opcode >= ARBEL_OPCODE_RECV_ERROR ) { /* "s" field is not valid for error opcodes */ is_send = ( opcode == ARBEL_OPCODE_SEND_ERROR ); - DBGC ( arbel, "Arbel %p CPN %lx syndrome %lx vendor %lx\n", + DBGC ( arbel, "Arbel %p CPN %lx syndrome %x vendor %x\n", arbel, cq->cqn, MLX_GET ( &cqe->error, syndrome ), MLX_GET ( &cqe->error, vendor_code ) ); rc = -EIO; @@ -1492,7 +1492,7 @@ static void arbel_poll_eq ( struct ib_device *ibdev ) { /* Ring doorbell */ MLX_FILL_1 ( &db_reg.ci, 0, ci, arbel_eq->next_idx ); - DBGCP ( arbel, "Ringing doorbell %08lx with %08lx\n", + DBGCP ( arbel, "Ringing doorbell %08lx with %08x\n", virt_to_phys ( arbel_eq->doorbell ), db_reg.dword[0] ); writel ( db_reg.dword[0], arbel_eq->doorbell ); @@ -1696,7 +1696,7 @@ static int arbel_start_firmware ( struct arbel *arbel ) { arbel, strerror ( rc ) ); goto err_query_fw; } - DBGC ( arbel, "Arbel %p firmware version %ld.%ld.%ld\n", arbel, + DBGC ( arbel, "Arbel %p firmware version %d.%d.%d\n", arbel, MLX_GET ( &fw, fw_rev_major ), MLX_GET ( &fw, fw_rev_minor ), MLX_GET ( &fw, fw_rev_subminor ) ); fw_pages = MLX_GET ( &fw, fw_pages ); |