From 2c51adcd688e9f94303fe49986c999d8e3e9ef74 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Sat, 28 Feb 2015 09:02:28 +0100 Subject: [PATCH] misoclib: better organization (create cores categories: cpu, mem, com, ...) --- make.py | 2 +- misoclib/{liteeth => com}/__init__.py | 0 misoclib/{ => com}/liteeth/LICENSE | 0 misoclib/{ => com}/liteeth/README | 0 .../liteeth}/__init__.py | 0 misoclib/{ => com}/liteeth/common.py | 0 misoclib/{ => com}/liteeth/core/__init__.py | 14 +++++++------- .../{ => com}/liteeth/core/arp/__init__.py | 8 ++++---- .../liteeth/core/etherbone/__init__.py | 16 ++++++++-------- .../liteeth/core/etherbone/dissector/bit.lua | 0 .../core/etherbone/dissector/etherbone.lua | 0 .../liteeth/core/etherbone/packet.py | 8 ++++---- .../{ => com}/liteeth/core/etherbone/probe.py | 4 ++-- .../liteeth/core/etherbone/record.py | 8 ++++---- .../liteeth/core/etherbone/wishbone.py | 4 ++-- .../{ => com}/liteeth/core/icmp/__init__.py | 8 ++++---- .../{ => com}/liteeth/core/ip/__init__.py | 12 ++++++------ .../{ => com}/liteeth/core/ip/checksum.py | 4 ++-- .../{ => com}/liteeth/core/ip/crossbar.py | 6 +++--- .../{ => com}/liteeth/core/tty/__init__.py | 4 ++-- .../{ => com}/liteeth/core/udp/__init__.py | 10 +++++----- .../{ => com}/liteeth/core/udp/crossbar.py | 6 +++--- misoclib/{ => com}/liteeth/doc/.gitignore | 0 misoclib/{ => com}/liteeth/doc/Makefile | 0 misoclib/{ => com}/liteeth/doc/make.bat | 0 .../doc/source/_static/LiteEth_logo_full.png | Bin .../doc/source/_static/LiteEth_logo_full.svg | 0 .../enjoydigital_sphinx_rtd_theme/__init__.py | 0 .../breadcrumbs.html | 0 .../enjoydigital_sphinx_rtd_theme/footer.html | 0 .../enjoydigital_sphinx_rtd_theme/layout.html | 0 .../layout_old.html | 0 .../enjoydigital_sphinx_rtd_theme/search.html | 0 .../searchbox.html | 0 .../static/css/badge_only.css | 0 .../static/css/theme - prior to centering.css | 0 .../static/css/theme.css | 0 .../static/fonts/fontawesome-webfont.eot | Bin .../static/fonts/fontawesome-webfont.svg | 0 .../static/fonts/fontawesome-webfont.ttf | Bin .../static/fonts/fontawesome-webfont.woff | Bin .../static/js/theme.js | 0 .../enjoydigital_sphinx_rtd_theme/theme.conf | 0 .../versions.html | 0 misoclib/{ => com}/liteeth/doc/source/conf.py | 0 .../liteeth/doc/source/docs/core/index.rst | 0 .../doc/source/docs/frontend/index.rst | 0 .../doc/source/docs/getting_started/FAQ.rst | 0 .../docs/getting_started/bug_reports.rst | 0 .../source/docs/getting_started/downloads.rst | 0 .../doc/source/docs/getting_started/index.rst | 0 .../liteeth/doc/source/docs/index.rst | 0 .../liteeth/doc/source/docs/intro/about.rst | 0 .../doc/source/docs/intro/community.rst | 0 .../liteeth/doc/source/docs/intro/index.rst | 0 .../liteeth/doc/source/docs/intro/license.rst | 0 .../doc/source/docs/intro/release_notes.rst | 0 .../docs/intro/talks_and_publications.rst | 0 .../liteeth/doc/source/home_page_layout.html | 0 .../{ => com}/liteeth/doc/source/index.rst | 0 .../liteeth/example_designs}/__init__.py | 0 .../{ => com}/liteeth/example_designs/make.py | 2 +- .../example_designs/platforms/kc705.py | 0 .../example_designs/targets/__init__.py | 0 .../liteeth/example_designs/targets/base.py | 8 ++++---- .../example_designs/targets/etherbone.py | 6 +++--- .../liteeth/example_designs/targets/tty.py | 6 +++--- .../liteeth/example_designs/targets/udp.py | 4 ++-- .../liteeth/example_designs/test/make.py | 0 .../example_designs/test/test_etherbone.py | 2 +- .../liteeth/example_designs/test/test_la.py | 0 .../liteeth/example_designs/test/test_regs.py | 0 .../liteeth/example_designs/test/test_tty.py | 0 .../liteeth/example_designs/test/test_udp.py | 0 .../{ => com}/liteeth/generic/__init__.py | 2 +- misoclib/{ => com}/liteeth/generic/arbiter.py | 0 .../{ => com}/liteeth/generic/crossbar.py | 8 ++++---- .../{ => com}/liteeth/generic/depacketizer.py | 4 ++-- .../{ => com}/liteeth/generic/dispatcher.py | 0 .../{ => com}/liteeth/generic/packetizer.py | 4 ++-- .../{ => com}/liteeth/liteeth-version.txt | 0 misoclib/{ => com}/liteeth/mac/__init__.py | 10 +++++----- misoclib/{ => com}/liteeth/mac/common.py | 10 +++++----- .../{ => com}/liteeth/mac/core/__init__.py | 6 +++--- misoclib/{ => com}/liteeth/mac/core/crc.py | 4 ++-- misoclib/{ => com}/liteeth/mac/core/gap.py | 4 ++-- .../{ => com}/liteeth/mac/core/last_be.py | 4 ++-- .../{ => com}/liteeth/mac/core/padding.py | 4 ++-- .../{ => com}/liteeth/mac/core/preamble.py | 4 ++-- .../liteeth/mac/frontend}/__init__.py | 0 .../{ => com}/liteeth/mac/frontend/sram.py | 4 ++-- .../liteeth/mac/frontend/wishbone.py | 6 +++--- .../test => com/liteeth/phy}/__init__.py | 0 misoclib/{ => com}/liteeth/phy/gmii.py | 4 ++-- misoclib/{ => com}/liteeth/phy/loopback.py | 4 ++-- misoclib/{ => com}/liteeth/phy/mii.py | 4 ++-- misoclib/{ => com}/liteeth/phy/sim.py | 4 ++-- misoclib/{ => com}/liteeth/setup.py | 0 misoclib/{ => com}/liteeth/test/Makefile | 0 .../model => com/liteeth/test}/__init__.py | 0 misoclib/{ => com}/liteeth/test/arp_tb.py | 10 +++++----- misoclib/{ => com}/liteeth/test/common.py | 2 +- .../{ => com}/liteeth/test/etherbone_tb.py | 10 +++++----- misoclib/{ => com}/liteeth/test/icmp_tb.py | 18 +++++++++--------- misoclib/{ => com}/liteeth/test/ip_tb.py | 10 +++++----- .../{ => com}/liteeth/test/mac_core_tb.py | 8 ++++---- .../{ => com}/liteeth/test/mac_wishbone_tb.py | 8 ++++---- misoclib/com/liteeth/test/model/__init__.py | 0 misoclib/{ => com}/liteeth/test/model/arp.py | 10 +++++----- .../{ => com}/liteeth/test/model/dumps.py | 0 .../{ => com}/liteeth/test/model/etherbone.py | 6 +++--- misoclib/{ => com}/liteeth/test/model/icmp.py | 12 ++++++------ misoclib/{ => com}/liteeth/test/model/ip.py | 10 +++++----- misoclib/{ => com}/liteeth/test/model/mac.py | 6 +++--- misoclib/{ => com}/liteeth/test/model/phy.py | 4 ++-- misoclib/{ => com}/liteeth/test/model/udp.py | 12 ++++++------ misoclib/{ => com}/liteeth/test/udp_tb.py | 8 ++++---- misoclib/{ => com}/uart/__init__.py | 0 .../{ => cpu/peripherals}/gpio/__init__.py | 0 .../peripherals}/identifier/__init__.py | 2 +- .../{ => cpu/peripherals}/identifier/git.py | 0 .../{ => cpu/peripherals}/timer/__init__.py | 0 misoclib/gensoc/__init__.py | 14 +++++++------- misoclib/mem/__init__.py | 0 misoclib/mem/flash/__init__.py | 0 .../{ => mem/flash}/norflash16/__init__.py | 0 misoclib/{ => mem/flash}/spiflash/__init__.py | 0 misoclib/{ => mem}/sdram/__init__.py | 0 misoclib/{ => mem}/sdram/bus/dfi.py | 0 misoclib/{ => mem}/sdram/bus/lasmibus.py | 0 .../{ => mem}/sdram/bus/wishbone2lasmi.py | 0 misoclib/{ => mem}/sdram/dfii/__init__.py | 2 +- misoclib/{ => mem}/sdram/lasmicon/__init__.py | 8 ++++---- .../{ => mem}/sdram/lasmicon/bankmachine.py | 2 +- .../{ => mem}/sdram/lasmicon/multiplexer.py | 2 +- misoclib/{ => mem}/sdram/lasmicon/perf.py | 0 .../{ => mem}/sdram/lasmicon/refresher.py | 2 +- .../test/abstract_transactions_lasmi.py | 2 +- .../sdram/lasmicon/test/bankmachine.py | 4 ++-- .../{ => mem}/sdram/lasmicon/test/common.py | 0 .../{ => mem}/sdram/lasmicon/test/lasmicon.py | 4 ++-- .../sdram/lasmicon/test/lasmicon_df.py | 4 ++-- .../sdram/lasmicon/test/lasmicon_wb.py | 4 ++-- .../sdram/lasmicon/test/refresher.py | 2 +- misoclib/{ => mem}/sdram/memtest/__init__.py | 0 misoclib/{ => mem}/sdram/minicon/__init__.py | 2 +- .../{ => mem}/sdram/minicon/tb/minicontb.py | 6 +++--- misoclib/{ => mem}/sdram/phy/gensdrphy.py | 4 ++-- misoclib/{ => mem}/sdram/phy/initsequence.py | 0 misoclib/{ => mem}/sdram/phy/k7ddrphy.py | 4 ++-- misoclib/{ => mem}/sdram/phy/s6ddrphy.py | 4 ++-- misoclib/video/__init__.py | 0 misoclib/{ => video}/framebuffer/__init__.py | 4 ++-- misoclib/{ => video}/framebuffer/dvi.py | 0 misoclib/{ => video}/framebuffer/format.py | 0 misoclib/{ => video}/framebuffer/phy.py | 4 ++-- software/common.mak | 2 +- targets/de0nano.py | 6 ++++-- targets/kc705.py | 9 +++++---- targets/mlabs_video.py | 12 ++++++++---- targets/pipistrello.py | 5 +++-- targets/ppro.py | 5 +++-- 162 files changed, 247 insertions(+), 238 deletions(-) rename misoclib/{liteeth => com}/__init__.py (100%) rename misoclib/{ => com}/liteeth/LICENSE (100%) rename misoclib/{ => com}/liteeth/README (100%) rename misoclib/{liteeth/example_designs => com/liteeth}/__init__.py (100%) rename misoclib/{ => com}/liteeth/common.py (100%) rename misoclib/{ => com}/liteeth/core/__init__.py (65%) rename misoclib/{ => com}/liteeth/core/arp/__init__.py (97%) rename misoclib/{ => com}/liteeth/core/etherbone/__init__.py (67%) rename misoclib/{ => com}/liteeth/core/etherbone/dissector/bit.lua (100%) rename misoclib/{ => com}/liteeth/core/etherbone/dissector/etherbone.lua (100%) rename misoclib/{ => com}/liteeth/core/etherbone/packet.py (94%) rename misoclib/{ => com}/liteeth/core/etherbone/probe.py (86%) rename misoclib/{ => com}/liteeth/core/etherbone/record.py (95%) rename misoclib/{ => com}/liteeth/core/etherbone/wishbone.py (94%) rename misoclib/{ => com}/liteeth/core/icmp/__init__.py (94%) rename misoclib/{ => com}/liteeth/core/ip/__init__.py (94%) rename misoclib/{ => com}/liteeth/core/ip/checksum.py (93%) rename misoclib/{ => com}/liteeth/core/ip/crossbar.py (84%) rename misoclib/{ => com}/liteeth/core/tty/__init__.py (96%) rename misoclib/{ => com}/liteeth/core/udp/__init__.py (92%) rename misoclib/{ => com}/liteeth/core/udp/crossbar.py (90%) rename misoclib/{ => com}/liteeth/doc/.gitignore (100%) rename misoclib/{ => com}/liteeth/doc/Makefile (100%) rename misoclib/{ => com}/liteeth/doc/make.bat (100%) rename misoclib/{ => com}/liteeth/doc/source/_static/LiteEth_logo_full.png (100%) rename misoclib/{ => com}/liteeth/doc/source/_static/LiteEth_logo_full.svg (100%) rename misoclib/{ => com}/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/__init__.py (100%) rename misoclib/{ => com}/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/breadcrumbs.html (100%) rename misoclib/{ => com}/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/footer.html (100%) rename misoclib/{ => com}/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/layout.html (100%) rename misoclib/{ => com}/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/layout_old.html (100%) rename misoclib/{ => com}/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/search.html (100%) rename misoclib/{ => com}/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/searchbox.html (100%) rename misoclib/{ => com}/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/badge_only.css (100%) rename misoclib/{ => com}/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/theme - prior to centering.css (100%) rename misoclib/{ => com}/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/theme.css (100%) rename misoclib/{ => com}/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot (100%) rename misoclib/{ => com}/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg (100%) rename misoclib/{ => com}/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf (100%) rename misoclib/{ => com}/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff (100%) rename misoclib/{ => com}/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/js/theme.js (100%) rename misoclib/{ => com}/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/theme.conf (100%) rename misoclib/{ => com}/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/versions.html (100%) rename misoclib/{ => com}/liteeth/doc/source/conf.py (100%) rename misoclib/{ => com}/liteeth/doc/source/docs/core/index.rst (100%) rename misoclib/{ => com}/liteeth/doc/source/docs/frontend/index.rst (100%) rename misoclib/{ => com}/liteeth/doc/source/docs/getting_started/FAQ.rst (100%) rename misoclib/{ => com}/liteeth/doc/source/docs/getting_started/bug_reports.rst (100%) rename misoclib/{ => com}/liteeth/doc/source/docs/getting_started/downloads.rst (100%) rename misoclib/{ => com}/liteeth/doc/source/docs/getting_started/index.rst (100%) rename misoclib/{ => com}/liteeth/doc/source/docs/index.rst (100%) rename misoclib/{ => com}/liteeth/doc/source/docs/intro/about.rst (100%) rename misoclib/{ => com}/liteeth/doc/source/docs/intro/community.rst (100%) rename misoclib/{ => com}/liteeth/doc/source/docs/intro/index.rst (100%) rename misoclib/{ => com}/liteeth/doc/source/docs/intro/license.rst (100%) rename misoclib/{ => com}/liteeth/doc/source/docs/intro/release_notes.rst (100%) rename misoclib/{ => com}/liteeth/doc/source/docs/intro/talks_and_publications.rst (100%) rename misoclib/{ => com}/liteeth/doc/source/home_page_layout.html (100%) rename misoclib/{ => com}/liteeth/doc/source/index.rst (100%) rename misoclib/{liteeth/mac/frontend => com/liteeth/example_designs}/__init__.py (100%) rename misoclib/{ => com}/liteeth/example_designs/make.py (99%) rename misoclib/{ => com}/liteeth/example_designs/platforms/kc705.py (100%) rename misoclib/{ => com}/liteeth/example_designs/targets/__init__.py (100%) rename misoclib/{ => com}/liteeth/example_designs/targets/base.py (97%) rename misoclib/{ => com}/liteeth/example_designs/targets/etherbone.py (93%) rename misoclib/{ => com}/liteeth/example_designs/targets/tty.py (87%) rename misoclib/{ => com}/liteeth/example_designs/targets/udp.py (95%) rename misoclib/{ => com}/liteeth/example_designs/test/make.py (100%) rename misoclib/{ => com}/liteeth/example_designs/test/test_etherbone.py (95%) rename misoclib/{ => com}/liteeth/example_designs/test/test_la.py (100%) rename misoclib/{ => com}/liteeth/example_designs/test/test_regs.py (100%) rename misoclib/{ => com}/liteeth/example_designs/test/test_tty.py (100%) rename misoclib/{ => com}/liteeth/example_designs/test/test_udp.py (100%) rename misoclib/{ => com}/liteeth/generic/__init__.py (98%) rename misoclib/{ => com}/liteeth/generic/arbiter.py (100%) rename misoclib/{ => com}/liteeth/generic/crossbar.py (80%) rename misoclib/{ => com}/liteeth/generic/depacketizer.py (95%) rename misoclib/{ => com}/liteeth/generic/dispatcher.py (100%) rename misoclib/{ => com}/liteeth/generic/packetizer.py (96%) rename misoclib/{ => com}/liteeth/liteeth-version.txt (100%) rename misoclib/{ => com}/liteeth/mac/__init__.py (81%) rename misoclib/{ => com}/liteeth/mac/common.py (80%) rename misoclib/{ => com}/liteeth/mac/core/__init__.py (94%) rename misoclib/{ => com}/liteeth/mac/core/crc.py (98%) rename misoclib/{ => com}/liteeth/mac/core/gap.py (87%) rename misoclib/{ => com}/liteeth/mac/core/last_be.py (91%) rename misoclib/{ => com}/liteeth/mac/core/padding.py (93%) rename misoclib/{ => com}/liteeth/mac/core/preamble.py (96%) rename misoclib/{liteeth/phy => com/liteeth/mac/frontend}/__init__.py (100%) rename misoclib/{ => com}/liteeth/mac/frontend/sram.py (98%) rename misoclib/{ => com}/liteeth/mac/frontend/wishbone.py (90%) rename misoclib/{liteeth/test => com/liteeth/phy}/__init__.py (100%) rename misoclib/{ => com}/liteeth/phy/gmii.py (96%) rename misoclib/{ => com}/liteeth/phy/loopback.py (89%) rename misoclib/{ => com}/liteeth/phy/mii.py (97%) rename misoclib/{ => com}/liteeth/phy/sim.py (92%) rename misoclib/{ => com}/liteeth/setup.py (100%) rename misoclib/{ => com}/liteeth/test/Makefile (100%) rename misoclib/{liteeth/test/model => com/liteeth/test}/__init__.py (100%) rename misoclib/{ => com}/liteeth/test/arp_tb.py (86%) rename misoclib/{ => com}/liteeth/test/common.py (98%) rename misoclib/{ => com}/liteeth/test/etherbone_tb.py (92%) rename misoclib/{ => com}/liteeth/test/icmp_tb.py (78%) rename misoclib/{ => com}/liteeth/test/ip_tb.py (85%) rename misoclib/{ => com}/liteeth/test/mac_core_tb.py (91%) rename misoclib/{ => com}/liteeth/test/mac_wishbone_tb.py (95%) create mode 100644 misoclib/com/liteeth/test/model/__init__.py rename misoclib/{ => com}/liteeth/test/model/arp.py (93%) rename misoclib/{ => com}/liteeth/test/model/dumps.py (100%) rename misoclib/{ => com}/liteeth/test/model/etherbone.py (98%) rename misoclib/{ => com}/liteeth/test/model/icmp.py (87%) rename misoclib/{ => com}/liteeth/test/model/ip.py (92%) rename misoclib/{ => com}/liteeth/test/model/mac.py (96%) rename misoclib/{ => com}/liteeth/test/model/phy.py (93%) rename misoclib/{ => com}/liteeth/test/model/udp.py (89%) rename misoclib/{ => com}/liteeth/test/udp_tb.py (91%) rename misoclib/{ => com}/uart/__init__.py (100%) rename misoclib/{ => cpu/peripherals}/gpio/__init__.py (100%) rename misoclib/{ => cpu/peripherals}/identifier/__init__.py (89%) rename misoclib/{ => cpu/peripherals}/identifier/git.py (100%) rename misoclib/{ => cpu/peripherals}/timer/__init__.py (100%) create mode 100644 misoclib/mem/__init__.py create mode 100644 misoclib/mem/flash/__init__.py rename misoclib/{ => mem/flash}/norflash16/__init__.py (100%) rename misoclib/{ => mem/flash}/spiflash/__init__.py (100%) rename misoclib/{ => mem}/sdram/__init__.py (100%) rename misoclib/{ => mem}/sdram/bus/dfi.py (100%) rename misoclib/{ => mem}/sdram/bus/lasmibus.py (100%) rename misoclib/{ => mem}/sdram/bus/wishbone2lasmi.py (100%) rename misoclib/{ => mem}/sdram/dfii/__init__.py (98%) rename misoclib/{ => mem}/sdram/lasmicon/__init__.py (87%) rename misoclib/{ => mem}/sdram/lasmicon/bankmachine.py (98%) rename misoclib/{ => mem}/sdram/lasmicon/multiplexer.py (99%) rename misoclib/{ => mem}/sdram/lasmicon/perf.py (100%) rename misoclib/{ => mem}/sdram/lasmicon/refresher.py (96%) rename misoclib/{ => mem}/sdram/lasmicon/test/abstract_transactions_lasmi.py (96%) rename misoclib/{ => mem}/sdram/lasmicon/test/bankmachine.py (91%) rename misoclib/{ => mem}/sdram/lasmicon/test/common.py (100%) rename misoclib/{ => mem}/sdram/lasmicon/test/lasmicon.py (92%) rename misoclib/{ => mem}/sdram/lasmicon/test/lasmicon_df.py (93%) rename misoclib/{ => mem}/sdram/lasmicon/test/lasmicon_wb.py (91%) rename misoclib/{ => mem}/sdram/lasmicon/test/refresher.py (95%) rename misoclib/{ => mem}/sdram/memtest/__init__.py (100%) rename misoclib/{ => mem}/sdram/minicon/__init__.py (99%) mode change 100755 => 100644 rename misoclib/{ => mem}/sdram/minicon/tb/minicontb.py (98%) mode change 100755 => 100644 rename misoclib/{ => mem}/sdram/phy/gensdrphy.py (96%) rename misoclib/{ => mem}/sdram/phy/initsequence.py (100%) rename misoclib/{ => mem}/sdram/phy/k7ddrphy.py (99%) rename misoclib/{ => mem}/sdram/phy/s6ddrphy.py (99%) create mode 100644 misoclib/video/__init__.py rename misoclib/{ => video}/framebuffer/__init__.py (88%) rename misoclib/{ => video}/framebuffer/dvi.py (100%) rename misoclib/{ => video}/framebuffer/format.py (100%) rename misoclib/{ => video}/framebuffer/phy.py (98%) diff --git a/make.py b/make.py index fa5b5536..470a23a9 100755 --- a/make.py +++ b/make.py @@ -8,7 +8,7 @@ from migen.fhdl import simplify from misoclib.gensoc import cpuif from misoclib.cpu import CPU -from misoclib.sdram.phy import initsequence +from misoclib.mem.sdram.phy import initsequence from misoc_import import misoc_import diff --git a/misoclib/liteeth/__init__.py b/misoclib/com/__init__.py similarity index 100% rename from misoclib/liteeth/__init__.py rename to misoclib/com/__init__.py diff --git a/misoclib/liteeth/LICENSE b/misoclib/com/liteeth/LICENSE similarity index 100% rename from misoclib/liteeth/LICENSE rename to misoclib/com/liteeth/LICENSE diff --git a/misoclib/liteeth/README b/misoclib/com/liteeth/README similarity index 100% rename from misoclib/liteeth/README rename to misoclib/com/liteeth/README diff --git a/misoclib/liteeth/example_designs/__init__.py b/misoclib/com/liteeth/__init__.py similarity index 100% rename from misoclib/liteeth/example_designs/__init__.py rename to misoclib/com/liteeth/__init__.py diff --git a/misoclib/liteeth/common.py b/misoclib/com/liteeth/common.py similarity index 100% rename from misoclib/liteeth/common.py rename to misoclib/com/liteeth/common.py diff --git a/misoclib/liteeth/core/__init__.py b/misoclib/com/liteeth/core/__init__.py similarity index 65% rename from misoclib/liteeth/core/__init__.py rename to misoclib/com/liteeth/core/__init__.py index 642dcb29..c2bfc8c4 100644 --- a/misoclib/liteeth/core/__init__.py +++ b/misoclib/com/liteeth/core/__init__.py @@ -1,10 +1,10 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * -from misoclib.liteeth.mac import LiteEthMAC -from misoclib.liteeth.core.arp import LiteEthARP -from misoclib.liteeth.core.ip import LiteEthIP -from misoclib.liteeth.core.udp import LiteEthUDP -from misoclib.liteeth.core.icmp import LiteEthICMP +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * +from misoclib.com.liteeth.mac import LiteEthMAC +from misoclib.com.liteeth.core.arp import LiteEthARP +from misoclib.com.liteeth.core.ip import LiteEthIP +from misoclib.com.liteeth.core.udp import LiteEthUDP +from misoclib.com.liteeth.core.icmp import LiteEthICMP class LiteEthIPCore(Module, AutoCSR): def __init__(self, phy, mac_address, ip_address, clk_freq): diff --git a/misoclib/liteeth/core/arp/__init__.py b/misoclib/com/liteeth/core/arp/__init__.py similarity index 97% rename from misoclib/liteeth/core/arp/__init__.py rename to misoclib/com/liteeth/core/arp/__init__.py index 82f4fc77..a166665e 100644 --- a/misoclib/liteeth/core/arp/__init__.py +++ b/misoclib/com/liteeth/core/arp/__init__.py @@ -1,7 +1,7 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * -from misoclib.liteeth.generic.depacketizer import LiteEthDepacketizer -from misoclib.liteeth.generic.packetizer import LiteEthPacketizer +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * +from misoclib.com.liteeth.generic.depacketizer import LiteEthDepacketizer +from misoclib.com.liteeth.generic.packetizer import LiteEthPacketizer _arp_table_layout = [ ("reply", 1), diff --git a/misoclib/liteeth/core/etherbone/__init__.py b/misoclib/com/liteeth/core/etherbone/__init__.py similarity index 67% rename from misoclib/liteeth/core/etherbone/__init__.py rename to misoclib/com/liteeth/core/etherbone/__init__.py index 09ffcb60..c68a8a6f 100644 --- a/misoclib/liteeth/core/etherbone/__init__.py +++ b/misoclib/com/liteeth/core/etherbone/__init__.py @@ -1,11 +1,11 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * -from misoclib.liteeth.generic.arbiter import Arbiter -from misoclib.liteeth.generic.dispatcher import Dispatcher -from misoclib.liteeth.core.etherbone.packet import * -from misoclib.liteeth.core.etherbone.probe import * -from misoclib.liteeth.core.etherbone.record import * -from misoclib.liteeth.core.etherbone.wishbone import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * +from misoclib.com.liteeth.generic.arbiter import Arbiter +from misoclib.com.liteeth.generic.dispatcher import Dispatcher +from misoclib.com.liteeth.core.etherbone.packet import * +from misoclib.com.liteeth.core.etherbone.probe import * +from misoclib.com.liteeth.core.etherbone.record import * +from misoclib.com.liteeth.core.etherbone.wishbone import * class LiteEthEtherbone(Module): def __init__(self, udp, udp_port): diff --git a/misoclib/liteeth/core/etherbone/dissector/bit.lua b/misoclib/com/liteeth/core/etherbone/dissector/bit.lua similarity index 100% rename from misoclib/liteeth/core/etherbone/dissector/bit.lua rename to misoclib/com/liteeth/core/etherbone/dissector/bit.lua diff --git a/misoclib/liteeth/core/etherbone/dissector/etherbone.lua b/misoclib/com/liteeth/core/etherbone/dissector/etherbone.lua similarity index 100% rename from misoclib/liteeth/core/etherbone/dissector/etherbone.lua rename to misoclib/com/liteeth/core/etherbone/dissector/etherbone.lua diff --git a/misoclib/liteeth/core/etherbone/packet.py b/misoclib/com/liteeth/core/etherbone/packet.py similarity index 94% rename from misoclib/liteeth/core/etherbone/packet.py rename to misoclib/com/liteeth/core/etherbone/packet.py index 79a6cd7c..a81a6a75 100644 --- a/misoclib/liteeth/core/etherbone/packet.py +++ b/misoclib/com/liteeth/core/etherbone/packet.py @@ -1,7 +1,7 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * -from misoclib.liteeth.generic.depacketizer import LiteEthDepacketizer -from misoclib.liteeth.generic.packetizer import LiteEthPacketizer +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * +from misoclib.com.liteeth.generic.depacketizer import LiteEthDepacketizer +from misoclib.com.liteeth.generic.packetizer import LiteEthPacketizer class LiteEthEtherbonePacketPacketizer(LiteEthPacketizer): def __init__(self): diff --git a/misoclib/liteeth/core/etherbone/probe.py b/misoclib/com/liteeth/core/etherbone/probe.py similarity index 86% rename from misoclib/liteeth/core/etherbone/probe.py rename to misoclib/com/liteeth/core/etherbone/probe.py index 465ced5f..07fc2040 100644 --- a/misoclib/liteeth/core/etherbone/probe.py +++ b/misoclib/com/liteeth/core/etherbone/probe.py @@ -1,5 +1,5 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * class LiteEthEtherboneProbe(Module): def __init__(self): diff --git a/misoclib/liteeth/core/etherbone/record.py b/misoclib/com/liteeth/core/etherbone/record.py similarity index 95% rename from misoclib/liteeth/core/etherbone/record.py rename to misoclib/com/liteeth/core/etherbone/record.py index db0d6d52..29c01bf5 100644 --- a/misoclib/liteeth/core/etherbone/record.py +++ b/misoclib/com/liteeth/core/etherbone/record.py @@ -1,7 +1,7 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * -from misoclib.liteeth.generic.depacketizer import LiteEthDepacketizer -from misoclib.liteeth.generic.packetizer import LiteEthPacketizer +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * +from misoclib.com.liteeth.generic.depacketizer import LiteEthDepacketizer +from misoclib.com.liteeth.generic.packetizer import LiteEthPacketizer class LiteEthEtherboneRecordPacketizer(LiteEthPacketizer): def __init__(self): diff --git a/misoclib/liteeth/core/etherbone/wishbone.py b/misoclib/com/liteeth/core/etherbone/wishbone.py similarity index 94% rename from misoclib/liteeth/core/etherbone/wishbone.py rename to misoclib/com/liteeth/core/etherbone/wishbone.py index 4d3f04cc..7f1530a8 100644 --- a/misoclib/liteeth/core/etherbone/wishbone.py +++ b/misoclib/com/liteeth/core/etherbone/wishbone.py @@ -1,5 +1,5 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * from migen.bus import wishbone class LiteEthEtherboneWishboneMaster(Module): diff --git a/misoclib/liteeth/core/icmp/__init__.py b/misoclib/com/liteeth/core/icmp/__init__.py similarity index 94% rename from misoclib/liteeth/core/icmp/__init__.py rename to misoclib/com/liteeth/core/icmp/__init__.py index 611d8482..c89da79e 100644 --- a/misoclib/liteeth/core/icmp/__init__.py +++ b/misoclib/com/liteeth/core/icmp/__init__.py @@ -1,7 +1,7 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * -from misoclib.liteeth.generic.depacketizer import LiteEthDepacketizer -from misoclib.liteeth.generic.packetizer import LiteEthPacketizer +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * +from misoclib.com.liteeth.generic.depacketizer import LiteEthDepacketizer +from misoclib.com.liteeth.generic.packetizer import LiteEthPacketizer class LiteEthICMPPacketizer(LiteEthPacketizer): def __init__(self): diff --git a/misoclib/liteeth/core/ip/__init__.py b/misoclib/com/liteeth/core/ip/__init__.py similarity index 94% rename from misoclib/liteeth/core/ip/__init__.py rename to misoclib/com/liteeth/core/ip/__init__.py index ca7bbf31..5c9edb1f 100644 --- a/misoclib/liteeth/core/ip/__init__.py +++ b/misoclib/com/liteeth/core/ip/__init__.py @@ -1,9 +1,9 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * -from misoclib.liteeth.core.ip.checksum import * -from misoclib.liteeth.core.ip.crossbar import * -from misoclib.liteeth.generic.depacketizer import LiteEthDepacketizer -from misoclib.liteeth.generic.packetizer import LiteEthPacketizer +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * +from misoclib.com.liteeth.core.ip.checksum import * +from misoclib.com.liteeth.core.ip.crossbar import * +from misoclib.com.liteeth.generic.depacketizer import LiteEthDepacketizer +from misoclib.com.liteeth.generic.packetizer import LiteEthPacketizer class LiteEthIPV4Packetizer(LiteEthPacketizer): def __init__(self): diff --git a/misoclib/liteeth/core/ip/checksum.py b/misoclib/com/liteeth/core/ip/checksum.py similarity index 93% rename from misoclib/liteeth/core/ip/checksum.py rename to misoclib/com/liteeth/core/ip/checksum.py index f6371c42..a502e02a 100644 --- a/misoclib/liteeth/core/ip/checksum.py +++ b/misoclib/com/liteeth/core/ip/checksum.py @@ -1,5 +1,5 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * class LiteEthIPV4Checksum(Module): def __init__(self, words_per_clock_cycle=1, skip_checksum=False): diff --git a/misoclib/liteeth/core/ip/crossbar.py b/misoclib/com/liteeth/core/ip/crossbar.py similarity index 84% rename from misoclib/liteeth/core/ip/crossbar.py rename to misoclib/com/liteeth/core/ip/crossbar.py index a49ee14e..f7de9773 100644 --- a/misoclib/liteeth/core/ip/crossbar.py +++ b/misoclib/com/liteeth/core/ip/crossbar.py @@ -1,6 +1,6 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * -from misoclib.liteeth.generic.crossbar import LiteEthCrossbar +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * +from misoclib.com.liteeth.generic.crossbar import LiteEthCrossbar class LiteEthIPV4MasterPort: def __init__(self, dw): diff --git a/misoclib/liteeth/core/tty/__init__.py b/misoclib/com/liteeth/core/tty/__init__.py similarity index 96% rename from misoclib/liteeth/core/tty/__init__.py rename to misoclib/com/liteeth/core/tty/__init__.py index 82bf5a0d..7ead3ef4 100644 --- a/misoclib/liteeth/core/tty/__init__.py +++ b/misoclib/com/liteeth/core/tty/__init__.py @@ -1,5 +1,5 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * class LiteEthTTYTX(Module): def __init__(self, ip_address, udp_port, fifo_depth=None): diff --git a/misoclib/liteeth/core/udp/__init__.py b/misoclib/com/liteeth/core/udp/__init__.py similarity index 92% rename from misoclib/liteeth/core/udp/__init__.py rename to misoclib/com/liteeth/core/udp/__init__.py index 1ff850fa..59f671df 100644 --- a/misoclib/liteeth/core/udp/__init__.py +++ b/misoclib/com/liteeth/core/udp/__init__.py @@ -1,8 +1,8 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * -from misoclib.liteeth.core.udp.crossbar import * -from misoclib.liteeth.generic.depacketizer import LiteEthDepacketizer -from misoclib.liteeth.generic.packetizer import LiteEthPacketizer +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * +from misoclib.com.liteeth.core.udp.crossbar import * +from misoclib.com.liteeth.generic.depacketizer import LiteEthDepacketizer +from misoclib.com.liteeth.generic.packetizer import LiteEthPacketizer class LiteEthUDPPacketizer(LiteEthPacketizer): def __init__(self): diff --git a/misoclib/liteeth/core/udp/crossbar.py b/misoclib/com/liteeth/core/udp/crossbar.py similarity index 90% rename from misoclib/liteeth/core/udp/crossbar.py rename to misoclib/com/liteeth/core/udp/crossbar.py index 191fe43a..a43f3eee 100644 --- a/misoclib/liteeth/core/udp/crossbar.py +++ b/misoclib/com/liteeth/core/udp/crossbar.py @@ -1,7 +1,7 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * -from misoclib.liteeth.generic.crossbar import LiteEthCrossbar +from misoclib.com.liteeth.generic.crossbar import LiteEthCrossbar class LiteEthUDPMasterPort: def __init__(self, dw): diff --git a/misoclib/liteeth/doc/.gitignore b/misoclib/com/liteeth/doc/.gitignore similarity index 100% rename from misoclib/liteeth/doc/.gitignore rename to misoclib/com/liteeth/doc/.gitignore diff --git a/misoclib/liteeth/doc/Makefile b/misoclib/com/liteeth/doc/Makefile similarity index 100% rename from misoclib/liteeth/doc/Makefile rename to misoclib/com/liteeth/doc/Makefile diff --git a/misoclib/liteeth/doc/make.bat b/misoclib/com/liteeth/doc/make.bat similarity index 100% rename from misoclib/liteeth/doc/make.bat rename to misoclib/com/liteeth/doc/make.bat diff --git a/misoclib/liteeth/doc/source/_static/LiteEth_logo_full.png b/misoclib/com/liteeth/doc/source/_static/LiteEth_logo_full.png similarity index 100% rename from misoclib/liteeth/doc/source/_static/LiteEth_logo_full.png rename to misoclib/com/liteeth/doc/source/_static/LiteEth_logo_full.png diff --git a/misoclib/liteeth/doc/source/_static/LiteEth_logo_full.svg b/misoclib/com/liteeth/doc/source/_static/LiteEth_logo_full.svg similarity index 100% rename from misoclib/liteeth/doc/source/_static/LiteEth_logo_full.svg rename to misoclib/com/liteeth/doc/source/_static/LiteEth_logo_full.svg diff --git a/misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/__init__.py b/misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/__init__.py similarity index 100% rename from misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/__init__.py rename to misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/__init__.py diff --git a/misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/breadcrumbs.html b/misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/breadcrumbs.html similarity index 100% rename from misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/breadcrumbs.html rename to misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/breadcrumbs.html diff --git a/misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/footer.html b/misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/footer.html similarity index 100% rename from misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/footer.html rename to misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/footer.html diff --git a/misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/layout.html b/misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/layout.html similarity index 100% rename from misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/layout.html rename to misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/layout.html diff --git a/misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/layout_old.html b/misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/layout_old.html similarity index 100% rename from misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/layout_old.html rename to misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/layout_old.html diff --git a/misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/search.html b/misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/search.html similarity index 100% rename from misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/search.html rename to misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/search.html diff --git a/misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/searchbox.html b/misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/searchbox.html similarity index 100% rename from misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/searchbox.html rename to misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/searchbox.html diff --git a/misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/badge_only.css b/misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/badge_only.css similarity index 100% rename from misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/badge_only.css rename to misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/badge_only.css diff --git a/misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/theme - prior to centering.css b/misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/theme - prior to centering.css similarity index 100% rename from misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/theme - prior to centering.css rename to misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/theme - prior to centering.css diff --git a/misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/theme.css b/misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/theme.css similarity index 100% rename from misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/theme.css rename to misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/css/theme.css diff --git a/misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot b/misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot similarity index 100% rename from misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot rename to misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot diff --git a/misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg b/misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg similarity index 100% rename from misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg rename to misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg diff --git a/misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf b/misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf similarity index 100% rename from misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf rename to misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf diff --git a/misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff b/misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff similarity index 100% rename from misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff rename to misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff diff --git a/misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/js/theme.js b/misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/js/theme.js similarity index 100% rename from misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/js/theme.js rename to misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/static/js/theme.js diff --git a/misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/theme.conf b/misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/theme.conf similarity index 100% rename from misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/theme.conf rename to misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/theme.conf diff --git a/misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/versions.html b/misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/versions.html similarity index 100% rename from misoclib/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/versions.html rename to misoclib/com/liteeth/doc/source/_themes/enjoydigital_sphinx_rtd_theme/versions.html diff --git a/misoclib/liteeth/doc/source/conf.py b/misoclib/com/liteeth/doc/source/conf.py similarity index 100% rename from misoclib/liteeth/doc/source/conf.py rename to misoclib/com/liteeth/doc/source/conf.py diff --git a/misoclib/liteeth/doc/source/docs/core/index.rst b/misoclib/com/liteeth/doc/source/docs/core/index.rst similarity index 100% rename from misoclib/liteeth/doc/source/docs/core/index.rst rename to misoclib/com/liteeth/doc/source/docs/core/index.rst diff --git a/misoclib/liteeth/doc/source/docs/frontend/index.rst b/misoclib/com/liteeth/doc/source/docs/frontend/index.rst similarity index 100% rename from misoclib/liteeth/doc/source/docs/frontend/index.rst rename to misoclib/com/liteeth/doc/source/docs/frontend/index.rst diff --git a/misoclib/liteeth/doc/source/docs/getting_started/FAQ.rst b/misoclib/com/liteeth/doc/source/docs/getting_started/FAQ.rst similarity index 100% rename from misoclib/liteeth/doc/source/docs/getting_started/FAQ.rst rename to misoclib/com/liteeth/doc/source/docs/getting_started/FAQ.rst diff --git a/misoclib/liteeth/doc/source/docs/getting_started/bug_reports.rst b/misoclib/com/liteeth/doc/source/docs/getting_started/bug_reports.rst similarity index 100% rename from misoclib/liteeth/doc/source/docs/getting_started/bug_reports.rst rename to misoclib/com/liteeth/doc/source/docs/getting_started/bug_reports.rst diff --git a/misoclib/liteeth/doc/source/docs/getting_started/downloads.rst b/misoclib/com/liteeth/doc/source/docs/getting_started/downloads.rst similarity index 100% rename from misoclib/liteeth/doc/source/docs/getting_started/downloads.rst rename to misoclib/com/liteeth/doc/source/docs/getting_started/downloads.rst diff --git a/misoclib/liteeth/doc/source/docs/getting_started/index.rst b/misoclib/com/liteeth/doc/source/docs/getting_started/index.rst similarity index 100% rename from misoclib/liteeth/doc/source/docs/getting_started/index.rst rename to misoclib/com/liteeth/doc/source/docs/getting_started/index.rst diff --git a/misoclib/liteeth/doc/source/docs/index.rst b/misoclib/com/liteeth/doc/source/docs/index.rst similarity index 100% rename from misoclib/liteeth/doc/source/docs/index.rst rename to misoclib/com/liteeth/doc/source/docs/index.rst diff --git a/misoclib/liteeth/doc/source/docs/intro/about.rst b/misoclib/com/liteeth/doc/source/docs/intro/about.rst similarity index 100% rename from misoclib/liteeth/doc/source/docs/intro/about.rst rename to misoclib/com/liteeth/doc/source/docs/intro/about.rst diff --git a/misoclib/liteeth/doc/source/docs/intro/community.rst b/misoclib/com/liteeth/doc/source/docs/intro/community.rst similarity index 100% rename from misoclib/liteeth/doc/source/docs/intro/community.rst rename to misoclib/com/liteeth/doc/source/docs/intro/community.rst diff --git a/misoclib/liteeth/doc/source/docs/intro/index.rst b/misoclib/com/liteeth/doc/source/docs/intro/index.rst similarity index 100% rename from misoclib/liteeth/doc/source/docs/intro/index.rst rename to misoclib/com/liteeth/doc/source/docs/intro/index.rst diff --git a/misoclib/liteeth/doc/source/docs/intro/license.rst b/misoclib/com/liteeth/doc/source/docs/intro/license.rst similarity index 100% rename from misoclib/liteeth/doc/source/docs/intro/license.rst rename to misoclib/com/liteeth/doc/source/docs/intro/license.rst diff --git a/misoclib/liteeth/doc/source/docs/intro/release_notes.rst b/misoclib/com/liteeth/doc/source/docs/intro/release_notes.rst similarity index 100% rename from misoclib/liteeth/doc/source/docs/intro/release_notes.rst rename to misoclib/com/liteeth/doc/source/docs/intro/release_notes.rst diff --git a/misoclib/liteeth/doc/source/docs/intro/talks_and_publications.rst b/misoclib/com/liteeth/doc/source/docs/intro/talks_and_publications.rst similarity index 100% rename from misoclib/liteeth/doc/source/docs/intro/talks_and_publications.rst rename to misoclib/com/liteeth/doc/source/docs/intro/talks_and_publications.rst diff --git a/misoclib/liteeth/doc/source/home_page_layout.html b/misoclib/com/liteeth/doc/source/home_page_layout.html similarity index 100% rename from misoclib/liteeth/doc/source/home_page_layout.html rename to misoclib/com/liteeth/doc/source/home_page_layout.html diff --git a/misoclib/liteeth/doc/source/index.rst b/misoclib/com/liteeth/doc/source/index.rst similarity index 100% rename from misoclib/liteeth/doc/source/index.rst rename to misoclib/com/liteeth/doc/source/index.rst diff --git a/misoclib/liteeth/mac/frontend/__init__.py b/misoclib/com/liteeth/example_designs/__init__.py similarity index 100% rename from misoclib/liteeth/mac/frontend/__init__.py rename to misoclib/com/liteeth/example_designs/__init__.py diff --git a/misoclib/liteeth/example_designs/make.py b/misoclib/com/liteeth/example_designs/make.py similarity index 99% rename from misoclib/liteeth/example_designs/make.py rename to misoclib/com/liteeth/example_designs/make.py index 2ae4b1ed..73de00fd 100644 --- a/misoclib/liteeth/example_designs/make.py +++ b/misoclib/com/liteeth/example_designs/make.py @@ -11,7 +11,7 @@ from mibuild import tools from mibuild.xilinx_common import * sys.path.append("../../../") # Temporary -from misoclib.liteeth.common import * +from misoclib.com.liteeth.common import * def get_csr_csv(regions): r = "" diff --git a/misoclib/liteeth/example_designs/platforms/kc705.py b/misoclib/com/liteeth/example_designs/platforms/kc705.py similarity index 100% rename from misoclib/liteeth/example_designs/platforms/kc705.py rename to misoclib/com/liteeth/example_designs/platforms/kc705.py diff --git a/misoclib/liteeth/example_designs/targets/__init__.py b/misoclib/com/liteeth/example_designs/targets/__init__.py similarity index 100% rename from misoclib/liteeth/example_designs/targets/__init__.py rename to misoclib/com/liteeth/example_designs/targets/__init__.py diff --git a/misoclib/liteeth/example_designs/targets/base.py b/misoclib/com/liteeth/example_designs/targets/base.py similarity index 97% rename from misoclib/liteeth/example_designs/targets/base.py rename to misoclib/com/liteeth/example_designs/targets/base.py index 6c6720d0..443eab5a 100644 --- a/misoclib/liteeth/example_designs/targets/base.py +++ b/misoclib/com/liteeth/example_designs/targets/base.py @@ -14,10 +14,10 @@ from litescope.bridge.uart2wb import LiteScopeUART2WB from litescope.frontend.la import LiteScopeLA from litescope.core.port import LiteScopeTerm -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * -from misoclib.liteeth.phy.gmii import LiteEthPHYGMII -from misoclib.liteeth.core import LiteEthUDPIPCore +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * +from misoclib.com.liteeth.phy.gmii import LiteEthPHYGMII +from misoclib.com.liteeth.core import LiteEthUDPIPCore class _CRG(Module): def __init__(self, platform): diff --git a/misoclib/liteeth/example_designs/targets/etherbone.py b/misoclib/com/liteeth/example_designs/targets/etherbone.py similarity index 93% rename from misoclib/liteeth/example_designs/targets/etherbone.py rename to misoclib/com/liteeth/example_designs/targets/etherbone.py index 74b1cbc5..5b58aa73 100644 --- a/misoclib/liteeth/example_designs/targets/etherbone.py +++ b/misoclib/com/liteeth/example_designs/targets/etherbone.py @@ -2,11 +2,11 @@ from litescope.common import * from litescope.frontend.la import LiteScopeLA from litescope.core.port import LiteScopeTerm -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * from targets.base import BaseSoC -from misoclib.liteeth.core.etherbone import LiteEthEtherbone +from misoclib.com.liteeth.core.etherbone import LiteEthEtherbone class EtherboneSoC(BaseSoC): default_platform = "kc705" diff --git a/misoclib/liteeth/example_designs/targets/tty.py b/misoclib/com/liteeth/example_designs/targets/tty.py similarity index 87% rename from misoclib/liteeth/example_designs/targets/tty.py rename to misoclib/com/liteeth/example_designs/targets/tty.py index 43e33627..e2fbe87a 100644 --- a/misoclib/liteeth/example_designs/targets/tty.py +++ b/misoclib/com/liteeth/example_designs/targets/tty.py @@ -2,11 +2,11 @@ from litescope.common import * from litescope.frontend.la import LiteScopeLA from litescope.core.port import LiteScopeTerm -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * from targets.base import BaseSoC -from misoclib.liteeth.core.tty import LiteEthTTY +from misoclib.com.liteeth.core.tty import LiteEthTTY class TTYSoC(BaseSoC): default_platform = "kc705" diff --git a/misoclib/liteeth/example_designs/targets/udp.py b/misoclib/com/liteeth/example_designs/targets/udp.py similarity index 95% rename from misoclib/liteeth/example_designs/targets/udp.py rename to misoclib/com/liteeth/example_designs/targets/udp.py index ae297973..9e4da6a1 100644 --- a/misoclib/liteeth/example_designs/targets/udp.py +++ b/misoclib/com/liteeth/example_designs/targets/udp.py @@ -2,8 +2,8 @@ from litescope.common import * from litescope.frontend.la import LiteScopeLA from litescope.core.port import LiteScopeTerm -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * from targets.base import BaseSoC diff --git a/misoclib/liteeth/example_designs/test/make.py b/misoclib/com/liteeth/example_designs/test/make.py similarity index 100% rename from misoclib/liteeth/example_designs/test/make.py rename to misoclib/com/liteeth/example_designs/test/make.py diff --git a/misoclib/liteeth/example_designs/test/test_etherbone.py b/misoclib/com/liteeth/example_designs/test/test_etherbone.py similarity index 95% rename from misoclib/liteeth/example_designs/test/test_etherbone.py rename to misoclib/com/liteeth/example_designs/test/test_etherbone.py index 444aca9f..e60af216 100644 --- a/misoclib/liteeth/example_designs/test/test_etherbone.py +++ b/misoclib/com/liteeth/example_designs/test/test_etherbone.py @@ -1,5 +1,5 @@ import socket, time -from misoclib.liteeth.test.model.etherbone import * +from misoclib.com.liteeth.test.model.etherbone import * SRAM_BASE = 0x02000000 diff --git a/misoclib/liteeth/example_designs/test/test_la.py b/misoclib/com/liteeth/example_designs/test/test_la.py similarity index 100% rename from misoclib/liteeth/example_designs/test/test_la.py rename to misoclib/com/liteeth/example_designs/test/test_la.py diff --git a/misoclib/liteeth/example_designs/test/test_regs.py b/misoclib/com/liteeth/example_designs/test/test_regs.py similarity index 100% rename from misoclib/liteeth/example_designs/test/test_regs.py rename to misoclib/com/liteeth/example_designs/test/test_regs.py diff --git a/misoclib/liteeth/example_designs/test/test_tty.py b/misoclib/com/liteeth/example_designs/test/test_tty.py similarity index 100% rename from misoclib/liteeth/example_designs/test/test_tty.py rename to misoclib/com/liteeth/example_designs/test/test_tty.py diff --git a/misoclib/liteeth/example_designs/test/test_udp.py b/misoclib/com/liteeth/example_designs/test/test_udp.py similarity index 100% rename from misoclib/liteeth/example_designs/test/test_udp.py rename to misoclib/com/liteeth/example_designs/test/test_udp.py diff --git a/misoclib/liteeth/generic/__init__.py b/misoclib/com/liteeth/generic/__init__.py similarity index 98% rename from misoclib/liteeth/generic/__init__.py rename to misoclib/com/liteeth/generic/__init__.py index 8de59192..e90ca078 100644 --- a/misoclib/liteeth/generic/__init__.py +++ b/misoclib/com/liteeth/generic/__init__.py @@ -1,4 +1,4 @@ -from misoclib.liteeth.common import * +from misoclib.com.liteeth.common import * # Generic classes class Port: diff --git a/misoclib/liteeth/generic/arbiter.py b/misoclib/com/liteeth/generic/arbiter.py similarity index 100% rename from misoclib/liteeth/generic/arbiter.py rename to misoclib/com/liteeth/generic/arbiter.py diff --git a/misoclib/liteeth/generic/crossbar.py b/misoclib/com/liteeth/generic/crossbar.py similarity index 80% rename from misoclib/liteeth/generic/crossbar.py rename to misoclib/com/liteeth/generic/crossbar.py index 0464d029..a443eb7f 100644 --- a/misoclib/liteeth/generic/crossbar.py +++ b/misoclib/com/liteeth/generic/crossbar.py @@ -1,9 +1,9 @@ from collections import OrderedDict -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * -from misoclib.liteeth.generic.arbiter import Arbiter -from misoclib.liteeth.generic.dispatcher import Dispatcher +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * +from misoclib.com.liteeth.generic.arbiter import Arbiter +from misoclib.com.liteeth.generic.dispatcher import Dispatcher class LiteEthCrossbar(Module): def __init__(self, master_port, dispatch_param): diff --git a/misoclib/liteeth/generic/depacketizer.py b/misoclib/com/liteeth/generic/depacketizer.py similarity index 95% rename from misoclib/liteeth/generic/depacketizer.py rename to misoclib/com/liteeth/generic/depacketizer.py index cb5a08d2..cb7d4430 100644 --- a/misoclib/liteeth/generic/depacketizer.py +++ b/misoclib/com/liteeth/generic/depacketizer.py @@ -1,5 +1,5 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * def _decode_header(h_dict, h_signal, obj): r = [] diff --git a/misoclib/liteeth/generic/dispatcher.py b/misoclib/com/liteeth/generic/dispatcher.py similarity index 100% rename from misoclib/liteeth/generic/dispatcher.py rename to misoclib/com/liteeth/generic/dispatcher.py diff --git a/misoclib/liteeth/generic/packetizer.py b/misoclib/com/liteeth/generic/packetizer.py similarity index 96% rename from misoclib/liteeth/generic/packetizer.py rename to misoclib/com/liteeth/generic/packetizer.py index f80a55c1..91b7202a 100644 --- a/misoclib/liteeth/generic/packetizer.py +++ b/misoclib/com/liteeth/generic/packetizer.py @@ -1,5 +1,5 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * def _encode_header(h_dict, h_signal, obj): r = [] diff --git a/misoclib/liteeth/liteeth-version.txt b/misoclib/com/liteeth/liteeth-version.txt similarity index 100% rename from misoclib/liteeth/liteeth-version.txt rename to misoclib/com/liteeth/liteeth-version.txt diff --git a/misoclib/liteeth/mac/__init__.py b/misoclib/com/liteeth/mac/__init__.py similarity index 81% rename from misoclib/liteeth/mac/__init__.py rename to misoclib/com/liteeth/mac/__init__.py index 622c1842..0ffe3009 100644 --- a/misoclib/liteeth/mac/__init__.py +++ b/misoclib/com/liteeth/mac/__init__.py @@ -1,8 +1,8 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * -from misoclib.liteeth.mac.common import * -from misoclib.liteeth.mac.core import LiteEthMACCore -from misoclib.liteeth.mac.frontend.wishbone import LiteEthMACWishboneInterface +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * +from misoclib.com.liteeth.mac.common import * +from misoclib.com.liteeth.mac.core import LiteEthMACCore +from misoclib.com.liteeth.mac.frontend.wishbone import LiteEthMACWishboneInterface class LiteEthMAC(Module, AutoCSR): def __init__(self, phy, dw, interface="crossbar", endianness="big", diff --git a/misoclib/liteeth/mac/common.py b/misoclib/com/liteeth/mac/common.py similarity index 80% rename from misoclib/liteeth/mac/common.py rename to misoclib/com/liteeth/mac/common.py index cc0e8b20..ba1b0ec2 100644 --- a/misoclib/liteeth/mac/common.py +++ b/misoclib/com/liteeth/mac/common.py @@ -1,8 +1,8 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * -from misoclib.liteeth.generic.depacketizer import LiteEthDepacketizer -from misoclib.liteeth.generic.packetizer import LiteEthPacketizer -from misoclib.liteeth.generic.crossbar import LiteEthCrossbar +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * +from misoclib.com.liteeth.generic.depacketizer import LiteEthDepacketizer +from misoclib.com.liteeth.generic.packetizer import LiteEthPacketizer +from misoclib.com.liteeth.generic.crossbar import LiteEthCrossbar class LiteEthMACDepacketizer(LiteEthDepacketizer): def __init__(self): diff --git a/misoclib/liteeth/mac/core/__init__.py b/misoclib/com/liteeth/mac/core/__init__.py similarity index 94% rename from misoclib/liteeth/mac/core/__init__.py rename to misoclib/com/liteeth/mac/core/__init__.py index d5ca2db0..0eaa44a9 100644 --- a/misoclib/liteeth/mac/core/__init__.py +++ b/misoclib/com/liteeth/mac/core/__init__.py @@ -1,6 +1,6 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * -from misoclib.liteeth.mac.core import gap, preamble, crc, padding, last_be +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * +from misoclib.com.liteeth.mac.core import gap, preamble, crc, padding, last_be class LiteEthMACCore(Module, AutoCSR): def __init__(self, phy, dw, endianness="big", with_hw_preamble_crc=True): diff --git a/misoclib/liteeth/mac/core/crc.py b/misoclib/com/liteeth/mac/core/crc.py similarity index 98% rename from misoclib/liteeth/mac/core/crc.py rename to misoclib/com/liteeth/mac/core/crc.py index 84d0c49f..6f1f8ff7 100644 --- a/misoclib/liteeth/mac/core/crc.py +++ b/misoclib/com/liteeth/mac/core/crc.py @@ -1,5 +1,5 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * class LiteEthMACCRCEngine(Module): """Cyclic Redundancy Check Engine diff --git a/misoclib/liteeth/mac/core/gap.py b/misoclib/com/liteeth/mac/core/gap.py similarity index 87% rename from misoclib/liteeth/mac/core/gap.py rename to misoclib/com/liteeth/mac/core/gap.py index a1cfe5a4..9a350868 100644 --- a/misoclib/liteeth/mac/core/gap.py +++ b/misoclib/com/liteeth/mac/core/gap.py @@ -1,5 +1,5 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * class LiteEthMACGap(Module): def __init__(self, dw, ack_on_gap=False): diff --git a/misoclib/liteeth/mac/core/last_be.py b/misoclib/com/liteeth/mac/core/last_be.py similarity index 91% rename from misoclib/liteeth/mac/core/last_be.py rename to misoclib/com/liteeth/mac/core/last_be.py index 4ea1d215..bf106eeb 100644 --- a/misoclib/liteeth/mac/core/last_be.py +++ b/misoclib/com/liteeth/mac/core/last_be.py @@ -1,5 +1,5 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * class LiteEthMACTXLastBE(Module): def __init__(self, dw): diff --git a/misoclib/liteeth/mac/core/padding.py b/misoclib/com/liteeth/mac/core/padding.py similarity index 93% rename from misoclib/liteeth/mac/core/padding.py rename to misoclib/com/liteeth/mac/core/padding.py index 8048f90b..b30fc44e 100644 --- a/misoclib/liteeth/mac/core/padding.py +++ b/misoclib/com/liteeth/mac/core/padding.py @@ -1,5 +1,5 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * class LiteEthMACPaddingInserter(Module): def __init__(self, dw, packet_min_length): diff --git a/misoclib/liteeth/mac/core/preamble.py b/misoclib/com/liteeth/mac/core/preamble.py similarity index 96% rename from misoclib/liteeth/mac/core/preamble.py rename to misoclib/com/liteeth/mac/core/preamble.py index 283e4d53..89527e95 100644 --- a/misoclib/liteeth/mac/core/preamble.py +++ b/misoclib/com/liteeth/mac/core/preamble.py @@ -1,5 +1,5 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * class LiteEthMACPreambleInserter(Module): def __init__(self, dw): diff --git a/misoclib/liteeth/phy/__init__.py b/misoclib/com/liteeth/mac/frontend/__init__.py similarity index 100% rename from misoclib/liteeth/phy/__init__.py rename to misoclib/com/liteeth/mac/frontend/__init__.py diff --git a/misoclib/liteeth/mac/frontend/sram.py b/misoclib/com/liteeth/mac/frontend/sram.py similarity index 98% rename from misoclib/liteeth/mac/frontend/sram.py rename to misoclib/com/liteeth/mac/frontend/sram.py index 86d7710b..7df9c584 100644 --- a/misoclib/liteeth/mac/frontend/sram.py +++ b/misoclib/com/liteeth/mac/frontend/sram.py @@ -1,5 +1,5 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * from migen.bank.description import * from migen.bank.eventmanager import * diff --git a/misoclib/liteeth/mac/frontend/wishbone.py b/misoclib/com/liteeth/mac/frontend/wishbone.py similarity index 90% rename from misoclib/liteeth/mac/frontend/wishbone.py rename to misoclib/com/liteeth/mac/frontend/wishbone.py index ec35918b..00747f92 100644 --- a/misoclib/liteeth/mac/frontend/wishbone.py +++ b/misoclib/com/liteeth/mac/frontend/wishbone.py @@ -1,6 +1,6 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * -from misoclib.liteeth.mac.frontend import sram +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * +from misoclib.com.liteeth.mac.frontend import sram from migen.bus import wishbone from migen.fhdl.simplify import FullMemoryWE diff --git a/misoclib/liteeth/test/__init__.py b/misoclib/com/liteeth/phy/__init__.py similarity index 100% rename from misoclib/liteeth/test/__init__.py rename to misoclib/com/liteeth/phy/__init__.py diff --git a/misoclib/liteeth/phy/gmii.py b/misoclib/com/liteeth/phy/gmii.py similarity index 96% rename from misoclib/liteeth/phy/gmii.py rename to misoclib/com/liteeth/phy/gmii.py index dc16c261..3e81c301 100644 --- a/misoclib/liteeth/phy/gmii.py +++ b/misoclib/com/liteeth/phy/gmii.py @@ -1,5 +1,5 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * class LiteEthPHYGMIITX(Module): def __init__(self, pads): diff --git a/misoclib/liteeth/phy/loopback.py b/misoclib/com/liteeth/phy/loopback.py similarity index 89% rename from misoclib/liteeth/phy/loopback.py rename to misoclib/com/liteeth/phy/loopback.py index 51d4e56b..8fa8ac10 100644 --- a/misoclib/liteeth/phy/loopback.py +++ b/misoclib/com/liteeth/phy/loopback.py @@ -1,5 +1,5 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * class LiteEthPHYLoopbackCRG(Module, AutoCSR): def __init__(self): diff --git a/misoclib/liteeth/phy/mii.py b/misoclib/com/liteeth/phy/mii.py similarity index 97% rename from misoclib/liteeth/phy/mii.py rename to misoclib/com/liteeth/phy/mii.py index 0a5ca660..779c8e3d 100644 --- a/misoclib/liteeth/phy/mii.py +++ b/misoclib/com/liteeth/phy/mii.py @@ -1,5 +1,5 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * class LiteEthPHYMIITX(Module): def __init__(self, pads): diff --git a/misoclib/liteeth/phy/sim.py b/misoclib/com/liteeth/phy/sim.py similarity index 92% rename from misoclib/liteeth/phy/sim.py rename to misoclib/com/liteeth/phy/sim.py index a2079a52..8b81576b 100644 --- a/misoclib/liteeth/phy/sim.py +++ b/misoclib/com/liteeth/phy/sim.py @@ -1,5 +1,5 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.generic import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.generic import * class LiteEthPHYSimCRG(Module, AutoCSR): def __init__(self): diff --git a/misoclib/liteeth/setup.py b/misoclib/com/liteeth/setup.py similarity index 100% rename from misoclib/liteeth/setup.py rename to misoclib/com/liteeth/setup.py diff --git a/misoclib/liteeth/test/Makefile b/misoclib/com/liteeth/test/Makefile similarity index 100% rename from misoclib/liteeth/test/Makefile rename to misoclib/com/liteeth/test/Makefile diff --git a/misoclib/liteeth/test/model/__init__.py b/misoclib/com/liteeth/test/__init__.py similarity index 100% rename from misoclib/liteeth/test/model/__init__.py rename to misoclib/com/liteeth/test/__init__.py diff --git a/misoclib/liteeth/test/arp_tb.py b/misoclib/com/liteeth/test/arp_tb.py similarity index 86% rename from misoclib/liteeth/test/arp_tb.py rename to misoclib/com/liteeth/test/arp_tb.py index 2d2a1ee7..a6df434d 100644 --- a/misoclib/liteeth/test/arp_tb.py +++ b/misoclib/com/liteeth/test/arp_tb.py @@ -3,12 +3,12 @@ from migen.bus import wishbone from migen.bus.transactions import * from migen.sim.generic import run_simulation -from misoclib.liteeth.common import * -from misoclib.liteeth.mac import LiteEthMAC -from misoclib.liteeth.core.arp import LiteEthARP +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.mac import LiteEthMAC +from misoclib.com.liteeth.core.arp import LiteEthARP -from misoclib.liteeth.test.common import * -from misoclib.liteeth.test.model import phy, mac, arp +from misoclib.com.liteeth.test.common import * +from misoclib.com.liteeth.test.model import phy, mac, arp ip_address = 0x12345678 mac_address = 0x12345678abcd diff --git a/misoclib/liteeth/test/common.py b/misoclib/com/liteeth/test/common.py similarity index 98% rename from misoclib/liteeth/test/common.py rename to misoclib/com/liteeth/test/common.py index 8b32855b..6519aff2 100644 --- a/misoclib/liteeth/test/common.py +++ b/misoclib/com/liteeth/test/common.py @@ -4,7 +4,7 @@ from migen.fhdl.std import * from migen.flow.actor import Sink, Source from migen.genlib.record import * -from misoclib.liteeth.common import * +from misoclib.com.liteeth.common import * def print_with_prefix(s, prefix=""): if not isinstance(s, str): diff --git a/misoclib/liteeth/test/etherbone_tb.py b/misoclib/com/liteeth/test/etherbone_tb.py similarity index 92% rename from misoclib/liteeth/test/etherbone_tb.py rename to misoclib/com/liteeth/test/etherbone_tb.py index dbcda159..5f751b04 100644 --- a/misoclib/liteeth/test/etherbone_tb.py +++ b/misoclib/com/liteeth/test/etherbone_tb.py @@ -3,12 +3,12 @@ from migen.bus import wishbone from migen.bus.transactions import * from migen.sim.generic import run_simulation -from misoclib.liteeth.common import * -from misoclib.liteeth.core import LiteEthUDPIPCore -from misoclib.liteeth.core.etherbone import LiteEthEtherbone +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.core import LiteEthUDPIPCore +from misoclib.com.liteeth.core.etherbone import LiteEthEtherbone -from misoclib.liteeth.test.common import * -from misoclib.liteeth.test.model import phy, mac, arp, ip, udp, etherbone +from misoclib.com.liteeth.test.common import * +from misoclib.com.liteeth.test.model import phy, mac, arp, ip, udp, etherbone ip_address = 0x12345678 mac_address = 0x12345678abcd diff --git a/misoclib/liteeth/test/icmp_tb.py b/misoclib/com/liteeth/test/icmp_tb.py similarity index 78% rename from misoclib/liteeth/test/icmp_tb.py rename to misoclib/com/liteeth/test/icmp_tb.py index fd66fe64..a34e0606 100644 --- a/misoclib/liteeth/test/icmp_tb.py +++ b/misoclib/com/liteeth/test/icmp_tb.py @@ -3,15 +3,15 @@ from migen.bus import wishbone from migen.bus.transactions import * from migen.sim.generic import run_simulation -from misoclib.liteeth.common import * -from misoclib.liteeth.core import LiteEthIPCore - -from misoclib.liteeth.test.common import * -from misoclib.liteeth.test.model.dumps import * -from misoclib.liteeth.test.model.mac import * -from misoclib.liteeth.test.model.ip import * -from misoclib.liteeth.test.model.icmp import * -from misoclib.liteeth.test.model import phy, mac, arp, ip, icmp +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.core import LiteEthIPCore + +from misoclib.com.liteeth.test.common import * +from misoclib.com.liteeth.test.model.dumps import * +from misoclib.com.liteeth.test.model.mac import * +from misoclib.com.liteeth.test.model.ip import * +from misoclib.com.liteeth.test.model.icmp import * +from misoclib.com.liteeth.test.model import phy, mac, arp, ip, icmp ip_address = 0x12345678 mac_address = 0x12345678abcd diff --git a/misoclib/liteeth/test/ip_tb.py b/misoclib/com/liteeth/test/ip_tb.py similarity index 85% rename from misoclib/liteeth/test/ip_tb.py rename to misoclib/com/liteeth/test/ip_tb.py index 434f8857..7652a976 100644 --- a/misoclib/liteeth/test/ip_tb.py +++ b/misoclib/com/liteeth/test/ip_tb.py @@ -3,11 +3,11 @@ from migen.bus import wishbone from migen.bus.transactions import * from migen.sim.generic import run_simulation -from misoclib.liteeth.common import * -from misoclib.liteeth.core import LiteEthIPCore +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.core import LiteEthIPCore -from misoclib.liteeth.test.common import * -from misoclib.liteeth.test.model import phy, mac, arp, ip +from misoclib.com.liteeth.test.common import * +from misoclib.com.liteeth.test.model import phy, mac, arp, ip ip_address = 0x12345678 mac_address = 0x12345678abcd @@ -51,7 +51,7 @@ class TB(Module): selfp.ip_port.source.ack = 1 if selfp.ip_port.source.stb == 1 and selfp.ip_port.source.sop == 1: - print("packet from from IP 0x{:08x}".format(selfp.ip_port.sink.ip_address)) + print("packet from IP 0x{:08x}".format(selfp.ip_port.sink.ip_address)) yield diff --git a/misoclib/liteeth/test/mac_core_tb.py b/misoclib/com/liteeth/test/mac_core_tb.py similarity index 91% rename from misoclib/liteeth/test/mac_core_tb.py rename to misoclib/com/liteeth/test/mac_core_tb.py index 3f48cf89..fe6451bd 100644 --- a/misoclib/liteeth/test/mac_core_tb.py +++ b/misoclib/com/liteeth/test/mac_core_tb.py @@ -3,11 +3,11 @@ from migen.bus import wishbone from migen.bus.transactions import * from migen.sim.generic import run_simulation -from misoclib.liteeth.common import * -from misoclib.liteeth.mac.core import LiteEthMACCore +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.mac.core import LiteEthMACCore -from misoclib.liteeth.test.common import * -from misoclib.liteeth.test.model import phy, mac +from misoclib.com.liteeth.test.common import * +from misoclib.com.liteeth.test.model import phy, mac class TB(Module): def __init__(self): diff --git a/misoclib/liteeth/test/mac_wishbone_tb.py b/misoclib/com/liteeth/test/mac_wishbone_tb.py similarity index 95% rename from misoclib/liteeth/test/mac_wishbone_tb.py rename to misoclib/com/liteeth/test/mac_wishbone_tb.py index 4db3974b..2f6d09cf 100644 --- a/misoclib/liteeth/test/mac_wishbone_tb.py +++ b/misoclib/com/liteeth/test/mac_wishbone_tb.py @@ -3,11 +3,11 @@ from migen.bus import wishbone from migen.bus.transactions import * from migen.sim.generic import run_simulation -from misoclib.liteeth.common import * -from misoclib.liteeth.mac import LiteEthMAC +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.mac import LiteEthMAC -from misoclib.liteeth.test.common import * -from misoclib.liteeth.test.model import phy, mac +from misoclib.com.liteeth.test.common import * +from misoclib.com.liteeth.test.model import phy, mac class WishboneMaster: def __init__(self, obj): diff --git a/misoclib/com/liteeth/test/model/__init__.py b/misoclib/com/liteeth/test/model/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/misoclib/liteeth/test/model/arp.py b/misoclib/com/liteeth/test/model/arp.py similarity index 93% rename from misoclib/liteeth/test/model/arp.py rename to misoclib/com/liteeth/test/model/arp.py index e6f3bfe6..9ca58d09 100644 --- a/misoclib/liteeth/test/model/arp.py +++ b/misoclib/com/liteeth/test/model/arp.py @@ -1,9 +1,9 @@ import math -from misoclib.liteeth.common import * -from misoclib.liteeth.test.common import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.test.common import * -from misoclib.liteeth.test.model import mac +from misoclib.com.liteeth.test.model import mac def print_arp(s): print_with_prefix(s, "[ARP]") @@ -118,8 +118,8 @@ class ARP(Module): request.target_ip = ip_address if __name__ == "__main__": - from misoclib.liteeth.test.model.dumps import * - from misoclib.liteeth.test.model.mac import * + from misoclib.com.liteeth.test.model.dumps import * + from misoclib.com.liteeth.test.model.mac import * errors = 0 # ARP request packet = MACPacket(arp_request) diff --git a/misoclib/liteeth/test/model/dumps.py b/misoclib/com/liteeth/test/model/dumps.py similarity index 100% rename from misoclib/liteeth/test/model/dumps.py rename to misoclib/com/liteeth/test/model/dumps.py diff --git a/misoclib/liteeth/test/model/etherbone.py b/misoclib/com/liteeth/test/model/etherbone.py similarity index 98% rename from misoclib/liteeth/test/model/etherbone.py rename to misoclib/com/liteeth/test/model/etherbone.py index 96606e31..7c3e35a3 100644 --- a/misoclib/liteeth/test/model/etherbone.py +++ b/misoclib/com/liteeth/test/model/etherbone.py @@ -1,9 +1,9 @@ import math, copy -from misoclib.liteeth.common import * -from misoclib.liteeth.test.common import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.test.common import * -from misoclib.liteeth.test.model import udp +from misoclib.com.liteeth.test.model import udp def print_etherbone(s): print_with_prefix(s, "[ETHERBONE]") diff --git a/misoclib/liteeth/test/model/icmp.py b/misoclib/com/liteeth/test/model/icmp.py similarity index 87% rename from misoclib/liteeth/test/model/icmp.py rename to misoclib/com/liteeth/test/model/icmp.py index 2d4ff245..e04e5d36 100644 --- a/misoclib/liteeth/test/model/icmp.py +++ b/misoclib/com/liteeth/test/model/icmp.py @@ -1,9 +1,9 @@ import math -from misoclib.liteeth.common import * -from misoclib.liteeth.test.common import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.test.common import * -from misoclib.liteeth.test.model import ip +from misoclib.com.liteeth.test.model import ip def print_icmp(s): print_with_prefix(s, "[ICMP]") @@ -79,9 +79,9 @@ class ICMP(Module): pass if __name__ == "__main__": - from misoclib.liteeth.test.model.dumps import * - from misoclib.liteeth.test.model.mac import * - from misoclib.liteeth.test.model.ip import * + from misoclib.com.liteeth.test.model.dumps import * + from misoclib.com.liteeth.test.model.mac import * + from misoclib.com.liteeth.test.model.ip import * errors = 0 # ICMP packet packet = MACPacket(ping_request) diff --git a/misoclib/liteeth/test/model/ip.py b/misoclib/com/liteeth/test/model/ip.py similarity index 92% rename from misoclib/liteeth/test/model/ip.py rename to misoclib/com/liteeth/test/model/ip.py index 97ec33d0..58e70a93 100644 --- a/misoclib/liteeth/test/model/ip.py +++ b/misoclib/com/liteeth/test/model/ip.py @@ -1,9 +1,9 @@ import math -from misoclib.liteeth.common import * -from misoclib.liteeth.test.common import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.test.common import * -from misoclib.liteeth.test.model import mac +from misoclib.com.liteeth.test.model import mac def print_ip(s): print_with_prefix(s, "[IP]") @@ -124,8 +124,8 @@ class IP(Module): self.icmp_callback(packet) if __name__ == "__main__": - from misoclib.liteeth.test.model.dumps import * - from misoclib.liteeth.test.model.mac import * + from misoclib.com.liteeth.test.model.dumps import * + from misoclib.com.liteeth.test.model.mac import * errors = 0 # UDP packet packet = MACPacket(udp) diff --git a/misoclib/liteeth/test/model/mac.py b/misoclib/com/liteeth/test/model/mac.py similarity index 96% rename from misoclib/liteeth/test/model/mac.py rename to misoclib/com/liteeth/test/model/mac.py index c4d6c905..33a1d91f 100644 --- a/misoclib/liteeth/test/model/mac.py +++ b/misoclib/com/liteeth/test/model/mac.py @@ -1,7 +1,7 @@ import math, binascii -from misoclib.liteeth.common import * -from misoclib.liteeth.test.common import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.test.common import * def print_mac(s): print_with_prefix(s, "[MAC]") @@ -127,7 +127,7 @@ class MAC(Module): raise ValueError # XXX handle this properly if __name__ == "__main__": - from misoclib.liteeth.test.model.dumps import * + from misoclib.com.liteeth.test.model.dumps import * errors = 0 packet = MACPacket(arp_request) packet.decode_remove_header() diff --git a/misoclib/liteeth/test/model/phy.py b/misoclib/com/liteeth/test/model/phy.py similarity index 93% rename from misoclib/liteeth/test/model/phy.py rename to misoclib/com/liteeth/test/model/phy.py index 14fd2e38..5b9922f1 100644 --- a/misoclib/liteeth/test/model/phy.py +++ b/misoclib/com/liteeth/test/model/phy.py @@ -1,5 +1,5 @@ -from misoclib.liteeth.common import * -from misoclib.liteeth.test.common import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.test.common import * def print_phy(s): print_with_prefix(s, "[PHY]") diff --git a/misoclib/liteeth/test/model/udp.py b/misoclib/com/liteeth/test/model/udp.py similarity index 89% rename from misoclib/liteeth/test/model/udp.py rename to misoclib/com/liteeth/test/model/udp.py index 32f1077b..886cd4b6 100644 --- a/misoclib/liteeth/test/model/udp.py +++ b/misoclib/com/liteeth/test/model/udp.py @@ -1,9 +1,9 @@ import math -from misoclib.liteeth.common import * -from misoclib.liteeth.test.common import * +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.test.common import * -from misoclib.liteeth.test.model import ip +from misoclib.com.liteeth.test.model import ip def print_udp(s): print_with_prefix(s, "[UDP]") @@ -90,9 +90,9 @@ class UDP(Module): self.etherbone_callback(packet) if __name__ == "__main__": - from misoclib.liteeth.test.model.dumps import * - from misoclib.liteeth.test.model.mac import * - from misoclib.liteeth.test.model.ip import * + from misoclib.com.liteeth.test.model.dumps import * + from misoclib.com.liteeth.test.model.mac import * + from misoclib.com.liteeth.test.model.ip import * errors = 0 # UDP packet packet = MACPacket(udp) diff --git a/misoclib/liteeth/test/udp_tb.py b/misoclib/com/liteeth/test/udp_tb.py similarity index 91% rename from misoclib/liteeth/test/udp_tb.py rename to misoclib/com/liteeth/test/udp_tb.py index 2f7ef9dd..3443fe26 100644 --- a/misoclib/liteeth/test/udp_tb.py +++ b/misoclib/com/liteeth/test/udp_tb.py @@ -3,11 +3,11 @@ from migen.bus import wishbone from migen.bus.transactions import * from migen.sim.generic import run_simulation -from misoclib.liteeth.common import * -from misoclib.liteeth.core import LiteEthUDPIPCore +from misoclib.com.liteeth.common import * +from misoclib.com.liteeth.core import LiteEthUDPIPCore -from misoclib.liteeth.test.common import * -from misoclib.liteeth.test.model import phy, mac, arp, ip, udp +from misoclib.com.liteeth.test.common import * +from misoclib.com.liteeth.test.model import phy, mac, arp, ip, udp ip_address = 0x12345678 mac_address = 0x12345678abcd diff --git a/misoclib/uart/__init__.py b/misoclib/com/uart/__init__.py similarity index 100% rename from misoclib/uart/__init__.py rename to misoclib/com/uart/__init__.py diff --git a/misoclib/gpio/__init__.py b/misoclib/cpu/peripherals/gpio/__init__.py similarity index 100% rename from misoclib/gpio/__init__.py rename to misoclib/cpu/peripherals/gpio/__init__.py diff --git a/misoclib/identifier/__init__.py b/misoclib/cpu/peripherals/identifier/__init__.py similarity index 89% rename from misoclib/identifier/__init__.py rename to misoclib/cpu/peripherals/identifier/__init__.py index dd018fe6..1f7a65a7 100644 --- a/misoclib/identifier/__init__.py +++ b/misoclib/cpu/peripherals/identifier/__init__.py @@ -1,7 +1,7 @@ from migen.fhdl.std import * from migen.bank.description import * -from misoclib.identifier import git +from misoclib.cpu.peripherals.identifier import git class Identifier(Module, AutoCSR): def __init__(self, sysid, frequency, revision=None): diff --git a/misoclib/identifier/git.py b/misoclib/cpu/peripherals/identifier/git.py similarity index 100% rename from misoclib/identifier/git.py rename to misoclib/cpu/peripherals/identifier/git.py diff --git a/misoclib/timer/__init__.py b/misoclib/cpu/peripherals/timer/__init__.py similarity index 100% rename from misoclib/timer/__init__.py rename to misoclib/cpu/peripherals/timer/__init__.py diff --git a/misoclib/gensoc/__init__.py b/misoclib/gensoc/__init__.py index 4b053d7e..3ce45252 100644 --- a/misoclib/gensoc/__init__.py +++ b/misoclib/gensoc/__init__.py @@ -6,13 +6,13 @@ from migen.fhdl.std import * from migen.bank import csrgen from migen.bus import wishbone, csr, wishbone2csr -from misoclib import uart, identifier, timer +from misoclib.com import uart from misoclib.cpu import CPU, lm32, mor1kx -from misoclib.sdram.bus import dfi, lasmibus, wishbone2lasmi -from misoclib.sdram import lasmicon -from misoclib.sdram import dfii -from misoclib.sdram import memtest -from misoclib.sdram.minicon import Minicon +from misoclib.cpu.peripherals import identifier, timer +from misoclib.mem.sdram.bus import dfi, lasmibus, wishbone2lasmi +from misoclib.mem.sdram import minicon,lasmicon +from misoclib.mem.sdram import dfii +from misoclib.mem.sdram import memtest def mem_decoder(address, start=26, end=29): return lambda a: a[start:end] == ((address >> (start+2)) & (2**(end-start))-1) @@ -248,7 +248,7 @@ class SDRAMSoC(GenSoC): if self.with_l2: raise ValueError("MINICON does not implement L2 cache (Use LASMICON or disable L2 cache (with_l2=False))") - self.submodules.minicon = sdramcon = Minicon(phy_settings, sdram_geom, sdram_timing) + self.submodules.minicon = sdramcon = minicon.Minicon(phy_settings, sdram_geom, sdram_timing) self.submodules.dficon1 = dfi.Interconnect(sdramcon.dfi, self.dfii.slave) sdram_width = flen(sdramcon.bus.dat_r) diff --git a/misoclib/mem/__init__.py b/misoclib/mem/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/misoclib/mem/flash/__init__.py b/misoclib/mem/flash/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/misoclib/norflash16/__init__.py b/misoclib/mem/flash/norflash16/__init__.py similarity index 100% rename from misoclib/norflash16/__init__.py rename to misoclib/mem/flash/norflash16/__init__.py diff --git a/misoclib/spiflash/__init__.py b/misoclib/mem/flash/spiflash/__init__.py similarity index 100% rename from misoclib/spiflash/__init__.py rename to misoclib/mem/flash/spiflash/__init__.py diff --git a/misoclib/sdram/__init__.py b/misoclib/mem/sdram/__init__.py similarity index 100% rename from misoclib/sdram/__init__.py rename to misoclib/mem/sdram/__init__.py diff --git a/misoclib/sdram/bus/dfi.py b/misoclib/mem/sdram/bus/dfi.py similarity index 100% rename from misoclib/sdram/bus/dfi.py rename to misoclib/mem/sdram/bus/dfi.py diff --git a/misoclib/sdram/bus/lasmibus.py b/misoclib/mem/sdram/bus/lasmibus.py similarity index 100% rename from misoclib/sdram/bus/lasmibus.py rename to misoclib/mem/sdram/bus/lasmibus.py diff --git a/misoclib/sdram/bus/wishbone2lasmi.py b/misoclib/mem/sdram/bus/wishbone2lasmi.py similarity index 100% rename from misoclib/sdram/bus/wishbone2lasmi.py rename to misoclib/mem/sdram/bus/wishbone2lasmi.py diff --git a/misoclib/sdram/dfii/__init__.py b/misoclib/mem/sdram/dfii/__init__.py similarity index 98% rename from misoclib/sdram/dfii/__init__.py rename to misoclib/mem/sdram/dfii/__init__.py index e34414a1..c3fa216f 100644 --- a/misoclib/sdram/dfii/__init__.py +++ b/misoclib/mem/sdram/dfii/__init__.py @@ -1,7 +1,7 @@ from migen.fhdl.std import * from migen.bank.description import * -from misoclib.sdram.bus import dfi +from misoclib.mem.sdram.bus import dfi class PhaseInjector(Module, AutoCSR): def __init__(self, phase): diff --git a/misoclib/sdram/lasmicon/__init__.py b/misoclib/mem/sdram/lasmicon/__init__.py similarity index 87% rename from misoclib/sdram/lasmicon/__init__.py rename to misoclib/mem/sdram/lasmicon/__init__.py index 9db64134..d0cf991c 100644 --- a/misoclib/sdram/lasmicon/__init__.py +++ b/misoclib/mem/sdram/lasmicon/__init__.py @@ -1,9 +1,9 @@ from migen.fhdl.std import * -from misoclib.sdram.bus import dfi, lasmibus -from misoclib.sdram.lasmicon.refresher import * -from misoclib.sdram.lasmicon.bankmachine import * -from misoclib.sdram.lasmicon.multiplexer import * +from misoclib.mem.sdram.bus import dfi, lasmibus +from misoclib.mem.sdram.lasmicon.refresher import * +from misoclib.mem.sdram.lasmicon.bankmachine import * +from misoclib.mem.sdram.lasmicon.multiplexer import * class LASMIcon(Module): def __init__(self, phy_settings, geom_settings, timing_settings): diff --git a/misoclib/sdram/lasmicon/bankmachine.py b/misoclib/mem/sdram/lasmicon/bankmachine.py similarity index 98% rename from misoclib/sdram/lasmicon/bankmachine.py rename to misoclib/mem/sdram/lasmicon/bankmachine.py index 53c43f0a..23eb6773 100644 --- a/misoclib/sdram/lasmicon/bankmachine.py +++ b/misoclib/mem/sdram/lasmicon/bankmachine.py @@ -4,7 +4,7 @@ from migen.genlib.fsm import FSM, NextState from migen.genlib.misc import optree from migen.genlib.fifo import SyncFIFO -from misoclib.sdram.lasmicon.multiplexer import * +from misoclib.mem.sdram.lasmicon.multiplexer import * class _AddressSlicer: def __init__(self, col_a, address_align): diff --git a/misoclib/sdram/lasmicon/multiplexer.py b/misoclib/mem/sdram/lasmicon/multiplexer.py similarity index 99% rename from misoclib/sdram/lasmicon/multiplexer.py rename to misoclib/mem/sdram/lasmicon/multiplexer.py index cee6f1fd..c7cd6954 100644 --- a/misoclib/sdram/lasmicon/multiplexer.py +++ b/misoclib/mem/sdram/lasmicon/multiplexer.py @@ -4,7 +4,7 @@ from migen.genlib.misc import optree from migen.genlib.fsm import FSM, NextState from migen.bank.description import AutoCSR -from misoclib.sdram.lasmicon.perf import Bandwidth +from misoclib.mem.sdram.lasmicon.perf import Bandwidth class CommandRequest: def __init__(self, a, ba): diff --git a/misoclib/sdram/lasmicon/perf.py b/misoclib/mem/sdram/lasmicon/perf.py similarity index 100% rename from misoclib/sdram/lasmicon/perf.py rename to misoclib/mem/sdram/lasmicon/perf.py diff --git a/misoclib/sdram/lasmicon/refresher.py b/misoclib/mem/sdram/lasmicon/refresher.py similarity index 96% rename from misoclib/sdram/lasmicon/refresher.py rename to misoclib/mem/sdram/lasmicon/refresher.py index cb59fb86..6313b2a1 100644 --- a/misoclib/sdram/lasmicon/refresher.py +++ b/misoclib/mem/sdram/lasmicon/refresher.py @@ -2,7 +2,7 @@ from migen.fhdl.std import * from migen.genlib.misc import timeline from migen.genlib.fsm import FSM -from misoclib.sdram.lasmicon.multiplexer import * +from misoclib.mem.sdram.lasmicon.multiplexer import * class Refresher(Module): def __init__(self, a, ba, tRP, tREFI, tRFC): diff --git a/misoclib/sdram/lasmicon/test/abstract_transactions_lasmi.py b/misoclib/mem/sdram/lasmicon/test/abstract_transactions_lasmi.py similarity index 96% rename from misoclib/sdram/lasmicon/test/abstract_transactions_lasmi.py rename to misoclib/mem/sdram/lasmicon/test/abstract_transactions_lasmi.py index d41c894e..6bfb1fdb 100644 --- a/misoclib/sdram/lasmicon/test/abstract_transactions_lasmi.py +++ b/misoclib/mem/sdram/lasmicon/test/abstract_transactions_lasmi.py @@ -2,7 +2,7 @@ from migen.fhdl.std import * from migen.bus.transactions import * from migen.sim.generic import run_simulation -from misoclib.sdram.bus import lasmibus +from misoclib.mem.sdram.bus import lasmibus def my_generator(n): bank = n % 4 diff --git a/misoclib/sdram/lasmicon/test/bankmachine.py b/misoclib/mem/sdram/lasmicon/test/bankmachine.py similarity index 91% rename from misoclib/sdram/lasmicon/test/bankmachine.py rename to misoclib/mem/sdram/lasmicon/test/bankmachine.py index 336c9017..12bdcd20 100644 --- a/misoclib/sdram/lasmicon/test/bankmachine.py +++ b/misoclib/mem/sdram/lasmicon/test/bankmachine.py @@ -1,8 +1,8 @@ from migen.fhdl.std import * from migen.sim.generic import run_simulation -from misoclib.sdram.bus import lasmibus -from misoclib.sdram.lasmicon.bankmachine import * +from misoclib.mem.sdram.bus import lasmibus +from misoclib.mem.sdram.lasmicon.bankmachine import * from common import sdram_phy, sdram_geom, sdram_timing, CommandLogger diff --git a/misoclib/sdram/lasmicon/test/common.py b/misoclib/mem/sdram/lasmicon/test/common.py similarity index 100% rename from misoclib/sdram/lasmicon/test/common.py rename to misoclib/mem/sdram/lasmicon/test/common.py diff --git a/misoclib/sdram/lasmicon/test/lasmicon.py b/misoclib/mem/sdram/lasmicon/test/lasmicon.py similarity index 92% rename from misoclib/sdram/lasmicon/test/lasmicon.py rename to misoclib/mem/sdram/lasmicon/test/lasmicon.py index c83f1ba7..af792bbf 100644 --- a/misoclib/sdram/lasmicon/test/lasmicon.py +++ b/misoclib/mem/sdram/lasmicon/test/lasmicon.py @@ -1,8 +1,8 @@ from migen.fhdl.std import * from migen.sim.generic import run_simulation -from misoclib.sdram.bus import lasmibus -from misoclib.sdram.lasmicon import * +from misoclib.mem.sdram.bus import lasmibus +from misoclib.mem.sdram.lasmicon import * from common import sdram_phy, sdram_geom, sdram_timing, DFILogger diff --git a/misoclib/sdram/lasmicon/test/lasmicon_df.py b/misoclib/mem/sdram/lasmicon/test/lasmicon_df.py similarity index 93% rename from misoclib/sdram/lasmicon/test/lasmicon_df.py rename to misoclib/mem/sdram/lasmicon/test/lasmicon_df.py index 53fb7ec4..aff7288f 100644 --- a/misoclib/sdram/lasmicon/test/lasmicon_df.py +++ b/misoclib/mem/sdram/lasmicon/test/lasmicon_df.py @@ -2,8 +2,8 @@ from migen.fhdl.std import * from migen.actorlib import dma_lasmi from migen.sim.generic import run_simulation -from misoclib.sdram.bus import lasmibus -from misoclib.sdram.lasmicon import * +from misoclib.mem.sdram.bus import lasmibus +from misoclib.mem.sdram.lasmicon import * from common import sdram_phy, sdram_geom, sdram_timing, DFILogger diff --git a/misoclib/sdram/lasmicon/test/lasmicon_wb.py b/misoclib/mem/sdram/lasmicon/test/lasmicon_wb.py similarity index 91% rename from misoclib/sdram/lasmicon/test/lasmicon_wb.py rename to misoclib/mem/sdram/lasmicon/test/lasmicon_wb.py index cbaa218e..63a7b073 100644 --- a/misoclib/sdram/lasmicon/test/lasmicon_wb.py +++ b/misoclib/mem/sdram/lasmicon/test/lasmicon_wb.py @@ -3,8 +3,8 @@ from migen.bus import wishbone from migen.bus.transactions import * from migen.sim.generic import run_simulation -from misoclib.sdram.bus import lasmibus, wishbone2lasmi -from misoclib.sdram.lasmicon import * +from misoclib.mem.sdram.bus import lasmibus, wishbone2lasmi +from misoclib.mem.sdram.lasmicon import * from common import sdram_phy, sdram_geom, sdram_timing, DFILogger diff --git a/misoclib/sdram/lasmicon/test/refresher.py b/misoclib/mem/sdram/lasmicon/test/refresher.py similarity index 95% rename from misoclib/sdram/lasmicon/test/refresher.py rename to misoclib/mem/sdram/lasmicon/test/refresher.py index 6437a781..7845bf90 100644 --- a/misoclib/sdram/lasmicon/test/refresher.py +++ b/misoclib/mem/sdram/lasmicon/test/refresher.py @@ -3,7 +3,7 @@ from random import Random from migen.fhdl.std import * from migen.sim.generic import run_simulation -from misoclib.sdram.lasmicon.refresher import * +from misoclib.mem.sdram.lasmicon.refresher import * from common import CommandLogger diff --git a/misoclib/sdram/memtest/__init__.py b/misoclib/mem/sdram/memtest/__init__.py similarity index 100% rename from misoclib/sdram/memtest/__init__.py rename to misoclib/mem/sdram/memtest/__init__.py diff --git a/misoclib/sdram/minicon/__init__.py b/misoclib/mem/sdram/minicon/__init__.py old mode 100755 new mode 100644 similarity index 99% rename from misoclib/sdram/minicon/__init__.py rename to misoclib/mem/sdram/minicon/__init__.py index 71cbb611..1f7660ee --- a/misoclib/sdram/minicon/__init__.py +++ b/misoclib/mem/sdram/minicon/__init__.py @@ -2,7 +2,7 @@ from migen.fhdl.std import * from migen.bus import wishbone from migen.genlib.fsm import FSM, NextState -from misoclib.sdram.bus import dfi as dfibus +from misoclib.mem.sdram.bus import dfi as dfibus class _AddressSlicer: def __init__(self, col_a, bank_a, row_a, address_align): diff --git a/misoclib/sdram/minicon/tb/minicontb.py b/misoclib/mem/sdram/minicon/tb/minicontb.py old mode 100755 new mode 100644 similarity index 98% rename from misoclib/sdram/minicon/tb/minicontb.py rename to misoclib/mem/sdram/minicon/tb/minicontb.py index 325da01c..d1321393 --- a/misoclib/sdram/minicon/tb/minicontb.py +++ b/misoclib/mem/sdram/minicon/tb/minicontb.py @@ -5,8 +5,8 @@ from migen.sim.generic import Simulator from migen.sim import icarus from mibuild.platforms import papilio_pro as board from misoclib import sdram -from misoclib.sdram.minicon import Minicon -from misoclib.sdram.phy import gensdrphy +from misoclib.mem.sdram.minicon import Minicon +from misoclib.mem.sdram.phy import gensdrphy from itertools import chain from os.path import isfile import sys @@ -147,7 +147,7 @@ end dut_name=self.dut_name) r += "\nendmodule" return r - + if __name__ == "__main__": diff --git a/misoclib/sdram/phy/gensdrphy.py b/misoclib/mem/sdram/phy/gensdrphy.py similarity index 96% rename from misoclib/sdram/phy/gensdrphy.py rename to misoclib/mem/sdram/phy/gensdrphy.py index 132dda9e..8dbba501 100644 --- a/misoclib/sdram/phy/gensdrphy.py +++ b/misoclib/mem/sdram/phy/gensdrphy.py @@ -25,8 +25,8 @@ from migen.fhdl.std import * from migen.genlib.record import * from migen.fhdl.specials import * -from misoclib.sdram.bus.dfi import * -from misoclib import sdram +from misoclib.mem.sdram.bus.dfi import * +from misoclib.mem import sdram class GENSDRPHY(Module): def __init__(self, pads): diff --git a/misoclib/sdram/phy/initsequence.py b/misoclib/mem/sdram/phy/initsequence.py similarity index 100% rename from misoclib/sdram/phy/initsequence.py rename to misoclib/mem/sdram/phy/initsequence.py diff --git a/misoclib/sdram/phy/k7ddrphy.py b/misoclib/mem/sdram/phy/k7ddrphy.py similarity index 99% rename from misoclib/sdram/phy/k7ddrphy.py rename to misoclib/mem/sdram/phy/k7ddrphy.py index 498532bb..99ff9417 100644 --- a/misoclib/sdram/phy/k7ddrphy.py +++ b/misoclib/mem/sdram/phy/k7ddrphy.py @@ -3,8 +3,8 @@ from migen.fhdl.std import * from migen.bank.description import * -from misoclib.sdram.bus.dfi import * -from misoclib import sdram +from misoclib.mem.sdram.bus.dfi import * +from misoclib.mem import sdram class K7DDRPHY(Module, AutoCSR): def __init__(self, pads, memtype): diff --git a/misoclib/sdram/phy/s6ddrphy.py b/misoclib/mem/sdram/phy/s6ddrphy.py similarity index 99% rename from misoclib/sdram/phy/s6ddrphy.py rename to misoclib/mem/sdram/phy/s6ddrphy.py index 2479c22b..f3ed15bc 100644 --- a/misoclib/sdram/phy/s6ddrphy.py +++ b/misoclib/mem/sdram/phy/s6ddrphy.py @@ -17,8 +17,8 @@ from migen.fhdl.std import * from migen.genlib.record import * -from misoclib.sdram.bus.dfi import * -from misoclib import sdram +from misoclib.mem.sdram.bus.dfi import * +from misoclib.mem import sdram class S6DDRPHY(Module): def __init__(self, pads, memtype, rd_bitslip, wr_bitslip, dqs_ddr_alignment): diff --git a/misoclib/video/__init__.py b/misoclib/video/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/misoclib/framebuffer/__init__.py b/misoclib/video/framebuffer/__init__.py similarity index 88% rename from misoclib/framebuffer/__init__.py rename to misoclib/video/framebuffer/__init__.py index 6324efde..f2766bdb 100644 --- a/misoclib/framebuffer/__init__.py +++ b/misoclib/video/framebuffer/__init__.py @@ -4,8 +4,8 @@ from migen.flow import plumbing from migen.bank.description import AutoCSR from migen.actorlib import dma_lasmi, structuring, misc -from misoclib.framebuffer.format import bpp, pixel_layout, FrameInitiator, VTG -from misoclib.framebuffer.phy import Driver +from misoclib.video.framebuffer.format import bpp, pixel_layout, FrameInitiator, VTG +from misoclib.video.framebuffer.phy import Driver class Framebuffer(Module, AutoCSR): def __init__(self, pads_vga, pads_dvi, lasmim): diff --git a/misoclib/framebuffer/dvi.py b/misoclib/video/framebuffer/dvi.py similarity index 100% rename from misoclib/framebuffer/dvi.py rename to misoclib/video/framebuffer/dvi.py diff --git a/misoclib/framebuffer/format.py b/misoclib/video/framebuffer/format.py similarity index 100% rename from misoclib/framebuffer/format.py rename to misoclib/video/framebuffer/format.py diff --git a/misoclib/framebuffer/phy.py b/misoclib/video/framebuffer/phy.py similarity index 98% rename from misoclib/framebuffer/phy.py rename to misoclib/video/framebuffer/phy.py index 95a1092d..21d5c587 100644 --- a/misoclib/framebuffer/phy.py +++ b/misoclib/video/framebuffer/phy.py @@ -4,8 +4,8 @@ from migen.genlib.cdc import MultiReg from migen.bank.description import * from migen.flow.actor import * -from misoclib.framebuffer.format import bpc_phy, phy_layout -from misoclib.framebuffer import dvi +from misoclib.video.framebuffer.format import bpc_phy, phy_layout +from misoclib.video.framebuffer import dvi class _FIFO(Module): def __init__(self, pack_factor): diff --git a/software/common.mak b/software/common.mak index 332da825..9335f14c 100644 --- a/software/common.mak +++ b/software/common.mak @@ -19,7 +19,7 @@ LD_quiet = @echo " LD " $@ && $(TARGET_PREFIX)ld OBJCOPY_quiet = @echo " OBJCOPY " $@ && $(TARGET_PREFIX)objcopy RANLIB_quiet = @echo " RANLIB " $@ && $(TARGET_PREFIX)ranlib -MSC_GIT_ID := $(shell cd $(MSCDIR) && python3 -c "from misoclib.identifier.git import get_id; print(hex(get_id()), end='')") +MSC_GIT_ID := $(shell cd $(MSCDIR) && python3 -c "from misoclib.cpu.peripherals.identifier.git import get_id; print(hex(get_id()), end='')") ifeq ($(V),1) CC = $(CC_normal) diff --git a/targets/de0nano.py b/targets/de0nano.py index 6c9e56f3..13217709 100644 --- a/targets/de0nano.py +++ b/targets/de0nano.py @@ -1,8 +1,10 @@ from migen.fhdl.std import * from migen.bus import wishbone -from misoclib import uart, gpio, sdram -from misoclib.sdram.phy import gensdrphy +from misoclib.cpu.peripherals import gpio +from misoclib.mem import sdram +from misoclib.mem.sdram.phy import gensdrphy +from misoclib.com import uart from misoclib.gensoc import SDRAMSoC class _PLL(Module): diff --git a/targets/kc705.py b/targets/kc705.py index 54b28771..a8fd017e 100644 --- a/targets/kc705.py +++ b/targets/kc705.py @@ -1,12 +1,13 @@ from migen.fhdl.std import * from migen.genlib.resetsync import AsyncResetSynchronizer -from misoclib import sdram, spiflash -from misoclib.sdram.phy import k7ddrphy +from misoclib.mem import sdram +from misoclib.mem.sdram.phy import k7ddrphy +from misoclib.mem.flash import spiflash from misoclib.gensoc import SDRAMSoC, mem_decoder -from misoclib.liteeth.phy.gmii import LiteEthPHYGMII -from misoclib.liteeth.mac import LiteEthMAC +from misoclib.com.liteeth.phy.gmii import LiteEthPHYGMII +from misoclib.com.liteeth.mac import LiteEthMAC class _CRG(Module): def __init__(self, platform): diff --git a/targets/mlabs_video.py b/targets/mlabs_video.py index 664caafd..8ff171f3 100644 --- a/targets/mlabs_video.py +++ b/targets/mlabs_video.py @@ -4,12 +4,16 @@ from fractions import Fraction from migen.fhdl.std import * from mibuild.generic_platform import ConstraintError -from misoclib import sdram, mxcrg, norflash16, framebuffer, gpio -from misoclib.sdram.phy import s6ddrphy +from misoclib import mxcrg +from misoclib.mem import sdram +from misoclib.mem.sdram.phy import s6ddrphy +from misoclib.mem.flash import norflash16 +from misoclib.cpu.peripherals import gpio +from misoclib.video import framebuffer from misoclib.gensoc import SDRAMSoC, mem_decoder -from misoclib.liteeth.phy.mii import LiteEthPHYMII -from misoclib.liteeth.mac import LiteEthMAC +from misoclib.com.liteeth.phy.mii import LiteEthPHYMII +from misoclib.com.liteeth.mac import LiteEthMAC class _MXClockPads: def __init__(self, platform): diff --git a/targets/pipistrello.py b/targets/pipistrello.py index a259083a..39ce3c8c 100644 --- a/targets/pipistrello.py +++ b/targets/pipistrello.py @@ -3,8 +3,9 @@ from fractions import Fraction from migen.fhdl.std import * from migen.genlib.resetsync import AsyncResetSynchronizer -from misoclib import spiflash, sdram -from misoclib.sdram.phy import gensdrphy +from misoclib.mem import sdram +from misoclib.mem.sdram.phy import gensdrphy +from misoclib.mem.flash import SpiFlash from misoclib.gensoc import SDRAMSoC class _CRG(Module): diff --git a/targets/ppro.py b/targets/ppro.py index d9b1dad8..3303c453 100644 --- a/targets/ppro.py +++ b/targets/ppro.py @@ -3,8 +3,9 @@ from fractions import Fraction from migen.fhdl.std import * from migen.genlib.resetsync import AsyncResetSynchronizer -from misoclib import spiflash, sdram -from misoclib.sdram.phy import gensdrphy +from misoclib.mem import sdram +from misoclib.mem.sdram.phy import gensdrphy +from misoclib.mem.flash import spiflash from misoclib.gensoc import SDRAMSoC class _CRG(Module): -- 2.30.2