Module Name: src
Committed By: tsutsui
Date: Mon Sep 5 14:14:42 UTC 2022
Modified Files:
src/sys/arch/evbarm/stand/board: epcom.c ns16550.c sscom.c
src/sys/arch/hpcmips/stand/lcboot: extern.h
src/sys/arch/i386/stand/lib: comio_direct.c
src/sys/compat/linux/arch/i386: linux_ptrace.c
src/sys/compat/linux/arch/powerpc: linux_ptrace.c
Log Message:
G/C ISSET() macro copies. It has been defined in <sys/types.h> since 2006.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/stand/board/epcom.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/stand/board/ns16550.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/stand/board/sscom.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hpcmips/stand/lcboot/extern.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/stand/lib/comio_direct.c
cvs rdiff -u -r1.35 -r1.36 src/sys/compat/linux/arch/i386/linux_ptrace.c
cvs rdiff -u -r1.33 -r1.34 src/sys/compat/linux/arch/powerpc/linux_ptrace.c
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/board/epcom.c
diff -u src/sys/arch/evbarm/stand/board/epcom.c:1.5 src/sys/arch/evbarm/stand/board/epcom.c:1.6
--- src/sys/arch/evbarm/stand/board/epcom.c:1.5 Fri Oct 23 00:39:30 2009
+++ src/sys/arch/evbarm/stand/board/epcom.c Mon Sep 5 14:14:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: epcom.c,v 1.5 2009/10/23 00:39:30 snj Exp $ */
+/* $NetBSD: epcom.c,v 1.6 2022/09/05 14:14:42 tsutsui Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -47,8 +47,6 @@
#define SYSCON_WRITE(x, v) *((volatile uint32_t *) \
(SCADDR + (EP93XX_SYSCON_ ## x))) = (v)
-#define ISSET(t,f) ((t) & (f))
-
void
cons_init(void)
{
Index: src/sys/arch/evbarm/stand/board/ns16550.c
diff -u src/sys/arch/evbarm/stand/board/ns16550.c:1.4 src/sys/arch/evbarm/stand/board/ns16550.c:1.5
--- src/sys/arch/evbarm/stand/board/ns16550.c:1.4 Thu Oct 30 06:23:13 2008
+++ src/sys/arch/evbarm/stand/board/ns16550.c Mon Sep 5 14:14:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ns16550.c,v 1.4 2008/10/30 06:23:13 cliff Exp $ */
+/* $NetBSD: ns16550.c,v 1.5 2022/09/05 14:14:42 tsutsui Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -54,8 +54,6 @@
#define OUTB(x, v) *((volatile uint8_t *) (CONADDR + (x))) = (v)
#endif
-#define ISSET(t,f) ((t) & (f))
-
#ifndef NS16550_FREQ
#define NS16550_FREQ COM_FREQ
#endif
Index: src/sys/arch/evbarm/stand/board/sscom.c
diff -u src/sys/arch/evbarm/stand/board/sscom.c:1.6 src/sys/arch/evbarm/stand/board/sscom.c:1.7
--- src/sys/arch/evbarm/stand/board/sscom.c:1.6 Mon Nov 4 21:57:26 2013
+++ src/sys/arch/evbarm/stand/board/sscom.c Mon Sep 5 14:14:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: sscom.c,v 1.6 2013/11/04 21:57:26 christos Exp $ */
+/* $NetBSD: sscom.c,v 1.7 2022/09/05 14:14:42 tsutsui Exp $ */
/*
@@ -93,8 +93,6 @@
#define OUTB(x, v) (*((volatile uint8_t *) ((CONADDR) + (x))) = (v))
#define OUTW(x, v) (*((volatile uint32_t *) ((CONADDR) + (x))) = (v))
-#define ISSET(t,f) ((t) & (f))
-
static long get_com_freq(void);
static int
Index: src/sys/arch/hpcmips/stand/lcboot/extern.h
diff -u src/sys/arch/hpcmips/stand/lcboot/extern.h:1.4 src/sys/arch/hpcmips/stand/lcboot/extern.h:1.5
--- src/sys/arch/hpcmips/stand/lcboot/extern.h:1.4 Sun Dec 11 12:17:34 2005
+++ src/sys/arch/hpcmips/stand/lcboot/extern.h Mon Sep 5 14:14:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.4 2005/12/11 12:17:34 christos Exp $ */
+/* $NetBSD: extern.h,v 1.5 2022/09/05 14:14:42 tsutsui Exp $ */
/*
* Copyright (c) 2003 Naoto Shimazaki.
@@ -80,8 +80,6 @@ struct boot_option {
#define __REG_2(reg) *((volatile u_int16_t*) (reg))
#define __REG_4(reg) *((volatile u_int32_t*) (reg))
-#define ISSET(t, f) ((t) & (f))
-
#define REGWRITE_1(base, off, val) \
(__REG_1(MIPS_PHYS_TO_KSEG1((u_int32_t) (base) + (off))) \
= (val))
Index: src/sys/arch/i386/stand/lib/comio_direct.c
diff -u src/sys/arch/i386/stand/lib/comio_direct.c:1.11 src/sys/arch/i386/stand/lib/comio_direct.c:1.12
--- src/sys/arch/i386/stand/lib/comio_direct.c:1.11 Sun Jan 5 20:49:20 2014
+++ src/sys/arch/i386/stand/lib/comio_direct.c Mon Sep 5 14:14:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: comio_direct.c,v 1.11 2014/01/05 20:49:20 jakllsch Exp $ */
+/* $NetBSD: comio_direct.c,v 1.12 2022/09/05 14:14:42 tsutsui Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995, 1996, 1997
@@ -80,8 +80,6 @@ static int serbuf_read = 0;
static int serbuf_write = 0;
static int stopped = 0;
-#define ISSET(t,f) ((t) & (f))
-
#define divrnd(n, q) (((n)*2/(q)+1)/2) /* divide and round off */
#define RATE_9600 divrnd((COM_FREQ / 16), 9600)
Index: src/sys/compat/linux/arch/i386/linux_ptrace.c
diff -u src/sys/compat/linux/arch/i386/linux_ptrace.c:1.35 src/sys/compat/linux/arch/i386/linux_ptrace.c:1.36
--- src/sys/compat/linux/arch/i386/linux_ptrace.c:1.35 Tue Sep 7 11:43:04 2021
+++ src/sys/compat/linux/arch/i386/linux_ptrace.c Mon Sep 5 14:14:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_ptrace.c,v 1.35 2021/09/07 11:43:04 riastradh Exp $ */
+/* $NetBSD: linux_ptrace.c,v 1.36 2022/09/05 14:14:42 tsutsui Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.35 2021/09/07 11:43:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.36 2022/09/05 14:14:42 tsutsui Exp $");
#include <sys/param.h>
#include <sys/mount.h>
@@ -114,7 +114,6 @@ struct linux_user {
};
#define LUSR_OFF(member) offsetof(struct linux_user, member)
-#define ISSET(t, f) ((t) & (f))
int linux_ptrace_disabled = 1; /* bitrotted */
Index: src/sys/compat/linux/arch/powerpc/linux_ptrace.c
diff -u src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.33 src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.34
--- src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.33 Tue Sep 7 11:43:04 2021
+++ src/sys/compat/linux/arch/powerpc/linux_ptrace.c Mon Sep 5 14:14:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_ptrace.c,v 1.33 2021/09/07 11:43:04 riastradh Exp $ */
+/* $NetBSD: linux_ptrace.c,v 1.34 2022/09/05 14:14:42 tsutsui Exp $ */
/*-
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.33 2021/09/07 11:43:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.34 2022/09/05 14:14:42 tsutsui Exp $");
#include <sys/param.h>
#include <sys/mount.h>
@@ -91,7 +91,6 @@ struct linux_user {
#define LUSR_OFF(member) offsetof(struct linux_user, member)
#define LUSR_REG_OFF(member) offsetof(struct linux_pt_regs, member)
-#define ISSET(t, f) ((t) & (f))
int linux_ptrace_disabled = 1; /* bitrotted */
