Merge branch '6-release_v2-0-0' into 'master'

Resolve "Make v2.0.0 release" Closes #6 See merge request be-cem-edl/fec/hardware-modules/rf-att-4cha!3

Merge branch '6-release_v2-0-0' into 'master'
Resolve "Make v2.0.0 release" Closes #6 See merge request be-cem-edl/fec/hardware-modules/rf-att-4cha!3
c5c55293 · Dimitris Lampridis · 6fcb20cc · 2587d7f5 · c5c55293 · c5c55293
Commit c5c55293 authored May 02, 2023 by Dimitris Lampridis
Showing with 32 additions and 4 deletions

.gitlab-ci.yml .gitlab-ci.yml +9 -0

CHANGELOG.rst CHANGELOG.rst +16 -0

Makefile software/lib/Makefile +6 -0

eeprom.c software/lib/eeprom.c +1 -3

liboattnusb.c software/lib/liboattnusb.c +0 -1

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,15 @@ include:
    ref: master
    file: 'edl-gitlab-ci.yml'

+cppcheck:
+  stage: analyse
+  image:
+    name: gitlab-registry.cern.ch/coht/common-containers/static-analysis:latest
+  interruptible: true
+  allow_failure: true
+  script:
+    - make -C software/lib cppcheck
+
 build_software:
  stage: build
  image: gitlab-registry.cern.ch/be-cem-edl/evergreen/gitlab-ci/build-fec-sw:latest

--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
+..
+  SPDX-License-Identifier: CC-BY-SA-4.0+
+
+  SPDX-FileCopyrightText: 2023 CERN (home.cern)
+
+==========
+Change Log
+==========
+Format: `Keep a Changelog <https://keepachangelog.com/en/1.0.0/>`_
+Versioning: `Semantic Versioning <https://semver.org/spec/v2.0.0.html>`_
+
+[2.0.0] - 2023-05-02
+====================
+
+First official release of the software, all previous ones were release
+candidates.
--- a/software/lib/Makefile
+++ b/software/lib/Makefile
@@ -11,6 +11,8 @@ GIT_VERSION = $(shell git describe --dirty --tags --long)
 NAME = oattnusb
 LIBNAME = lib$(NAME)

+CPPCHECK ?= cppcheck
+
 all:	lib doc
 lib:	$(LIBNAME).a $(LIBNAME).so

@@ -28,4 +30,8 @@ clean:
 	rm -f *.a *.o *.so
 	rm -rf html

+cppcheck:
+	$(CPPCHECK) -I. *.c *.h  --error-exitcode=1 --suppress=missingIncludeSystem \
+		--enable=warning,style,performance,portability,information,missingInclude
+
 -include Makefile.install
--- a/software/lib/eeprom.c
+++ b/software/lib/eeprom.c
@@ -43,13 +43,11 @@ static void eeprom_backup(unsigned char *eeprom_raw, int sz)

 int oau_factory_program_eeprom(unsigned int bus, unsigned int dev, char *serial)
 {
-	int i;
 	int ret;
 	int b, d;
 	char devbus[16];
 	static uint8_t eeprom_raw[128];
 	static char ser[64];
-	char *ptr;
 	struct ftdi_context *ctx;

 	if ((ctx = ftdi_new()) == NULL) {
@@ -57,7 +55,7 @@ int oau_factory_program_eeprom(unsigned int bus, unsigned int dev, char *serial)
 		return -ENOMEM;
 	}

-	snprintf(devbus, sizeof(devbus), "d:%03d/%03d", bus, dev);
+	snprintf(devbus, sizeof(devbus), "d:%03u/%03u", bus, dev);
 	ret = ftdi_usb_open_string(ctx, devbus);
 	if (ret != 0) {
 		fprintf(stderr, "cannot open usb device %s\n", devbus);

--- a/software/lib/liboattnusb.c
+++ b/software/lib/liboattnusb.c
@@ -179,7 +179,6 @@ int oattnusb_get_nchannels(int fd)

 int oattnusb_list_devices(void)
 {
-	int i, devs;
 	struct oattnusb_devarray *list;

 	list = oattnusb_get_devarray(OATTNUSB_VENDOR_ID, OATTNUSB_DEVICE_ID);