- Updated wctdm24xxp and wcte12xp driver which are now more tolerant of

  systems which do not exhibit good real-time characteristics.
- Bringing in improvements to battery alarm generation that was on kpflemings
  battery_alarms branch. (Issue #12099)


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

1 files changed, 3 insertions, 16 deletions

diff --git a/kernel/wcte12xp/wcte12xp.h b/kernel/wcte12xp/wcte12xp.h
index 20e0558..aa6306b 100644
--- a/kernel/wcte12xp/wcte12xp.h
+++ b/kernel/wcte12xp/wcte12xp.h
@@ -54,9 +54,8 @@
 
 #define PCI_WINDOW_SIZE ((2 * 2 * 2 * SFRAME_SIZE) + (2 * ERING_SIZE * 4))
 
-#define MAX_COMMANDS 7*7*2 /* 42 bytes /3 (cntl,addr,data) /2 (cs) */
+#define MAX_COMMANDS 7*7*2*2 /* 42 bytes /3 (cntl,addr,data) /2 (cs) */
 
-#define ISR_COMMANDS  2
 #define NUM_EC 4
 
 #define __CMD_VPM  (1 << 16)		/* flag for VPM action */
@@ -106,13 +105,11 @@ struct command {
 
 struct cmdq {
 	struct command cmds[MAX_COMMANDS];
-	unsigned char isrshadow[ISR_COMMANDS];
 };
 
 struct vpm150m;
 
 struct t1 {
-	struct pci_dev *dev;
 	spinlock_t reglock;
 	unsigned char txident;
 	unsigned char rxident;
@@ -127,6 +124,7 @@ struct t1 {
 	int alarmcount;			/* How much red alarm we've seen */
 	int alarmdebounce;
 	char *variety;
+	char name[80];
 	unsigned int intcount;
 	int sync;
 	int dead;
@@ -141,29 +139,18 @@ struct t1 {
 	int initialized;
 	int *chanmap;
 	unsigned char ledtestreg;
-	unsigned long iobase;
 	unsigned char ec_chunk1[32][ZT_CHUNKSIZE];
 	unsigned char ec_chunk2[32][ZT_CHUNKSIZE];
 	struct zt_span span;						/* Span */
 	struct zt_chan chans[32];					/* Channels */
-	int freeregion;
-	unsigned int intmask;
 	wait_queue_head_t regq;
 	struct cmdq	cmdq;
 	struct command dummy;	/* preallocate for dummy noop command */
 	unsigned char ctlreg;
-	int rdbl;
-	int tdbl;
 	unsigned int rxints;
 	unsigned int txints;
-	unsigned int sdi;
 	int usecount;
-	dma_addr_t 	readdma;
-	dma_addr_t	writedma;
-	dma_addr_t  descripdma;
-	volatile unsigned int *writechunk;
-	volatile unsigned int *readchunk;
-	volatile unsigned int *descripchunk;
+	struct voicebus* vb;
 	unsigned int isrreaderrors;
 #ifdef VPM_SUPPORT
 	int vpm;