get rid of BaseIn/BaseOut.

kivikakk · May 21, 2024 · c573661 · c573661
1 parent 1fcb792
commit c573661
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 20 deletions.
diff --git a/src/main/scala/ee/hrzn/chryse/platform/resource/Base.scala b/src/main/scala/ee/hrzn/chryse/platform/resource/Base.scala
@@ -9,7 +9,7 @@ abstract class Base[HW <: Data](gen: => HW) {
   final private[chryse] var pinId: Option[Pin]   = None
   final private[chryse] var name: Option[String] = None
 
-  // Should return Chisel datatype.
+  // Should return Chisel datatype with Input/Output attached.
   private[chryse] def makeIo(): HW = gen
 
   final private[chryse] var ioInst: Option[InstSides[HW]] = None
@@ -52,4 +52,7 @@ abstract class Base[HW <: Data](gen: => HW) {
 
 case class InstSides[HW](user: HW, top: HW)
 
+// Note that the DataView doesn't really need or care about the generated data's
+// direction or lack thereof, so this is sufficient for all Base[Bool]
+// subclasses.
 object BaseBool extends Base[Bool](Bool()) {}
diff --git a/src/main/scala/ee/hrzn/chryse/platform/resource/BaseIn.scala b/src/main/scala/ee/hrzn/chryse/platform/resource/BaseIn.scala
diff --git a/src/main/scala/ee/hrzn/chryse/platform/resource/BaseOut.scala b/src/main/scala/ee/hrzn/chryse/platform/resource/BaseOut.scala
diff --git a/src/main/scala/ee/hrzn/chryse/platform/resource/Button.scala b/src/main/scala/ee/hrzn/chryse/platform/resource/Button.scala
@@ -2,7 +2,7 @@ package ee.hrzn.chryse.platform.resource
 
 import chisel3._
 
-class Button extends BaseIn[Bool](Bool()) {
+class Button extends Base[Bool](Input(Bool())) {
   private var invert = false // TODO: possibly belongs in a higher class
 
   def inverted: this.type = {

diff --git a/src/main/scala/ee/hrzn/chryse/platform/resource/ClockSource.scala b/src/main/scala/ee/hrzn/chryse/platform/resource/ClockSource.scala
@@ -2,7 +2,7 @@ package ee.hrzn.chryse.platform.resource
 
 import chisel3._
 
-case class ClockSource(hz: Int) extends BaseIn[Clock](Clock()) {}
+case class ClockSource(hz: Int) extends Base[Clock](Input(Clock())) {}
 
 object ClockSource {
   def apply(hz: Int) = new ClockSource(hz)

diff --git a/src/main/scala/ee/hrzn/chryse/platform/resource/LED.scala b/src/main/scala/ee/hrzn/chryse/platform/resource/LED.scala
@@ -2,7 +2,7 @@ package ee.hrzn.chryse.platform.resource
 
 import chisel3._
 
-class LED extends BaseOut[Bool](Bool()) {
+class LED extends Base[Bool](Output(Bool())) {
   private var invert = false // TODO: possibly belongs in a higher class
 
   def inverted: this.type = {

diff --git a/src/main/scala/ee/hrzn/chryse/platform/resource/UARTRX.scala b/src/main/scala/ee/hrzn/chryse/platform/resource/UARTRX.scala
@@ -2,7 +2,7 @@ package ee.hrzn.chryse.platform.resource
 
 import chisel3._
 
-class UARTRX extends BaseIn[Bool](Bool()) {}
+class UARTRX extends Base[Bool](Input(Bool())) {}
 
 object UARTRX {
   def apply() = new UARTRX

diff --git a/src/main/scala/ee/hrzn/chryse/platform/resource/UARTTX.scala b/src/main/scala/ee/hrzn/chryse/platform/resource/UARTTX.scala
@@ -2,7 +2,7 @@ package ee.hrzn.chryse.platform.resource
 
 import chisel3._
 
-class UARTTX extends BaseOut[Bool](Bool()) {}
+class UARTTX extends Base[Bool](Output(Bool())) {}
 
 object UARTTX {
   def apply() = new UARTTX