net: cadence_gem: Fix debug statements
Enabling debug breaks the build, Fix them and make debug statements always compilable. Fix few statements to use sized integer casting. Signed-off-by: Sai Pavan Boddu <sai.pavan.boddu@xilinx.com> Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
parent
97d7fb5a79
commit
6fe7661d3d
|
@ -35,14 +35,13 @@
|
|||
#include "sysemu/dma.h"
|
||||
#include "net/checksum.h"
|
||||
|
||||
#ifdef CADENCE_GEM_ERR_DEBUG
|
||||
#define DB_PRINT(...) do { \
|
||||
fprintf(stderr, ": %s: ", __func__); \
|
||||
fprintf(stderr, ## __VA_ARGS__); \
|
||||
} while (0)
|
||||
#else
|
||||
#define DB_PRINT(...)
|
||||
#endif
|
||||
#define CADENCE_GEM_ERR_DEBUG 0
|
||||
#define DB_PRINT(...) do {\
|
||||
if (CADENCE_GEM_ERR_DEBUG) { \
|
||||
qemu_log(": %s: ", __func__); \
|
||||
qemu_log(__VA_ARGS__); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
#define GEM_NWCTRL (0x00000000/4) /* Network Control reg */
|
||||
#define GEM_NWCFG (0x00000004/4) /* Network Config reg */
|
||||
|
@ -979,7 +978,7 @@ static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)
|
|||
size += 4;
|
||||
}
|
||||
|
||||
DB_PRINT("config bufsize: %d packet size: %ld\n", rxbufsize, size);
|
||||
DB_PRINT("config bufsize: %u packet size: %zd\n", rxbufsize, size);
|
||||
|
||||
/* Find which queue we are targeting */
|
||||
q = get_queue_from_screen(s, rxbuf_ptr, rxbufsize);
|
||||
|
@ -992,9 +991,9 @@ static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)
|
|||
return -1;
|
||||
}
|
||||
|
||||
DB_PRINT("copy %u bytes to 0x%" PRIx64 "\n",
|
||||
MIN(bytes_to_copy, rxbufsize),
|
||||
rx_desc_get_buffer(s, s->rx_desc[q]));
|
||||
DB_PRINT("copy %" PRIu32 " bytes to 0x%" PRIx64 "\n",
|
||||
MIN(bytes_to_copy, rxbufsize),
|
||||
rx_desc_get_buffer(s, s->rx_desc[q]));
|
||||
|
||||
/* Copy packet data to emulated DMA buffer */
|
||||
address_space_write(&s->dma_as, rx_desc_get_buffer(s, s->rx_desc[q]) +
|
||||
|
@ -1160,8 +1159,8 @@ static void gem_transmit(CadenceGEMState *s)
|
|||
*/
|
||||
if ((tx_desc_get_buffer(s, desc) == 0) ||
|
||||
(tx_desc_get_length(desc) == 0)) {
|
||||
DB_PRINT("Invalid TX descriptor @ 0x%x\n",
|
||||
(unsigned)packet_desc_addr);
|
||||
DB_PRINT("Invalid TX descriptor @ 0x%" HWADDR_PRIx "\n",
|
||||
packet_desc_addr);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue