Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 14 Aug 2014 16:01:38 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r269980 - head/sys/dev/cs
Message-ID:  <201408141601.s7EG1cX8067424@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: imp
Date: Thu Aug 14 16:01:38 2014
New Revision: 269980
URL: http://svnweb.freebsd.org/changeset/base/269980

Log:
  Delete pp_isadma. It isn't use, and the code that used it has been
  commented out (temporarily) since 1998 when this driver hit the
  tree. Also, no need to compute the ethernet header and then never use
  it.

Modified:
  head/sys/dev/cs/if_cs.c

Modified: head/sys/dev/cs/if_cs.c
==============================================================================
--- head/sys/dev/cs/if_cs.c	Thu Aug 14 16:01:33 2014	(r269979)
+++ head/sys/dev/cs/if_cs.c	Thu Aug 14 16:01:38 2014	(r269980)
@@ -264,7 +264,7 @@ cs_cs89x0_probe(device_t dev)
 	uint16_t id;
 	char chip_revision;
 	uint16_t eeprom_buff[CHKSUM_LEN];
-	int chip_type, pp_isaint, pp_isadma;
+	int chip_type, pp_isaint;
 
 	sc->dev = dev;
 	error = cs_alloc_port(dev, 0, CS_89x0_IO_PORTS);
@@ -299,11 +299,9 @@ cs_cs89x0_probe(device_t dev)
 
 	if (chip_type == CS8900) {
 		pp_isaint = PP_CS8900_ISAINT;
-		pp_isadma = PP_CS8900_ISADMA;
 		sc->send_cmd = TX_CS8900_AFTER_ALL;
 	} else {
 		pp_isaint = PP_CS8920_ISAINT;
-		pp_isadma = PP_CS8920_ISADMA;
 		sc->send_cmd = TX_CS8920_AFTER_ALL;
 	}
 
@@ -381,17 +379,6 @@ cs_cs89x0_probe(device_t dev)
 	if (!(sc->flags & CS_NO_IRQ))
 		cs_writereg(sc, pp_isaint, irq);
 
-	/*
-	 * Temporary disabled
-	 *
-	if (drq>0)
-		cs_writereg(sc, pp_isadma, drq);
-	else {
-		device_printf(dev, "incorrect drq\n",);
-		return (0);
-	}
-	*/
-
 	if (bootverbose)
 		 device_printf(dev, "CS89%c0%s rev %c media%s%s%s\n",
 			chip_type == CS8900 ? '0' : '2',
@@ -702,7 +689,6 @@ cs_get_packet(struct cs_softc *sc)
 {
 	struct ifnet *ifp = sc->ifp;
 	int status, length;
-	struct ether_header *eh;
 	struct mbuf *m;
 
 #ifdef CS_DEBUG
@@ -746,8 +732,6 @@ cs_get_packet(struct cs_softc *sc)
 	bus_read_multi_2(sc->port_res, RX_FRAME_PORT, mtod(m, uint16_t *),
 	    (length + 1) >> 1);
 
-	eh = mtod(m, struct ether_header *);
-
 #ifdef CS_DEBUG
 	for (i=0;i<length;i++)
 	     printf(" %02x",(unsigned char)*((char *)(m->m_data+i)));

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408141601.s7EG1cX8067424>