Message ID | 1316974483-16947-1-git-send-email-antonynpavlov@gmail.com |
---|---|
State | New |
Headers | show |
On 25 September 2011 19:14, Antony Pavlov <antonynpavlov@gmail.com> wrote: > The commit fc2bf44972349b078d8310466c3866615500e67f > changed the type of val argument of the function gt64120_writel() > from uint32_t to uint64_t, so we need to change the corresponding > length modifier from '%x' to '%llx'. For a uint64_t you need to use PRIx64 -- '%llx' won't work on systems where uint64_t isn't typedefed as 'long long'. -- PMM
On 25 September 2011 23:22, Peter Maydell <peter.maydell@linaro.org> wrote: > On 25 September 2011 19:14, Antony Pavlov <antonynpavlov@gmail.com> wrote: >> The commit fc2bf44972349b078d8310466c3866615500e67f >> changed the type of val argument of the function gt64120_writel() >> from uint32_t to uint64_t, so we need to change the corresponding >> length modifier from '%x' to '%llx'. > > For a uint64_t you need to use PRIx64 -- '%llx' won't work on > systems where uint64_t isn't typedefed as 'long long'. Thanks! I will resend patches in a few seconds.
diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c index c7df8c4..0baa320 100644 --- a/hw/gt64xxx.c +++ b/hw/gt64xxx.c @@ -543,19 +543,19 @@ static void gt64120_writel (void *opaque, target_phys_addr_t addr, /* not really implemented */ s->regs[saddr] = ~(~(s->regs[saddr]) | ~(val & 0xfffffffe)); s->regs[saddr] |= !!(s->regs[saddr] & 0xfffffffe); - DPRINTF("INTRCAUSE %x\n", val); + DPRINTF("INTRCAUSE %llx\n", val); break; case GT_INTRMASK: s->regs[saddr] = val & 0x3c3ffffe; - DPRINTF("INTRMASK %x\n", val); + DPRINTF("INTRMASK %llx\n", val); break; case GT_PCI0_ICMASK: s->regs[saddr] = val & 0x03fffffe; - DPRINTF("ICMASK %x\n", val); + DPRINTF("ICMASK %llx\n", val); break; case GT_PCI0_SERR0MASK: s->regs[saddr] = val & 0x0000003f; - DPRINTF("SERR0MASK %x\n", val); + DPRINTF("SERR0MASK %llx\n", val); break; /* Reserved when only PCI_0 is configured. */
The commit fc2bf44972349b078d8310466c3866615500e67f changed the type of val argument of the function gt64120_writel() from uint32_t to uint64_t, so we need to change the corresponding length modifier from '%x' to '%llx'. Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> --- hw/gt64xxx.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)