Revision b1503cda hw/e1000.c

b/hw/e1000.c
763 763
    [MTA ... MTA+127] = &mac_readreg,
764 764
    [VFTA ... VFTA+127] = &mac_readreg,
765 765
};
766
enum { NREADOPS = sizeof(macreg_readops) / sizeof(*macreg_readops) };
766
enum { NREADOPS = ARRAY_SIZE(macreg_readops) };
767 767

  
768 768
#define putreg(x)	[x] = mac_writereg
769 769
static void (*macreg_writeops[])(E1000State *, int, uint32_t) = {
......
779 779
    [MTA ... MTA+127] = &mac_writereg,
780 780
    [VFTA ... VFTA+127] = &mac_writereg,
781 781
};
782
enum { NWRITEOPS = sizeof(macreg_writeops) / sizeof(*macreg_writeops) };
782
enum { NWRITEOPS = ARRAY_SIZE(macreg_writeops) };
783 783

  
784 784
static void
785 785
e1000_mmio_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
......
854 854
    TDT,	TORH,	TORL,	TOTH,	TOTL,	TPR,	TPT,	TXDCTL,	WUFC,
855 855
    VET,
856 856
};
857
enum { MAC_NSAVE = sizeof mac_regtosave/sizeof *mac_regtosave };
857
enum { MAC_NSAVE = ARRAY_SIZE(mac_regtosave) };
858 858

  
859 859
static const struct {
860 860
    int size;
861 861
    int array0;
862 862
} mac_regarraystosave[] = { {32, RA}, {128, MTA}, {128, VFTA} };
863
enum { MAC_NARRAYS = sizeof mac_regarraystosave/sizeof *mac_regarraystosave };
863
enum { MAC_NARRAYS = ARRAY_SIZE(mac_regarraystosave) };
864 864

  
865 865
static void
866 866
nic_save(QEMUFile *f, void *opaque)

Also available in: Unified diff