CVS commit: [netbsd-6] src/sys/arch/arc/include

2022-08-16 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Tue Aug 16 14:09:27 UTC 2022

Modified Files:
src/sys/arch/arc/include [netbsd-6]: pci_machdep.h

Log Message:
Remove commits to wrong branch.


To generate a diff of this commit:
cvs rdiff -u -r1.9.10.2 -r1.9.10.3 src/sys/arch/arc/include/pci_machdep.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/arc/include/pci_machdep.h
diff -u src/sys/arch/arc/include/pci_machdep.h:1.9.10.2 src/sys/arch/arc/include/pci_machdep.h:1.9.10.3
--- src/sys/arch/arc/include/pci_machdep.h:1.9.10.2	Tue Aug 16 13:55:15 2022
+++ src/sys/arch/arc/include/pci_machdep.h	Tue Aug 16 14:09:27 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.9.10.2 2022/08/16 13:55:15 skrll Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.9.10.3 2022/08/16 14:09:27 skrll Exp $ */
 /* NetBSD: pci_machdep.h,v 1.3 1999/03/19 03:40:46 cgd Exp  */
 
 /*
@@ -28,9 +28,6 @@
  * rights to redistribute these changes.
  */
 
-#ifndef	_MACHINE_PCI_MACHDEP_H_
-#define	_MACHINE_PCI_MACHDEP_H_
-
 /*
  * Machine-specific definitions for PCI autoconfiguration.
  */
@@ -103,7 +100,5 @@ struct arc_pci_chipset {
 (*(c)->pc_intr_disestablish)((c), (iv))
 #define	pci_conf_interrupt(c, b, d, f, s, i)\
 (*(c)->pc_conf_interrupt)((c), (b), (d), (f), (s), (i))
-#define	pci_conf_hook(c, b, d, f, i)	\
+#define	pci_conf_hook(c, b, d, f, i)\
 (*(c)->pc_conf_hook)((c), (b), (d), (f), (i))
-
-#endif /* _MACHINE_PCI_MACHDEP_H_ */



CVS commit: [netbsd-6] src/sys/arch/arc/include

2022-08-16 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Tue Aug 16 14:09:27 UTC 2022

Modified Files:
src/sys/arch/arc/include [netbsd-6]: pci_machdep.h

Log Message:
Remove commits to wrong branch.


To generate a diff of this commit:
cvs rdiff -u -r1.9.10.2 -r1.9.10.3 src/sys/arch/arc/include/pci_machdep.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-6] src/sys/arch/arc/include

2022-08-16 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Tue Aug 16 13:55:15 UTC 2022

Modified Files:
src/sys/arch/arc/include [netbsd-6]: pci_machdep.h

Log Message:
Multiple inclusion protection.


To generate a diff of this commit:
cvs rdiff -u -r1.9.10.1 -r1.9.10.2 src/sys/arch/arc/include/pci_machdep.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/arc/include/pci_machdep.h
diff -u src/sys/arch/arc/include/pci_machdep.h:1.9.10.1 src/sys/arch/arc/include/pci_machdep.h:1.9.10.2
--- src/sys/arch/arc/include/pci_machdep.h:1.9.10.1	Tue Aug 16 13:52:58 2022
+++ src/sys/arch/arc/include/pci_machdep.h	Tue Aug 16 13:55:15 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.9.10.1 2022/08/16 13:52:58 skrll Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.9.10.2 2022/08/16 13:55:15 skrll Exp $ */
 /* NetBSD: pci_machdep.h,v 1.3 1999/03/19 03:40:46 cgd Exp  */
 
 /*
@@ -28,6 +28,9 @@
  * rights to redistribute these changes.
  */
 
+#ifndef	_MACHINE_PCI_MACHDEP_H_
+#define	_MACHINE_PCI_MACHDEP_H_
+
 /*
  * Machine-specific definitions for PCI autoconfiguration.
  */
@@ -102,3 +105,5 @@ struct arc_pci_chipset {
 (*(c)->pc_conf_interrupt)((c), (b), (d), (f), (s), (i))
 #define	pci_conf_hook(c, b, d, f, i)	\
 (*(c)->pc_conf_hook)((c), (b), (d), (f), (i))
+
+#endif /* _MACHINE_PCI_MACHDEP_H_ */



CVS commit: [netbsd-6] src/sys/arch/arc/include

2022-08-16 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Tue Aug 16 13:55:15 UTC 2022

Modified Files:
src/sys/arch/arc/include [netbsd-6]: pci_machdep.h

Log Message:
Multiple inclusion protection.


To generate a diff of this commit:
cvs rdiff -u -r1.9.10.1 -r1.9.10.2 src/sys/arch/arc/include/pci_machdep.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-6] src/sys/arch/arc/include

2022-08-16 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Tue Aug 16 13:52:58 UTC 2022

Modified Files:
src/sys/arch/arc/include [netbsd-6]: pci_machdep.h

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.10.1 src/sys/arch/arc/include/pci_machdep.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/arc/include/pci_machdep.h
diff -u src/sys/arch/arc/include/pci_machdep.h:1.9 src/sys/arch/arc/include/pci_machdep.h:1.9.10.1
--- src/sys/arch/arc/include/pci_machdep.h:1.9	Mon Apr  4 20:37:45 2011
+++ src/sys/arch/arc/include/pci_machdep.h	Tue Aug 16 13:52:58 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.9 2011/04/04 20:37:45 dyoung Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.9.10.1 2022/08/16 13:52:58 skrll Exp $ */
 /* NetBSD: pci_machdep.h,v 1.3 1999/03/19 03:40:46 cgd Exp  */
 
 /*
@@ -100,5 +100,5 @@ struct arc_pci_chipset {
 (*(c)->pc_intr_disestablish)((c), (iv))
 #define	pci_conf_interrupt(c, b, d, f, s, i)\
 (*(c)->pc_conf_interrupt)((c), (b), (d), (f), (s), (i))
-#define	pci_conf_hook(c, b, d, f, i)\
+#define	pci_conf_hook(c, b, d, f, i)	\
 (*(c)->pc_conf_hook)((c), (b), (d), (f), (i))



CVS commit: [netbsd-6] src/sys/arch/arc/include

2022-08-16 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Tue Aug 16 13:52:58 UTC 2022

Modified Files:
src/sys/arch/arc/include [netbsd-6]: pci_machdep.h

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.10.1 src/sys/arch/arc/include/pci_machdep.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.