[zaptel-commits] tzafrir: branch tzafrir/kernelmove_14 r2610 - in
/team/tzafrir/kernelmove_14:...
zaptel-commits at lists.digium.com
zaptel-commits at lists.digium.com
Fri Jun 8 16:54:40 MST 2007
Author: tzafrir
Date: Fri Jun 8 18:54:39 2007
New Revision: 2610
URL: http://svn.digium.com/view/zaptel?view=rev&rev=2610
Log:
Basic build of kernel and modules work, except wct4xxp and wctc4xxp.
* Changed name of file to check in the configure script.
* zaptel.h in userspace dir just includes kernel dir.
* All other userspace includes were prepended with kernel/ .
* -I. is no longer in the CFLAGS.
* Removed kernel 2.4 kernel stuff from Makefile.
* Kernel 2.6 main file is kernel/Kbuild. It includes Makefile.kernel26
from subdirs.
Added:
team/tzafrir/kernelmove_14/TODO (with props)
team/tzafrir/kernelmove_14/kernel/Kbuild
- copied, changed from r2592, team/tzafrir/kernelmove/kernel/Kbuild
team/tzafrir/kernelmove_14/kernel/Makefile
- copied unchanged from r2592, team/tzafrir/kernelmove/kernel/Makefile
team/tzafrir/kernelmove_14/zaptel.h
- copied unchanged from r2592, team/tzafrir/kernelmove/zaptel.h
Modified:
team/tzafrir/kernelmove_14/ (props changed)
team/tzafrir/kernelmove_14/Makefile
team/tzafrir/kernelmove_14/build_tools/make_firmware_object
team/tzafrir/kernelmove_14/configure
team/tzafrir/kernelmove_14/configure.ac
team/tzafrir/kernelmove_14/firmware/Makefile
team/tzafrir/kernelmove_14/fxotune.c
team/tzafrir/kernelmove_14/fxotune.h
team/tzafrir/kernelmove_14/fxstest.c
team/tzafrir/kernelmove_14/genconst.c
team/tzafrir/kernelmove_14/hdlcgen.c
team/tzafrir/kernelmove_14/hdlcstress.c
team/tzafrir/kernelmove_14/hdlctest.c
team/tzafrir/kernelmove_14/hdlcverify.c
team/tzafrir/kernelmove_14/kernel/ (props changed)
team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile
team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile.kernel26
team/tzafrir/kernelmove_14/tor2ee.c
Propchange: team/tzafrir/kernelmove_14/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jun 8 18:54:39 2007
@@ -1,9 +1,21 @@
+fxstest
+hdlcgen
+hdlcstress
+hdlctest
+hdlcverify
+patgen
+patlooptest
+pattest
+sethdlc
sethdlc-new
+timertest
+usbfxstest
ztdiag
zttool
ztspeed
ztmonitor
ztcfg
+ztcfg-dude
zonedata.lo
torisatool
tor2fw.h
Modified: team/tzafrir/kernelmove_14/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/Makefile?view=diff&rev=2610&r1=2609&r2=2610
==============================================================================
--- team/tzafrir/kernelmove_14/Makefile (original)
+++ team/tzafrir/kernelmove_14/Makefile Fri Jun 8 18:54:39 2007
@@ -4,8 +4,6 @@
# Copyright (C) 2001-2007 Digium, Inc.
#
#
-
-CFLAGS+=-DSTANDALONE_ZAPATA -DBUILDING_TONEZONE
ifeq ($(MAKELEVEL),0)
PWD:=$(shell pwd)
@@ -57,18 +55,6 @@
CFLAGS+=-DHOTPLUG_FIRMWARE
endif
-ifeq ($(ARCH),i386)
-ifneq ($(wildcard $(PWD)/hpec/hpec_x86_32.o_shipped),)
-HPEC_PRESENT=yes
-endif
-endif
-
-ifeq ($(ARCH),x86_64)
-ifneq ($(wildcard $(PWD)/hpec/hpec_x86_64.o_shipped),)
-HPEC_PRESENT=yes
-endif
-endif
-
# If the file .zaptel.makeopts is present in your home directory, you can
# include all of your favorite menuselect options so that every time you download
# a new version of Asterisk, you don't have to run menuselect to set them.
@@ -90,53 +76,19 @@
endif
endif
-ifeq ($(BUILDVER),linux24)
-MENUSELECT_MODULES+=xpp wctc4xxp zttranscode
-endif
+MODULES := pciradio tor2 torisa wcfxo wct1xxp wctdm wctdm24xxp \
+ wcte11xp wcusb zaptel ztd-eth ztd-loc ztdummy ztdynamic \
+ zttranscode
+MODULES:=$(filter-out $(MENUSELECT_MODULES),$(MODULES))
+
+ZAP_SUBDIRS := xpp # wctc4xp wct4xxp
+ZAP_SUBDIRS := $(filter-out $(MENUSELECT_MODULES),$(ZAP_SUBDIRS))
ifeq ($(findstring xpp,$(MENUSELECT_MODULES)),)
BUILD_XPP:=yes
endif
-TOPDIR_MODULES:=pciradio tor2 torisa wcfxo wct1xxp wctdm wctdm24xxp wcte11xp wcusb zaptel ztd-eth ztd-loc ztdummy ztdynamic zttranscode wcte12xp
-SUBDIR_MODULES:=wct4xxp wctc4xxp xpp
-BUILD_TOPDIR_MODULES:=$(filter-out $(MENUSELECT_MODULES),$(TOPDIR_MODULES))
-BUILD_SUBDIR_MODULES:=$(filter-out $(MENUSELECT_MODULES),$(SUBDIR_MODULES))
-BUILD_MODULES:=$(BUILD_TOPDIR_MODULES) $(BUILD_SUBDIR_MODULES)
-
-MOD_DESTDIR:=zaptel
-
-#NOTE NOTE NOTE
-#
-# all variables set before the include of Makefile.kernel26 are needed by the 2.6 kernel module build process
-
-ifneq ($(KBUILD_EXTMOD),)
-
-obj-m:=$(BUILD_TOPDIR_MODULES:%=%.o)
-obj-m+=$(BUILD_SUBDIR_MODULES:%=%/)
-
-include $(src)/Makefile.kernel26
-
-else
-
-ifeq ($(BUILDVER),linux24)
- INSTALL_MODULES:=$(BUILD_TOPDIR_MODULES:%=%.o)
- INSTALL_MODULES+=$(foreach mod,$(BUILD_SUBDIR_MODULES),$(mod)/$(mod).o)
- ALL_MODULES:=$(TOPDIR_MODULES:%=%.o)
- ALL_MODULES+=$(SUBDIR_MODULES:%=%/%.o)
-else
- INSTALL_MODULES:=$(BUILD_TOPDIR_MODULES:%=%.ko)
- INSTALL_MODULES+=$(foreach mod,$(filter-out xpp,$(BUILD_SUBDIR_MODULES)),$(mod)/$(mod).ko)
- ifneq ($(filter xpp,$(BUILD_SUBDIR_MODULES)),)
- INSTALL_MODULES+=$(patsubst %,xpp/%.ko,xpp_usb xpd_fxo xpd_fxs xpp)
- endif
-
- ALL_MODULES:=$(TOPDIR_MODULES:%=%.ko)
- ALL_MODULES+=$(foreach mod,$(filter-out xpp,$(SUBDIR_MODULES)),$(mod)/$(mod).ko)
- ALL_MODULES+=$(patsubst %,xpp/%.ko,xpp_usb xpd_fxo xpd_fxs xpp)
-endif
-
-CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
+CFLAGS+=-g -Wall -DSTANDALONE_ZAPATA -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
ifneq (,$(findstring ppc,$(UNAME_M)))
CFLAGS_PPC:=-fsigned-char
endif
@@ -145,21 +97,6 @@
endif
CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_x86_64)
LCFLAGS=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
-KFLAGS=-I$(KINCLUDES) -O6
-KFLAGS+=-DMODULE -D__KERNEL__ -DEXPORT_SYMTAB -I$(KSRC)/drivers/net \
- -Wall -I. -Wstrict-prototypes -fomit-frame-pointer -I$(KSRC)/drivers/net/wan -I$(KINCLUDES)/net
-ifneq (,$(wildcard $(KINCLUDES)/linux/modversions.h))
- KFLAGS+=-DMODVERSIONS -include $(KINCLUDES)/linux/modversions.h
-endif
-ifneq (,$(findstring ppc,$(UNAME_M)))
-KFLAGS_PPC:=-msoft-float -fsigned-char
-endif
-KFLAGS+=$(KFLAGS_PPC)
-ifeq ($(KVERS_MAJ),2.4)
- ifneq (,$(findstring x86_64,$(UNAME_M)))
- KFLAGS+=-mcmodel=kernel
- endif
-endif
#
# Features are now configured in zconfig.h
@@ -167,9 +104,8 @@
MODULE_ALIASES=wcfxs wctdm8xxp wct2xxp
-KFLAGS+=-DSTANDALONE_ZAPATA
-CFLAGS+=-DSTANDALONE_ZAPATA
-KMAKE = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)
+KMAKE := $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)/kernel \
+ MODULES="$(MODULES)" ZAP_SUBDIRS="$(ZAP_SUBDIRS)"
KMAKE_INST = $(KMAKE) \
INSTALL_MOD_PATH=$(INSTALL_PREFIX) INSTALL_MOD_DIR=misc modules_install
@@ -192,57 +128,50 @@
endif
endif
-LTZ_A:=libtonezone.a
-LTZ_A_OBJS:=zonedata.o tonezone.o
-LTZ_SO:=libtonezone.so
-LTZ_SO_OBJS:=zonedata.lo tonezone.lo
-LTZ_SO_MAJOR_VER:=1
-LTZ_SO_MINOR_VER:=0
+LTZ_A := libtonezone.a
+LTZ_A_OBJS := zonedata.o tonezone.o
+LTZ_SO_BASE := libtonezone.so
+LTZ_SO_OBJS := zonedata.lo tonezone.lo
+LTZ_SO_MAJOR_VER:= 1
+LTZ_SO_MINOR_VER:= 0
+LTZ_SO := $(LTZ_SO_BASE).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER)
BIN_DIR:=$(INSTALL_PREFIX)/sbin
LIB_DIR:=$(INSTALL_PREFIX)/usr/lib
INC_DIR:=$(INSTALL_PREFIX)/usr/include
MOD_DIR:=$(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc
+LDCONFIG = /sbin/ldconfig
+SBINDIR = $(INSTALL_PREFIX)/sbin
+BINS_INSTALL = $(BINS)
+MANDIR = $(INSTALL_PREFIX)/share/man
+INCLUDE_DIR = $(INSTALL_PREFIX)/usr/include/zaptel
+
BINS:=fxotune fxstest sethdlc-new ztcfg ztdiag ztmonitor ztspeed zttest zttool
-UTILS:=$(filter-out zttool fxstest ztcfg,$(BINS))
+UTILS:=$(filter-out zttool ztcfg,$(BINS))
UTILSO:=$(UTILS:%=%.o)
BINS:=$(filter-out $(MENUSELECT_UTILS),$(BINS))
-
-all: menuselect.makeopts
- @$(MAKE) _all
-
-_all: $(if $(BUILD_MODULES),modules) programs $(LTZ_SO) $(LTZ_A)
+UTILS_ALL := $(UTILS)
+
+all: menuselect.makeopts modules programs
+
+programs: $(BINS) $(LTZ_SO) $(LTZ_A) xpp-utils
xpp-utils:
ifeq (yes,$(BUILD_XPP))
- @$(MAKE) -C xpp/utils
-endif
-
-programs: $(BINS) xpp-utils
-
-modules: prereq
+ @$(MAKE) -C kernel/xpp/utils
+endif
+
+modules: $(BUILDVER)
+
+linux24: prereq
+ make -C kernel
+
+linux26: prereq
@if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
-ifeq ($(BUILDVER),linux26)
- $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) modules
-else
-modules: $(INSTALL_MODULES)
-endif
-
-ifeq ($(HPEC_PRESENT),yes)
-ifeq ($(ARCH),i386)
-ZAPTEL_HPEC:=hpec/hpec_x86_32.o_shipped
-endif
-
-ifeq ($(ARCH),x86_64)
-ZAPTEL_HPEC:=hpec/hpec_x86_64.o_shipped
-endif
-
-KFLAGS+=-DECHO_CAN_HPEC -I$(PWD)/hpec
-zaptel-base.o: hpec/hpec_zaptel.h hpec/hpec_user.h
-endif
-
-version.h:
+ $(KMAKE) modules
+
+kernel/version.h:
@ZAPTELVERSION="${ZAPTELVERSION}" build_tools/make_version_h > $@.tmp
@if cmp -s $@.tmp $@ ; then :; else \
mv $@.tmp $@ ; \
@@ -264,33 +193,18 @@
torisatool: torisatool.o
$(CC) -o $@ $^
-tones.h: gendigits
- ./gendigits > $@
-
-tor2fw.h: tormenta2.rbt makefw
- ./makefw $< tor2fw > $@
-
-radfw.h: pciradio.rbt makefw
- ./makefw $< radfw > $@
-
-makefw: makefw.c
- $(HOSTCC) -o $@ $^
-
-gendigits: LDLIBS+=-lm
-gendigits: CFLAGS=
-
-prereq: config.status tones.h tor2fw.h radfw.h version.h
-
-zttool.o: zttool.c zaptel.h
- $(CC) -g -c $(NEWT_INCLUDE) $(CFLAGS) -o $@ $<
-
-ztprovision.o: ztprovision.c zaptel.h
-
-ztmonitor.o: ztmonitor.c zaptel.h
+prereq: config.status kernel/version.h
+
+zttool.o: CFLAGS+=$(NEWT_INCLUDE)
+zttool.o: $(ZPATEL_H)
+
+ztmonitor.o: $(ZPATEL_H)
ztspeed: CFLAGS=
ztspeed.o: CFLAGS=
zttool: LDLIBS+=$(NEWT_LIB)
+
+# FIXME: this no longer works.
sethdlc-new.o: CFLAGS+=-I$(KINCLUDES)
$(LTZ_A): $(LTZ_A_OBJS)
@@ -298,7 +212,7 @@
ranlib $@
$(LTZ_SO): $(LTZ_SO_OBJS)
- $(CC) -shared -Wl,-soname,$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) -o $@ $^ -lm
+ $(CC) -shared -Wl,-soname,$(LTZ_SO) -o $@ $^ -lm
ztcfg.c: ztcfg.h
@@ -306,7 +220,7 @@
$(CC) -o $@ $^ -lm
data:
- $(MAKE) -C datamods datamods
+ $(KMAKE) ZAP_SUBDIRS=datamods MODULES=datamods
ztcfg: ztcfg.o $(LTZ_A)
$(CC) -o $@ $^ -lm
@@ -314,10 +228,7 @@
ztcfg-dude: ztcfg-dude.o mknotch.o complex.o $(LTZ_SO)
$(CC) -o $@ $^ -lm -lstdc++
-mknotch.o: mknotch.cc
- $(CC) -o $@ -c $^
-
-complex.o: complex.cc
+mknotch.o complex.o: %.o: %.cc
$(CC) -o $@ -c $^
usbfxstest: LDLIBS+=-lzap
@@ -326,38 +237,10 @@
fxotune: LDLIBS+=-lm
fxsdump: LDLIBS+=-lm
-devel: tor2ee
-
-ifeq ($(BUILDVER),linux24)
-wct4xxp/wct4xxp.o:
- $(MAKE) -C wct4xxp KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
-
-tor2.o: tor2-hw.h tor2fw.h
-
-zaptel-base.o: digits.h arith.h sec.h mec.h sec-2.h mec2.h mec3.h zconfig.h
-
-wcusb.o: wcusb.h
-
-wcfxsusb.o: wcfxsusb.h
-
-wctdm.o: wctdm.h
-
-wctdm24xxp.o: wctdm.h
-
-pciradio.o: radfw.h
-
-ztdummy.o: ztdummy.h
-
-zaptel.o: zaptel-base.o $(ZAPTEL_HPEC)
- $(LD) -r -o $@ $< $(ZAPTEL_HPEC)
-
-$(filter-out zaptel.o,$(BUILD_TOPDIR_MODULES:%=%.o)) zaptel-base.o: %.o: %.c zaptel.h
- $(CC) $(KFLAGS) -o $@ -c $<
-
-zaptel.c: tones.h
-endif
-
-stackcheck: checkstack $(BUILDVER)
+# What does this target mean?
+#devel: tor2ee
+
+stackcheck: checkstack modules
./checkstack *.o
MISDNVERSION=1_1_3
@@ -387,6 +270,30 @@
$(UTILSO): %.o: %.c
$(CC) $(CFLAGS) -o $@ -c $<
+
+install: all install-programs install-modules devices
+
+install-programs: $(BINS_INSTALL) $(LTZ_A) $(LTZ_SO) firmware
+ifeq ($(HOTPLUG_FIRMWARE),yes)
+ $(MAKE) -C firmware hotplug-install
+endif
+ install -d $(SBINDIR)
+ install $(BINS_INSTALL) $(SBINDIR)/
+ install -d $(INCLUDE_DIR)
+ $(INSTALL) -m 644 kernel/zaptel.h tonezone.h $(INCLUDE_DIR)/
+ install -d $(MANDIR)/man8
+ $(INSTALL) -m 644 doc/*.8 $(MANDIR)/man8/
+ install -d $(LIB_DIR)
+ $(INSTALL) $(LTZ_A) $(LTZ_SO) $(LIB_DIR)/
+ $(LDCONFIG) || $(LDCONFIG) -n $(LIB_DIR)
+ # FIXME: should this be set for the symlink LTZ_SO_BASE or for
+ # the real file LTZ_SO ?
+ if [ -z "$(INSTALL_PREFIX)" ] && $(CHECK_SELINUX) ; then \
+ /sbin/restorecon -v $(LIB_DIR)/$(LTZ_SO_BASE); \
+ fi
+ifeq ($(BUILDVER),linux26)
+ $(KMAKE_INST)
+else
install: all devices install-modules install-libs install-include install-xpp
ifeq ($(HOTPLUG_FIRMWARE),yes)
@@ -481,25 +388,21 @@
uninstall-hotplug:
$(MAKE) -C firmware hotplug-uninstall
-uninstall-modules:
+
+# Originally install-moduled dependend on a very brutal
+# uninstall-modules for cleanup. This seems suboptiomal.
+install-modules:
ifeq ($(BUILDVER),linux24)
-else
- for x in $(ALL_MODULES); do \
- rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/extra/$$x ; \
- rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/$$x ; \
- rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/zaptel/$$x ; \
- done;
-endif
-
-install-modules: $(INSTALL_MODULES) uninstall-modules
+ make -C kernel install
+else
+ $(KMAKE_INST)
+endif
+
+uninstall-modules:
ifeq ($(BUILDVER),linux24)
- $(INSTALL) -d $(MOD_DIR)
- $(INSTALL) -m 644 $(INSTALL_MODULES) $(MOD_DIR)
-else
- $(KMAKE_INST)
- if [ -f datamods/syncppp.ko ]; then \
- $(MAKE) -C datamods install; \
- fi
+ #make -C kernel modules_uninstall # if there were such a target
+else
+ #$(KMAKE) uninstall # To be implemented
endif
config:
@@ -545,12 +448,12 @@
rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
rm -f $(LTZ_SO) $(LTZ_A) *.lo
ifeq ($(BUILDVER),linux26)
- $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) clean
- $(MAKE) -C xpp/utils clean
-else
- $(MAKE) -C wct4xxp clean
+ $(KMAKE) clean
+else
+ $(MAKE) -C kernel clean
endif
$(MAKE) -C firmware clean
+ $(MAKE) -C kernel/xpp/utils clean
rm -rf .tmp_versions
rm -f gendigits tones.h
rm -f libtonezone*
@@ -594,6 +497,6 @@
.EXPORT_ALL_VARIABLES:
-.PHONY: menuselect distclean dist-clean clean version.h all _all install b410p devices programs modules tests devel data stackcheck install-udev config update install-programs install-modules install-include install-libs install-xpp xpp-utils uninstall-modules
-
-endif
+.PHONY: menuselect distclean dist-clean clean all install devices programs modules tests devel data stackcheck install-udev config update install-programs install-modules install-include install-libs install-xpp xpp-utils uninstall-modules
+
+endif
Added: team/tzafrir/kernelmove_14/TODO
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/TODO?view=auto&rev=2610
==============================================================================
--- team/tzafrir/kernelmove_14/TODO (added)
+++ team/tzafrir/kernelmove_14/TODO Fri Jun 8 18:54:39 2007
@@ -1,0 +1,16 @@
+Working:
+* Basic 2.6 build.
+* userspace build.
+
+* Test menuselect integration.
+* trim kernel/Makefile
+* build wct4xxp/ and wctc4xxp/ (the octasic API mess)
+* kernel 2.4 build
+* 'make clean' may trigger a configure of menuselect
+* install
+* fix building of datamods
+* properly clean all programs
+* uninstall target
+* Fix building tor2ee.
+* stackcheck: in kernel?
+
Propchange: team/tzafrir/kernelmove_14/TODO
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/tzafrir/kernelmove_14/TODO
------------------------------------------------------------------------------
svn:keywords = Author Date Ide Revision
Propchange: team/tzafrir/kernelmove_14/TODO
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: team/tzafrir/kernelmove_14/build_tools/make_firmware_object
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/build_tools/make_firmware_object?view=diff&rev=2610&r1=2609&r2=2610
==============================================================================
--- team/tzafrir/kernelmove_14/build_tools/make_firmware_object (original)
+++ team/tzafrir/kernelmove_14/build_tools/make_firmware_object Fri Jun 8 18:54:39 2007
@@ -6,7 +6,7 @@
# 2 - output file
# 3 - template output file (used to learn desired format)
-bfdname=`LANG=C objdump -f ${3} | grep -e "${3}:" | sed "s/.*file format \(.*\)/\1/"`
-bfdarch=`LANG=C objdump -f ${3} | grep -e "architecture:" | sed "s/.*ture: \(.*\),.*/\1/"`
+bfdname=elf32-i386
+bfdarch=i386
objcopy -I binary ${1} -B ${bfdarch} -O ${bfdname} ${2} --rename-section .data=.rodata,alloc,load,data,contents,readonly
Modified: team/tzafrir/kernelmove_14/configure
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/configure?view=diff&rev=2610&r1=2609&r2=2610
==============================================================================
--- team/tzafrir/kernelmove_14/configure (original)
+++ team/tzafrir/kernelmove_14/configure Fri Jun 8 18:54:39 2007
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 2107 .
+# From configure.ac Revision: 2216 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61.
#
@@ -580,7 +580,7 @@
PACKAGE_BUGREPORT=
ac_unique_file="zaptel"
-ac_unique_file="zaptel-base.c"
+ac_unique_file="kernel/zaptel-base.c"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
Modified: team/tzafrir/kernelmove_14/configure.ac
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/configure.ac?view=diff&rev=2610&r1=2609&r2=2610
==============================================================================
--- team/tzafrir/kernelmove_14/configure.ac (original)
+++ team/tzafrir/kernelmove_14/configure.ac Fri Jun 8 18:54:39 2007
@@ -9,7 +9,7 @@
AC_INIT(zaptel, ZAP_VERSION, www.asterisk.org)
# check existence of the package
-AC_CONFIG_SRCDIR([zaptel-base.c])
+AC_CONFIG_SRCDIR([kernel/zaptel-base.c])
AC_COPYRIGHT("Zaptel")
AC_REVISION($Revision$)
Modified: team/tzafrir/kernelmove_14/firmware/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/firmware/Makefile?view=diff&rev=2610&r1=2609&r2=2610
==============================================================================
--- team/tzafrir/kernelmove_14/firmware/Makefile (original)
+++ team/tzafrir/kernelmove_14/firmware/Makefile Fri Jun 8 18:54:39 2007
@@ -155,14 +155,14 @@
fi
# Build object file of an oct6114 064 firmware image for linking
-zaptel-fw-oct6114-064.o: zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz ../wct4xxp/base.o zaptel-fw-oct6114-064.bin
+zaptel-fw-oct6114-064.o: zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz zaptel-fw-oct6114-064.bin
@echo Making firmware object file for zaptel-fw-oct6114-064.bin
- ../build_tools/make_firmware_object zaptel-fw-oct6114-064.bin $@ ../wct4xxp/base.o
+ ../build_tools/make_firmware_object zaptel-fw-oct6114-064.bin $@
# Build object file of an oct6114 128 firmware image for linking
-zaptel-fw-oct6114-128.o: zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz ../wct4xxp/base.o zaptel-fw-oct6114-128.bin
+zaptel-fw-oct6114-128.o: zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz zaptel-fw-oct6114-128.bin
@echo Making firmware object file for zaptel-fw-oct6114-128.bin
- ../build_tools/make_firmware_object zaptel-fw-oct6114-128.bin $@ ../wct4xxp/base.o
+ ../build_tools/make_firmware_object zaptel-fw-oct6114-128.bin $@
# Build object file of a TC400M firmware image for linking
zaptel-fw-tc400m.o:
Modified: team/tzafrir/kernelmove_14/fxotune.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/fxotune.c?view=diff&rev=2610&r1=2609&r2=2610
==============================================================================
--- team/tzafrir/kernelmove_14/fxotune.c (original)
+++ team/tzafrir/kernelmove_14/fxotune.c Fri Jun 8 18:54:39 2007
@@ -28,7 +28,6 @@
#else
#include <zaptel/zaptel.h>
#endif
-#include "wctdm.h"
#include "fxotune.h"
#define TEST_DURATION 2000 /* 4000 samples (or 500 ms) of test */
Modified: team/tzafrir/kernelmove_14/fxotune.h
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/fxotune.h?view=diff&rev=2610&r1=2609&r2=2610
==============================================================================
--- team/tzafrir/kernelmove_14/fxotune.h (original)
+++ team/tzafrir/kernelmove_14/fxotune.h Fri Jun 8 18:54:39 2007
@@ -13,7 +13,7 @@
* (C) 2005 Digium, Inc.
*/
-#include "wctdm.h"
+#include "kernel/wctdm.h"
struct wctdm_echo_coefs echo_trys [] =
{
Modified: team/tzafrir/kernelmove_14/fxstest.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/fxstest.c?view=diff&rev=2610&r1=2609&r2=2610
==============================================================================
--- team/tzafrir/kernelmove_14/fxstest.c (original)
+++ team/tzafrir/kernelmove_14/fxstest.c Fri Jun 8 18:54:39 2007
@@ -7,7 +7,7 @@
#include <sys/ioctl.h>
#include "zaptel.h"
#include "tonezone.h"
-#include "wctdm.h"
+#include "kernel/wctdm.h"
static int tones[] = {
ZT_TONE_DIALTONE,
Modified: team/tzafrir/kernelmove_14/genconst.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/genconst.c?view=diff&rev=2610&r1=2609&r2=2610
==============================================================================
--- team/tzafrir/kernelmove_14/genconst.c (original)
+++ team/tzafrir/kernelmove_14/genconst.c Fri Jun 8 18:54:39 2007
@@ -1,5 +1,5 @@
#define GEN_CONST
-#include "mec-2.h"
+#include "kernel/mec2_const.h"
#include <stdio.h>
int main()
Modified: team/tzafrir/kernelmove_14/hdlcgen.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/hdlcgen.c?view=diff&rev=2610&r1=2609&r2=2610
==============================================================================
--- team/tzafrir/kernelmove_14/hdlcgen.c (original)
+++ team/tzafrir/kernelmove_14/hdlcgen.c Fri Jun 8 18:54:39 2007
@@ -1,5 +1,5 @@
#define FAST_HDLC_NEED_TABLES
-#include "fasthdlc.h"
+#include "kernel/fasthdlc.h"
#include <stdio.h>
#include <fcntl.h>
#include <string.h>
Modified: team/tzafrir/kernelmove_14/hdlcstress.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/hdlcstress.c?view=diff&rev=2610&r1=2609&r2=2610
==============================================================================
--- team/tzafrir/kernelmove_14/hdlcstress.c (original)
+++ team/tzafrir/kernelmove_14/hdlcstress.c Fri Jun 8 18:54:39 2007
@@ -11,7 +11,7 @@
#include <stdlib.h>
#include "bittest.h"
#define FAST_HDLC_NEED_TABLES
-#include "fasthdlc.h"
+#include "kernel/fasthdlc.h"
/* #define BLOCK_SIZE 2048 */
#define BLOCK_SIZE 2041
Modified: team/tzafrir/kernelmove_14/hdlctest.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/hdlctest.c?view=diff&rev=2610&r1=2609&r2=2610
==============================================================================
--- team/tzafrir/kernelmove_14/hdlctest.c (original)
+++ team/tzafrir/kernelmove_14/hdlctest.c Fri Jun 8 18:54:39 2007
@@ -11,7 +11,7 @@
#include <stdlib.h>
#include "bittest.h"
#define FAST_HDLC_NEED_TABLES
-#include "fasthdlc.h"
+#include "kernel/fasthdlc.h"
#define BLOCK_SIZE 2039
Modified: team/tzafrir/kernelmove_14/hdlcverify.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/hdlcverify.c?view=diff&rev=2610&r1=2609&r2=2610
==============================================================================
--- team/tzafrir/kernelmove_14/hdlcverify.c (original)
+++ team/tzafrir/kernelmove_14/hdlcverify.c Fri Jun 8 18:54:39 2007
@@ -1,5 +1,5 @@
#define FAST_HDLC_NEED_TABLES
-#include "fasthdlc.h"
+#include "kernel/fasthdlc.h"
#include <stdio.h>
#include <fcntl.h>
#include <string.h>
Propchange: team/tzafrir/kernelmove_14/kernel/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jun 8 18:54:39 2007
@@ -1,0 +1,13 @@
+.*.swp
+*.ko
+*.mod.c
+.*.d
+*.cmd
+.tmp_versions
+Module.symvers
+gendigits
+makefw
+tones.h
+radfw.h
+tor2fw.h
+version.h
Copied: team/tzafrir/kernelmove_14/kernel/Kbuild (from r2592, team/tzafrir/kernelmove/kernel/Kbuild)
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/Kbuild?view=diff&rev=2610&p1=team/tzafrir/kernelmove/kernel/Kbuild&r1=2592&p2=team/tzafrir/kernelmove_14/kernel/Kbuild&r2=2610
==============================================================================
--- team/tzafrir/kernelmove/kernel/Kbuild (original)
+++ team/tzafrir/kernelmove_14/kernel/Kbuild Fri Jun 8 18:54:39 2007
@@ -15,7 +15,9 @@
#HOSTLOADLIBES_gendigits += -lm
HOST_LOADLIBES += -lm
-$(obj)/zaptel.o: $(obj)/tones.h
+zaptel-objs := zaptel-base.o
+
+$(obj)/zaptel-base.o: $(obj)/tones.h
$(obj)/pciradio.o: $(obj)/radfw.h
$(obj)/tor2.o: $(obj)/tor2fw.h
Modified: team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile?view=diff&rev=2610&r1=2609&r2=2610
==============================================================================
--- team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile (original)
+++ team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile Fri Jun 8 18:54:39 2007
@@ -4,8 +4,9 @@
else
-OCTASIC_OBJS:=$(shell ../oct612x/octasic-helper objects ../oct612x)
-OCTASIC_CFLAGS:=$(shell ../oct612x/octasic-helper cflags ../oct612x) -Wno-undef
+OCT_CFLAGS := $(shell ../../oct612x/octasic-helper objects ../oct612x)
+OCTASIC_OBJS := $(OCT_CFLAGS)
+OCTASIC_CFLAGS := $(OCT_CFLAGS) -Wno-undef
all: wct4xxp.o
Modified: team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile.kernel26
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile.kernel26?view=diff&rev=2610&r1=2609&r2=2610
==============================================================================
--- team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile.kernel26 (original)
+++ team/tzafrir/kernelmove_14/kernel/wct4xxp/Makefile.kernel26 Fri Jun 8 18:54:39 2007
@@ -1,21 +1,24 @@
obj-m += wct4xxp.o
-EXTRA_CFLAGS := -I$(src)/.. $(shell $(src)/../oct612x/octasic-helper cflags $(src)/../oct612x) -Wno-undef
+OCT_CFLAGS := $(shell $(src)/../../oct612x/octasic-helper cflags $(src)/../../oct612x)
+OCT_OBJS := $(shell $(src)/../../oct612x/octasic-helper objects $(obj)/../../oct612x)
-wct4xxp-objs := base.o vpm450m.o $(shell $(src)/../oct612x/octasic-helper objects ../oct612x)
+EXTRA_CFLAGS := -I$(src)/.. $(OCT_CFLAGS) -Wno-undef -DSTANDALONE_ZAPATA
+
+wct4xxp-objs := base.o vpm450m.o $(OCT_OBJS)
ifneq ($(HOTPLUG_FIRMWARE),yes)
-wct4xxp-objs += ../firmware/zaptel-fw-oct6114-064.o ../firmware/zaptel-fw-oct6114-128.o
+wct4xxp-objs += $(obj)/../../firmware/zaptel-fw-oct6114-064.o $(obj)/../../firmware/zaptel-fw-oct6114-128.o
endif
$(obj)/../firmware/zaptel-fw-oct6114-064.o: $(obj)/base.o
- $(MAKE) -C $(obj)/../firmware zaptel-fw-oct6114-064.o
+ $(MAKE) -C $(obj)/../../firmware zaptel-fw-oct6114-064.o
$(obj)/../firmware/zaptel-fw-oct6114-128.o: $(obj)/base.o
- $(MAKE) -C $(obj)/../firmware zaptel-fw-oct6114-128.o
+ $(MAKE) -C $(obj)/../../firmware zaptel-fw-oct6114-128.o
$(obj)/base.o: $(src)/vpm450m.h $(src)/wct4xxp.h
$(obj)/base.o: $(src)/../zaptel.h
$(obj)/vpm450m.o: $(src)/vpm450m.h
-$(obj)/vpm450m.o: $(src)/../oct612x/include/oct6100api/oct6100_api.h
+$(obj)/vpm450m.o: $(src)/../../oct612x/include/oct6100api/oct6100_api.h
Modified: team/tzafrir/kernelmove_14/tor2ee.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_14/tor2ee.c?view=diff&rev=2610&r1=2609&r2=2610
==============================================================================
--- team/tzafrir/kernelmove_14/tor2ee.c (original)
+++ team/tzafrir/kernelmove_14/tor2ee.c Fri Jun 8 18:54:39 2007
@@ -39,7 +39,7 @@
#include <time.h>
#define NEED_PCI_IDS
-#include "tor2-hw.h"
+#include "kernel/tor2-hw.h"
#define NUM_REGS 0x86 >> 1
More information about the zaptel-commits
mailing list