socsvn commit: r289983 - soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve

[iateaca at FreeBSD.org]

Author: iateaca
Date: Thu Aug 20 20:00:51 2015
New Revision: 289983
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289983

Log:
  redesign: dismiss one layer of wrappers for read/write registers

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 19:39:15 2015	(r289982)
+++ soc2015/iateaca/bhyve-ne2000-head/usr.sbin/bhyve/pci_ne2000.c	Thu Aug 20 20:00:51 2015	(r289983)
@@ -117,17 +117,8 @@
 
 static uint16_t
 ne2000_read(struct ne2000_softc *sc, uint8_t offset, int size);
-static uint8_t
-ne2000_read_nic(struct ne2000_softc *sc, uint8_t offset);
-static uint16_t
-ne2000_read_asic(struct ne2000_softc *sc, uint8_t offset);
-
 static int
 ne2000_write(struct ne2000_softc *sc, uint8_t offset, uint16_t value, int size);
-static int
-ne2000_write_nic(struct ne2000_softc *sc, uint8_t offset, uint8_t value);
-static int
-ne2000_write_asic(struct ne2000_softc *sc, uint8_t offset, uint16_t value);
 
 static uint8_t
 ne2000_read_nic_locked(struct ne2000_softc *sc, uint8_t offset);
@@ -941,50 +932,23 @@
 static uint16_t
 ne2000_read(struct ne2000_softc *sc, uint8_t offset, int size)
 {
+	int err;
 	uint16_t value = 0;
 
 	assert(offset < ED_NOVELL_IO_PORTS);
 
+	err = pthread_mutex_lock(&sc->mtx);
+	assert(err == 0);
+
 	if (offset < ED_NOVELL_ASIC_OFFSET) {
 		assert(size == 1);
-		value = ne2000_read_nic(sc, offset);
+		value = ne2000_read_nic_locked(sc, offset);
 	}
 	else {
 		assert(size <= 2);
-		value = ne2000_read_asic(sc, offset - ED_NOVELL_ASIC_OFFSET);
+		value = ne2000_read_asic_locked(sc, offset - ED_NOVELL_ASIC_OFFSET);
 	}
 
-	return value;
-}
-
-static uint8_t
-ne2000_read_nic(struct ne2000_softc *sc, uint8_t offset)
-{
-	int err;
-	uint8_t value = 0;
-
-	err = pthread_mutex_lock(&sc->mtx);
-	assert(err == 0);
-
-	value = ne2000_read_nic_locked(sc, offset);
-
-	err = pthread_mutex_unlock(&sc->mtx);
-	assert(err == 0);
-
-	return value;
-}
-
-static uint16_t
-ne2000_read_asic(struct ne2000_softc *sc, uint8_t offset)
-{
-	int err;
-	uint16_t value = 0;
-
-	err = pthread_mutex_lock(&sc->mtx);
-	assert(err == 0);
-
-	value = ne2000_read_asic_locked(sc, offset);
-
 	err = pthread_mutex_unlock(&sc->mtx);
 	assert(err == 0);
 
@@ -998,50 +962,24 @@
 
 	assert(offset < ED_NOVELL_IO_PORTS);
 
+	err = pthread_mutex_lock(&sc->mtx);
+	assert(err == 0);
+
 	if (offset < ED_NOVELL_ASIC_OFFSET) {
 		assert(size == 1);
-		err = ne2000_write_nic(sc, offset, value);
+		err = ne2000_write_nic_locked(sc, offset, value);
 	}
 	else {
 		assert(size <= 2);
-		err = ne2000_write_asic(sc, offset - ED_NOVELL_ASIC_OFFSET, value);
+		err = ne2000_write_asic_locked(sc, offset - ED_NOVELL_ASIC_OFFSET, value);
 	}
 
-	return err;
-}
-
-static int
-ne2000_write_nic(struct ne2000_softc *sc, uint8_t offset, uint8_t value)
-{
-	int err;
-	int rc = -1;
-
-	err = pthread_mutex_lock(&sc->mtx);
-	assert(err == 0);
-
-	rc = ne2000_write_nic_locked(sc, offset, value);
-
-	err = pthread_mutex_unlock(&sc->mtx);
 	assert(err == 0);
 
-	return rc;
-}
-
-static int
-ne2000_write_asic(struct ne2000_softc *sc, uint8_t offset, uint16_t value)
-{
-	int err;
-	int rc = -1;
-
-	err = pthread_mutex_lock(&sc->mtx);
-	assert(err == 0);
-
-	rc = ne2000_write_asic_locked(sc, offset, value);
-
 	err = pthread_mutex_unlock(&sc->mtx);
 	assert(err == 0);
 
-	return rc;
+	return 0;
 }
 
 static uint8_t