diff options
| author | adrian <adrian@FreeBSD.org> | 2015-12-18 05:43:59 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2015-12-18 05:43:59 +0000 |
| commit | a3e51ff0e646d14f512a03172ad4923209f6fff3 (patch) | |
| tree | cbf62a2eadf5b1324e3309f67b9d2eaa7e022893 /sys/conf | |
| parent | 59c25660ce939819d2aaba073b0bdb0173a302af (diff) | |
| download | FreeBSD-src-a3e51ff0e646d14f512a03172ad4923209f6fff3.zip FreeBSD-src-a3e51ff0e646d14f512a03172ad4923209f6fff3.tar.gz | |
[intrng] Migrate the intrng code from sys/arm/arm to sys/kern/subr_intr.c.
The ci20 port (by kan@) is going to reuse almost all of the intrng code
since the SoC in question looks suspiciously like someone took an ARM
SoC design and replaced the ARM core with a MIPS core.
* migrate out the code;
* rename ARM_ -> INTR_;
* rename arm_ -> intr_;
* move the interrupt flush routine from intr.c / intrng.c into
arm/machdep_intr.c - removing the code duplication and removing
the ARM specific bits from here.
Thanks to the Star Wars: The Force Awakens premiere line for allowing
me a couple hours of quiet time to finish the universe builds.
Tested:
* make universe
TODO:
* The structure definitions in subr_intr.c still includes machine/intr.h
which requires one duplicates all of the intrng definitions in
the platform code (which kan has done, and I think we don't have to.)
Instead I should break out the generic things (function declarations,
common intr structures, etc) into a separate header.
* Kan has requested I make the PIC based IPI stuff optional.
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files.arm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/conf/files.arm b/sys/conf/files.arm index 1c57106..292fd54 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -46,16 +46,17 @@ arm/arm/identcpu.c standard arm/arm/in_cksum.c optional inet | inet6 arm/arm/in_cksum_arm.S optional inet | inet6 arm/arm/intr.c optional !arm_intrng -arm/arm/intrng.c optional arm_intrng +kern/subr_intr.c optional arm_intrng arm/arm/locore.S standard no-obj arm/arm/machdep.c standard +arm/arm/machdep_intr.c standard arm/arm/mem.c optional mem arm/arm/minidump_machdep.c optional mem arm/arm/mp_machdep.c optional smp arm/arm/mpcore_timer.c optional mpcore_timer arm/arm/nexus.c standard arm/arm/physmem.c standard -arm/arm/pic_if.m optional arm_intrng +kern/pic_if.m optional arm_intrng arm/arm/pl190.c optional pl190 arm/arm/pl310.c optional pl310 arm/arm/platform.c optional platform |
