From c03c41eb77554af816e1caa09ca75b931633f908 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Fri, 1 May 2015 20:27:31 +0200 Subject: [PATCH] litescope: rename host directory to software (to be coherent with others cores) --- misoclib/com/liteeth/example_designs/test/make.py | 4 ++-- misoclib/com/liteeth/example_designs/test/test_la.py | 2 +- misoclib/com/litepcie/example_designs/test/make.py | 6 +++--- misoclib/mem/litesata/example_designs/test/bist.py | 2 +- misoclib/mem/litesata/example_designs/test/make.py | 4 ++-- .../mem/litesata/example_designs/test/test_la.py | 2 +- misoclib/mem/litesata/example_designs/test/tools.py | 2 +- .../tools/litescope/example_designs/test/make.py | 4 ++-- .../tools/litescope/example_designs/test/test_io.py | 2 +- .../tools/litescope/example_designs/test/test_la.py | 2 +- .../tools/litescope/{host => software}/__init__.py | 0 .../litescope/{host => software}/driver/__init__.py | 0 .../litescope/{host => software}/driver/etherbone.py | 2 +- .../tools/litescope/{host => software}/driver/io.py | 0 .../tools/litescope/{host => software}/driver/la.py | 12 ++++++------ .../litescope/{host => software}/driver/pcie.py | 2 +- .../tools/litescope/{host => software}/driver/reg.py | 0 .../{host => software}/driver/truthtable.py | 0 .../litescope/{host => software}/driver/uart.py | 2 +- .../litescope/{host => software}/dump/__init__.py | 0 .../tools/litescope/{host => software}/dump/csv.py | 2 +- .../litescope/{host => software}/dump/python.py | 2 +- .../litescope/{host => software}/dump/sigrok.py | 2 +- .../tools/litescope/{host => software}/dump/vcd.py | 2 +- 24 files changed, 28 insertions(+), 28 deletions(-) rename misoclib/tools/litescope/{host => software}/__init__.py (100%) rename misoclib/tools/litescope/{host => software}/driver/__init__.py (100%) rename misoclib/tools/litescope/{host => software}/driver/etherbone.py (97%) rename misoclib/tools/litescope/{host => software}/driver/io.py (100%) rename misoclib/tools/litescope/{host => software}/driver/la.py (91%) rename misoclib/tools/litescope/{host => software}/driver/pcie.py (96%) rename misoclib/tools/litescope/{host => software}/driver/reg.py (100%) rename misoclib/tools/litescope/{host => software}/driver/truthtable.py (100%) rename misoclib/tools/litescope/{host => software}/driver/uart.py (97%) rename misoclib/tools/litescope/{host => software}/dump/__init__.py (100%) rename misoclib/tools/litescope/{host => software}/dump/csv.py (96%) rename misoclib/tools/litescope/{host => software}/dump/python.py (94%) rename misoclib/tools/litescope/{host => software}/dump/sigrok.py (98%) rename misoclib/tools/litescope/{host => software}/dump/vcd.py (98%) diff --git a/misoclib/com/liteeth/example_designs/test/make.py b/misoclib/com/liteeth/example_designs/test/make.py index 2922b9a1..717e93c1 100755 --- a/misoclib/com/liteeth/example_designs/test/make.py +++ b/misoclib/com/liteeth/example_designs/test/make.py @@ -19,11 +19,11 @@ def _get_args(): if __name__ == "__main__": args = _get_args() if args.bridge == "uart": - from misoclib.tools.litescope.host.driver.uart import LiteScopeUART2WishboneDriver + from misoclib.tools.litescope.software.driver.uart import LiteScopeUART2WishboneDriver port = args.port if not args.port.isdigit() else int(args.port) wb = LiteScopeUART2WishboneDriver(port, args.baudrate, "./csr.csv", int(args.busword), debug=False) elif args.bridge == "etherbone": - from misoclib.tools.litescope.host.driver.etherbone import LiteScopeEtherboneDriver + from misoclib.tools.litescope.software.driver.etherbone import LiteScopeEtherboneDriver wb = LiteScopeEtherboneDriver(args.ip_address, int(args.udp_port), "./csr.csv", int(args.busword), debug=False) else: ValueError("Invalid bridge {}".format(args.bridge)) diff --git a/misoclib/com/liteeth/example_designs/test/test_la.py b/misoclib/com/liteeth/example_designs/test/test_la.py index 674cbca1..9def9d0c 100644 --- a/misoclib/com/liteeth/example_designs/test/test_la.py +++ b/misoclib/com/liteeth/example_designs/test/test_la.py @@ -1,5 +1,5 @@ import time -from misoclib.tools.litescope.host.driver.la import LiteScopeLADriver +from misoclib.tools.litescope.software.driver.la import LiteScopeLADriver def main(wb): diff --git a/misoclib/com/litepcie/example_designs/test/make.py b/misoclib/com/litepcie/example_designs/test/make.py index c1020000..9823f24e 100755 --- a/misoclib/com/litepcie/example_designs/test/make.py +++ b/misoclib/com/litepcie/example_designs/test/make.py @@ -21,14 +21,14 @@ def _get_args(): if __name__ == "__main__": args = _get_args() if args.bridge == "uart": - from misoclib.tools.litescope.host.driver.uart import LiteScopeUART2WishboneDriver + from misoclib.tools.litescope.software.driver.uart import LiteScopeUART2WishboneDriver port = args.port if not args.port.isdigit() else int(args.port) wb = LiteScopeUART2WishboneDriver(port, args.baudrate, "./csr.csv", int(args.busword), debug=False) elif args.bridge == "etherbone": - from misoclib.tools.litescope.host.driver.etherbone import LiteScopeEtherboneDriver + from misoclib.tools.litescope.software.driver.etherbone import LiteScopeEtherboneDriver wb = LiteScopeEtherboneDriver(args.ip_address, int(args.udp_port), "./csr.csv", int(args.busword), debug=False) elif args.bridge == "pcie": - from misoclib.tools.litescope.host.driver.pcie import LiteScopePCIeDriver + from misoclib.tools.litescope.software.driver.pcie import LiteScopePCIeDriver wb = LiteScopePCIeDriver(args.bar, args.bar_size, "./csr.csv", int(args.busword), debug=False) else: ValueError("Invalid bridge {}".format(args.bridge)) diff --git a/misoclib/mem/litesata/example_designs/test/bist.py b/misoclib/mem/litesata/example_designs/test/bist.py index e610ebf4..4995657b 100644 --- a/misoclib/mem/litesata/example_designs/test/bist.py +++ b/misoclib/mem/litesata/example_designs/test/bist.py @@ -2,7 +2,7 @@ import time import argparse import random as rand from collections import OrderedDict -from misoclib.tools.litescope.host.driver.uart import LiteScopeUART2WishboneDriver +from misoclib.tools.litescope.software.driver.uart import LiteScopeUART2WishboneDriver KB = 1024 MB = 1024*KB diff --git a/misoclib/mem/litesata/example_designs/test/make.py b/misoclib/mem/litesata/example_designs/test/make.py index 47278051..a89f8627 100755 --- a/misoclib/mem/litesata/example_designs/test/make.py +++ b/misoclib/mem/litesata/example_designs/test/make.py @@ -19,11 +19,11 @@ def _get_args(): if __name__ == "__main__": args = _get_args() if args.bridge == "uart": - from misoclib.tools.litescope.host.driver.uart import LiteScopeUART2WishboneDriver + from misoclib.tools.litescope.software.driver.uart import LiteScopeUART2WishboneDriver port = args.port if not args.port.isdigit() else int(args.port) wb = LiteScopeUART2WishboneDriver(port, args.baudrate, "./csr.csv", int(args.busword), debug=False) elif args.bridge == "etherbone": - from misoclib.tools.litescope.host.driver.etherbone import LiteScopeEtherboneDriver + from misoclib.tools.litescope.software.driver.etherbone import LiteScopeEtherboneDriver wb = LiteScopeEtherboneDriver(args.ip_address, int(args.udp_port), "./csr.csv", int(args.busword), debug=False) else: ValueError("Invalid bridge {}".format(args.bridge)) diff --git a/misoclib/mem/litesata/example_designs/test/test_la.py b/misoclib/mem/litesata/example_designs/test/test_la.py index 2b6eb57e..10f3a214 100644 --- a/misoclib/mem/litesata/example_designs/test/test_la.py +++ b/misoclib/mem/litesata/example_designs/test/test_la.py @@ -1,7 +1,7 @@ import sys from tools import * from test_bist import * -from litescope.host.driver.la import LiteScopeLADriver +from litescope.software.driver.la import LiteScopeLADriver def main(wb): diff --git a/misoclib/mem/litesata/example_designs/test/tools.py b/misoclib/mem/litesata/example_designs/test/tools.py index 546d2bea..845ab128 100644 --- a/misoclib/mem/litesata/example_designs/test/tools.py +++ b/misoclib/mem/litesata/example_designs/test/tools.py @@ -1,4 +1,4 @@ -from litescope.host.dump import * +from litescope.software.dump import * primitives = { "ALIGN": 0x7B4A4ABC, diff --git a/misoclib/tools/litescope/example_designs/test/make.py b/misoclib/tools/litescope/example_designs/test/make.py index 47278051..a89f8627 100755 --- a/misoclib/tools/litescope/example_designs/test/make.py +++ b/misoclib/tools/litescope/example_designs/test/make.py @@ -19,11 +19,11 @@ def _get_args(): if __name__ == "__main__": args = _get_args() if args.bridge == "uart": - from misoclib.tools.litescope.host.driver.uart import LiteScopeUART2WishboneDriver + from misoclib.tools.litescope.software.driver.uart import LiteScopeUART2WishboneDriver port = args.port if not args.port.isdigit() else int(args.port) wb = LiteScopeUART2WishboneDriver(port, args.baudrate, "./csr.csv", int(args.busword), debug=False) elif args.bridge == "etherbone": - from misoclib.tools.litescope.host.driver.etherbone import LiteScopeEtherboneDriver + from misoclib.tools.litescope.software.driver.etherbone import LiteScopeEtherboneDriver wb = LiteScopeEtherboneDriver(args.ip_address, int(args.udp_port), "./csr.csv", int(args.busword), debug=False) else: ValueError("Invalid bridge {}".format(args.bridge)) diff --git a/misoclib/tools/litescope/example_designs/test/test_io.py b/misoclib/tools/litescope/example_designs/test/test_io.py index ddfd30c5..b573b2c8 100644 --- a/misoclib/tools/litescope/example_designs/test/test_io.py +++ b/misoclib/tools/litescope/example_designs/test/test_io.py @@ -1,5 +1,5 @@ import time -from misoclib.tools.litescope.host.driver.io import LiteScopeIODriver +from misoclib.tools.litescope.software.driver.io import LiteScopeIODriver def led_anim0(io): diff --git a/misoclib/tools/litescope/example_designs/test/test_la.py b/misoclib/tools/litescope/example_designs/test/test_la.py index 70e2993b..c9616648 100644 --- a/misoclib/tools/litescope/example_designs/test/test_la.py +++ b/misoclib/tools/litescope/example_designs/test/test_la.py @@ -1,4 +1,4 @@ -from misoclib.tools.litescope.host.driver.la import LiteScopeLADriver +from misoclib.tools.litescope.software.driver.la import LiteScopeLADriver def main(wb): diff --git a/misoclib/tools/litescope/host/__init__.py b/misoclib/tools/litescope/software/__init__.py similarity index 100% rename from misoclib/tools/litescope/host/__init__.py rename to misoclib/tools/litescope/software/__init__.py diff --git a/misoclib/tools/litescope/host/driver/__init__.py b/misoclib/tools/litescope/software/driver/__init__.py similarity index 100% rename from misoclib/tools/litescope/host/driver/__init__.py rename to misoclib/tools/litescope/software/driver/__init__.py diff --git a/misoclib/tools/litescope/host/driver/etherbone.py b/misoclib/tools/litescope/software/driver/etherbone.py similarity index 97% rename from misoclib/tools/litescope/host/driver/etherbone.py rename to misoclib/tools/litescope/software/driver/etherbone.py index 66d4cfa2..34949a17 100644 --- a/misoclib/tools/litescope/host/driver/etherbone.py +++ b/misoclib/tools/litescope/software/driver/etherbone.py @@ -1,5 +1,5 @@ import socket -from misoclib.tools.litescope.host.driver.reg import * +from misoclib.tools.litescope.software.driver.reg import * from liteeth.test.model.etherbone import * diff --git a/misoclib/tools/litescope/host/driver/io.py b/misoclib/tools/litescope/software/driver/io.py similarity index 100% rename from misoclib/tools/litescope/host/driver/io.py rename to misoclib/tools/litescope/software/driver/io.py diff --git a/misoclib/tools/litescope/host/driver/la.py b/misoclib/tools/litescope/software/driver/la.py similarity index 91% rename from misoclib/tools/litescope/host/driver/la.py rename to misoclib/tools/litescope/software/driver/la.py index a74eaf54..2b84e962 100644 --- a/misoclib/tools/litescope/host/driver/la.py +++ b/misoclib/tools/litescope/software/driver/la.py @@ -1,8 +1,8 @@ import csv from struct import * from migen.fhdl.structure import * -from misoclib.tools.litescope.host.dump import * -from misoclib.tools.litescope.host.driver.truthtable import * +from misoclib.tools.litescope.software.dump import * +from misoclib.tools.litescope.software.driver.truthtable import * class LiteScopeLADriver(): @@ -125,16 +125,16 @@ class LiteScopeLADriver(): print("saving to " + filename) name, ext = os.path.splitext(filename) if ext == ".vcd": - from misoclib.tools.litescope.host.dump.vcd import VCDDump + from misoclib.tools.litescope.software.dump.vcd import VCDDump dump = VCDDump() elif ext == ".csv": - from misoclib.tools.litescope.host.dump.csv import CSVDump + from misoclib.tools.litescope.software.dump.csv import CSVDump dump = CSVDump() elif ext == ".py": - from misoclib.tools.litescope.host.dump.python import PythonDump + from misoclib.tools.litescope.software.dump.python import PythonDump dump = PythonDump() elif ext == ".sr": - from misoclib.tools.litescope.host.dump.sigrok import SigrokDump + from misoclib.tools.litescope.software.dump.sigrok import SigrokDump if self.samplerate is None: raise ValueError("Unable to automatically retrieve clk_freq, clk_freq parameter required") dump = SigrokDump(samplerate=self.samplerate) diff --git a/misoclib/tools/litescope/host/driver/pcie.py b/misoclib/tools/litescope/software/driver/pcie.py similarity index 96% rename from misoclib/tools/litescope/host/driver/pcie.py rename to misoclib/tools/litescope/software/driver/pcie.py index 8e066155..8fe5c4d7 100644 --- a/misoclib/tools/litescope/host/driver/pcie.py +++ b/misoclib/tools/litescope/software/driver/pcie.py @@ -1,6 +1,6 @@ import string import mmap -from misoclib.tools.litescope.host.driver.reg import * +from misoclib.tools.litescope.software.driver.reg import * class LiteScopePCIeDriver: diff --git a/misoclib/tools/litescope/host/driver/reg.py b/misoclib/tools/litescope/software/driver/reg.py similarity index 100% rename from misoclib/tools/litescope/host/driver/reg.py rename to misoclib/tools/litescope/software/driver/reg.py diff --git a/misoclib/tools/litescope/host/driver/truthtable.py b/misoclib/tools/litescope/software/driver/truthtable.py similarity index 100% rename from misoclib/tools/litescope/host/driver/truthtable.py rename to misoclib/tools/litescope/software/driver/truthtable.py diff --git a/misoclib/tools/litescope/host/driver/uart.py b/misoclib/tools/litescope/software/driver/uart.py similarity index 97% rename from misoclib/tools/litescope/host/driver/uart.py rename to misoclib/tools/litescope/software/driver/uart.py index c4c90071..42f1c03b 100644 --- a/misoclib/tools/litescope/host/driver/uart.py +++ b/misoclib/tools/litescope/software/driver/uart.py @@ -1,6 +1,6 @@ import serial from struct import * -from misoclib.tools.litescope.host.driver.reg import * +from misoclib.tools.litescope.software.driver.reg import * def write_b(uart, data): diff --git a/misoclib/tools/litescope/host/dump/__init__.py b/misoclib/tools/litescope/software/dump/__init__.py similarity index 100% rename from misoclib/tools/litescope/host/dump/__init__.py rename to misoclib/tools/litescope/software/dump/__init__.py diff --git a/misoclib/tools/litescope/host/dump/csv.py b/misoclib/tools/litescope/software/dump/csv.py similarity index 96% rename from misoclib/tools/litescope/host/dump/csv.py rename to misoclib/tools/litescope/software/dump/csv.py index 495f3df0..54066114 100644 --- a/misoclib/tools/litescope/host/dump/csv.py +++ b/misoclib/tools/litescope/software/dump/csv.py @@ -1,4 +1,4 @@ -from misoclib.tools.litescope.host.dump import * +from misoclib.tools.litescope.software.dump import * class CSVDump(Dump): diff --git a/misoclib/tools/litescope/host/dump/python.py b/misoclib/tools/litescope/software/dump/python.py similarity index 94% rename from misoclib/tools/litescope/host/dump/python.py rename to misoclib/tools/litescope/software/dump/python.py index c0294c4a..2a4b7b1e 100644 --- a/misoclib/tools/litescope/host/dump/python.py +++ b/misoclib/tools/litescope/software/dump/python.py @@ -1,4 +1,4 @@ -from misoclib.tools.litescope.host.dump import * +from misoclib.tools.litescope.software.dump import * class PythonDump(Dump): diff --git a/misoclib/tools/litescope/host/dump/sigrok.py b/misoclib/tools/litescope/software/dump/sigrok.py similarity index 98% rename from misoclib/tools/litescope/host/dump/sigrok.py rename to misoclib/tools/litescope/software/dump/sigrok.py index 15d6d0e9..3bd13b5c 100644 --- a/misoclib/tools/litescope/host/dump/sigrok.py +++ b/misoclib/tools/litescope/software/dump/sigrok.py @@ -5,7 +5,7 @@ import zipfile import re from collections import OrderedDict -from misoclib.tools.litescope.host.dump import * +from misoclib.tools.litescope.software.dump import * class SigrokDump(Dump): diff --git a/misoclib/tools/litescope/host/dump/vcd.py b/misoclib/tools/litescope/software/dump/vcd.py similarity index 98% rename from misoclib/tools/litescope/host/dump/vcd.py rename to misoclib/tools/litescope/software/dump/vcd.py index a27294cf..a47876a6 100644 --- a/misoclib/tools/litescope/host/dump/vcd.py +++ b/misoclib/tools/litescope/software/dump/vcd.py @@ -1,5 +1,5 @@ import datetime -from misoclib.tools.litescope.host.dump import * +from misoclib.tools.litescope.software.dump import * class VCDDump(Dump): -- 2.30.2