From 155b680da482cea2381becb73c51cfb838bff31e Mon Sep 17 00:00:00 2001 From: Bert Vermeulen Date: Mon, 21 Jul 2014 21:27:33 +0200 Subject: [PATCH] Reorganize project tree. --- Makefile.am | 358 +++++++++--------- backend.c => src/backend.c | 0 device.c => src/device.c | 0 {hardware/common => src}/dmm/es519xx.c | 0 {hardware/common => src}/dmm/fs9721.c | 0 {hardware/common => src}/dmm/fs9922.c | 0 {hardware/common => src}/dmm/m2110.c | 0 {hardware/common => src}/dmm/metex14.c | 0 {hardware/common => src}/dmm/rs9lcd.c | 0 drivers.c => src/drivers.c | 0 error.c => src/error.c | 0 {hardware/common => src}/ezusb.c | 0 .../hardware}/agilent-dmm/agilent-dmm.h | 0 {hardware => src/hardware}/agilent-dmm/api.c | 0 .../hardware}/agilent-dmm/sched.c | 0 {hardware => src/hardware}/appa-55ii/api.c | 0 .../hardware}/appa-55ii/protocol.c | 0 .../hardware}/appa-55ii/protocol.h | 0 .../hardware}/asix-sigma/asix-sigma.c | 0 .../hardware}/asix-sigma/asix-sigma.h | 0 .../hardware}/atten-pps3xxx/api.c | 0 .../hardware}/atten-pps3xxx/protocol.c | 0 .../hardware}/atten-pps3xxx/protocol.h | 0 {hardware => src/hardware}/beaglelogic/api.c | 0 .../hardware}/beaglelogic/beaglelogic.h | 0 .../hardware}/beaglelogic/protocol.c | 0 .../hardware}/beaglelogic/protocol.h | 0 {hardware => src/hardware}/brymen-bm86x/api.c | 0 .../hardware}/brymen-bm86x/protocol.c | 0 .../hardware}/brymen-bm86x/protocol.h | 0 {hardware => src/hardware}/brymen-dmm/api.c | 0 .../hardware}/brymen-dmm/parser.c | 0 .../hardware}/brymen-dmm/protocol.c | 0 .../hardware}/brymen-dmm/protocol.h | 0 {hardware => src/hardware}/cem-dt-885x/api.c | 0 .../hardware}/cem-dt-885x/protocol.c | 0 .../hardware}/cem-dt-885x/protocol.h | 0 {hardware => src/hardware}/center-3xx/api.c | 0 .../hardware}/center-3xx/protocol.c | 0 .../hardware}/center-3xx/protocol.h | 0 {hardware => src/hardware}/chronovu-la/api.c | 0 .../hardware}/chronovu-la/protocol.c | 0 .../hardware}/chronovu-la/protocol.h | 0 {hardware => src/hardware}/colead-slm/api.c | 0 .../hardware}/colead-slm/protocol.c | 0 .../hardware}/colead-slm/protocol.h | 0 .../hardware}/conrad-digi-35-cpu/api.c | 0 .../hardware}/conrad-digi-35-cpu/protocol.c | 0 .../hardware}/conrad-digi-35-cpu/protocol.h | 0 {hardware => src/hardware}/demo/demo.c | 0 {hardware => src/hardware}/fluke-dmm/api.c | 0 .../hardware}/fluke-dmm/fluke-dmm.h | 0 {hardware => src/hardware}/fluke-dmm/fluke.c | 0 {hardware => src/hardware}/fx2lafw/api.c | 0 {hardware => src/hardware}/fx2lafw/protocol.c | 0 {hardware => src/hardware}/fx2lafw/protocol.h | 0 {hardware => src/hardware}/gmc-mh-1x-2x/api.c | 0 .../hardware}/gmc-mh-1x-2x/protocol.c | 0 .../hardware}/gmc-mh-1x-2x/protocol.h | 0 {hardware => src/hardware}/hameg-hmo/api.c | 0 .../hardware}/hameg-hmo/protocol.c | 0 .../hardware}/hameg-hmo/protocol.h | 0 {hardware => src/hardware}/hantek-dso/api.c | 0 {hardware => src/hardware}/hantek-dso/dso.c | 0 {hardware => src/hardware}/hantek-dso/dso.h | 0 .../hardware}/ikalogic-scanalogic2/api.c | 0 .../hardware}/ikalogic-scanalogic2/protocol.c | 0 .../hardware}/ikalogic-scanalogic2/protocol.h | 0 .../hardware}/ikalogic-scanaplus/api.c | 0 .../hardware}/ikalogic-scanaplus/protocol.c | 0 .../hardware}/ikalogic-scanaplus/protocol.h | 0 .../hardware}/kecheng-kc-330b/api.c | 0 .../hardware}/kecheng-kc-330b/protocol.c | 0 .../hardware}/kecheng-kc-330b/protocol.h | 0 .../hardware}/lascar-el-usb/api.c | 0 .../hardware}/lascar-el-usb/protocol.c | 0 .../hardware}/lascar-el-usb/protocol.h | 0 {hardware => src/hardware}/link-mso19/api.c | 0 .../hardware}/link-mso19/protocol.c | 0 .../hardware}/link-mso19/protocol.h | 0 .../hardware}/manson-hcs-3xxx/api.c | 0 .../hardware}/manson-hcs-3xxx/protocol.c | 0 .../hardware}/manson-hcs-3xxx/protocol.h | 0 {hardware => src/hardware}/mic-985xx/api.c | 0 .../hardware}/mic-985xx/protocol.c | 0 .../hardware}/mic-985xx/protocol.h | 0 .../hardware}/motech-lps-30x/api.c | 0 .../hardware}/motech-lps-30x/protocol.c | 0 .../hardware}/motech-lps-30x/protocol.h | 0 {hardware => src/hardware}/norma-dmm/api.c | 0 .../hardware}/norma-dmm/protocol.c | 0 .../hardware}/norma-dmm/protocol.h | 0 .../hardware}/openbench-logic-sniffer/api.c | 0 .../openbench-logic-sniffer/protocol.c | 0 .../openbench-logic-sniffer/protocol.h | 0 {hardware => src/hardware}/rigol-ds/api.c | 0 .../hardware}/rigol-ds/protocol.c | 0 .../hardware}/rigol-ds/protocol.h | 0 .../hardware}/saleae-logic16/api.c | 0 .../hardware}/saleae-logic16/protocol.c | 0 .../hardware}/saleae-logic16/protocol.h | 0 {hardware => src/hardware}/serial-dmm/api.c | 0 .../hardware}/serial-dmm/protocol.c | 0 .../hardware}/serial-dmm/protocol.h | 0 {hardware => src/hardware}/sysclk-lwla/api.c | 0 {hardware => src/hardware}/sysclk-lwla/lwla.c | 0 {hardware => src/hardware}/sysclk-lwla/lwla.h | 0 .../hardware}/sysclk-lwla/protocol.c | 0 .../hardware}/sysclk-lwla/protocol.h | 0 {hardware => src/hardware}/teleinfo/api.c | 0 .../hardware}/teleinfo/protocol.c | 0 .../hardware}/teleinfo/protocol.h | 0 {hardware => src/hardware}/testo/api.c | 0 {hardware => src/hardware}/testo/protocol.c | 0 {hardware => src/hardware}/testo/protocol.h | 0 .../hardware}/tondaj-sl-814/api.c | 0 .../hardware}/tondaj-sl-814/protocol.c | 0 .../hardware}/tondaj-sl-814/protocol.h | 0 {hardware => src/hardware}/uni-t-dmm/api.c | 0 .../hardware}/uni-t-dmm/protocol.c | 0 .../hardware}/uni-t-dmm/protocol.h | 0 {hardware => src/hardware}/uni-t-ut32x/api.c | 0 .../hardware}/uni-t-ut32x/protocol.c | 0 .../hardware}/uni-t-ut32x/protocol.h | 0 {hardware => src/hardware}/victor-dmm/api.c | 0 .../hardware}/victor-dmm/protocol.c | 0 .../hardware}/victor-dmm/protocol.h | 0 .../hardware}/zeroplus-logic-cube/analyzer.c | 0 .../hardware}/zeroplus-logic-cube/analyzer.h | 0 .../hardware}/zeroplus-logic-cube/api.c | 0 .../hardware}/zeroplus-logic-cube/gl_usb.c | 0 .../hardware}/zeroplus-logic-cube/gl_usb.h | 0 .../hardware}/zeroplus-logic-cube/protocol.c | 0 .../hardware}/zeroplus-logic-cube/protocol.h | 0 hwdriver.c => src/hwdriver.c | 0 {input => src/input}/binary.c | 0 {input => src/input}/chronovu_la8.c | 0 {input => src/input}/csv.c | 0 {input => src/input}/input.c | 0 {input => src/input}/vcd.c | 0 {input => src/input}/wav.c | 0 .../libsigrok-internal.h | 0 log.c => src/log.c | 0 {output => src/output}/analog.c | 0 {output => src/output}/ascii.c | 0 {output => src/output}/binary.c | 0 {output => src/output}/bits.c | 0 {output => src/output}/chronovu_la8.c | 0 {output => src/output}/csv.c | 0 {output => src/output}/gnuplot.c | 0 {output => src/output}/hex.c | 0 {output => src/output}/ols.c | 0 {output => src/output}/output.c | 0 {output => src/output}/vcd.c | 0 {hardware/common => src/scpi}/scpi.c | 0 {hardware/common => src/scpi}/scpi_serial.c | 0 {hardware/common => src/scpi}/scpi_tcp.c | 0 .../common => src/scpi}/scpi_usbtmc_libusb.c | 0 {hardware/common => src/scpi}/scpi_visa.c | 0 {hardware/common => src/scpi}/scpi_vxi.c | 0 {hardware/common => src/scpi}/vxi.h | 0 {hardware/common => src/scpi}/vxi.x | 0 {hardware/common => src/scpi}/vxi_clnt.c | 0 {hardware/common => src/scpi}/vxi_xdr.c | 0 {hardware/common => src}/serial.c | 0 session.c => src/session.c | 0 session_driver.c => src/session_driver.c | 0 session_file.c => src/session_file.c | 0 soft-trigger.c => src/soft-trigger.c | 0 std.c => src/std.c | 0 strutil.c => src/strutil.c | 0 trigger.c => src/trigger.c | 0 {hardware/common => src}/usb.c | 0 version.c => src/version.c | 0 174 files changed, 179 insertions(+), 179 deletions(-) rename backend.c => src/backend.c (100%) rename device.c => src/device.c (100%) rename {hardware/common => src}/dmm/es519xx.c (100%) rename {hardware/common => src}/dmm/fs9721.c (100%) rename {hardware/common => src}/dmm/fs9922.c (100%) rename {hardware/common => src}/dmm/m2110.c (100%) rename {hardware/common => src}/dmm/metex14.c (100%) rename {hardware/common => src}/dmm/rs9lcd.c (100%) rename drivers.c => src/drivers.c (100%) rename error.c => src/error.c (100%) rename {hardware/common => src}/ezusb.c (100%) rename {hardware => src/hardware}/agilent-dmm/agilent-dmm.h (100%) rename {hardware => src/hardware}/agilent-dmm/api.c (100%) rename {hardware => src/hardware}/agilent-dmm/sched.c (100%) rename {hardware => src/hardware}/appa-55ii/api.c (100%) rename {hardware => src/hardware}/appa-55ii/protocol.c (100%) rename {hardware => src/hardware}/appa-55ii/protocol.h (100%) rename {hardware => src/hardware}/asix-sigma/asix-sigma.c (100%) rename {hardware => src/hardware}/asix-sigma/asix-sigma.h (100%) rename {hardware => src/hardware}/atten-pps3xxx/api.c (100%) rename {hardware => src/hardware}/atten-pps3xxx/protocol.c (100%) rename {hardware => src/hardware}/atten-pps3xxx/protocol.h (100%) rename {hardware => src/hardware}/beaglelogic/api.c (100%) rename {hardware => src/hardware}/beaglelogic/beaglelogic.h (100%) rename {hardware => src/hardware}/beaglelogic/protocol.c (100%) rename {hardware => src/hardware}/beaglelogic/protocol.h (100%) rename {hardware => src/hardware}/brymen-bm86x/api.c (100%) rename {hardware => src/hardware}/brymen-bm86x/protocol.c (100%) rename {hardware => src/hardware}/brymen-bm86x/protocol.h (100%) rename {hardware => src/hardware}/brymen-dmm/api.c (100%) rename {hardware => src/hardware}/brymen-dmm/parser.c (100%) rename {hardware => src/hardware}/brymen-dmm/protocol.c (100%) rename {hardware => src/hardware}/brymen-dmm/protocol.h (100%) rename {hardware => src/hardware}/cem-dt-885x/api.c (100%) rename {hardware => src/hardware}/cem-dt-885x/protocol.c (100%) rename {hardware => src/hardware}/cem-dt-885x/protocol.h (100%) rename {hardware => src/hardware}/center-3xx/api.c (100%) rename {hardware => src/hardware}/center-3xx/protocol.c (100%) rename {hardware => src/hardware}/center-3xx/protocol.h (100%) rename {hardware => src/hardware}/chronovu-la/api.c (100%) rename {hardware => src/hardware}/chronovu-la/protocol.c (100%) rename {hardware => src/hardware}/chronovu-la/protocol.h (100%) rename {hardware => src/hardware}/colead-slm/api.c (100%) rename {hardware => src/hardware}/colead-slm/protocol.c (100%) rename {hardware => src/hardware}/colead-slm/protocol.h (100%) rename {hardware => src/hardware}/conrad-digi-35-cpu/api.c (100%) rename {hardware => src/hardware}/conrad-digi-35-cpu/protocol.c (100%) rename {hardware => src/hardware}/conrad-digi-35-cpu/protocol.h (100%) rename {hardware => src/hardware}/demo/demo.c (100%) rename {hardware => src/hardware}/fluke-dmm/api.c (100%) rename {hardware => src/hardware}/fluke-dmm/fluke-dmm.h (100%) rename {hardware => src/hardware}/fluke-dmm/fluke.c (100%) rename {hardware => src/hardware}/fx2lafw/api.c (100%) rename {hardware => src/hardware}/fx2lafw/protocol.c (100%) rename {hardware => src/hardware}/fx2lafw/protocol.h (100%) rename {hardware => src/hardware}/gmc-mh-1x-2x/api.c (100%) rename {hardware => src/hardware}/gmc-mh-1x-2x/protocol.c (100%) rename {hardware => src/hardware}/gmc-mh-1x-2x/protocol.h (100%) rename {hardware => src/hardware}/hameg-hmo/api.c (100%) rename {hardware => src/hardware}/hameg-hmo/protocol.c (100%) rename {hardware => src/hardware}/hameg-hmo/protocol.h (100%) rename {hardware => src/hardware}/hantek-dso/api.c (100%) rename {hardware => src/hardware}/hantek-dso/dso.c (100%) rename {hardware => src/hardware}/hantek-dso/dso.h (100%) rename {hardware => src/hardware}/ikalogic-scanalogic2/api.c (100%) rename {hardware => src/hardware}/ikalogic-scanalogic2/protocol.c (100%) rename {hardware => src/hardware}/ikalogic-scanalogic2/protocol.h (100%) rename {hardware => src/hardware}/ikalogic-scanaplus/api.c (100%) rename {hardware => src/hardware}/ikalogic-scanaplus/protocol.c (100%) rename {hardware => src/hardware}/ikalogic-scanaplus/protocol.h (100%) rename {hardware => src/hardware}/kecheng-kc-330b/api.c (100%) rename {hardware => src/hardware}/kecheng-kc-330b/protocol.c (100%) rename {hardware => src/hardware}/kecheng-kc-330b/protocol.h (100%) rename {hardware => src/hardware}/lascar-el-usb/api.c (100%) rename {hardware => src/hardware}/lascar-el-usb/protocol.c (100%) rename {hardware => src/hardware}/lascar-el-usb/protocol.h (100%) rename {hardware => src/hardware}/link-mso19/api.c (100%) rename {hardware => src/hardware}/link-mso19/protocol.c (100%) rename {hardware => src/hardware}/link-mso19/protocol.h (100%) rename {hardware => src/hardware}/manson-hcs-3xxx/api.c (100%) rename {hardware => src/hardware}/manson-hcs-3xxx/protocol.c (100%) rename {hardware => src/hardware}/manson-hcs-3xxx/protocol.h (100%) rename {hardware => src/hardware}/mic-985xx/api.c (100%) rename {hardware => src/hardware}/mic-985xx/protocol.c (100%) rename {hardware => src/hardware}/mic-985xx/protocol.h (100%) rename {hardware => src/hardware}/motech-lps-30x/api.c (100%) rename {hardware => src/hardware}/motech-lps-30x/protocol.c (100%) rename {hardware => src/hardware}/motech-lps-30x/protocol.h (100%) rename {hardware => src/hardware}/norma-dmm/api.c (100%) rename {hardware => src/hardware}/norma-dmm/protocol.c (100%) rename {hardware => src/hardware}/norma-dmm/protocol.h (100%) rename {hardware => src/hardware}/openbench-logic-sniffer/api.c (100%) rename {hardware => src/hardware}/openbench-logic-sniffer/protocol.c (100%) rename {hardware => src/hardware}/openbench-logic-sniffer/protocol.h (100%) rename {hardware => src/hardware}/rigol-ds/api.c (100%) rename {hardware => src/hardware}/rigol-ds/protocol.c (100%) rename {hardware => src/hardware}/rigol-ds/protocol.h (100%) rename {hardware => src/hardware}/saleae-logic16/api.c (100%) rename {hardware => src/hardware}/saleae-logic16/protocol.c (100%) rename {hardware => src/hardware}/saleae-logic16/protocol.h (100%) rename {hardware => src/hardware}/serial-dmm/api.c (100%) rename {hardware => src/hardware}/serial-dmm/protocol.c (100%) rename {hardware => src/hardware}/serial-dmm/protocol.h (100%) rename {hardware => src/hardware}/sysclk-lwla/api.c (100%) rename {hardware => src/hardware}/sysclk-lwla/lwla.c (100%) rename {hardware => src/hardware}/sysclk-lwla/lwla.h (100%) rename {hardware => src/hardware}/sysclk-lwla/protocol.c (100%) rename {hardware => src/hardware}/sysclk-lwla/protocol.h (100%) rename {hardware => src/hardware}/teleinfo/api.c (100%) rename {hardware => src/hardware}/teleinfo/protocol.c (100%) rename {hardware => src/hardware}/teleinfo/protocol.h (100%) rename {hardware => src/hardware}/testo/api.c (100%) rename {hardware => src/hardware}/testo/protocol.c (100%) rename {hardware => src/hardware}/testo/protocol.h (100%) rename {hardware => src/hardware}/tondaj-sl-814/api.c (100%) rename {hardware => src/hardware}/tondaj-sl-814/protocol.c (100%) rename {hardware => src/hardware}/tondaj-sl-814/protocol.h (100%) rename {hardware => src/hardware}/uni-t-dmm/api.c (100%) rename {hardware => src/hardware}/uni-t-dmm/protocol.c (100%) rename {hardware => src/hardware}/uni-t-dmm/protocol.h (100%) rename {hardware => src/hardware}/uni-t-ut32x/api.c (100%) rename {hardware => src/hardware}/uni-t-ut32x/protocol.c (100%) rename {hardware => src/hardware}/uni-t-ut32x/protocol.h (100%) rename {hardware => src/hardware}/victor-dmm/api.c (100%) rename {hardware => src/hardware}/victor-dmm/protocol.c (100%) rename {hardware => src/hardware}/victor-dmm/protocol.h (100%) rename {hardware => src/hardware}/zeroplus-logic-cube/analyzer.c (100%) rename {hardware => src/hardware}/zeroplus-logic-cube/analyzer.h (100%) rename {hardware => src/hardware}/zeroplus-logic-cube/api.c (100%) rename {hardware => src/hardware}/zeroplus-logic-cube/gl_usb.c (100%) rename {hardware => src/hardware}/zeroplus-logic-cube/gl_usb.h (100%) rename {hardware => src/hardware}/zeroplus-logic-cube/protocol.c (100%) rename {hardware => src/hardware}/zeroplus-logic-cube/protocol.h (100%) rename hwdriver.c => src/hwdriver.c (100%) rename {input => src/input}/binary.c (100%) rename {input => src/input}/chronovu_la8.c (100%) rename {input => src/input}/csv.c (100%) rename {input => src/input}/input.c (100%) rename {input => src/input}/vcd.c (100%) rename {input => src/input}/wav.c (100%) rename libsigrok-internal.h => src/libsigrok-internal.h (100%) rename log.c => src/log.c (100%) rename {output => src/output}/analog.c (100%) rename {output => src/output}/ascii.c (100%) rename {output => src/output}/binary.c (100%) rename {output => src/output}/bits.c (100%) rename {output => src/output}/chronovu_la8.c (100%) rename {output => src/output}/csv.c (100%) rename {output => src/output}/gnuplot.c (100%) rename {output => src/output}/hex.c (100%) rename {output => src/output}/ols.c (100%) rename {output => src/output}/output.c (100%) rename {output => src/output}/vcd.c (100%) rename {hardware/common => src/scpi}/scpi.c (100%) rename {hardware/common => src/scpi}/scpi_serial.c (100%) rename {hardware/common => src/scpi}/scpi_tcp.c (100%) rename {hardware/common => src/scpi}/scpi_usbtmc_libusb.c (100%) rename {hardware/common => src/scpi}/scpi_visa.c (100%) rename {hardware/common => src/scpi}/scpi_vxi.c (100%) rename {hardware/common => src/scpi}/vxi.h (100%) rename {hardware/common => src/scpi}/vxi.x (100%) rename {hardware/common => src/scpi}/vxi_clnt.c (100%) rename {hardware/common => src/scpi}/vxi_xdr.c (100%) rename {hardware/common => src}/serial.c (100%) rename session.c => src/session.c (100%) rename session_driver.c => src/session_driver.c (100%) rename session_file.c => src/session_file.c (100%) rename soft-trigger.c => src/soft-trigger.c (100%) rename std.c => src/std.c (100%) rename strutil.c => src/strutil.c (100%) rename trigger.c => src/trigger.c (100%) rename {hardware/common => src}/usb.c (100%) rename version.c => src/version.c (100%) diff --git a/Makefile.am b/Makefile.am index 72f97969..3a485e0a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,318 +20,318 @@ ACLOCAL_AMFLAGS = -I autostuff -AM_CPPFLAGS = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"' +AM_CPPFLAGS = -Isrc -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"' lib_LTLIBRARIES = libsigrok.la # Backend files libsigrok_la_SOURCES = \ - backend.c \ - device.c \ - session.c \ - session_file.c \ - session_driver.c \ - drivers.c \ - hwdriver.c \ - trigger.c \ - soft-trigger.c \ - strutil.c \ - log.c \ - version.c \ - error.c \ - std.c - -# Input formats -libsigrok_la_SOURCES += \ - input/binary.c \ - input/chronovu_la8.c \ - input/csv.c \ - input/input.c \ - input/vcd.c \ - input/wav.c - -# Output formats -libsigrok_la_SOURCES += \ - output/output.c \ - output/analog.c \ - output/ascii.c \ - output/bits.c \ - output/binary.c \ - output/csv.c \ - output/chronovu_la8.c \ - output/gnuplot.c \ - output/hex.c \ - output/ols.c \ - output/vcd.c - -# Hardware (common files) -libsigrok_la_SOURCES += \ - hardware/common/scpi.c \ - hardware/common/scpi_tcp.c + src/backend.c \ + src/device.c \ + src/session.c \ + src/session_file.c \ + src/session_driver.c \ + src/drivers.c \ + src/hwdriver.c \ + src/trigger.c \ + src/soft-trigger.c \ + src/strutil.c \ + src/log.c \ + src/version.c \ + src/error.c \ + src/std.c + +# Input modules +libsigrok_la_SOURCES += \ + src/input/binary.c \ + src/input/chronovu_la8.c \ + src/input/csv.c \ + src/input/input.c \ + src/input/vcd.c \ + src/input/wav.c + +# Output modules +libsigrok_la_SOURCES += \ + src/output/output.c \ + src/output/analog.c \ + src/output/ascii.c \ + src/output/bits.c \ + src/output/binary.c \ + src/output/csv.c \ + src/output/chronovu_la8.c \ + src/output/gnuplot.c \ + src/output/hex.c \ + src/output/ols.c \ + src/output/vcd.c + +# SCPI support +libsigrok_la_SOURCES += \ + src/scpi/scpi.c \ + src/scpi/scpi_tcp.c if NEED_RPC libsigrok_la_SOURCES += \ - hardware/common/scpi_vxi.c \ - hardware/common/vxi_clnt.c \ - hardware/common/vxi_xdr.c \ - hardware/common/vxi.h + src/scpi/scpi_vxi.c \ + src/scpi/vxi_clnt.c \ + src/scpi/vxi_xdr.c \ + src/scpi/vxi.h endif if NEED_SERIAL libsigrok_la_SOURCES += \ - hardware/common/serial.c \ - hardware/common/scpi_serial.c + src/serial.c \ + src/scpi/scpi_serial.c endif if NEED_USB libsigrok_la_SOURCES += \ - hardware/common/ezusb.c \ - hardware/common/usb.c \ - hardware/common/scpi_usbtmc_libusb.c + src/ezusb.c \ + src/usb.c \ + src/scpi/scpi_usbtmc_libusb.c endif if NEED_VISA libsigrok_la_SOURCES += \ - hardware/common/scpi_visa.c + src/scpi/scpi_visa.c endif -# Hardware (DMM parsers) +# Hardware (DMM chip parsers) libsigrok_la_SOURCES += \ - hardware/common/dmm/es519xx.c \ - hardware/common/dmm/fs9721.c \ - hardware/common/dmm/fs9922.c \ - hardware/common/dmm/m2110.c \ - hardware/common/dmm/metex14.c \ - hardware/common/dmm/rs9lcd.c + src/dmm/es519xx.c \ + src/dmm/fs9721.c \ + src/dmm/fs9922.c \ + src/dmm/m2110.c \ + src/dmm/metex14.c \ + src/dmm/rs9lcd.c # Hardware drivers if HW_AGILENT_DMM libsigrok_la_SOURCES += \ - hardware/agilent-dmm/api.c \ - hardware/agilent-dmm/agilent-dmm.h \ - hardware/agilent-dmm/sched.c + src/hardware/agilent-dmm/api.c \ + src/hardware/agilent-dmm/agilent-dmm.h \ + src/hardware/agilent-dmm/sched.c endif if HW_APPA_55II libsigrok_la_SOURCES += \ - hardware/appa-55ii/protocol.h \ - hardware/appa-55ii/protocol.c \ - hardware/appa-55ii/api.c + src/hardware/appa-55ii/protocol.h \ + src/hardware/appa-55ii/protocol.c \ + src/hardware/appa-55ii/api.c endif if HW_ASIX_SIGMA libsigrok_la_SOURCES += \ - hardware/asix-sigma/asix-sigma.h \ - hardware/asix-sigma/asix-sigma.c + src/hardware/asix-sigma/asix-sigma.h \ + src/hardware/asix-sigma/asix-sigma.c endif if HW_ATTEN_PPS3XXX libsigrok_la_SOURCES += \ - hardware/atten-pps3xxx/protocol.h \ - hardware/atten-pps3xxx/protocol.c \ - hardware/atten-pps3xxx/api.c + src/hardware/atten-pps3xxx/protocol.h \ + src/hardware/atten-pps3xxx/protocol.c \ + src/hardware/atten-pps3xxx/api.c endif if HW_BEAGLELOGIC libsigrok_la_SOURCES += \ - hardware/beaglelogic/protocol.h \ - hardware/beaglelogic/protocol.c \ - hardware/beaglelogic/api.c + src/hardware/beaglelogic/protocol.h \ + src/hardware/beaglelogic/protocol.c \ + src/hardware/beaglelogic/api.c endif if HW_BRYMEN_BM86X libsigrok_la_SOURCES += \ - hardware/brymen-bm86x/protocol.h \ - hardware/brymen-bm86x/protocol.c \ - hardware/brymen-bm86x/api.c + src/hardware/brymen-bm86x/protocol.h \ + src/hardware/brymen-bm86x/protocol.c \ + src/hardware/brymen-bm86x/api.c endif if HW_BRYMEN_DMM libsigrok_la_SOURCES += \ - hardware/brymen-dmm/parser.c \ - hardware/brymen-dmm/protocol.h \ - hardware/brymen-dmm/protocol.c \ - hardware/brymen-dmm/api.c + src/hardware/brymen-dmm/parser.c \ + src/hardware/brymen-dmm/protocol.h \ + src/hardware/brymen-dmm/protocol.c \ + src/hardware/brymen-dmm/api.c endif if HW_CEM_DT_885X libsigrok_la_SOURCES += \ - hardware/cem-dt-885x/protocol.h \ - hardware/cem-dt-885x/protocol.c \ - hardware/cem-dt-885x/api.c + src/hardware/cem-dt-885x/protocol.h \ + src/hardware/cem-dt-885x/protocol.c \ + src/hardware/cem-dt-885x/api.c endif if HW_CENTER_3XX libsigrok_la_SOURCES += \ - hardware/center-3xx/protocol.h \ - hardware/center-3xx/protocol.c \ - hardware/center-3xx/api.c + src/hardware/center-3xx/protocol.h \ + src/hardware/center-3xx/protocol.c \ + src/hardware/center-3xx/api.c endif if HW_CHRONOVU_LA libsigrok_la_SOURCES += \ - hardware/chronovu-la/protocol.h \ - hardware/chronovu-la/protocol.c \ - hardware/chronovu-la/api.c + src/hardware/chronovu-la/protocol.h \ + src/hardware/chronovu-la/protocol.c \ + src/hardware/chronovu-la/api.c endif if HW_COLEAD_SLM libsigrok_la_SOURCES += \ - hardware/colead-slm/protocol.h \ - hardware/colead-slm/protocol.c \ - hardware/colead-slm/api.c + src/hardware/colead-slm/protocol.h \ + src/hardware/colead-slm/protocol.c \ + src/hardware/colead-slm/api.c endif if HW_CONRAD_DIGI_35_CPU libsigrok_la_SOURCES += \ - hardware/conrad-digi-35-cpu/protocol.h \ - hardware/conrad-digi-35-cpu/protocol.c \ - hardware/conrad-digi-35-cpu/api.c + src/hardware/conrad-digi-35-cpu/protocol.h \ + src/hardware/conrad-digi-35-cpu/protocol.c \ + src/hardware/conrad-digi-35-cpu/api.c endif if HW_DEMO libsigrok_la_SOURCES += \ - hardware/demo/demo.c + src/hardware/demo/demo.c endif if HW_FLUKE_DMM libsigrok_la_SOURCES += \ - hardware/fluke-dmm/fluke-dmm.h \ - hardware/fluke-dmm/fluke.c \ - hardware/fluke-dmm/api.c + src/hardware/fluke-dmm/fluke-dmm.h \ + src/hardware/fluke-dmm/fluke.c \ + src/hardware/fluke-dmm/api.c endif if HW_FX2LAFW libsigrok_la_SOURCES += \ - hardware/fx2lafw/protocol.h \ - hardware/fx2lafw/protocol.c \ - hardware/fx2lafw/api.c + src/hardware/fx2lafw/protocol.h \ + src/hardware/fx2lafw/protocol.c \ + src/hardware/fx2lafw/api.c endif if HW_GMC_MH_1X_2X libsigrok_la_SOURCES += \ - hardware/gmc-mh-1x-2x/protocol.h \ - hardware/gmc-mh-1x-2x/protocol.c \ - hardware/gmc-mh-1x-2x/api.c + src/hardware/gmc-mh-1x-2x/protocol.h \ + src/hardware/gmc-mh-1x-2x/protocol.c \ + src/hardware/gmc-mh-1x-2x/api.c endif if HW_HAMEG_HMO libsigrok_la_SOURCES += \ - hardware/hameg-hmo/protocol.h \ - hardware/hameg-hmo/protocol.c \ - hardware/hameg-hmo/api.c + src/hardware/hameg-hmo/protocol.h \ + src/hardware/hameg-hmo/protocol.c \ + src/hardware/hameg-hmo/api.c endif if HW_HANTEK_DSO libsigrok_la_SOURCES += \ - hardware/hantek-dso/dso.h \ - hardware/hantek-dso/dso.c \ - hardware/hantek-dso/api.c + src/hardware/hantek-dso/dso.h \ + src/hardware/hantek-dso/dso.c \ + src/hardware/hantek-dso/api.c endif if HW_IKALOGIC_SCANALOGIC2 libsigrok_la_SOURCES += \ - hardware/ikalogic-scanalogic2/protocol.h \ - hardware/ikalogic-scanalogic2/protocol.c \ - hardware/ikalogic-scanalogic2/api.c + src/hardware/ikalogic-scanalogic2/protocol.h \ + src/hardware/ikalogic-scanalogic2/protocol.c \ + src/hardware/ikalogic-scanalogic2/api.c endif if HW_IKALOGIC_SCANAPLUS libsigrok_la_SOURCES += \ - hardware/ikalogic-scanaplus/protocol.h \ - hardware/ikalogic-scanaplus/protocol.c \ - hardware/ikalogic-scanaplus/api.c + src/hardware/ikalogic-scanaplus/protocol.h \ + src/hardware/ikalogic-scanaplus/protocol.c \ + src/hardware/ikalogic-scanaplus/api.c endif if HW_KECHENG_KC_330B libsigrok_la_SOURCES += \ - hardware/kecheng-kc-330b/protocol.h \ - hardware/kecheng-kc-330b/protocol.c \ - hardware/kecheng-kc-330b/api.c + src/hardware/kecheng-kc-330b/protocol.h \ + src/hardware/kecheng-kc-330b/protocol.c \ + src/hardware/kecheng-kc-330b/api.c endif if HW_LASCAR_EL_USB libsigrok_la_SOURCES += \ - hardware/lascar-el-usb/protocol.h \ - hardware/lascar-el-usb/protocol.c \ - hardware/lascar-el-usb/api.c + src/hardware/lascar-el-usb/protocol.h \ + src/hardware/lascar-el-usb/protocol.c \ + src/hardware/lascar-el-usb/api.c endif if HW_MANSON_HCS_3XXX libsigrok_la_SOURCES += \ - hardware/manson-hcs-3xxx/protocol.h \ - hardware/manson-hcs-3xxx/protocol.c \ - hardware/manson-hcs-3xxx/api.c + src/hardware/manson-hcs-3xxx/protocol.h \ + src/hardware/manson-hcs-3xxx/protocol.c \ + src/hardware/manson-hcs-3xxx/api.c endif if HW_MIC_985XX libsigrok_la_SOURCES += \ - hardware/mic-985xx/protocol.h \ - hardware/mic-985xx/protocol.c \ - hardware/mic-985xx/api.c + src/hardware/mic-985xx/protocol.h \ + src/hardware/mic-985xx/protocol.c \ + src/hardware/mic-985xx/api.c endif if HW_MOTECH_LPS_30X libsigrok_la_SOURCES += \ - hardware/motech-lps-30x/protocol.h \ - hardware/motech-lps-30x/protocol.c \ - hardware/motech-lps-30x/api.c + src/hardware/motech-lps-30x/protocol.h \ + src/hardware/motech-lps-30x/protocol.c \ + src/hardware/motech-lps-30x/api.c endif if HW_NORMA_DMM libsigrok_la_SOURCES += \ - hardware/norma-dmm/protocol.h \ - hardware/norma-dmm/protocol.c \ - hardware/norma-dmm/api.c + src/hardware/norma-dmm/protocol.h \ + src/hardware/norma-dmm/protocol.c \ + src/hardware/norma-dmm/api.c endif if HW_OPENBENCH_LOGIC_SNIFFER libsigrok_la_SOURCES += \ - hardware/openbench-logic-sniffer/protocol.h \ - hardware/openbench-logic-sniffer/protocol.c \ - hardware/openbench-logic-sniffer/api.c + src/hardware/openbench-logic-sniffer/protocol.h \ + src/hardware/openbench-logic-sniffer/protocol.c \ + src/hardware/openbench-logic-sniffer/api.c endif if HW_RIGOL_DS libsigrok_la_SOURCES += \ - hardware/rigol-ds/protocol.h \ - hardware/rigol-ds/protocol.c \ - hardware/rigol-ds/api.c + src/hardware/rigol-ds/protocol.h \ + src/hardware/rigol-ds/protocol.c \ + src/hardware/rigol-ds/api.c endif if HW_SALEAE_LOGIC16 libsigrok_la_SOURCES += \ - hardware/saleae-logic16/protocol.h \ - hardware/saleae-logic16/protocol.c \ - hardware/saleae-logic16/api.c + src/hardware/saleae-logic16/protocol.h \ + src/hardware/saleae-logic16/protocol.c \ + src/hardware/saleae-logic16/api.c endif if HW_SERIAL_DMM libsigrok_la_SOURCES += \ - hardware/serial-dmm/protocol.h \ - hardware/serial-dmm/protocol.c \ - hardware/serial-dmm/api.c + src/hardware/serial-dmm/protocol.h \ + src/hardware/serial-dmm/protocol.c \ + src/hardware/serial-dmm/api.c endif if HW_SYSCLK_LWLA libsigrok_la_SOURCES += \ - hardware/sysclk-lwla/lwla.h \ - hardware/sysclk-lwla/lwla.c \ - hardware/sysclk-lwla/protocol.h \ - hardware/sysclk-lwla/protocol.c \ - hardware/sysclk-lwla/api.c + src/hardware/sysclk-lwla/lwla.h \ + src/hardware/sysclk-lwla/lwla.c \ + src/hardware/sysclk-lwla/protocol.h \ + src/hardware/sysclk-lwla/protocol.c \ + src/hardware/sysclk-lwla/api.c endif if HW_TELEINFO libsigrok_la_SOURCES += \ - hardware/teleinfo/protocol.h \ - hardware/teleinfo/protocol.c \ - hardware/teleinfo/api.c + src/hardware/teleinfo/protocol.h \ + src/hardware/teleinfo/protocol.c \ + src/hardware/teleinfo/api.c endif if HW_TESTO libsigrok_la_SOURCES += \ - hardware/testo/protocol.h \ - hardware/testo/protocol.c \ - hardware/testo/api.c + src/hardware/testo/protocol.h \ + src/hardware/testo/protocol.c \ + src/hardware/testo/api.c endif if HW_TONDAJ_SL_814 libsigrok_la_SOURCES += \ - hardware/tondaj-sl-814/protocol.h \ - hardware/tondaj-sl-814/protocol.c \ - hardware/tondaj-sl-814/api.c + src/hardware/tondaj-sl-814/protocol.h \ + src/hardware/tondaj-sl-814/protocol.c \ + src/hardware/tondaj-sl-814/api.c endif if HW_UNI_T_DMM libsigrok_la_SOURCES += \ - hardware/uni-t-dmm/protocol.h \ - hardware/uni-t-dmm/protocol.c \ - hardware/uni-t-dmm/api.c + src/hardware/uni-t-dmm/protocol.h \ + src/hardware/uni-t-dmm/protocol.c \ + src/hardware/uni-t-dmm/api.c endif if HW_UNI_T_UT32X libsigrok_la_SOURCES += \ - hardware/uni-t-ut32x/protocol.h \ - hardware/uni-t-ut32x/protocol.c \ - hardware/uni-t-ut32x/api.c + src/hardware/uni-t-ut32x/protocol.h \ + src/hardware/uni-t-ut32x/protocol.c \ + src/hardware/uni-t-ut32x/api.c endif if HW_VICTOR_DMM libsigrok_la_SOURCES += \ - hardware/victor-dmm/protocol.h \ - hardware/victor-dmm/protocol.c \ - hardware/victor-dmm/api.c + src/hardware/victor-dmm/protocol.h \ + src/hardware/victor-dmm/protocol.c \ + src/hardware/victor-dmm/api.c endif if HW_ZEROPLUS_LOGIC_CUBE libsigrok_la_SOURCES += \ - hardware/zeroplus-logic-cube/analyzer.c \ - hardware/zeroplus-logic-cube/analyzer.h \ - hardware/zeroplus-logic-cube/gl_usb.h \ - hardware/zeroplus-logic-cube/gl_usb.c \ - hardware/zeroplus-logic-cube/protocol.h \ - hardware/zeroplus-logic-cube/protocol.c \ - hardware/zeroplus-logic-cube/api.c + src/hardware/zeroplus-logic-cube/analyzer.c \ + src/hardware/zeroplus-logic-cube/analyzer.h \ + src/hardware/zeroplus-logic-cube/gl_usb.h \ + src/hardware/zeroplus-logic-cube/gl_usb.c \ + src/hardware/zeroplus-logic-cube/protocol.h \ + src/hardware/zeroplus-logic-cube/protocol.c \ + src/hardware/zeroplus-logic-cube/api.c endif libsigrok_la_LIBADD = $(LIBOBJS) @@ -343,7 +343,7 @@ library_include_HEADERS = \ include/libsigrok/libsigrok.h \ include/libsigrok/proto.h \ include/libsigrok/version.h -noinst_HEADERS = libsigrok-internal.h +noinst_HEADERS = src/libsigrok-internal.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libsigrok.pc diff --git a/backend.c b/src/backend.c similarity index 100% rename from backend.c rename to src/backend.c diff --git a/device.c b/src/device.c similarity index 100% rename from device.c rename to src/device.c diff --git a/hardware/common/dmm/es519xx.c b/src/dmm/es519xx.c similarity index 100% rename from hardware/common/dmm/es519xx.c rename to src/dmm/es519xx.c diff --git a/hardware/common/dmm/fs9721.c b/src/dmm/fs9721.c similarity index 100% rename from hardware/common/dmm/fs9721.c rename to src/dmm/fs9721.c diff --git a/hardware/common/dmm/fs9922.c b/src/dmm/fs9922.c similarity index 100% rename from hardware/common/dmm/fs9922.c rename to src/dmm/fs9922.c diff --git a/hardware/common/dmm/m2110.c b/src/dmm/m2110.c similarity index 100% rename from hardware/common/dmm/m2110.c rename to src/dmm/m2110.c diff --git a/hardware/common/dmm/metex14.c b/src/dmm/metex14.c similarity index 100% rename from hardware/common/dmm/metex14.c rename to src/dmm/metex14.c diff --git a/hardware/common/dmm/rs9lcd.c b/src/dmm/rs9lcd.c similarity index 100% rename from hardware/common/dmm/rs9lcd.c rename to src/dmm/rs9lcd.c diff --git a/drivers.c b/src/drivers.c similarity index 100% rename from drivers.c rename to src/drivers.c diff --git a/error.c b/src/error.c similarity index 100% rename from error.c rename to src/error.c diff --git a/hardware/common/ezusb.c b/src/ezusb.c similarity index 100% rename from hardware/common/ezusb.c rename to src/ezusb.c diff --git a/hardware/agilent-dmm/agilent-dmm.h b/src/hardware/agilent-dmm/agilent-dmm.h similarity index 100% rename from hardware/agilent-dmm/agilent-dmm.h rename to src/hardware/agilent-dmm/agilent-dmm.h diff --git a/hardware/agilent-dmm/api.c b/src/hardware/agilent-dmm/api.c similarity index 100% rename from hardware/agilent-dmm/api.c rename to src/hardware/agilent-dmm/api.c diff --git a/hardware/agilent-dmm/sched.c b/src/hardware/agilent-dmm/sched.c similarity index 100% rename from hardware/agilent-dmm/sched.c rename to src/hardware/agilent-dmm/sched.c diff --git a/hardware/appa-55ii/api.c b/src/hardware/appa-55ii/api.c similarity index 100% rename from hardware/appa-55ii/api.c rename to src/hardware/appa-55ii/api.c diff --git a/hardware/appa-55ii/protocol.c b/src/hardware/appa-55ii/protocol.c similarity index 100% rename from hardware/appa-55ii/protocol.c rename to src/hardware/appa-55ii/protocol.c diff --git a/hardware/appa-55ii/protocol.h b/src/hardware/appa-55ii/protocol.h similarity index 100% rename from hardware/appa-55ii/protocol.h rename to src/hardware/appa-55ii/protocol.h diff --git a/hardware/asix-sigma/asix-sigma.c b/src/hardware/asix-sigma/asix-sigma.c similarity index 100% rename from hardware/asix-sigma/asix-sigma.c rename to src/hardware/asix-sigma/asix-sigma.c diff --git a/hardware/asix-sigma/asix-sigma.h b/src/hardware/asix-sigma/asix-sigma.h similarity index 100% rename from hardware/asix-sigma/asix-sigma.h rename to src/hardware/asix-sigma/asix-sigma.h diff --git a/hardware/atten-pps3xxx/api.c b/src/hardware/atten-pps3xxx/api.c similarity index 100% rename from hardware/atten-pps3xxx/api.c rename to src/hardware/atten-pps3xxx/api.c diff --git a/hardware/atten-pps3xxx/protocol.c b/src/hardware/atten-pps3xxx/protocol.c similarity index 100% rename from hardware/atten-pps3xxx/protocol.c rename to src/hardware/atten-pps3xxx/protocol.c diff --git a/hardware/atten-pps3xxx/protocol.h b/src/hardware/atten-pps3xxx/protocol.h similarity index 100% rename from hardware/atten-pps3xxx/protocol.h rename to src/hardware/atten-pps3xxx/protocol.h diff --git a/hardware/beaglelogic/api.c b/src/hardware/beaglelogic/api.c similarity index 100% rename from hardware/beaglelogic/api.c rename to src/hardware/beaglelogic/api.c diff --git a/hardware/beaglelogic/beaglelogic.h b/src/hardware/beaglelogic/beaglelogic.h similarity index 100% rename from hardware/beaglelogic/beaglelogic.h rename to src/hardware/beaglelogic/beaglelogic.h diff --git a/hardware/beaglelogic/protocol.c b/src/hardware/beaglelogic/protocol.c similarity index 100% rename from hardware/beaglelogic/protocol.c rename to src/hardware/beaglelogic/protocol.c diff --git a/hardware/beaglelogic/protocol.h b/src/hardware/beaglelogic/protocol.h similarity index 100% rename from hardware/beaglelogic/protocol.h rename to src/hardware/beaglelogic/protocol.h diff --git a/hardware/brymen-bm86x/api.c b/src/hardware/brymen-bm86x/api.c similarity index 100% rename from hardware/brymen-bm86x/api.c rename to src/hardware/brymen-bm86x/api.c diff --git a/hardware/brymen-bm86x/protocol.c b/src/hardware/brymen-bm86x/protocol.c similarity index 100% rename from hardware/brymen-bm86x/protocol.c rename to src/hardware/brymen-bm86x/protocol.c diff --git a/hardware/brymen-bm86x/protocol.h b/src/hardware/brymen-bm86x/protocol.h similarity index 100% rename from hardware/brymen-bm86x/protocol.h rename to src/hardware/brymen-bm86x/protocol.h diff --git a/hardware/brymen-dmm/api.c b/src/hardware/brymen-dmm/api.c similarity index 100% rename from hardware/brymen-dmm/api.c rename to src/hardware/brymen-dmm/api.c diff --git a/hardware/brymen-dmm/parser.c b/src/hardware/brymen-dmm/parser.c similarity index 100% rename from hardware/brymen-dmm/parser.c rename to src/hardware/brymen-dmm/parser.c diff --git a/hardware/brymen-dmm/protocol.c b/src/hardware/brymen-dmm/protocol.c similarity index 100% rename from hardware/brymen-dmm/protocol.c rename to src/hardware/brymen-dmm/protocol.c diff --git a/hardware/brymen-dmm/protocol.h b/src/hardware/brymen-dmm/protocol.h similarity index 100% rename from hardware/brymen-dmm/protocol.h rename to src/hardware/brymen-dmm/protocol.h diff --git a/hardware/cem-dt-885x/api.c b/src/hardware/cem-dt-885x/api.c similarity index 100% rename from hardware/cem-dt-885x/api.c rename to src/hardware/cem-dt-885x/api.c diff --git a/hardware/cem-dt-885x/protocol.c b/src/hardware/cem-dt-885x/protocol.c similarity index 100% rename from hardware/cem-dt-885x/protocol.c rename to src/hardware/cem-dt-885x/protocol.c diff --git a/hardware/cem-dt-885x/protocol.h b/src/hardware/cem-dt-885x/protocol.h similarity index 100% rename from hardware/cem-dt-885x/protocol.h rename to src/hardware/cem-dt-885x/protocol.h diff --git a/hardware/center-3xx/api.c b/src/hardware/center-3xx/api.c similarity index 100% rename from hardware/center-3xx/api.c rename to src/hardware/center-3xx/api.c diff --git a/hardware/center-3xx/protocol.c b/src/hardware/center-3xx/protocol.c similarity index 100% rename from hardware/center-3xx/protocol.c rename to src/hardware/center-3xx/protocol.c diff --git a/hardware/center-3xx/protocol.h b/src/hardware/center-3xx/protocol.h similarity index 100% rename from hardware/center-3xx/protocol.h rename to src/hardware/center-3xx/protocol.h diff --git a/hardware/chronovu-la/api.c b/src/hardware/chronovu-la/api.c similarity index 100% rename from hardware/chronovu-la/api.c rename to src/hardware/chronovu-la/api.c diff --git a/hardware/chronovu-la/protocol.c b/src/hardware/chronovu-la/protocol.c similarity index 100% rename from hardware/chronovu-la/protocol.c rename to src/hardware/chronovu-la/protocol.c diff --git a/hardware/chronovu-la/protocol.h b/src/hardware/chronovu-la/protocol.h similarity index 100% rename from hardware/chronovu-la/protocol.h rename to src/hardware/chronovu-la/protocol.h diff --git a/hardware/colead-slm/api.c b/src/hardware/colead-slm/api.c similarity index 100% rename from hardware/colead-slm/api.c rename to src/hardware/colead-slm/api.c diff --git a/hardware/colead-slm/protocol.c b/src/hardware/colead-slm/protocol.c similarity index 100% rename from hardware/colead-slm/protocol.c rename to src/hardware/colead-slm/protocol.c diff --git a/hardware/colead-slm/protocol.h b/src/hardware/colead-slm/protocol.h similarity index 100% rename from hardware/colead-slm/protocol.h rename to src/hardware/colead-slm/protocol.h diff --git a/hardware/conrad-digi-35-cpu/api.c b/src/hardware/conrad-digi-35-cpu/api.c similarity index 100% rename from hardware/conrad-digi-35-cpu/api.c rename to src/hardware/conrad-digi-35-cpu/api.c diff --git a/hardware/conrad-digi-35-cpu/protocol.c b/src/hardware/conrad-digi-35-cpu/protocol.c similarity index 100% rename from hardware/conrad-digi-35-cpu/protocol.c rename to src/hardware/conrad-digi-35-cpu/protocol.c diff --git a/hardware/conrad-digi-35-cpu/protocol.h b/src/hardware/conrad-digi-35-cpu/protocol.h similarity index 100% rename from hardware/conrad-digi-35-cpu/protocol.h rename to src/hardware/conrad-digi-35-cpu/protocol.h diff --git a/hardware/demo/demo.c b/src/hardware/demo/demo.c similarity index 100% rename from hardware/demo/demo.c rename to src/hardware/demo/demo.c diff --git a/hardware/fluke-dmm/api.c b/src/hardware/fluke-dmm/api.c similarity index 100% rename from hardware/fluke-dmm/api.c rename to src/hardware/fluke-dmm/api.c diff --git a/hardware/fluke-dmm/fluke-dmm.h b/src/hardware/fluke-dmm/fluke-dmm.h similarity index 100% rename from hardware/fluke-dmm/fluke-dmm.h rename to src/hardware/fluke-dmm/fluke-dmm.h diff --git a/hardware/fluke-dmm/fluke.c b/src/hardware/fluke-dmm/fluke.c similarity index 100% rename from hardware/fluke-dmm/fluke.c rename to src/hardware/fluke-dmm/fluke.c diff --git a/hardware/fx2lafw/api.c b/src/hardware/fx2lafw/api.c similarity index 100% rename from hardware/fx2lafw/api.c rename to src/hardware/fx2lafw/api.c diff --git a/hardware/fx2lafw/protocol.c b/src/hardware/fx2lafw/protocol.c similarity index 100% rename from hardware/fx2lafw/protocol.c rename to src/hardware/fx2lafw/protocol.c diff --git a/hardware/fx2lafw/protocol.h b/src/hardware/fx2lafw/protocol.h similarity index 100% rename from hardware/fx2lafw/protocol.h rename to src/hardware/fx2lafw/protocol.h diff --git a/hardware/gmc-mh-1x-2x/api.c b/src/hardware/gmc-mh-1x-2x/api.c similarity index 100% rename from hardware/gmc-mh-1x-2x/api.c rename to src/hardware/gmc-mh-1x-2x/api.c diff --git a/hardware/gmc-mh-1x-2x/protocol.c b/src/hardware/gmc-mh-1x-2x/protocol.c similarity index 100% rename from hardware/gmc-mh-1x-2x/protocol.c rename to src/hardware/gmc-mh-1x-2x/protocol.c diff --git a/hardware/gmc-mh-1x-2x/protocol.h b/src/hardware/gmc-mh-1x-2x/protocol.h similarity index 100% rename from hardware/gmc-mh-1x-2x/protocol.h rename to src/hardware/gmc-mh-1x-2x/protocol.h diff --git a/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c similarity index 100% rename from hardware/hameg-hmo/api.c rename to src/hardware/hameg-hmo/api.c diff --git a/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c similarity index 100% rename from hardware/hameg-hmo/protocol.c rename to src/hardware/hameg-hmo/protocol.c diff --git a/hardware/hameg-hmo/protocol.h b/src/hardware/hameg-hmo/protocol.h similarity index 100% rename from hardware/hameg-hmo/protocol.h rename to src/hardware/hameg-hmo/protocol.h diff --git a/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c similarity index 100% rename from hardware/hantek-dso/api.c rename to src/hardware/hantek-dso/api.c diff --git a/hardware/hantek-dso/dso.c b/src/hardware/hantek-dso/dso.c similarity index 100% rename from hardware/hantek-dso/dso.c rename to src/hardware/hantek-dso/dso.c diff --git a/hardware/hantek-dso/dso.h b/src/hardware/hantek-dso/dso.h similarity index 100% rename from hardware/hantek-dso/dso.h rename to src/hardware/hantek-dso/dso.h diff --git a/hardware/ikalogic-scanalogic2/api.c b/src/hardware/ikalogic-scanalogic2/api.c similarity index 100% rename from hardware/ikalogic-scanalogic2/api.c rename to src/hardware/ikalogic-scanalogic2/api.c diff --git a/hardware/ikalogic-scanalogic2/protocol.c b/src/hardware/ikalogic-scanalogic2/protocol.c similarity index 100% rename from hardware/ikalogic-scanalogic2/protocol.c rename to src/hardware/ikalogic-scanalogic2/protocol.c diff --git a/hardware/ikalogic-scanalogic2/protocol.h b/src/hardware/ikalogic-scanalogic2/protocol.h similarity index 100% rename from hardware/ikalogic-scanalogic2/protocol.h rename to src/hardware/ikalogic-scanalogic2/protocol.h diff --git a/hardware/ikalogic-scanaplus/api.c b/src/hardware/ikalogic-scanaplus/api.c similarity index 100% rename from hardware/ikalogic-scanaplus/api.c rename to src/hardware/ikalogic-scanaplus/api.c diff --git a/hardware/ikalogic-scanaplus/protocol.c b/src/hardware/ikalogic-scanaplus/protocol.c similarity index 100% rename from hardware/ikalogic-scanaplus/protocol.c rename to src/hardware/ikalogic-scanaplus/protocol.c diff --git a/hardware/ikalogic-scanaplus/protocol.h b/src/hardware/ikalogic-scanaplus/protocol.h similarity index 100% rename from hardware/ikalogic-scanaplus/protocol.h rename to src/hardware/ikalogic-scanaplus/protocol.h diff --git a/hardware/kecheng-kc-330b/api.c b/src/hardware/kecheng-kc-330b/api.c similarity index 100% rename from hardware/kecheng-kc-330b/api.c rename to src/hardware/kecheng-kc-330b/api.c diff --git a/hardware/kecheng-kc-330b/protocol.c b/src/hardware/kecheng-kc-330b/protocol.c similarity index 100% rename from hardware/kecheng-kc-330b/protocol.c rename to src/hardware/kecheng-kc-330b/protocol.c diff --git a/hardware/kecheng-kc-330b/protocol.h b/src/hardware/kecheng-kc-330b/protocol.h similarity index 100% rename from hardware/kecheng-kc-330b/protocol.h rename to src/hardware/kecheng-kc-330b/protocol.h diff --git a/hardware/lascar-el-usb/api.c b/src/hardware/lascar-el-usb/api.c similarity index 100% rename from hardware/lascar-el-usb/api.c rename to src/hardware/lascar-el-usb/api.c diff --git a/hardware/lascar-el-usb/protocol.c b/src/hardware/lascar-el-usb/protocol.c similarity index 100% rename from hardware/lascar-el-usb/protocol.c rename to src/hardware/lascar-el-usb/protocol.c diff --git a/hardware/lascar-el-usb/protocol.h b/src/hardware/lascar-el-usb/protocol.h similarity index 100% rename from hardware/lascar-el-usb/protocol.h rename to src/hardware/lascar-el-usb/protocol.h diff --git a/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c similarity index 100% rename from hardware/link-mso19/api.c rename to src/hardware/link-mso19/api.c diff --git a/hardware/link-mso19/protocol.c b/src/hardware/link-mso19/protocol.c similarity index 100% rename from hardware/link-mso19/protocol.c rename to src/hardware/link-mso19/protocol.c diff --git a/hardware/link-mso19/protocol.h b/src/hardware/link-mso19/protocol.h similarity index 100% rename from hardware/link-mso19/protocol.h rename to src/hardware/link-mso19/protocol.h diff --git a/hardware/manson-hcs-3xxx/api.c b/src/hardware/manson-hcs-3xxx/api.c similarity index 100% rename from hardware/manson-hcs-3xxx/api.c rename to src/hardware/manson-hcs-3xxx/api.c diff --git a/hardware/manson-hcs-3xxx/protocol.c b/src/hardware/manson-hcs-3xxx/protocol.c similarity index 100% rename from hardware/manson-hcs-3xxx/protocol.c rename to src/hardware/manson-hcs-3xxx/protocol.c diff --git a/hardware/manson-hcs-3xxx/protocol.h b/src/hardware/manson-hcs-3xxx/protocol.h similarity index 100% rename from hardware/manson-hcs-3xxx/protocol.h rename to src/hardware/manson-hcs-3xxx/protocol.h diff --git a/hardware/mic-985xx/api.c b/src/hardware/mic-985xx/api.c similarity index 100% rename from hardware/mic-985xx/api.c rename to src/hardware/mic-985xx/api.c diff --git a/hardware/mic-985xx/protocol.c b/src/hardware/mic-985xx/protocol.c similarity index 100% rename from hardware/mic-985xx/protocol.c rename to src/hardware/mic-985xx/protocol.c diff --git a/hardware/mic-985xx/protocol.h b/src/hardware/mic-985xx/protocol.h similarity index 100% rename from hardware/mic-985xx/protocol.h rename to src/hardware/mic-985xx/protocol.h diff --git a/hardware/motech-lps-30x/api.c b/src/hardware/motech-lps-30x/api.c similarity index 100% rename from hardware/motech-lps-30x/api.c rename to src/hardware/motech-lps-30x/api.c diff --git a/hardware/motech-lps-30x/protocol.c b/src/hardware/motech-lps-30x/protocol.c similarity index 100% rename from hardware/motech-lps-30x/protocol.c rename to src/hardware/motech-lps-30x/protocol.c diff --git a/hardware/motech-lps-30x/protocol.h b/src/hardware/motech-lps-30x/protocol.h similarity index 100% rename from hardware/motech-lps-30x/protocol.h rename to src/hardware/motech-lps-30x/protocol.h diff --git a/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c similarity index 100% rename from hardware/norma-dmm/api.c rename to src/hardware/norma-dmm/api.c diff --git a/hardware/norma-dmm/protocol.c b/src/hardware/norma-dmm/protocol.c similarity index 100% rename from hardware/norma-dmm/protocol.c rename to src/hardware/norma-dmm/protocol.c diff --git a/hardware/norma-dmm/protocol.h b/src/hardware/norma-dmm/protocol.h similarity index 100% rename from hardware/norma-dmm/protocol.h rename to src/hardware/norma-dmm/protocol.h diff --git a/hardware/openbench-logic-sniffer/api.c b/src/hardware/openbench-logic-sniffer/api.c similarity index 100% rename from hardware/openbench-logic-sniffer/api.c rename to src/hardware/openbench-logic-sniffer/api.c diff --git a/hardware/openbench-logic-sniffer/protocol.c b/src/hardware/openbench-logic-sniffer/protocol.c similarity index 100% rename from hardware/openbench-logic-sniffer/protocol.c rename to src/hardware/openbench-logic-sniffer/protocol.c diff --git a/hardware/openbench-logic-sniffer/protocol.h b/src/hardware/openbench-logic-sniffer/protocol.h similarity index 100% rename from hardware/openbench-logic-sniffer/protocol.h rename to src/hardware/openbench-logic-sniffer/protocol.h diff --git a/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c similarity index 100% rename from hardware/rigol-ds/api.c rename to src/hardware/rigol-ds/api.c diff --git a/hardware/rigol-ds/protocol.c b/src/hardware/rigol-ds/protocol.c similarity index 100% rename from hardware/rigol-ds/protocol.c rename to src/hardware/rigol-ds/protocol.c diff --git a/hardware/rigol-ds/protocol.h b/src/hardware/rigol-ds/protocol.h similarity index 100% rename from hardware/rigol-ds/protocol.h rename to src/hardware/rigol-ds/protocol.h diff --git a/hardware/saleae-logic16/api.c b/src/hardware/saleae-logic16/api.c similarity index 100% rename from hardware/saleae-logic16/api.c rename to src/hardware/saleae-logic16/api.c diff --git a/hardware/saleae-logic16/protocol.c b/src/hardware/saleae-logic16/protocol.c similarity index 100% rename from hardware/saleae-logic16/protocol.c rename to src/hardware/saleae-logic16/protocol.c diff --git a/hardware/saleae-logic16/protocol.h b/src/hardware/saleae-logic16/protocol.h similarity index 100% rename from hardware/saleae-logic16/protocol.h rename to src/hardware/saleae-logic16/protocol.h diff --git a/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c similarity index 100% rename from hardware/serial-dmm/api.c rename to src/hardware/serial-dmm/api.c diff --git a/hardware/serial-dmm/protocol.c b/src/hardware/serial-dmm/protocol.c similarity index 100% rename from hardware/serial-dmm/protocol.c rename to src/hardware/serial-dmm/protocol.c diff --git a/hardware/serial-dmm/protocol.h b/src/hardware/serial-dmm/protocol.h similarity index 100% rename from hardware/serial-dmm/protocol.h rename to src/hardware/serial-dmm/protocol.h diff --git a/hardware/sysclk-lwla/api.c b/src/hardware/sysclk-lwla/api.c similarity index 100% rename from hardware/sysclk-lwla/api.c rename to src/hardware/sysclk-lwla/api.c diff --git a/hardware/sysclk-lwla/lwla.c b/src/hardware/sysclk-lwla/lwla.c similarity index 100% rename from hardware/sysclk-lwla/lwla.c rename to src/hardware/sysclk-lwla/lwla.c diff --git a/hardware/sysclk-lwla/lwla.h b/src/hardware/sysclk-lwla/lwla.h similarity index 100% rename from hardware/sysclk-lwla/lwla.h rename to src/hardware/sysclk-lwla/lwla.h diff --git a/hardware/sysclk-lwla/protocol.c b/src/hardware/sysclk-lwla/protocol.c similarity index 100% rename from hardware/sysclk-lwla/protocol.c rename to src/hardware/sysclk-lwla/protocol.c diff --git a/hardware/sysclk-lwla/protocol.h b/src/hardware/sysclk-lwla/protocol.h similarity index 100% rename from hardware/sysclk-lwla/protocol.h rename to src/hardware/sysclk-lwla/protocol.h diff --git a/hardware/teleinfo/api.c b/src/hardware/teleinfo/api.c similarity index 100% rename from hardware/teleinfo/api.c rename to src/hardware/teleinfo/api.c diff --git a/hardware/teleinfo/protocol.c b/src/hardware/teleinfo/protocol.c similarity index 100% rename from hardware/teleinfo/protocol.c rename to src/hardware/teleinfo/protocol.c diff --git a/hardware/teleinfo/protocol.h b/src/hardware/teleinfo/protocol.h similarity index 100% rename from hardware/teleinfo/protocol.h rename to src/hardware/teleinfo/protocol.h diff --git a/hardware/testo/api.c b/src/hardware/testo/api.c similarity index 100% rename from hardware/testo/api.c rename to src/hardware/testo/api.c diff --git a/hardware/testo/protocol.c b/src/hardware/testo/protocol.c similarity index 100% rename from hardware/testo/protocol.c rename to src/hardware/testo/protocol.c diff --git a/hardware/testo/protocol.h b/src/hardware/testo/protocol.h similarity index 100% rename from hardware/testo/protocol.h rename to src/hardware/testo/protocol.h diff --git a/hardware/tondaj-sl-814/api.c b/src/hardware/tondaj-sl-814/api.c similarity index 100% rename from hardware/tondaj-sl-814/api.c rename to src/hardware/tondaj-sl-814/api.c diff --git a/hardware/tondaj-sl-814/protocol.c b/src/hardware/tondaj-sl-814/protocol.c similarity index 100% rename from hardware/tondaj-sl-814/protocol.c rename to src/hardware/tondaj-sl-814/protocol.c diff --git a/hardware/tondaj-sl-814/protocol.h b/src/hardware/tondaj-sl-814/protocol.h similarity index 100% rename from hardware/tondaj-sl-814/protocol.h rename to src/hardware/tondaj-sl-814/protocol.h diff --git a/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c similarity index 100% rename from hardware/uni-t-dmm/api.c rename to src/hardware/uni-t-dmm/api.c diff --git a/hardware/uni-t-dmm/protocol.c b/src/hardware/uni-t-dmm/protocol.c similarity index 100% rename from hardware/uni-t-dmm/protocol.c rename to src/hardware/uni-t-dmm/protocol.c diff --git a/hardware/uni-t-dmm/protocol.h b/src/hardware/uni-t-dmm/protocol.h similarity index 100% rename from hardware/uni-t-dmm/protocol.h rename to src/hardware/uni-t-dmm/protocol.h diff --git a/hardware/uni-t-ut32x/api.c b/src/hardware/uni-t-ut32x/api.c similarity index 100% rename from hardware/uni-t-ut32x/api.c rename to src/hardware/uni-t-ut32x/api.c diff --git a/hardware/uni-t-ut32x/protocol.c b/src/hardware/uni-t-ut32x/protocol.c similarity index 100% rename from hardware/uni-t-ut32x/protocol.c rename to src/hardware/uni-t-ut32x/protocol.c diff --git a/hardware/uni-t-ut32x/protocol.h b/src/hardware/uni-t-ut32x/protocol.h similarity index 100% rename from hardware/uni-t-ut32x/protocol.h rename to src/hardware/uni-t-ut32x/protocol.h diff --git a/hardware/victor-dmm/api.c b/src/hardware/victor-dmm/api.c similarity index 100% rename from hardware/victor-dmm/api.c rename to src/hardware/victor-dmm/api.c diff --git a/hardware/victor-dmm/protocol.c b/src/hardware/victor-dmm/protocol.c similarity index 100% rename from hardware/victor-dmm/protocol.c rename to src/hardware/victor-dmm/protocol.c diff --git a/hardware/victor-dmm/protocol.h b/src/hardware/victor-dmm/protocol.h similarity index 100% rename from hardware/victor-dmm/protocol.h rename to src/hardware/victor-dmm/protocol.h diff --git a/hardware/zeroplus-logic-cube/analyzer.c b/src/hardware/zeroplus-logic-cube/analyzer.c similarity index 100% rename from hardware/zeroplus-logic-cube/analyzer.c rename to src/hardware/zeroplus-logic-cube/analyzer.c diff --git a/hardware/zeroplus-logic-cube/analyzer.h b/src/hardware/zeroplus-logic-cube/analyzer.h similarity index 100% rename from hardware/zeroplus-logic-cube/analyzer.h rename to src/hardware/zeroplus-logic-cube/analyzer.h diff --git a/hardware/zeroplus-logic-cube/api.c b/src/hardware/zeroplus-logic-cube/api.c similarity index 100% rename from hardware/zeroplus-logic-cube/api.c rename to src/hardware/zeroplus-logic-cube/api.c diff --git a/hardware/zeroplus-logic-cube/gl_usb.c b/src/hardware/zeroplus-logic-cube/gl_usb.c similarity index 100% rename from hardware/zeroplus-logic-cube/gl_usb.c rename to src/hardware/zeroplus-logic-cube/gl_usb.c diff --git a/hardware/zeroplus-logic-cube/gl_usb.h b/src/hardware/zeroplus-logic-cube/gl_usb.h similarity index 100% rename from hardware/zeroplus-logic-cube/gl_usb.h rename to src/hardware/zeroplus-logic-cube/gl_usb.h diff --git a/hardware/zeroplus-logic-cube/protocol.c b/src/hardware/zeroplus-logic-cube/protocol.c similarity index 100% rename from hardware/zeroplus-logic-cube/protocol.c rename to src/hardware/zeroplus-logic-cube/protocol.c diff --git a/hardware/zeroplus-logic-cube/protocol.h b/src/hardware/zeroplus-logic-cube/protocol.h similarity index 100% rename from hardware/zeroplus-logic-cube/protocol.h rename to src/hardware/zeroplus-logic-cube/protocol.h diff --git a/hwdriver.c b/src/hwdriver.c similarity index 100% rename from hwdriver.c rename to src/hwdriver.c diff --git a/input/binary.c b/src/input/binary.c similarity index 100% rename from input/binary.c rename to src/input/binary.c diff --git a/input/chronovu_la8.c b/src/input/chronovu_la8.c similarity index 100% rename from input/chronovu_la8.c rename to src/input/chronovu_la8.c diff --git a/input/csv.c b/src/input/csv.c similarity index 100% rename from input/csv.c rename to src/input/csv.c diff --git a/input/input.c b/src/input/input.c similarity index 100% rename from input/input.c rename to src/input/input.c diff --git a/input/vcd.c b/src/input/vcd.c similarity index 100% rename from input/vcd.c rename to src/input/vcd.c diff --git a/input/wav.c b/src/input/wav.c similarity index 100% rename from input/wav.c rename to src/input/wav.c diff --git a/libsigrok-internal.h b/src/libsigrok-internal.h similarity index 100% rename from libsigrok-internal.h rename to src/libsigrok-internal.h diff --git a/log.c b/src/log.c similarity index 100% rename from log.c rename to src/log.c diff --git a/output/analog.c b/src/output/analog.c similarity index 100% rename from output/analog.c rename to src/output/analog.c diff --git a/output/ascii.c b/src/output/ascii.c similarity index 100% rename from output/ascii.c rename to src/output/ascii.c diff --git a/output/binary.c b/src/output/binary.c similarity index 100% rename from output/binary.c rename to src/output/binary.c diff --git a/output/bits.c b/src/output/bits.c similarity index 100% rename from output/bits.c rename to src/output/bits.c diff --git a/output/chronovu_la8.c b/src/output/chronovu_la8.c similarity index 100% rename from output/chronovu_la8.c rename to src/output/chronovu_la8.c diff --git a/output/csv.c b/src/output/csv.c similarity index 100% rename from output/csv.c rename to src/output/csv.c diff --git a/output/gnuplot.c b/src/output/gnuplot.c similarity index 100% rename from output/gnuplot.c rename to src/output/gnuplot.c diff --git a/output/hex.c b/src/output/hex.c similarity index 100% rename from output/hex.c rename to src/output/hex.c diff --git a/output/ols.c b/src/output/ols.c similarity index 100% rename from output/ols.c rename to src/output/ols.c diff --git a/output/output.c b/src/output/output.c similarity index 100% rename from output/output.c rename to src/output/output.c diff --git a/output/vcd.c b/src/output/vcd.c similarity index 100% rename from output/vcd.c rename to src/output/vcd.c diff --git a/hardware/common/scpi.c b/src/scpi/scpi.c similarity index 100% rename from hardware/common/scpi.c rename to src/scpi/scpi.c diff --git a/hardware/common/scpi_serial.c b/src/scpi/scpi_serial.c similarity index 100% rename from hardware/common/scpi_serial.c rename to src/scpi/scpi_serial.c diff --git a/hardware/common/scpi_tcp.c b/src/scpi/scpi_tcp.c similarity index 100% rename from hardware/common/scpi_tcp.c rename to src/scpi/scpi_tcp.c diff --git a/hardware/common/scpi_usbtmc_libusb.c b/src/scpi/scpi_usbtmc_libusb.c similarity index 100% rename from hardware/common/scpi_usbtmc_libusb.c rename to src/scpi/scpi_usbtmc_libusb.c diff --git a/hardware/common/scpi_visa.c b/src/scpi/scpi_visa.c similarity index 100% rename from hardware/common/scpi_visa.c rename to src/scpi/scpi_visa.c diff --git a/hardware/common/scpi_vxi.c b/src/scpi/scpi_vxi.c similarity index 100% rename from hardware/common/scpi_vxi.c rename to src/scpi/scpi_vxi.c diff --git a/hardware/common/vxi.h b/src/scpi/vxi.h similarity index 100% rename from hardware/common/vxi.h rename to src/scpi/vxi.h diff --git a/hardware/common/vxi.x b/src/scpi/vxi.x similarity index 100% rename from hardware/common/vxi.x rename to src/scpi/vxi.x diff --git a/hardware/common/vxi_clnt.c b/src/scpi/vxi_clnt.c similarity index 100% rename from hardware/common/vxi_clnt.c rename to src/scpi/vxi_clnt.c diff --git a/hardware/common/vxi_xdr.c b/src/scpi/vxi_xdr.c similarity index 100% rename from hardware/common/vxi_xdr.c rename to src/scpi/vxi_xdr.c diff --git a/hardware/common/serial.c b/src/serial.c similarity index 100% rename from hardware/common/serial.c rename to src/serial.c diff --git a/session.c b/src/session.c similarity index 100% rename from session.c rename to src/session.c diff --git a/session_driver.c b/src/session_driver.c similarity index 100% rename from session_driver.c rename to src/session_driver.c diff --git a/session_file.c b/src/session_file.c similarity index 100% rename from session_file.c rename to src/session_file.c diff --git a/soft-trigger.c b/src/soft-trigger.c similarity index 100% rename from soft-trigger.c rename to src/soft-trigger.c diff --git a/std.c b/src/std.c similarity index 100% rename from std.c rename to src/std.c diff --git a/strutil.c b/src/strutil.c similarity index 100% rename from strutil.c rename to src/strutil.c diff --git a/trigger.c b/src/trigger.c similarity index 100% rename from trigger.c rename to src/trigger.c diff --git a/hardware/common/usb.c b/src/usb.c similarity index 100% rename from hardware/common/usb.c rename to src/usb.c diff --git a/version.c b/src/version.c similarity index 100% rename from version.c rename to src/version.c -- 2.30.2