[zaptel-commits] mattf: branch mattf/zaptel-1.4-vpmadt032fwupdate r3874 - in /team/mattf/zapte...

[SVN commits to the Zaptel project]

Author: mattf
Date: Fri Feb 22 15:36:37 2008
New Revision: 3874

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3874
Log:
Merged revisions 3861,3863,3869 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

........
r3861 | qwell | 2008-02-20 16:02:06 -0600 (Wed, 20 Feb 2008) | 4 lines

Make hpec buildable again.

Closes issue #11951, patch by me.

........
r3863 | kpfleming | 2008-02-21 11:51:17 -0600 (Thu, 21 Feb 2008) | 2 lines

the tor2 private structure has a field for the corresponding PCI device pointer, but it was never filled in... since it is now being used in the init_spans() function, this caused a NULL pointer dereference. solve that problem by actually filling in the pointer variable that already existed :-)

........
r3869 | qwell | 2008-02-21 17:59:39 -0600 (Thu, 21 Feb 2008) | 2 lines

Make firmware get properly installed again.

........

Modified:
    team/mattf/zaptel-1.4-vpmadt032fwupdate/   (props changed)
    team/mattf/zaptel-1.4-vpmadt032fwupdate/Makefile
    team/mattf/zaptel-1.4-vpmadt032fwupdate/firmware/Makefile
    team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/Kbuild
    team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/tor2.c

Propchange: team/mattf/zaptel-1.4-vpmadt032fwupdate/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb 22 15:36:37 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-3857
+/branches/1.4:1-3873

Modified: team/mattf/zaptel-1.4-vpmadt032fwupdate/Makefile
URL: http://svn.digium.com/view/zaptel/team/mattf/zaptel-1.4-vpmadt032fwupdate/Makefile?view=diff&rev=3874&r1=3873&r2=3874
==============================================================================
--- team/mattf/zaptel-1.4-vpmadt032fwupdate/Makefile (original)
+++ team/mattf/zaptel-1.4-vpmadt032fwupdate/Makefile Fri Feb 22 15:36:37 2008
@@ -414,7 +414,7 @@
 
 install-firmware:
 ifeq ($(HOTPLUG_FIRMWARE),yes)
-	$(MAKE) -C firmware hotplug-install DESTDIR=$(DESTDIR)
+	$(MAKE) -C firmware hotplug-install DESTDIR=$(DESTDIR) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
 endif
 
 install-libs: libs

Modified: team/mattf/zaptel-1.4-vpmadt032fwupdate/firmware/Makefile
URL: http://svn.digium.com/view/zaptel/team/mattf/zaptel-1.4-vpmadt032fwupdate/firmware/Makefile?view=diff&rev=3874&r1=3873&r2=3874
==============================================================================
--- team/mattf/zaptel-1.4-vpmadt032fwupdate/firmware/Makefile (original)
+++ team/mattf/zaptel-1.4-vpmadt032fwupdate/firmware/Makefile Fri Feb 22 15:36:37 2008
@@ -13,7 +13,7 @@
 
 .PHONY: dist-clean all uninstall have_download install
 
--include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/makeopts
+-include ../menuselect.makeopts ../makeopts
 
 PWD:=$(shell pwd)
 

Modified: team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/Kbuild
URL: http://svn.digium.com/view/zaptel/team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/Kbuild?view=diff&rev=3874&r1=3873&r2=3874
==============================================================================
--- team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/Kbuild (original)
+++ team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/Kbuild Fri Feb 22 15:36:37 2008
@@ -16,16 +16,23 @@
 
 zaptel-objs := zaptel-base.o
 
-ifeq ($(HPEC_PRESENT),yes)
 ifeq ($(ARCH),i386)
+ifneq ($(wildcard $(src)/hpec/hpec_x86_32.o_shipped),)
+HPEC_PRESENT=yes
 zaptel-objs += hpec/hpec_x86_32.o
+endif
 endif
 
 ifeq ($(ARCH),x86_64)
+ifneq ($(wildcard $(src)/hpec/hpec_x86_64.o_shipped),)
+HPEC_PRESENT=yes
 zaptel-objs += hpec/hpec_x86_64.o
 endif
+endif
 
+ifeq ($(HPEC_PRESENT),yes)
 EXTRA_CFLAGS += -DECHO_CAN_HPEC -I$(src)/hpec
+$(obj)/zaptel-base.o: hpec/hpec_zaptel.h hpec/hpec_user.h
 endif
 
 $(obj)/pciradio.o: $(obj)/radfw.h

Modified: team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/tor2.c
URL: http://svn.digium.com/view/zaptel/team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/tor2.c?view=diff&rev=3874&r1=3873&r2=3874
==============================================================================
--- team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/tor2.c (original)
+++ team/mattf/zaptel-1.4-vpmadt032fwupdate/kernel/tor2.c Fri Feb 22 15:36:37 2008
@@ -372,6 +372,7 @@
 		memset(tor->chans[x],0,sizeof(struct zt_chan) * 31);
 	}
 	/* Load the resources */
+	tor->pci = pdev;
 	tor->irq = pdev->irq;
 	if (tor->irq < 1) {
 		printk(KERN_ERR "No IRQ allocated for device\n");