Deleted Added
full compact
machdep.c (12533) machdep.c (12623)
1/*-
2 * Copyright (c) 1992 Terrence R. Lambert.
3 * Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
4 * All rights reserved.
5 *
6 * This code is derived from software contributed to Berkeley by
7 * William Jolitz.
8 *

--- 21 unchanged lines hidden (view full) ---

30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 *
37 * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
1/*-
2 * Copyright (c) 1992 Terrence R. Lambert.
3 * Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
4 * All rights reserved.
5 *
6 * This code is derived from software contributed to Berkeley by
7 * William Jolitz.
8 *

--- 21 unchanged lines hidden (view full) ---

30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 *
37 * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
38 * $Id: machdep.c,v 1.152 1995/11/20 12:41:24 phk Exp $
38 * $Id: machdep.c,v 1.153 1995/11/29 19:57:01 wollman Exp $
39 */
40
41#include "npx.h"
42#include "isa.h"
43
44#include <sys/param.h>
45#include <sys/systm.h>
46#include <sys/sysproto.h>

--- 90 unchanged lines hidden (view full) ---

137extern int ptrace_write_u __P((struct proc *p, vm_offset_t off, int data));
138
139static void cpu_startup __P((void *));
140SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL)
141
142static void identifycpu(void);
143
144char machine[] = "i386";
39 */
40
41#include "npx.h"
42#include "isa.h"
43
44#include <sys/param.h>
45#include <sys/systm.h>
46#include <sys/sysproto.h>

--- 90 unchanged lines hidden (view full) ---

137extern int ptrace_write_u __P((struct proc *p, vm_offset_t off, int data));
138
139static void cpu_startup __P((void *));
140SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL)
141
142static void identifycpu(void);
143
144char machine[] = "i386";
145SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, "");
146
145char cpu_model[128];
147char cpu_model[128];
148SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, cpu_model, 0, "");
146
147struct kern_devconf kdc_cpu0 = {
148 0, 0, 0, /* filled in by dev_attach */
149 "cpu", 0, { MDDT_CPU },
150 0, 0, 0, CPU_EXTERNALLEN,
151 0, /* CPU has no parent */
152 0, /* no parentdata */
153 DC_BUSY, /* the CPU is always busy */

--- 15 unchanged lines hidden (view full) ---

169#endif
170#endif /* BOUNCE_BUFFERS */
171
172extern int freebufspace;
173int msgbufmapped = 0; /* set when safe to use msgbuf */
174int _udatasel, _ucodesel;
175
176
149
150struct kern_devconf kdc_cpu0 = {
151 0, 0, 0, /* filled in by dev_attach */
152 "cpu", 0, { MDDT_CPU },
153 0, 0, 0, CPU_EXTERNALLEN,
154 0, /* CPU has no parent */
155 0, /* no parentdata */
156 DC_BUSY, /* the CPU is always busy */

--- 15 unchanged lines hidden (view full) ---

172#endif
173#endif /* BOUNCE_BUFFERS */
174
175extern int freebufspace;
176int msgbufmapped = 0; /* set when safe to use msgbuf */
177int _udatasel, _ucodesel;
178
179
177/*
178 * Machine-dependent startup code
179 */
180int boothowto = 0, bootverbose = 0, Maxmem = 0, badpages = 0, physmem = 0;
180int physmem = 0;
181
182static int
183sysctl_hw_physmem SYSCTL_HANDLER_ARGS
184{
185 int error = sysctl_handle_int(oidp, 0, ctob(physmem), req);
186 return (error);
187}
188
189SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_INT|CTLFLAG_RD,
190 0, 0, sysctl_hw_physmem, "I", "");
191
192static int
193sysctl_hw_usermem SYSCTL_HANDLER_ARGS
194{
195 int error = sysctl_handle_int(oidp, 0,
196 ctob(physmem - cnt.v_wire_count), req);
197 return (error);
198}
199
200SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_INT|CTLFLAG_RD,
201 0, 0, sysctl_hw_usermem, "I", "");
202
203int boothowto = 0, bootverbose = 0, Maxmem = 0, badpages = 0;
181long dumplo;
182extern int bootdev;
183int biosmem;
184
185vm_offset_t phys_avail[10];
186
187/* must be 2 less so 0 0 can signal end of chunks */
188#define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(vm_offset_t)) - 2)

--- 843 unchanged lines hidden (view full) ---

1032 int error;
1033 error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2,
1034 req);
1035 if (!error && req->newptr)
1036 resettodr();
1037 return (error);
1038}
1039
204long dumplo;
205extern int bootdev;
206int biosmem;
207
208vm_offset_t phys_avail[10];
209
210/* must be 2 less so 0 0 can signal end of chunks */
211#define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(vm_offset_t)) - 2)

--- 843 unchanged lines hidden (view full) ---

1055 int error;
1056 error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2,
1057 req);
1058 if (!error && req->newptr)
1059 resettodr();
1060 return (error);
1061}
1062
1040SYSCTL_PROC(_machdep, CPU_ADJKERNTZ, adjkerntz,
1041 CTLTYPE_INT|CTLFLAG_RW, &adjkerntz, 0, sysctl_machdep_adjkerntz, "");
1063SYSCTL_PROC(_machdep, CPU_ADJKERNTZ, adjkerntz, CTLTYPE_INT|CTLFLAG_RW,
1064 &adjkerntz, 0, sysctl_machdep_adjkerntz, "I", "");
1042
1043static int
1044sysctl_machdep_consdev SYSCTL_HANDLER_ARGS
1045{
1046 dev_t consdev;
1047 consdev = (cn_tty == NULL ? NODEV : cn_tty->t_dev);
1048 return (sysctl_handle_opaque(oidp, &consdev, sizeof consdev, req));
1049}
1050
1065
1066static int
1067sysctl_machdep_consdev SYSCTL_HANDLER_ARGS
1068{
1069 dev_t consdev;
1070 consdev = (cn_tty == NULL ? NODEV : cn_tty->t_dev);
1071 return (sysctl_handle_opaque(oidp, &consdev, sizeof consdev, req));
1072}
1073
1051SYSCTL_PROC(_machdep, CPU_CONSDEV, consdev,
1052 CTLTYPE_OPAQUE|CTLFLAG_RD, 0, 0, sysctl_machdep_consdev, "");
1074SYSCTL_PROC(_machdep, CPU_CONSDEV, consdev, CTLTYPE_OPAQUE|CTLFLAG_RD,
1075 0, 0, sysctl_machdep_consdev, "T,dev_t", "");
1053
1054SYSCTL_INT(_machdep, CPU_DISRTCSET, disable_rtc_set,
1055 CTLFLAG_RW, &disable_rtc_set, 0, "");
1056
1057SYSCTL_STRUCT(_machdep, CPU_BOOTINFO, bootinfo,
1058 CTLFLAG_RD, &bootinfo, bootinfo, "");
1059
1060/*

--- 761 unchanged lines hidden ---
1076
1077SYSCTL_INT(_machdep, CPU_DISRTCSET, disable_rtc_set,
1078 CTLFLAG_RW, &disable_rtc_set, 0, "");
1079
1080SYSCTL_STRUCT(_machdep, CPU_BOOTINFO, bootinfo,
1081 CTLFLAG_RD, &bootinfo, bootinfo, "");
1082
1083/*

--- 761 unchanged lines hidden ---