Date: Thu, 20 Aug 2015 12:52:43 GMT From: iateaca@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r289960 - soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve Message-ID: <201508201252.t7KCqh47095216@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: iateaca Date: Thu Aug 20 12:52:43 2015 New Revision: 289960 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289960 Log: redesign: rename the ne2000 data structure Modified: soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c Modified: soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c ============================================================================== --- soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c Thu Aug 20 11:26:26 2015 (r289959) +++ soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c Thu Aug 20 12:52:43 2015 (r289960) @@ -61,7 +61,7 @@ /* * NE2000 data structures */ -struct pci_ne2000_softc { +struct ne2000_softc { struct pci_devinst *asc_pi; /* @@ -89,68 +89,56 @@ }; /* - * NE2000 debug functions - */ -void vm_inject_fault(void *vm, int vcpuid, int vector, int errcode_valid, - int errcode); - -static void -pci_ne2000_inject_ud(struct pci_ne2000_softc *sc) -{ - vm_inject_fault(sc->asc_pi->pi_vmctx, 0, 6, 0, 0); -} - -/* * NE2000 module function declarations */ static void -ne2000_set_reg_by_offset(struct pci_ne2000_softc *sc, uint8_t page, +ne2000_set_reg_by_offset(struct ne2000_softc *sc, uint8_t page, uint8_t offset, uint8_t value); static uint8_t -ne2000_get_reg_by_offset(struct pci_ne2000_softc *sc, uint8_t page, +ne2000_get_reg_by_offset(struct ne2000_softc *sc, uint8_t page, uint8_t offset); static void -ne2000_set_field_by_offset(struct pci_ne2000_softc *sc, uint8_t page, +ne2000_set_field_by_offset(struct ne2000_softc *sc, uint8_t page, uint8_t offset, uint8_t mask, uint8_t value); static uint8_t -ne2000_read_nic(struct pci_ne2000_softc *sc, uint8_t offset); +ne2000_read_nic(struct ne2000_softc *sc, uint8_t offset); static uint16_t -ne2000_read_asic(struct pci_ne2000_softc *sc, uint8_t offset); +ne2000_read_asic(struct ne2000_softc *sc, uint8_t offset); static int -ne2000_write_nic(struct pci_ne2000_softc *sc, uint8_t offset, uint8_t value); +ne2000_write_nic(struct ne2000_softc *sc, uint8_t offset, uint8_t value); static int -ne2000_write_asic(struct pci_ne2000_softc *sc, uint8_t offset, uint16_t value); +ne2000_write_asic(struct ne2000_softc *sc, uint8_t offset, uint16_t value); static int -ne2000_emul_reg_cr(struct pci_ne2000_softc *sc, uint8_t value); +ne2000_emul_reg_cr(struct ne2000_softc *sc, uint8_t value); static int -ne2000_emul_reg_page0(struct pci_ne2000_softc *sc, uint8_t offset, +ne2000_emul_reg_page0(struct ne2000_softc *sc, uint8_t offset, uint8_t value); static int -ne2000_emul_reg_page1(struct pci_ne2000_softc *sc, uint8_t offset, +ne2000_emul_reg_page1(struct ne2000_softc *sc, uint8_t offset, uint8_t value); static int ne2000_reset_board(void); -static int ne2000_software_reset(struct pci_ne2000_softc *sc); +static int ne2000_software_reset(struct ne2000_softc *sc); static int -ne2000_tap_init(struct pci_ne2000_softc *sc, char *tap_name); +ne2000_tap_init(struct ne2000_softc *sc, char *tap_name); static int -ne2000_tap_tx(struct pci_ne2000_softc *sc, uint8_t tpsr, uint16_t tbcr); +ne2000_tap_tx(struct ne2000_softc *sc, uint8_t tpsr, uint16_t tbcr); static int -ne2000_tap_rx(struct pci_ne2000_softc *sc); +ne2000_tap_rx(struct ne2000_softc *sc); static void ne2000_tap_callback(int fd, enum ev_type type, void *param); static int -ne2000_receive_ring_is_valid(struct pci_ne2000_softc *sc); +ne2000_receive_ring_is_valid(struct ne2000_softc *sc); static int -ne2000_receive_ring_is_full(struct pci_ne2000_softc *sc); +ne2000_receive_ring_is_full(struct ne2000_softc *sc); static int -ne2000_ether_frame_is_valid(struct pci_ne2000_softc *sc); +ne2000_ether_frame_is_valid(struct ne2000_softc *sc); static uint32_t ne2000_ether_crc32_be(const uint8_t *buf, size_t len); @@ -162,7 +150,7 @@ * NE2000 module function definitions */ static void -ne2000_set_reg_by_offset(struct pci_ne2000_softc *sc, uint8_t page, +ne2000_set_reg_by_offset(struct ne2000_softc *sc, uint8_t page, uint8_t offset, uint8_t value) { assert(page < NE2000_PAGE_COUNT); @@ -172,7 +160,7 @@ } static uint8_t -ne2000_get_reg_by_offset(struct pci_ne2000_softc *sc, uint8_t page, +ne2000_get_reg_by_offset(struct ne2000_softc *sc, uint8_t page, uint8_t offset) { assert(page < NE2000_PAGE_COUNT); @@ -182,7 +170,7 @@ } static void -ne2000_set_field_by_offset(struct pci_ne2000_softc *sc, uint8_t page, +ne2000_set_field_by_offset(struct ne2000_softc *sc, uint8_t page, uint8_t offset, uint8_t mask, uint8_t value) { uint8_t reg_value = 0; @@ -196,7 +184,7 @@ } static void -pci_ne2000_update_intr(struct pci_ne2000_softc *sc) +pci_ne2000_update_intr(struct ne2000_softc *sc) { uint8_t isr = 0; uint8_t imr = 0; @@ -218,7 +206,7 @@ } static int -ne2000_tap_init(struct pci_ne2000_softc *sc, char *tap_name) +ne2000_tap_init(struct ne2000_softc *sc, char *tap_name) { int err; int opt = 1; @@ -241,7 +229,7 @@ } static int -ne2000_tap_tx(struct pci_ne2000_softc *sc, uint8_t tpsr, uint16_t tbcr) +ne2000_tap_tx(struct ne2000_softc *sc, uint8_t tpsr, uint16_t tbcr) { ssize_t write_len; @@ -259,7 +247,7 @@ } static int -ne2000_tap_rx(struct pci_ne2000_softc *sc) +ne2000_tap_rx(struct ne2000_softc *sc) { uint8_t pstart = 0; uint8_t pstop = 0; @@ -354,7 +342,7 @@ ne2000_tap_callback(int fd, enum ev_type type, void *param) { int err; - struct pci_ne2000_softc *sc = (struct pci_ne2000_softc *)param; + struct ne2000_softc *sc = (struct ne2000_softc *)param; assert(sc != NULL); err = pthread_mutex_lock(&sc->mtx); @@ -370,7 +358,7 @@ } static int -ne2000_receive_ring_is_valid(struct pci_ne2000_softc *sc) +ne2000_receive_ring_is_valid(struct ne2000_softc *sc) { uint8_t cr = 0; @@ -403,7 +391,7 @@ } static int -ne2000_receive_ring_is_full(struct pci_ne2000_softc *sc) +ne2000_receive_ring_is_full(struct ne2000_softc *sc) { uint32_t avail = 0; uint32_t start = 0; @@ -440,7 +428,7 @@ } static int -ne2000_ether_frame_is_valid(struct pci_ne2000_softc *sc) +ne2000_ether_frame_is_valid(struct ne2000_softc *sc) { uint8_t key = 0; uint8_t mar_offset = 0; @@ -569,7 +557,7 @@ static int pci_ne2000_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts) { - struct pci_ne2000_softc *sc = NULL; + struct ne2000_softc *sc = NULL; int err; /* the default mac address is 00:a0:98:4a:0e:ee */ @@ -583,7 +571,7 @@ assert(ctx != NULL); assert(pi != NULL); - sc = calloc(1, sizeof(struct pci_ne2000_softc)); + sc = calloc(1, sizeof(struct ne2000_softc)); pi->pi_arg = sc; sc->asc_pi = pi; @@ -632,7 +620,7 @@ pci_ne2000_write(struct vmctx *ctx, int vcpu, struct pci_devinst *pi, int baridx, uint64_t offset, int size, uint64_t value) { - struct pci_ne2000_softc *sc = pi->pi_arg; + struct ne2000_softc *sc = pi->pi_arg; int err; assert(sc != NULL); @@ -664,7 +652,7 @@ } static int -ne2000_write_nic(struct pci_ne2000_softc *sc, uint8_t offset, uint8_t value) +ne2000_write_nic(struct ne2000_softc *sc, uint8_t offset, uint8_t value) { int err; @@ -690,7 +678,7 @@ } static int -ne2000_write_asic(struct pci_ne2000_softc *sc, uint8_t offset, uint16_t value) +ne2000_write_asic(struct ne2000_softc *sc, uint8_t offset, uint16_t value) { uint8_t dcr = 0; uint8_t rbcr0 = 0; @@ -768,7 +756,7 @@ } static int -ne2000_emul_reg_cr(struct pci_ne2000_softc *sc, uint8_t value) +ne2000_emul_reg_cr(struct ne2000_softc *sc, uint8_t value) { int err; uint8_t rbcr0 = 0; @@ -861,7 +849,7 @@ } static int -ne2000_emul_reg_page0(struct pci_ne2000_softc *sc, uint8_t offset, +ne2000_emul_reg_page0(struct ne2000_softc *sc, uint8_t offset, uint8_t value) { uint8_t pstart = 0; @@ -898,7 +886,7 @@ } static int -ne2000_emul_reg_page1(struct pci_ne2000_softc *sc, uint8_t offset, +ne2000_emul_reg_page1(struct ne2000_softc *sc, uint8_t offset, uint8_t value) { uint8_t pstart = 0; @@ -927,7 +915,7 @@ } static int -ne2000_software_reset(struct pci_ne2000_softc *sc) +ne2000_software_reset(struct ne2000_softc *sc) { DPRINTF("The NIC is in Software Reset State"); @@ -951,7 +939,7 @@ pci_ne2000_read(struct vmctx *ctx, int vcpu, struct pci_devinst *pi, int baridx, uint64_t offset, int size) { - struct pci_ne2000_softc *sc = pi->pi_arg; + struct ne2000_softc *sc = pi->pi_arg; uint64_t value = 0; int err; @@ -981,7 +969,7 @@ } static uint8_t -ne2000_read_nic(struct pci_ne2000_softc *sc, uint8_t offset) +ne2000_read_nic(struct ne2000_softc *sc, uint8_t offset) { int err; uint8_t value = 0; @@ -1041,7 +1029,7 @@ } static uint16_t -ne2000_read_asic(struct pci_ne2000_softc *sc, uint8_t offset) +ne2000_read_asic(struct ne2000_softc *sc, uint8_t offset) { int err; uint8_t dcr = 0;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508201252.t7KCqh47095216>