From 40333cf8fd0af22cd656265622dd798385e95f50 Mon Sep 17 00:00:00 2001 From: bjh21 Date: Sat, 3 Mar 2001 21:34:00 +0000 Subject: [PATCH] Kill cpu_host and cpu_flags: they weren't having any practical effect. --- sys/arch/arm/include/cpus.h | 10 +--------- sys/arch/arm/mainbus/cpu.c | 13 +------------ 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/sys/arch/arm/include/cpus.h b/sys/arch/arm/include/cpus.h index d43bc2ed75bd..7bb1ba367352 100644 --- a/sys/arch/arm/include/cpus.h +++ b/sys/arch/arm/include/cpus.h @@ -1,4 +1,4 @@ -/* $NetBSD: cpus.h,v 1.4 2001/02/26 16:04:22 bjh21 Exp $ */ +/* $NetBSD: cpus.h,v 1.5 2001/03/03 21:34:00 bjh21 Exp $ */ /* * Copyright (c) 1995 Mark Brinicombe. @@ -54,12 +54,6 @@ #define CPU_CLASS_SARM 2 /* Guess */ #define CPU_CLASS_I486 3 /* 486/586 */ -#define CPU_HOST_NONE 0 /* No host */ -#define CPU_HOST_MAINBUS 1 /* Hosted via motherboard */ - -#define CPU_FLAG_PRESENT 0x01 -#define CPU_FLAG_HALTED 0x02 - #define FPU_CLASS_NONE 0 /* no Floating point support */ #define FPU_CLASS_FPE 1 /* Floating point emulator installed */ #define FPU_CLASS_FPA 2 /* Floating point accelerator installed */ @@ -77,8 +71,6 @@ typedef struct _cpu { /* These are generic CPU variables */ u_int cpu_class; /* The CPU class */ - u_int cpu_host; /* The CPU host interface */ - u_int cpu_flags; /* The CPU flags */ char cpu_model[256]; /* Text description of CPU */ /* These are generic FPU variables */ diff --git a/sys/arch/arm/mainbus/cpu.c b/sys/arch/arm/mainbus/cpu.c index 115b15281a2e..c5a34acfe673 100644 --- a/sys/arch/arm/mainbus/cpu.c +++ b/sys/arch/arm/mainbus/cpu.c @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.10 2001/03/03 18:04:34 bjh21 Exp $ */ +/* $NetBSD: cpu.c,v 1.11 2001/03/03 21:34:01 bjh21 Exp $ */ /* * Copyright (c) 1995 Mark Brinicombe. @@ -175,8 +175,6 @@ identify_master_cpu(cpu_number, dev_name) u_int fpsr; cpus[cpu_number].cpu_class = CPU_CLASS_ARM; - cpus[cpu_number].cpu_host = CPU_HOST_MAINBUS; - cpus[cpu_number].cpu_flags = CPU_FLAG_PRESENT; cpus[cpu_number].cpu_ctrl = cpuctrl; /* Get the cpu ID from coprocessor 15 */ @@ -330,10 +328,6 @@ identify_arm_cpu(cpu_number) int i; cpu = &cpus[cpu_number]; - if (cpu->cpu_host == CPU_HOST_NONE || cpu->cpu_class == CPU_CLASS_NONE) { - printf("No installed processor\n"); - return; - } if (cpu->cpu_class != CPU_CLASS_ARM && cpu->cpu_class != CPU_CLASS_SARM) { printf("identify_arm_cpu: Can only identify ARM CPU's\n"); return; @@ -409,11 +403,6 @@ identify_arm_fpu(cpu_number) cpu_t *cpu; cpu = &cpus[cpu_number]; - if (cpu->cpu_host == CPU_HOST_NONE || cpu->cpu_class == CPU_CLASS_NONE) { - printf("No installed processor\n"); - return; - } - if (cpu->cpu_class != CPU_CLASS_ARM && cpu->cpu_class != CPU_CLASS_SARM) { printf("identify_arm_cpu: Can only identify ARM hosted FPUs\n"); return;