laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29919 ) Change subject: sw/e1-tracer: split recorder + analysis tools in sub-directories ...................................................................... sw/e1-tracer: split recorder + analysis tools in sub-directories this way it's easier to see which part of the code is used where Change-Id: I7d727263383ec1d6d61dd31fcfebf4a4b1a04765 --- M .checkpatch.conf R software/e1-tracer/analyze/Makefile R software/e1-tracer/analyze/crc4itu.c R software/e1-tracer/analyze/crc4itu.h R software/e1-tracer/analyze/dump.c R software/e1-tracer/analyze/dump_ts.py R software/e1-tracer/analyze/hdlc-decode-pipe.c R software/e1-tracer/analyze/osmo_e1f.c R software/e1-tracer/analyze/osmo_e1f.h R software/e1-tracer/analyze/replay.c A software/e1-tracer/record/Makefile R software/e1-tracer/record/idt82v2081.c R software/e1-tracer/record/idt82v2081.h R software/e1-tracer/record/idt82v2081_regs.h R software/e1-tracer/record/idt82v2081_usb.c R software/e1-tracer/record/idt82v2081_usb.h R software/e1-tracer/record/main.c 17 files changed, 14 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/.checkpatch.conf b/.checkpatch.conf index b79575f..72fd35f 100644 --- a/.checkpatch.conf +++ b/.checkpatch.conf @@ -1,3 +1,3 @@ ---exclude ^software/e1-tracer/crc4itu.(c|h)$ +--exclude ^software/e1-tracer/analyze/crc4itu.(c|h)$ --ignore OPEN_BRACE --ignore SPACING diff --git a/software/e1-tracer/Makefile b/software/e1-tracer/analyze/Makefile similarity index 71% rename from software/e1-tracer/Makefile rename to software/e1-tracer/analyze/Makefile index cc3c2cf..7bd89f4 100644 --- a/software/e1-tracer/Makefile +++ b/software/e1-tracer/analyze/Makefile @@ -2,12 +2,10 @@ CFLAGS=`pkg-config libusb-1.0 libosmocore libosmoabis --cflags` -O2 -Wall LDLIBS=`pkg-config libusb-1.0 libosmocore --libs` -OBJS=main dump replay hdlc-decode-pipe +OBJS=dump replay hdlc-decode-pipe all: $(OBJS) -main: idt82v2081.o idt82v2081_usb.o main.o - dump: dump.o crc4itu.o osmo_e1f.o clean: diff --git a/software/e1-tracer/crc4itu.c b/software/e1-tracer/analyze/crc4itu.c similarity index 100% rename from software/e1-tracer/crc4itu.c rename to software/e1-tracer/analyze/crc4itu.c diff --git a/software/e1-tracer/crc4itu.h b/software/e1-tracer/analyze/crc4itu.h similarity index 100% rename from software/e1-tracer/crc4itu.h rename to software/e1-tracer/analyze/crc4itu.h diff --git a/software/e1-tracer/dump.c b/software/e1-tracer/analyze/dump.c similarity index 100% rename from software/e1-tracer/dump.c rename to software/e1-tracer/analyze/dump.c diff --git a/software/e1-tracer/dump_ts.py b/software/e1-tracer/analyze/dump_ts.py similarity index 100% rename from software/e1-tracer/dump_ts.py rename to software/e1-tracer/analyze/dump_ts.py diff --git a/software/e1-tracer/hdlc-decode-pipe.c b/software/e1-tracer/analyze/hdlc-decode-pipe.c similarity index 100% rename from software/e1-tracer/hdlc-decode-pipe.c rename to software/e1-tracer/analyze/hdlc-decode-pipe.c diff --git a/software/e1-tracer/osmo_e1f.c b/software/e1-tracer/analyze/osmo_e1f.c similarity index 100% rename from software/e1-tracer/osmo_e1f.c rename to software/e1-tracer/analyze/osmo_e1f.c diff --git a/software/e1-tracer/osmo_e1f.h b/software/e1-tracer/analyze/osmo_e1f.h similarity index 100% rename from software/e1-tracer/osmo_e1f.h rename to software/e1-tracer/analyze/osmo_e1f.h diff --git a/software/e1-tracer/replay.c b/software/e1-tracer/analyze/replay.c similarity index 100% rename from software/e1-tracer/replay.c rename to software/e1-tracer/analyze/replay.c diff --git a/software/e1-tracer/record/Makefile b/software/e1-tracer/record/Makefile new file mode 100644 index 0000000..e513237 --- /dev/null +++ b/software/e1-tracer/record/Makefile @@ -0,0 +1,12 @@ +CC=gcc +CFLAGS=`pkg-config libusb-1.0 --cflags` -O2 -Wall +LDLIBS=`pkg-config libusb-1.0 --libs` + +OBJS=main + +all: $(OBJS) + +main: idt82v2081.o idt82v2081_usb.o main.o + +clean: + rm -f $(OBJS) *.o diff --git a/software/e1-tracer/idt82v2081.c b/software/e1-tracer/record/idt82v2081.c similarity index 100% rename from software/e1-tracer/idt82v2081.c rename to software/e1-tracer/record/idt82v2081.c diff --git a/software/e1-tracer/idt82v2081.h b/software/e1-tracer/record/idt82v2081.h similarity index 100% rename from software/e1-tracer/idt82v2081.h rename to software/e1-tracer/record/idt82v2081.h diff --git a/software/e1-tracer/idt82v2081_regs.h b/software/e1-tracer/record/idt82v2081_regs.h similarity index 100% rename from software/e1-tracer/idt82v2081_regs.h rename to software/e1-tracer/record/idt82v2081_regs.h diff --git a/software/e1-tracer/idt82v2081_usb.c b/software/e1-tracer/record/idt82v2081_usb.c similarity index 100% rename from software/e1-tracer/idt82v2081_usb.c rename to software/e1-tracer/record/idt82v2081_usb.c diff --git a/software/e1-tracer/idt82v2081_usb.h b/software/e1-tracer/record/idt82v2081_usb.h similarity index 100% rename from software/e1-tracer/idt82v2081_usb.h rename to software/e1-tracer/record/idt82v2081_usb.h diff --git a/software/e1-tracer/main.c b/software/e1-tracer/record/main.c similarity index 100% rename from software/e1-tracer/main.c rename to software/e1-tracer/record/main.c -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I7d727263383ec1d6d61dd31fcfebf4a4b1a04765 Gerrit-Change-Number: 29919 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged