[zaptel-commits] kpfleming: branch group/new_octasic_build r1271 - in /team/group/new_octasic_...

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Wed Aug  9 08:46:34 2006
New Revision: 1271

URL: http://svn.digium.com/view/zaptel?rev=1271&view=rev
Log:
some more changes... getting closer to something usable

Added:
    team/group/new_octasic_build/oct612x/
      - copied from r1270, team/group/new_octasic_build/wct4xxp/oct612x/
    team/group/new_octasic_build/wct4xxp/base.c
      - copied unchanged from r1270, team/group/new_octasic_build/wct4xxp/wct4xxp_base.c
    team/group/new_octasic_build/wct4xxp/wct4xxp.h   (props changed)
      - copied unchanged from r1270, team/group/new_octasic_build/wct4xxp.h
Removed:
    team/group/new_octasic_build/wct4xxp.h
    team/group/new_octasic_build/wct4xxp/oct612x/
    team/group/new_octasic_build/wct4xxp/wct4xxp_base.c
Modified:
    team/group/new_octasic_build/oct612x/octasic-helper
    team/group/new_octasic_build/wct4xxp/Makefile
    team/group/new_octasic_build/wcte11xp.c

Modified: team/group/new_octasic_build/oct612x/octasic-helper
URL: http://svn.digium.com/view/zaptel/team/group/new_octasic_build/oct612x/octasic-helper?rev=1271&r1=1270&r2=1271&view=diff
==============================================================================
--- team/group/new_octasic_build/oct612x/octasic-helper (original)
+++ team/group/new_octasic_build/oct612x/octasic-helper Wed Aug  9 08:46:34 2006
@@ -20,6 +20,7 @@
 	    $APIDIR/oct6100_events.o \
 	    $APIDIR/oct6100_interrupts.o \
 	    $APIDIR/oct6100_memory.o \
+	    $APIDIR/oct6100_miscellaneous.o \
 	    $APIDIR/oct6100_mixer.o \
 	    $APIDIR/oct6100_phasing_tsst.o \
 	    $APIDIR/oct6100_playout_buf.o \

Modified: team/group/new_octasic_build/wct4xxp/Makefile
URL: http://svn.digium.com/view/zaptel/team/group/new_octasic_build/wct4xxp/Makefile?rev=1271&r1=1270&r2=1271&view=diff
==============================================================================
--- team/group/new_octasic_build/wct4xxp/Makefile (original)
+++ team/group/new_octasic_build/wct4xxp/Makefile Wed Aug  9 08:46:34 2006
@@ -1,15 +1,12 @@
-
-
 hostprogs-y := fw2h
 
 obj-m += wct4xxp.o
 
-EXTRA_CFLAGS:=-I$(src)/.. $(shell $(src)/oct612x/octasic-helper cflags $(src)/oct612x)
+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)
+wct4xxp-objs := 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/wct4xxp.h
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Modified: team/group/new_octasic_build/wcte11xp.c
URL: http://svn.digium.com/view/zaptel/team/group/new_octasic_build/wcte11xp.c?rev=1271&r1=1270&r2=1271&view=diff
==============================================================================
--- team/group/new_octasic_build/wcte11xp.c (original)
+++ team/group/new_octasic_build/wcte11xp.c Wed Aug  9 08:46:34 2006
@@ -43,7 +43,8 @@
 #include <linux/moduleparam.h>
 #endif
 
-#include "wct4xxp.h"	/* For certain definitions */
+/* XXX: fix this */
+#include "wct4xxp/wct4xxp.h"	/* For certain definitions */
 
 #define WC_MAX_CARDS	32