Deleted Added
sdiff udiff text old ( 261781 ) new ( 263008 )
full compact
cpu_machdep.c (261781) cpu_machdep.c (263008)
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 *

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

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 */
39
40#include <sys/cdefs.h>
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 *

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

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 */
39
40#include <sys/cdefs.h>
41__FBSDID("$FreeBSD: head/sys/i386/i386/machdep.c 261781 2014-02-11 22:02:40Z jhb $");
41__FBSDID("$FreeBSD: head/sys/i386/i386/machdep.c 263008 2014-03-11 10:20:42Z royger $");
42
43#include "opt_apic.h"
44#include "opt_atalk.h"
45#include "opt_atpic.h"
46#include "opt_compat.h"
47#include "opt_cpu.h"
48#include "opt_ddb.h"
49#include "opt_inet.h"

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

127#include <machine/pc/bios.h>
128#include <machine/pcb.h>
129#include <machine/pcb_ext.h>
130#include <machine/proc.h>
131#include <machine/reg.h>
132#include <machine/sigframe.h>
133#include <machine/specialreg.h>
134#include <machine/vm86.h>
42
43#include "opt_apic.h"
44#include "opt_atalk.h"
45#include "opt_atpic.h"
46#include "opt_compat.h"
47#include "opt_cpu.h"
48#include "opt_ddb.h"
49#include "opt_inet.h"

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

127#include <machine/pc/bios.h>
128#include <machine/pcb.h>
129#include <machine/pcb_ext.h>
130#include <machine/proc.h>
131#include <machine/reg.h>
132#include <machine/sigframe.h>
133#include <machine/specialreg.h>
134#include <machine/vm86.h>
135#include <x86/init.h>
135#ifdef PERFMON
136#include <machine/perfmon.h>
137#endif
138#ifdef SMP
139#include <machine/smp.h>
140#endif
141#ifdef FDT
142#include <x86/fdt.h>

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

248
249static struct trapframe proc0_tf;
250struct pcpu __pcpu[MAXCPU];
251
252struct mtx icu_lock;
253
254struct mem_range_softc mem_range_softc;
255
136#ifdef PERFMON
137#include <machine/perfmon.h>
138#endif
139#ifdef SMP
140#include <machine/smp.h>
141#endif
142#ifdef FDT
143#include <x86/fdt.h>

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

249
250static struct trapframe proc0_tf;
251struct pcpu __pcpu[MAXCPU];
252
253struct mtx icu_lock;
254
255struct mem_range_softc mem_range_softc;
256
257 /* Default init_ops implementation. */
258 struct init_ops init_ops = {
259 .early_clock_source_init = i8254_init,
260 .early_delay = i8254_delay,
261 };
262
256static void
257cpu_startup(dummy)
258 void *dummy;
259{
260 uintmax_t memsize;
261 char *sysenv;
262
263 /*

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

2972 * so we just query it.
2973 */
2974 outl(0xcf8, 0x80000084);
2975 arch_i386_xbox_memsize = (inl(0xcfc) == 0x7FFFFFF) ? 128 : 64;
2976 }
2977#endif /* XBOX */
2978
2979 /*
263static void
264cpu_startup(dummy)
265 void *dummy;
266{
267 uintmax_t memsize;
268 char *sysenv;
269
270 /*

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

2979 * so we just query it.
2980 */
2981 outl(0xcf8, 0x80000084);
2982 arch_i386_xbox_memsize = (inl(0xcfc) == 0x7FFFFFF) ? 128 : 64;
2983 }
2984#endif /* XBOX */
2985
2986 /*
2980 * Initialize the i8254 before the console so that console
2987 * Initialize the clock before the console so that console
2981 * initialization can use DELAY().
2982 */
2988 * initialization can use DELAY().
2989 */
2983 i8254_init();
2990 clock_init();
2984
2985 /*
2986 * Initialize the console before we print anything out.
2987 */
2988 cninit();
2989
2990 if (metadata_missing)
2991 printf("WARNING: loader(8) metadata is missing!\n");

--- 740 unchanged lines hidden --- 		2991
2992 /*
2993 * Initialize the console before we print anything out.
2994 */
2995 cninit();
2996
2997 if (metadata_missing)
2998 printf("WARNING: loader(8) metadata is missing!\n");

--- 740 unchanged lines hidden ---