Fri May 29 08:37:34 2009 UTC ()
KNF


(skrll)
diff -r1.66 -r1.67 src/sys/arch/hp700/hp700/machdep.c
cvs diff -r1.66 -r1.67 src/sys/arch/hp700/hp700/Attic/machdep.c (expand / switch to unified diff)

--- src/sys/arch/hp700/hp700/Attic/machdep.c 2009/05/18 05:20:46 1.66
+++ src/sys/arch/hp700/hp700/Attic/machdep.c 2009/05/29 08:37:34 1.67
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: machdep.c,v 1.66 2009/05/18 05:20:46 skrll Exp $ */ 1/* $NetBSD: machdep.c,v 1.67 2009/05/29 08:37:34 skrll Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. 4 * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Matthew Fredette. 8 * by Matthew Fredette.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -48,27 +48,27 @@ @@ -48,27 +48,27 @@
48 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 48 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 49 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
50 * IN NO EVENT SHALL THE AUTHOR OR HIS RELATIVES BE LIABLE FOR ANY DIRECT, 50 * IN NO EVENT SHALL THE AUTHOR OR HIS RELATIVES BE LIABLE FOR ANY DIRECT,
51 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 51 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
52 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 52 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
53 * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 53 * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
54 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 54 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
55 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 55 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
56 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 56 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
57 * THE POSSIBILITY OF SUCH DAMAGE. 57 * THE POSSIBILITY OF SUCH DAMAGE.
58 */ 58 */
59 59
60#include <sys/cdefs.h> 60#include <sys/cdefs.h>
61__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.66 2009/05/18 05:20:46 skrll Exp $"); 61__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.67 2009/05/29 08:37:34 skrll Exp $");
62 62
63#include "opt_cputype.h" 63#include "opt_cputype.h"
64#include "opt_ddb.h" 64#include "opt_ddb.h"
65#include "opt_kgdb.h" 65#include "opt_kgdb.h"
66#include "opt_modular.h" 66#include "opt_modular.h"
67#include "opt_useleds.h" 67#include "opt_useleds.h"
68 68
69#include <sys/param.h> 69#include <sys/param.h>
70#include <sys/systm.h> 70#include <sys/systm.h>
71#include <sys/signalvar.h> 71#include <sys/signalvar.h>
72#include <sys/kernel.h> 72#include <sys/kernel.h>
73#include <sys/proc.h> 73#include <sys/proc.h>
74#include <sys/buf.h> 74#include <sys/buf.h>
@@ -782,29 +782,28 @@ cpuid(void) @@ -782,29 +782,28 @@ cpuid(void)
782 */ 782 */
783 if (pmap_hptsize && p->hci_cputype != hpcxl && p->hci_cputype != hpcxl2) 783 if (pmap_hptsize && p->hci_cputype != hpcxl && p->hci_cputype != hpcxl2)
784 pmap_hptsize = 0; 784 pmap_hptsize = 0;
785 785
786 cpu_type = hppa_cpu_info->hci_cputype; 786 cpu_type = hppa_cpu_info->hci_cputype;
787 cpu_ibtlb_ins = hppa_cpu_info->ibtlbins; 787 cpu_ibtlb_ins = hppa_cpu_info->ibtlbins;
788 cpu_dbtlb_ins = hppa_cpu_info->dbtlbins; 788 cpu_dbtlb_ins = hppa_cpu_info->dbtlbins;
789 cpu_hpt_init = hppa_cpu_info->hptinit; 789 cpu_hpt_init = hppa_cpu_info->hptinit;
790 cpu_desidhash = hppa_cpu_info->desidhash; 790 cpu_desidhash = hppa_cpu_info->desidhash;
791 791
792 cpu_revision = (*cpu_desidhash)(); 792 cpu_revision = (*cpu_desidhash)();
793 793
794 /* force strong ordering for now */ 794 /* force strong ordering for now */
795 if (hppa_cpu_info->hci_features & HPPA_FTRS_W32B) { 795 if (hppa_cpu_info->hci_features & HPPA_FTRS_W32B)
796 kpsw |= PSW_O; 796 kpsw |= PSW_O;
797 } 
798 797
799 snprintf(cpu_model, sizeof(cpu_model), "HP9000/%s", model); 798 snprintf(cpu_model, sizeof(cpu_model), "HP9000/%s", model);
800 799
801#define LDILDO(t,f) ((t)[0] = (f)[0], (t)[1] = (f)[1]); 800#define LDILDO(t,f) ((t)[0] = (f)[0], (t)[1] = (f)[1]);
802 LDILDO(trap_ep_T_TLB_DIRTY , hppa_cpu_info->tlbdh); 801 LDILDO(trap_ep_T_TLB_DIRTY , hppa_cpu_info->tlbdh);
803 LDILDO(trap_ep_T_DTLBMISS , hppa_cpu_info->dtlbh); 802 LDILDO(trap_ep_T_DTLBMISS , hppa_cpu_info->dtlbh);
804 LDILDO(trap_ep_T_DTLBMISSNA, hppa_cpu_info->dtlbnah); 803 LDILDO(trap_ep_T_DTLBMISSNA, hppa_cpu_info->dtlbnah);
805 LDILDO(trap_ep_T_ITLBMISS , hppa_cpu_info->itlbh); 804 LDILDO(trap_ep_T_ITLBMISS , hppa_cpu_info->itlbh);
806 LDILDO(trap_ep_T_ITLBMISSNA, hppa_cpu_info->itlbnah); 805 LDILDO(trap_ep_T_ITLBMISSNA, hppa_cpu_info->itlbnah);
807#undef LDILDO 806#undef LDILDO
808 807
809 /* Bootstrap any FPU. */ 808 /* Bootstrap any FPU. */
810 hppa_fpu_bootstrap(pdc_coproc.ccr_enable); 809 hppa_fpu_bootstrap(pdc_coproc.ccr_enable);