Module Name: src
Committed By: kre
Date: Mon Jul 9 08:51:19 UTC 2018
Modified Files:
src/sys/arch/evbarm/stand/boot2440: dev_sdmmc.c
src/sys/arch/mips/sibyte/dev: sbjcnvar.h
src/sys/dev/sbus: magmareg.h spifreg.h
Log Message:
Avoid redefining SET/CLR/ISSET (which in the kernel are normally
defined in <sys/types.h>). These redefinitions (when they are,
that is, when types.h is included) were sneaking through because
they were defined identically ... until CLR in <sys/types.h> was
changed... Avoid that issue arising again.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/stand/boot2440/dev_sdmmc.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/sibyte/dev/sbjcnvar.h
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/sbus/magmareg.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/sbus/spifreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/stand/boot2440/dev_sdmmc.c
diff -u src/sys/arch/evbarm/stand/boot2440/dev_sdmmc.c:1.3 src/sys/arch/evbarm/stand/boot2440/dev_sdmmc.c:1.4
--- src/sys/arch/evbarm/stand/boot2440/dev_sdmmc.c:1.3 Fri Jan 2 19:42:05 2015
+++ src/sys/arch/evbarm/stand/boot2440/dev_sdmmc.c Mon Jul 9 08:51:19 2018
@@ -90,9 +90,16 @@
#include "dev_sdmmc.h"
#include "s3csdi.h"
+#ifndef SET
#define SET(t, f) ((t) |= (f))
+#endif
+#ifndef ISSET
#define ISSET(t, f) ((t) & (f))
+#endif
+#ifndef CLR
#define CLR(t, f) ((t) &= ~(f))
+#endif
+
//#define SDMMC_DEBUG
#ifdef SDMMC_DEBUG
Index: src/sys/arch/mips/sibyte/dev/sbjcnvar.h
diff -u src/sys/arch/mips/sibyte/dev/sbjcnvar.h:1.6 src/sys/arch/mips/sibyte/dev/sbjcnvar.h:1.7
--- src/sys/arch/mips/sibyte/dev/sbjcnvar.h:1.6 Mon Apr 13 21:18:42 2015
+++ src/sys/arch/mips/sibyte/dev/sbjcnvar.h Mon Jul 9 08:51:19 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sbjcnvar.h,v 1.6 2015/04/13 21:18:42 riastradh Exp $ */
+/* $NetBSD: sbjcnvar.h,v 1.7 2018/07/09 08:51:19 kre Exp $ */
/*
* Copyright 2000, 2001
@@ -171,6 +171,12 @@ struct sbjcn_softc {
};
/* Macros to clear/set/test flags. */
-#define SET(t, f) (t) |= (f)
-#define CLR(t, f) (t) &= ~(f)
+#ifndef SET
+#define SET(t, f) ((t) |= (f))
+#endif
+#ifndef CLR
+#define CLR(t, f) ((t) &= ~(f))
+#endif
+#ifndef ISSET
#define ISSET(t, f) ((t) & (f))
+#endif
Index: src/sys/dev/sbus/magmareg.h
diff -u src/sys/dev/sbus/magmareg.h:1.18 src/sys/dev/sbus/magmareg.h:1.19
--- src/sys/dev/sbus/magmareg.h:1.18 Sat Nov 15 19:18:19 2014
+++ src/sys/dev/sbus/magmareg.h Mon Jul 9 08:51:19 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: magmareg.h,v 1.18 2014/11/15 19:18:19 christos Exp $ */
+/* $NetBSD: magmareg.h,v 1.19 2018/07/09 08:51:19 kre Exp $ */
/*-
* Copyright (c) 1998 Iain Hibbert
@@ -189,9 +189,15 @@ struct mbpp_softc {
/*
* useful macros
*/
+#ifndef SET
#define SET(t, f) ((t) |= (f))
+#endif
+#ifndef CLR
#define CLR(t, f) ((t) &= ~(f))
+#endif
+#ifndef ISSET
#define ISSET(t, f) ((t) & (f))
+#endif
/* internal function prototypes */
Index: src/sys/dev/sbus/spifreg.h
diff -u src/sys/dev/sbus/spifreg.h:1.5 src/sys/dev/sbus/spifreg.h:1.6
--- src/sys/dev/sbus/spifreg.h:1.5 Sat Nov 15 19:18:19 2014
+++ src/sys/dev/sbus/spifreg.h Mon Jul 9 08:51:19 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: spifreg.h,v 1.5 2014/11/15 19:18:19 christos Exp $ */
+/* $NetBSD: spifreg.h,v 1.6 2018/07/09 08:51:19 kre Exp $ */
/* $OpenBSD: spifreg.h,v 1.5 2003/06/02 18:32:41 jason Exp $ */
/*
@@ -383,9 +383,15 @@
/*
* useful macros
*/
+#ifndef SET
#define SET(t, f) ((t) |= (f))
+#endif
+#ifndef CLR
#define CLR(t, f) ((t) &= ~(f))
+#endif
+#ifndef ISSET
#define ISSET(t, f) ((t) & (f))
+#endif
/*
* internal function prototypes
