Thu Nov 30 14:51:01 2017 UTC ()
typo


(skrll)
diff -r1.6 -r1.7 src/sys/arch/arm/fdt/gtmr_fdt.c
cvs diff -r1.6 -r1.7 src/sys/arch/arm/fdt/gtmr_fdt.c (expand / switch to unified diff)

--- src/sys/arch/arm/fdt/gtmr_fdt.c 2017/11/30 14:50:34 1.6
+++ src/sys/arch/arm/fdt/gtmr_fdt.c 2017/11/30 14:51:01 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: gtmr_fdt.c,v 1.6 2017/11/30 14:50:34 skrll Exp $ */ 1/* $NetBSD: gtmr_fdt.c,v 1.7 2017/11/30 14:51:01 skrll Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2017 Jared McNeill <jmcneill@invisible.ca> 4 * Copyright (c) 2017 Jared McNeill <jmcneill@invisible.ca>
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.
@@ -17,51 +17,51 @@ @@ -17,51 +17,51 @@
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, 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
21 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 21 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
23 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 23 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
24 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#include <sys/cdefs.h> 29#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: gtmr_fdt.c,v 1.6 2017/11/30 14:50:34 skrll Exp $"); 30__KERNEL_RCSID(0, "$NetBSD: gtmr_fdt.c,v 1.7 2017/11/30 14:51:01 skrll Exp $");
31 31
32#include <sys/param.h> 32#include <sys/param.h>
33#include <sys/bus.h> 33#include <sys/bus.h>
34#include <sys/device.h> 34#include <sys/device.h>
35#include <sys/intr.h> 35#include <sys/intr.h>
36#include <sys/systm.h> 36#include <sys/systm.h>
37#include <sys/kernel.h> 37#include <sys/kernel.h>
38#include <sys/kmem.h> 38#include <sys/kmem.h>
39 39
40#include <arm/cortex/gtmr_intr.h> 40#include <arm/cortex/gtmr_intr.h>
41#include <arm/cortex/mpcore_var.h> 41#include <arm/cortex/mpcore_var.h>
42#include <arm/cortex/gtmr_var.h> 42#include <arm/cortex/gtmr_var.h>
43 43
44#include <dev/fdt/fdtvar.h> 44#include <dev/fdt/fdtvar.h>
45#include <arm/fdt/arm_fdtvar.h> 45#include <arm/fdt/arm_fdtvar.h>
46 46
47static int gtmr_fdt_match(device_t, cfdata_t, void *); 47static int gtmr_fdt_match(device_t, cfdata_t, void *);
48static void gtmr_fdt_attach(device_t, device_t, void *); 48static void gtmr_fdt_attach(device_t, device_t, void *);
49 49
50static void gtmr_fdt_cpu_hatch(void *, struct cpu_info *); 50static void gtmr_fdt_cpu_hatch(void *, struct cpu_info *);
51 51
52CFATTACH_DECL_NEW(gtmr_fdt, 0, gtmr_fdt_match, gtmr_fdt_attach, NULL, NULL); 52CFATTACH_DECL_NEW(gtmr_fdt, 0, gtmr_fdt_match, gtmr_fdt_attach, NULL, NULL);
53 53
54/* The vritual timer list entry */ 54/* The virtual timer list entry */
55#define GTMR_VTIMER 2 55#define GTMR_VTIMER 2
56 56
57static int 57static int
58gtmr_fdt_match(device_t parent, cfdata_t cf, void *aux) 58gtmr_fdt_match(device_t parent, cfdata_t cf, void *aux)
59{ 59{
60 const char * const compatible[] = { 60 const char * const compatible[] = {
61 "arm,armv7-timer", 61 "arm,armv7-timer",
62 "arm,armv8-timer", 62 "arm,armv8-timer",
63 NULL 63 NULL
64 }; 64 };
65 struct fdt_attach_args * const faa = aux; 65 struct fdt_attach_args * const faa = aux;
66 66
67 return of_compatible(faa->faa_phandle, compatible) >= 0; 67 return of_compatible(faa->faa_phandle, compatible) >= 0;