[zaptel-commits] jcollie: branch group/new_octasic_build r1270 - in /team/group/new_octasic_bu...

zaptel-commits at lists.digium.com zaptel-commits at lists.digium.com
Wed Aug 9 06:20:57 MST 2006 

Author: jcollie
Date: Wed Aug  9 08:20:57 2006
New Revision: 1270

URL: http://svn.digium.com/view/zaptel?rev=1270&view=rev
Log:
My attempt at new build system for octasic drivers.

Added:
    team/group/new_octasic_build/wct4xxp/
    team/group/new_octasic_build/wct4xxp/Makefile   (with props)
    team/group/new_octasic_build/wct4xxp/OCT6114-128D.ima
      - copied unchanged from r1268, team/group/new_octasic_build/OCT6114-128D.ima
    team/group/new_octasic_build/wct4xxp/fw2h.c
      - copied unchanged from r1268, team/group/new_octasic_build/fw2h.c
    team/group/new_octasic_build/wct4xxp/oct612x/
      - copied from r1268, team/group/new_octasic_build/oct612x/
    team/group/new_octasic_build/wct4xxp/oct612x/Makefile
      - copied unchanged from r1269, team/group/new_octasic_build/oct612x/Makefile
    team/group/new_octasic_build/wct4xxp/oct612x/apilib/
      - copied from r1269, team/group/new_octasic_build/oct612x/apilib/
    team/group/new_octasic_build/wct4xxp/oct612x/include/
      - copied from r1269, team/group/new_octasic_build/oct612x/include/
    team/group/new_octasic_build/wct4xxp/oct612x/octasic-helper
      - copied unchanged from r1269, team/group/new_octasic_build/oct612x/octasic-helper
    team/group/new_octasic_build/wct4xxp/oct612x/octdeviceapi/
      - copied from r1269, team/group/new_octasic_build/oct612x/octdeviceapi/
    team/group/new_octasic_build/wct4xxp/vpm450m.c
      - copied, changed from r1268, team/group/new_octasic_build/vpm450m.c
    team/group/new_octasic_build/wct4xxp/vpm450m.h
      - copied unchanged from r1268, team/group/new_octasic_build/vpm450m.h
    team/group/new_octasic_build/wct4xxp/wct4xxp-diag.c   (props changed)
      - copied unchanged from r1268, team/group/new_octasic_build/wct4xxp-diag.c
    team/group/new_octasic_build/wct4xxp/wct4xxp_base.c
      - copied unchanged from r1268, team/group/new_octasic_build/wct4xxp_base.c
Removed:
    team/group/new_octasic_build/OCT6114-128D.ima
    team/group/new_octasic_build/fw2h.c
    team/group/new_octasic_build/oct612x/
    team/group/new_octasic_build/vpm450m.c
    team/group/new_octasic_build/vpm450m.h
    team/group/new_octasic_build/wct4xxp-diag.c
    team/group/new_octasic_build/wct4xxp_base.c
Modified:
    team/group/new_octasic_build/Makefile

Modified: team/group/new_octasic_build/Makefile
URL: http://svn.digium.com/view/zaptel/team/group/new_octasic_build/Makefile?rev=1270&r1=1269&r2=1270&view=diff
==============================================================================
--- team/group/new_octasic_build/Makefile (original)
+++ team/group/new_octasic_build/Makefile Wed Aug  9 08:20:57 2006
@@ -106,7 +106,7 @@
 LIBTONEZONE_SO_MINOR_VER:=0
 
 MODULES:=zaptel tor2 torisa wcusb wcfxo wctdm wctdm24xxp \
-	 ztdynamic ztd-eth wct1xxp wct4xxp wcte11xp pciradio \
+	 ztdynamic ztd-eth wct1xxp wcte11xp pciradio \
          ztd-loc # ztdummy
 #MODULES+=wcfxsusb
 # build ztdummy by default for 2.6 kernels
@@ -120,9 +120,7 @@
 MOD_DESTDIR:=zaptel
 
 obj-m:=$(MODULESO)
-obj-m+=oct612x/
-wct4xxp-objs:=wct4xxp_base.o vpm450m.o
-CFLAGS_vpm450m.o:=-I$(src)/oct612x/include -I$(src)/oct612x/include/oct6100api
+obj-m+=wct4xxp/
 
 # Also build xpp in the subdirectory xpp/ . But only for >=2.6.10 and only 
 # for i386. On other archs the module will probably build but panic.
@@ -142,7 +140,7 @@
 
 linux24: prereq vpm450m_fw.h $(MODULESO) $(BINS)
 
-linux26: prereq vpm450m_fw.h $(BINS)
+linux26: prereq $(BINS)
 	@echo $(KSRC)
 	@if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
 	$(KMAKE) modules
@@ -213,8 +211,8 @@
 
 fw2h: CFLAGS=
 
-vpm450m_fw.h: OCT6114-128D.ima fw2h
-	./fw2h $< $@
+#vpm450m_fw.h: OCT6114-128D.ima fw2h
+#	./fw2h $< $@
 
 zaptel.c: tones.h 
 

Added: team/group/new_octasic_build/wct4xxp/Makefile
URL: http://svn.digium.com/view/zaptel/team/group/new_octasic_build/wct4xxp/Makefile?rev=1270&view=auto
==============================================================================
--- team/group/new_octasic_build/wct4xxp/Makefile (added)
+++ team/group/new_octasic_build/wct4xxp/Makefile Wed Aug  9 08:20:57 2006
@@ -1,0 +1,15 @@
+
+
+hostprogs-y := fw2h
+
+obj-m += wct4xxp.o
+
+EXTRA_CFLAGS:=-I$(src)/.. $(shell $(src)/oct612x/octasic-helper cflags $(src)/oct612x)
+
+wct4xxp-objs:=wct4xxp_base.o vpm450m.o $(shell $(src)/oct612x/octasic-helper objects oct612x)
+
+vpm450m.c: $(obj)/vpm450m_fw.h
+
+$(obj)/vpm450m_fw.h: $(src)/OCT6114-128D.ima $(obj)/fw2h
+	$(obj)/fw2h $< $@
+

Propchange: team/group/new_octasic_build/wct4xxp/Makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/group/new_octasic_build/wct4xxp/Makefile
------------------------------------------------------------------------------
    svn:keywords = Author Id Date Revision

Propchange: team/group/new_octasic_build/wct4xxp/Makefile
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: team/group/new_octasic_build/wct4xxp/vpm450m.c (from r1268, team/group/new_octasic_build/vpm450m.c)
URL: http://svn.digium.com/view/zaptel/team/group/new_octasic_build/wct4xxp/vpm450m.c?p2=team/group/new_octasic_build/wct4xxp/vpm450m.c&p1=team/group/new_octasic_build/vpm450m.c&r1=1268&r2=1270&rev=1270&view=diff
==============================================================================
--- team/group/new_octasic_build/vpm450m.c (original)
+++ team/group/new_octasic_build/wct4xxp/vpm450m.c Wed Aug  9 08:20:57 2006
@@ -16,7 +16,7 @@
 #include "vpm450m_fw.h"
 #endif
 
-#include "oct6100_api.h"
+#include "oct6100api/oct6100_api.h"
 #include "vpm450m.h"
 
 /* API for Octasic access */

Propchange: team/group/new_octasic_build/wct4xxp/wct4xxp-diag.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/group/new_octasic_build/wct4xxp/wct4xxp-diag.c
------------------------------------------------------------------------------
    svn:keywords = Author Id Date Revision

Propchange: team/group/new_octasic_build/wct4xxp/wct4xxp-diag.c
------------------------------------------------------------------------------
    svn:mime-type = text/plain

More information about the zaptel-commits mailing list