From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Mon, 21 Feb 2005 04:44:22 +0000 (+0000)
Subject: GC __alpha__ support.
X-Git-Tag: v2.0.1~8622
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/f90fc764b462794b55ba7783b96f5ccd22416b42

GC __alpha__ support.
---

diff --git a/sys/dev/netif/de/if_de.c b/sys/dev/netif/de/if_de.c
index 08ff9a824b..6d8eff751e 100644
--- a/sys/dev/netif/de/if_de.c
+++ b/sys/dev/netif/de/if_de.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: if_de.c,v 1.86 1999/06/01 19:17:59 thorpej Exp $	*/
 
 /* $FreeBSD: src/sys/pci/if_de.c,v 1.123.2.4 2000/08/04 23:25:09 peter Exp $ */
-/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.20 2005/02/21 04:38:21 joerg Exp $ */
+/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.21 2005/02/21 04:44:22 joerg Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -4674,15 +4674,6 @@ tulip_attach(
 	   (sc->tulip_features & (TULIP_HAVE_ISVSROM|TULIP_HAVE_OKSROM))
 		 == TULIP_HAVE_ISVSROM ? " (invalid EESPROM checksum)" : "");
 
-#if defined(__alpha__)
-    /*
-     * In case the SRM console told us about a bogus media,
-     * we need to check to be safe.
-     */
-    if (sc->tulip_mediums[sc->tulip_media] == NULL)
-	sc->tulip_media = TULIP_MEDIA_UNKNOWN;
-#endif
-
     (*sc->tulip_boardsw->bd_media_probe)(sc);
     ifmedia_init(&sc->tulip_ifmedia, 0,
 		 tulip_ifmedia_change,
@@ -4926,9 +4917,6 @@ static int
 tulip_pci_attach(device_t dev)
 {
     tulip_softc_t *sc;
-#if defined(__alpha__)
-    tulip_media_t media = TULIP_MEDIA_UNKNOWN;
-#endif
     int retval, idx;
     u_int32_t revinfo, cfdainfo, cfcsinfo;
     unsigned csroffset = TULIP_PCI_CSROFFSET;
@@ -5010,24 +4998,6 @@ tulip_pci_attach(device_t dev)
 	pci_write_config(dev, PCI_CFDA, cfdainfo, 4);
 	DELAY(11*1000);
     }
-#if defined(__alpha__) 
-    /*
-     * The Alpha SRM console encodes a console set media in the driver
-     * part of the CFDA register.  Note that the Multia presents a
-     * problem in that its BNC mode is really EXTSIA.  So in that case
-     * force a probe.
-     */
-    switch ((cfdainfo >> 8) & 0xff) {
-	case 1: media = chipid > TULIP_21040 ? TULIP_MEDIA_AUI : TULIP_MEDIA_AUIBNC; break;
-	case 2: media = chipid > TULIP_21040 ? TULIP_MEDIA_BNC : TULIP_MEDIA_UNKNOWN; break;
-	case 3: media = TULIP_MEDIA_10BASET; break;
-	case 4: media = TULIP_MEDIA_10BASET_FD; break;
-	case 5: media = TULIP_MEDIA_100BASETX; break;
-	case 6: media = TULIP_MEDIA_100BASETX_FD; break;
-	default: media = TULIP_MEDIA_UNKNOWN; break;
-    }
-#endif
-
     sc->tulip_unit = unit;
     sc->tulip_name = "de";
     sc->tulip_revinfo = revinfo;
@@ -5109,14 +5079,7 @@ tulip_pci_attach(device_t dev)
 	}
 
 	s = splimp();
-#if defined(__alpha__) 
-	sc->tulip_media = media;
-#endif
 	tulip_attach(sc);
-#if defined(__alpha__) 
-	if (sc->tulip_media != TULIP_MEDIA_UNKNOWN)
-		tulip_linkup(sc, media);
-#endif
 	splx(s);
     }
     return 0;
diff --git a/sys/dev/netif/de/if_devar.h b/sys/dev/netif/de/if_devar.h
index 45314bb06e..fa3df1b067 100644
--- a/sys/dev/netif/de/if_devar.h
+++ b/sys/dev/netif/de/if_devar.h
@@ -1,7 +1,7 @@
 /*	$NetBSD: if_devar.h,v 1.32 1999/04/01 14:55:25 tsubai Exp $	*/
 
 /* $FreeBSD: src/sys/pci/if_devar.h,v 1.23.2.1 2000/08/04 23:25:10 peter Exp $ */
-/* $DragonFly: src/sys/dev/netif/de/if_devar.h,v 1.7 2005/02/21 04:38:21 joerg Exp $ */
+/* $DragonFly: src/sys/dev/netif/de/if_devar.h,v 1.8 2005/02/21 04:44:22 joerg Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -777,17 +777,10 @@ static const struct {
 			  TULIP_DATA_PER_DESC, 0, \
 			  BUS_DMA_NOWAIT|BUS_DMA_ALLOCNOW, (mapp))
 #else
-#ifdef __alpha__
-#define TULIP_RXDESC_PRESYNC(sc, di, s)		alpha_mb()
-#define TULIP_RXDESC_POSTSYNC(sc, di, s)	alpha_mb()
-#define TULIP_RXMAP_PRESYNC(sc, map)		alpha_mb()
-#define TULIP_RXMAP_POSTSYNC(sc, map)		alpha_mb()
-#else
 #define TULIP_RXDESC_PRESYNC(sc, di, s)		do { } while (0)
 #define TULIP_RXDESC_POSTSYNC(sc, di, s)	do { } while (0)
 #define TULIP_RXMAP_PRESYNC(sc, map)		do { } while (0)
 #define TULIP_RXMAP_POSTSYNC(sc, map)		do { } while (0)
-#endif
 #define TULIP_RXMAP_CREATE(sc, mapp)		do { } while (0)
 #endif
 
@@ -811,17 +804,10 @@ static const struct {
 			  TULIP_MAX_TXSEG, TULIP_DATA_PER_DESC, \
 			  0, BUS_DMA_NOWAIT, (mapp))
 #else
-#ifdef __alpha__
-#define TULIP_TXDESC_PRESYNC(sc, di, s)		alpha_mb()
-#define TULIP_TXDESC_POSTSYNC(sc, di, s)	alpha_mb()
-#define TULIP_TXMAP_PRESYNC(sc, map)		alpha_mb()
-#define TULIP_TXMAP_POSTSYNC(sc, map)		alpha_mb()
-#else
 #define TULIP_TXDESC_PRESYNC(sc, di, s)		do { } while (0)
 #define TULIP_TXDESC_POSTSYNC(sc, di, s)	do { } while (0)
 #define TULIP_TXMAP_PRESYNC(sc, map)		do { } while (0)
 #define TULIP_TXMAP_POSTSYNC(sc, map)		do { } while (0)
-#endif
 #define TULIP_TXMAP_CREATE(sc, mapp)		do { } while (0)
 #endif
 
@@ -846,13 +832,7 @@ static tulip_softc_t *tulips[TULIP_MAX_DEVICES];
 #endif
 
 #if !defined(TULIP_KVATOPHYS) && (!defined(TULIP_BUS_DMA) || defined(TULIP_BUS_DMA_NORX) || defined(TULIP_BUS_DMA_NOTX))
-#if defined(__alpha__)
-/* XXX XXX NEED REAL DMA MAPPING SUPPORT XXX XXX */
-#define vtobus(va)	alpha_XXX_dmamap((vm_offset_t)va)
-#else
-#define vtobus(va)	vtophys(va)
-#endif
-#define	TULIP_KVATOPHYS(sc, va)		vtobus(va)
+#define	TULIP_KVATOPHYS(sc, va)		vtophys(va)
 #endif
 
 #if defined(TULIP_PERFSTATS)
@@ -878,17 +858,6 @@ TULIP_PERFREAD(
     return x;
 }
 #define	TULIP_PERFDIFF(s, f)	((f) - (s))
-#elif defined(__alpha__)
-typedef unsigned long tulip_cycle_t;
-static __inline__ tulip_cycle_t
-TULIP_PERFREAD(
-    void)
-{
-    tulip_cycle_t x;
-    __asm__ volatile ("rpcc %0" : "=r" (x));
-    return x;
-}
-#define	TULIP_PERFDIFF(s, f)	((unsigned int) ((f) - (s)))
 #endif
 #else
 #define	TULIP_PERFSTART(name)