diff options
| author | Jim Lawson | 2019-09-11 09:09:05 -0700 |
|---|---|---|
| committer | GitHub | 2019-09-11 09:09:05 -0700 |
| commit | 3d65ccee36fd97c26d170f631322ad0c2c9d6dd7 (patch) | |
| tree | 45b40cd34f1e3f8927017608a503d0011bb74b5e /src/main/scala/chisel3/aop/injecting | |
| parent | cafc46863dc2c26c3ee38eb507a5c3d6ff60d4b5 (diff) | |
Move dontTouch, RawModule, and MultiIOModule out of experimental (#1162)
* Move dontTouch out of experimental package.
* Move RawModule, MultiIOModule out of experimental.
* Respond to comments - Move LagacyModule from experimental to internal.
*NOTE*: At some point, these module definitions (especially those in separate packages) should be moved to individual files at the appropriate location in the source tree. The current organization is purely to support comparison with prior versions.
* Fix up a few more imports.
Diffstat (limited to 'src/main/scala/chisel3/aop/injecting')
| -rw-r--r-- | src/main/scala/chisel3/aop/injecting/InjectingAspect.scala | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/scala/chisel3/aop/injecting/InjectingAspect.scala b/src/main/scala/chisel3/aop/injecting/InjectingAspect.scala index 74cd62f3..00a17d86 100644 --- a/src/main/scala/chisel3/aop/injecting/InjectingAspect.scala +++ b/src/main/scala/chisel3/aop/injecting/InjectingAspect.scala @@ -2,9 +2,8 @@ package chisel3.aop.injecting -import chisel3.{Module, ModuleAspect, experimental, withClockAndReset} +import chisel3.{Module, ModuleAspect, experimental, withClockAndReset, RawModule, MultiIOModule} import chisel3.aop._ -import chisel3.experimental.RawModule import chisel3.internal.Builder import chisel3.internal.firrtl.DefModule import chisel3.stage.DesignAnnotation @@ -36,7 +35,7 @@ case class InjectingAspect[T <: RawModule, RunFirrtlTransformAnnotation(new InjectingTransform) +: modules.map { module => val (chiselIR, _) = Builder.build(Module(new ModuleAspect(module) { module match { - case x: experimental.MultiIOModule => withClockAndReset(x.clock, x.reset) { injection(module) } + case x: MultiIOModule => withClockAndReset(x.clock, x.reset) { injection(module) } case x: RawModule => injection(module) } })) |