Attachment #355330 for bug #480148

Lines 49-54 Link Here

(-)dahdi-linux-2.7.0.ORIG/drivers/dahdi/Kbuild (+6 lines)
49		49
50	obj-m += $(DAHDI_MODULES_EXTRA)	50	obj-m += $(DAHDI_MODULES_EXTRA)
51		51
		52	obj-m += oct612x.o
		53
		54	oct612x-objs := $(shell $(src)/oct612x/octasic-helper objects oct612x) oct612x-symbols.o
		55	oct612x-objs += oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_user.o
		56	ccflags-y += $(shell $(src)/oct612x/octasic-helper cflags $(src)/oct612x) -Wno-undef
		57
52	# If you want to build OSLEC, include the code in the standard location:	58	# If you want to build OSLEC, include the code in the standard location:
53	# drivers/staging/echo . The DAHDI OSLEC echo canceller will be built as	59	# drivers/staging/echo . The DAHDI OSLEC echo canceller will be built as
54	# well:	60	# well:




#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);

Lines 8-14 Link Here

(-)dahdi-linux-2.7.0.ORIG/drivers/dahdi/opvxd115/Kbuild (-1 / +1 lines)
8	EXTRA_CFLAGS+=-DHOTPLUG_FIRMWARE	8	EXTRA_CFLAGS+=-DHOTPLUG_FIRMWARE
9	endif	9	endif
10		10
11	opvxd115-objs := base.o vpm450m.o $(shell $(src)/../oct612x/octasic-helper objects ../oct612x)	11	opvxd115-objs := base.o vpm450m.o
12		12
13	DAHDI_KERNEL_H_NAME:=kernel.h	13	DAHDI_KERNEL_H_NAME:=kernel.h
14	DAHDI_KERNEL_H_PATH:=$(DAHDI_INCLUDE)/dahdi/$(DAHDI_KERNEL_H_NAME)	14	DAHDI_KERNEL_H_PATH:=$(DAHDI_INCLUDE)/dahdi/$(DAHDI_KERNEL_H_NAME)

Lines 2-8 Link Here

(-)dahdi-linux-2.7.0.ORIG/drivers/dahdi/wct4xxp/Kbuild (-2 / +2 lines)
2		2
3	FIRM_DIR := ../firmware	3	FIRM_DIR := ../firmware
4		4
5	EXTRA_CFLAGS += -I$(src)/.. $(shell $(src)/../oct612x/octasic-helper cflags $(src)/../oct612x) -Wno-undef	5	EXTRA_CFLAGS += -I$(src)/.. -Wno-undef
6		6
7	# The OCT612X source files are from a vendor drop and we do not want to edit	7	# The OCT612X source files are from a vendor drop and we do not want to edit
8	# them to make this warning go away. Therefore, turn off the	8	# them to make this warning go away. Therefore, turn off the
Lines 14-20 Link Here
14	EXTRA_CFLAGS+=-DHOTPLUG_FIRMWARE	14	EXTRA_CFLAGS+=-DHOTPLUG_FIRMWARE
15	endif	15	endif
16		16
17	wct4xxp-objs := base.o vpm450m.o ../oct612x/lib.a	17	wct4xxp-objs := base.o vpm450m.o
18		18
19	ifneq ($(HOTPLUG_FIRMWARE),yes)	19	ifneq ($(HOTPLUG_FIRMWARE),yes)
20	wct4xxp-objs += $(FIRM_DIR)/dahdi-fw-oct6114-064.o $(FIRM_DIR)/dahdi-fw-oct6114-128.o $(FIRM_DIR)/dahdi-fw-oct6114-256.o	20	wct4xxp-objs += $(FIRM_DIR)/dahdi-fw-oct6114-064.o $(FIRM_DIR)/dahdi-fw-oct6114-128.o $(FIRM_DIR)/dahdi-fw-oct6114-256.o

Return to bug 480148

Line 0 Link Here

(-)dahdi-linux-2.7.0.ORIG/drivers/dahdi/oct612x-symbols.c (+28 lines)
	1	#include <linux/kernel.h>
	2	#include <linux/module.h>
	3
	4	#include "oct6100api/oct6100_api.h"
	5
	6	MODULE_LICENSE("GPLv2");
	7	MODULE_AUTHOR("Jaco Kroon and Stefan Knoblich");
	8	MODULE_DESCRIPTION("Octasic 612x echo canceller library");
	9	MODULE_VERSION("0.0.1");
	10
	11	EXPORT_SYMBOL_GPL(Oct6100ApiGetCapacityPins);
	12	EXPORT_SYMBOL_GPL(Oct6100ApiGetCapacityPinsDef);
	13	EXPORT_SYMBOL_GPL(Oct6100ChannelModify);
	14	EXPORT_SYMBOL_GPL(Oct6100ChannelModifyDef);
	15	EXPORT_SYMBOL_GPL(Oct6100ChannelOpen);
	16	EXPORT_SYMBOL_GPL(Oct6100ChannelOpenDef);
	17	EXPORT_SYMBOL_GPL(Oct6100ChipClose);
	18	EXPORT_SYMBOL_GPL(Oct6100ChipCloseDef);
	19	EXPORT_SYMBOL_GPL(Oct6100ChipOpen);
	20	EXPORT_SYMBOL_GPL(Oct6100ChipOpenDef);
	21	EXPORT_SYMBOL_GPL(Oct6100EventGetTone);
	22	EXPORT_SYMBOL_GPL(Oct6100EventGetToneDef);
	23	EXPORT_SYMBOL_GPL(Oct6100GetInstanceSize);
	24	EXPORT_SYMBOL_GPL(Oct6100GetInstanceSizeDef);
	25	EXPORT_SYMBOL_GPL(Oct6100InterruptServiceRoutine);
	26	EXPORT_SYMBOL_GPL(Oct6100InterruptServiceRoutineDef);
	27	EXPORT_SYMBOL_GPL(Oct6100ToneDetectionEnable);
	28	EXPORT_SYMBOL_GPL(Oct6100ToneDetectionEnableDef);