Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Object model updates for AHB and AXI" #2440

Merged
merged 1 commit into from
Apr 29, 2020
Merged

Revert "Object model updates for AHB and AXI" #2440

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 17 additions & 22 deletions src/main/scala/diplomaticobjectmodel/model/OMPorts.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,26 +124,21 @@ case class SystemPort(
_types: Seq[String] = Seq("SystemPort", "OutboundPort", "OMPort", "OMDevice", "OMComponent", "OMCompoundType")) extends OutboundPort

object OMPortMaker {
val protocolSpecifications: (ProtocolType, SubProtocolType) => String = {
case (AHBProtocol, AHBLiteSubProtocol) => "AHB Lite Protocol"
case (AHBProtocol, AHBFullSubProtocol) => "AHB Full Protocol"
case (AXI4Protocol, AXI4SubProtocol) => "AXI Protocol"
case (AXI4Protocol, AXI4LiteSubProtocol) => "AXI Lite Protocol"
case (APBProtocol, APBSubProtocol) => "APB Protocol"
case (TLProtocol, TL_UHSubProtocol) => "TileLink Protocol"
case (TLProtocol, TL_ULSubProtocol) => "TileLink Protocol"
case (TLProtocol, TL_CSubProtocol) => "TileLink Protocol"
case _ => "Invalid Protocol"
}
val protocolSpecifications = Map[ProtocolType, String](
AHBProtocol -> "AMBA 3 AHB-Lite Protocol",
AXI4Protocol -> "AMBA 3 AXI4-Lite Protocol",
APBProtocol -> "AMBA 3 APB Protocol",
TLProtocol -> "TileLink specification"
)

val protocolSpecificationVersions = Map[ProtocolType, String](
AHBProtocol -> "3",
AXI4Protocol -> "4",
AHBProtocol -> "1.0",
AXI4Protocol -> "1.0",
APBProtocol -> "1.0",
TLProtocol -> "1.8"
)

def specVersion(protocol: ProtocolType, subProtocol: SubProtocolType, version: String): Option[OMSpecification] = Some(OMSpecification(protocolSpecifications(protocol, subProtocol), version))
def specVersion(protocol: ProtocolType, version: String): Option[OMSpecification] = Some(OMSpecification(protocolSpecifications(protocol), version))

val portNames = Map[PortType, String](
SystemPortType -> "System Port",
Expand All @@ -163,14 +158,14 @@ object OMPortMaker {
val documentationName = portNames(portType)

val omProtocol = (protocol, subProtocol) match {
case (AXI4Protocol, AXI4SubProtocol) => AXI4(specification = specVersion(protocol, subProtocol, version))
case (AXI4Protocol, AXI4LiteSubProtocol) => AXI4_Lite(specification = specVersion(protocol, subProtocol, version))
case (AHBProtocol, AHBLiteSubProtocol) => AHB_Lite(specification = specVersion(protocol, subProtocol, version))
case (AHBProtocol, AHBFullSubProtocol) => AHB(specification = specVersion(protocol, subProtocol, version))
case (APBProtocol, APBSubProtocol) => APB(specification = specVersion(protocol, subProtocol, version))
case (TLProtocol, TL_UHSubProtocol) => TL_UH(specification = specVersion(protocol, subProtocol, version))
case (TLProtocol, TL_ULSubProtocol) => TL_UL(specification = specVersion(protocol, subProtocol, version))
case (TLProtocol, TL_CSubProtocol) => TL_C(specification = specVersion(protocol, subProtocol, version))
case (AXI4Protocol, AXI4SubProtocol) => AXI4(specification = specVersion(protocol, version))
case (AXI4Protocol, AXI4LiteSubProtocol) => AXI4_Lite(specification = specVersion(protocol, version))
case (AHBProtocol, AHBLiteSubProtocol) => AHB_Lite(specification = specVersion(protocol, version))
case (AHBProtocol, AHBFullSubProtocol) => AHB(specification = specVersion(protocol, version))
case (APBProtocol, APBSubProtocol) => APB(specification = specVersion(protocol, version))
case (TLProtocol, TL_UHSubProtocol) => TL_UH(specification = specVersion(protocol, version))
case (TLProtocol, TL_ULSubProtocol) => TL_UL(specification = specVersion(protocol, version))
case (TLProtocol, TL_CSubProtocol) => TL_C(specification = specVersion(protocol, version))
case _ => throw new IllegalArgumentException(s"protocol $protocol, subProtocol $subProtocol")
}

Expand Down