Commit 54be4c42 authored by Thomas Huth's avatar Thomas Huth Committed by Michael Tokarev
Browse files

hw/timer/mt48t59: Fix bit-rotten NVRAM_PRINTF format strings 



When compiling with NVRAM_PRINTF enabled, gcc currently bails out with:

  CC      hw/timer/m48t59.o
  CC      hw/timer/m48t59-isa.o
hw/timer/m48t59.c: In function ‘NVRAM_writeb’:
hw/timer/m48t59.c:460:5: error: format ‘%x’ expects argument of type ‘unsigned int’, but argument 3 has type ‘hwaddr’ [-Werror=format=]
     NVRAM_PRINTF("%s: 0x%08x => 0x%08x\n", __func__, addr, val);
     ^
hw/timer/m48t59.c:460:5: error: format ‘%x’ expects argument of type ‘unsigned int’, but argument 4 has type ‘uint64_t’ [-Werror=format=]
hw/timer/m48t59.c: In function ‘NVRAM_readb’:
hw/timer/m48t59.c:492:5: error: format ‘%x’ expects argument of type ‘unsigned int’, but argument 3 has type ‘hwaddr’ [-Werror=format=]
     NVRAM_PRINTF("%s: 0x%08x <= 0x%08x\n", __func__, addr, retval);

Fix it by using the correct format strings and while we're at it,
also change the definition of NVRAM_PRINTF so that this can not
bit-rot so easily again.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent 4a4ff4c5

hw/timer/m48t59-internal.h

+3 −6
Original line number Diff line number Diff line
@@ -25,13 +25,10 @@ 
#ifndef HW_M48T59_INTERNAL_H

#define HW_M48T59_INTERNAL_H 1



//#define DEBUG_NVRAM

#define M48T59_DEBUG 0



#if defined(DEBUG_NVRAM)

#define NVRAM_PRINTF(fmt, ...) do { printf(fmt , ## __VA_ARGS__); } while (0)

#else

#define NVRAM_PRINTF(fmt, ...) do { } while (0)

#endif

#define NVRAM_PRINTF(fmt, ...) do { \

    if (M48T59_DEBUG) { printf(fmt , ## __VA_ARGS__); } } while (0)



/*

 * The M48T02, M48T08 and M48T59 chips are very similar. The newer '59 has

hw/timer/m48t59.c

+2 −2
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ static void NVRAM_writeb(void *opaque, hwaddr addr, uint64_t val, 
{

    M48t59State *NVRAM = opaque;



    NVRAM_PRINTF("%s: 0x%08x => 0x%08x\n", __func__, addr, val);

    NVRAM_PRINTF("%s: 0x%"HWADDR_PRIx" => 0x%"PRIx64"\n", __func__, addr, val);

    switch (addr) {

    case 0:

        NVRAM->addr &= ~0x00FF;
@@ -488,7 +488,7 @@ static uint64_t NVRAM_readb(void *opaque, hwaddr addr, unsigned size) 
        retval = -1;

        break;

    }

    NVRAM_PRINTF("%s: 0x%08x <= 0x%08x\n", __func__, addr, retval);

    NVRAM_PRINTF("%s: 0x%"HWADDR_PRIx" <= 0x%08x\n", __func__, addr, retval);



    return retval;

}