Commit aa4bd9bd authored by Federico Vaga's avatar Federico Vaga

Merge branch 'release/v1.3.0'

parents 0a34de6a 39b5a46d
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
......@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
......@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
......@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
......
This is free and unencumbered software released into the public domain.
Anyone is free to copy, modify, publish, use, compile, sell, or
distribute this software, either in source code form or as a compiled
binary, for any purpose, commercial or non-commercial, and by any
means.
In jurisdictions that recognize copyright laws, the author or authors
of this software dedicate any and all copyright interest in the
software to the public domain. We make this dedication for the benefit
of the public at large and to the detriment of our heirs and
successors. We intend this dedication to be an overt act of
relinquishment in perpetuity of all present and future rights to this
software under copyright law.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
For more information, please refer to <http://unlicense.org/>
......@@ -18,14 +18,7 @@ export ZIO_VERSION
all: modules tools
modules:
$(MAKE) -C $(LINUX) M=$(shell /bin/pwd)
modules_install:
$(MAKE) -C $(LINUX) M=$(shell /bin/pwd) $@
coccicheck:
$(MAKE) -C $(LINUX) M=$(shell /bin/pwd) coccicheck
$(MAKE) -C drivers/zio M=$(shell /bin/pwd)
.PHONY: tools
......
......@@ -9,9 +9,9 @@ CONFIG_ZIO_SNIFF_DEV:=y
zio-$(CONFIG_ZIO_SNIFF_DEV) += sniff-dev.o
obj-m = zio.o
obj-m += drivers/
obj-m += buffers/
obj-m += triggers/
obj-$(CONFIG_ZIO_DEVICES) += devices/
obj-$(CONFIG_ZIO_BUFFERS) += buffers/
obj-$(CONFIG_ZIO_TRIGGERS) += triggers/
# src is defined byt the kernel Makefile, but we want to use it also in our
# local Makefile (tools, lib)
......@@ -27,6 +27,6 @@ endif
ccflags-y += -DADDITIONAL_VERSIONS="$(SUBMODULE_VERSIONS)"
# WARNING: the line below doesn't work in-kernel if you compile with O=
ccflags-y += -I$(src)/include/ -DGIT_VERSION=\"$(GIT_VERSION)\"
ccflags-y += -I$(src)/../../include/ -DGIT_VERSION=\"$(GIT_VERSION)\"
ccflags-y += $(ZIO_VERSION)
ccflags-$(CONFIG_ZIO_DEBUG) += -DDEBUG
# include parent_common.mk for buildsystem's defines
# It allows you to inherit an environment configuration from larger project
REPO_PARENT ?= ../../../
-include $(REPO_PARENT)/parent_common.mk
KVERSION ?= $(shell uname -r)
LINUX ?= /lib/modules/$(KVERSION)/build
GIT_VERSION := $(shell git describe --dirty --long --tags)
# Extract major, minor and patch number
ZIO_VERSION := -D__ZIO_MAJOR_VERSION=$(shell echo $(GIT_VERSION) | cut -d '-' -f 2 | cut -d '.' -f 1; )
ZIO_VERSION += -D__ZIO_MINOR_VERSION=$(shell echo $(GIT_VERSION) | cut -d '-' -f 2 | cut -d '.' -f 2; )
ZIO_VERSION += -D__ZIO_PATCH_VERSION=$(shell echo $(GIT_VERSION) | cut -d '-' -f 3)
export GIT_VERSION
export ZIO_VERSION
CONFIG_ZIO_DEVICES ?= m
CONFIG_ZIO_BUFFERS ?= m
CONFIG_ZIO_TRIGGERS ?= m
export CONFIG_ZIO_DEVICES
export CONFIG_ZIO_BUFFERS
export CONFIG_ZIO_TRIGGERS
all: modules
modules coccicheck modules_install:
$(MAKE) -C $(LINUX) M=$(shell /bin/pwd) $@
......@@ -7,7 +7,7 @@ endif
ccflags-y += -DADDITIONAL_VERSIONS="$(SUBMODULE_VERSIONS)"
ccflags-y += -I$(src)/../include/ -DGIT_VERSION=\"$(GIT_VERSION)\"
ccflags-y += -I$(src)/../../../include/ -DGIT_VERSION=\"$(GIT_VERSION)\"
ccflags-$(CONFIG_ZIO_DEBUG) += -DDEBUG
# zio-buf-kmalloc.o is now part of zio-core
......
/* Alessandro Rubini for CERN, 2011, GNU GPLv2 or later */
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2011-2019 CERN
* Author: Alessandro Rubini <rubini@gnudd.com>
*/
/*
* This is a kmalloc-based buffer for the ZIO framework. It is used both
......
/* Alessandro Rubini for CERN, 2012, GNU GPLv2 or later */
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2011-2019 CERN
* Author: Alessandro Rubini <rubini@gnudd.com>
*/
/*
* This is a vmalloc-based buffer for the ZIO framework. It supports
......
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2011 CERN
* Copyright 2011-2019 CERN
* Author: Federico Vaga <federico.vaga@gmail.com>
*
* GNU GPLv2 or later
*/
#include <linux/kernel.h>
......
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2011 CERN
* Copyright 2011-2019 CERN
* Author: Federico Vaga <federico.vaga@gmail.com>
* Author: Alessandro Rubini <rubini@gnudd.com>
*
* GNU GPLv2 or later
*/
#include <linux/kernel.h>
#include <linux/module.h>
......
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2011 CERN
* Copyright 2011-2019 CERN
* Author: Federico Vaga <federico.vaga@gmail.com>
* Author: Alessandro Rubini <rubini@gnudd.com>
*
* GNU GPLv2 or later
*/
#include <linux/kernel.h>
......
......@@ -7,7 +7,7 @@ endif
ccflags-y += -DADDITIONAL_VERSIONS="$(SUBMODULE_VERSIONS)"
ccflags-y += -I$(src)/../include/ -DGIT_VERSION=\"$(GIT_VERSION)\"
ccflags-y += -I$(src)/../../../include/ -DGIT_VERSION=\"$(GIT_VERSION)\"
ccflags-y += $(ZIO_VERSION)
ccflags-$(CONFIG_ZIO_DEBUG) += -DDEBUG
......
/* Federico Vaga for CERN, 2011, GNU GPLv2 or later */
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2011-2019 CERN
* Author: Federico Vaga <federico.vaga@gmail.com>
*/
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
......
/* Alessandro Rubini for CERN, 2013, GNU GPLv2 or later */
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2013-2019 CERN
* Author: Alessandro Rubini <rubini@gnudd.com>
*/
/*
* This is a simple DTC (digital to time converter). It just sends out
......
/* Alessandro Rubini for CERN, 2011, GNU GPLv2 or later */
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2011-2019 CERN
* Author: Alessandro Rubini <rubini@gnudd.com>
*/
/*
* Simple driver for GPIO-based output (faked as 1 analog
......
/* Alessandro Rubini for CERN, 2013, GNU GPLv2 or later */
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2013-2019 CERN
* Author: Alessandro Rubini <rubini@gnudd.com>
*/
/*
* This is a simple TDC (time to digital converter). The events it
......
/* Alessandro Rubini for CERN, 2012, GNU GPLv2 or later */
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2012-2019 CERN
* Author: Alessandro Rubini <rubini@gnudd.com>
*/
/*
* Simple loop device, that allows testing with the I/O flows, triggers etc.
......
/* Alessandro Rubini, 2012, public domain */
// SPDX-License-Identifier: Unlicense
/*
* Copyright 2011-2019 CERN
* Author: Alessandro Rubini <rubini@gnudd.com>
*/
/*
* A minimal device: one input channel only: returns an 8-byte sample
......
/* Federico Vaga 2013, GNU GPLv2 or later */
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2013-2019 CERN
* Author: Federico Vaga <federico.vaga@gmail.com>
*/
#include <linux/module.h>
#include <linux/kernel.h>
......
/* Federico Vaga for CERN, 2011, GNU GPLv2 or later */
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2011-2019 CERN
* Author: Federico Vaga <federico.vaga@gmail.com>
*/
/*
* zio-zero is a simple zio driver, with both input and output. The
* channels are completely software driven. The input channels fill
......
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2011 CERN
* Copyright 2011-2019 CERN
* Author: Alessandro Rubini <rubini@gnudd.com>
* Author: Federico Vaga <federico.vaga@gmail.com>
*
* GNU GPLv2 or later
*/
#include <linux/kernel.h>
#include <linux/module.h>
......
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2011 CERN
* Copyright 2011-2019 CERN
* Author: Alessandro Rubini <rubini@gnudd.com>
*
* GNU GPLv2 or later
*/
/*
......
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2011 CERN
* Copyright 2011-2019 CERN
* Author: Federico Vaga <federico.vaga@gmail.com>
*
* GNU GPLv2 or later
*/
#include <linux/kernel.h>
#include <linux/module.h>
......
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2011 CERN
* Copyright 2011-2019 CERN
* Author: Alessandro Rubini <rubini@gnudd.com>
*
* GNU GPLv2 or later
*/
#include <linux/kernel.h>
#include <linux/module.h>
......
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2011 CERN
* Copyright 2011-2019 CERN
* Author: Federico Vaga <federico.vaga@gmail.com>
*
* GNU GPLv2 or later
*/
#include <linux/kernel.h>
#include <linux/module.h>
......
......@@ -7,7 +7,7 @@ endif
ccflags-y += -DADDITIONAL_VERSIONS="$(SUBMODULE_VERSIONS)"
ccflags-y += -I$(src)/../include/ -DGIT_VERSION=\"$(GIT_VERSION)\"
ccflags-y += -I$(src)/../../../include/ -DGIT_VERSION=\"$(GIT_VERSION)\"
ccflags-$(CONFIG_ZIO_DEBUG) += -DDEBUG
# zio-trig-user.o is now part of zio-core
......
/* Alessandro Rubini for CERN, 2012, GNU GPLv2 or later */
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2012-2019 CERN
* Author: Alessandro Rubini <rubini@gnudd.com>
*/
/*
* This is a high-resolution-timer trigger for the ZIO framework. It is not
......
/* Alessandro Rubini for CERN, 2011, GNU GPLv2 or later */
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2011-2019 CERN
* Author: Alessandro Rubini <rubini@gnudd.com>
*/
/*
* This is a trigger based on an external IRQ. You can specify the IRQ
......
/* Alessandro Rubini for CERN, 2011, GNU GPLv2 or later */
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2011-2019 CERN
* Author: Alessandro Rubini <rubini@gnudd.com>
*/
/*
* This is a timer-based trigger for the ZIO framework. It is not
......
/* Alessandro Rubini for CERN, 2011, GNU GPLv2 or later */
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2011-2019 CERN
* Author: Alessandro Rubini <rubini@gnudd.com>
*/
/*
* This is a transparent trigger, driven by user requests. It is best
......
// SPDX-License-Identifier: Unlicense
/*
* Copyright 2013-2019 CERN
* Author: Alessandro Rubini <rubini@gnudd.com>
*/
/*
* Trivial utility that reports data from ZIO input channels
*/
......
// SPDX-License-Identifier: Unlicense
/*
* Copyright 2011-2019 CERN
* Author: Alessandro Rubini <rubini@gnudd.com>
*/
/*
* Simple program that cats one zio device to stdout
*/
......
// SPDX-License-Identifier: Unlicense
/*
* Copyright 2011-2019 CERN
* Author: Alessandro Rubini <rubini@gnudd.com>
* Author: Federico Vaga <federico.vaga@gmail.com>
*/
/*
* Trivial utility that reports data from ZIO input channels
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment