Module Name: src
Committed By: riastradh
Date: Thu Oct 6 19:59:55 UTC 2022
Modified Files:
src/sys/dev/ic: comreg.h comvar.h ns16550reg.h st16650reg.h
Log Message:
com(4): Add include guards.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/ic/comreg.h
cvs rdiff -u -r1.96 -r1.97 src/sys/dev/ic/comvar.h
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/ic/ns16550reg.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/st16650reg.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/dev/ic/comreg.h
diff -u src/sys/dev/ic/comreg.h:1.27 src/sys/dev/ic/comreg.h:1.28
--- src/sys/dev/ic/comreg.h:1.27 Mon Sep 28 11:33:15 2020
+++ src/sys/dev/ic/comreg.h Thu Oct 6 19:59:55 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: comreg.h,v 1.27 2020/09/28 11:33:15 jmcneill Exp $ */
+/* $NetBSD: comreg.h,v 1.28 2022/10/06 19:59:55 riastradh Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -31,6 +31,9 @@
* @(#)comreg.h 7.2 (Berkeley) 5/9/91
*/
+#ifndef _SYS_DEV_IC_COMREG_H_
+#define _SYS_DEV_IC_COMREG_H_
+
#include <dev/ic/ns16550reg.h>
#ifdef _KERNEL_OPT
@@ -168,3 +171,5 @@
/* XXX ISA-specific. */
#define COM_NPORTS 8
+
+#endif /* _SYS_DEV_IC_COMREG_H_ */
Index: src/sys/dev/ic/comvar.h
diff -u src/sys/dev/ic/comvar.h:1.96 src/sys/dev/ic/comvar.h:1.97
--- src/sys/dev/ic/comvar.h:1.96 Fri Nov 12 21:57:13 2021
+++ src/sys/dev/ic/comvar.h Thu Oct 6 19:59:55 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: comvar.h,v 1.96 2021/11/12 21:57:13 jmcneill Exp $ */
+/* $NetBSD: comvar.h,v 1.97 2022/10/06 19:59:55 riastradh Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -30,6 +30,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef _SYS_DEV_IC_COMVAR_H_
+#define _SYS_DEV_IC_COMVAR_H_
+
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
#include "opt_com.h"
@@ -230,3 +233,5 @@ bool com_suspend(device_t, const pmf_qua
#define IPL_SERIAL IPL_TTY
#define splserial() spltty()
#endif
+
+#endif /* _SYS_DEV_IC_COMVAR_H_ */
Index: src/sys/dev/ic/ns16550reg.h
diff -u src/sys/dev/ic/ns16550reg.h:1.13 src/sys/dev/ic/ns16550reg.h:1.14
--- src/sys/dev/ic/ns16550reg.h:1.13 Fri Jan 11 23:10:41 2019
+++ src/sys/dev/ic/ns16550reg.h Thu Oct 6 19:59:55 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ns16550reg.h,v 1.13 2019/01/11 23:10:41 thorpej Exp $ */
+/* $NetBSD: ns16550reg.h,v 1.14 2022/10/06 19:59:55 riastradh Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -31,6 +31,9 @@
* @(#)ns16550.h 7.1 (Berkeley) 5/9/91
*/
+#ifndef _SYS_DEV_IC_NS16550REG_H_
+#define _SYS_DEV_IC_NS16550REG_H_
+
/*
* NS16550 UART registers
*/
@@ -65,3 +68,5 @@
#define com_tfl 32 /* transmit fifo level (R) (SUNXI) */
#define com_rfl 33 /* receive fifo level (R) (SUNXI) */
#define com_halt 41 /* halt tx (R/W) (SUNXI) */
+
+#endif /* _SYS_DEV_IC_NS16550REG_H_ */
Index: src/sys/dev/ic/st16650reg.h
diff -u src/sys/dev/ic/st16650reg.h:1.3 src/sys/dev/ic/st16650reg.h:1.4
--- src/sys/dev/ic/st16650reg.h:1.3 Sun Dec 11 12:21:28 2005
+++ src/sys/dev/ic/st16650reg.h Thu Oct 6 19:59:55 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: st16650reg.h,v 1.3 2005/12/11 12:21:28 christos Exp $ */
+/* $NetBSD: st16650reg.h,v 1.4 2022/10/06 19:59:55 riastradh Exp $ */
/*
* Copyright (c) 1991 The Regents of the University of California.
@@ -31,6 +31,9 @@
* @(#)ns16550.h 7.1 (Berkeley) 5/9/91
*/
+#ifndef _SYS_DEV_IC_ST16650REG_H_
+#define _SYS_DEV_IC_ST16650REG_H_
+
/*
* ST16650A UART registers
*/
@@ -52,3 +55,5 @@
#define com_xoff1 6 /* XOFF 1 character (R/W) */
#define com_scratch 7 /* scratch register (R/W) */
#define com_xoff2 7 /* XOFF 2 character (R/W) */
+
+#endif /* _SYS_DEV_IC_ST16650REG_H_ */
