a few sparc references sprinkled about in dev
Index: ic/com.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/com.c,v
retrieving revision 1.160
diff -u -p -r1.160 com.c
--- ic/com.c 3 Sep 2016 14:43:37 -0000 1.160
+++ ic/com.c 4 Sep 2016 18:14:52 -0000
@@ -79,14 +79,10 @@
#endif
#include <machine/bus.h>
-#if !defined(__sparc__) || defined(__sparc64__)
#include <machine/intr.h>
-#endif
-#if !defined(__sparc__) || defined(__sparc64__)
#define COM_CONSOLE
#include <dev/cons.h>
-#endif
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: ic/z8530tty.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/z8530tty.c,v
retrieving revision 1.26
diff -u -p -r1.26 z8530tty.c
--- ic/z8530tty.c 5 Feb 2015 12:04:58 -0000 1.26
+++ ic/z8530tty.c 4 Sep 2016 18:15:14 -0000
@@ -330,7 +330,7 @@ zstty_attach(struct device *parent, stru
}
#endif
-#if defined(__sparc__) || defined(__sparc64__)
+#if defined(__sparc64__)
if (strcmp(args->type, "keyboard") == 0 ||
strcmp(args->type, "mouse") == 0)
printf(": %s", args->type);
Index: sbus/sbusvar.h
===================================================================
RCS file: /cvs/src/sys/dev/sbus/sbusvar.h,v
retrieving revision 1.13
diff -u -p -r1.13 sbusvar.h
--- sbus/sbusvar.h 26 Jun 2008 05:42:18 -0000 1.13
+++ sbus/sbusvar.h 4 Sep 2016 18:13:26 -0000
@@ -128,13 +128,7 @@ struct sbus_softc {
#define SBUS_BURST_32 0x20
#define SBUS_BURST_64 0x40
-/* We use #defined(SUN4*) here while the ports are in flux */
-#if defined(__sparc__) && !defined(__sparc64__)
-#include <sparc/dev/sbusvar.h>
-#define INTLEV(x) (x)
-#elif defined(__sparc64__)
#include <sparc64/dev/sbusvar.h>
#include <sparc64/dev/iommureg.h>
-#endif
#endif /* _SBUS_VAR_H */
Index: wscons/wsdisplayvar.h
===================================================================
RCS file: /cvs/src/sys/dev/wscons/wsdisplayvar.h,v
retrieving revision 1.29
diff -u -p -r1.29 wsdisplayvar.h
--- wscons/wsdisplayvar.h 4 Nov 2013 05:45:04 -0000 1.29
+++ wscons/wsdisplayvar.h 4 Sep 2016 18:13:55 -0000
@@ -36,14 +36,14 @@
* to black on white to match the firmware console.
*/
#ifndef WS_DEFAULT_FG
-#if defined(__sparc__) || defined(__sparc64__)
+#if defined(__sparc64__)
#define WS_DEFAULT_FG WSCOL_BLACK
#else
#define WS_DEFAULT_FG WSCOL_WHITE
#endif
#endif
#ifndef WS_DEFAULT_BG
-#if defined(__sparc__) || defined(__sparc64__)
+#if defined(__sparc64__)
#define WS_DEFAULT_BG WSCOL_WHITE
#else
#define WS_DEFAULT_BG WSCOL_BLACK
Index: wsfont/wsfont.c
===================================================================
RCS file: /cvs/src/sys/dev/wsfont/wsfont.c,v
retrieving revision 1.42
diff -u -p -r1.42 wsfont.c
--- wsfont/wsfont.c 13 Sep 2015 16:44:30 -0000 1.42
+++ wsfont/wsfont.c 4 Sep 2016 18:14:13 -0000
@@ -104,7 +104,7 @@
#define FONT_BOLD8x16_ISO1
#if defined(__alpha__) || defined(__luna88k__) || defined(__macppc__) || \
- defined(__sgi__) || defined(__sparc__) || defined(__sparc64__) || \
+ defined(__sgi__) || defined(__sparc64__) || \
!defined(SMALL_KERNEL)
#define FONT_GALLANT12x22
#endif
