Stop using __KERNEL_RCSID() in header files; it confuses ident(1) by overwriting RCSID in main source files. XXX The first argument of __KERNEL_RCSID() is neglected for ELF. If we wish to have RCSID of header files in kernel binary, we need something like __FBSDID() macro in FreeBSD.diff -r1.4 -r1.5 src/sys/arch/arm/omap/omap3_sdmareg.h
(rin)
--- src/sys/arch/arm/omap/Attic/omap3_sdmareg.h 2014/07/30 12:45:44 1.4
+++ src/sys/arch/arm/omap/Attic/omap3_sdmareg.h 2020/04/16 21:56:41 1.5
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: omap3_sdmareg.h,v 1.4 2014/07/30 12:45:44 macallan Exp $ */ | 1 | /* $NetBSD: omap3_sdmareg.h,v 1.5 2020/04/16 21:56:41 rin Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 2012 Michael Lorenz | 4 | * Copyright (c) 2012 Michael Lorenz | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Redistribution and use in source and binary forms, with or without | 7 | * Redistribution and use in source and binary forms, with or without | |
8 | * modification, are permitted provided that the following conditions | 8 | * modification, are permitted provided that the following conditions | |
9 | * are met: | 9 | * are met: | |
10 | * 1. Redistributions of source code must retain the above copyright | 10 | * 1. Redistributions of source code must retain the above copyright | |
11 | * notice, this list of conditions and the following disclaimer. | 11 | * notice, this list of conditions and the following disclaimer. | |
12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright | |
13 | * notice, this list of conditions and the following disclaimer in the | 13 | * notice, this list of conditions and the following disclaimer in the | |
14 | * documentation and/or other materials provided with the distribution. | 14 | * documentation and/or other materials provided with the distribution. | |
@@ -16,29 +16,26 @@ | @@ -16,29 +16,26 @@ | |||
16 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | 16 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |
17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
26 | * POSSIBILITY OF SUCH DAMAGE. | 26 | * POSSIBILITY OF SUCH DAMAGE. | |
27 | */ | 27 | */ | |
28 | 28 | |||
29 | #include <sys/cdefs.h> | |||
30 | __KERNEL_RCSID(0, "$NetBSD: omap3_sdmareg.h,v 1.4 2014/07/30 12:45:44 macallan Exp $"); | |||
31 | ||||
32 | #ifndef OMAPDMA_REG_H | 29 | #ifndef OMAPDMA_REG_H | |
33 | #define OMAPDMA_REG_H | 30 | #define OMAPDMA_REG_H | |
34 | 31 | |||
35 | /* | 32 | /* | |
36 | * all register offsets are relative to OMAP3530_SDMA_BASE | 33 | * all register offsets are relative to OMAP3530_SDMA_BASE | |
37 | */ | 34 | */ | |
38 | 35 | |||
39 | #define OMAPDMA_REVISION 0x00000000 | 36 | #define OMAPDMA_REVISION 0x00000000 | |
40 | 37 | |||
41 | /* each bit corresponds to a DMA channel, write 1 to clear */ | 38 | /* each bit corresponds to a DMA channel, write 1 to clear */ | |
42 | #define OMAPDMA_IRQSTATUS_L0 0x00000008 | 39 | #define OMAPDMA_IRQSTATUS_L0 0x00000008 | |
43 | #define OMAPDMA_IRQSTATUS_L1 0x0000000c | 40 | #define OMAPDMA_IRQSTATUS_L1 0x0000000c | |
44 | #define OMAPDMA_IRQSTATUS_L2 0x00000010 | 41 | #define OMAPDMA_IRQSTATUS_L2 0x00000010 |
--- src/sys/arch/arm/omap/Attic/omap3_sdmavar.h 2013/01/09 03:35:11 1.1
+++ src/sys/arch/arm/omap/Attic/omap3_sdmavar.h 2020/04/16 21:56:41 1.2
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: omap3_sdmavar.h,v 1.1 2013/01/09 03:35:11 macallan Exp $ */ | 1 | /* $NetBSD: omap3_sdmavar.h,v 1.2 2020/04/16 21:56:41 rin Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 2012 Michael Lorenz | 4 | * Copyright (c) 2012 Michael Lorenz | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Redistribution and use in source and binary forms, with or without | 7 | * Redistribution and use in source and binary forms, with or without | |
8 | * modification, are permitted provided that the following conditions | 8 | * modification, are permitted provided that the following conditions | |
9 | * are met: | 9 | * are met: | |
10 | * 1. Redistributions of source code must retain the above copyright | 10 | * 1. Redistributions of source code must retain the above copyright | |
11 | * notice, this list of conditions and the following disclaimer. | 11 | * notice, this list of conditions and the following disclaimer. | |
12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright | |
13 | * notice, this list of conditions and the following disclaimer in the | 13 | * notice, this list of conditions and the following disclaimer in the | |
14 | * documentation and/or other materials provided with the distribution. | 14 | * documentation and/or other materials provided with the distribution. | |
@@ -16,26 +16,23 @@ | @@ -16,26 +16,23 @@ | |||
16 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | 16 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |
17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
26 | * POSSIBILITY OF SUCH DAMAGE. | 26 | * POSSIBILITY OF SUCH DAMAGE. | |
27 | */ | 27 | */ | |
28 | 28 | |||
29 | #include <sys/cdefs.h> | |||
30 | __KERNEL_RCSID(0, "$NetBSD: omap3_sdmavar.h,v 1.1 2013/01/09 03:35:11 macallan Exp $"); | |||
31 | ||||
32 | #ifndef OMAPDMA_VAR_H | 29 | #ifndef OMAPDMA_VAR_H | |
33 | #define OMAPDMA_VAR_H | 30 | #define OMAPDMA_VAR_H | |
34 | 31 | |||
35 | void omapdma_write_reg(int, uint32_t); | 32 | void omapdma_write_reg(int, uint32_t); | |
36 | uint32_t omapdma_read_reg(int); | 33 | uint32_t omapdma_read_reg(int); | |
37 | void omapdma_write_ch_reg(int, int, uint32_t); | 34 | void omapdma_write_ch_reg(int, int, uint32_t); | |
38 | uint32_t omapdma_read_ch_reg(int, int); | 35 | uint32_t omapdma_read_ch_reg(int, int); | |
39 | 36 | |||
40 | 37 | |||
41 | #endif /* OMAPDMA_VAR_H */ | 38 | #endif /* OMAPDMA_VAR_H */ |
--- src/sys/arch/arm/omap/Attic/omapfbreg.h 2013/02/12 21:17:17 1.3
+++ src/sys/arch/arm/omap/Attic/omapfbreg.h 2020/04/16 21:56:41 1.4
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: omapfbreg.h,v 1.3 2013/02/12 21:17:17 macallan Exp $ */ | 1 | /* $NetBSD: omapfbreg.h,v 1.4 2020/04/16 21:56:41 rin Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2010 Michael Lorenz | 4 | * Copyright (c) 2010 Michael Lorenz | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Redistribution and use in source and binary forms, with or without | 7 | * Redistribution and use in source and binary forms, with or without | |
8 | * modification, are permitted provided that the following conditions | 8 | * modification, are permitted provided that the following conditions | |
9 | * are met: | 9 | * are met: | |
10 | * 1. Redistributions of source code must retain the above copyright | 10 | * 1. Redistributions of source code must retain the above copyright | |
11 | * notice, this list of conditions and the following disclaimer. | 11 | * notice, this list of conditions and the following disclaimer. | |
12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright | |
13 | * notice, this list of conditions and the following disclaimer in the | 13 | * notice, this list of conditions and the following disclaimer in the | |
14 | * documentation and/or other materials provided with the distribution. | 14 | * documentation and/or other materials provided with the distribution. | |
@@ -16,29 +16,26 @@ | @@ -16,29 +16,26 @@ | |||
16 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | 16 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |
17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
26 | * POSSIBILITY OF SUCH DAMAGE. | 26 | * POSSIBILITY OF SUCH DAMAGE. | |
27 | */ | 27 | */ | |
28 | 28 | |||
29 | #include <sys/cdefs.h> | |||
30 | __KERNEL_RCSID(0, "$NetBSD: omapfbreg.h,v 1.3 2013/02/12 21:17:17 macallan Exp $"); | |||
31 | ||||
32 | #ifndef OMAPFB_REG_H | 29 | #ifndef OMAPFB_REG_H | |
33 | #define OMAPFB_REG_H | 30 | #define OMAPFB_REG_H | |
34 | 31 | |||
35 | #define OMAPFB_DSS_REVISION 0x0000 | 32 | #define OMAPFB_DSS_REVISION 0x0000 | |
36 | #define OMAPFB_DSS_SYSCONFIG 0x0010 | 33 | #define OMAPFB_DSS_SYSCONFIG 0x0010 | |
37 | #define OMAPFB_DSS_SYSSTATUS 0x0014 | 34 | #define OMAPFB_DSS_SYSSTATUS 0x0014 | |
38 | #define OMAPFB_DSS_IRQSTATUS 0x0018 | 35 | #define OMAPFB_DSS_IRQSTATUS 0x0018 | |
39 | #define OMAPFB_DSS_CONTROL 0x0040 | 36 | #define OMAPFB_DSS_CONTROL 0x0040 | |
40 | #define OMAPFB_DSS_SDI_CONTROL 0x0044 | 37 | #define OMAPFB_DSS_SDI_CONTROL 0x0044 | |
41 | #define OMAPFB_DSS_PLL_CONTROL 0x0048 | 38 | #define OMAPFB_DSS_PLL_CONTROL 0x0048 | |
42 | #define OMAPFB_DSS_SDI_STATUS 0x005c | 39 | #define OMAPFB_DSS_SDI_STATUS 0x005c | |
43 | 40 | |||
44 | /* display controller */ | 41 | /* display controller */ |
--- src/sys/arch/arm/ti/omap3_dssreg.h 2019/10/31 17:08:54 1.1
+++ src/sys/arch/arm/ti/omap3_dssreg.h 2020/04/16 21:56:41 1.2
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: omap3_dssreg.h,v 1.1 2019/10/31 17:08:54 jmcneill Exp $ */ | 1 | /* $NetBSD: omap3_dssreg.h,v 1.2 2020/04/16 21:56:41 rin Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2010 Michael Lorenz | 4 | * Copyright (c) 2010 Michael Lorenz | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Redistribution and use in source and binary forms, with or without | 7 | * Redistribution and use in source and binary forms, with or without | |
8 | * modification, are permitted provided that the following conditions | 8 | * modification, are permitted provided that the following conditions | |
9 | * are met: | 9 | * are met: | |
10 | * 1. Redistributions of source code must retain the above copyright | 10 | * 1. Redistributions of source code must retain the above copyright | |
11 | * notice, this list of conditions and the following disclaimer. | 11 | * notice, this list of conditions and the following disclaimer. | |
12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright | |
13 | * notice, this list of conditions and the following disclaimer in the | 13 | * notice, this list of conditions and the following disclaimer in the | |
14 | * documentation and/or other materials provided with the distribution. | 14 | * documentation and/or other materials provided with the distribution. | |
@@ -16,29 +16,26 @@ | @@ -16,29 +16,26 @@ | |||
16 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | 16 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |
17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
26 | * POSSIBILITY OF SUCH DAMAGE. | 26 | * POSSIBILITY OF SUCH DAMAGE. | |
27 | */ | 27 | */ | |
28 | 28 | |||
29 | #include <sys/cdefs.h> | |||
30 | __KERNEL_RCSID(0, "$NetBSD: omap3_dssreg.h,v 1.1 2019/10/31 17:08:54 jmcneill Exp $"); | |||
31 | ||||
32 | #ifndef OMAP3_DSSREG_H | 29 | #ifndef OMAP3_DSSREG_H | |
33 | #define OMAP3_DSSREG_H | 30 | #define OMAP3_DSSREG_H | |
34 | 31 | |||
35 | #define OMAPFB_DSS_REVISION 0x0000 | 32 | #define OMAPFB_DSS_REVISION 0x0000 | |
36 | #define OMAPFB_DSS_SYSCONFIG 0x0010 | 33 | #define OMAPFB_DSS_SYSCONFIG 0x0010 | |
37 | #define OMAPFB_DSS_SYSSTATUS 0x0014 | 34 | #define OMAPFB_DSS_SYSSTATUS 0x0014 | |
38 | #define OMAPFB_DSS_IRQSTATUS 0x0018 | 35 | #define OMAPFB_DSS_IRQSTATUS 0x0018 | |
39 | #define OMAPFB_DSS_CONTROL 0x0040 | 36 | #define OMAPFB_DSS_CONTROL 0x0040 | |
40 | #define OMAPFB_DSS_SDI_CONTROL 0x0044 | 37 | #define OMAPFB_DSS_SDI_CONTROL 0x0044 | |
41 | #define OMAPFB_DSS_PLL_CONTROL 0x0048 | 38 | #define OMAPFB_DSS_PLL_CONTROL 0x0048 | |
42 | #define OMAPFB_DSS_SDI_STATUS 0x005c | 39 | #define OMAPFB_DSS_SDI_STATUS 0x005c | |
43 | 40 | |||
44 | /* display controller */ | 41 | /* display controller */ |
--- src/sys/arch/macppc/dev/batteryvar.h 2008/04/29 06:53:02 1.2
+++ src/sys/arch/macppc/dev/batteryvar.h 2020/04/16 21:56:41 1.3
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: batteryvar.h,v 1.2 2008/04/29 06:53:02 martin Exp $ */ | 1 | /* $NetBSD: batteryvar.h,v 1.3 2020/04/16 21:56:41 rin Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2007 Michael Lorenz | 4 | * Copyright (c) 2007 Michael Lorenz | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Redistribution and use in source and binary forms, with or without | 7 | * Redistribution and use in source and binary forms, with or without | |
8 | * modification, are permitted provided that the following conditions | 8 | * modification, are permitted provided that the following conditions | |
9 | * are met: | 9 | * are met: | |
10 | * 1. Redistributions of source code must retain the above copyright | 10 | * 1. Redistributions of source code must retain the above copyright | |
11 | * notice, this list of conditions and the following disclaimer. | 11 | * notice, this list of conditions and the following disclaimer. | |
12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright | |
13 | * notice, this list of conditions and the following disclaimer in the | 13 | * notice, this list of conditions and the following disclaimer in the | |
14 | * documentation and/or other materials provided with the distribution. | 14 | * documentation and/or other materials provided with the distribution. | |
@@ -16,29 +16,26 @@ | @@ -16,29 +16,26 @@ | |||
16 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | 16 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |
17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
26 | * POSSIBILITY OF SUCH DAMAGE. | 26 | * POSSIBILITY OF SUCH DAMAGE. | |
27 | */ | 27 | */ | |
28 | 28 | |||
29 | #include <sys/cdefs.h> | |||
30 | __KERNEL_RCSID(0, "$NetBSD: batteryvar.h,v 1.2 2008/04/29 06:53:02 martin Exp $"); | |||
31 | ||||
32 | #ifndef BATTERY_VAR_H | 29 | #ifndef BATTERY_VAR_H | |
33 | #define BATTERY_VAR_H | 30 | #define BATTERY_VAR_H | |
34 | 31 | |||
35 | #include <macppc/dev/pmuvar.h> | 32 | #include <macppc/dev/pmuvar.h> | |
36 | 33 | |||
37 | #define BATTERY_TYPE_LEGACY 1 | 34 | #define BATTERY_TYPE_LEGACY 1 | |
38 | #define BATTERY_TYPE_SMART 2 | 35 | #define BATTERY_TYPE_SMART 2 | |
39 | 36 | |||
40 | struct battery_attach_args { | 37 | struct battery_attach_args { | |
41 | int baa_type; | 38 | int baa_type; | |
42 | int baa_num; /* for smart batteries */ | 39 | int baa_num; /* for smart batteries */ | |
43 | struct pmu_ops *baa_pmu_ops; | 40 | struct pmu_ops *baa_pmu_ops; | |
44 | }; | 41 | }; |
--- src/sys/arch/macppc/dev/cudavar.h 2014/08/13 09:41:50 1.3
+++ src/sys/arch/macppc/dev/cudavar.h 2020/04/16 21:56:41 1.4
@@ -14,29 +14,26 @@ | @@ -14,29 +14,26 @@ | |||
14 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | 14 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |
15 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 15 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
16 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 16 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
17 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 17 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
18 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 18 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
19 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 19 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
20 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 20 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
21 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 21 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
22 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 22 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
23 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 23 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
24 | * POSSIBILITY OF SUCH DAMAGE. | 24 | * POSSIBILITY OF SUCH DAMAGE. | |
25 | */ | 25 | */ | |
26 | 26 | |||
27 | #include <sys/cdefs.h> | |||
28 | __KERNEL_RCSID(0, "$NetBSD: cudavar.h,v 1.3 2014/08/13 09:41:50 macallan Exp $"); | |||
29 | ||||
30 | #ifndef CUDAVAR_H | 27 | #ifndef CUDAVAR_H | |
31 | #define CUDAVAR_H | 28 | #define CUDAVAR_H | |
32 | 29 | |||
33 | /* Cuda addresses */ | 30 | /* Cuda addresses */ | |
34 | #define CUDA_ADB 0 | 31 | #define CUDA_ADB 0 | |
35 | #define CUDA_PSEUDO 1 | 32 | #define CUDA_PSEUDO 1 | |
36 | #define CUDA_ERROR 2 /* error codes? */ | 33 | #define CUDA_ERROR 2 /* error codes? */ | |
37 | #define CUDA_TIMER 3 | 34 | #define CUDA_TIMER 3 | |
38 | #define CUDA_POWER 4 | 35 | #define CUDA_POWER 4 | |
39 | #define CUDA_IIC 5 /* XXX ??? */ | 36 | #define CUDA_IIC 5 /* XXX ??? */ | |
40 | #define CUDA_PMU 6 | 37 | #define CUDA_PMU 6 | |
41 | #define CUDA_ADB_QUERY 7 | 38 | #define CUDA_ADB_QUERY 7 | |
42 | 39 |
--- src/sys/arch/macppc/dev/deqvar.h 2008/05/16 03:11:09 1.3
+++ src/sys/arch/macppc/dev/deqvar.h 2020/04/16 21:56:41 1.4
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: deqvar.h,v 1.3 2008/05/16 03:11:09 macallan Exp $ */ | 1 | /* $NetBSD: deqvar.h,v 1.4 2020/04/16 21:56:41 rin Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (C) 2005 Michael Lorenz | 4 | * Copyright (C) 2005 Michael Lorenz | |
5 | * | 5 | * | |
6 | * Redistribution and use in source and binary forms, with or without | 6 | * Redistribution and use in source and binary forms, with or without | |
7 | * modification, are permitted provided that the following conditions | 7 | * modification, are permitted provided that the following conditions | |
8 | * are met: | 8 | * are met: | |
9 | * 1. Redistributions of source code must retain the above copyright | 9 | * 1. Redistributions of source code must retain the above copyright | |
10 | * notice, this list of conditions and the following disclaimer. | 10 | * notice, this list of conditions and the following disclaimer. | |
11 | * 2. Redistributions in binary form must reproduce the above copyright | 11 | * 2. Redistributions in binary form must reproduce the above copyright | |
12 | * notice, this list of conditions and the following disclaimer in the | 12 | * notice, this list of conditions and the following disclaimer in the | |
13 | * documentation and/or other materials provided with the distribution. | 13 | * documentation and/or other materials provided with the distribution. | |
14 | * 3. The name of the author may not be used to endorse or promote products | 14 | * 3. The name of the author may not be used to endorse or promote products | |
@@ -24,28 +24,25 @@ | @@ -24,28 +24,25 @@ | |||
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | |
26 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
27 | */ | 27 | */ | |
28 | 28 | |||
29 | /* | 29 | /* | |
30 | * a dummy device to attach to OF's deq node marking the TAS3004 audio mixer / | 30 | * a dummy device to attach to OF's deq node marking the TAS3004 audio mixer / | |
31 | * equalizer chip, needed by snapper | 31 | * equalizer chip, needed by snapper | |
32 | */ | 32 | */ | |
33 | 33 | |||
34 | #ifndef DEQVAR_H | 34 | #ifndef DEQVAR_H | |
35 | #define DEQVAR_H | 35 | #define DEQVAR_H | |
36 | 36 | |||
37 | #include <sys/cdefs.h> | |||
38 | __KERNEL_RCSID(0, "$NetBSD: deqvar.h,v 1.3 2008/05/16 03:11:09 macallan Exp $"); | |||
39 | ||||
40 | #include <sys/kernel.h> | 37 | #include <sys/kernel.h> | |
41 | #include <sys/device.h> | 38 | #include <sys/device.h> | |
42 | #include <dev/i2c/i2cvar.h> | 39 | #include <dev/i2c/i2cvar.h> | |
43 | 40 | |||
44 | struct deq_softc { | 41 | struct deq_softc { | |
45 | device_t sc_dev; | 42 | device_t sc_dev; | |
46 | device_t sc_parent; | 43 | device_t sc_parent; | |
47 | int sc_node, sc_address; | 44 | int sc_node, sc_address; | |
48 | struct i2c_controller *sc_i2c; | 45 | struct i2c_controller *sc_i2c; | |
49 | }; | 46 | }; | |
50 | 47 | |||
51 | #endif | 48 | #endif |
--- src/sys/arch/macppc/dev/obiovar.h 2018/05/04 17:17:48 1.3
+++ src/sys/arch/macppc/dev/obiovar.h 2020/04/16 21:56:41 1.4
@@ -14,29 +14,26 @@ | @@ -14,29 +14,26 @@ | |||
14 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | 14 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |
15 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 15 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
16 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 16 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
17 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 17 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
18 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 18 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
19 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 19 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
20 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 20 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
21 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 21 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
22 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 22 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
23 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 23 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
24 | * POSSIBILITY OF SUCH DAMAGE. | 24 | * POSSIBILITY OF SUCH DAMAGE. | |
25 | */ | 25 | */ | |
26 | 26 | |||
27 | #include <sys/cdefs.h> | |||
28 | __KERNEL_RCSID(0, "$NetBSD: obiovar.h,v 1.3 2018/05/04 17:17:48 macallan Exp $"); | |||
29 | ||||
30 | #ifndef OBIOVAR_H | 27 | #ifndef OBIOVAR_H | |
31 | #define OBIOVAR_H | 28 | #define OBIOVAR_H | |
32 | 29 | |||
33 | /* | 30 | /* | |
34 | * access obio registers | 31 | * access obio registers | |
35 | * Since only some PowerBooks have more than one obio and in these cases we | 32 | * Since only some PowerBooks have more than one obio and in these cases we | |
36 | * need to special-case it anyway we can safely assume that whoever wants to | 33 | * need to special-case it anyway we can safely assume that whoever wants to | |
37 | * mess with obio registers means obio0 | 34 | * mess with obio registers means obio0 | |
38 | */ | 35 | */ | |
39 | 36 | |||
40 | void obio_write_4(int, uint32_t); | 37 | void obio_write_4(int, uint32_t); | |
41 | void obio_write_1(int, uint8_t); | 38 | void obio_write_1(int, uint8_t); | |
42 | uint32_t obio_read_4(int); | 39 | uint32_t obio_read_4(int); |
--- src/sys/arch/macppc/dev/valkyriefbreg.h 2018/02/16 18:12:45 1.3
+++ src/sys/arch/macppc/dev/valkyriefbreg.h 2020/04/16 21:56:41 1.4
@@ -14,29 +14,26 @@ | @@ -14,29 +14,26 @@ | |||
14 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | 14 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |
15 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 15 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
16 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 16 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
17 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 17 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
18 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 18 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
19 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 19 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
20 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 20 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
21 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 21 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
22 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 22 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
23 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 23 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
24 | * POSSIBILITY OF SUCH DAMAGE. | 24 | * POSSIBILITY OF SUCH DAMAGE. | |
25 | */ | 25 | */ | |
26 | 26 | |||
27 | #include <sys/cdefs.h> | |||
28 | __KERNEL_RCSID(0, "$NetBSD: valkyriefbreg.h,v 1.3 2018/02/16 18:12:45 macallan Exp $"); | |||
29 | ||||
30 | #ifndef VALKYRIEFBREG_H | 27 | #ifndef VALKYRIEFBREG_H | |
31 | #define VALKYRIEFBREG_H | 28 | #define VALKYRIEFBREG_H | |
32 | 29 | |||
33 | #define VAL_FB_OFFSET 0x00000000 | 30 | #define VAL_FB_OFFSET 0x00000000 | |
34 | #define VAL_CMAP_OFFSET 0x00304000 | 31 | #define VAL_CMAP_OFFSET 0x00304000 | |
35 | #define VAL_CMAP_ADDR 0x00000000 | 32 | #define VAL_CMAP_ADDR 0x00000000 | |
36 | #define VAL_CMAP_LUT 0x00000008 | 33 | #define VAL_CMAP_LUT 0x00000008 | |
37 | #define VAL_REGS_OFFSET 0x0030a000 | 34 | #define VAL_REGS_OFFSET 0x0030a000 | |
38 | #define VAL_MODE 0x00000000 | 35 | #define VAL_MODE 0x00000000 | |
39 | #define VAL_MODE_STOP 0x80 | 36 | #define VAL_MODE_STOP 0x80 | |
40 | #define VAL_MODE_NOSYNC 0x40 | 37 | #define VAL_MODE_NOSYNC 0x40 | |
41 | 38 | |||
42 | #define VAL_DEPTH 0x00000008 | 39 | #define VAL_DEPTH 0x00000008 |
--- src/sys/arch/macppc/dev/videopllvar.h 2018/02/16 18:12:45 1.3
+++ src/sys/arch/macppc/dev/videopllvar.h 2020/04/16 21:56:41 1.4
@@ -14,22 +14,19 @@ | @@ -14,22 +14,19 @@ | |||
14 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | 14 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |
15 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 15 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
16 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 16 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
17 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 17 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
18 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 18 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
19 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 19 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
20 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 20 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
21 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 21 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
22 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 22 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
23 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 23 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
24 | * POSSIBILITY OF SUCH DAMAGE. | 24 | * POSSIBILITY OF SUCH DAMAGE. | |
25 | */ | 25 | */ | |
26 | 26 | |||
27 | #include <sys/cdefs.h> | |||
28 | __KERNEL_RCSID(0, "$NetBSD: videopllvar.h,v 1.3 2018/02/16 18:12:45 macallan Exp $"); | |||
29 | ||||
30 | #ifndef VIDEOPLLVAR_H | 27 | #ifndef VIDEOPLLVAR_H | |
31 | #define VIDEOPLLVAR_H | 28 | #define VIDEOPLLVAR_H | |
32 | 29 | |||
33 | int videopll_set_freq(int); /* in kHz */ | 30 | int videopll_set_freq(int); /* in kHz */ | |
34 | 31 | |||
35 | #endif /* VIDEOPLLVAR_H */ | 32 | #endif /* VIDEOPLLVAR_H */ |
--- src/sys/arch/macppc/dev/platinumfbreg.h 2016/06/16 14:46:12 1.1
+++ src/sys/arch/macppc/dev/platinumfbreg.h 2020/04/16 21:56:41 1.2
@@ -10,29 +10,26 @@ | @@ -10,29 +10,26 @@ | |||
10 | * | 10 | * | |
11 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | 11 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | |
12 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 12 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
13 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | 13 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |
14 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | 14 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | |
15 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | 15 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |
16 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 16 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
17 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 17 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
18 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 18 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
19 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 19 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | |
20 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 20 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
21 | */ | 21 | */ | |
22 | 22 | |||
23 | #include <sys/cdefs.h> | |||
24 | __KERNEL_RCSID(0, "$NetBSD: platinumfbreg.h,v 1.1 2016/06/16 14:46:12 macallan Exp $"); | |||
25 | ||||
26 | #ifndef PLATINUMFBREG_H | 23 | #ifndef PLATINUMFBREG_H | |
27 | #define PLATINUMFBREG_H | 24 | #define PLATINUMFBREG_H | |
28 | 25 | |||
29 | /* | 26 | /* | |
30 | * platinum register address offsets. | 27 | * platinum register address offsets. | |
31 | * registers are each 32 bits with 12*8bits of padding, | 28 | * registers are each 32 bits with 12*8bits of padding, | |
32 | * 128 registers total | 29 | * 128 registers total | |
33 | */ | 30 | */ | |
34 | #define PLATINUM_REG_OFFSET_ADDR(x) (x * 0x10) | 31 | #define PLATINUM_REG_OFFSET_ADDR(x) (x * 0x10) | |
35 | #define PLATINUM_REG_COUNT 128 | 32 | #define PLATINUM_REG_COUNT 128 | |
36 | 33 | |||
37 | /* | 34 | /* | |
38 | * colormap register addresses. | 35 | * colormap register addresses. |
--- src/sys/arch/macppc/dev/pmuvar.h 2016/06/01 05:27:40 1.9
+++ src/sys/arch/macppc/dev/pmuvar.h 2020/04/16 21:56:41 1.10
@@ -14,29 +14,26 @@ | @@ -14,29 +14,26 @@ | |||
14 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | 14 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |
15 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 15 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
16 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 16 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
17 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 17 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
18 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 18 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
19 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 19 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
20 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 20 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
21 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 21 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
22 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 22 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
23 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 23 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
24 | * POSSIBILITY OF SUCH DAMAGE. | 24 | * POSSIBILITY OF SUCH DAMAGE. | |
25 | */ | 25 | */ | |
26 | 26 | |||
27 | #include <sys/cdefs.h> | |||
28 | __KERNEL_RCSID(0, "$NetBSD: pmuvar.h,v 1.9 2016/06/01 05:27:40 macallan Exp $"); | |||
29 | ||||
30 | #ifndef PMUVAR_H | 27 | #ifndef PMUVAR_H | |
31 | #define PMUVAR_H | 28 | #define PMUVAR_H | |
32 | 29 | |||
33 | /* PMU commands */ | 30 | /* PMU commands */ | |
34 | #define PMU_POWER_CTRL0 0x10 /* control power of some devices */ | 31 | #define PMU_POWER_CTRL0 0x10 /* control power of some devices */ | |
35 | #define PMU_POWER_CTRL 0x11 /* control power of some devices */ | 32 | #define PMU_POWER_CTRL 0x11 /* control power of some devices */ | |
36 | 33 | |||
37 | #define PMU_POWER_OFF 0x7e /* Turn Power off */ | 34 | #define PMU_POWER_OFF 0x7e /* Turn Power off */ | |
38 | #define PMU_RESET_CPU 0xd0 /* Reset CPU */ | 35 | #define PMU_RESET_CPU 0xd0 /* Reset CPU */ | |
39 | 36 | |||
40 | #define PMU_SET_RTC 0x30 /* Set realtime clock */ | 37 | #define PMU_SET_RTC 0x30 /* Set realtime clock */ | |
41 | #define PMU_READ_RTC 0x38 /* Read realtime clock */ | 38 | #define PMU_READ_RTC 0x38 /* Read realtime clock */ | |
42 | 39 |
--- src/sys/arch/mips/adm5120/dev/if_admswvar.h 2018/09/03 16:29:25 1.6
+++ src/sys/arch/mips/adm5120/dev/if_admswvar.h 2020/04/16 21:56:41 1.7
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: if_admswvar.h,v 1.6 2018/09/03 16:29:25 riastradh Exp $ */ | 1 | /* $NetBSD: if_admswvar.h,v 1.7 2020/04/16 21:56:41 rin Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko. | 4 | * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Redistribution and use in source and binary forms, with or | 7 | * Redistribution and use in source and binary forms, with or | |
8 | * without modification, are permitted provided that the following | 8 | * without modification, are permitted provided that the following | |
9 | * conditions are met: | 9 | * conditions are met: | |
10 | * 1. Redistributions of source code must retain the above copyright | 10 | * 1. Redistributions of source code must retain the above copyright | |
11 | * notice, this list of conditions and the following disclaimer. | 11 | * notice, this list of conditions and the following disclaimer. | |
12 | * 2. Redistributions in binary form must reproduce the above | 12 | * 2. Redistributions in binary form must reproduce the above | |
13 | * copyright notice, this list of conditions and the following | 13 | * copyright notice, this list of conditions and the following | |
14 | * disclaimer in the documentation and/or other materials provided | 14 | * disclaimer in the documentation and/or other materials provided | |
@@ -23,29 +23,26 @@ | @@ -23,29 +23,26 @@ | |||
23 | * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS | 23 | * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS | |
24 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, | 24 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, | |
25 | * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 25 | * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | |
26 | * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, | 26 | * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, | |
27 | * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 27 | * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
28 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR | 28 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR | |
29 | * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT | 29 | * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT | |
30 | * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY | 30 | * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY | |
31 | * OF SUCH DAMAGE. | 31 | * OF SUCH DAMAGE. | |
32 | */ | 32 | */ | |
33 | #ifndef _IF_ADMSWVAR_H_ | 33 | #ifndef _IF_ADMSWVAR_H_ | |
34 | #define _IF_ADMSWVAR_H_ | 34 | #define _IF_ADMSWVAR_H_ | |
35 | 35 | |||
36 | #include <sys/cdefs.h> | |||
37 | __KERNEL_RCSID(0, "$NetBSD: if_admswvar.h,v 1.6 2018/09/03 16:29:25 riastradh Exp $"); | |||
38 | ||||
39 | #include <sys/param.h> | 36 | #include <sys/param.h> | |
40 | #include <sys/bus.h> | 37 | #include <sys/bus.h> | |
41 | #include <sys/callout.h> | 38 | #include <sys/callout.h> | |
42 | #include <sys/device.h> | 39 | #include <sys/device.h> | |
43 | #include <sys/endian.h> | 40 | #include <sys/endian.h> | |
44 | #include <sys/errno.h> | 41 | #include <sys/errno.h> | |
45 | #include <sys/intr.h> | 42 | #include <sys/intr.h> | |
46 | #include <sys/ioctl.h> | 43 | #include <sys/ioctl.h> | |
47 | #include <sys/kernel.h> | 44 | #include <sys/kernel.h> | |
48 | #include <sys/malloc.h> | 45 | #include <sys/malloc.h> | |
49 | #include <sys/mbuf.h> | 46 | #include <sys/mbuf.h> | |
50 | #include <sys/socket.h> | 47 | #include <sys/socket.h> | |
51 | #include <sys/systm.h> | 48 | #include <sys/systm.h> |
--- src/sys/arch/powerpc/include/intr.h 2020/02/20 04:59:43 1.15
+++ src/sys/arch/powerpc/include/intr.h 2020/04/16 21:56:42 1.16
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: intr.h,v 1.15 2020/02/20 04:59:43 rin Exp $ */ | 1 | /* $NetBSD: intr.h,v 1.16 2020/04/16 21:56:42 rin Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2007 Michael Lorenz | 4 | * Copyright (c) 2007 Michael Lorenz | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Redistribution and use in source and binary forms, with or without | 7 | * Redistribution and use in source and binary forms, with or without | |
8 | * modification, are permitted provided that the following conditions | 8 | * modification, are permitted provided that the following conditions | |
9 | * are met: | 9 | * are met: | |
10 | * 1. Redistributions of source code must retain the above copyright | 10 | * 1. Redistributions of source code must retain the above copyright | |
11 | * notice, this list of conditions and the following disclaimer. | 11 | * notice, this list of conditions and the following disclaimer. | |
12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright | |
13 | * notice, this list of conditions and the following disclaimer in the | 13 | * notice, this list of conditions and the following disclaimer in the | |
14 | * documentation and/or other materials provided with the distribution. | 14 | * documentation and/or other materials provided with the distribution. | |
@@ -16,31 +16,26 @@ | @@ -16,31 +16,26 @@ | |||
16 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | 16 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |
17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
26 | * POSSIBILITY OF SUCH DAMAGE. | 26 | * POSSIBILITY OF SUCH DAMAGE. | |
27 | */ | 27 | */ | |
28 | 28 | |||
29 | #ifndef _LOCORE | |||
30 | #include <sys/cdefs.h> | |||
31 | __KERNEL_RCSID(0, "$NetBSD: intr.h,v 1.15 2020/02/20 04:59:43 rin Exp $"); | |||
32 | #endif | |||
33 | ||||
34 | #ifndef _POWERPC_INTR_MACHDEP_H_ | 29 | #ifndef _POWERPC_INTR_MACHDEP_H_ | |
35 | #define _POWERPC_INTR_MACHDEP_H_ | 30 | #define _POWERPC_INTR_MACHDEP_H_ | |
36 | 31 | |||
37 | #define __HAVE_FAST_SOFTINTS 1 | 32 | #define __HAVE_FAST_SOFTINTS 1 | |
38 | 33 | |||
39 | 34 | |||
40 | /* Interrupt priority `levels'. */ | 35 | /* Interrupt priority `levels'. */ | |
41 | #define IPL_NONE 0 /* nothing */ | 36 | #define IPL_NONE 0 /* nothing */ | |
42 | #define IPL_SOFTCLOCK 1 /* timeouts */ | 37 | #define IPL_SOFTCLOCK 1 /* timeouts */ | |
43 | #define IPL_SOFTBIO 2 /* block I/O */ | 38 | #define IPL_SOFTBIO 2 /* block I/O */ | |
44 | #define IPL_SOFTNET 3 /* protocol stacks */ | 39 | #define IPL_SOFTNET 3 /* protocol stacks */ | |
45 | #define IPL_SOFTSERIAL 4 /* serial */ | 40 | #define IPL_SOFTSERIAL 4 /* serial */ | |
46 | #define IPL_VM 5 /* memory allocation */ | 41 | #define IPL_VM 5 /* memory allocation */ |
--- src/sys/arch/powerpc/pic/ipivar.h 2019/11/24 15:49:12 1.10
+++ src/sys/arch/powerpc/pic/ipivar.h 2020/04/16 21:56:42 1.11
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: ipivar.h,v 1.10 2019/11/24 15:49:12 ad Exp $ */ | 1 | /* $NetBSD: ipivar.h,v 1.11 2020/04/16 21:56:42 rin Exp $ */ | |
2 | /*- | 2 | /*- | |
3 | * Copyright (c) 2007 The NetBSD Foundation, Inc. | 3 | * Copyright (c) 2007 The NetBSD Foundation, Inc. | |
4 | * All rights reserved. | 4 | * All rights reserved. | |
5 | * | 5 | * | |
6 | * This code is derived from software contributed to The NetBSD Foundation | 6 | * This code is derived from software contributed to The NetBSD Foundation | |
7 | * by Tim Rightnour | 7 | * by Tim Rightnour | |
8 | * | 8 | * | |
9 | * Redistribution and use in source and binary forms, with or without | 9 | * Redistribution and use in source and binary forms, with or without | |
10 | * modification, are permitted provided that the following conditions | 10 | * modification, are permitted provided that the following conditions | |
11 | * are met: | 11 | * are met: | |
12 | * 1. Redistributions of source code must retain the above copyright | 12 | * 1. Redistributions of source code must retain the above copyright | |
13 | * notice, this list of conditions and the following disclaimer. | 13 | * notice, this list of conditions and the following disclaimer. | |
14 | * 2. Redistributions in binary form must reproduce the above copyright | 14 | * 2. Redistributions in binary form must reproduce the above copyright | |
@@ -18,29 +18,26 @@ | @@ -18,29 +18,26 @@ | |||
18 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | 18 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |
19 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 19 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
20 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 20 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
21 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 21 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
22 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 22 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
23 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 23 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
24 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 24 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
25 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 25 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
26 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 26 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
27 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 27 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
28 | * POSSIBILITY OF SUCH DAMAGE. | 28 | * POSSIBILITY OF SUCH DAMAGE. | |
29 | */ | 29 | */ | |
30 | 30 | |||
31 | #include <sys/cdefs.h> | |||
32 | __KERNEL_RCSID(0, "$NetBSD: ipivar.h,v 1.10 2019/11/24 15:49:12 ad Exp $"); | |||
33 | ||||
34 | #ifndef _IPI_VAR_H_ | 31 | #ifndef _IPI_VAR_H_ | |
35 | #define _IPI_VAR_H_ | 32 | #define _IPI_VAR_H_ | |
36 | 33 | |||
37 | #ifdef _KERNEL_OPT | 34 | #ifdef _KERNEL_OPT | |
38 | #include "opt_ppcarch.h" | 35 | #include "opt_ppcarch.h" | |
39 | #endif | 36 | #endif | |
40 | 37 | |||
41 | #if defined(_KERNEL) && !defined(PPC_BOOKE) | 38 | #if defined(_KERNEL) && !defined(PPC_BOOKE) | |
42 | struct ipi_ops { | 39 | struct ipi_ops { | |
43 | void (*ppc_send_ipi)(cpuid_t, uint32_t); | 40 | void (*ppc_send_ipi)(cpuid_t, uint32_t); | |
44 | /* type, level, arg */ | 41 | /* type, level, arg */ | |
45 | void (*ppc_establish_ipi)(int, int, void *); | 42 | void (*ppc_establish_ipi)(int, int, void *); | |
46 | int ppc_ipi_vector; | 43 | int ppc_ipi_vector; |
--- src/sys/arch/powerpc/pic/picvar.h 2018/05/11 22:39:59 1.10
+++ src/sys/arch/powerpc/pic/picvar.h 2020/04/16 21:56:42 1.11
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: picvar.h,v 1.10 2018/05/11 22:39:59 macallan Exp $ */ | 1 | /* $NetBSD: picvar.h,v 1.11 2020/04/16 21:56:42 rin Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2007 Michael Lorenz | 4 | * Copyright (c) 2007 Michael Lorenz | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Redistribution and use in source and binary forms, with or without | 7 | * Redistribution and use in source and binary forms, with or without | |
8 | * modification, are permitted provided that the following conditions | 8 | * modification, are permitted provided that the following conditions | |
9 | * are met: | 9 | * are met: | |
10 | * 1. Redistributions of source code must retain the above copyright | 10 | * 1. Redistributions of source code must retain the above copyright | |
11 | * notice, this list of conditions and the following disclaimer. | 11 | * notice, this list of conditions and the following disclaimer. | |
12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright | |
13 | * notice, this list of conditions and the following disclaimer in the | 13 | * notice, this list of conditions and the following disclaimer in the | |
14 | * documentation and/or other materials provided with the distribution. | 14 | * documentation and/or other materials provided with the distribution. | |
@@ -16,29 +16,26 @@ | @@ -16,29 +16,26 @@ | |||
16 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | 16 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |
17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
26 | * POSSIBILITY OF SUCH DAMAGE. | 26 | * POSSIBILITY OF SUCH DAMAGE. | |
27 | */ | 27 | */ | |
28 | 28 | |||
29 | #include <sys/cdefs.h> | |||
30 | __KERNEL_RCSID(0, "$NetBSD: picvar.h,v 1.10 2018/05/11 22:39:59 macallan Exp $"); | |||
31 | ||||
32 | #ifndef PIC_VAR_H | 29 | #ifndef PIC_VAR_H | |
33 | #define PIC_VAR_H | 30 | #define PIC_VAR_H | |
34 | 31 | |||
35 | #include <sys/intr.h> | 32 | #include <sys/intr.h> | |
36 | 33 | |||
37 | struct pic_ops { | 34 | struct pic_ops { | |
38 | void *pic_cookie; /* private stuff / hardware info */ | 35 | void *pic_cookie; /* private stuff / hardware info */ | |
39 | int pic_intrbase; /* global number of the 1st IRQ we handle */ | 36 | int pic_intrbase; /* global number of the 1st IRQ we handle */ | |
40 | int pic_numintrs; /* how many IRQs do we handle? */ | 37 | int pic_numintrs; /* how many IRQs do we handle? */ | |
41 | /* | 38 | /* | |
42 | * all functions that take an IRQ number as argument need a local | 39 | * all functions that take an IRQ number as argument need a local | |
43 | * interrupt number | 40 | * interrupt number | |
44 | */ | 41 | */ |
--- src/sys/dev/acpi/wmi/wmi_acpivar.h 2010/10/28 15:55:04 1.5
+++ src/sys/dev/acpi/wmi/wmi_acpivar.h 2020/04/16 21:56:42 1.6
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: wmi_acpivar.h,v 1.5 2010/10/28 15:55:04 jruoho Exp $ */ | 1 | /* $NetBSD: wmi_acpivar.h,v 1.6 2020/04/16 21:56:42 rin Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2009, 2010 Jukka Ruohonen <jruohonen@iki.fi> | 4 | * Copyright (c) 2009, 2010 Jukka Ruohonen <jruohonen@iki.fi> | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Redistribution and use in source and binary forms, with or without | 7 | * Redistribution and use in source and binary forms, with or without | |
8 | * modification, are permitted provided that the following conditions | 8 | * modification, are permitted provided that the following conditions | |
9 | * are met: | 9 | * are met: | |
10 | * | 10 | * | |
11 | * 1. Redistributions of source code must retain the above copyright | 11 | * 1. Redistributions of source code must retain the above copyright | |
12 | * notice, this list of conditions and the following disclaimer. | 12 | * notice, this list of conditions and the following disclaimer. | |
13 | * 2. Redistributions in binary form must reproduce the above copyright | 13 | * 2. Redistributions in binary form must reproduce the above copyright | |
14 | * notice, this list of conditions and the following disclaimer in the | 14 | * notice, this list of conditions and the following disclaimer in the | |
@@ -20,29 +20,26 @@ | @@ -20,29 +20,26 @@ | |||
20 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | 20 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | |
21 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | 21 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | |
22 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | 22 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | |
23 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | 23 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | |
24 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | 24 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | |
25 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 25 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | |
26 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 26 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |
27 | * SUCH DAMAGE. | 27 | * SUCH DAMAGE. | |
28 | */ | 28 | */ | |
29 | 29 | |||
30 | #ifndef _SYS_DEV_ACPI_WMI_WMI_ACPIVAR_H | 30 | #ifndef _SYS_DEV_ACPI_WMI_WMI_ACPIVAR_H | |
31 | #define _SYS_DEV_ACPI_WMI_WMI_ACPIVAR_H | 31 | #define _SYS_DEV_ACPI_WMI_WMI_ACPIVAR_H | |
32 | 32 | |||
33 | #include <sys/cdefs.h> | |||
34 | __KERNEL_RCSID(0, "$NetBSD: wmi_acpivar.h,v 1.5 2010/10/28 15:55:04 jruoho Exp $"); | |||
35 | ||||
36 | ACPI_STATUS acpi_wmi_event_register(device_t, ACPI_NOTIFY_HANDLER); | 33 | ACPI_STATUS acpi_wmi_event_register(device_t, ACPI_NOTIFY_HANDLER); | |
37 | ACPI_STATUS acpi_wmi_event_deregister(device_t); | 34 | ACPI_STATUS acpi_wmi_event_deregister(device_t); | |
38 | ACPI_STATUS acpi_wmi_event_get(device_t, uint32_t, ACPI_BUFFER *); | 35 | ACPI_STATUS acpi_wmi_event_get(device_t, uint32_t, ACPI_BUFFER *); | |
39 | 36 | |||
40 | int acpi_wmi_guid_match(device_t, const char *); | 37 | int acpi_wmi_guid_match(device_t, const char *); | |
41 | 38 | |||
42 | ACPI_STATUS acpi_wmi_data_query(device_t, const char *, | 39 | ACPI_STATUS acpi_wmi_data_query(device_t, const char *, | |
43 | uint8_t, ACPI_BUFFER *); | 40 | uint8_t, ACPI_BUFFER *); | |
44 | ACPI_STATUS acpi_wmi_data_write(device_t, const char *, | 41 | ACPI_STATUS acpi_wmi_data_write(device_t, const char *, | |
45 | uint8_t, ACPI_BUFFER *); | 42 | uint8_t, ACPI_BUFFER *); | |
46 | 43 | |||
47 | ACPI_STATUS acpi_wmi_method(device_t, const char *, uint8_t, | 44 | ACPI_STATUS acpi_wmi_method(device_t, const char *, uint8_t, | |
48 | uint32_t, ACPI_BUFFER *, ACPI_BUFFER *); | 45 | uint32_t, ACPI_BUFFER *, ACPI_BUFFER *); |
--- src/sys/dev/adb/adbvar.h 2008/04/29 06:53:02 1.2
+++ src/sys/dev/adb/adbvar.h 2020/04/16 21:56:42 1.3
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: adbvar.h,v 1.2 2008/04/29 06:53:02 martin Exp $ */ | 1 | /* $NetBSD: adbvar.h,v 1.3 2020/04/16 21:56:42 rin Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2006 Michael Lorenz | 4 | * Copyright (c) 2006 Michael Lorenz | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Redistribution and use in source and binary forms, with or without | 7 | * Redistribution and use in source and binary forms, with or without | |
8 | * modification, are permitted provided that the following conditions | 8 | * modification, are permitted provided that the following conditions | |
9 | * are met: | 9 | * are met: | |
10 | * 1. Redistributions of source code must retain the above copyright | 10 | * 1. Redistributions of source code must retain the above copyright | |
11 | * notice, this list of conditions and the following disclaimer. | 11 | * notice, this list of conditions and the following disclaimer. | |
12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright | |
13 | * notice, this list of conditions and the following disclaimer in the | 13 | * notice, this list of conditions and the following disclaimer in the | |
14 | * documentation and/or other materials provided with the distribution. | 14 | * documentation and/or other materials provided with the distribution. | |
@@ -16,29 +16,26 @@ | @@ -16,29 +16,26 @@ | |||
16 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | 16 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |
17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
26 | * POSSIBILITY OF SUCH DAMAGE. | 26 | * POSSIBILITY OF SUCH DAMAGE. | |
27 | */ | 27 | */ | |
28 | 28 | |||
29 | #include <sys/cdefs.h> | |||
30 | __KERNEL_RCSID(0, "$NetBSD: adbvar.h,v 1.2 2008/04/29 06:53:02 martin Exp $"); | |||
31 | ||||
32 | #ifndef ADBVAR_H | 29 | #ifndef ADBVAR_H | |
33 | #define ADBVAR_H | 30 | #define ADBVAR_H | |
34 | 31 | |||
35 | #define ADB_CMDADDR(cmd) ((u_int8_t)((cmd) & 0xf0) >> 4) | 32 | #define ADB_CMDADDR(cmd) ((u_int8_t)((cmd) & 0xf0) >> 4) | |
36 | #define ADBFLUSH(dev) ((((u_int8_t)(dev) & 0x0f) << 4) | 0x01) | 33 | #define ADBFLUSH(dev) ((((u_int8_t)(dev) & 0x0f) << 4) | 0x01) | |
37 | #define ADBLISTEN(dev, reg) ((((u_int8_t)(dev) & 0x0f) << 4) | 0x08 | (reg)) | 34 | #define ADBLISTEN(dev, reg) ((((u_int8_t)(dev) & 0x0f) << 4) | 0x08 | (reg)) | |
38 | #define ADBTALK(dev, reg) ((((u_int8_t)(dev) & 0x0f) << 4) | 0x0c | (reg)) | 35 | #define ADBTALK(dev, reg) ((((u_int8_t)(dev) & 0x0f) << 4) | 0x0c | (reg)) | |
39 | 36 | |||
40 | struct adb_bus_accessops { | 37 | struct adb_bus_accessops { | |
41 | void *cookie; | 38 | void *cookie; | |
42 | /* cookie, poll, address/command, length, data */ | 39 | /* cookie, poll, address/command, length, data */ | |
43 | int (*send)(void *, int, int, int, uint8_t *); | 40 | int (*send)(void *, int, int, int, uint8_t *); | |
44 | void (*poll)(void *); | 41 | void (*poll)(void *); |
--- src/sys/dev/i2c/adm1026reg.h 2019/12/11 21:00:11 1.3
+++ src/sys/dev/i2c/adm1026reg.h 2020/04/16 21:56:42 1.4
@@ -26,29 +26,26 @@ | @@ -26,29 +26,26 @@ | |||
26 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 26 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
27 | * POSSIBILITY OF SUCH DAMAGE. | 27 | * POSSIBILITY OF SUCH DAMAGE. | |
28 | */ | 28 | */ | |
29 | 29 | |||
30 | #ifndef _DEV_I2C_ADM1026REG_H_ | 30 | #ifndef _DEV_I2C_ADM1026REG_H_ | |
31 | #define _DEV_I2C_ADM1026REG_H_ | 31 | #define _DEV_I2C_ADM1026REG_H_ | |
32 | 32 | |||
33 | /* | 33 | /* | |
34 | * Register definitions for "ADM1026 Thermal System Management Fan Controller" | 34 | * Register definitions for "ADM1026 Thermal System Management Fan Controller" | |
35 | * Datasheet available from (URL valid as of December 2015): | 35 | * Datasheet available from (URL valid as of December 2015): | |
36 | * http://www.onsemi.com/pub_link/Collateral/ADM1026-D.PDF | 36 | * http://www.onsemi.com/pub_link/Collateral/ADM1026-D.PDF | |
37 | */ | 37 | */ | |
38 | 38 | |||
39 | #include <sys/cdefs.h> | |||
40 | __KERNEL_RCSID(0, "$NetBSD: adm1026reg.h,v 1.3 2019/12/11 21:00:11 jdc Exp $"); | |||
41 | ||||
42 | #define ADM1026_ADDR1 0x2c | 39 | #define ADM1026_ADDR1 0x2c | |
43 | 40 | |||
44 | #define ADM1026_CONF1 0x00 | 41 | #define ADM1026_CONF1 0x00 | |
45 | #define ADM1026_CONF2 0x01 | 42 | #define ADM1026_CONF2 0x01 | |
46 | #define ADM1026_FAN_DIV1 0x02 | 43 | #define ADM1026_FAN_DIV1 0x02 | |
47 | #define ADM1026_FAN_DIV2 0x03 | 44 | #define ADM1026_FAN_DIV2 0x03 | |
48 | #define ADM1026_DAC_CTRL 0x04 | 45 | #define ADM1026_DAC_CTRL 0x04 | |
49 | #define ADM1026_PWM_CTRL 0x05 | 46 | #define ADM1026_PWM_CTRL 0x05 | |
50 | #define ADM1026_EEPROM 0x06 | 47 | #define ADM1026_EEPROM 0x06 | |
51 | #define ADM1026_TVG_CONF 0x07 /* THERM, V-REF and GPIO16 */ | 48 | #define ADM1026_TVG_CONF 0x07 /* THERM, V-REF and GPIO16 */ | |
52 | #define ADM1026_GPIO_CONF1 0x08 | 49 | #define ADM1026_GPIO_CONF1 0x08 | |
53 | #define ADM1026_GPIO_CONF2 0x09 | 50 | #define ADM1026_GPIO_CONF2 0x09 | |
54 | #define ADM1026_GPIO_CONF3 0x0a | 51 | #define ADM1026_GPIO_CONF3 0x0a |
--- src/sys/dev/i2c/dbcool_reg.h 2013/08/07 19:38:45 1.7
+++ src/sys/dev/i2c/dbcool_reg.h 2020/04/16 21:56:42 1.8
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: dbcool_reg.h,v 1.7 2013/08/07 19:38:45 soren Exp $ */ | 1 | /* $NetBSD: dbcool_reg.h,v 1.8 2020/04/16 21:56:42 rin Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2008 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 2008 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by Paul Goyette | 8 | * by Paul Goyette | |
9 | * | 9 | * | |
10 | * Redistribution and use in source and binary forms, with or without | 10 | * Redistribution and use in source and binary forms, with or without | |
11 | * modification, are permitted provided that the following conditions | 11 | * modification, are permitted provided that the following conditions | |
12 | * are met: | 12 | * are met: | |
13 | * 1. Redistributions of source code must retain the above copyright | 13 | * 1. Redistributions of source code must retain the above copyright | |
14 | * notice, this list of conditions and the following disclaimer. | 14 | * notice, this list of conditions and the following disclaimer. | |
@@ -26,29 +26,26 @@ | @@ -26,29 +26,26 @@ | |||
26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
29 | * POSSIBILITY OF SUCH DAMAGE. | 29 | * POSSIBILITY OF SUCH DAMAGE. | |
30 | */ | 30 | */ | |
31 | 31 | |||
32 | /* | 32 | /* | |
33 | * a driver for the dbCool(tm) family of environmental controllers | 33 | * a driver for the dbCool(tm) family of environmental controllers | |
34 | */ | 34 | */ | |
35 | 35 | |||
36 | #ifndef DBCOOLREG_H | 36 | #ifndef DBCOOLREG_H | |
37 | #define DBCOOLREG_H | 37 | #define DBCOOLREG_H | |
38 | 38 | |||
39 | #include <sys/cdefs.h> | |||
40 | __KERNEL_RCSID(0, "$NetBSD: dbcool_reg.h,v 1.7 2013/08/07 19:38:45 soren Exp $"); | |||
41 | ||||
42 | #define DBCOOL_ADDRMASK 0x3fc | 39 | #define DBCOOL_ADDRMASK 0x3fc | |
43 | #define DBCOOL_ADDR 0x2c /* Some chips have multiple addrs */ | 40 | #define DBCOOL_ADDR 0x2c /* Some chips have multiple addrs */ | |
44 | 41 | |||
45 | /* The dBCool chip family register set */ | 42 | /* The dBCool chip family register set */ | |
46 | 43 | |||
47 | /* Not all registers are available on all chips! */ | 44 | /* Not all registers are available on all chips! */ | |
48 | #define DBCOOL_CONFIG5A_REG 0x04 | 45 | #define DBCOOL_CONFIG5A_REG 0x04 | |
49 | #define DBCOOL_CONFIG6_REG 0x10 | 46 | #define DBCOOL_CONFIG6_REG 0x10 | |
50 | #define DBCOOL_CONFIG7_REG 0x11 | 47 | #define DBCOOL_CONFIG7_REG 0x11 | |
51 | #define DBCOOL_INTERNAL_TRIP 0x13 | 48 | #define DBCOOL_INTERNAL_TRIP 0x13 | |
52 | #define DBCOOL_EXTERNAL_TRIP 0x14 | 49 | #define DBCOOL_EXTERNAL_TRIP 0x14 | |
53 | #define DBCOOL_TEST 0x15 | 50 | #define DBCOOL_TEST 0x15 | |
54 | #define DBCOOL_CHANNEL_MODE 0x16 | 51 | #define DBCOOL_CHANNEL_MODE 0x16 |
--- src/sys/dev/i2c/dbcool_var.h 2011/08/02 14:06:15 1.14
+++ src/sys/dev/i2c/dbcool_var.h 2020/04/16 21:56:42 1.15
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: dbcool_var.h,v 1.14 2011/08/02 14:06:15 pgoyette Exp $ */ | 1 | /* $NetBSD: dbcool_var.h,v 1.15 2020/04/16 21:56:42 rin Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2008 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 2008 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by Paul Goyette | 8 | * by Paul Goyette | |
9 | * | 9 | * | |
10 | * Redistribution and use in source and binary forms, with or without | 10 | * Redistribution and use in source and binary forms, with or without | |
11 | * modification, are permitted provided that the following conditions | 11 | * modification, are permitted provided that the following conditions | |
12 | * are met: | 12 | * are met: | |
13 | * 1. Redistributions of source code must retain the above copyright | 13 | * 1. Redistributions of source code must retain the above copyright | |
14 | * notice, this list of conditions and the following disclaimer. | 14 | * notice, this list of conditions and the following disclaimer. | |
@@ -30,29 +30,26 @@ | @@ -30,29 +30,26 @@ | |||
30 | */ | 30 | */ | |
31 | 31 | |||
32 | /* | 32 | /* | |
33 | * A driver for dbCool(tm) family of environmental controllers | 33 | * A driver for dbCool(tm) family of environmental controllers | |
34 | */ | 34 | */ | |
35 | 35 | |||
36 | #ifndef DBCOOLVAR_H | 36 | #ifndef DBCOOLVAR_H | |
37 | #define DBCOOLVAR_H | 37 | #define DBCOOLVAR_H | |
38 | 38 | |||
39 | #ifdef DEBUG | 39 | #ifdef DEBUG | |
40 | #define DBCOOL_DEBUG | 40 | #define DBCOOL_DEBUG | |
41 | #endif | 41 | #endif | |
42 | 42 | |||
43 | #include <sys/cdefs.h> | |||
44 | __KERNEL_RCSID(0, "$NetBSD: dbcool_var.h,v 1.14 2011/08/02 14:06:15 pgoyette Exp $"); | |||
45 | ||||
46 | #include <dev/i2c/i2cvar.h> | 43 | #include <dev/i2c/i2cvar.h> | |
47 | 44 | |||
48 | #include <dev/sysmon/sysmonvar.h> | 45 | #include <dev/sysmon/sysmonvar.h> | |
49 | 46 | |||
50 | #include <dev/i2c/dbcool_reg.h> | 47 | #include <dev/i2c/dbcool_reg.h> | |
51 | 48 | |||
52 | enum dbc_pwm_params { | 49 | enum dbc_pwm_params { | |
53 | DBC_PWM_BEHAVIOR = 0, | 50 | DBC_PWM_BEHAVIOR = 0, | |
54 | DBC_PWM_MIN_DUTY, | 51 | DBC_PWM_MIN_DUTY, | |
55 | DBC_PWM_MAX_DUTY, | 52 | DBC_PWM_MAX_DUTY, | |
56 | DBC_PWM_CUR_DUTY, | 53 | DBC_PWM_CUR_DUTY, | |
57 | DBC_PWM_LAST_PARAM | 54 | DBC_PWM_LAST_PARAM | |
58 | }; | 55 | }; |
--- src/sys/dev/i2c/sgsmixvar.h 2008/05/08 02:32:48 1.2
+++ src/sys/dev/i2c/sgsmixvar.h 2020/04/16 21:56:42 1.3
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: sgsmixvar.h,v 1.2 2008/05/08 02:32:48 macallan Exp $ */ | 1 | /* $NetBSD: sgsmixvar.h,v 1.3 2020/04/16 21:56:42 rin Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (C) 2005 Michael Lorenz. | 4 | * Copyright (C) 2005 Michael Lorenz. | |
5 | * | 5 | * | |
6 | * Redistribution and use in source and binary forms, with or without | 6 | * Redistribution and use in source and binary forms, with or without | |
7 | * modification, are permitted provided that the following conditions | 7 | * modification, are permitted provided that the following conditions | |
8 | * are met: | 8 | * are met: | |
9 | * 1. Redistributions of source code must retain the above copyright | 9 | * 1. Redistributions of source code must retain the above copyright | |
10 | * notice, this list of conditions and the following disclaimer. | 10 | * notice, this list of conditions and the following disclaimer. | |
11 | * 2. Redistributions in binary form must reproduce the above copyright | 11 | * 2. Redistributions in binary form must reproduce the above copyright | |
12 | * notice, this list of conditions and the following disclaimer in the | 12 | * notice, this list of conditions and the following disclaimer in the | |
13 | * documentation and/or other materials provided with the distribution. | 13 | * documentation and/or other materials provided with the distribution. | |
14 | * | 14 | * | |
@@ -16,21 +16,18 @@ | @@ -16,21 +16,18 @@ | |||
16 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 16 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
17 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | 17 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |
18 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | 18 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | |
19 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | 19 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |
20 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 20 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
21 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 21 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
22 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | |
24 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
25 | */ | 25 | */ | |
26 | #ifndef SGSMIXVAR_H | 26 | #ifndef SGSMIXVAR_H | |
27 | #define SGSMIXVAR_H | 27 | #define SGSMIXVAR_H | |
28 | 28 | |||
29 | #include <sys/cdefs.h> | |||
30 | __KERNEL_RCSID(0, "$NetBSD: sgsmixvar.h,v 1.2 2008/05/08 02:32:48 macallan Exp $"); | |||
31 | ||||
32 | void sgsmix_set_speaker_vol(void *, int, int); | 29 | void sgsmix_set_speaker_vol(void *, int, int); | |
33 | void sgsmix_set_headphone_vol(void *, int, int); | 30 | void sgsmix_set_headphone_vol(void *, int, int); | |
34 | void sgsmix_set_bass_treble(void *, int, int); | 31 | void sgsmix_set_bass_treble(void *, int, int); | |
35 | 32 | |||
36 | #endif | 33 | #endif |
--- src/sys/dev/ic/i128reg.h 2008/04/29 06:53:02 1.3
+++ src/sys/dev/ic/i128reg.h 2020/04/16 21:56:42 1.4
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: i128reg.h,v 1.3 2008/04/29 06:53:02 martin Exp $ */ | 1 | /* $NetBSD: i128reg.h,v 1.4 2020/04/16 21:56:42 rin Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2007 Michael Lorenz | 4 | * Copyright (c) 2007 Michael Lorenz | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Redistribution and use in source and binary forms, with or without | 7 | * Redistribution and use in source and binary forms, with or without | |
8 | * modification, are permitted provided that the following conditions | 8 | * modification, are permitted provided that the following conditions | |
9 | * are met: | 9 | * are met: | |
10 | * 1. Redistributions of source code must retain the above copyright | 10 | * 1. Redistributions of source code must retain the above copyright | |
11 | * notice, this list of conditions and the following disclaimer. | 11 | * notice, this list of conditions and the following disclaimer. | |
12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright | |
13 | * notice, this list of conditions and the following disclaimer in the | 13 | * notice, this list of conditions and the following disclaimer in the | |
14 | * documentation and/or other materials provided with the distribution. | 14 | * documentation and/or other materials provided with the distribution. | |
@@ -16,29 +16,26 @@ | @@ -16,29 +16,26 @@ | |||
16 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | 16 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |
17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
26 | * POSSIBILITY OF SUCH DAMAGE. | 26 | * POSSIBILITY OF SUCH DAMAGE. | |
27 | */ | 27 | */ | |
28 | 28 | |||
29 | #include <sys/cdefs.h> | |||
30 | __KERNEL_RCSID(0, "$NetBSD: i128reg.h,v 1.3 2008/04/29 06:53:02 martin Exp $"); | |||
31 | ||||
32 | /* | 29 | /* | |
33 | * register definition for Number Nine Imagine 128 graphics controllers | 30 | * register definition for Number Nine Imagine 128 graphics controllers | |
34 | * | 31 | * | |
35 | * adapted from XFree86's i128 driver source | 32 | * adapted from XFree86's i128 driver source | |
36 | */ | 33 | */ | |
37 | 34 | |||
38 | #ifndef I128REG_H | 35 | #ifndef I128REG_H | |
39 | #define I128REG_H | 36 | #define I128REG_H | |
40 | 37 | |||
41 | #define INTP 0x4000 | 38 | #define INTP 0x4000 | |
42 | #define INTP_DD_INT 0x01 /* drawing op completed */ | 39 | #define INTP_DD_INT 0x01 /* drawing op completed */ | |
43 | #define INTP_CL_INT 0x02 | 40 | #define INTP_CL_INT 0x02 | |
44 | #define INTM 0x4004 | 41 | #define INTM 0x4004 |
--- src/sys/dev/ic/i128var.h 2012/10/20 13:31:09 1.3
+++ src/sys/dev/ic/i128var.h 2020/04/16 21:56:42 1.4
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: i128var.h,v 1.3 2012/10/20 13:31:09 macallan Exp $ */ | 1 | /* $NetBSD: i128var.h,v 1.4 2020/04/16 21:56:42 rin Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2007 Michael Lorenz | 4 | * Copyright (c) 2007 Michael Lorenz | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Redistribution and use in source and binary forms, with or without | 7 | * Redistribution and use in source and binary forms, with or without | |
8 | * modification, are permitted provided that the following conditions | 8 | * modification, are permitted provided that the following conditions | |
9 | * are met: | 9 | * are met: | |
10 | * 1. Redistributions of source code must retain the above copyright | 10 | * 1. Redistributions of source code must retain the above copyright | |
11 | * notice, this list of conditions and the following disclaimer. | 11 | * notice, this list of conditions and the following disclaimer. | |
12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright | |
13 | * notice, this list of conditions and the following disclaimer in the | 13 | * notice, this list of conditions and the following disclaimer in the | |
14 | * documentation and/or other materials provided with the distribution. | 14 | * documentation and/or other materials provided with the distribution. | |
@@ -16,29 +16,26 @@ | @@ -16,29 +16,26 @@ | |||
16 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | 16 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |
17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 17 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 18 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 19 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 20 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
26 | * POSSIBILITY OF SUCH DAMAGE. | 26 | * POSSIBILITY OF SUCH DAMAGE. | |
27 | */ | 27 | */ | |
28 | 28 | |||
29 | #include <sys/cdefs.h> | |||
30 | __KERNEL_RCSID(0, "$NetBSD: i128var.h,v 1.3 2012/10/20 13:31:09 macallan Exp $"); | |||
31 | ||||
32 | /* | 29 | /* | |
33 | * register definition for Number Nine Imagine 128 graphics controllers | 30 | * register definition for Number Nine Imagine 128 graphics controllers | |
34 | * | 31 | * | |
35 | * adapted from XFree86's i128 driver source | 32 | * adapted from XFree86's i128 driver source | |
36 | */ | 33 | */ | |
37 | 34 | |||
38 | #ifndef I128VAR_H | 35 | #ifndef I128VAR_H | |
39 | #define I128VAR_H | 36 | #define I128VAR_H | |
40 | 37 | |||
41 | /* tag, handle, stride, colour depth */ | 38 | /* tag, handle, stride, colour depth */ | |
42 | void i128_init(bus_space_tag_t, bus_space_handle_t, int, int); | 39 | void i128_init(bus_space_tag_t, bus_space_handle_t, int, int); | |
43 | void i128_bitblt(bus_space_tag_t, bus_space_handle_t, int, int, int, int, int, | 40 | void i128_bitblt(bus_space_tag_t, bus_space_handle_t, int, int, int, int, int, | |
44 | int, int); | 41 | int, int); |
--- src/sys/dev/pci/gffbreg.h 2013/10/23 13:15:47 1.3
+++ src/sys/dev/pci/gffbreg.h 2020/04/16 21:56:42 1.4
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: gffbreg.h,v 1.3 2013/10/23 13:15:47 macallan Exp $ */ | 1 | /* $NetBSD: gffbreg.h,v 1.4 2020/04/16 21:56:42 rin Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 2013 Michael Lorenz | 4 | * Copyright (c) 2013 Michael Lorenz | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Redistribution and use in source and binary forms, with or without | 7 | * Redistribution and use in source and binary forms, with or without | |
8 | * modification, are permitted provided that the following conditions | 8 | * modification, are permitted provided that the following conditions | |
9 | * are met: | 9 | * are met: | |
10 | * 1. Redistributions of source code must retain the above copyright | 10 | * 1. Redistributions of source code must retain the above copyright | |
11 | * notice, this list of conditions and the following disclaimer. | 11 | * notice, this list of conditions and the following disclaimer. | |
12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright | |
13 | * notice, this list of conditions and the following disclaimer in the | 13 | * notice, this list of conditions and the following disclaimer in the | |
14 | * documentation and/or other materials provided with the distribution. | 14 | * documentation and/or other materials provided with the distribution. | |
@@ -21,29 +21,26 @@ | @@ -21,29 +21,26 @@ | |||
21 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 21 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
22 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 22 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
23 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | |
25 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
26 | */ | 26 | */ | |
27 | 27 | |||
28 | /* | 28 | /* | |
29 | * A console driver for nvidia geforce graphics controllers | 29 | * A console driver for nvidia geforce graphics controllers | |
30 | * tested on macppc only so far | 30 | * tested on macppc only so far | |
31 | * register definitions are mostly from the xf86-video-nv driver | 31 | * register definitions are mostly from the xf86-video-nv driver | |
32 | */ | 32 | */ | |
33 | 33 | |||
34 | #include <sys/cdefs.h> | |||
35 | __KERNEL_RCSID(0, "$NetBSD: gffbreg.h,v 1.3 2013/10/23 13:15:47 macallan Exp $"); | |||
36 | ||||
37 | #ifndef GFFBREG_H | 34 | #ifndef GFFBREG_H | |
38 | #define GFFBREG_H | 35 | #define GFFBREG_H | |
39 | 36 | |||
40 | #define GFFB_RAMDAC0 0x00680000 | 37 | #define GFFB_RAMDAC0 0x00680000 | |
41 | #define GFFB_RAMDAC1 0x00682000 | 38 | #define GFFB_RAMDAC1 0x00682000 | |
42 | 39 | |||
43 | #define GFFB_PCIO0 0x00601000 | 40 | #define GFFB_PCIO0 0x00601000 | |
44 | #define GFFB_PCIO1 0x00603000 | 41 | #define GFFB_PCIO1 0x00603000 | |
45 | 42 | |||
46 | /* VGA registers live here, one set for each head */ | 43 | /* VGA registers live here, one set for each head */ | |
47 | #define GFFB_PDIO0 0x00681000 | 44 | #define GFFB_PDIO0 0x00681000 | |
48 | #define GFFB_PDIO1 0x00683000 | 45 | #define GFFB_PDIO1 0x00683000 | |
49 | 46 |
--- src/sys/dev/pci/ppbvar.h 2017/04/18 05:21:34 1.2
+++ src/sys/dev/pci/ppbvar.h 2020/04/16 21:56:42 1.3
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: ppbvar.h,v 1.2 2017/04/18 05:21:34 msaitoh Exp $ */ | 1 | /* $NetBSD: ppbvar.h,v 1.3 2020/04/16 21:56:42 rin Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 1996, 1998 Christopher G. Demetriou. All rights reserved. | 4 | * Copyright (c) 1996, 1998 Christopher G. Demetriou. All rights reserved. | |
5 | * | 5 | * | |
6 | * Redistribution and use in source and binary forms, with or without | 6 | * Redistribution and use in source and binary forms, with or without | |
7 | * modification, are permitted provided that the following conditions | 7 | * modification, are permitted provided that the following conditions | |
8 | * are met: | 8 | * are met: | |
9 | * 1. Redistributions of source code must retain the above copyright | 9 | * 1. Redistributions of source code must retain the above copyright | |
10 | * notice, this list of conditions and the following disclaimer. | 10 | * notice, this list of conditions and the following disclaimer. | |
11 | * 2. Redistributions in binary form must reproduce the above copyright | 11 | * 2. Redistributions in binary form must reproduce the above copyright | |
12 | * notice, this list of conditions and the following disclaimer in the | 12 | * notice, this list of conditions and the following disclaimer in the | |
13 | * documentation and/or other materials provided with the distribution. | 13 | * documentation and/or other materials provided with the distribution. | |
14 | * 3. All advertising materials mentioning features or use of this software | 14 | * 3. All advertising materials mentioning features or use of this software | |
@@ -20,29 +20,26 @@ | @@ -20,29 +20,26 @@ | |||
20 | * | 20 | * | |
21 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | 21 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | |
22 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 22 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
23 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | 23 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |
24 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | 24 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | |
25 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | 25 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |
26 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 26 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
27 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 27 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
28 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 28 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
29 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 29 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | |
30 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 30 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
31 | */ | 31 | */ | |
32 | 32 | |||
33 | #include <sys/cdefs.h> | |||
34 | __KERNEL_RCSID(0, "$NetBSD: ppbvar.h,v 1.2 2017/04/18 05:21:34 msaitoh Exp $"); | |||
35 | ||||
36 | #include <sys/param.h> | 33 | #include <sys/param.h> | |
37 | #include <sys/systm.h> | 34 | #include <sys/systm.h> | |
38 | #include <sys/kernel.h> | 35 | #include <sys/kernel.h> | |
39 | #include <sys/device.h> | 36 | #include <sys/device.h> | |
40 | #include <sys/evcnt.h> | 37 | #include <sys/evcnt.h> | |
41 | 38 | |||
42 | #include <dev/pci/pcireg.h> | 39 | #include <dev/pci/pcireg.h> | |
43 | #include <dev/pci/pcivar.h> | 40 | #include <dev/pci/pcivar.h> | |
44 | #include <dev/pci/ppbreg.h> | 41 | #include <dev/pci/ppbreg.h> | |
45 | #include <dev/pci/pcidevs.h> | 42 | #include <dev/pci/pcidevs.h> | |
46 | 43 | |||
47 | struct ppb_softc { | 44 | struct ppb_softc { | |
48 | device_t sc_dev; /* generic device glue */ | 45 | device_t sc_dev; /* generic device glue */ |
--- src/sys/dev/pci/voyagervar.h 2018/04/19 21:50:09 1.5
+++ src/sys/dev/pci/voyagervar.h 2020/04/16 21:56:42 1.6
@@ -1,43 +1,40 @@ | @@ -1,43 +1,40 @@ | |||
1 | /* $NetBSD: voyagervar.h,v 1.5 2018/04/19 21:50:09 christos Exp $ */ | 1 | /* $NetBSD: voyagervar.h,v 1.6 2020/04/16 21:56:42 rin Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 2011 Michael Lorenz | 4 | * Copyright (c) 2011 Michael Lorenz | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Redistribution and use in source and binary forms, with or without | 7 | * Redistribution and use in source and binary forms, with or without | |
8 | * modification, are permitted provided that the following conditions | 8 | * modification, are permitted provided that the following conditions | |
9 | * are met: | 9 | * are met: | |
10 | * 1. Redistributions of source code must retain the above copyright | 10 | * 1. Redistributions of source code must retain the above copyright | |
11 | * notice, this list of conditions and the following disclaimer. | 11 | * notice, this list of conditions and the following disclaimer. | |
12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright | |
13 | * notice, this list of conditions and the following disclaimer in the | 13 | * notice, this list of conditions and the following disclaimer in the | |
14 | * documentation and/or other materials provided with the distribution. | 14 | * documentation and/or other materials provided with the distribution. | |
15 | * | 15 | * | |
16 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | 16 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | |
17 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 17 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
18 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | 18 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |
19 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | 19 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | |
20 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | 20 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |
21 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 21 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
22 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 22 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
23 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | |
25 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
26 | */ | 26 | */ | |
27 | 27 | |||
28 | #include <sys/cdefs.h> | |||
29 | __KERNEL_RCSID(0, "$NetBSD: voyagervar.h,v 1.5 2018/04/19 21:50:09 christos Exp $"); | |||
30 | ||||
31 | #ifndef VOYAGERVAR_H | 28 | #ifndef VOYAGERVAR_H | |
32 | #define VOYAGERVAR_H | 29 | #define VOYAGERVAR_H | |
33 | 30 | |||
34 | #include <dev/pci/pcivar.h> | 31 | #include <dev/pci/pcivar.h> | |
35 | #include <dev/pci/pcireg.h> | 32 | #include <dev/pci/pcireg.h> | |
36 | 33 | |||
37 | struct voyager_attach_args { | 34 | struct voyager_attach_args { | |
38 | pci_chipset_tag_t vaa_pc; | 35 | pci_chipset_tag_t vaa_pc; | |
39 | pcitag_t vaa_pcitag; | 36 | pcitag_t vaa_pcitag; | |
40 | bus_space_tag_t vaa_tag; | 37 | bus_space_tag_t vaa_tag; | |
41 | bus_space_handle_t vaa_regh; | 38 | bus_space_handle_t vaa_regh; | |
42 | bus_space_handle_t vaa_memh; | 39 | bus_space_handle_t vaa_memh; | |
43 | bus_addr_t vaa_reg_pa; | 40 | bus_addr_t vaa_reg_pa; |
--- src/sys/dev/qbus/rlvar.h 2017/05/22 17:22:29 1.9
+++ src/sys/dev/qbus/rlvar.h 2020/04/16 21:56:43 1.10
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: rlvar.h,v 1.9 2017/05/22 17:22:29 ragge Exp $ */ | 1 | /* $NetBSD: rlvar.h,v 1.10 2020/04/16 21:56:43 rin Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved. | 4 | * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved. | |
5 | * | 5 | * | |
6 | * Redistribution and use in source and binary forms, with or without | 6 | * Redistribution and use in source and binary forms, with or without | |
7 | * modification, are permitted provided that the following conditions | 7 | * modification, are permitted provided that the following conditions | |
8 | * are met: | 8 | * are met: | |
9 | * 1. Redistributions of source code must retain the above copyright | 9 | * 1. Redistributions of source code must retain the above copyright | |
10 | * notice, this list of conditions and the following disclaimer. | 10 | * notice, this list of conditions and the following disclaimer. | |
11 | * 2. Redistributions in binary form must reproduce the above copyright | 11 | * 2. Redistributions in binary form must reproduce the above copyright | |
12 | * notice, this list of conditions and the following disclaimer in the | 12 | * notice, this list of conditions and the following disclaimer in the | |
13 | * documentation and/or other materials provided with the distribution. | 13 | * documentation and/or other materials provided with the distribution. | |
14 | * | 14 | * | |
@@ -19,29 +19,26 @@ | @@ -19,29 +19,26 @@ | |||
19 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | 19 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |
20 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 20 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
21 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 21 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
22 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | |
24 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
25 | */ | 25 | */ | |
26 | 26 | |||
27 | /* | 27 | /* | |
28 | * RL11/RLV11/RLV12 disk controller driver and | 28 | * RL11/RLV11/RLV12 disk controller driver and | |
29 | * RL01/RL02 disk device driver. | 29 | * RL01/RL02 disk device driver. | |
30 | */ | 30 | */ | |
31 | 31 | |||
32 | #include <sys/cdefs.h> | |||
33 | __KERNEL_RCSID(0, "$NetBSD: rlvar.h,v 1.9 2017/05/22 17:22:29 ragge Exp $"); | |||
34 | ||||
35 | struct rlc_softc { | 32 | struct rlc_softc { | |
36 | device_t sc_dev; | 33 | device_t sc_dev; | |
37 | struct uba_softc *sc_uh; | 34 | struct uba_softc *sc_uh; | |
38 | struct evcnt sc_intrcnt; | 35 | struct evcnt sc_intrcnt; | |
39 | bus_space_tag_t sc_iot; | 36 | bus_space_tag_t sc_iot; | |
40 | bus_space_handle_t sc_ioh; | 37 | bus_space_handle_t sc_ioh; | |
41 | bus_dma_tag_t sc_dmat; | 38 | bus_dma_tag_t sc_dmat; | |
42 | bus_dmamap_t sc_dmam; | 39 | bus_dmamap_t sc_dmam; | |
43 | struct bufq_state *sc_q; /* Queue of waiting bufs */ | 40 | struct bufq_state *sc_q; /* Queue of waiting bufs */ | |
44 | struct buf *sc_active; /* Currently active buf */ | 41 | struct buf *sc_active; /* Currently active buf */ | |
45 | void *sc_bufaddr; /* Current in-core address */ | 42 | void *sc_bufaddr; /* Current in-core address */ | |
46 | int sc_diskblk; /* Current block on disk */ | 43 | int sc_diskblk; /* Current block on disk */ | |
47 | int sc_bytecnt; /* How much left to transfer */ | 44 | int sc_bytecnt; /* How much left to transfer */ |
--- src/sys/external/bsd/ena-com/ena_plat.h 2018/11/28 19:15:32 1.4
+++ src/sys/external/bsd/ena-com/ena_plat.h 2020/04/16 21:56:43 1.5
@@ -24,31 +24,29 @@ | @@ -24,31 +24,29 @@ | |||
24 | * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 24 | * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | |
25 | * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 25 | * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |
26 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 26 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | |
27 | * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 27 | * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
28 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 28 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
29 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 29 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
30 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 30 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | |
31 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 31 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
32 | */ | 32 | */ | |
33 | 33 | |||
34 | #ifndef ENA_PLAT_H_ | 34 | #ifndef ENA_PLAT_H_ | |
35 | #define ENA_PLAT_H_ | 35 | #define ENA_PLAT_H_ | |
36 | 36 | |||
37 | #include <sys/cdefs.h> | |||
38 | #if 0 | 37 | #if 0 | |
39 | __FBSDID("$FreeBSD: head/sys/contrib/ena-com/ena_plat.h 333453 2018-05-10 09:25:51Z mw $"); | 38 | __FBSDID("$FreeBSD: head/sys/contrib/ena-com/ena_plat.h 333453 2018-05-10 09:25:51Z mw $"); | |
40 | #endif | 39 | #endif | |
41 | __KERNEL_RCSID(0, "$NetBSD: ena_plat.h,v 1.4 2018/11/28 19:15:32 jmcneill Exp $"); | |||
42 | 40 | |||
43 | #include <sys/param.h> | 41 | #include <sys/param.h> | |
44 | #include <sys/systm.h> | 42 | #include <sys/systm.h> | |
45 | 43 | |||
46 | #include <sys/bus.h> | 44 | #include <sys/bus.h> | |
47 | #include <sys/condvar.h> | 45 | #include <sys/condvar.h> | |
48 | #include <sys/endian.h> | 46 | #include <sys/endian.h> | |
49 | #include <sys/kernel.h> | 47 | #include <sys/kernel.h> | |
50 | #include <sys/kthread.h> | 48 | #include <sys/kthread.h> | |
51 | #include <sys/malloc.h> | 49 | #include <sys/malloc.h> | |
52 | #include <sys/mbuf.h> | 50 | #include <sys/mbuf.h> | |
53 | #include <sys/module.h> | 51 | #include <sys/module.h> | |
54 | #include <sys/proc.h> | 52 | #include <sys/proc.h> |
--- src/sys/lib/libkern/crc16.h 2016/08/20 19:44:46 1.1
+++ src/sys/lib/libkern/crc16.h 2020/04/16 21:56:43 1.2
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: crc16.h,v 1.1 2016/08/20 19:44:46 jdolecek Exp $ */ | 1 | /* $NetBSD: crc16.h,v 1.2 2020/04/16 21:56:43 rin Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2006 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 2006 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by Steve C. Woodford. | 8 | * by Steve C. Woodford. | |
9 | * | 9 | * | |
10 | * Redistribution and use in source and binary forms, with or without | 10 | * Redistribution and use in source and binary forms, with or without | |
11 | * modification, are permitted provided that the following conditions | 11 | * modification, are permitted provided that the following conditions | |
12 | * are met: | 12 | * are met: | |
13 | * 1. Redistributions of source code must retain the above copyright | 13 | * 1. Redistributions of source code must retain the above copyright | |
14 | * notice, this list of conditions and the following disclaimer. | 14 | * notice, this list of conditions and the following disclaimer. | |
@@ -19,29 +19,26 @@ | @@ -19,29 +19,26 @@ | |||
19 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | 19 | * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |
20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | 20 | * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 21 | * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
29 | * POSSIBILITY OF SUCH DAMAGE. | 29 | * POSSIBILITY OF SUCH DAMAGE. | |
30 | */ | 30 | */ | |
31 | 31 | |||
32 | #include <sys/cdefs.h> | |||
33 | __KERNEL_RCSID(0, "$NetBSD: crc16.h,v 1.1 2016/08/20 19:44:46 jdolecek Exp $"); | |||
34 | ||||
35 | /* CRC table for standard ANSI CRC-16 with polynom 0x8005 */ | 32 | /* CRC table for standard ANSI CRC-16 with polynom 0x8005 */ | |
36 | static const uint16_t crc16_lookup[] = { | 33 | static const uint16_t crc16_lookup[] = { | |
37 | 0x0000, 0xc0c1, 0xc181, 0x0140, 0xc301, 0x03c0, 0x0280, 0xc241, | 34 | 0x0000, 0xc0c1, 0xc181, 0x0140, 0xc301, 0x03c0, 0x0280, 0xc241, | |
38 | 0xc601, 0x06c0, 0x0780, 0xc741, 0x0500, 0xc5c1, 0xc481, 0x0440, | 35 | 0xc601, 0x06c0, 0x0780, 0xc741, 0x0500, 0xc5c1, 0xc481, 0x0440, | |
39 | 0xcc01, 0x0cc0, 0x0d80, 0xcd41, 0x0f00, 0xcfc1, 0xce81, 0x0e40, | 36 | 0xcc01, 0x0cc0, 0x0d80, 0xcd41, 0x0f00, 0xcfc1, 0xce81, 0x0e40, | |
40 | 0x0a00, 0xcac1, 0xcb81, 0x0b40, 0xc901, 0x09c0, 0x0880, 0xc841, | 37 | 0x0a00, 0xcac1, 0xcb81, 0x0b40, 0xc901, 0x09c0, 0x0880, 0xc841, | |
41 | 0xd801, 0x18c0, 0x1980, 0xd941, 0x1b00, 0xdbc1, 0xda81, 0x1a40, | 38 | 0xd801, 0x18c0, 0x1980, 0xd941, 0x1b00, 0xdbc1, 0xda81, 0x1a40, | |
42 | 0x1e00, 0xdec1, 0xdf81, 0x1f40, 0xdd01, 0x1dc0, 0x1c80, 0xdc41, | 39 | 0x1e00, 0xdec1, 0xdf81, 0x1f40, 0xdd01, 0x1dc0, 0x1c80, 0xdc41, | |
43 | 0x1400, 0xd4c1, 0xd581, 0x1540, 0xd701, 0x17c0, 0x1680, 0xd641, | 40 | 0x1400, 0xd4c1, 0xd581, 0x1540, 0xd701, 0x17c0, 0x1680, 0xd641, | |
44 | 0xd201, 0x12c0, 0x1380, 0xd341, 0x1100, 0xd1c1, 0xd081, 0x1040, | 41 | 0xd201, 0x12c0, 0x1380, 0xd341, 0x1100, 0xd1c1, 0xd081, 0x1040, | |
45 | 0xf001, 0x30c0, 0x3180, 0xf141, 0x3300, 0xf3c1, 0xf281, 0x3240, | 42 | 0xf001, 0x30c0, 0x3180, 0xf141, 0x3300, 0xf3c1, 0xf281, 0x3240, | |
46 | 0x3600, 0xf6c1, 0xf781, 0x3740, 0xf501, 0x35c0, 0x3480, 0xf441, | 43 | 0x3600, 0xf6c1, 0xf781, 0x3740, 0xf501, 0x35c0, 0x3480, 0xf441, | |
47 | 0x3c00, 0xfcc1, 0xfd81, 0x3d40, 0xff01, 0x3fc0, 0x3e80, 0xfe41, | 44 | 0x3c00, 0xfcc1, 0xfd81, 0x3d40, 0xff01, 0x3fc0, 0x3e80, 0xfe41, |
--- src/sys/ufs/ext2fs/ext2fs_xattr.h 2016/08/12 20:30:15 1.2
+++ src/sys/ufs/ext2fs/ext2fs_xattr.h 2020/04/16 21:56:43 1.3
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: ext2fs_xattr.h,v 1.2 2016/08/12 20:30:15 macallan Exp $ */ | 1 | /* $NetBSD: ext2fs_xattr.h,v 1.3 2020/04/16 21:56:43 rin Exp $ */ | |
2 | 2 | |||
3 | /*- | 3 | /*- | |
4 | * Copyright (c) 2016 The NetBSD Foundation, Inc. | 4 | * Copyright (c) 2016 The NetBSD Foundation, Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * This code is derived from software contributed to The NetBSD Foundation | 7 | * This code is derived from software contributed to The NetBSD Foundation | |
8 | * by Jaromir Dolecek. | 8 | * by Jaromir Dolecek. | |
9 | * | 9 | * | |
10 | * Redistribution and use in source and binary forms, with or without | 10 | * Redistribution and use in source and binary forms, with or without | |
11 | * modification, are permitted provided that the following conditions | 11 | * modification, are permitted provided that the following conditions | |
12 | * are met: | 12 | * are met: | |
13 | * 1. Redistributions of source code must retain the above copyright | 13 | * 1. Redistributions of source code must retain the above copyright | |
14 | * notice, this list of conditions and the following disclaimer. | 14 | * notice, this list of conditions and the following disclaimer. | |
@@ -22,29 +22,26 @@ | @@ -22,29 +22,26 @@ | |||
22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | 22 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
29 | * POSSIBILITY OF SUCH DAMAGE. | 29 | * POSSIBILITY OF SUCH DAMAGE. | |
30 | */ | 30 | */ | |
31 | 31 | |||
32 | #ifndef _UFS_EXT2FS_EXT2FS_XATTR_H_ | 32 | #ifndef _UFS_EXT2FS_EXT2FS_XATTR_H_ | |
33 | #define _UFS_EXT2FS_EXT2FS_XATTR_H_ | 33 | #define _UFS_EXT2FS_EXT2FS_XATTR_H_ | |
34 | 34 | |||
35 | #include <sys/cdefs.h> | |||
36 | __KERNEL_RCSID(0, "$NetBSD: ext2fs_xattr.h,v 1.2 2016/08/12 20:30:15 macallan Exp $"); | |||
37 | ||||
38 | #ifdef _KERNEL | 35 | #ifdef _KERNEL | |
39 | 36 | |||
40 | #define EXT2FS_XATTR_MAGIC 0xEA020000 | 37 | #define EXT2FS_XATTR_MAGIC 0xEA020000 | |
41 | 38 | |||
42 | #define EXT2FS_XATTR_NAME_LEN_MAX 255 | 39 | #define EXT2FS_XATTR_NAME_LEN_MAX 255 | |
43 | #define EXT2FS_XATTR_REFCOUNT_MAX 1024 | 40 | #define EXT2FS_XATTR_REFCOUNT_MAX 1024 | |
44 | 41 | |||
45 | /* | 42 | /* | |
46 | * This is used as header for extended attribute block within inode | 43 | * This is used as header for extended attribute block within inode | |
47 | */ | 44 | */ | |
48 | struct ext2fs_xattr_ibody_header { | 45 | struct ext2fs_xattr_ibody_header { | |
49 | uint32_t h_magic; /* Magic number - 0xEA020000 */ | 46 | uint32_t h_magic; /* Magic number - 0xEA020000 */ | |
50 | }; | 47 | }; |