---

yaml --- r: 227891 b: refs/heads/master c: 91d29ee h: refs/heads/master i: 227889: d6b26a2 227887: a163edf v: v3
git-mirror · Oct 30, 2010 · 8400440 · 8400440
1 parent f7e4d59
commit 8400440
Show file tree

Hide file tree

Showing 19 changed files with 1 addition and 691 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e44f765dfd3a8592c2d6b6005be061eccdee137
+refs/heads/master: 91d29ee1a82fedcd7d1bbf24007b31a49c47e90a
diff --git a/trunk/drivers/staging/bcm/Bcmchar.c b/trunk/drivers/staging/bcm/Bcmchar.c
@@ -329,9 +329,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			}
 
 			if(
-#if !defined(BCM_SHM_INTERFACE)
 				(((ULONG)sRdmBuffer.Register & 0x0F000000) != 0x0F000000) ||
-#endif
 					((ULONG)sRdmBuffer.Register & 0x3)
 			  )
 			{
@@ -385,10 +383,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 				break;
 			}
 			if(
-#if !defined(BCM_SHM_INTERFACE)
 
 				(((ULONG)sWrmBuffer.Register & 0x0F000000) != 0x0F000000) ||
-#endif
 					((ULONG)sWrmBuffer.Register & 0x3)
 			 )
 			{
@@ -823,7 +819,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			bcm_kfree(pvBuffer);
 			break;
 		}
-#ifndef BCM_SHM_INTERFACE
 		case IOCTL_BCM_BUFFER_DOWNLOAD_START:
 		{
 			INT NVMAccess = down_trylock(&Adapter->NVMRdmWrmLock) ;
@@ -999,7 +994,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			up(&Adapter->NVMRdmWrmLock);
 			break;
 		}
-#endif
 		case IOCTL_BE_BUCKET_SIZE:
 			Adapter->BEBucketSize = *(PULONG)arg;
 			Status = STATUS_SUCCESS;

diff --git a/trunk/drivers/staging/bcm/Bcmnet.c b/trunk/drivers/staging/bcm/Bcmnet.c
@@ -50,9 +50,6 @@ static struct notifier_block bcm_notifier_block =
 struct net_device *gblpnetdev;
 /***************************************************************************************/
 /* proto-type of lower function */
-#ifdef BCM_SHM_INTERFACE
-const char *bcmVirtDeviceName="bcmeth";
-#endif
 
 static INT bcm_open(struct net_device *dev)
 {
@@ -155,7 +152,6 @@ int register_networkdev(PMINI_ADAPTER Adapter)
 	Adapter->dev->hard_header_len    	= ETH_HLEN + LEADER_SIZE;
 #endif
 
-#ifndef BCM_SHM_INTERFACE
 	Adapter->dev->mtu					= MTU_SIZE; /* 1400 Bytes */
 	/* Read the MAC Address from EEPROM */
 	ReadMacAddressFromNVM(Adapter);
@@ -176,24 +172,6 @@ int register_networkdev(PMINI_ADAPTER Adapter)
 		Adapter->bNetdeviceNotifierRegistered = TRUE;
 	}
 
-#else
-
-	Adapter->dev->mtu			= CPE_MTU_SIZE;
-
-#if 0
-	//for CPE - harcode the virtual mac address
-	Adapter->dev->dev_addr[0] =  MII_WIMAX_MACADDRESS[0];
-	Adapter->dev->dev_addr[1] =  MII_WIMAX_MACADDRESS[1];
-	Adapter->dev->dev_addr[2] =  MII_WIMAX_MACADDRESS[2];
-	Adapter->dev->dev_addr[3] =  MII_WIMAX_MACADDRESS[3];
-	Adapter->dev->dev_addr[4] =  MII_WIMAX_MACADDRESS[4];
-	Adapter->dev->dev_addr[5] =  MII_WIMAX_MACADDRESS[5];
-#else
-	ReadMacAddressFromNVM(Adapter);
-#endif
-	strcpy(Adapter->dev->name, bcmVirtDeviceName); //Copy the device name
-
-#endif
 
 	result = register_netdev(Adapter->dev);
 	if (!result)

diff --git a/trunk/drivers/staging/bcm/DDRInit.c b/trunk/drivers/staging/bcm/DDRInit.c
@@ -1,6 +1,5 @@
 #include "headers.h"
 
-#ifndef BCM_SHM_INTERFACE
 
 
 #define DDR_DUMP_INTERNAL_DEVICE_MEMORY 0xBFC02B00
@@ -1298,5 +1297,4 @@ int download_ddr_settings(PMINI_ADAPTER Adapter)
 	return retval;
 }
 
-#endif
 
diff --git a/trunk/drivers/staging/bcm/Debug.h b/trunk/drivers/staging/bcm/Debug.h
@@ -21,19 +21,6 @@ typedef enum _BASE_TYPE
 int bcm_print_buffer( UINT debug_level, const char *function_name,
 				  char *file_name, int line_number, unsigned char *buffer, int bufferlen, BASE_TYPE base);
 
-#ifdef BCM_SHM_INTERFACE
-#define CPE_VIRTUAL_ERROR_CODE_BASE_ADDR		(0xBFC02E00 + 0x4C)
-// ERROR codes for debugging
-extern unsigned char u32ErrorCounter ;
-#define ERROR_DEVICE_REMOVED  0x1
-#define ERROR_LEADER_LENGTH_ZERO  0x2
-#define ERROR_LEADER_LENGTH_CORRUPTED  0x3
-#define ERROR_NO_SKBUFF  0x4
-
-#define ERROR_DL_MODULE 0xaa000000
-extern void  CPE_ERROR_LOG(unsigned int module,unsigned int code);
-
-#endif
 
 
 

diff --git a/trunk/drivers/staging/bcm/InterfaceDld.c b/trunk/drivers/staging/bcm/InterfaceDld.c
@@ -1,6 +1,5 @@
 #include "headers.h"
 
-#ifndef BCM_SHM_INTERFACE
 
 int InterfaceFileDownload( PVOID arg,
                         struct file *flp,
@@ -506,5 +505,4 @@ INT buffDnldVerify(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer, unsigned
 	return status;
 }
 
-#endif
 
diff --git a/trunk/drivers/staging/bcm/InterfaceInit.h b/trunk/drivers/staging/bcm/InterfaceInit.h
@@ -19,16 +19,12 @@ INT InterfaceInitialize(void);
 
 INT InterfaceExit(void);
 
-#ifndef BCM_SHM_INTERFACE
 INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER Adapter);
 
 INT usbbcm_worker_thread(PS_INTERFACE_ADAPTER psIntfAdapter);
 
 VOID InterfaceAdapterFree(PS_INTERFACE_ADAPTER psIntfAdapter);
 
-#else
-INT InterfaceAdapterInit(PMINI_ADAPTER Adapter);
-#endif
 
 
 #if 0

diff --git a/trunk/drivers/staging/bcm/InterfaceIsr.c b/trunk/drivers/staging/bcm/InterfaceIsr.c
@@ -1,6 +1,5 @@
 #include "headers.h"
 
-#ifndef BCM_SHM_INTERFACE
 
 static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
 {
@@ -199,5 +198,4 @@ void InterfaceDisableInterrupt(PMINI_ADAPTER Adapter)
 
 }
 
-#endif
 
diff --git a/trunk/drivers/staging/bcm/InterfaceMisc.c b/trunk/drivers/staging/bcm/InterfaceMisc.c
@@ -1,6 +1,5 @@
 #include "headers.h"
 
-#ifndef BCM_SHM_INTERFACE
 
 PS_INTERFACE_ADAPTER
 InterfaceAdapterGet(PMINI_ADAPTER psAdapter)
@@ -287,4 +286,3 @@ VOID putUsbSuspend(struct work_struct *work)
 
 }
 
-#endif
diff --git a/trunk/drivers/staging/bcm/InterfaceTx.c b/trunk/drivers/staging/bcm/InterfaceTx.c
@@ -1,6 +1,5 @@
 #include "headers.h"
 
-#ifndef BCM_SHM_INTERFACE
 
 /*
 Function:				InterfaceTxDataPacket
@@ -255,5 +254,4 @@ int InterfaceTransmitPacket(PVOID arg, PVOID data, UINT len)
 	return TransmitTcb(psIntfAdapter, pTcb, data, len);
 }
 
-#endif
 
diff --git a/trunk/drivers/staging/bcm/Macros.h b/trunk/drivers/staging/bcm/Macros.h
@@ -300,12 +300,7 @@ typedef enum _E_PHS_DSC_ACTION
 
 /* Idle Mode Related Registers */
 #define DEBUG_INTERRUPT_GENERATOR_REGISTOR 0x0F00007C
-#ifdef BCM_SHM_INTERFACE
-#define SW_ABORT_IDLEMODE_LOC 		0xbfc02f9c
-#define CPE_VIRTUAL_MAILBOX_REG     0xBFC02E58
-#else
 #define SW_ABORT_IDLEMODE_LOC 		0x0FF01FFC
-#endif
 
 #define SW_ABORT_IDLEMODE_PATTERN 	0xd0ea1d1e
 #define DEVICE_INT_OUT_EP_REG0		0x0F011870