Module Name: src
Committed By: christos
Date: Mon Jul 9 14:07:37 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:
Remove duplicate copies of the SET/CLR/ISSET macros.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/stand/boot2440/dev_sdmmc.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/sibyte/dev/sbjcnvar.h
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/sbus/magmareg.h
cvs rdiff -u -r1.6 -r1.7 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.4 src/sys/arch/evbarm/stand/boot2440/dev_sdmmc.c:1.5
--- src/sys/arch/evbarm/stand/boot2440/dev_sdmmc.c:1.4 Mon Jul 9 04:51:19 2018
+++ src/sys/arch/evbarm/stand/boot2440/dev_sdmmc.c Mon Jul 9 10:07:37 2018
@@ -90,17 +90,6 @@
#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
#define DPRINTF(s) do {printf s; } while (/*CONSTCOND*/0)
Index: src/sys/arch/mips/sibyte/dev/sbjcnvar.h
diff -u src/sys/arch/mips/sibyte/dev/sbjcnvar.h:1.7 src/sys/arch/mips/sibyte/dev/sbjcnvar.h:1.8
--- src/sys/arch/mips/sibyte/dev/sbjcnvar.h:1.7 Mon Jul 9 04:51:19 2018
+++ src/sys/arch/mips/sibyte/dev/sbjcnvar.h Mon Jul 9 10:07:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sbjcnvar.h,v 1.7 2018/07/09 08:51:19 kre Exp $ */
+/* $NetBSD: sbjcnvar.h,v 1.8 2018/07/09 14:07:37 christos Exp $ */
/*
* Copyright 2000, 2001
@@ -169,14 +169,3 @@ struct sbjcn_softc {
struct sbjcn_channel sc_channels[1];
};
-
-/* Macros to clear/set/test flags. */
-#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.19 src/sys/dev/sbus/magmareg.h:1.20
--- src/sys/dev/sbus/magmareg.h:1.19 Mon Jul 9 04:51:19 2018
+++ src/sys/dev/sbus/magmareg.h Mon Jul 9 10:07:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: magmareg.h,v 1.19 2018/07/09 08:51:19 kre Exp $ */
+/* $NetBSD: magmareg.h,v 1.20 2018/07/09 14:07:37 christos Exp $ */
/*-
* Copyright (c) 1998 Iain Hibbert
@@ -186,19 +186,6 @@ struct mbpp_softc {
struct mbpp_port ms_port[MAGMA_MAX_BPP];
};
-/*
- * 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 */
int cd1400_compute_baud(speed_t, int, int *, int *);
Index: src/sys/dev/sbus/spifreg.h
diff -u src/sys/dev/sbus/spifreg.h:1.6 src/sys/dev/sbus/spifreg.h:1.7
--- src/sys/dev/sbus/spifreg.h:1.6 Mon Jul 9 04:51:19 2018
+++ src/sys/dev/sbus/spifreg.h Mon Jul 9 10:07:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: spifreg.h,v 1.6 2018/07/09 08:51:19 kre Exp $ */
+/* $NetBSD: spifreg.h,v 1.7 2018/07/09 14:07:37 christos Exp $ */
/* $OpenBSD: spifreg.h,v 1.5 2003/06/02 18:32:41 jason Exp $ */
/*
@@ -381,19 +381,6 @@
#define STTY_RBUF_SIZE (2 * 512)
/*
- * 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
*/
int spif_match(device_t, cfdata_t, void *);
