update to PR47 Octasic API kit, and use new GetCapacityPins API call to only attempt downloading the correct firmware for the modules we find

git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@1877 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 10 insertions, 9 deletions

diff --git a/wct4xxp/vpm450m.h b/wct4xxp/vpm450m.h
index adf5b90..bce3a93 100644
--- a/wct4xxp/vpm450m.h
+++ b/wct4xxp/vpm450m.h
@@ -24,23 +24,24 @@
 #ifndef _VPM450M_H
 #define _VPM450M_H
 
-struct vpm450m;
-
-#ifdef HOTPLUG_FIRMWARE
-struct firmware;
+#ifdef LINUX26
+#include <linux/firmware.h>
+#else
+struct firmware {
+	size_t size;
+	u8 *data;
+};
 #endif
 
+struct vpm450m;
+
 /* From driver */
 unsigned int oct_get_reg(void *data, unsigned int reg);
 void oct_set_reg(void *data, unsigned int reg, unsigned int val);
 
 /* From vpm450m */
-#ifdef HOTPLUG_FIRMWARE
 struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct firmware *firmware);
-#else
-struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans);
-#endif
-
+unsigned int get_vpm450m_capacity(void *wc);
 void vpm450m_setec(struct vpm450m *instance, int channel, int eclen);
 void vpm450m_setdtmf(struct vpm450m *instance, int channel, int dtmfdetect, int dtmfmute);
 int vpm450m_checkirq(struct vpm450m *vpm450m);