[Midnightbsd-cvs] src: if_tx.c: merge
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Dec 2 12:02:00 EST 2008
Log Message:
-----------
merge
Modified Files:
--------------
src/sys/dev/tx:
if_tx.c (r1.2 -> r1.3)
-------------- next part --------------
Index: if_tx.c
===================================================================
RCS file: /home/cvs/src/sys/dev/tx/if_tx.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/dev/tx/if_tx.c -L sys/dev/tx/if_tx.c -u -r1.2 -r1.3
--- sys/dev/tx/if_tx.c
+++ sys/dev/tx/if_tx.c
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/tx/if_tx.c,v 1.89.2.2 2005/08/25 05:01:16 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/tx/if_tx.c,v 1.97 2007/02/23 12:18:57 piso Exp $");
/*
* EtherPower II 10/100 Fast Ethernet (SMC 9432 serie)
@@ -61,7 +61,6 @@
#include <machine/bus.h>
#include <machine/resource.h>
-#include <machine/clock.h> /* for DELAY */
#include <sys/bus.h>
#include <sys/rman.h>
@@ -159,8 +158,7 @@
};
static int
-epic_probe(dev)
- device_t dev;
+epic_probe(device_t dev)
{
struct epic_type *t;
@@ -175,8 +173,7 @@
}
static struct epic_type *
-epic_devtype(dev)
- device_t dev;
+epic_devtype(device_t dev)
{
struct epic_type *t;
@@ -218,8 +215,7 @@
* Reset to known state.
*/
static int
-epic_attach(dev)
- device_t dev;
+epic_attach(device_t dev)
{
struct ifnet *ifp;
epic_softc_t *sc;
@@ -422,7 +418,7 @@
/* Activate our interrupt handler. */
error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET,
- epic_intr, sc, &sc->sc_ih);
+ NULL, epic_intr, sc, &sc->sc_ih);
if (error) {
device_printf(dev, "couldn't set up irq\n");
goto fail;
@@ -445,7 +441,6 @@
static void
epic_release(epic_softc_t *sc)
{
-
if (sc->ifp != NULL)
if_free(sc->ifp);
if (sc->irq)
@@ -482,8 +477,7 @@
* Detach driver and free resources.
*/
static int
-epic_detach(dev)
- device_t dev;
+epic_detach(device_t dev)
{
struct ifnet *ifp;
epic_softc_t *sc;
@@ -515,8 +509,7 @@
* get confused by errant DMAs when rebooting.
*/
static void
-epic_shutdown(dev)
- device_t dev;
+epic_shutdown(device_t dev)
{
epic_softc_t *sc;
@@ -529,10 +522,7 @@
* This is if_ioctl handler.
*/
static int
-epic_ifioctl(ifp, command, data)
- struct ifnet *ifp;
- u_long command;
- caddr_t data;
+epic_ifioctl(struct ifnet *ifp, u_long command, caddr_t data)
{
epic_softc_t *sc = ifp->if_softc;
struct mii_data *mii;
@@ -645,8 +635,7 @@
* or queue become empty.
*/
static void
-epic_ifstart(ifp)
- struct ifnet * ifp;
+epic_ifstart(struct ifnet * ifp)
{
epic_softc_t *sc = ifp->if_softc;
struct epic_tx_buffer *buf;
@@ -725,8 +714,7 @@
* Synopsis: Finish all received frames.
*/
static void
-epic_rx_done(sc)
- epic_softc_t *sc;
+epic_rx_done(epic_softc_t *sc)
{
struct ifnet *ifp = sc->ifp;
u_int16_t len;
@@ -809,8 +797,7 @@
* are pending or descriptor is not transmitted yet.
*/
static void
-epic_tx_done(sc)
- epic_softc_t *sc;
+epic_tx_done(epic_softc_t *sc)
{
struct epic_tx_buffer *buf;
struct epic_tx_desc *desc;
@@ -860,8 +847,7 @@
* Interrupt function
*/
static void
-epic_intr(arg)
- void *arg;
+epic_intr(void *arg)
{
epic_softc_t *sc;
int status, i;
@@ -932,8 +918,7 @@
* and restart the transmitter.
*/
static void
-epic_tx_underrun(sc)
- epic_softc_t *sc;
+epic_tx_underrun(epic_softc_t *sc)
{
if (sc->tx_threshold > TRANSMIT_THRESHOLD_MAX) {
sc->txcon &= ~TXCON_EARLY_TRANSMIT_ENABLE;
@@ -964,8 +949,7 @@
* if success continue to work.
*/
static void
-epic_ifwatchdog(ifp)
- struct ifnet *ifp;
+epic_ifwatchdog(struct ifnet *ifp)
{
epic_softc_t *sc;
int x;
@@ -1020,8 +1004,7 @@
* Set media options.
*/
static int
-epic_ifmedia_upd(ifp)
- struct ifnet *ifp;
+epic_ifmedia_upd(struct ifnet *ifp)
{
epic_softc_t *sc;
struct mii_data *mii;
@@ -1147,9 +1130,7 @@
* Report current media status.
*/
static void
-epic_ifmedia_sts(ifp, ifmr)
- struct ifnet *ifp;
- struct ifmediareq *ifmr;
+epic_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
{
epic_softc_t *sc;
struct mii_data *mii;
@@ -1179,8 +1160,7 @@
* Callback routine, called on media change.
*/
static void
-epic_miibus_statchg(dev)
- device_t dev;
+epic_miibus_statchg(device_t dev)
{
epic_softc_t *sc;
struct mii_data *mii;
@@ -1216,8 +1196,7 @@
}
static void
-epic_miibus_mediainit(dev)
- device_t dev;
+epic_miibus_mediainit(device_t dev)
{
epic_softc_t *sc;
struct mii_data *mii;
@@ -1249,8 +1228,7 @@
* Reset chip and update media.
*/
static void
-epic_init(xsc)
- void *xsc;
+epic_init(void *xsc)
{
epic_softc_t *sc = xsc;
struct ifnet *ifp = sc->ifp;
@@ -1286,9 +1264,9 @@
CSR_WRITE_4(sc, PTCDAR, sc->tx_addr);
/* Put node address to EPIC. */
- CSR_WRITE_4(sc, LAN0, ((u_int16_t *)IFP2ENADDR(sc->ifp))[0]);
- CSR_WRITE_4(sc, LAN1, ((u_int16_t *)IFP2ENADDR(sc->ifp))[1]);
- CSR_WRITE_4(sc, LAN2, ((u_int16_t *)IFP2ENADDR(sc->ifp))[2]);
+ CSR_WRITE_4(sc, LAN0, ((u_int16_t *)IF_LLADDR(sc->ifp))[0]);
+ CSR_WRITE_4(sc, LAN1, ((u_int16_t *)IF_LLADDR(sc->ifp))[1]);
+ CSR_WRITE_4(sc, LAN2, ((u_int16_t *)IF_LLADDR(sc->ifp))[2]);
/* Set tx mode, includeing transmit threshold. */
epic_set_tx_mode(sc);
@@ -1338,8 +1316,7 @@
* access RXCON.
*/
static void
-epic_set_rx_mode(sc)
- epic_softc_t *sc;
+epic_set_rx_mode(epic_softc_t *sc)
{
u_int32_t flags;
u_int32_t rxcon;
@@ -1361,8 +1338,7 @@
* access TXCON.
*/
static void
-epic_set_tx_mode(sc)
- epic_softc_t *sc;
+epic_set_tx_mode(epic_softc_t *sc)
{
if (sc->txcon & TXCON_EARLY_TRANSMIT_ENABLE)
@@ -1379,8 +1355,7 @@
* Note: EPIC must be in idle state.
*/
static void
-epic_set_mc_table(sc)
- epic_softc_t *sc;
+epic_set_mc_table(epic_softc_t *sc)
{
struct ifnet *ifp;
struct ifmultiaddr *ifma;
@@ -1426,8 +1401,7 @@
* Synopsis: Start receive process and transmit one, if they need.
*/
static void
-epic_start_activity(sc)
- epic_softc_t *sc;
+epic_start_activity(epic_softc_t *sc)
{
/* Start rx process. */
@@ -1440,8 +1414,7 @@
* packet needs to be queued to stop Tx DMA.
*/
static void
-epic_stop_activity(sc)
- epic_softc_t *sc;
+epic_stop_activity(epic_softc_t *sc)
{
int status, i;
@@ -1486,8 +1459,7 @@
* XXX the packet will then be actually sent over network...
*/
static int
-epic_queue_last_packet(sc)
- epic_softc_t *sc;
+epic_queue_last_packet(epic_softc_t *sc)
{
struct epic_tx_desc *desc;
struct epic_frag_list *flist;
@@ -1556,8 +1528,7 @@
* Synopsis: Shut down board and deallocates rings.
*/
static void
-epic_stop(sc)
- epic_softc_t *sc;
+epic_stop(epic_softc_t *sc)
{
int s;
@@ -1591,8 +1562,7 @@
* Synopsis: This function should free all memory allocated for rings.
*/
static void
-epic_free_rings(sc)
- epic_softc_t *sc;
+epic_free_rings(epic_softc_t *sc)
{
int i;
@@ -1638,8 +1608,7 @@
* are bounded and aligned properly.
*/
static int
-epic_init_rings(sc)
- epic_softc_t *sc;
+epic_init_rings(epic_softc_t *sc)
{
int error, i;
@@ -1737,9 +1706,7 @@
* EEPROM operation functions
*/
static void
-epic_write_eepromreg(sc, val)
- epic_softc_t *sc;
- u_int8_t val;
+epic_write_eepromreg(epic_softc_t *sc, u_int8_t val)
{
u_int16_t i;
@@ -1752,17 +1719,14 @@
}
static u_int8_t
-epic_read_eepromreg(sc)
- epic_softc_t *sc;
+epic_read_eepromreg(epic_softc_t *sc)
{
return (CSR_READ_1(sc, EECTL));
}
static u_int8_t
-epic_eeprom_clock(sc, val)
- epic_softc_t *sc;
- u_int8_t val;
+epic_eeprom_clock(epic_softc_t *sc, u_int8_t val)
{
epic_write_eepromreg(sc, val);
@@ -1773,9 +1737,7 @@
}
static void
-epic_output_eepromw(sc, val)
- epic_softc_t *sc;
- u_int16_t val;
+epic_output_eepromw(epic_softc_t *sc, u_int16_t val)
{
int i;
@@ -1788,8 +1750,7 @@
}
static u_int16_t
-epic_input_eepromw(sc)
- epic_softc_t *sc;
+epic_input_eepromw(epic_softc_t *sc)
{
u_int16_t retval = 0;
int i;
@@ -1803,9 +1764,7 @@
}
static int
-epic_read_eeprom(sc, loc)
- epic_softc_t *sc;
- u_int16_t loc;
+epic_read_eeprom(epic_softc_t *sc, u_int16_t loc)
{
u_int16_t dataval;
u_int16_t read_cmd;
@@ -1830,9 +1789,7 @@
* Here goes MII read/write routines.
*/
static int
-epic_read_phy_reg(sc, phy, reg)
- epic_softc_t *sc;
- int phy, reg;
+epic_read_phy_reg(epic_softc_t *sc, int phy, int reg)
{
int i;
@@ -1848,9 +1805,7 @@
}
static void
-epic_write_phy_reg(sc, phy, reg, val)
- epic_softc_t *sc;
- int phy, reg, val;
+epic_write_phy_reg(epic_softc_t *sc, int phy, int reg, int val)
{
int i;
@@ -1865,9 +1820,7 @@
}
static int
-epic_miibus_readreg(dev, phy, reg)
- device_t dev;
- int phy, reg;
+epic_miibus_readreg(device_t dev, int phy, int reg)
{
epic_softc_t *sc;
@@ -1877,9 +1830,7 @@
}
static int
-epic_miibus_writereg(dev, phy, reg, data)
- device_t dev;
- int phy, reg, data;
+epic_miibus_writereg(device_t dev, int phy, int reg, int data)
{
epic_softc_t *sc;
More information about the Midnightbsd-cvs
mailing list