Commit 872a2b7c authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Paolo Bonzini
Browse files

hw/net: Use the IEC binary prefix definitions 



It eases code review, unit is explicit.

Patch generated using:

  $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/

and modified manually.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarStefan Weil <sw@weilnetz.de>
Message-Id: <20180625124238.25339-35-f4bug@amsat.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d471bf3e

hw/net/e1000e.c

+4 −3
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
*/



#include "qemu/osdep.h"

#include "qemu/units.h"

#include "net/net.h"

#include "net/tap.h"

#include "qemu/range.h"
@@ -81,10 +82,10 @@ typedef struct E1000EState { 
#define E1000E_IO_IDX       2

#define E1000E_MSIX_IDX     3



#define E1000E_MMIO_SIZE    (128 * 1024)

#define E1000E_FLASH_SIZE   (128 * 1024)

#define E1000E_MMIO_SIZE    (128 * KiB)

#define E1000E_FLASH_SIZE   (128 * KiB)

#define E1000E_IO_SIZE      (32)

#define E1000E_MSIX_SIZE    (16 * 1024)

#define E1000E_MSIX_SIZE    (16 * KiB)



#define E1000E_MSIX_TABLE   (0x0000)

#define E1000E_MSIX_PBA     (0x2000)

hw/net/e1000x_common.c

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
*/



#include "qemu/osdep.h"

#include "qemu/units.h"

#include "hw/hw.h"

#include "hw/pci/pci.h"

#include "net/net.h"
@@ -111,7 +112,7 @@ bool e1000x_is_oversized(uint32_t *mac, size_t size) 
    static const int maximum_ethernet_vlan_size = 1522;

    /* this is the size past which hardware will

       drop packets when setting LPE=1 */

    static const int maximum_ethernet_lpe_size = 16384;

    static const int maximum_ethernet_lpe_size = 16 * KiB;



    if ((size > maximum_ethernet_lpe_size ||

        (size > maximum_ethernet_vlan_size

hw/net/eepro100.c

+1 −2
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
 */



#include "qemu/osdep.h"

#include "qemu/units.h"

#include "hw/hw.h"

#include "hw/pci/pci.h"

#include "net/net.h"
@@ -60,8 +61,6 @@ 
 * changed to pad short packets itself. */

#define CONFIG_PAD_RECEIVED_FRAMES



#define KiB 1024



/* Debug EEPRO100 card. */

#if 0

# define DEBUG_EEPRO100

hw/net/ne2000.h

+3 −2
Original line number Diff line number Diff line 
#ifndef HW_NE2000_H

#define HW_NE2000_H



#include "qemu/units.h"

#include "hw/hw.h"

#include "net/net.h"



#define NE2000_PMEM_SIZE    (32*1024)

#define NE2000_PMEM_START   (16*1024)

#define NE2000_PMEM_SIZE    (32 * KiB)

#define NE2000_PMEM_START   (16 * KiB)

#define NE2000_PMEM_END     (NE2000_PMEM_SIZE+NE2000_PMEM_START)

#define NE2000_MEM_SIZE     NE2000_PMEM_END

include/hw/net/allwinner_emac.h

+3 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#ifndef ALLWINNER_EMAC_H

#define ALLWINNER_EMAC_H



#include "qemu/units.h"

#include "net/net.h"

#include "qemu/fifo8.h"

#include "hw/net/mii.h"
@@ -125,8 +126,8 @@ 
#define EMAC_INT_RX         (1 << 8)



/* Due to lack of specifications, size of fifos is chosen arbitrarily */

#define TX_FIFO_SIZE        (4 * 1024)

#define RX_FIFO_SIZE        (32 * 1024)

#define TX_FIFO_SIZE        (4 * KiB)

#define RX_FIFO_SIZE        (32 * KiB)



#define NUM_TX_FIFOS        2

#define RX_HDR_SIZE         8