Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/hpcarm G/C unused over a decade.



details:   https://anonhg.NetBSD.org/src/rev/31e03e5d4a77
branches:  trunk
changeset: 1023902:31e03e5d4a77
user:      rin <rin%NetBSD.org@localhost>
date:      Fri Oct 01 06:08:43 2021 +0000

description:
G/C unused over a decade.

diffstat:

 sys/arch/hpcarm/conf/files.sa11x0 |    4 +-
 sys/arch/hpcarm/hpcarm/intr.c     |  194 --------------------------------------
 sys/arch/hpcarm/hpcarm/spl.S      |  131 -------------------------
 3 files changed, 1 insertions(+), 328 deletions(-)

diffs (truncated from 350 to 300 lines):

diff -r c267e315bf79 -r 31e03e5d4a77 sys/arch/hpcarm/conf/files.sa11x0
--- a/sys/arch/hpcarm/conf/files.sa11x0 Fri Oct 01 06:07:12 2021 +0000
+++ b/sys/arch/hpcarm/conf/files.sa11x0 Fri Oct 01 06:08:43 2021 +0000
@@ -1,12 +1,10 @@
-#      $NetBSD: files.sa11x0,v 1.2 2021/10/01 06:07:12 rin Exp $
+#      $NetBSD: files.sa11x0,v 1.3 2021/10/01 06:08:43 rin Exp $
 #
 # SA-11x0 model specific configuration info
 #
 
 # SA-11x0 specific files.
-#file  arch/hpcarm/hpcarm/intr.c
 file   arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
-#file  arch/hpcarm/hpcarm/spl.S
 file   arch/arm/arm32/intr.c
 file   arch/arm/arm32/spl.S
 
diff -r c267e315bf79 -r 31e03e5d4a77 sys/arch/hpcarm/hpcarm/intr.c
--- a/sys/arch/hpcarm/hpcarm/intr.c     Fri Oct 01 06:07:12 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,194 +0,0 @@
-/*     $NetBSD: intr.c,v 1.19 2012/07/27 05:36:10 matt Exp $   */
-
-/*
- * Copyright (c) 1994-1998 Mark Brinicombe.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by Mark Brinicombe
- *     for the NetBSD Project.
- * 4. The name of the company nor the name of the author may be used to
- *    endorse or promote products derived from this software without specific
- *    prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Soft interrupt and other generic interrupt functions.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.19 2012/07/27 05:36:10 matt Exp $");
-
-#include "opt_irqstats.h"
-#include "opt_cputypes.h"
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/syslog.h>
-#include <sys/malloc.h>
-#include <sys/atomic.h>
-
-#include <machine/intr.h>
-#include <machine/cpu.h>
-
-volatile u_int soft_interrupts = 0;
-
-extern int softintr_dispatch(int);
-
-/* Generate soft interrupt counts if IRQSTATS is defined */
-#ifdef IRQSTATS
-extern u_int sintrcnt[];
-#define INC_SINTRCNT(x) ++sintrcnt[x]
-#else
-#define INC_SINTRCNT(x)
-#endif /* IRQSTATS */
-
-/* Prototypes */
-
-#include "com.h"
-#if NCOM > 0
-extern void comsoft(void);
-#endif /* NCOM > 0 */
-
-#if defined(CPU_SA1100) || defined(CPU_SA1110)
-#include "sacom.h"
-#if NSACOM > 0
-extern void sacomsoft(void);
-#endif /* NSACOM > 0 */
-#endif
-
-/* Eventually these will become macros */
-
-#ifdef __HAVE_FAST_SOFTINTS
-void setsoftintr(u_int);
-void clearsoftintr(u_int);
-void dosoftints(void);
-
-void
-setsoftintr(u_int intrmask)
-{
-       atomic_or_uint(&soft_interrupts, intrmask);
-}
-
-void
-clearsoftintr(u_int intrmask)
-{
-       atomic_and_uint(&soft_interrupts, ~intrmask);
-}
-
-void
-setsoftnet(void)
-{
-       atomic_or_uint(&soft_interrupts, SOFTIRQ_BIT(SOFTIRQ_NET));
-}
-#endif
-
-void    set_spl_masks(void);
-
-u_int spl_masks[_SPL_LEVELS + 1];
-u_int spl_smasks[_SPL_LEVELS];
-
-#ifdef __HAVE_FAST_SOFTINTS
-/* Handle software interrupts */
-
-void
-dosoftints(void)
-{
-       u_int softints;
-       int s;
-
-       softintr_dispatch(curcpu()->ci_cpl);
-}
-#endif
-
-void
-set_spl_masks(void)
-{
-       int loop;
-
-       for (loop = 0; loop < _SPL_LEVELS; ++loop)
-               spl_smasks[loop] = 0;
-
-       for (loop = 0; loop <= _SPL_SOFTCLOCK; loop++)
-               spl_masks[loop]    = imask[IPL_SOFTCLOCK];
-
-       spl_masks[_SPL_SOFTBIO]    = imask[IPL_SOFTBIO];
-       spl_masks[_SPL_SOFTNET]    = imask[IPL_SOFTNET];
-       spl_masks[_SPL_SOFTSERIAL] = imask[IPL_SOFTSERIAL];
-       spl_masks[_SPL_VM]         = imask[IPL_VM];
-       spl_masks[_SPL_SCHED]      = imask[IPL_SCHED];
-       spl_masks[_SPL_HIGH]       = imask[IPL_HIGH];
-       spl_masks[_SPL_LEVELS]     = 0;
-
-       spl_smasks[_SPL_0] = 0xffffffff;
-       for (loop = 0; loop < _SPL_SOFTSERIAL; ++loop)
-               spl_smasks[loop] |= SOFTIRQ_BIT(SOFTIRQ_SERIAL);
-       for (loop = 0; loop < _SPL_SOFTNET; ++loop)
-               spl_smasks[loop] |= SOFTIRQ_BIT(SOFTIRQ_NET);
-       for (loop = 0; loop < _SPL_SOFTBIO; ++loop)
-               spl_smasks[loop] |= SOFTIRQ_BIT(SOFTIRQ_BIO);
-       for (loop = 0; loop < _SPL_SOFTCLOCK; ++loop)
-               spl_smasks[loop] |= SOFTIRQ_BIT(SOFTIRQ_CLOCK);
-}
-
-int
-ipl_to_spl(ipl_t ipl)
-{
-
-       switch (ipl) {
-       case IPL_NONE:
-               return _SPL_0;
-       case IPL_SOFTCLOCK:
-               return _SPL_SOFTCLOCK;
-       case IPL_SOFTNET:
-               return _SPL_SOFTNET;
-       case IPL_SOFTBIO:
-               return _SPL_SOFTBIO;
-       case IPL_SOFTSERIAL:
-               return _SPL_SOFTSERIAL;
-       case IPL_VM:
-               return _SPL_VM;
-       case IPL_SCHED:
-               return _SPL_SCHED;
-       case IPL_HIGH:
-               return _SPL_HIGH;
-       default:
-               panic("bogus ipl %d", ipl);
-       }
-}
-
-#ifdef DIAGNOSTIC
-void   dump_spl_masks(void);
-
-void
-dump_spl_masks(void)
-{
-       int loop;
-
-       for (loop = 0; loop < _SPL_LEVELS; ++loop) {
-               printf("spl_masks[%d]=%08x spl_smasks[%d]=%08x\n", loop,
-                   spl_masks[loop], loop, spl_smasks[loop]);
-       }
-}
-#endif
-
-/* End of intr.c */
diff -r c267e315bf79 -r 31e03e5d4a77 sys/arch/hpcarm/hpcarm/spl.S
--- a/sys/arch/hpcarm/hpcarm/spl.S      Fri Oct 01 06:07:12 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-/*     $NetBSD: spl.S,v 1.7 2013/12/02 18:36:11 joerg Exp $    */
-
-/*
- * Copyright (c) 1996-1998 Mark Brinicombe.
- * Copyright (c) Brini.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by Mark Brinicombe
- *     for the NetBSD Project.
- * 4. The name of the company nor the name of the author may be used to
- *    endorse or promote products derived from this software without specific
- *    prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * spl routines
- *
- * Created      : 01/03/96
- */
-
-#include "assym.h"
-#include <arm/arm32/psl.h>
-#include <machine/asm.h>
-#include <machine/cpu.h>
-
-       .text
-       .align  0
-
-Lcurrent_spl_level:
-       .word   _C_LABEL(current_spl_level)
-
-ENTRY(raisespl)
-       stmfd   sp!, {r4}
-       /* Disable interrupts */
-       mrs     r4, cpsr
-       orr     r1, r4,  #(I32_bit)
-       msr     cpsr_all, r1
-
-       mov     r3, r0                  /* Save the new value */
-       ldr     r1, Lcurrent_spl_level  /* Get the current spl level */
-       ldr     r0, [r1]
-       cmp     r3, r0
-       ble     raisespl_exit
-
-       str     r3, [r1]                /* Store the new spl level */
-
-       stmfd   sp!, {r0, lr}           /* Preserve registers */
-       bl      _C_LABEL(irq_setmasks)  /* Update the actual masks */
-       ldmfd   sp!, {r0, lr}
-raisespl_exit:
-       msr     cpsr_all, r4
-       ldmfd   sp!, {r4}
-       mov     pc, lr
-
-ENTRY(lowerspl)
-       stmfd   sp!, {r4}
-       /* Disable interrupts */
-       mrs     r4, cpsr
-       orr     r1, r4,  #(I32_bit)
-       msr     cpsr_all, r1
-



Home | Main Index | Thread Index | Old Index