* Copyright (c) 2007 CodeSourcery.
* Written by Paul Brook
*
- * This code is licenced under the GPL.
+ * This code is licensed under the GPL.
*/
-#include "hw.h"
-#include "arm-misc.h"
+#include "sysbus.h"
#include "net.h"
#include <zlib.h>
//#define DEBUG_STELLARIS_ENET 1
#ifdef DEBUG_STELLARIS_ENET
-#define DPRINTF(fmt, args...) \
-do { printf("stellaris_enet: " fmt , ##args); } while (0)
-#define BADF(fmt, args...) \
-do { fprintf(stderr, "stellaris_enet: error: " fmt , ##args); exit(1);} while (0)
+#define DPRINTF(fmt, ...) \
+do { printf("stellaris_enet: " fmt , ## __VA_ARGS__); } while (0)
+#define BADF(fmt, ...) \
+do { fprintf(stderr, "stellaris_enet: error: " fmt , ## __VA_ARGS__); exit(1);} while (0)
#else
-#define DPRINTF(fmt, args...) do {} while(0)
-#define BADF(fmt, args...) \
-do { fprintf(stderr, "stellaris_enet: error: " fmt , ##args);} while (0)
+#define DPRINTF(fmt, ...) do {} while(0)
+#define BADF(fmt, ...) \
+do { fprintf(stderr, "stellaris_enet: error: " fmt , ## __VA_ARGS__);} while (0)
#endif
#define SE_INT_RX 0x01
#define SE_TCTL_DUPLEX 0x08
typedef struct {
+ SysBusDevice busdev;
uint32_t ris;
uint32_t im;
uint32_t rctl;
uint8_t *rx_fifo;
int rx_fifo_len;
int next_packet;
- VLANClientState *vc;
+ NICState *nic;
+ NICConf conf;
qemu_irq irq;
- uint8_t macaddr[6];
int mmio_index;
} stellaris_enet_state;
}
/* TODO: Implement MAC address filtering. */
-static void stellaris_enet_receive(void *opaque, const uint8_t *buf, int size)
+static ssize_t stellaris_enet_receive(VLANClientState *nc, const uint8_t *buf, size_t size)
{
- stellaris_enet_state *s = (stellaris_enet_state *)opaque;
+ stellaris_enet_state *s = DO_UPCAST(NICState, nc, nc)->opaque;
int n;
uint8_t *p;
uint32_t crc;
if ((s->rctl & SE_RCTL_RXEN) == 0)
- return;
+ return -1;
if (s->np >= 31) {
DPRINTF("Packet dropped\n");
- return;
+ return -1;
}
DPRINTF("Received packet len=%d\n", size);
s->ris |= SE_INT_RX;
stellaris_enet_update(s);
+
+ return size;
}
-static int stellaris_enet_can_receive(void *opaque)
+static int stellaris_enet_can_receive(VLANClientState *nc)
{
- stellaris_enet_state *s = (stellaris_enet_state *)opaque;
+ stellaris_enet_state *s = DO_UPCAST(NICState, nc, nc)->opaque;
if ((s->rctl & SE_RCTL_RXEN) == 0)
return 1;
}
return val;
case 0x14: /* IA0 */
- return s->macaddr[0] | (s->macaddr[1] << 8)
- | (s->macaddr[2] << 16) | (s->macaddr[3] << 24);
+ return s->conf.macaddr.a[0] | (s->conf.macaddr.a[1] << 8)
+ | (s->conf.macaddr.a[2] << 16) | (s->conf.macaddr.a[3] << 24);
case 0x18: /* IA1 */
- return s->macaddr[4] | (s->macaddr[5] << 8);
+ return s->conf.macaddr.a[4] | (s->conf.macaddr.a[5] << 8);
case 0x1c: /* THR */
return s->thr;
case 0x20: /* MCTL */
memset(&s->tx_fifo[s->tx_frame_len], 0, 60 - s->tx_frame_len);
s->tx_fifo_len = 60;
}
- qemu_send_packet(s->vc, s->tx_fifo, s->tx_frame_len);
+ qemu_send_packet(&s->nic->nc, s->tx_fifo, s->tx_frame_len);
s->tx_frame_len = -1;
s->ris |= SE_INT_TXEMP;
stellaris_enet_update(s);
}
break;
case 0x14: /* IA0 */
- s->macaddr[0] = value;
- s->macaddr[1] = value >> 8;
- s->macaddr[2] = value >> 16;
- s->macaddr[3] = value >> 24;
+ s->conf.macaddr.a[0] = value;
+ s->conf.macaddr.a[1] = value >> 8;
+ s->conf.macaddr.a[2] = value >> 16;
+ s->conf.macaddr.a[3] = value >> 24;
break;
case 0x18: /* IA1 */
- s->macaddr[4] = value;
- s->macaddr[5] = value >> 8;
+ s->conf.macaddr.a[4] = value;
+ s->conf.macaddr.a[5] = value >> 8;
break;
case 0x1c: /* THR */
s->thr = value;
}
}
-static CPUReadMemoryFunc *stellaris_enet_readfn[] = {
+static CPUReadMemoryFunc * const stellaris_enet_readfn[] = {
stellaris_enet_read,
stellaris_enet_read,
stellaris_enet_read
};
-static CPUWriteMemoryFunc *stellaris_enet_writefn[] = {
+static CPUWriteMemoryFunc * const stellaris_enet_writefn[] = {
stellaris_enet_write,
stellaris_enet_write,
stellaris_enet_write
return 0;
}
-static void stellaris_enet_cleanup(VLANClientState *vc)
+static void stellaris_enet_cleanup(VLANClientState *nc)
{
- stellaris_enet_state *s = vc->opaque;
+ stellaris_enet_state *s = DO_UPCAST(NICState, nc, nc)->opaque;
- unregister_savevm("stellaris_enet", s);
+ unregister_savevm(&s->busdev.qdev, "stellaris_enet", s);
cpu_unregister_io_memory(s->mmio_index);
qemu_free(s);
}
-void stellaris_enet_init(NICInfo *nd, uint32_t base, qemu_irq irq)
+static NetClientInfo net_stellaris_enet_info = {
+ .type = NET_CLIENT_TYPE_NIC,
+ .size = sizeof(NICState),
+ .can_receive = stellaris_enet_can_receive,
+ .receive = stellaris_enet_receive,
+ .cleanup = stellaris_enet_cleanup,
+};
+
+static int stellaris_enet_init(SysBusDevice *dev)
{
- stellaris_enet_state *s;
-
- qemu_check_nic_model(nd, "stellaris");
-
- s = (stellaris_enet_state *)qemu_mallocz(sizeof(stellaris_enet_state));
- s->mmio_index = cpu_register_io_memory(0, stellaris_enet_readfn,
- stellaris_enet_writefn, s);
- cpu_register_physical_memory(base, 0x00001000, s->mmio_index);
- s->irq = irq;
- memcpy(s->macaddr, nd->macaddr, 6);
-
- if (nd->vlan) {
- s->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
- stellaris_enet_receive,
- stellaris_enet_can_receive,
- stellaris_enet_cleanup, s);
- qemu_format_nic_info_str(s->vc, s->macaddr);
- }
+ stellaris_enet_state *s = FROM_SYSBUS(stellaris_enet_state, dev);
+
+ s->mmio_index = cpu_register_io_memory(stellaris_enet_readfn,
+ stellaris_enet_writefn, s,
+ DEVICE_NATIVE_ENDIAN);
+ sysbus_init_mmio(dev, 0x1000, s->mmio_index);
+ sysbus_init_irq(dev, &s->irq);
+ qemu_macaddr_default_if_unset(&s->conf.macaddr);
+
+ s->nic = qemu_new_nic(&net_stellaris_enet_info, &s->conf,
+ dev->qdev.info->name, dev->qdev.id, s);
+ qemu_format_nic_info_str(&s->nic->nc, s->conf.macaddr.a);
stellaris_enet_reset(s);
- register_savevm("stellaris_enet", -1, 1,
+ register_savevm(&s->busdev.qdev, "stellaris_enet", -1, 1,
stellaris_enet_save, stellaris_enet_load, s);
+ return 0;
+}
+
+static SysBusDeviceInfo stellaris_enet_info = {
+ .init = stellaris_enet_init,
+ .qdev.name = "stellaris_enet",
+ .qdev.size = sizeof(stellaris_enet_state),
+ .qdev.props = (Property[]) {
+ DEFINE_NIC_PROPERTIES(stellaris_enet_state, conf),
+ DEFINE_PROP_END_OF_LIST(),
+ }
+};
+
+static void stellaris_enet_register_devices(void)
+{
+ sysbus_register_withprop(&stellaris_enet_info);
}
+
+device_init(stellaris_enet_register_devices)
projects / qemu.git / blobdiff