diff -ruN AmcCarrierEmpty_project.yaml/Adc16Dx370.yaml AmcCarrierEmpty_project.yaml_mdewart/Adc16Dx370.yaml --- AmcCarrierEmpty_project.yaml/Adc16Dx370.yaml 2016-05-17 16:55:13.000000002 -0700 +++ AmcCarrierEmpty_project.yaml_mdewart/Adc16Dx370.yaml 2016-05-17 16:58:15.000000002 -0700 @@ -115,13 +115,13 @@ ######################################################### - name: PowerDown sequence: - - ScalVal: AdcReg[2] - SetVal: 0x3 + - entry: AdcReg[2] + value: 0x3 ######################################################### - name: PowerUp sequence: - - ScalVal: AdcReg[2] - SetVal: 0x0 + - entry: AdcReg[2] + value: 0x0 ######################################################### - name: CalibrateAdc sequence: diff -ruN AmcCarrierEmpty_project.yaml/AmcCarrierBsa.yaml AmcCarrierEmpty_project.yaml_mdewart/AmcCarrierBsa.yaml --- AmcCarrierEmpty_project.yaml/AmcCarrierBsa.yaml 2016-05-17 16:55:13.000000002 -0700 +++ AmcCarrierEmpty_project.yaml_mdewart/AmcCarrierBsa.yaml 2016-05-17 17:03:27.000000002 -0700 @@ -17,9 +17,8 @@ size: 0x100000 # Double check this ######### MMIODev: - - <<: *BsaRawDiagnosic - offset: 0x00000000 - +# - <<: *BsaRawDiagnosic +# offset: 0x00000000 - <<: *BsaBufferControl offset: 0x00010000 diff -ruN AmcCarrierEmpty_project.yaml/AmcCarrierCore.yaml AmcCarrierEmpty_project.yaml_mdewart/AmcCarrierCore.yaml --- AmcCarrierEmpty_project.yaml/AmcCarrierCore.yaml 2016-05-17 16:55:13.000000002 -0700 +++ AmcCarrierEmpty_project.yaml_mdewart/AmcCarrierCore.yaml 2016-05-17 17:07:33.000000002 -0700 @@ -47,36 +47,36 @@ - <<: *AxiSy56040 offset: 0x03000000 ################################################## - - <<: *GenericMemory - name: "Axi24LC64FT" + - name: "Axi24LC64FT" offset: 0x04000000 size: 0x2000 - - <<: *MemoryArray - nelms: 0x800 + IntField: + - <<: *MemoryArray + nelms: 0x800 ################################################## - - <<: *GenericMemory - name: "AxiCdcm6208" + - name: "AxiCdcm6208" offset: 0x05000000 size: 0x40 - - <<: *MemoryArray - nelms: 0x29 + IntField: + - <<: *MemoryArray + nelms: 0x29 ################################################## - - <<: *GenericMemory - name: "DdrSpdMemory" + - name: "DdrSpdMemory" offset: 0x06000000 size: 0x100 description: Lookup tool at www.micron.com/spd - - <<: *MemoryArray - nelms: 0x40 - nmode: RO # Read only + IntField: + - <<: *MemoryArray + nelms: 0x40 + nmode: RO # Read only ################################################## - - <<: *GenericMemory - name: "DdrTempSensor" + - name: "DdrTempSensor" offset: 0x06000100 size: 0x100 - - <<: *MemoryArray - nelms: 0x40 - nmode: RO # Read only + IntField: + - <<: *MemoryArray + nelms: 0x40 + nmode: RO # Read only ################################################## - <<: *AmcCarrierBsi offset: 0x07000000 diff -ruN AmcCarrierEmpty_project.yaml/AxiStreamDmaRingWrite.yaml AmcCarrierEmpty_project.yaml_mdewart/AxiStreamDmaRingWrite.yaml --- AmcCarrierEmpty_project.yaml/AxiStreamDmaRingWrite.yaml 2016-05-17 16:55:13.000000002 -0700 +++ AmcCarrierEmpty_project.yaml_mdewart/AxiStreamDmaRingWrite.yaml 2016-05-17 16:59:02.000000002 -0700 @@ -73,7 +73,7 @@ enums: - name: Wrap value: 0 - - name: DoneWhenFull: + - name: DoneWhenFull value: 1 description: ######################################################### @@ -191,19 +191,21 @@ StartAddr. Clear the Done field. nelms: *numBuffers sequence: - - ScalVal: Init[index] - SetVal: 0x1 - - ScalVal: Init[index] - SetVal: 0x0 + - entry: Init + value: 0x1 + - entry: Init + value: 0x0 ######################################################### - name: SoftTrigger description: Send a trigger to the buffer nelms: *numBuffers sequence: - - ScalVal: SoftTrigger[index] - SetVal: 0x1 - - ScalVal: SoftTrigger[index] - SetVal: 0x0 - - - name: SoftTriggerAll - command: SoftTrigger + - entry: SoftTrigger + value: 0x1 + - entry: SoftTrigger + value: 0x0 + - name: SoftTriggerAll + description: Send a trigger to the buffer + sequence: + entry: SoftTrigger + value: 1 diff -ruN AmcCarrierEmpty_project.yaml/AxiVersion.yaml AmcCarrierEmpty_project.yaml_mdewart/AxiVersion.yaml --- AmcCarrierEmpty_project.yaml/AxiVersion.yaml 2016-05-17 16:55:13.000000002 -0700 +++ AmcCarrierEmpty_project.yaml_mdewart/AxiVersion.yaml 2016-05-17 16:58:15.000000002 -0700 @@ -91,18 +91,18 @@ - name: MasterReset description: Perform a logical reset sequence: - - ScalVal: MasterReset - SetVal: 0x1 + - entry: MasterReset + value: 0x1 ######################################################### - name: FpgaReload description: Reload the FPGA from the attached PROM sequence: - - ScalVal: FpgaReload - SetVal: 0x1 + - entry: FpgaReload + value: 0x1 ######################################################### - name: CounterReset description: Reload the FPGA from the attached PROM sequence: - - ScalVal: CounterReset - SetVal: 0x1 + - entry: CounterReset + value: 0x1 ######################################################### \ No newline at end of file diff -ruN AmcCarrierEmpty_project.yaml/AxisDaqMux.yaml AmcCarrierEmpty_project.yaml_mdewart/AxisDaqMux.yaml --- AmcCarrierEmpty_project.yaml/AxisDaqMux.yaml 2016-05-17 16:55:13.000000002 -0700 +++ AmcCarrierEmpty_project.yaml_mdewart/AxisDaqMux.yaml 2016-05-17 16:58:15.000000002 -0700 @@ -165,9 +165,9 @@ - name: TriggerDaq description: Trigger data aquisition from software. sequence: - - ScalVal: SoftwareTrigger - SetVal: 0x1 - - ScalVal: SoftwareTrigger - SetVal: 0x0 + - entry: SoftwareTrigger + value: 0x1 + - entry: SoftwareTrigger + value: 0x0 ######################################################### \ No newline at end of file diff -ruN AmcCarrierEmpty_project.yaml/BsaBufferControl.yaml AmcCarrierEmpty_project.yaml_mdewart/BsaBufferControl.yaml --- AmcCarrierEmpty_project.yaml/BsaBufferControl.yaml 2016-05-17 16:55:14.000000002 -0700 +++ AmcCarrierEmpty_project.yaml_mdewart/BsaBufferControl.yaml 2016-05-17 17:02:18.000000002 -0700 @@ -17,14 +17,14 @@ size: 0x10000 # Double check this ######### MMIODev: - - <<: *GenericMemory - offset: 0x00000000 + - offset: 0x00000000 name: Timestamps size: 512 # 64 64-bit values - - <<: *MemoryArray - nelms: 64 - bitSize: 64 - mode: RO + IntField: + - <<: *MemoryArray + nelms: 64 + bitSize: 64 + mode: RO - <<: *AxiStreamDmaRingWrite offset: 0x00010000 diff -ruN AmcCarrierEmpty_project.yaml/Dac38J84.yaml AmcCarrierEmpty_project.yaml_mdewart/Dac38J84.yaml --- AmcCarrierEmpty_project.yaml/Dac38J84.yaml 2016-05-17 16:55:13.000000002 -0700 +++ AmcCarrierEmpty_project.yaml_mdewart/Dac38J84.yaml 2016-05-17 16:58:15.000000002 -0700 @@ -210,38 +210,38 @@ - name: ClearAlarms description: Clear all the DAC alarms sequence: - - ScalVal: DacReg[100] - SetVal: 0xFFFF - - ScalVal: DacReg[101] - SetVal: 0xFFFF - - ScalVal: DacReg[102] - SetVal: 0xFFFF - - ScalVal: DacReg[103] - SetVal: 0xFFFF - - ScalVal: DacReg[104] - SetVal: 0xFFFF - - ScalVal: DacReg[105] - SetVal: 0xFFFF - - ScalVal: DacReg[106] - SetVal: 0xFFFF - - ScalVal: DacReg[107] - SetVal: 0xFFFF - - ScalVal: DacReg[108] - SetVal: 0xFFFF + - entry: DacReg[100] + value: 0xFFFF + - entry: DacReg[101] + value: 0xFFFF + - entry: DacReg[102] + value: 0xFFFF + - entry: DacReg[103] + value: 0xFFFF + - entry: DacReg[104] + value: 0xFFFF + - entry: DacReg[105] + value: 0xFFFF + - entry: DacReg[106] + value: 0xFFFF + - entry: DacReg[107] + value: 0xFFFF + - entry: DacReg[108] + value: 0xFFFF ######################################################### - name: InitDac description: Initialization sequence for the DAC JESD core sequence: # Disable TX - - ScalVal: EnableTx - SetVal: 0x0 + - entry: EnableTx + value: 0x0 # Disable and initialize JESD - - ScalVal: InitJesd - SetVal: 0x1E + - entry: InitJesd + value: 0x1E # Enable JESD - - ScalVal: InitJesd - SetVal: 0x01 + - entry: InitJesd + value: 0x01 # Enable TX - - ScalVal: EnableTx - SetVal: 0x1 + - entry: EnableTx + value: 0x1 ######################################################### \ No newline at end of file diff -ruN AmcCarrierEmpty_project.yaml/GenericMemory.yaml AmcCarrierEmpty_project.yaml_mdewart/GenericMemory.yaml --- AmcCarrierEmpty_project.yaml/GenericMemory.yaml 2016-05-17 16:55:13.000000002 -0700 +++ AmcCarrierEmpty_project.yaml_mdewart/GenericMemory.yaml 2016-05-17 17:01:06.000000002 -0700 @@ -22,3 +22,11 @@ mode: RW description: Memory Array ######################################################### + # + +IntField: &MemoryArray + offset: 0x0 + name: MemoryArray + nelms: 1 + mode: RW + description: Memory Array diff -ruN AmcCarrierEmpty_project.yaml/JesdRx.yaml AmcCarrierEmpty_project.yaml_mdewart/JesdRx.yaml --- AmcCarrierEmpty_project.yaml/JesdRx.yaml 2016-05-17 16:55:14.000000002 -0700 +++ AmcCarrierEmpty_project.yaml_mdewart/JesdRx.yaml 2016-05-17 16:58:15.000000002 -0700 @@ -210,16 +210,16 @@ - name: ClearErrors description: Clear the registered errors of all RX lanes sequence: - - ScalVal: ClearErrors - SetVal: 0x1 - - ScalVal: ClearErrors - SetVal: 0x0 + - entry: ClearErrors + value: 0x1 + - entry: ClearErrors + value: 0x0 ######################################################### - name: ResetGTs description: Toggle the reset of all RX MGTs sequence: - - ScalVal: ResetGTs - SetVal: 0x1 - - ScalVal: ResetGTs - SetVal: 0x0 + - entry: ResetGTs + value: 0x1 + - entry: ResetGTs + value: 0x0 ######################################################### \ No newline at end of file diff -ruN AmcCarrierEmpty_project.yaml/Lmk04828.yaml AmcCarrierEmpty_project.yaml_mdewart/Lmk04828.yaml --- AmcCarrierEmpty_project.yaml/Lmk04828.yaml 2016-05-17 16:55:13.000000002 -0700 +++ AmcCarrierEmpty_project.yaml_mdewart/Lmk04828.yaml 2016-05-17 16:58:16.000000002 -0700 @@ -89,40 +89,40 @@ description: Synchronise LMK internal counters. Warning this function will power off and power on all the system clocks sequence: # Turn off normal continuous sysref - - ScalVal: EnableSysRef - SetVal: 0x0 + - entry: EnableSysRef + value: 0x0 # Turn On SYNC - - ScalVal: EnableSync - SetVal: 0x0 + - entry: EnableSync + value: 0x0 # 1000 ms sleep - entry: usleep set: 1000000 # Toggle Sync bit - - ScalVal: SyncBit - SetVal: 0x1 - - ScalVal: SyncBit - SetVal: 0x0 + - entry: SyncBit + value: 0x1 + - entry: SyncBit + value: 0x0 # 1000 ms sleep - entry: usleep set: 1000000 # Turn on normal continuous sysref - - ScalVal: EnableSysRef - SetVal: 0x3 + - entry: EnableSysRef + value: 0x3 # Turn Off SYNC - - ScalVal: EnableSync - SetVal: 0xff + - entry: EnableSync + value: 0xff ######################################################### - name: PwrUpSysRef description: Powerup the sysref lines sequence: # Turn on normal continuous sysref - - ScalVal: EnableSysRef - SetVal: 0x3 + - entry: EnableSysRef + value: 0x3 ######################################################### - name: PwrDwnSysRef description: Powerdown the sysref lines sequence: # Turn off normal continuous sysref - - ScalVal: EnableSysRef - SetVal: 0x0 + - entry: EnableSysRef + value: 0x0 ######################################################### diff -ruN AmcCarrierEmpty_project.yaml/RssiCore.yaml AmcCarrierEmpty_project.yaml_mdewart/RssiCore.yaml --- AmcCarrierEmpty_project.yaml/RssiCore.yaml 2016-05-17 16:55:14.000000002 -0700 +++ AmcCarrierEmpty_project.yaml_mdewart/RssiCore.yaml 2016-05-17 17:05:28.000000002 -0700 @@ -21,113 +21,113 @@ sizeBits: 1 lsBit: 0 mode: RW - description: Open Connection Request (Server goes to listen state, Client actively requests the connection by sending SYN segment) + description: "Open Connection Request (Server goes to listen state, Client actively requests the connection by sending SYN segment)" ######################################################### - offset: 0x00 name: CloseConn sizeBits: 1 lsBit: 1 mode: RW - description: Close Connection Request (Send a RST Segment to peer and close the connection) + description: "Close Connection Request (Send a RST Segment to peer and close the connection)" ######################################################### - offset: 0x00 name: Mode sizeBits: 1 lsBit: 2 mode: RW - description: Mode:'0': Use internal parameters from generics,'1': Use parameters from registers + description: "Mode:'0': Use internal parameters from generics,'1': Use parameters from registers" ######################################################### - offset: 0x00 name: HeaderChksumEn sizeBits: 1 lsBit: 3 mode: RW - description: Header checksum: '1': Enable calculation and check, '0': Disable check and insert 0 in place of header checksum + description: "Header checksum: '1': Enable calculation and check, '0': Disable check and insert 0 in place of header checksum" ######################################################### - offset: 0x00 name: InjectFault sizeBits: 1 lsBit: 4 mode: RW - description: Inject fault to the next packet header checksum (Default '0'). Acts on rising edge - injects exactly one fault in next segment + description: "Inject fault to the next packet header checksum (Default '0'). Acts on rising edge - injects exactly one fault in next segment" ######################################################### - offset: 0x04 name: InitSeqN sizeBits: 8 mode: RW - description: Initial sequence number [7:0] + description: "Initial sequence number [7:0]" ######################################################### - offset: 0x08 name: Version sizeBits: 4 mode: RW - description: Version register [3:0] + description: "Version register [3:0]" ######################################################### - offset: 0x0C name: MaxOutsSeg sizeBits: 8 mode: RW - description: Maximum out standing segments [7:0] + description: "Maximum out standing segments [7:0]" ######################################################### - offset: 0x10 name: MaxSegSize sizeBits: 16 mode: RW - description: Maximum segment size [15:0] + description: "Maximum segment size [15:0]" ######################################################### - offset: 0x14 name: RetransTimeout sizeBits: 16 mode: RW - description: Retransmission timeout [15:0] + description: "Retransmission timeout [15:0]" ######################################################### - offset: 0x18 name: CumAckTimeout sizeBits: 16 mode: RW - description: Cumulative acknowledgment timeout [15:0] + description: "Cumulative acknowledgment timeout [15:0]" ######################################################### - offset: 0x1C name: NullSegTimeout sizeBits: 16 mode: RW - description: Null segment timeout [15:0] + description: "Null segment timeout [15:0]" ######################################################### - offset: 0x20 name: MaxNumRetrans sizeBits: 8 mode: RW - description: Maximum number of retransmissions [7:0] + description: "Maximum number of retransmissions [7:0]" ######################################################### - offset: 0x24 name: MaxCumAck sizeBits: 8 mode: RW - description: Maximum cumulative acknowledgments [7:0] + description: "Maximum cumulative acknowledgments [7:0]" ######################################################### - offset: 0x28 name: MaxOutOfSeq sizeBits: 8 mode: RW - description: Max out of sequence segments (EACK) [7:0] + description: "Max out of sequence segments (EACK) [7:0]" ######################################################### - offset: 0x40 name: StatusReg sizeBits: 7 mode: RO - description: Status register [6:0] + description: "Status register [6:0]" ######################################################### - offset: 0x44 name: ValidCnt sizeBits: 32 mode: RO - description: Number of valid segments [31:0] + description: "Number of valid segments [31:0]" ######################################################### - offset: 0x48 name: DropCnt sizeBits: 32 mode: RO - description: Number of dropped segments [31:0] + description: "Number of dropped segments [31:0]" ######################################################### ######### Commands: @@ -136,24 +136,24 @@ - name: OpenConn description: Open connection request sequence: - - ScalVal: OpenConn - SetVal: 0x1 - - ScalVal: OpenConn - SetVal: 0x0 + - entry: OpenConn + value: 0x1 + - entry: OpenConn + value: 0x0 ######################################################### - name: CloseConn description: Close connection request sequence: - - ScalVal: CloseConn - SetVal: 0x1 - - ScalVal: CloseConn - SetVal: 0x0 + - entry: CloseConn + value: 0x1 + - entry: CloseConn + value: 0x0 ######################################################### - name: InjectFault description: Inject a single fault(for debug and test purposes only). Corrupts checksum during transmission sequence: - - ScalVal: InjectFault - SetVal: 0x1 - - ScalVal: InjectFault - SetVal: 0x0 - ######################################################### \ No newline at end of file + - entry: InjectFault + value: 0x1 + - entry: InjectFault + value: 0x0 + #########################################################