diff options
| author | Suren A. Chilingaryan <csa@dside.dyndns.org> | 2011-10-21 03:44:27 +0200 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@dside.dyndns.org> | 2011-10-21 03:44:27 +0200 |
| commit | 32bd82e4b4748cbe7b4734030dfb135feab4dffc (patch) | |
| tree | 5a4a6c77d2f51f4d8e9081961b31bb6b53c64948 /register.c | |
| parent | b407c19d68509af786ed13fb22e66bebbf73c0d8 (diff) | |
| download | ipecamera-32bd82e4b4748cbe7b4734030dfb135feab4dffc.tar.gz ipecamera-32bd82e4b4748cbe7b4734030dfb135feab4dffc.tar.bz2 ipecamera-32bd82e4b4748cbe7b4734030dfb135feab4dffc.tar.xz ipecamera-32bd82e4b4748cbe7b4734030dfb135feab4dffc.zip | |
Accept short addresses for IPECamera FPGA registers
Diffstat (limited to 'register.c')
| -rw-r--r-- | register.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -145,7 +145,10 @@ static int pcilib_read_register_space_internal(pcilib_t *ctx, pcilib_register_ba assert(bits < 8 * sizeof(pcilib_register_value_t)); if (((addr + n) > b->size)||(((addr + n) == b->size)&&(bits))) { - pcilib_error("Accessing register (%u regs at addr %u) out of register space (%u registers total)", bits?(n+1):n, addr, b->size); + if ((b->format)&&(strchr(b->format, 'x'))) + pcilib_error("Accessing register (%u regs at addr 0x%x) out of register space (%u registers total)", bits?(n+1):n, addr, b->size); + else + pcilib_error("Accessing register (%u regs at addr %u) out of register space (%u registers total)", bits?(n+1):n, addr, b->size); return PCILIB_ERROR_OUTOFRANGE; } @@ -250,7 +253,10 @@ static int pcilib_write_register_space_internal(pcilib_t *ctx, pcilib_register_b assert(bits < 8 * sizeof(pcilib_register_value_t)); if (((addr + n) > b->size)||(((addr + n) == b->size)&&(bits))) { - pcilib_error("Accessing register (%u regs at addr %u) out of register space (%u registers total)", bits?(n+1):n, addr, b->size); + if ((b->format)&&(strchr(b->format, 'x'))) + pcilib_error("Accessing register (%u regs at addr 0x%x) out of register space (%u registers total)", bits?(n+1):n, addr, b->size); + else + pcilib_error("Accessing register (%u regs at addr %u) out of register space (%u registers total)", bits?(n+1):n, addr, b->size); return PCILIB_ERROR_OUTOFRANGE; } |