Tue Jan 28 07:47:26 2020 UTC ()
Traiing whitespace


(skrll)
diff -r1.16 -r1.17 src/sys/arch/arm/mainbus/cpu_mainbus.c
cvs diff -r1.16 -r1.17 src/sys/arch/arm/mainbus/cpu_mainbus.c (expand / switch to unified diff)

--- src/sys/arch/arm/mainbus/cpu_mainbus.c 2014/10/29 14:14:14 1.16
+++ src/sys/arch/arm/mainbus/cpu_mainbus.c 2020/01/28 07:47:26 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: cpu_mainbus.c,v 1.16 2014/10/29 14:14:14 skrll Exp $ */ 1/* $NetBSD: cpu_mainbus.c,v 1.17 2020/01/28 07:47:26 skrll Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1995 Mark Brinicombe. 4 * Copyright (c) 1995 Mark Brinicombe.
5 * Copyright (c) 1995 Brini. 5 * Copyright (c) 1995 Brini.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
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
@@ -35,54 +35,54 @@ @@ -35,54 +35,54 @@
35 * RiscBSD kernel project 35 * RiscBSD kernel project
36 * 36 *
37 * cpu.c 37 * cpu.c
38 * 38 *
39 * Probing and configuration for the master cpu 39 * Probing and configuration for the master cpu
40 * 40 *
41 * Created : 10/10/95 41 * Created : 10/10/95
42 */ 42 */
43 43
44#include "locators.h" 44#include "locators.h"
45#include "opt_multiprocessor.h" 45#include "opt_multiprocessor.h"
46 46
47#include <sys/cdefs.h> 47#include <sys/cdefs.h>
48__KERNEL_RCSID(0, "$NetBSD: cpu_mainbus.c,v 1.16 2014/10/29 14:14:14 skrll Exp $"); 48__KERNEL_RCSID(0, "$NetBSD: cpu_mainbus.c,v 1.17 2020/01/28 07:47:26 skrll Exp $");
49 49
50#include <sys/param.h> 50#include <sys/param.h>
51#include <sys/systm.h> 51#include <sys/systm.h>
52#include <sys/cpu.h> 52#include <sys/cpu.h>
53#include <sys/device.h> 53#include <sys/device.h>
54#include <sys/proc.h> 54#include <sys/proc.h>
55 55
56#include <arm/mainbus/mainbus.h> 56#include <arm/mainbus/mainbus.h>
57 57
58/* 58/*
59 * Prototypes 59 * Prototypes
60 */ 60 */
61static int cpu_mainbus_match(device_t, cfdata_t, void *); 61static int cpu_mainbus_match(device_t, cfdata_t, void *);
62static void cpu_mainbus_attach(device_t, device_t, void *); 62static void cpu_mainbus_attach(device_t, device_t, void *);
63  63
64/* 64/*
65 * int cpumatch(device_t parent, cfdata_t cf, void *aux) 65 * int cpumatch(device_t parent, cfdata_t cf, void *aux)
66 * 66 *
67 * Probe for the main cpu. Currently all this does is return 1 to 67 * Probe for the main cpu. Currently all this does is return 1 to
68 * indicate that the cpu was found. 68 * indicate that the cpu was found.
69 */  69 */
70#ifdef MULTIPROCESSOR 70#ifdef MULTIPROCESSOR
71extern u_int arm_cpu_max; 71extern u_int arm_cpu_max;
72#else 72#else
73#define arm_cpu_max 1 73#define arm_cpu_max 1
74#endif 74#endif
75  75
76static int 76static int
77cpu_mainbus_match(device_t parent, cfdata_t cf, void *aux) 77cpu_mainbus_match(device_t parent, cfdata_t cf, void *aux)
78{ 78{
79 struct mainbus_attach_args * const mb = aux; 79 struct mainbus_attach_args * const mb = aux;
80 int id = mb->mb_core; 80 int id = mb->mb_core;
81 81
82 if (id != MAINBUSCF_CORE_DEFAULT) { 82 if (id != MAINBUSCF_CORE_DEFAULT) {
83 if (id == 0) 83 if (id == 0)
84 return cpu_info_store.ci_dev == NULL; 84 return cpu_info_store.ci_dev == NULL;
85 if (id >= arm_cpu_max) 85 if (id >= arm_cpu_max)
86 return 0; 86 return 0;
87#ifdef MULTIPROCESSOR 87#ifdef MULTIPROCESSOR
88 if (cpu_info[id] != NULL) 88 if (cpu_info[id] != NULL)
@@ -103,24 +103,24 @@ cpu_mainbus_match(device_t parent, cfdat @@ -103,24 +103,24 @@ cpu_mainbus_match(device_t parent, cfdat
103 mb->mb_core = id; 103 mb->mb_core = id;
104 return 1; 104 return 1;
105 } 105 }
106#endif 106#endif
107 107
108 return 0; 108 return 0;
109} 109}
110 110
111/* 111/*
112 * void cpusattach(device_t parent, device_t dev, void *aux) 112 * void cpusattach(device_t parent, device_t dev, void *aux)
113 * 113 *
114 * Attach the main cpu 114 * Attach the main cpu
115 */ 115 */
116  116
117static void 117static void
118cpu_mainbus_attach(device_t parent, device_t self, void *aux) 118cpu_mainbus_attach(device_t parent, device_t self, void *aux)
119{ 119{
120 struct mainbus_attach_args * const mb = aux; 120 struct mainbus_attach_args * const mb = aux;
121 121
122 cpu_attach(self, mb->mb_core); 122 cpu_attach(self, mb->mb_core);
123} 123}
124 124
125CFATTACH_DECL_NEW(cpu_mainbus, 0, 125CFATTACH_DECL_NEW(cpu_mainbus, 0,
126 cpu_mainbus_match, cpu_mainbus_attach, NULL, NULL); 126 cpu_mainbus_match, cpu_mainbus_attach, NULL, NULL);