app-emulation/opencbm: bump to debian version
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2691 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
@@ -0,0 +1,36 @@
|
||||
From: Frédéric Brière <fbriere@fbriere.net>
|
||||
Subject: [PATCH] Adjusted autoconf.h location for Linux 2.6.33
|
||||
|
||||
Linux 2.6.33 has moved linux/autoconf.h to generated/autoconf.h.
|
||||
|
||||
Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
|
||||
Forwarded: yes
|
||||
|
||||
---
|
||||
sys/linux/cbm_module.c | 7 +++++--
|
||||
1 files changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/sys/linux/cbm_module.c b/sys/linux/cbm_module.c
|
||||
index d8c5a23..91ea8f3 100644
|
||||
--- a/sys/linux/cbm_module.c
|
||||
+++ b/sys/linux/cbm_module.c
|
||||
@@ -22,12 +22,15 @@ static char *rcsid =
|
||||
"@(#) $Id: cbm_module.c,v 1.13.2.21 2009/12/13 20:40:32 strik Exp $";
|
||||
#endif
|
||||
|
||||
+#include <linux/version.h>
|
||||
+
|
||||
#ifdef KERNEL_INCLUDE_OLD_CONFIG_H
|
||||
#include <linux/config.h>
|
||||
-#else
|
||||
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
|
||||
#include <linux/autoconf.h>
|
||||
+#else
|
||||
+ #include <generated/autoconf.h>
|
||||
#endif
|
||||
-#include <linux/version.h>
|
||||
|
||||
#ifdef CONFIG_MODVERSIONS
|
||||
# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,4)
|
||||
--
|
||||
tg: (95e2d72..) fixes/autoconf-2.6.33 (depends on: upstream)
|
||||
34
app-emulation/opencbm/files/0.4.3_rc2/01_skip-targets.diff
Normal file
34
app-emulation/opencbm/files/0.4.3_rc2/01_skip-targets.diff
Normal file
@@ -0,0 +1,34 @@
|
||||
From: Frédéric Brière <fbriere@fbriere.net>
|
||||
Subject: [PATCH] Skip various targets that do not apply to this Debian package
|
||||
|
||||
This patch removes the following Makefile targets:
|
||||
|
||||
* sys/linux: Linux kernel module, packaged separately
|
||||
* compat: Old cbm4linux kernel module, obsolete
|
||||
* demo/*: Demo applications, included as examples in libopencbm-dev
|
||||
|
||||
Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
|
||||
Forwarded: not-needed
|
||||
|
||||
---
|
||||
LINUX/Makefile | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/LINUX/Makefile b/LINUX/Makefile
|
||||
index eb4b9f2..6a82370 100644
|
||||
--- a/LINUX/Makefile
|
||||
+++ b/LINUX/Makefile
|
||||
@@ -6,9 +6,9 @@ CBMDEV = /dev/cbm
|
||||
CBMPERM = 666
|
||||
DEVMAJOR = 10
|
||||
DEVMINOR = 177
|
||||
-SUBDIRS = sys/linux include arch/$(ARCH) lib compat \
|
||||
+SUBDIRS = include arch/$(ARCH) lib \
|
||||
cbmctrl cbmformat cbmforng d64copy cbmcopy \
|
||||
- demo/flash demo/morse demo/rpm1541 docs
|
||||
+ docs
|
||||
|
||||
SUBDIRS_OPTIONAL = mnib36
|
||||
|
||||
--
|
||||
tg: (e590d2a..) debian/skip-targets (depends on: master)
|
||||
@@ -0,0 +1,44 @@
|
||||
From: Frédéric Brière <fbriere@fbriere.net>
|
||||
Subject: [PATCH] Allow invoking the module Makefile from the kernel tree
|
||||
|
||||
This makes it possible to invoke the (renamed) module Makefile directly from
|
||||
the Linux kernel source tree, without the need to set $(here) or create a
|
||||
symlink. In particular, it should make DKMS support a little bit easier.
|
||||
|
||||
Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
|
||||
|
||||
---
|
||||
sys/linux/LINUX/Makefile | 4 +---
|
||||
1 files changed, 1 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/sys/linux/LINUX/Makefile b/sys/linux/LINUX/Makefile
|
||||
index cb14aab..19a49a2 100644
|
||||
--- a/sys/linux/LINUX/Makefile
|
||||
+++ b/sys/linux/LINUX/Makefile
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
ifneq ($(KERNELRELEASE),)
|
||||
EXTRA_CFLAGS := $(CBM4LINUX_KERNEL_FLAGS) -I$(here)/../../include -I$(here)/../../include/LINUX
|
||||
+ccflags-y += -I$(src)/../../include -I$(src)/../../include/LINUX
|
||||
obj-m := cbm.o
|
||||
cbm-objs := cbm_module.o
|
||||
|
||||
@@ -18,7 +19,6 @@ all: cbm.o
|
||||
.PHONY: all clean mrproper install uninstall install-files
|
||||
clean:
|
||||
rm -f cbm.mod.c *.o *.ko .cbm* Modules.symvers
|
||||
- rm -f Makefile
|
||||
|
||||
mrproper: clean
|
||||
|
||||
@@ -38,8 +38,6 @@ ifneq ($(UDEV_RULES),)
|
||||
endif
|
||||
|
||||
cbm.o: cbm_module.c
|
||||
- -ln -s LINUX/Makefile Makefile
|
||||
$(MAKE) -C $(KERNEL_SOURCE) here=`pwd` CBM4LINUX_KERNEL_FLAGS=$(KERNEL_FLAGS) SUBDIRS=`pwd` modules
|
||||
- -rm -f Makefile
|
||||
|
||||
endif
|
||||
--
|
||||
tg: (e970caa..) features/module_makefile (depends on: upstream)
|
||||
38
app-emulation/opencbm/files/0.4.3_rc2/03_module_flatten.diff
Normal file
38
app-emulation/opencbm/files/0.4.3_rc2/03_module_flatten.diff
Normal file
@@ -0,0 +1,38 @@
|
||||
From: Frédéric Brière <fbriere@fbriere.net>
|
||||
Subject: [PATCH] Flatten the module source tree
|
||||
|
||||
This allows flattening the module source tree in a simple src/ and
|
||||
include/ directory pair, getting rid of all the LINUX/ stuff.
|
||||
|
||||
Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
|
||||
Forwarded: not-needed
|
||||
|
||||
---
|
||||
sys/linux/LINUX/Makefile | 5 ++---
|
||||
1 files changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/sys/linux/LINUX/Makefile b/sys/linux/LINUX/Makefile
|
||||
index 19a49a2..a4ef189 100644
|
||||
--- a/sys/linux/LINUX/Makefile
|
||||
+++ b/sys/linux/LINUX/Makefile
|
||||
@@ -1,8 +1,7 @@
|
||||
# $Id: Makefile,v 1.3.4.3 2007/11/11 16:57:25 strik Exp $
|
||||
|
||||
ifneq ($(KERNELRELEASE),)
|
||||
-EXTRA_CFLAGS := $(CBM4LINUX_KERNEL_FLAGS) -I$(here)/../../include -I$(here)/../../include/LINUX
|
||||
-ccflags-y += -I$(src)/../../include -I$(src)/../../include/LINUX
|
||||
+ccflags-y += -I$(src)/../include
|
||||
obj-m := cbm.o
|
||||
cbm-objs := cbm_module.o
|
||||
|
||||
@@ -12,7 +11,7 @@ modules:
|
||||
|
||||
else
|
||||
|
||||
-include ../../LINUX/config.make
|
||||
+include ../config.make
|
||||
|
||||
all: cbm.o
|
||||
|
||||
--
|
||||
tg: (ec9570d..) debian/module_flatten (depends on: features/module_makefile)
|
||||
77
app-emulation/opencbm/files/0.4.3_rc2/04_irq_count.diff
Normal file
77
app-emulation/opencbm/files/0.4.3_rc2/04_irq_count.diff
Normal file
@@ -0,0 +1,77 @@
|
||||
From: Frédéric Brière <fbriere@fbriere.net>
|
||||
Subject: [PATCH] Rename irq_count to cbm_irq_count in Linux kernel module
|
||||
|
||||
arch/x86/include/asm/processor.h already defines a variable called
|
||||
irq_count for CONFIG_X86_64.
|
||||
|
||||
Signed-off-by: Frédéric Brière <fbriere@fbriere.net>
|
||||
Forwarded: yes
|
||||
|
||||
---
|
||||
sys/linux/cbm_module.c | 14 +++++++-------
|
||||
1 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/sys/linux/cbm_module.c b/sys/linux/cbm_module.c
|
||||
index d8c5a23..451657c 100644
|
||||
--- a/sys/linux/cbm_module.c
|
||||
+++ b/sys/linux/cbm_module.c
|
||||
@@ -254,7 +254,7 @@ static struct wait_queue *cbm_wait_q;
|
||||
static wait_queue_head_t cbm_wait_q;
|
||||
#endif
|
||||
volatile static int eoi;
|
||||
-volatile static int irq_count;
|
||||
+volatile static int cbm_irq_count;
|
||||
|
||||
#ifndef KERNEL_VERSION
|
||||
# define signal_pending(p) (p->signal & ~p->blocked)
|
||||
@@ -422,7 +422,7 @@ static void wait_for_listener(void)
|
||||
add_wait_queue(&cbm_wait_q, &wait);
|
||||
current->state = TASK_INTERRUPTIBLE;
|
||||
RELEASE(CLK_OUT);
|
||||
- while(irq_count && !signal_pending(current)) {
|
||||
+ while(cbm_irq_count && !signal_pending(current)) {
|
||||
schedule();
|
||||
}
|
||||
remove_wait_queue(&cbm_wait_q, &wait);
|
||||
@@ -534,7 +534,7 @@ static int cbm_raw_write(const char *buf, size_t cnt, int atn, int talk)
|
||||
size_t sent = 0;
|
||||
unsigned long flags;
|
||||
|
||||
- eoi = irq_count = 0;
|
||||
+ eoi = cbm_irq_count = 0;
|
||||
|
||||
DPRINTK("cbm_write: %d bytes, atn=%d\n", cnt, atn);
|
||||
|
||||
@@ -571,7 +571,7 @@ static int cbm_raw_write(const char *buf, size_t cnt, int atn, int talk)
|
||||
}
|
||||
udelay(50);
|
||||
if(GET(DATA_IN)) {
|
||||
- irq_count = ((sent == (cnt-1)) && (atn == 0)) ? 2 : 1;
|
||||
+ cbm_irq_count = ((sent == (cnt-1)) && (atn == 0)) ? 2 : 1;
|
||||
wait_for_listener();
|
||||
|
||||
if(signal_pending(current)) {
|
||||
@@ -883,10 +883,10 @@ static irqreturn_t cbm_interrupt(int irq, void *dev_id)
|
||||
{
|
||||
POLL(); /* acknowledge interrupt */
|
||||
|
||||
- if(irq_count == 0) {
|
||||
+ if(cbm_irq_count == 0) {
|
||||
return IRQ_NONE;
|
||||
}
|
||||
- if(--irq_count == 0) {
|
||||
+ if(--cbm_irq_count == 0) {
|
||||
DPRINTK("continue to send (no EOI)\n");
|
||||
SET(CLK_OUT);
|
||||
wake_up_interruptible(&cbm_wait_q);
|
||||
@@ -1028,7 +1028,7 @@ int cbm_init(void)
|
||||
#endif
|
||||
);
|
||||
|
||||
- irq_count = 0;
|
||||
+ cbm_irq_count = 0;
|
||||
|
||||
out_bits = (CTRL_READ() ^ out_eor) &
|
||||
(DATA_OUT|CLK_OUT|ATN_OUT|RESET);
|
||||
--
|
||||
tg: (a9f3f01..) fixes/irq_count (depends on: upstream)
|
||||
Reference in New Issue
Block a user