Skip to content

Z
ZIO
Commit 742d6010 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

Merge branch 'zio-v1.0-fixes' (picks module_version stuff)

parents f80db0ee 4eecc7d0
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 4 deletions
Makefile
View file @ 742d6010
......@@ -11,8 +11,10 @@ obj-m += triggers/
obj-m += tools/
GIT_VERSION = $(shell cd $(src); git describe --dirty --long --tags)
# WARNING: the line below doesn't work in-kernel if you compile with O=
EXTRA_CFLAGS += -I$(obj)/include/
EXTRA_CFLAGS += -I$(obj)/include/ -DGIT_VERSION=\"$(GIT_VERSION)\"
all: modules tools
......
buffers/Makefile
View file @ 742d6010
LINUX ?= /lib/modules/$(shell uname -r)/build
EXTRA_CFLAGS += -I$(obj)/../include/
GIT_VERSION = $(shell cd $(src); git describe --dirty --long --tags)
EXTRA_CFLAGS += -I$(obj)/../include/ -DGIT_VERSION=\"$(GIT_VERSION)\"
# zio-buf-kmalloc.o is now part of zio-core
obj-m = zio-buf-vmalloc.o
buffers/zio-buf-vmalloc.c
View file @ 742d6010
......@@ -411,4 +411,5 @@ static void __exit zbk_exit(void)
module_init(zbk_init);
module_exit(zbk_exit);
MODULE_AUTHOR("Alessandro Rubini");
MODULE_VERSION(GIT_VERSION); /* Defined in local Makefile */
MODULE_LICENSE("GPL");
core.c
View file @ 742d6010
......@@ -142,6 +142,7 @@ static void __exit zio_exit(void)
subsys_initcall(zio_init);
module_exit(zio_exit);
MODULE_VERSION(GIT_VERSION); /* Defined in local Makefile */
MODULE_AUTHOR("Federico Vaga and Alessandro Rubini");
/* Federico wrote the core, Alessandro wrote default trigger and buffer */
MODULE_DESCRIPTION("ZIO - ZIO Input Output");
......
drivers/Makefile
View file @ 742d6010
LINUX ?= /lib/modules/$(shell uname -r)/build
EXTRA_CFLAGS += -I$(obj)/../include
GIT_VERSION = $(shell cd $(src); git describe --dirty --long --tags)
EXTRA_CFLAGS += -I$(obj)/../include/ -DGIT_VERSION=\"$(GIT_VERSION)\"
obj-m = zio-zero.o
obj-m += zio-loop.o
......
drivers/zio-ad788x.c
View file @ 742d6010
......@@ -362,6 +362,7 @@ static void __exit ad788x_exit(void)
module_init(ad788x_init);
module_exit(ad788x_exit);
MODULE_VERSION(GIT_VERSION); /* Defined in local Makefile */
MODULE_AUTHOR("Federico Vaga <federico.vaga@gmail.com>");
MODULE_DESCRIPTION("AD788x driver for ZIO framework");
MODULE_LICENSE("GPL");
drivers/zio-fake-dtc.c
View file @ 742d6010
......@@ -154,5 +154,6 @@ static void __exit zdtc_exit(void)
module_init(zdtc_init);
module_exit(zdtc_exit);
MODULE_VERSION(GIT_VERSION); /* Defined in local Makefile */
MODULE_LICENSE("GPL");
drivers/zio-gpio.c
View file @ 742d6010
......@@ -214,4 +214,5 @@ static void __exit zgp_exit(void)
module_init(zgp_init);
module_exit(zgp_exit);
MODULE_VERSION(GIT_VERSION); /* Defined in local Makefile */
MODULE_LICENSE("GPL");
drivers/zio-irq-tdc.c
View file @ 742d6010
......@@ -247,5 +247,6 @@ static void __exit ztdc_exit(void)
module_init(ztdc_init);
module_exit(ztdc_exit);
MODULE_VERSION(GIT_VERSION); /* Defined in local Makefile */
MODULE_LICENSE("GPL");
drivers/zio-loop.c
View file @ 742d6010
......@@ -514,6 +514,7 @@ static void __exit zloop_exit(void)
module_init(zloop_init);
module_exit(zloop_exit);
MODULE_VERSION(GIT_VERSION); /* Defined in local Makefile */
MODULE_AUTHOR("Alessandro Rubini <rubini@.com>");
MODULE_DESCRIPTION("A zio driver which loops back to zio or a chardev");
MODULE_LICENSE("GPL");
drivers/zio-mini.c
View file @ 742d6010
......@@ -137,4 +137,5 @@ static void __exit zmini_exit(void)
module_init(zmini_init);
module_exit(zmini_exit);
MODULE_VERSION(GIT_VERSION); /* Defined in local Makefile */
MODULE_LICENSE("GPL and additional rights");
drivers/zio-zero.c
View file @ 742d6010
......@@ -209,6 +209,7 @@ static void __exit zzero_exit(void)
module_init(zzero_init);
module_exit(zzero_exit);
MODULE_VERSION(GIT_VERSION); /* Defined in local Makefile */
MODULE_AUTHOR("Federico Vaga <federico.vaga@gmail.com>");
MODULE_DESCRIPTION("A zio driver which fakes zero, random and sawtooth input");
MODULE_LICENSE("GPL");
triggers/Makefile
View file @ 742d6010
LINUX ?= /lib/modules/$(shell uname -r)/build
EXTRA_CFLAGS += -I$(obj)/../include/
GIT_VERSION = $(shell cd $(src); git describe --dirty --long --tags)
EXTRA_CFLAGS += -I$(obj)/../include/ -DGIT_VERSION=\"$(GIT_VERSION)\"
# zio-trig-user.o is now part of zio-core
obj-m = zio-trig-timer.o
......
triggers/zio-trig-hrt.c
View file @ 742d6010
......@@ -285,5 +285,7 @@ static void __exit ztt_exit(void)
module_init(ztt_init);
module_exit(ztt_exit);
MODULE_VERSION(GIT_VERSION); /* Defined in local Makefile */
MODULE_AUTHOR("Alessandro Rubini");
MODULE_LICENSE("GPL");
triggers/zio-trig-irq.c
View file @ 742d6010
......@@ -194,5 +194,7 @@ static void __exit zti_exit(void)
module_init(zti_init);
module_exit(zti_exit);
MODULE_VERSION(GIT_VERSION); /* Defined in local Makefile */
MODULE_AUTHOR("Alessandro Rubini");
MODULE_LICENSE("GPL");
triggers/zio-trig-timer.c
View file @ 742d6010
......@@ -239,5 +239,7 @@ static void __exit ztt_exit(void)
module_init(ztt_init);
module_exit(ztt_exit);
MODULE_VERSION(GIT_VERSION); /* Defined in local Makefile */
MODULE_AUTHOR("Alessandro Rubini");
MODULE_LICENSE("GPL");
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