Insert ifmedia_set() that I forgot and put in the vtophys() hack for

the alpha. Now the ThunderLAN driver works on the alpha (both my
sample cards check out.) Update the alpha GENERIC config to include
ThunderLAN driver now that I've tested it.

4 files changed, 14 insertions, 5 deletions

diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 95b9686..8eafb1e 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.15 1999/01/23 16:53:26 dfr Exp $
+#	$Id: GENERIC,v 1.16 1999/03/27 20:41:25 wpaul Exp $
 
 machine		"alpha"
 cpu		"EV4"
@@ -101,6 +101,7 @@ device de0
 device fxp0
 device le0
 device pn0
+device tl0
 device xl0
 
 pseudo-device	loop
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index 95b9686..8eafb1e 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.15 1999/01/23 16:53:26 dfr Exp $
+#	$Id: GENERIC,v 1.16 1999/03/27 20:41:25 wpaul Exp $
 
 machine		"alpha"
 cpu		"EV4"
@@ -101,6 +101,7 @@ device de0
 device fxp0
 device le0
 device pn0
+device tl0
 device xl0
 
 pseudo-device	loop
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index 3caa83c..a2e8437 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_tl.c,v 1.37 1999/03/30 16:59:06 wpaul Exp $
+ *	$Id: if_tl.c,v 1.38 1999/03/31 04:00:05 wpaul Exp $
  */
 
 /*
@@ -221,7 +221,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_tl.c,v 1.37 1999/03/30 16:59:06 wpaul Exp $";
+	"$Id: if_tl.c,v 1.38 1999/03/31 04:00:05 wpaul Exp $";
 #endif
 
 /*
@@ -1763,6 +1763,7 @@ tl_attach(config_id, unit)
 		ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_10_T|IFM_HDX, 0, NULL);
 		ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_10_T|IFM_FDX, 0, NULL);
 		ifmedia_add(&sc->ifmedia, IFM_ETHER|IFM_10_5, 0, NULL);
+		ifmedia_set(&sc->ifmedia, IFM_ETHER|IFM_10_T);
 		/* Reset again, this time setting bitrate mode. */
 		tl_softreset(sc, 1);
 		ifm = &sc->ifmedia;
diff --git a/sys/pci/if_tlreg.h b/sys/pci/if_tlreg.h
index c5e76c9..f4eb98c 100644
--- a/sys/pci/if_tlreg.h
+++ b/sys/pci/if_tlreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_tlreg.h,v 1.14 1999/03/30 16:57:26 wpaul Exp $
+ *	$Id: if_tlreg.h,v 1.15 1999/03/31 04:00:05 wpaul Exp $
  */
 
 
@@ -806,3 +806,9 @@ struct tl_stats {
  */
 #define EEPROM_CTL_READ			0xA1	/* 0101 0001 */
 #define EEPROM_CTL_WRITE		0xA0	/* 0101 0000 */
+
+#ifdef __alpha__
+#undef vtophys
+#define vtophys(va)		(pmap_kextract(((vm_offset_t) (va))) \
+					+ 1*1024*1024*1024)
+#endif