Module Name: src
Committed By: skrll
Date: Fri Dec 11 09:40:28 UTC 2020
Modified Files:
src/sys/dev/fdt: display_timing.h fdt_ddb.h fdt_port.h fdtvar.h
syscon.h
Log Message:
Multiple inclusion protection define consistency
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/fdt/display_timing.h \
src/sys/dev/fdt/fdt_ddb.h src/sys/dev/fdt/syscon.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/fdt/fdt_port.h
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/fdt/fdtvar.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/fdt/display_timing.h
diff -u src/sys/dev/fdt/display_timing.h:1.1 src/sys/dev/fdt/display_timing.h:1.2
--- src/sys/dev/fdt/display_timing.h:1.1 Sat Jun 3 14:48:02 2017
+++ src/sys/dev/fdt/display_timing.h Fri Dec 11 09:40:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: display_timing.h,v 1.1 2017/06/03 14:48:02 jmcneill Exp $ */
+/* $NetBSD: display_timing.h,v 1.2 2020/12/11 09:40:28 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -26,8 +26,8 @@
* SUCH DAMAGE.
*/
-#ifndef _FDT_DISPLAY_TIMING_H
-#define _FDT_DISPLAY_TIMING_H
+#ifndef _DEV_FDT_DISPLAY_TIMING_H_
+#define _DEV_FDT_DISPLAY_TIMING_H_
struct display_timing {
/* required */
@@ -44,4 +44,4 @@ struct display_timing {
int display_timing_parse(int, struct display_timing *);
-#endif /* !_FDT_DISPLAY_TIMING_H */
+#endif /* _DEV_FDT_DISPLAY_TIMING_H_ */
Index: src/sys/dev/fdt/fdt_ddb.h
diff -u src/sys/dev/fdt/fdt_ddb.h:1.1 src/sys/dev/fdt/fdt_ddb.h:1.2
--- src/sys/dev/fdt/fdt_ddb.h:1.1 Fri Oct 30 16:08:45 2020
+++ src/sys/dev/fdt/fdt_ddb.h Fri Dec 11 09:40:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_ddb.h,v 1.1 2020/10/30 16:08:45 skrll Exp $ */
+/* $NetBSD: fdt_ddb.h,v 1.2 2020/12/11 09:40:28 skrll Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -30,9 +30,9 @@
*/
-#ifndef _FDT_DDB_H
-#define _FDT_DDB_H
+#ifndef _DEV_FDT_FDT_DDB_H_
+#define _DEV_FDT_FDT_DDB_H_
void fdt_print(const void *, bool, void (*)(const char *, ...) __printflike(1, 2));
-#endif
+#endif /* _DEV_FDT_FDT_DDB_H_ */
Index: src/sys/dev/fdt/syscon.h
diff -u src/sys/dev/fdt/syscon.h:1.1 src/sys/dev/fdt/syscon.h:1.2
--- src/sys/dev/fdt/syscon.h:1.1 Sat Jun 30 12:35:18 2018
+++ src/sys/dev/fdt/syscon.h Fri Dec 11 09:40:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: syscon.h,v 1.1 2018/06/30 12:35:18 jmcneill Exp $ */
+/* $NetBSD: syscon.h,v 1.2 2020/12/11 09:40:28 skrll Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -26,8 +26,8 @@
* SUCH DAMAGE.
*/
-#ifndef _FDT_SYSCON_H
-#define _FDT_SYSCON_H
+#ifndef _DEV_FDT_SYSCON_H_
+#define _DEV_FDT_SYSCON_H_
struct syscon {
void *priv;
@@ -51,4 +51,4 @@ struct syscon {
(_syscon)->write_4((_syscon)->priv, (_reg), (_val))
-#endif /* !_FDT_SYSCON_H */
+#endif /* _DEV_FDT_SYSCON_H_ */
Index: src/sys/dev/fdt/fdt_port.h
diff -u src/sys/dev/fdt/fdt_port.h:1.3 src/sys/dev/fdt/fdt_port.h:1.4
--- src/sys/dev/fdt/fdt_port.h:1.3 Sun Feb 3 12:53:11 2019
+++ src/sys/dev/fdt/fdt_port.h Fri Dec 11 09:40:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_port.h,v 1.3 2019/02/03 12:53:11 jmcneill Exp $ */
+/* $NetBSD: fdt_port.h,v 1.4 2020/12/11 09:40:28 skrll Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -123,4 +123,4 @@ int fdt_endpoint_activate_direct(struct
*/
int fdt_endpoint_enable(struct fdt_endpoint *, bool);
-#endif /* _DEV_FDT_FDT_PORT_H_ */
+#endif /* _DEV_FDT_FDT_PORT_H */
Index: src/sys/dev/fdt/fdtvar.h
diff -u src/sys/dev/fdt/fdtvar.h:1.61 src/sys/dev/fdt/fdtvar.h:1.62
--- src/sys/dev/fdt/fdtvar.h:1.61 Mon Sep 28 11:54:24 2020
+++ src/sys/dev/fdt/fdtvar.h Fri Dec 11 09:40:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtvar.h,v 1.61 2020/09/28 11:54:24 jmcneill Exp $ */
+/* $NetBSD: fdtvar.h,v 1.62 2020/12/11 09:40:28 skrll Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,8 +26,8 @@
* SUCH DAMAGE.
*/
-#ifndef _DEV_FDT_FDTVAR_H
-#define _DEV_FDT_FDTVAR_H
+#ifndef _DEV_FDT_FDTVAR_H_
+#define _DEV_FDT_FDTVAR_H_
#include <sys/types.h>
#include <sys/bus.h>
@@ -441,4 +441,4 @@ int fdtbus_print(void *, const char *);
bus_dma_tag_t fdtbus_dma_tag_create(int, const struct fdt_dma_range *,
u_int);
-#endif /* _DEV_FDT_FDTVAR_H */
+#endif /* _DEV_FDT_FDTVAR_H_ */
