Only in net/: aft_a104.c
Only in net/: aft_a104.o
Only in net/: aft_analog.c
Only in net/: aft_analog.o
Only in /common/wanpipe: aft_hw
Only in net/: af_wanpipe.ko
Only in net/: af_wanpipe.mod.c
Only in net/: af_wanpipe.mod.o
Only in net/: af_wanpipe.o
Only in /common/wanpipe: bkup
Only in /common/wanpipe: CVS
Only in /common/wanpipe: header_change_script.sh
Only in net/: Makefile
Only in net/: Makefile~
Only in net/: Module.symvers
Only in /common/wanpipe: old
Binary files net/sdla_56k.o and /common/wanpipe/sdla_56k.o differ
Only in /common/wanpipe: .#sdla_8te1.c.1.24
Only in /common/wanpipe: .#sdla_8te1.c.1.26
Only in /common/wanpipe: .#sdla_8te1.c.1.30
Only in /common/wanpipe: .#sdla_8te1.c.1.41
Only in /common/wanpipe: .#sdla_8te1.c.1.57
Only in /common/wanpipe: .#sdla_8te1.c.1.62
Only in /common/wanpipe: .#sdla_8te1.c.1.73
Binary files net/sdla_8te1.o and /common/wanpipe/sdla_8te1.o differ
Only in net/: sdla_adccp.c
Only in /common/wanpipe: sdla_adsl.o
diff -dur --exclude='*.*cmd*' net/sdla_aft_te1.c /common/wanpipe/sdla_aft_te1.c
--- net/sdla_aft_te1.c	2007-06-07 12:42:59.000000000 -0400
+++ /common/wanpipe/sdla_aft_te1.c	2007-06-19 14:07:38.000000000 -0400
@@ -9724,9 +9724,7 @@
 	
 #ifdef AFT_TDM_API_SUPPORT 
 
-		if (card->wandev.fe_iface.watchdog){
-			err = card->wandev.fe_iface.watchdog(&card->fe);
-		}
+		
 		
 		wanpipe_tdm_api_rx_tx(&chan->wp_tdm_api_dev,
 			    rx_dma_chain->dma_virt+rx_offset,
@@ -9809,6 +9807,10 @@
 		if (!chan->tdmv_zaptel_cfg){
 
 #endif
+			if (card->wandev.fe_iface.watchdog) {
+				err = card->wandev.fe_iface.watchdog(&card->fe);
+			}
+
          		if (!wan_test_bit(AFT_TDM_GLOBAL_ISR,&card->u.aft.chip_cfg_status)) {
 				card->hw_iface.bus_read_4(card->hw,AFT_PORT_REG(card,AFT_DMA_CTRL_REG),&reg);
 				wan_set_bit(AFT_DMACTRL_TDMV_RX_TOGGLE,&reg);
Only in /common/wanpipe: sdla_aft_te1.c~
Only in /common/wanpipe: .#sdla_aft_te1.c.1.124
Only in /common/wanpipe: .#sdla_aft_te1.c.1.126
Only in /common/wanpipe: .#sdla_aft_te1.c.1.130
Only in /common/wanpipe: .#sdla_aft_te1.c.1.133
Only in /common/wanpipe: .#sdla_aft_te1.c.1.135
Only in /common/wanpipe: .#sdla_aft_te1.c.1.138
Only in /common/wanpipe: .#sdla_aft_te1.c.1.142
Only in /common/wanpipe: .#sdla_aft_te1.c.1.143
Only in /common/wanpipe: .#sdla_aft_te1.c.1.146
Only in /common/wanpipe: .#sdla_aft_te1.c.1.152
Only in /common/wanpipe: .#sdla_aft_te1.c.1.157
Only in /common/wanpipe: .#sdla_aft_te1.c.1.160
Only in /common/wanpipe: .#sdla_aft_te1.c.1.162
Only in /common/wanpipe: .#sdla_aft_te1.c.1.166
Only in /common/wanpipe: .#sdla_aft_te1.c.1.172
Only in /common/wanpipe: .#sdla_aft_te1.c.1.177
Only in /common/wanpipe: .#sdla_aft_te1.c.1.181
Only in /common/wanpipe: .#sdla_aft_te1.c.1.182
Only in /common/wanpipe: .#sdla_aft_te1.c.1.185
Only in /common/wanpipe: .#sdla_aft_te1.c.1.189
Only in /common/wanpipe: .#sdla_aft_te1.c.1.191
Only in /common/wanpipe: .#sdla_aft_te1.c.1.193
Only in /common/wanpipe: .#sdla_aft_te1.c.1.194
Only in /common/wanpipe: .#sdla_aft_te1.c.1.195
Only in /common/wanpipe: .#sdla_aft_te1.c.1.197
Only in /common/wanpipe: .#sdla_aft_te1.c.1.199
Only in /common/wanpipe: .#sdla_aft_te1.c.1.201
Only in /common/wanpipe: .#sdla_aft_te1.c.1.202
Only in /common/wanpipe: .#sdla_aft_te1.c.1.207
Only in /common/wanpipe: .#sdla_aft_te1.c.1.208
Only in /common/wanpipe: .#sdla_aft_te1.c.1.216
Only in /common/wanpipe: .#sdla_aft_te1.c.1.219
Only in /common/wanpipe: .#sdla_aft_te1.c.1.221
Only in /common/wanpipe: .#sdla_aft_te1.c.1.234
Only in /common/wanpipe: .#sdla_aft_te1.c.1.245
Only in /common/wanpipe: .#sdla_aft_te1.c.1.247
Only in /common/wanpipe: .#sdla_aft_te1.c.1.252
Only in /common/wanpipe: .#sdla_aft_te1.c.1.256
Only in /common/wanpipe: .#sdla_aft_te1.c.1.257
Only in /common/wanpipe: .#sdla_aft_te1.c.1.259
Only in /common/wanpipe: .#sdla_aft_te1.c.1.262
Only in /common/wanpipe: .#sdla_aft_te1.c.1.263
Only in /common/wanpipe: .#sdla_aft_te1.c.1.264
Only in /common/wanpipe: .#sdla_aft_te1.c.1.265
Only in /common/wanpipe: .#sdla_aft_te1.c.1.266
Only in /common/wanpipe: .#sdla_aft_te1.c.1.275
Only in /common/wanpipe: .#sdla_aft_te1.c.1.276
Only in /common/wanpipe: .#sdla_aft_te1.c.1.278
Only in /common/wanpipe: .#sdla_aft_te1.c.1.280
Only in /common/wanpipe: .#sdla_aft_te1.c.1.283
Only in /common/wanpipe: .#sdla_aft_te1.c.1.285
Only in /common/wanpipe: .#sdla_aft_te1.c.1.287
Only in /common/wanpipe: .#sdla_aft_te1.c.1.292
Only in /common/wanpipe: .#sdla_aft_te1.c.1.304
Only in /common/wanpipe: .#sdla_aft_te1.c.1.311
Only in /common/wanpipe: .#sdla_aft_te1.c.1.322
Only in /common/wanpipe: .#sdla_aft_te1.c.1.325
Only in /common/wanpipe: .#sdla_aft_te1.c.1.328
Only in /common/wanpipe: .#sdla_aft_te1.c.1.330
Binary files net/sdla_aft_te1.o and /common/wanpipe/sdla_aft_te1.o differ
Only in /common/wanpipe: sdla_aft_te1_ss7.c
Only in /common/wanpipe: .#sdla_aft_te3.c.1.49
Only in /common/wanpipe: .#sdla_aft_te3.c.1.52
Binary files net/sdla_aft_te3.o and /common/wanpipe/sdla_aft_te3.o differ
Only in net/: sdla_aft_te3.orig.c
Only in net/: sdla_asyhdlc.c
Only in /common/wanpipe: .#sdla_atm.c.1.57
Only in net/: sdla_bitstrm.c
Only in net/: sdla_bsc.c
Only in net/: sdla_bscstrm.c
Only in /common/wanpipe: sdla_cdev.c
Only in net/: sdla_chdlc.c
diff -dur --exclude='*.*cmd*' net/sdladrv.c /common/wanpipe/sdladrv.c
--- net/sdladrv.c	2007-05-29 14:21:18.000000000 -0400
+++ /common/wanpipe/sdladrv.c	2007-06-13 18:31:35.000000000 -0400
@@ -5612,25 +5612,38 @@
 					}
 				}else{
 
-					/* Allow old A101 & A102 config for A101d/2d */
+					/* Allow old A101 config for A101 SHARK */
 					if (conf->card_type == WANOPT_AFT &&
 					    hw->hwcard->slot_no == conf->PCI_slot_no && 
 				    	    hw->hwcard->bus_no == conf->pci_bus_no &&
-					    (hw->hwcard->cfg_type == WANOPT_AFT102 ||
-					     hw->hwcard->cfg_type == WANOPT_AFT101)) {
+					    hw->hwcard->cfg_type == WANOPT_AFT101) {
 						/* Remap the card type to standard
 						   A104 Shark style.  We are allowing
 						   and old config file for A101/2-SH */
+						conf->config_id = WANCONFIG_AFT_TE1;
 						conf->card_type = WANOPT_AFT104;
+						conf->fe_cfg.line_no=1;
+                                        	goto adapter_found;
+					  	      
+					}              
+
+					/* Allow old A102 config for A102 SHARK */
+					if (conf->card_type == WANOPT_AFT &&
+					    hw->hwcard->slot_no == conf->PCI_slot_no && 
+				    	    hw->hwcard->bus_no == conf->pci_bus_no &&
+					    hw->hwcard->cfg_type == WANOPT_AFT102) {
+						/* Remap the card type to standard
+						   A104 Shark style.  We are allowing
+						   and old config file for A101/2-SH */
 						conf->config_id = WANCONFIG_AFT_TE1;
+						conf->card_type = WANOPT_AFT104;
 						if (cpu_no == SDLA_CPU_A) {
 							conf->fe_cfg.line_no=1;
 						} else {
 							conf->fe_cfg.line_no=2;		
 						}
                                         	goto adapter_found;
-					  	      
-					}              
+					}            
 
 					if (conf->card_type == WANOPT_S51X &&
 					    IS_56K_MEDIA(&conf->fe_cfg) && 
Only in /common/wanpipe: .#sdladrv.c.1.113
Only in /common/wanpipe: .#sdladrv.c.1.115
Only in /common/wanpipe: .#sdladrv.c.1.117
Only in /common/wanpipe: .#sdladrv.c.1.119
Only in /common/wanpipe: .#sdladrv.c.1.120
Only in /common/wanpipe: .#sdladrv.c.1.143
Only in /common/wanpipe: .#sdladrv.c.1.145
Only in /common/wanpipe: .#sdladrv.c.1.147
Only in /common/wanpipe: .#sdladrv.c.1.153
Only in /common/wanpipe: .#sdladrv.c.1.157
Only in /common/wanpipe: .#sdladrv.c.1.159
Only in /common/wanpipe: .#sdladrv.c.1.163
Only in /common/wanpipe: .#sdladrv.c.1.164
Only in /common/wanpipe: .#sdladrv.c.1.168
Only in /common/wanpipe: .#sdladrv.c.1.169
Only in /common/wanpipe: .#sdladrv.c.1.176
Binary files net/sdladrv_fe.o and /common/wanpipe/sdladrv_fe.o differ
Only in net/: sdladrv.ko
Only in net/: sdladrv.mod.c
Only in net/: sdladrv.mod.o
Only in net/: sdladrv.o
diff -dur --exclude='*.*cmd*' net/sdladrv_src.c /common/wanpipe/sdladrv_src.c
--- net/sdladrv_src.c	2007-05-29 14:21:18.000000000 -0400
+++ /common/wanpipe/sdladrv_src.c	2007-04-18 14:27:27.000000000 -0400
@@ -239,10 +239,8 @@
 static int sdla_pci_read_config_word(void*, int, u16*);
 static int sdla_pci_read_config_dword(void*, int, u32*);
 
-static int sdla_pci_bridge_write_config_dword(void*, int, u_int32_t);
-static int sdla_pci_bridge_write_config_byte(void*, int, u_int8_t);
-static int sdla_pci_bridge_read_config_dword(void*, int, u_int32_t*);
-static int sdla_pci_bridge_read_config_byte(void*, int, u_int8_t*);
+static int sdla_pci_bridge_write_config_dword(void*, int, u32);
+static int sdla_pci_bridge_read_config_dword(void*, int, u32*);
 
 static int sdla_cmd (void* phw, unsigned long offset, wan_mbox_t* mbox);
 
@@ -372,9 +370,6 @@
 #endif
 static int sdla_pci_probe(sdlahw_t*);
 #endif
-
-static int sdla_is_pciexpress(void *phw);
-
 /****** Global Data **********************************************************
  * Note: All data must be explicitly initialized!!!
  */
@@ -724,7 +719,6 @@
 			break;
 		
 		case A300_ADPTR_U_1TE3:
-		case AFT_ADPTR_56K:
 			if (hw->hwcard->adptr_subtype == AFT_SUBTYPE_SHARK){
 				snprintf(tmp_hw_probe->hw_info, 
 					sizeof(tmp_hw_probe->hw_info),
@@ -748,7 +742,7 @@
 					port ? "SEC" : "PRI");						
 			}
 			break;
-			
+
 		default:
 			/*sprintf(tmp_hw_probe->hw_info,*/
 			snprintf(tmp_hw_probe->hw_info, 
@@ -1717,10 +1711,6 @@
 			if (pci_bridge_dev->vendor == PLX_VENDOR_ID && 
 			    pci_bridge_dev->device == PLX_DEVICE_ID){
 				hwcard->pci_bridge_dev = pci_bridge_dev;
-				hwcard->pci_bridge_bus = 
-						pci_bridge_dev->bus->number;
-				hwcard->pci_bridge_slot =
-						((pci_bridge_dev->devfn >> 3) & PCI_DEV_SLOT_MASK);
 				DEBUG_TEST("%s: PCI-Express card (bus:%d, slot:%d)\n",
 					wan_drvname,
 					pci_bridge_dev->bus->number, 
@@ -2668,9 +2658,7 @@
 		hw_iface->pci_write_config_dword = sdla_pci_write_config_dword;
 		
 		hw_iface->pci_bridge_read_config_dword	= sdla_pci_bridge_read_config_dword;
-		hw_iface->pci_bridge_read_config_byte	= sdla_pci_bridge_read_config_byte;
 		hw_iface->pci_bridge_write_config_dword = sdla_pci_bridge_write_config_dword;
-		hw_iface->pci_bridge_write_config_byte = sdla_pci_bridge_write_config_byte;
 
 		hw_iface->read_cpld		= sdla_hw_read_cpld;
 		hw_iface->write_cpld		= sdla_hw_write_cpld;
@@ -2717,7 +2705,6 @@
 		case A400_ADPTR_ANALOG:
 			hw_iface->fe_read = sdla_shark_rm_read_fe;
 			hw_iface->fe_write = sdla_shark_rm_write_fe;
-			break;
 		case AFT_ADPTR_ISDN:
 			DEBUG_EVENT("%s: Front-End interface functions are not defined!\n",
 						devname);
@@ -5612,15 +5599,14 @@
 					}
 				}else{
 
-					/* Allow old A101 & A102 config for A101d/2d */
-					if (conf->card_type == WANOPT_AFT &&
+					/* Allow old A102 config for A102 SHARK */    
+                                        if (conf->card_type == WANOPT_AFT &&
 					    hw->hwcard->slot_no == conf->PCI_slot_no && 
 				    	    hw->hwcard->bus_no == conf->pci_bus_no &&
-					    (hw->hwcard->cfg_type == WANOPT_AFT102 ||
-					     hw->hwcard->cfg_type == WANOPT_AFT101)) {
+					    hw->hwcard->cfg_type == WANOPT_AFT102) {
 						/* Remap the card type to standard
 						   A104 Shark style.  We are allowing
-						   and old config file for A101/2-SH */
+						   and old config file for A102-SH */
 						conf->card_type = WANOPT_AFT104;
 						conf->config_id = WANCONFIG_AFT_TE1;
 						if (cpu_no == SDLA_CPU_A) {
@@ -5630,23 +5616,8 @@
 						}
                                         	goto adapter_found;
 					  	      
-					}              
-
-					if (conf->card_type == WANOPT_S51X &&
-					    IS_56K_MEDIA(&conf->fe_cfg) && 
-					    hw->hwcard->slot_no == conf->PCI_slot_no && 
-				    	    hw->hwcard->bus_no == conf->pci_bus_no &&
-					    hw->hwcard->cfg_type == WANOPT_AFT_56K) {
-						/* Remap the old 56K card type to standard
-						   AFT 56K Shark style.  We are allowing
-						   and old config file for 56K */
-						conf->card_type = WANOPT_AFT_56K;
-						conf->config_id = WANCONFIG_AFT_56K;
-						conf->fe_cfg.line_no=1;
-                                        	goto adapter_found;
-					  	      
 					}
-
+					
 					if ((hw->hwcard->slot_no == conf->PCI_slot_no) && 
 				    	    (hw->hwcard->bus_no == conf->pci_bus_no) &&
 				    	    (hw->cpu_no == cpu_no) &&
@@ -6192,9 +6163,6 @@
 	case SDLA_HWEC_NO:
 		*(u16*)value = hwcard->hwec_chan_no;
 		break;
-	case SDLA_PCIEXPRESS:
-		*(u8*)value = sdla_is_pciexpress(hw);
-		break;
 	}
 	return 0;
 }
@@ -6578,7 +6546,7 @@
 	return 0;
 }
 
-static int sdla_pci_bridge_read_config_dword(void* phw, int reg, u_int32_t* value)
+static int sdla_pci_bridge_read_config_dword(void* phw, int reg, u32* value)
 {
 	sdlahw_t*	hw = (sdlahw_t*)phw;
 	sdlahw_card_t*	card;
@@ -6586,10 +6554,9 @@
 	WAN_ASSERT(hw == NULL);
 	SDLA_MAGIC(hw);
 	WAN_ASSERT(hw->hwcard == NULL);
-	
-	if (!sdla_is_pciexpress(hw)){
+	if (hw->hwcard->pci_bridge_dev == NULL){
 		*value = 0xFFFFFFFF;
-		return 0;	
+		return 0;
 	}
 	card = hw->hwcard;
 #if defined(__FreeBSD__)
@@ -6607,42 +6574,7 @@
 #endif
 	return 0;
 }
-
-static int sdla_pci_bridge_read_config_byte(void* phw, int reg, u_int8_t* value)
-{
-	sdlahw_t*	hw = (sdlahw_t*)phw;
-	sdlahw_card_t*	card;
-#if defined(__NetBSD__) || defined(__OpenBSD__)
-	u32		tmp = 0x00;
-#endif
-
-	WAN_ASSERT(hw == NULL);
-	SDLA_MAGIC(hw);
-	WAN_ASSERT(hw->hwcard == NULL);
-	
-	if (!sdla_is_pciexpress(hw)){
-		*value = 0xFF;
-		return 0;	
-	}
-	card = hw->hwcard;
-#if defined(__FreeBSD__)
-# if (__FreeBSD_version > 400000)
-	*value = pci_read_config(card->pci_bridge_dev, reg, 1);
-# else
-	*value = ci_cfgread(card->pci_bridge_dev, reg, 1);
-# endif
-#elif defined(__NetBSD__) || defined(__OpenBSD__)
-	tmp = pci_conf_read(card->pci_bridge_dev->pa_pc, card->pci_bridge_dev->pa_tag, reg);
-	*value = tmp & 0xFF;
-#elif defined(__LINUX__)
-	pci_read_config_byte(card->pci_bridge_dev, reg, value);
-#else
-# warning "sdla_pci_bridge_read_config_byte: Not supported yet!"
-#endif
-	return 0;
-}
-
-static int sdla_pci_bridge_write_config_dword(void* phw, int reg, u_int32_t value)
+static int sdla_pci_bridge_write_config_dword(void* phw, int reg, u32 value)
 {
 	sdlahw_t*	hw = (sdlahw_t*)phw;
 	sdlahw_card_t*	card;
@@ -6650,8 +6582,7 @@
 	WAN_ASSERT(hw == NULL);
 	SDLA_MAGIC(hw);
 	WAN_ASSERT(hw->hwcard == NULL);
-	
-	if (!sdla_is_pciexpress(hw)){
+	if (hw->hwcard->pci_bridge_dev == NULL){
 		return 0;	
 	}
 	card = hw->hwcard;
@@ -6671,34 +6602,6 @@
 	return 0;
 }
 
-static int sdla_pci_bridge_write_config_byte(void* phw, int reg, u_int8_t value)
-{
-	sdlahw_t*	hw = (sdlahw_t*)phw;
-	sdlahw_card_t*	card;
-
-	WAN_ASSERT(hw == NULL);
-	SDLA_MAGIC(hw);
-	WAN_ASSERT(hw->hwcard == NULL);
-	
-	if (!sdla_is_pciexpress(hw)){
-		return 0;	
-	}
-	card = hw->hwcard;
-#if defined(__FreeBSD__)
-# if (__FreeBSD_version > 400000)
-	pci_write_config(card->pci_bridge_dev, reg, value, 1);
-# else
-	pci_conf_write(card->pci_bridge_dev, reg, 1);
-# endif
-#elif defined(__NetBSD__) || defined(__OpenBSD__)
-	pci_conf_write(card->pci_bridge_dev->pa_pc, card->pci_bridge_dev->pa_tag, reg, value); 
-#elif defined(__LINUX__)
-	pci_write_config_byte(card->pci_bridge_dev, reg, value);
-#else
-# warning "sdla_pci_bridge_write_config_dword: Not supported yet!"
-#endif
-	return 0;
-}
 
 #if defined(WAN_ISA_SUPPORT)	
 static int sdla_isa_read_1(void* phw, unsigned int offset, u8* value) 
@@ -7070,7 +6973,6 @@
 # endif		
 	wan_set_bit(SDLA_DMA_FLAG_ALLOC, &dma_descr->flag);
 	wan_set_bit(SDLA_DMA_FLAG_READY, &dma_descr->flag);
-#elif defined(__OpenBSD__)
 #else
 # warning "BUSDMA Alloc is not defined!"
 #endif
@@ -7186,18 +7088,6 @@
 		dma_descr->dma_offset	= 0;
 	}
 	dma_descr->dma_map_len	= map_len;
-#elif defined(__OpenBSD__)
-	dma_descr->dma_addr = virt_to_phys(buf);
-	if (dma_descr->dma_addr & (dma_descr->alignment-1)){
-		dma_descr->dma_offset = 
-				dma_descr->alignment - (dma_descr->dma_addr & (dma_descr->alignment-1));
-		dma_descr->dma_virt = buf + dma_descr->dma_offset;
-		dma_descr->dma_addr = virt_to_phys(dma_descrt->dma_virt));
-	} else {
-		dma_descr->dma_virt	= buf; 
-		dma_descr->dma_offset	=0; 
-	}
-	dma_chain->dma_map_len	= map_len;
 #else
 # warning "BUSDMA map is not defined!"
 #endif
@@ -7221,8 +7111,7 @@
 	}
 #if defined(__FreeBSD__)
 	if (dma_descr->skb){
-		caddr_t	data = wan_skb_put(dma_descr->skb, dma_descr->dma_len);	/* Apr 19, 2007 new line */
-		bcopy(dma_descr->dma_virt, data, dma_descr->dma_len);
+		bcopy(dma_descr->dma_virt, wan_skb_data(dma_descr->skb), dma_descr->dma_len);
 	}
 #elif defined(__LINUX__)
 	if (dma_descr->dma_addr){
@@ -7232,10 +7121,6 @@
 	dma_descr->dma_addr	= 0;
 	dma_descr->dma_len	= 0;
 	dma_descr->dma_map_len	= 0;
-#elif defined(__OpenBSD__)
-	dma_descr->dma_addr	= 0;
-	dma_descr->dma_len	= 0;
-	dma_descr->dma_map_len	= 0;
 #else
 # warning "BUSDMA Unmap is not defined!"
 #endif
@@ -7263,7 +7148,6 @@
 		dma_descr++;
 	}
 #elif defined(__LINUX__)
-#elif defined(__OpenBSD__)
 #else
 # warning "BUSDMA Sync is not defined!"
 #endif
@@ -7362,6 +7246,7 @@
 	sdlahw_t*	hw = (sdlahw_t*)phw;
 	u16		org_off;
 
+#if 1
 	if (hw->hwcard->adptr_subtype == AFT_SUBTYPE_NORMAL){
 		switch(hw->hwcard->adptr_type){
 		case A101_ADPTR_1TE1:
@@ -7388,7 +7273,7 @@
 			sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, org_off);
 			break;
 		default:
-			DEBUG_EVENT("%s: ERROR: Invalid read access to cpld (Normal)!\n",
+			DEBUG_EVENT("%s: ERROR: Invalid read access to cpld!\n",
 						hw->devname);
 			return -EINVAL;
 		}
@@ -7410,7 +7295,7 @@
 				sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, org_off);
 				break;
 			default:
-				DEBUG_EVENT("%s: ERROR: Invalid read access to cpld (PMC)!\n",
+				DEBUG_EVENT("%s: ERROR: Invalid read access to cpld!\n",
 							hw->devname);
 				return -EINVAL;
 			}
@@ -7434,7 +7319,7 @@
 				sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, org_off);
 				break;
 			default:
-				DEBUG_EVENT("%s: ERROR: Invalid read access to cpld (DS)!\n",
+				DEBUG_EVENT("%s: ERROR: Invalid read access to cpld!\n",
 							hw->devname);
 				return -EINVAL;
 			}
@@ -7462,7 +7347,7 @@
    				sdla_bus_read_1(hw, AFT56K_MCPU_INTERFACE, data);
 				break;
 			default:
-				DEBUG_EVENT("%s: ERROR: Invalid read access to cpld (SHARK)!\n",
+				DEBUG_EVENT("%s: ERROR: Invalid read access to cpld!\n",
 						hw->devname);
 				return -EINVAL;		
 			}
@@ -7473,6 +7358,67 @@
 						hw->devname);
 		return -EINVAL;	
 	}
+#else
+	switch(hw->hwcard->adptr_type){
+	case A101_ADPTR_1TE1:
+	case A101_ADPTR_2TE1:
+   		off &= ~AFT_BIT_DEV_ADDR_CLEAR;
+	        off |= AFT_BIT_DEV_ADDR_CPLD;
+		/* Save current original address */
+		sdla_bus_read_2(hw, AFT_MCPU_INTERFACE_ADDR, &org_off);
+		sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, off);
+		sdla_bus_read_1(hw, AFT_MCPU_INTERFACE, data);
+		/* Restore the original address */
+		sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, org_off);
+		break;
+
+	case A104_ADPTR_4TE1:
+       		off &= ~AFT4_BIT_DEV_ADDR_CLEAR;
+		off |= AFT4_BIT_DEV_ADDR_CPLD;
+		/* Save current original address */
+		sdla_bus_read_2(hw, AFT_MCPU_INTERFACE_ADDR, &org_off);
+		WP_DELAY(5);
+		sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, off);
+		WP_DELAY(5);
+		sdla_bus_read_1(hw, AFT_MCPU_INTERFACE, data);
+		/* Restore the original address */
+		sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, org_off);
+		break;
+
+	case A108_ADPTR_8TE1:
+	    	off &= ~AFT8_BIT_DEV_ADDR_CLEAR;
+        	off |= AFT8_BIT_DEV_ADDR_CPLD;
+
+		/* Save current original address */
+		sdla_bus_read_2(hw, AFT_MCPU_INTERFACE_ADDR, &org_off);
+		WP_DELAY(5);
+		sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, off);
+		WP_DELAY(5);
+		sdla_bus_read_1(hw, AFT_MCPU_INTERFACE, data);
+		/* Restore the original address */
+		sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, org_off);
+		break;
+
+	case A200_ADPTR_ANALOG:
+	case A400_ADPTR_ANALOG:
+		off &= ~AFT4_BIT_DEV_ADDR_CLEAR;
+		off |= AFT4_BIT_DEV_ADDR_CPLD;
+		/* Save current original address */
+		sdla_bus_read_2(hw, AFT_MCPU_INTERFACE_ADDR, &org_off);
+		WP_DELAY(5);
+		sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, off);
+		WP_DELAY(5);
+		sdla_bus_read_1(hw, AFT_MCPU_INTERFACE, data);
+		/* Restore the original address */
+		sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, org_off);
+		break;
+
+	default:
+		DEBUG_EVENT("%s: ERROR: Invalid read access to cpld!\n",
+				hw->devname);
+		return -EINVAL;
+	}
+#endif	
 	return 0;
 }
 
@@ -7484,6 +7430,7 @@
 	DEBUG_56K("%s: hw->hwcard->adptr_type: 0x%X\n",
 				hw->devname, hw->hwcard->adptr_type);
 
+#if 1
 	if (hw->hwcard->adptr_subtype == AFT_SUBTYPE_NORMAL){
 		switch(hw->hwcard->adptr_type){
 		case A101_ADPTR_1TE1:
@@ -7510,7 +7457,7 @@
 			sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, org_off);
 			break;
 		default:
-			DEBUG_EVENT("%s: ERROR: Invalid write access to cpld (Normal)!\n",
+			DEBUG_EVENT("%s: ERROR: (1)Invalid write access to cpld!\n",
 						hw->devname);
 			return -EINVAL;
 		}
@@ -7532,7 +7479,7 @@
 				sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, org_off);
 				break;
 			default:
-				DEBUG_EVENT("%s: ERROR: Invalid write access to cpld (PMC)!\n",
+				DEBUG_EVENT("%s: ERROR: (2)Invalid write access to cpld!\n",
 							hw->devname);
 				return -EINVAL;
 			}
@@ -7555,7 +7502,7 @@
 				sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, org_off);
 				break;
 			default:
-				DEBUG_EVENT("%s: ERROR: Invalid write access to cpld (DS)!\n",
+				DEBUG_EVENT("%s: ERROR: (3)Invalid write access to cpld!\n",
 							hw->devname);
 				return -EINVAL;
 			}
@@ -7582,29 +7529,76 @@
    				sdla_bus_write_1(hw, AFT56K_MCPU_INTERFACE, data);
 				break;
 			default:
-				DEBUG_EVENT("%s: ERROR: Invalid write access to cpld (SHARK)!\n",
+				DEBUG_EVENT("%s: ERROR: (4)Invalid write access to cpld!\n",
 						hw->devname);
 				return -EINVAL;		
 			}
 			break;
 		}
 	}else{
-		DEBUG_EVENT("%s: ERROR: Invalid write access to cpld!\n",
+		DEBUG_EVENT("%s: ERROR: (5)Invalid write access to cpld!\n",
 						hw->devname);
 		return -EINVAL;	
 	}
-	return 0;
-}
+#else
+	switch(hw->hwcard->adptr_type){
+	case A101_ADPTR_1TE1:
+	case A101_ADPTR_2TE1:
+   		off &= ~AFT_BIT_DEV_ADDR_CLEAR;
+	        off |= AFT_BIT_DEV_ADDR_CPLD;
+		/* Save current original address */
+		sdla_bus_read_2(hw, AFT_MCPU_INTERFACE_ADDR, &org_off);
+		sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, off);
+		sdla_bus_write_1(hw, AFT_MCPU_INTERFACE, data);
+		/* Restore the original address */
+		sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, org_off);
+		break;
 
-static int sdla_is_pciexpress(void *phw)
-{
-	sdlahw_t*	hw = (sdlahw_t*)phw;
+	case A104_ADPTR_4TE1:
+       		off &= ~AFT4_BIT_DEV_ADDR_CLEAR;
+		off |= AFT4_BIT_DEV_ADDR_CPLD;
+		/* Save current original address */
+		sdla_bus_read_2(hw, AFT_MCPU_INTERFACE_ADDR, &org_off);
+		WP_DELAY(5);
+		sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, off);
+		WP_DELAY(5);
+		sdla_bus_write_1(hw, AFT_MCPU_INTERFACE, data);
+		/* Restore the original address */
+		sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, org_off);
+		break;
 
-	WAN_ASSERT(hw == NULL);
-	SDLA_MAGIC(hw);
-	WAN_ASSERT(hw->hwcard == NULL);
-	if (hw->hwcard->pci_bridge_dev == NULL) return 0;
-	return 1;
-}
+	case A108_ADPTR_8TE1:
+		off &= ~AFT8_BIT_DEV_ADDR_CLEAR;
+        	off |= AFT8_BIT_DEV_ADDR_CPLD;
+		/* Save current original address */
+		sdla_bus_read_2(hw, AFT_MCPU_INTERFACE_ADDR, &org_off);
+		WP_DELAY(5);
+		sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, off);
+		WP_DELAY(5);
+		sdla_bus_write_1(hw, AFT_MCPU_INTERFACE, data);
+		/* Restore the original address */
+		sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, org_off);
+		break;
 
+	case A200_ADPTR_ANALOG:
+	case A400_ADPTR_ANALOG:
+		off &= ~AFT4_BIT_DEV_ADDR_CLEAR;
+		off |= AFT4_BIT_DEV_ADDR_CPLD;
+		/* Save current original address */
+		sdla_bus_read_2(hw, AFT_MCPU_INTERFACE_ADDR, &org_off);
+		WP_DELAY(5);
+		sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, off);
+		WP_DELAY(5);
+		sdla_bus_write_1(hw, AFT_MCPU_INTERFACE, data);
+		/* Restore the original address */
+		sdla_bus_write_2(hw, AFT_MCPU_INTERFACE_ADDR, org_off);
+		break;
 
+	default:
+		DEBUG_EVENT("%s: ERROR: Invalid read access to cpld!\n",
+				hw->devname);
+		return -EINVAL;
+	}
+#endif	
+	return 0;
+}
Binary files net/sdladrv_src.o and /common/wanpipe/sdladrv_src.o differ
Only in /common/wanpipe: .#sdla_ec.c.1.31
Only in net/: sdla_edu.c
Only in net/: sdla_fr.c
Only in net/: sdla_ft1.c
Only in net/: sdla_ft1.o
Only in net/: sdlamain.c
Only in net/: sdlamain.o
Only in net/: sdla_mp_fr.c
Only in net/: sdla_ppp.c
Only in /common/wanpipe: sdla_remora.c~
Only in /common/wanpipe: .#sdla_remora.c.1.115
Only in /common/wanpipe: .#sdla_remora.c.1.17
Only in /common/wanpipe: .#sdla_remora.c.1.53
Only in /common/wanpipe: .#sdla_remora.c.1.56
Only in /common/wanpipe: sdla_remora.ncchange.c
Binary files net/sdla_remora.o and /common/wanpipe/sdla_remora.o differ
diff -dur --exclude='*.*cmd*' net/sdla_remora_tdmv.c /common/wanpipe/sdla_remora_tdmv.c
--- net/sdla_remora_tdmv.c	2007-06-04 15:15:35.000000000 -0400
+++ /common/wanpipe/sdla_remora_tdmv.c	2007-06-19 13:38:42.000000000 -0400
@@ -780,6 +780,7 @@
 		/* It's something else... */
 		wr->mod[mod_no].fxo.battdebounce = wr->battdebounce;
 	}
+
 	if (wr->mod[mod_no].fxo.battdebounce)
 		wr->mod[mod_no].fxo.battdebounce--;
 	if (wr->mod[mod_no].fxo.polaritydebounce) {
Only in /common/wanpipe: sdla_remora_tdmv.c~
Only in /common/wanpipe: .#sdla_remora_tdmv.c.1.35
Only in /common/wanpipe: .#sdla_remora_tdmv.c.1.40
Only in /common/wanpipe: .#sdla_remora_tdmv.c.1.44
Only in /common/wanpipe: .#sdla_remora_tdmv.c.1.53
Binary files net/sdla_remora_tdmv.o and /common/wanpipe/sdla_remora_tdmv.o differ
Only in net/: sdla_sdlc.c
Only in /common/wanpipe: .#sdla_tdmv.c.1.117
Only in /common/wanpipe: .#sdla_tdmv.c.1.52
Only in /common/wanpipe: .#sdla_tdmv.c.1.57
Only in /common/wanpipe: .#sdla_tdmv.c.1.63
Only in /common/wanpipe: .#sdla_tdmv.c.1.84
Only in /common/wanpipe: .#sdla_tdmv.c.1.90
Only in /common/wanpipe: .#sdla_tdmv.c.1.95
Only in /common/wanpipe: .#sdla_tdmv.c.1.96
Only in /common/wanpipe: .#sdla_tdmv.c.1.98
Binary files net/sdla_tdmv.o and /common/wanpipe/sdla_tdmv.o differ
Only in /common/wanpipe: .#sdla_te1.c.1.187
Only in /common/wanpipe: .#sdla_te1.c.1.216
Only in /common/wanpipe: .#sdla_te1.c.1.217
Only in /common/wanpipe: .#sdla_te1.c.1.218
Only in /common/wanpipe: .#sdla_te1.c.1.219
Only in /common/wanpipe: .#sdla_te1.c.1.232
Only in /common/wanpipe: .#sdla_te1.c.1.233
Only in /common/wanpipe: .#sdla_te1.c.1.254
Only in /common/wanpipe: .#sdla_te1.c.1.260
Binary files net/sdla_te1.o and /common/wanpipe/sdla_te1.o differ
Binary files net/sdla_te3.o and /common/wanpipe/sdla_te3.o differ
Only in /common/wanpipe: sdla_template.c
Only in net/: sdla_x25.c
Only in /common/wanpipe: .#sdla_xilinx.c.1.206
Only in /common/wanpipe: .#sdla_xilinx.c.1.212
Only in /common/wanpipe: .#sdla_xilinx.c.1.213
Only in /common/wanpipe: .#sdla_xilinx.c.1.220
Only in /common/wanpipe: .#sdla_xilinx.c.1.225
Only in /common/wanpipe: .#sdla_xilinx.c.1.235
Only in /common/wanpipe: .#sdla_xilinx.c.1.246
Only in /common/wanpipe: .#sdla_xilinx.c.1.254
Only in /common/wanpipe: .#sdla_xilinx.c.1.257
Only in /common/wanpipe: .#sdla_xilinx.c.1.275
Binary files net/sdla_xilinx.o and /common/wanpipe/sdla_xilinx.o differ
Only in /common/wanpipe: sdla_xilinx.orig.c
Only in /common/wanpipe: search_replace.sh
Only in /common/wanpipe: sources
Only in /common/wanpipe: tags
Only in /common/wanpipe: tdm_api_ec
Only in /common/wanpipe: te1.diff
Only in net/: .tmp_versions
Only in net/: wan_aften.ko
Only in net/: wan_aften.mod.c
Only in net/: wan_aften.mod.o
Only in net/: wan_aften.o
Only in net/: wanec.ko
Only in net/: wanec.mod.c
Only in net/: wanec.mod.o
Only in net/: wanec.o
Only in /common/wanpipe: .#wanpipe_abstr.c.1.60
Binary files net/wanpipe_abstr.o and /common/wanpipe/wanpipe_abstr.o differ
Only in /common/wanpipe: .#wanpipe_codec_law.c.1.9
Binary files net/wanpipe_codec_law.o and /common/wanpipe/wanpipe_codec_law.o differ
Binary files net/wanpipe_codec.o and /common/wanpipe/wanpipe_codec.o differ
Only in net/: wanpipe.ko
Only in net/: wanpipe_linux_iface.c
Only in net/: wanpipe_linux_iface.o
Only in net/: wanpipe.mod.c
Only in net/: wanpipe.mod.o
Only in net/: wanpipe_multppp.c
Only in net/: wanpipe.o
Only in net/: wanpipe_syncppp.c
Only in net/: wanpipe_syncppp.ko
Only in net/: wanpipe_syncppp.mod.c
Only in net/: wanpipe_syncppp.mod.o
Only in net/: wanpipe_syncppp.o
Only in /common/wanpipe: .#wanpipe_tdm_api.c.1.10
Only in /common/wanpipe: .#wanpipe_tdm_api.c.1.25
Only in /common/wanpipe: .#wanpipe_tdm_api.c.1.28
Only in /common/wanpipe: .#wanpipe_tdm_api.c.1.37
Only in /common/wanpipe: .#wanpipe_tdm_api.c.1.42
Only in /common/wanpipe: .#wanpipe_tdm_api.c.1.45
Only in /common/wanpipe: .#wanpipe_tdm_api.c.1.50
Only in /common/wanpipe: .#wanpipe_tdm_api.c.1.51
Binary files net/wanpipe_tdm_api.o and /common/wanpipe/wanpipe_tdm_api.o differ
Only in /common/wanpipe: .#wanpipe_utils.c.1.96
Binary files net/wanpipe_utils.o and /common/wanpipe/wanpipe_utils.o differ
Only in /common/wanpipe: wanproc.c
Only in /common/wanpipe: wanproc.c.old_bsd
Only in net/: wanrouter.ko
Only in net/: wanrouter.mod.c
Only in net/: wanrouter.mod.o
Only in net/: wanrouter.o
