Build OSLEC EC if in the tree

Build the OSLEC echo canceller (drivers/staging/echo and
dahdi_echocan_oslec) if the code of oslec is present in the tree.

Also closing another issue regarding documentation of building OSLEC,
as it is now even clearer than before.

Patch has been used in the Debian package for quite some time.

Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>

(closes issue DAHLIN-110)
Reported by: biohumanoid (Pavel Selivanov)
Patches:
     oslec_auto.diff uploaded by tzafrir (license 5035)

(closes issue DAHLIN-261)

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10440 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Tzafrir Cohen 2012-01-17 14:26:25 +00:00
parent ad60b833e8
commit f76ebe2d75
2 changed files with 11 additions and 15 deletions

11
README
View File

@ -212,13 +212,10 @@ under driver/staging/echo . In fact, dahdi_echocan_oslec assumes that
this is where the oslec code lies. If it is elsewhere you'll need to fix this is where the oslec code lies. If it is elsewhere you'll need to fix
the #include line. the #include line.
Thus for the moment, the simplest way to build OSLEC with dahdi is: Thus for the moment, the simplest way to build OSLEC with dahdi is to
copy the directory `drivers/staging/echo` from a recent kernel tree (at
1. Copy the directory `drivers/staging/echo` from a recent kernel tree least 2.6.28-rc1) to the a subdirectory with the same name in the
(at least 2.6.28-rc1) to the a subdirectory with the same name in the dahdi-linux tree.
dahdi-linux tree.
2. Edit drivers/dahdi/Kbuild and uncomment the two lines related to OSLEC.
After doing that, you'll see the following when building (running After doing that, you'll see the following when building (running
'make') 'make')

View File

@ -33,14 +33,13 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_MG2) += dahdi_echocan_mg2.o
obj-m += $(DAHDI_MODULES_EXTRA) obj-m += $(DAHDI_MODULES_EXTRA)
# Only enable this if you think you know what you're doing. This is not # If you want to build OSLEC, include the code in the standard location:
# supported yet: # drivers/staging/echo . The DAHDI OSLEC echo canceller will be built as
#obj-m += dahdi_echocan_oslec.o # well:
# ifneq (,$(wildcard $(src)/../staging/echo/echo.c))
# A quick and dirty way to build OSLEC, if you happened to place it obj-m += dahdi_echocan_oslec.o
# yourself in the dahdi source tree. This is experimental. See README obj-m += ../staging/echo/
# regarding OSLEC. endif
#obj-m += ../staging/echo/
CFLAGS_MODULE += -I$(DAHDI_INCLUDE) -I$(src) CFLAGS_MODULE += -I$(DAHDI_INCLUDE) -I$(src)