[zaptel-commits] tzafrir: branch tzafrir/kernelmove r2165 - in /team/tzafrir/kernelmove: ./ ke...

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Thu Feb 15 16:53:43 2007
New Revision: 2165

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2165
Log:
* Move ocastic external to reside under kernel/
* Userspace tools are currently built with -Ikernel.
  (TODO: maybe remove STANDALONE_ZAPATA instead?)
* Set HOTPLUG_FIRMWARE properly in ztcodec_dte/
* Update needed svn:ignore-s

Modified:
    team/tzafrir/kernelmove/   (props changed)
    team/tzafrir/kernelmove/Makefile
    team/tzafrir/kernelmove/TODO
    team/tzafrir/kernelmove/kernel/   (props changed)
    team/tzafrir/kernelmove/kernel/ztcodec_dte/   (props changed)
    team/tzafrir/kernelmove/kernel/ztcodec_dte/Kbuild

Propchange: team/tzafrir/kernelmove/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Thu Feb 15 16:53:43 2007
@@ -1,2 +1,1 @@
 menuselect https://origsvn.digium.com/svn/menuselect/branches/1.0
-oct612x http://svn.digium.com/svn/octasic_api/oct612x/tags/PR47-00/software

Modified: team/tzafrir/kernelmove/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove/Makefile?view=diff&rev=2165&r1=2164&r2=2165
==============================================================================
--- team/tzafrir/kernelmove/Makefile (original)
+++ team/tzafrir/kernelmove/Makefile Thu Feb 15 16:53:43 2007
@@ -32,6 +32,7 @@
 KINCLUDES:=$(KSRC)/include
 
 CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
+CFLAGS+=-Ikernel # FIXME: we can't really need everything from there.
 ifneq (,$(findstring ppc,$(UNAME_M)))
 CFLAGS_PPC:=-fsigned-char
 endif
@@ -249,12 +250,12 @@
 #prereq: config.status tones.h tor2fw.h radfw.h version.h
 prereq: config.status version.h
 
-zttool.o: zttool.c zaptel.h
+zttool.o: zttool.c $(ZPATEL_H)
 	$(CC) -g -c $(NEWT_INCLUDE) $(CFLAGS) -o $@ $<
 
-ztprovision.o: ztprovision.c zaptel.h
-
-ztmonitor.o: ztmonitor.c zaptel.h
+ztprovision.o: ztprovision.c $(ZPATEL_H)
+
+ztmonitor.o: ztmonitor.c $(ZPATEL_H)
 
 ztspeed: CFLAGS=
 ztspeed.o: CFLAGS=

Modified: team/tzafrir/kernelmove/TODO
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove/TODO?view=diff&rev=2165&r1=2164&r2=2165
==============================================================================
--- team/tzafrir/kernelmove/TODO (original)
+++ team/tzafrir/kernelmove/TODO Thu Feb 15 16:53:43 2007
@@ -3,11 +3,11 @@
 kernel 2.6 build basically getting close to work.
 
 TODO:
-* Fix building the Ocastic subdir in wct4xxp (probably minor issue).
 * Fix building the datamod dir(?)
 * kernel 2.4 .
 * "Kbuild" is not good for some older 2.6 kernels. (Makefile/makefile?)
 * How do we provide version.h to kernel dir?
+* How do we provide zaptel.h to userspace?
 * Trim main Makefile.
 * dependencies? (ztd-eth->ztdynamic).
 * Configuration system.

Propchange: team/tzafrir/kernelmove/kernel/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Thu Feb 15 16:53:43 2007
@@ -1,0 +1,1 @@
+oct612x http://svn.digium.com/svn/octasic_api/oct612x/tags/PR47-00/software

Propchange: team/tzafrir/kernelmove/kernel/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Feb 15 16:53:43 2007
@@ -1,9 +1,13 @@
 .*.swp
+*.ko
+*.mod.c
 .*.d
 *.cmd
 .tmp_versions
+Module.symvers
 gendigits
 makefw
 tones.h
 radfw.h
 tor2fw.h
+version.h

Propchange: team/tzafrir/kernelmove/kernel/ztcodec_dte/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Feb 15 16:53:43 2007
@@ -1,1 +1,4 @@
 .*.d
+*.ko
+*.mod.c
+*.cmd

Modified: team/tzafrir/kernelmove/kernel/ztcodec_dte/Kbuild
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove/kernel/ztcodec_dte/Kbuild?view=diff&rev=2165&r1=2164&r2=2165
==============================================================================
--- team/tzafrir/kernelmove/kernel/ztcodec_dte/Kbuild (original)
+++ team/tzafrir/kernelmove/kernel/ztcodec_dte/Kbuild Thu Feb 15 16:53:43 2007
@@ -1,6 +1,7 @@
 obj-m += ztcodec_dte.o
 
-EXTRA_CFLAGS := -DSTANDALONE_ZAPATA -I$(src)/.. -Wno-undef
+EXTRA_CFLAGS := -DSTANDALONE_ZAPATA -I$(src)/.. -Wno-undef \
+  -DHOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
 
 ztcodec_dte-objs := base.o