ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: cadence_gem: Clean up variable names 

Cleanup some variable names in preparation for migrating the state
struct and type cast macro to a public header. The acronym "GEM" on
its own is not specific enough to be used in a more global namespace
so preface with "cadence". Fix the capitalisation of "gem" in the
state type while touching the typename. Also preface the GEM_MAXREG
macro as this will need to migrate to public header.

Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Tested-by: Alistair Francis <alistair.francis@xilinx.com>
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Message-id: 8e2b0687b3a7b7a3fde5ba2f3bee6f3b911e84ef.1431381507.git.peter.crosthwaite@xilinx.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Crosthwaite 2015-05-14 19:23:07 -07:00 committed by Peter Maydell
parent bf4cb10966
commit 448f19e231
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
hw/net/cadence_gem.c
View File

@ -141,7 +141,7 @@
#define GEM_DESCONF6 (0x00000294/4) #define GEM_DESCONF6 (0x00000294/4)
#define GEM_DESCONF7 (0x00000298/4) #define GEM_DESCONF7 (0x00000298/4)
#define GEM_MAXREG (0x00000640/4) /* Last valid GEM address */ #define CADENCE_GEM_MAXREG (0x00000640/4) /* Last valid GEM address */
/*****************************************/ /*****************************************/
#define GEM_NWCTRL_TXSTART 0x00000200 /* Transmit Enable */ #define GEM_NWCTRL_TXSTART 0x00000200 /* Transmit Enable */
@ -350,9 +350,9 @@ static inline void rx_desc_set_sar(unsigned *desc, int sar_idx)
} }
#define TYPE_CADENCE_GEM "cadence_gem" #define TYPE_CADENCE_GEM "cadence_gem"
#define GEM(obj) OBJECT_CHECK(GemState, (obj), TYPE_CADENCE_GEM) #define CADENCE_GEM(obj) OBJECT_CHECK(CadenceGEMState, (obj), TYPE_CADENCE_GEM)
typedef struct GemState { typedef struct CadenceGEMState {
SysBusDevice parent_obj; SysBusDevice parent_obj;
MemoryRegion iomem; MemoryRegion iomem;
@ -361,15 +361,15 @@ typedef struct GemState {
qemu_irq irq; qemu_irq irq;
/* GEM registers backing store */ /* GEM registers backing store */
uint32_t regs[GEM_MAXREG]; uint32_t regs[CADENCE_GEM_MAXREG];
/* Mask of register bits which are write only */ /* Mask of register bits which are write only */
uint32_t regs_wo[GEM_MAXREG]; uint32_t regs_wo[CADENCE_GEM_MAXREG];
/* Mask of register bits which are read only */ /* Mask of register bits which are read only */
uint32_t regs_ro[GEM_MAXREG]; uint32_t regs_ro[CADENCE_GEM_MAXREG];
/* Mask of register bits which are clear on read */ /* Mask of register bits which are clear on read */
uint32_t regs_rtc[GEM_MAXREG]; uint32_t regs_rtc[CADENCE_GEM_MAXREG];
/* Mask of register bits which are write 1 to clear */ /* Mask of register bits which are write 1 to clear */
uint32_t regs_w1c[GEM_MAXREG]; uint32_t regs_w1c[CADENCE_GEM_MAXREG];
/* PHY registers backing store */ /* PHY registers backing store */
uint16_t phy_regs[32]; uint16_t phy_regs[32];
@ -385,7 +385,7 @@ typedef struct GemState {
unsigned rx_desc[2]; unsigned rx_desc[2];
bool sar_active[4]; bool sar_active[4];
} GemState; } CadenceGEMState;
/* The broadcast MAC address: 0xFFFFFFFFFFFF */ /* The broadcast MAC address: 0xFFFFFFFFFFFF */
static const uint8_t broadcast_addr[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; static const uint8_t broadcast_addr[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
@ -395,7 +395,7 @@ static const uint8_t broadcast_addr[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
* One time initialization. * One time initialization.
* Set masks to identify which register bits have magical clear properties * Set masks to identify which register bits have magical clear properties
*/ */
static void gem_init_register_masks(GemState *s) static void gem_init_register_masks(CadenceGEMState *s)
{ {
/* Mask of register bits which are read only */ /* Mask of register bits which are read only */
memset(&s->regs_ro[0], 0, sizeof(s->regs_ro)); memset(&s->regs_ro[0], 0, sizeof(s->regs_ro));
@ -430,7 +430,7 @@ static void gem_init_register_masks(GemState *s)
* phy_update_link: * phy_update_link:
* Make the emulated PHY link state match the QEMU "interface" state. * Make the emulated PHY link state match the QEMU "interface" state.
*/ */
static void phy_update_link(GemState *s) static void phy_update_link(CadenceGEMState *s)
{ {
DB_PRINT("down %d\n", qemu_get_queue(s->nic)->link_down); DB_PRINT("down %d\n", qemu_get_queue(s->nic)->link_down);
@ -450,7 +450,7 @@ static void phy_update_link(GemState *s)
static int gem_can_receive(NetClientState *nc) static int gem_can_receive(NetClientState *nc)
{ {
GemState *s; CadenceGEMState *s;
s = qemu_get_nic_opaque(nc); s = qemu_get_nic_opaque(nc);
@ -483,7 +483,7 @@ static int gem_can_receive(NetClientState *nc)
* gem_update_int_status: * gem_update_int_status:
* Raise or lower interrupt based on current status. * Raise or lower interrupt based on current status.
*/ */
static void gem_update_int_status(GemState *s) static void gem_update_int_status(CadenceGEMState *s)
{ {
if (s->regs[GEM_ISR]) { if (s->regs[GEM_ISR]) {
DB_PRINT("asserting int. (0x%08x)\n", s->regs[GEM_ISR]); DB_PRINT("asserting int. (0x%08x)\n", s->regs[GEM_ISR]);
@ -495,7 +495,7 @@ static void gem_update_int_status(GemState *s)
* gem_receive_updatestats: * gem_receive_updatestats:
* Increment receive statistics. * Increment receive statistics.
*/ */
static void gem_receive_updatestats(GemState *s, const uint8_t *packet, static void gem_receive_updatestats(CadenceGEMState *s, const uint8_t *packet,
unsigned bytes) unsigned bytes)
{ {
uint64_t octets; uint64_t octets;
@ -586,7 +586,7 @@ static unsigned calc_mac_hash(const uint8_t *mac)
* GEM_RM_PROMISCUOUS_ACCEPT, GEM_RX_BROADCAST_ACCEPT, * GEM_RM_PROMISCUOUS_ACCEPT, GEM_RX_BROADCAST_ACCEPT,
* GEM_RX_MULTICAST_HASH_ACCEPT or GEM_RX_UNICAST_HASH_ACCEPT * GEM_RX_MULTICAST_HASH_ACCEPT or GEM_RX_UNICAST_HASH_ACCEPT
*/ */
static int gem_mac_address_filter(GemState *s, const uint8_t *packet) static int gem_mac_address_filter(CadenceGEMState *s, const uint8_t *packet)
{ {
uint8_t *gem_spaddr; uint8_t *gem_spaddr;
int i; int i;
@ -636,7 +636,7 @@ static int gem_mac_address_filter(GemState *s, const uint8_t *packet)
return GEM_RX_REJECT; return GEM_RX_REJECT;
} }
static void gem_get_rx_desc(GemState *s) static void gem_get_rx_desc(CadenceGEMState *s)
{ {
DB_PRINT("read descriptor 0x%x\n", (unsigned)s->rx_desc_addr); DB_PRINT("read descriptor 0x%x\n", (unsigned)s->rx_desc_addr);
/* read current descriptor */ /* read current descriptor */
@ -660,7 +660,7 @@ static void gem_get_rx_desc(GemState *s)
*/ */
static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size) static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)
{ {
GemState *s; CadenceGEMState *s;
unsigned rxbufsize, bytes_to_copy; unsigned rxbufsize, bytes_to_copy;
unsigned rxbuf_offset; unsigned rxbuf_offset;
uint8_t rxbuf[2048]; uint8_t rxbuf[2048];
@ -810,7 +810,7 @@ static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)
* gem_transmit_updatestats: * gem_transmit_updatestats:
* Increment transmit statistics. * Increment transmit statistics.
*/ */
static void gem_transmit_updatestats(GemState *s, const uint8_t *packet, static void gem_transmit_updatestats(CadenceGEMState *s, const uint8_t *packet,
unsigned bytes) unsigned bytes)
{ {
uint64_t octets; uint64_t octets;
@ -856,7 +856,7 @@ static void gem_transmit_updatestats(GemState *s, const uint8_t *packet,
* gem_transmit: * gem_transmit:
* Fish packets out of the descriptor ring and feed them to QEMU * Fish packets out of the descriptor ring and feed them to QEMU
*/ */
static void gem_transmit(GemState *s) static void gem_transmit(CadenceGEMState *s)
{ {
unsigned desc[2]; unsigned desc[2];
hwaddr packet_desc_addr; hwaddr packet_desc_addr;
@ -976,7 +976,7 @@ static void gem_transmit(GemState *s)
} }
} }
static void gem_phy_reset(GemState *s) static void gem_phy_reset(CadenceGEMState *s)
{ {
memset(&s->phy_regs[0], 0, sizeof(s->phy_regs)); memset(&s->phy_regs[0], 0, sizeof(s->phy_regs));
s->phy_regs[PHY_REG_CONTROL] = 0x1140; s->phy_regs[PHY_REG_CONTROL] = 0x1140;
@ -1004,7 +1004,7 @@ static void gem_phy_reset(GemState *s)
static void gem_reset(DeviceState *d) static void gem_reset(DeviceState *d)
{ {
int i; int i;
GemState *s = GEM(d); CadenceGEMState *s = CADENCE_GEM(d);
DB_PRINT("\n"); DB_PRINT("\n");
@ -1032,13 +1032,13 @@ static void gem_reset(DeviceState *d)
gem_update_int_status(s); gem_update_int_status(s);
} }
static uint16_t gem_phy_read(GemState *s, unsigned reg_num) static uint16_t gem_phy_read(CadenceGEMState *s, unsigned reg_num)
{ {
DB_PRINT("reg: %d value: 0x%04x\n", reg_num, s->phy_regs[reg_num]); DB_PRINT("reg: %d value: 0x%04x\n", reg_num, s->phy_regs[reg_num]);
return s->phy_regs[reg_num]; return s->phy_regs[reg_num];
} }
static void gem_phy_write(GemState *s, unsigned reg_num, uint16_t val) static void gem_phy_write(CadenceGEMState *s, unsigned reg_num, uint16_t val)
{ {
DB_PRINT("reg: %d value: 0x%04x\n", reg_num, val); DB_PRINT("reg: %d value: 0x%04x\n", reg_num, val);
@ -1072,10 +1072,10 @@ static void gem_phy_write(GemState *s, unsigned reg_num, uint16_t val)
*/ */
static uint64_t gem_read(void *opaque, hwaddr offset, unsigned size) static uint64_t gem_read(void *opaque, hwaddr offset, unsigned size)
{ {
GemState *s; CadenceGEMState *s;
uint32_t retval; uint32_t retval;
s = (GemState *)opaque; s = (CadenceGEMState *)opaque;
offset >>= 2; offset >>= 2;
retval = s->regs[offset]; retval = s->regs[offset];
@ -1120,7 +1120,7 @@ static uint64_t gem_read(void *opaque, hwaddr offset, unsigned size)
static void gem_write(void *opaque, hwaddr offset, uint64_t val, static void gem_write(void *opaque, hwaddr offset, uint64_t val,
unsigned size) unsigned size)
{ {
GemState *s = (GemState *)opaque; CadenceGEMState *s = (CadenceGEMState *)opaque;
uint32_t readonly; uint32_t readonly;
DB_PRINT("offset: 0x%04x write: 0x%08x ", (unsigned)offset, (unsigned)val); DB_PRINT("offset: 0x%04x write: 0x%08x ", (unsigned)offset, (unsigned)val);
@ -1226,7 +1226,7 @@ static NetClientInfo net_gem_info = {
static int gem_init(SysBusDevice *sbd) static int gem_init(SysBusDevice *sbd)
{ {
DeviceState *dev = DEVICE(sbd); DeviceState *dev = DEVICE(sbd);
GemState *s = GEM(dev); CadenceGEMState *s = CADENCE_GEM(dev);
DB_PRINT("\n"); DB_PRINT("\n");
@ -1248,18 +1248,18 @@ static const VMStateDescription vmstate_cadence_gem = {
.version_id = 2, .version_id = 2,
.minimum_version_id = 2, .minimum_version_id = 2,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_UINT32_ARRAY(regs, GemState, GEM_MAXREG), VMSTATE_UINT32_ARRAY(regs, CadenceGEMState, CADENCE_GEM_MAXREG),
VMSTATE_UINT16_ARRAY(phy_regs, GemState, 32), VMSTATE_UINT16_ARRAY(phy_regs, CadenceGEMState, 32),
VMSTATE_UINT8(phy_loop, GemState), VMSTATE_UINT8(phy_loop, CadenceGEMState),
VMSTATE_UINT32(rx_desc_addr, GemState), VMSTATE_UINT32(rx_desc_addr, CadenceGEMState),
VMSTATE_UINT32(tx_desc_addr, GemState), VMSTATE_UINT32(tx_desc_addr, CadenceGEMState),
VMSTATE_BOOL_ARRAY(sar_active, GemState, 4), VMSTATE_BOOL_ARRAY(sar_active, CadenceGEMState, 4),
VMSTATE_END_OF_LIST(), VMSTATE_END_OF_LIST(),
} }
}; };
static Property gem_properties[] = { static Property gem_properties[] = {
DEFINE_NIC_PROPERTIES(GemState, conf), DEFINE_NIC_PROPERTIES(CadenceGEMState, conf),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };
@ -1277,7 +1277,7 @@ static void gem_class_init(ObjectClass *klass, void *data)
static const TypeInfo gem_info = { static const TypeInfo gem_info = {
.name = TYPE_CADENCE_GEM, .name = TYPE_CADENCE_GEM,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(GemState), .instance_size = sizeof(CadenceGEMState),
.class_init = gem_class_init, .class_init = gem_class_init,
}; };