Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91d29ee1 authored by Stephen Hemminger's avatar Stephen Hemminger
Browse files

beceem: remove ifdef's



There were a lot of ifdef's for driver options which have no
configuration options.  Choose the current value and remove the
ifdef.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
parent 2e44f765
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -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;
+0 −22
Original line number Diff line number Diff line
@@ -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)
+0 −2
Original line number Diff line number Diff line
#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
+0 −13
Original line number Diff line number Diff line
@@ -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



+0 −2
Original line number Diff line number Diff line
#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
Loading