From 4c512593fb5688f3de502ba1ed70681a0802b6c9 Mon Sep 17 00:00:00 2001
From: edwardcwang
Date: Tue, 19 Feb 2019 16:14:39 -0800
Subject: Mainline Chisel multi-clock functionality (#1013)

Close #1009---
 src/main/scala/chisel3/package.scala | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/main')

diff --git a/src/main/scala/chisel3/package.scala b/src/main/scala/chisel3/package.scala
index 3fa461ad..6c1ab588 100644
--- a/src/main/scala/chisel3/package.scala
+++ b/src/main/scala/chisel3/package.scala
@@ -47,6 +47,11 @@ package object chisel3 {    // scalastyle:ignore package.object.name
   val Clock = chisel3.core.Clock
   type Clock = chisel3.core.Clock
 
+  // Clock and reset scoping functions
+  val withClockAndReset = chisel3.core.withClockAndReset
+  val withClock = chisel3.core.withClock
+  val withReset = chisel3.core.withReset
+
   implicit class AddDirectionToData[T<:Data](target: T) {
     @chiselRuntimeDeprecated
     @deprecated("Input(Data) should be used over Data.asInput", "chisel3")
@@ -424,8 +429,11 @@ package object chisel3 {    // scalastyle:ignore package.object.name
     type ChiselEnum = chisel3.core.EnumFactory
     val EnumAnnotations = chisel3.core.EnumAnnotations
 
+    @deprecated("Use the version in chisel3._", "chisel3.2")
     val withClockAndReset = chisel3.core.withClockAndReset
+    @deprecated("Use the version in chisel3._", "chisel3.2")
     val withClock = chisel3.core.withClock
+    @deprecated("Use the version in chisel3._", "chisel3.2")
     val withReset = chisel3.core.withReset
 
     val dontTouch = chisel3.core.dontTouch
-- 
cgit v1.2.3