diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-08-08 19:36:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 19:36:05 +0200 |
| commit | b326b03a5261a824f428fe0811a5376c8758b929 (patch) | |
| tree | a13673a636ddbea3b5fd5585e3bb109b56b69435 /ice40/arch_pybindings.cc | |
| parent | cd4e761bb799ca99f02d3aa177961af28a93f2d8 (diff) | |
| parent | f6189e4677c7bdaeaa5b9b796a67d750e6c7d49d (diff) | |
| download | nextpnr-b326b03a5261a824f428fe0811a5376c8758b929.tar.gz nextpnr-b326b03a5261a824f428fe0811a5376c8758b929.tar.bz2 nextpnr-b326b03a5261a824f428fe0811a5376c8758b929.zip | |
Merge pull request #45 from YosysHQ/constids
Get rid of PortPin and BelType
Diffstat (limited to 'ice40/arch_pybindings.cc')
| -rw-r--r-- | ice40/arch_pybindings.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/ice40/arch_pybindings.cc b/ice40/arch_pybindings.cc index 1d16ade0..f1639ba6 100644 --- a/ice40/arch_pybindings.cc +++ b/ice40/arch_pybindings.cc @@ -49,13 +49,6 @@ void arch_wrap_python() class_<BelPin>("BelPin").def_readwrite("bel", &BelPin::bel).def_readwrite("pin", &BelPin::pin); - enum_<PortPin>("PortPin") -#define X(t) .value("PIN_" #t, PIN_##t) - -#include "portpins.inc" - ; -#undef X - auto arch_cls = class_<Arch, Arch *, bases<BaseCtx>, boost::noncopyable>("Arch", init<ArchArgs>()); auto ctx_cls = class_<Context, Context *, bases<Arch>, boost::noncopyable>("Context", no_init) .def("checksum", &Context::checksum) @@ -63,7 +56,7 @@ void arch_wrap_python() .def("place", &Context::place) .def("route", &Context::route); - fn_wrapper_1a<Context, decltype(&Context::getBelType), &Context::getBelType, conv_to_str<BelType>, + fn_wrapper_1a<Context, decltype(&Context::getBelType), &Context::getBelType, conv_to_str<IdString>, conv_from_str<BelId>>::def_wrap(ctx_cls, "getBelType"); fn_wrapper_1a<Context, decltype(&Context::checkBelAvail), &Context::checkBelAvail, pass_through<bool>, conv_from_str<BelId>>::def_wrap(ctx_cls, "checkBelAvail"); @@ -81,7 +74,7 @@ void arch_wrap_python() "getBels"); fn_wrapper_2a<Context, decltype(&Context::getBelPinWire), &Context::getBelPinWire, conv_to_str<WireId>, - conv_from_str<BelId>, conv_from_str<PortPin>>::def_wrap(ctx_cls, "getBelPinWire"); + conv_from_str<BelId>, conv_from_str<IdString>>::def_wrap(ctx_cls, "getBelPinWire"); fn_wrapper_1a<Context, decltype(&Context::getWireBelPins), &Context::getWireBelPins, wrap_context<BelPinRange>, conv_from_str<WireId>>::def_wrap(ctx_cls, "getWireBelPins"); |