Skip to content

Commit 8d0cf76

Browse files
Merge pull request #15 from tukl-msd/refactor/ImpedanceSpec_signal_renaming
ImpedanceSpec signals renamed
2 parents 6e1e565 + 02d936d commit 8d0cf76

File tree

4 files changed

+40
-40
lines changed

4 files changed

+40
-40
lines changed

include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecDDR4.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -193,18 +193,18 @@ struct MemImpedanceSpecTypeDDR4 {
193193
double ck_dyn_E;
194194

195195
// Commandbus
196-
bool cb_termination;
197-
double cb_R_eq;
198-
double cb_dyn_E;
196+
bool ca_termination;
197+
double ca_R_eq;
198+
double ca_dyn_E;
199199

200200
// Data bus read
201-
bool rb_termination;
202-
double rb_R_eq;
203-
double rb_dyn_E;
201+
bool rdq_termination;
202+
double rdq_R_eq;
203+
double rdq_dyn_E;
204204
// Data bus write
205-
bool wb_termination;
206-
double wb_R_eq;
207-
double wb_dyn_E;
205+
bool wdq_termination;
206+
double wdq_R_eq;
207+
double wdq_dyn_E;
208208

209209
// DQS read
210210
bool rdqs_termination;
@@ -215,7 +215,7 @@ struct MemImpedanceSpecTypeDDR4 {
215215
double wdqs_R_eq;
216216
double wdqs_dyn_E;
217217
};
218-
NLOHMANN_JSONIFY_ALL_THINGS(MemImpedanceSpecTypeDDR4, ck_termination, ck_R_eq, ck_dyn_E, cb_termination, cb_R_eq, cb_dyn_E, rb_termination, rb_R_eq, rb_dyn_E, wb_termination, wb_R_eq, wb_dyn_E, rdqs_termination, rdqs_R_eq, rdqs_dyn_E, wdqs_termination, wdqs_R_eq, wdqs_dyn_E)
218+
NLOHMANN_JSONIFY_ALL_THINGS(MemImpedanceSpecTypeDDR4, ck_termination, ck_R_eq, ck_dyn_E, ca_termination, ca_R_eq, ca_dyn_E, rdq_termination, rdq_R_eq, rdq_dyn_E, wdq_termination, wdq_R_eq, wdq_dyn_E, rdqs_termination, rdqs_R_eq, rdqs_dyn_E, wdqs_termination, wdqs_R_eq, wdqs_dyn_E)
219219

220220
struct MemSpecDDR4 : BaseMemSpec
221221
{

include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecDDR5.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -190,18 +190,18 @@ struct MemImpedanceSpecTypeDDR5 {
190190
double ck_dyn_E;
191191

192192
// Commandbus
193-
bool cb_termination;
194-
double cb_R_eq;
195-
double cb_dyn_E;
193+
bool ca_termination;
194+
double ca_R_eq;
195+
double ca_dyn_E;
196196

197197
// Data bus read
198-
bool rb_termination;
199-
double rb_R_eq;
200-
double rb_dyn_E;
198+
bool rdq_termination;
199+
double rdq_R_eq;
200+
double rdq_dyn_E;
201201
// Data bus write
202-
bool wb_termination;
203-
double wb_R_eq;
204-
double wb_dyn_E;
202+
bool wdq_termination;
203+
double wdq_R_eq;
204+
double wdq_dyn_E;
205205

206206
// DQS read
207207
bool rdqs_termination;
@@ -212,7 +212,7 @@ struct MemImpedanceSpecTypeDDR5 {
212212
double wdqs_R_eq;
213213
double wdqs_dyn_E;
214214
};
215-
NLOHMANN_JSONIFY_ALL_THINGS(MemImpedanceSpecTypeDDR5, ck_termination, ck_R_eq, ck_dyn_E, cb_termination, cb_R_eq, cb_dyn_E, rb_termination, rb_R_eq, rb_dyn_E, wb_termination, wb_R_eq, wb_dyn_E, rdqs_termination, rdqs_R_eq, rdqs_dyn_E, wdqs_termination, wdqs_R_eq, wdqs_dyn_E)
215+
NLOHMANN_JSONIFY_ALL_THINGS(MemImpedanceSpecTypeDDR5, ck_termination, ck_R_eq, ck_dyn_E, ca_termination, ca_R_eq, ca_dyn_E, rdq_termination, rdq_R_eq, rdq_dyn_E, wdq_termination, wdq_R_eq, wdq_dyn_E, rdqs_termination, rdqs_R_eq, rdqs_dyn_E, wdqs_termination, wdqs_R_eq, wdqs_dyn_E)
216216

217217
struct DataRateSpecTypeDDR5 {
218218
uint64_t ca_bus_rate;

include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecLPDDR4.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,18 @@ struct MemImpedanceSpecTypeLPDDR4 {
6868
double ck_dyn_E;
6969

7070
// Commandbus
71-
bool cb_termination;
72-
double cb_R_eq;
73-
double cb_dyn_E;
71+
bool ca_termination;
72+
double ca_R_eq;
73+
double ca_dyn_E;
7474

7575
// Data bus read
76-
bool rb_termination;
77-
double rb_R_eq;
78-
double rb_dyn_E;
76+
bool rdq_termination;
77+
double rdq_R_eq;
78+
double rdq_dyn_E;
7979
// Data bus write
80-
bool wb_termination;
81-
double wb_R_eq;
82-
double wb_dyn_E;
80+
bool wdq_termination;
81+
double wdq_R_eq;
82+
double wdq_dyn_E;
8383

8484
// DQS read
8585
bool rdqs_termination;
@@ -90,7 +90,7 @@ struct MemImpedanceSpecTypeLPDDR4 {
9090
double wdqs_R_eq;
9191
double wdqs_dyn_E;
9292
};
93-
NLOHMANN_JSONIFY_ALL_THINGS(MemImpedanceSpecTypeLPDDR4, ck_termination, ck_R_eq, ck_dyn_E, cb_termination, cb_R_eq, cb_dyn_E, rb_termination, rb_R_eq, rb_dyn_E, wb_termination, wb_R_eq, wb_dyn_E, rdqs_termination, rdqs_R_eq, rdqs_dyn_E, wdqs_termination, wdqs_R_eq, wdqs_dyn_E)
93+
NLOHMANN_JSONIFY_ALL_THINGS(MemImpedanceSpecTypeLPDDR4, ck_termination, ck_R_eq, ck_dyn_E, ca_termination, ca_R_eq, ca_dyn_E, rdq_termination, rdq_R_eq, rdq_dyn_E, wdq_termination, wdq_R_eq, wdq_dyn_E, rdqs_termination, rdqs_R_eq, rdqs_dyn_E, wdqs_termination, wdqs_R_eq, wdqs_dyn_E)
9494

9595
struct MemTimingSpecTypeLPDDR4
9696
{

include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecLPDDR5.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,18 @@ struct MemImpedanceSpecTypeLPDDR5
7171
double ck_dyn_E;
7272

7373
// Commandbus
74-
bool cb_termination;
75-
double cb_R_eq;
76-
double cb_dyn_E;
74+
bool ca_termination;
75+
double ca_R_eq;
76+
double ca_dyn_E;
7777

7878
// Data bus read
79-
bool rb_termination;
80-
double rb_R_eq;
81-
double rb_dyn_E;
79+
bool rdq_termination;
80+
double rdq_R_eq;
81+
double rdq_dyn_E;
8282
// Data bus write
83-
bool wb_termination;
84-
double wb_R_eq;
85-
double wb_dyn_E;
83+
bool wdq_termination;
84+
double wdq_R_eq;
85+
double wdq_dyn_E;
8686

8787
// DQS read
8888
bool rdqs_termination;
@@ -93,7 +93,7 @@ struct MemImpedanceSpecTypeLPDDR5
9393
double wck_R_eq;
9494
double wck_dyn_E;
9595
};
96-
NLOHMANN_JSONIFY_ALL_THINGS(MemImpedanceSpecTypeLPDDR5, ck_termination, ck_R_eq, ck_dyn_E, cb_termination, cb_R_eq, cb_dyn_E, rb_termination, rb_R_eq, rb_dyn_E, wb_termination, wb_R_eq, wb_dyn_E, rdqs_termination, rdqs_R_eq, rdqs_dyn_E, wck_termination, wck_R_eq, wck_dyn_E)
96+
NLOHMANN_JSONIFY_ALL_THINGS(MemImpedanceSpecTypeLPDDR5, ck_termination, ck_R_eq, ck_dyn_E, ca_termination, ca_R_eq, ca_dyn_E, rdq_termination, rdq_R_eq, rdq_dyn_E, wdq_termination, wdq_R_eq, wdq_dyn_E, rdqs_termination, rdqs_R_eq, rdqs_dyn_E, wck_termination, wck_R_eq, wck_dyn_E)
9797

9898
struct MemTimingSpecTypeLPDDR5
9999
{

0 commit comments

Comments
 (0)