caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ice40: Add support for PLL DELAY_ADJUSTMENT_MODE

Browse Source 
Fixes #336

Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2019-09-23 19:46:31 +01:00
parent 395db49b21
commit 30e3c8469b
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ice40/pack.cc
View File

@ -1266,7 +1266,21 @@ static void pack_special(Context *ctx)
log_error("Invalid PLL output selection '%s'\n", param.second.as_string().c_str()); log_error("Invalid PLL output selection '%s'\n", param.second.as_string().c_str());
packed->params[pos_map_name.at(param.first)] = pos_map_val.at(param.second.as_string()); packed->params[pos_map_name.at(param.first)] = pos_map_val.at(param.second.as_string());
} }
const std::map<IdString, IdString> delmodes = {
{ctx->id("DELAY_ADJUSTMENT_MODE_FEEDBACK"), ctx->id("DELAY_ADJMODE_FB")},
{ctx->id("DELAY_ADJUSTMENT_MODE_RELATIVE"), ctx->id("DELAY_ADJMODE_REL")},
};
for (auto delmode : delmodes) {
if (ci->params.count(delmode.first)) {
std::string value = str_or_default(ci->params, delmode.first, "");
if (value == "DYNAMIC")
packed->params[delmode.second] = 1;
else if (value == "FIXED")
packed->params[delmode.second] = 0;
else
log_error("Invalid PLL %s selection '%s'\n", delmode.first.c_str(ctx), value.c_str());
}
}
auto feedback_path = packed->params[ctx->id("FEEDBACK_PATH")].is_string auto feedback_path = packed->params[ctx->id("FEEDBACK_PATH")].is_string
? packed->params[ctx->id("FEEDBACK_PATH")].as_string() ? packed->params[ctx->id("FEEDBACK_PATH")].as_string()
: std::to_string(packed->params[ctx->id("FEEDBACK_PATH")].as_int64()); : std::to_string(packed->params[ctx->id("FEEDBACK_PATH")].as_int64());