fix build on macos and windows

Author: dzo

hw/misc/esp32_rtc_cntl.c

@@ -126,7 +126,7 @@ static uint64_t esp32_rtc_cntl_read(void *opaque, hwaddr addr, unsigned int size
         break;
     }
     if (DEBUG)
-        printf("RTC_CNTL Read %lx %lx\n",addr,r);
+        printf("RTC_CNTL Read %x %x\n",(uint32_t)addr,(uint32_t)r);
     return r;
 }
 
@@ -135,7 +135,7 @@ static void esp32_rtc_cntl_write(void *opaque, hwaddr addr, uint64_t value,
 {
     Esp32RtcCntlState *s = ESP32_RTC_CNTL(opaque);
     if(DEBUG)
-        printf("RTC_CNTL Write %lx %lx\n",addr,value);
+        printf("RTC_CNTL Write %x %x\n",(uint32_t) addr, (uint32_t)value);
     switch (addr) {
     case A_RTC_CNTL_OPTIONS0:
         if (value & R_RTC_CNTL_OPTIONS0_SW_SYS_RESET_MASK) {
@@ -183,7 +183,7 @@ static void esp32_rtc_cntl_write(void *opaque, hwaddr addr, uint64_t value,
                 sleep_time - s->time_reg, NANOSECONDS_PER_SECOND,
                 s->rtc_slowclk_freq);
             if(DEBUG)
-                printf("Sleep %ld, %ld, %d, %ld\n",s->time_reg, sleep_time, timer_en, sleep_ns);
+                printf("Sleep %d, %d, %d, %d\n",(uint32_t)s->time_reg, (uint32_t)sleep_time, timer_en, (uint32_t)sleep_ns);
             if(timer_en)
                 timer_mod(&s->sleep_timer, qemu_clock_get_ns(QEMU_CLOCK_REALTIME)+sleep_ns);
             s->low_power_state_reg=FIELD_DP32(s->low_power_state_reg,RTC_CNTL_LOW_POWER_ST_REG, RTC_RDY_FOR_WAKEUP,1);
@@ -232,7 +232,7 @@ static void esp32_rtc_cntl_write(void *opaque, hwaddr addr, uint64_t value,
         break;
     case A_RTC_CNTL_EXT_WAKEUP_CONF:
         if(DEBUG)
-            printf("wakeup_conf %lx\n",value);
+            printf("wakeup_conf %x\n",(uint32_t)value);
         s->wakeup_conf = value;
         break;
     case A_RTC_MEM_CONF:

hw/misc/esp32_sens.c

@@ -21,7 +21,7 @@
 static uint64_t esp32_sens_read(void *opaque, hwaddr addr, unsigned int size)
 {
     Esp32SensState *s = ESP32_SENS(opaque);
-    uint32_t r = 0;
+    uint32_t r = 0,n1;
 
     switch(addr) {
     case A_SENS_SAR_MEAS_START1:
@@ -37,7 +37,7 @@ static uint64_t esp32_sens_read(void *opaque, hwaddr addr, unsigned int size)
         r = s->sar_start_force;
         break;
     case A_SENS_SAR_TOUCH_OUT1 ... A_SENS_SAR_TOUCH_OUT1+4*4:
-        int n1=((addr-A_SENS_SAR_TOUCH_OUT1)/4)*2;
+        n1=((addr-A_SENS_SAR_TOUCH_OUT1)/4)*2;
         r = ((1500-s->touch_sensor[n1]+rand()%20)<<16) | (1500-s->touch_sensor[n1+1]+rand()%20);
         break;
     case A_SENS_ULP_CP_SLEEP_CYC0 ... A_SENS_ULP_CP_SLEEP_CYC0+4*4: