[patch] 99-oct612x-split.diff

99-oct612x-split.diff (text/plain), 3.55 KB, created by Tony Vroon (RETIRED) on 2013-08-07 14:07:12 UTC

diff -uNr dahdi-linux-2.7.0.ORIG/drivers/dahdi/Kbuild dahdi-linux-2.7.0/drivers/dahdi/Kbuild
--- dahdi-linux-2.7.0.ORIG/drivers/dahdi/Kbuild	2013-08-07 13:57:16.997275058 +0100
+++ dahdi-linux-2.7.0/drivers/dahdi/Kbuild	2013-08-07 13:57:59.953275703 +0100
@@ -49,6 +49,12 @@
 
 obj-m += $(DAHDI_MODULES_EXTRA)
 
+obj-m += oct612x.o
+
+oct612x-objs := $(shell $(src)/oct612x/octasic-helper objects oct612x) oct612x-symbols.o
+oct612x-objs += oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_user.o
+ccflags-y += $(shell $(src)/oct612x/octasic-helper cflags $(src)/oct612x) -Wno-undef
+
 # If you want to build OSLEC, include the code in the standard location:
 # drivers/staging/echo . The DAHDI OSLEC echo canceller will be built as
 # well:
diff -uNr dahdi-linux-2.7.0.ORIG/drivers/dahdi/oct612x-symbols.c dahdi-linux-2.7.0/drivers/dahdi/oct612x-symbols.c
--- dahdi-linux-2.7.0.ORIG/drivers/dahdi/oct612x-symbols.c	1970-01-01 01:00:00.000000000 +0100
+++ dahdi-linux-2.7.0/drivers/dahdi/oct612x-symbols.c	2013-08-07 13:57:59.953275703 +0100
@@ -0,0 +1,28 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+
+#include "oct6100api/oct6100_api.h"
+
+MODULE_LICENSE("GPLv2");
+MODULE_AUTHOR("Jaco Kroon and Stefan Knoblich");
+MODULE_DESCRIPTION("Octasic 612x echo canceller library");
+MODULE_VERSION("0.0.1");
+
+EXPORT_SYMBOL_GPL(Oct6100ApiGetCapacityPins);
+EXPORT_SYMBOL_GPL(Oct6100ApiGetCapacityPinsDef);
+EXPORT_SYMBOL_GPL(Oct6100ChannelModify);
+EXPORT_SYMBOL_GPL(Oct6100ChannelModifyDef);
+EXPORT_SYMBOL_GPL(Oct6100ChannelOpen);
+EXPORT_SYMBOL_GPL(Oct6100ChannelOpenDef);
+EXPORT_SYMBOL_GPL(Oct6100ChipClose);
+EXPORT_SYMBOL_GPL(Oct6100ChipCloseDef);
+EXPORT_SYMBOL_GPL(Oct6100ChipOpen);
+EXPORT_SYMBOL_GPL(Oct6100ChipOpenDef);
+EXPORT_SYMBOL_GPL(Oct6100EventGetTone);
+EXPORT_SYMBOL_GPL(Oct6100EventGetToneDef);
+EXPORT_SYMBOL_GPL(Oct6100GetInstanceSize);
+EXPORT_SYMBOL_GPL(Oct6100GetInstanceSizeDef);
+EXPORT_SYMBOL_GPL(Oct6100InterruptServiceRoutine);
+EXPORT_SYMBOL_GPL(Oct6100InterruptServiceRoutineDef);
+EXPORT_SYMBOL_GPL(Oct6100ToneDetectionEnable);
+EXPORT_SYMBOL_GPL(Oct6100ToneDetectionEnableDef);
diff -uNr dahdi-linux-2.7.0.ORIG/drivers/dahdi/opvxd115/Kbuild dahdi-linux-2.7.0/drivers/dahdi/opvxd115/Kbuild
--- dahdi-linux-2.7.0.ORIG/drivers/dahdi/opvxd115/Kbuild	2013-08-07 13:57:16.999275058 +0100
+++ dahdi-linux-2.7.0/drivers/dahdi/opvxd115/Kbuild	2013-08-07 13:57:59.953275703 +0100
@@ -8,7 +8,7 @@
   EXTRA_CFLAGS+=-DHOTPLUG_FIRMWARE
 endif
 
-opvxd115-objs := base.o vpm450m.o $(shell $(src)/../oct612x/octasic-helper objects ../oct612x)
+opvxd115-objs := base.o vpm450m.o
 
 DAHDI_KERNEL_H_NAME:=kernel.h
 DAHDI_KERNEL_H_PATH:=$(DAHDI_INCLUDE)/dahdi/$(DAHDI_KERNEL_H_NAME)
diff -uNr dahdi-linux-2.7.0.ORIG/drivers/dahdi/wct4xxp/Kbuild dahdi-linux-2.7.0/drivers/dahdi/wct4xxp/Kbuild
--- dahdi-linux-2.7.0.ORIG/drivers/dahdi/wct4xxp/Kbuild	2013-08-07 13:57:16.981275058 +0100
+++ dahdi-linux-2.7.0/drivers/dahdi/wct4xxp/Kbuild	2013-08-07 13:59:05.607276688 +0100
@@ -2,7 +2,7 @@
 
 FIRM_DIR	:= ../firmware
 
-EXTRA_CFLAGS += -I$(src)/.. $(shell $(src)/../oct612x/octasic-helper cflags $(src)/../oct612x) -Wno-undef
+EXTRA_CFLAGS += -I$(src)/.. -Wno-undef
 
 # The OCT612X source files are from a vendor drop and we do not want to edit
 # them to make this warning go away. Therefore, turn off the
@@ -14,7 +14,7 @@
   EXTRA_CFLAGS+=-DHOTPLUG_FIRMWARE
 endif
 
-wct4xxp-objs := base.o vpm450m.o ../oct612x/lib.a
+wct4xxp-objs := base.o vpm450m.o
 
 ifneq ($(HOTPLUG_FIRMWARE),yes)
 wct4xxp-objs += $(FIRM_DIR)/dahdi-fw-oct6114-064.o $(FIRM_DIR)/dahdi-fw-oct6114-128.o $(FIRM_DIR)/dahdi-fw-oct6114-256.o