- Nuke some more #ifdef sun related sections.

4 files changed, 1 insertions, 41 deletions

diff --git a/sys/netatm/atm_if.h b/sys/netatm/atm_if.h
index d87803bc1117..4388eeeddd20 100644
--- a/sys/netatm/atm_if.h
+++ b/sys/netatm/atm_if.h
@@ -338,15 +338,6 @@ struct atm_ncm {
 #define	DEVICE_LOCK(u)		((u)->cu_savepri = splimp())
 #define	DEVICE_UNLOCK(u)	((void) splx((u)->cu_savepri))
 
-
-/*
- * SBus defines
- */
-#if defined(sun)
-#define	SBUS_BURST32	0x20	/* Device supports 32-byte bursts */
-#endif
-
-
 /*
  * Macro to schedule the ATM interrupt queue handler
  */
diff --git a/sys/netatm/atm_ioctl.h b/sys/netatm/atm_ioctl.h
index 547432058435..a205addd4914 100644
--- a/sys/netatm/atm_ioctl.h
+++ b/sys/netatm/atm_ioctl.h
@@ -415,7 +415,7 @@ struct air_phy_stat_rsp {
 /*
  * PF_ATM ioctls
  */
-#if defined(sun) && !defined(__GNUC__)
+#if !defined(__GNUC__)
 #define	AIOCCFG		_IOW(A, 128, struct atmcfgreq)	/* Configure i/f */
 #define	AIOCADD		_IOW(A, 129, struct atmaddreq)	/* Add (e.g. PVC) */
 #define	AIOCDEL		_IOW(A, 130, struct atmdelreq)	/* Delete */
diff --git a/sys/netatm/port.h b/sys/netatm/port.h
index 840c08449c9f..a5b9895ebc34 100644
--- a/sys/netatm/port.h
+++ b/sys/netatm/port.h
@@ -39,25 +39,6 @@
 #define	_NETATM_PORT_H
 
 /*
- * Try to ensure that this system is supported
- */
-#if (defined(BSD) && (BSD >= 199103))
-
-	/* 4.3 BSD Net2 based */
-
-#elif defined(sun)
-
-	/* SunOS4.x */
-
-#else
-
-	/* Ooops */
-	#error "Undefined/unsupported system type"
-
-#endif
-
-
-/*
  * User-space memory management
  *
  * UM_ALLOC(size)	Returns an allocated kernel memory chunk of size bytes.
@@ -73,11 +54,6 @@
 #define	UM_COPY(from, to, len)	bcopy((void *)(from), (void *)(to),\
 						(size_t)(len))
 #define	UM_ZERO(addr, len)	bzero((void *)(addr), (size_t)(len))
-#elif defined(sun)
-#define	UM_ALLOC(size)		malloc(size)
-#define	UM_FREE(addr)		free((char *)(addr))
-#define	UM_COPY(from, to, len)	bcopy((char *)(from), (char *)(to), (len))
-#define	UM_ZERO(addr, len)	bzero((char *)(addr), (len))
 #endif
 
 
@@ -483,8 +459,6 @@ typedef int	KTimeout_ret;
 #endif
 #if (defined(BSD) && (BSD >= 199103))
 #define	KT_TIME(t)	microtime(&t)
-#elif defined(sun)
-#define	KT_TIME(t)	uniqtime(&t)
 #else
 #define	KT_TIME(t)	((t) = time)
 #endif
diff --git a/sys/netatm/spans/spans_kxdr.c b/sys/netatm/spans/spans_kxdr.c
index 7fd4b663d075..7aaae354fd4a 100644
--- a/sys/netatm/spans/spans_kxdr.c
+++ b/sys/netatm/spans/spans_kxdr.c
@@ -84,8 +84,6 @@ __RCSID("@(#) $FreeBSD$");
  * Mountain View, California  94043
  */
 
-#if !defined(sun)
-
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)xdr.c 1.35 87/08/12";*/
 /*static char *sccsid = "from: @(#)xdr.c	2.1 88/07/29 4.0 RPCSRC";*/
@@ -683,6 +681,3 @@ xdrmbuf_getpos(xdrs)
 
 	return ((u_int)xdrs->x_private - (u_int)xdrs->x_base);
 }
-
-#endif	/* !defined(sun) */
-