Skip to content

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

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
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 690 deletions
drivers/staging/bcm/Bcmchar.c
View file @ 91d29ee1
...@@ -329,9 +329,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) ...@@ -329,9 +329,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
} }
if( if(
#if !defined(BCM_SHM_INTERFACE)
(((ULONG)sRdmBuffer.Register & 0x0F000000) != 0x0F000000) || (((ULONG)sRdmBuffer.Register & 0x0F000000) != 0x0F000000) ||
#endif
((ULONG)sRdmBuffer.Register & 0x3) ((ULONG)sRdmBuffer.Register & 0x3)
) )
{ {
...@@ -385,10 +383,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) ...@@ -385,10 +383,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
break; break;
} }
if( if(
#if !defined(BCM_SHM_INTERFACE)
(((ULONG)sWrmBuffer.Register & 0x0F000000) != 0x0F000000) || (((ULONG)sWrmBuffer.Register & 0x0F000000) != 0x0F000000) ||
#endif
((ULONG)sWrmBuffer.Register & 0x3) ((ULONG)sWrmBuffer.Register & 0x3)
) )
{ {
...@@ -823,7 +819,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) ...@@ -823,7 +819,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
bcm_kfree(pvBuffer); bcm_kfree(pvBuffer);
break; break;
} }
#ifndef BCM_SHM_INTERFACE
case IOCTL_BCM_BUFFER_DOWNLOAD_START: case IOCTL_BCM_BUFFER_DOWNLOAD_START:
{ {
INT NVMAccess = down_trylock(&Adapter->NVMRdmWrmLock) ; INT NVMAccess = down_trylock(&Adapter->NVMRdmWrmLock) ;
...@@ -999,7 +994,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) ...@@ -999,7 +994,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
up(&Adapter->NVMRdmWrmLock); up(&Adapter->NVMRdmWrmLock);
break; break;
} }
#endif
case IOCTL_BE_BUCKET_SIZE: case IOCTL_BE_BUCKET_SIZE:
Adapter->BEBucketSize = *(PULONG)arg; Adapter->BEBucketSize = *(PULONG)arg;
Status = STATUS_SUCCESS; Status = STATUS_SUCCESS;
......
drivers/staging/bcm/Bcmnet.c
View file @ 91d29ee1
...@@ -50,9 +50,6 @@ static struct notifier_block bcm_notifier_block = ...@@ -50,9 +50,6 @@ static struct notifier_block bcm_notifier_block =
struct net_device *gblpnetdev; struct net_device *gblpnetdev;
/***************************************************************************************/ /***************************************************************************************/
/* proto-type of lower function */ /* proto-type of lower function */
#ifdef BCM_SHM_INTERFACE
const char *bcmVirtDeviceName="bcmeth";
#endif
static INT bcm_open(struct net_device *dev) static INT bcm_open(struct net_device *dev)
{ {
...@@ -155,7 +152,6 @@ int register_networkdev(PMINI_ADAPTER Adapter) ...@@ -155,7 +152,6 @@ int register_networkdev(PMINI_ADAPTER Adapter)
Adapter->dev->hard_header_len = ETH_HLEN + LEADER_SIZE; Adapter->dev->hard_header_len = ETH_HLEN + LEADER_SIZE;
#endif #endif
#ifndef BCM_SHM_INTERFACE
Adapter->dev->mtu = MTU_SIZE; /* 1400 Bytes */ Adapter->dev->mtu = MTU_SIZE; /* 1400 Bytes */
/* Read the MAC Address from EEPROM */ /* Read the MAC Address from EEPROM */
ReadMacAddressFromNVM(Adapter); ReadMacAddressFromNVM(Adapter);
...@@ -176,24 +172,6 @@ int register_networkdev(PMINI_ADAPTER Adapter) ...@@ -176,24 +172,6 @@ int register_networkdev(PMINI_ADAPTER Adapter)
Adapter->bNetdeviceNotifierRegistered = TRUE; 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); result = register_netdev(Adapter->dev);
if (!result) if (!result)
......
drivers/staging/bcm/DDRInit.c
View file @ 91d29ee1
#include "headers.h" #include "headers.h"
#ifndef BCM_SHM_INTERFACE
#define DDR_DUMP_INTERNAL_DEVICE_MEMORY 0xBFC02B00 #define DDR_DUMP_INTERNAL_DEVICE_MEMORY 0xBFC02B00
...@@ -1298,5 +1297,4 @@ int download_ddr_settings(PMINI_ADAPTER Adapter) ...@@ -1298,5 +1297,4 @@ int download_ddr_settings(PMINI_ADAPTER Adapter)
return retval; return retval;
} }
#endif
drivers/staging/bcm/Debug.h
View file @ 91d29ee1
...@@ -21,19 +21,6 @@ typedef enum _BASE_TYPE ...@@ -21,19 +21,6 @@ typedef enum _BASE_TYPE
int bcm_print_buffer( UINT debug_level, const char *function_name, 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); 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
......
drivers/staging/bcm/InterfaceDld.c
View file @ 91d29ee1
#include "headers.h" #include "headers.h"
#ifndef BCM_SHM_INTERFACE
int InterfaceFileDownload( PVOID arg, int InterfaceFileDownload( PVOID arg,
struct file *flp, struct file *flp,
...@@ -506,5 +505,4 @@ INT buffDnldVerify(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer, unsigned ...@@ -506,5 +505,4 @@ INT buffDnldVerify(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer, unsigned
return status; return status;
} }
#endif
drivers/staging/bcm/InterfaceInit.h
View file @ 91d29ee1
...@@ -19,16 +19,12 @@ INT InterfaceInitialize(void); ...@@ -19,16 +19,12 @@ INT InterfaceInitialize(void);
INT InterfaceExit(void); INT InterfaceExit(void);
#ifndef BCM_SHM_INTERFACE
INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER Adapter); INT InterfaceAdapterInit(PS_INTERFACE_ADAPTER Adapter);
INT usbbcm_worker_thread(PS_INTERFACE_ADAPTER psIntfAdapter); INT usbbcm_worker_thread(PS_INTERFACE_ADAPTER psIntfAdapter);
VOID InterfaceAdapterFree(PS_INTERFACE_ADAPTER psIntfAdapter); VOID InterfaceAdapterFree(PS_INTERFACE_ADAPTER psIntfAdapter);
#else
INT InterfaceAdapterInit(PMINI_ADAPTER Adapter);
#endif
#if 0 #if 0
......
drivers/staging/bcm/InterfaceIsr.c
View file @ 91d29ee1
#include "headers.h" #include "headers.h"
#ifndef BCM_SHM_INTERFACE
static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/) static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
{ {
...@@ -199,5 +198,4 @@ void InterfaceDisableInterrupt(PMINI_ADAPTER Adapter) ...@@ -199,5 +198,4 @@ void InterfaceDisableInterrupt(PMINI_ADAPTER Adapter)
} }
#endif
drivers/staging/bcm/InterfaceMisc.c
View file @ 91d29ee1
#include "headers.h" #include "headers.h"
#ifndef BCM_SHM_INTERFACE
PS_INTERFACE_ADAPTER PS_INTERFACE_ADAPTER
InterfaceAdapterGet(PMINI_ADAPTER psAdapter) InterfaceAdapterGet(PMINI_ADAPTER psAdapter)
...@@ -287,4 +286,3 @@ VOID putUsbSuspend(struct work_struct *work) ...@@ -287,4 +286,3 @@ VOID putUsbSuspend(struct work_struct *work)
} }
#endif
drivers/staging/bcm/InterfaceTx.c
View file @ 91d29ee1
#include "headers.h" #include "headers.h"
#ifndef BCM_SHM_INTERFACE
/* /*
Function: InterfaceTxDataPacket Function: InterfaceTxDataPacket
...@@ -255,5 +254,4 @@ int InterfaceTransmitPacket(PVOID arg, PVOID data, UINT len) ...@@ -255,5 +254,4 @@ int InterfaceTransmitPacket(PVOID arg, PVOID data, UINT len)
return TransmitTcb(psIntfAdapter, pTcb, data, len); return TransmitTcb(psIntfAdapter, pTcb, data, len);
} }
#endif
drivers/staging/bcm/Macros.h
View file @ 91d29ee1
...@@ -300,12 +300,7 @@ typedef enum _E_PHS_DSC_ACTION ...@@ -300,12 +300,7 @@ typedef enum _E_PHS_DSC_ACTION
/* Idle Mode Related Registers */ /* Idle Mode Related Registers */
#define DEBUG_INTERRUPT_GENERATOR_REGISTOR 0x0F00007C #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 #define SW_ABORT_IDLEMODE_LOC 0x0FF01FFC
#endif
#define SW_ABORT_IDLEMODE_PATTERN 0xd0ea1d1e #define SW_ABORT_IDLEMODE_PATTERN 0xd0ea1d1e
#define DEVICE_INT_OUT_EP_REG0 0x0F011870 #define DEVICE_INT_OUT_EP_REG0 0x0F011870
......
drivers/staging/bcm/Misc.c
View file @ 91d29ee1
This diff is collapsed.
drivers/staging/bcm/Prototypes.h
View file @ 91d29ee1
...@@ -309,11 +309,6 @@ INT buffDnldVerify(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer, unsigned ...@@ -309,11 +309,6 @@ INT buffDnldVerify(PMINI_ADAPTER Adapter, unsigned char *mappedbuffer, unsigned
VOID putUsbSuspend(struct work_struct *work); VOID putUsbSuspend(struct work_struct *work);
BOOLEAN IsReqGpioIsLedInNVM(PMINI_ADAPTER Adapter, UINT gpios); BOOLEAN IsReqGpioIsLedInNVM(PMINI_ADAPTER Adapter, UINT gpios);
#ifdef BCM_SHM_INTERFACE
INT beceem_virtual_device_init(void);
VOID virtual_mail_box_interrupt(void);
INT beceem_virtual_device_exit(void);
#endif
#endif #endif
......
drivers/staging/bcm/Transmit.c
View file @ 91d29ee1
...@@ -146,18 +146,6 @@ INT bcm_transmit(struct sk_buff *skb, /**< skb */ ...@@ -146,18 +146,6 @@ INT bcm_transmit(struct sk_buff *skb, /**< skb */
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_OSAL_DBG, DBG_LVL_ALL, "Pkt Len = %d, sec: %ld, usec: %ld\n", BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_OSAL_DBG, DBG_LVL_ALL, "Pkt Len = %d, sec: %ld, usec: %ld\n",
(skb->len-ETH_HLEN), tv.tv_sec, tv.tv_usec); (skb->len-ETH_HLEN), tv.tv_sec, tv.tv_usec);
#ifdef BCM_SHM_INTERFACE
spin_lock(&Adapter->txtransmitlock);
if(Adapter->txtransmit_running == 0)
{
Adapter->txtransmit_running = 1;
calltransmit = 1;
}
else
calltransmit = 0;
spin_unlock(&Adapter->txtransmitlock);
#endif
if(calltransmit == 1) if(calltransmit == 1)
transmit_packets(Adapter); transmit_packets(Adapter);
else else
...@@ -165,9 +153,6 @@ INT bcm_transmit(struct sk_buff *skb, /**< skb */ ...@@ -165,9 +153,6 @@ INT bcm_transmit(struct sk_buff *skb, /**< skb */
if(!atomic_read(&Adapter->TxPktAvail)) if(!atomic_read(&Adapter->TxPktAvail))
{ {
atomic_set(&Adapter->TxPktAvail, 1); atomic_set(&Adapter->TxPktAvail, 1);
#ifdef BCM_SHM_INTERFACE
virtual_mail_box_interrupt();
#endif
wake_up(&Adapter->tx_packet_wait_queue); wake_up(&Adapter->tx_packet_wait_queue);
} }
} }
...@@ -224,44 +209,8 @@ INT SendControlPacket(PMINI_ADAPTER Adapter, /**<Logical Adapter*/ ...@@ -224,44 +209,8 @@ INT SendControlPacket(PMINI_ADAPTER Adapter, /**<Logical Adapter*/
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Leader Length: %x",PLeader->PLength); BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Leader Length: %x",PLeader->PLength);
if(Adapter->device_removed) if(Adapter->device_removed)
return 0; return 0;
#ifndef BCM_SHM_INTERFACE
Adapter->interface_transmit(Adapter->pvInterfaceAdapter, Adapter->interface_transmit(Adapter->pvInterfaceAdapter,
pControlPacket, (PLeader->PLength + LEADER_SIZE)); pControlPacket, (PLeader->PLength + LEADER_SIZE));
#else
tx_pkts_to_firmware(pControlPacket,(PLeader->PLength + LEADER_SIZE),1);
if(PLeader->Status==IDLE_MESSAGE)
{
if(((CONTROL_MESSAGE*)PLeader)->szData[0] == GO_TO_IDLE_MODE_PAYLOAD &&
((CONTROL_MESSAGE*)PLeader)->szData[1] == TARGET_CAN_GO_TO_IDLE_MODE)
{
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Idle Mode Ack Sent to the Device\n");
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Host Entering into Idle Mode\n");
do_gettimeofday(&tv);
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "IdleMode Msg sent to f/w at time :%ld ms", tv.tv_sec *1000 + tv.tv_usec /1000);
if(Adapter->bDoSuspend != TRUE)
{
Adapter->IdleMode = TRUE;
Adapter->bPreparingForLowPowerMode = FALSE ;
}
}
}
if((PLeader->Status == LINK_UP_CONTROL_REQ) &&
((PUCHAR)pControlPacket)[sizeof(LEADER)] == LINK_UP_ACK &&
((PUCHAR)pControlPacket)[sizeof(LEADER)+1] ==
LINK_SHUTDOWN_REQ_FROM_FIRMWARE &&
((PUCHAR)pControlPacket)[sizeof(LEADER)+2] == SHUTDOWN_ACK_FROM_DRIVER)
{
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_CONTROL, DBG_LVL_ALL, "Shut Down ACK Sent and Host entering Shut State \n");
if(Adapter->bDoSuspend != TRUE)
{
Adapter->bShutStatus = TRUE;
Adapter->bPreparingForLowPowerMode = FALSE;
Adapter->bTriedToWakeUpFromlowPowerMode = FALSE;
}
}
#endif
((PLINUX_DEP_DATA)Adapter->pvOsDepData)->netstats.tx_packets++; ((PLINUX_DEP_DATA)Adapter->pvOsDepData)->netstats.tx_packets++;
((PLINUX_DEP_DATA)Adapter->pvOsDepData)->netstats.tx_bytes+= ((PLINUX_DEP_DATA)Adapter->pvOsDepData)->netstats.tx_bytes+=
...@@ -282,9 +231,6 @@ INT SetupNextSend(PMINI_ADAPTER Adapter, /**<Logical Adapter*/ ...@@ -282,9 +231,6 @@ INT SetupNextSend(PMINI_ADAPTER Adapter, /**<Logical Adapter*/
USHORT Vcid) /**<VCID for this packet*/ USHORT Vcid) /**<VCID for this packet*/
{ {
int status=0; int status=0;
#ifdef GDMA_INTERFACE
int dontfree = 0;
#endif
BOOLEAN bHeaderSupressionEnabled = FALSE; BOOLEAN bHeaderSupressionEnabled = FALSE;
B_UINT16 uiClassifierRuleID; B_UINT16 uiClassifierRuleID;
int QueueIndex = NO_OF_QUEUES + 1; int QueueIndex = NO_OF_QUEUES + 1;
...@@ -361,12 +307,8 @@ INT SetupNextSend(PMINI_ADAPTER Adapter, /**<Logical Adapter*/ ...@@ -361,12 +307,8 @@ INT SetupNextSend(PMINI_ADAPTER Adapter, /**<Logical Adapter*/
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Packet->len = %d", Packet->len); BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Packet->len = %d", Packet->len);
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Vcid = %d", Vcid); BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Vcid = %d", Vcid);
#ifndef BCM_SHM_INTERFACE
status = Adapter->interface_transmit(Adapter->pvInterfaceAdapter, status = Adapter->interface_transmit(Adapter->pvInterfaceAdapter,
Packet->data, (Leader.PLength + LEADER_SIZE)); Packet->data, (Leader.PLength + LEADER_SIZE));
#else
status = tx_pkts_to_firmware(Packet,Packet->len,0);
#endif
if(status) if(status)
{ {
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Tx Failed..\n"); BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Tx Failed..\n");
...@@ -376,9 +318,6 @@ INT SetupNextSend(PMINI_ADAPTER Adapter, /**<Logical Adapter*/ ...@@ -376,9 +318,6 @@ INT SetupNextSend(PMINI_ADAPTER Adapter, /**<Logical Adapter*/
Adapter->PackInfo[QueueIndex].uiTotalTxBytes += Leader.PLength; Adapter->PackInfo[QueueIndex].uiTotalTxBytes += Leader.PLength;
atomic_add(Leader.PLength, &Adapter->GoodTxByteCount); atomic_add(Leader.PLength, &Adapter->GoodTxByteCount);
atomic_inc(&Adapter->TxTotalPacketCount); atomic_inc(&Adapter->TxTotalPacketCount);
#ifdef GDMA_INTERFACE
dontfree = 1;
#endif
} }
atomic_dec(&Adapter->CurrNumFreeTxDesc); atomic_dec(&Adapter->CurrNumFreeTxDesc);
...@@ -393,23 +332,11 @@ INT SetupNextSend(PMINI_ADAPTER Adapter, /**<Logical Adapter*/ ...@@ -393,23 +332,11 @@ INT SetupNextSend(PMINI_ADAPTER Adapter, /**<Logical Adapter*/
Adapter->PackInfo[QueueIndex].NumOfPacketsSent++; Adapter->PackInfo[QueueIndex].NumOfPacketsSent++;
atomic_dec(&Adapter->PackInfo[QueueIndex].uiPerSFTxResourceCount); atomic_dec(&Adapter->PackInfo[QueueIndex].uiPerSFTxResourceCount);
#ifdef BCM_SHM_INTERFACE
if(atomic_read(&Adapter->PackInfo[QueueIndex].uiPerSFTxResourceCount) < 0)
{
atomic_set(&Adapter->PackInfo[QueueIndex].uiPerSFTxResourceCount, 0);
}
#endif
Adapter->PackInfo[QueueIndex].uiThisPeriodSentBytes += Leader.PLength; Adapter->PackInfo[QueueIndex].uiThisPeriodSentBytes += Leader.PLength;
} }
#ifdef GDMA_INTERFACE
if(!dontfree){
bcm_kfree_skb(Packet); bcm_kfree_skb(Packet);
}
#else
bcm_kfree_skb(Packet);
#endif
return status; return status;
} }
...@@ -420,9 +347,7 @@ Transmit thread ...@@ -420,9 +347,7 @@ Transmit thread
int tx_pkt_handler(PMINI_ADAPTER Adapter /**< pointer to adapter object*/ int tx_pkt_handler(PMINI_ADAPTER Adapter /**< pointer to adapter object*/
) )
{ {
#ifndef BCM_SHM_INTERFACE
int status = 0; int status = 0;
#endif
UINT calltransmit = 1; UINT calltransmit = 1;
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "Entring to wait for signal from the interrupt service thread!Adapter = %p",Adapter); BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_PACKETS, DBG_LVL_ALL, "Entring to wait for signal from the interrupt service thread!Adapter = %p",Adapter);
...@@ -437,9 +362,7 @@ int tx_pkt_handler(PMINI_ADAPTER Adapter /**< pointer to adapter object*/ ...@@ -437,9 +362,7 @@ int tx_pkt_handler(PMINI_ADAPTER Adapter /**< pointer to adapter object*/
atomic_read(&Adapter->CurrNumFreeTxDesc)) && atomic_read(&Adapter->CurrNumFreeTxDesc)) &&
(Adapter->device_removed == FALSE))) || (Adapter->device_removed == FALSE))) ||
(1 == Adapter->downloadDDR) || kthread_should_stop() (1 == Adapter->downloadDDR) || kthread_should_stop()
#ifndef BCM_SHM_INTERFACE
|| (TRUE == Adapter->bEndPointHalted) || (TRUE == Adapter->bEndPointHalted)
#endif
, msecs_to_jiffies(10)); , msecs_to_jiffies(10));
} }
else{ else{
...@@ -449,9 +372,7 @@ int tx_pkt_handler(PMINI_ADAPTER Adapter /**< pointer to adapter object*/ ...@@ -449,9 +372,7 @@ int tx_pkt_handler(PMINI_ADAPTER Adapter /**< pointer to adapter object*/
atomic_read(&Adapter->CurrNumFreeTxDesc)) && atomic_read(&Adapter->CurrNumFreeTxDesc)) &&
(Adapter->device_removed == FALSE))) || (Adapter->device_removed == FALSE))) ||
(1 == Adapter->downloadDDR) || kthread_should_stop() (1 == Adapter->downloadDDR) || kthread_should_stop()
#ifndef BCM_SHM_INTERFACE
|| (TRUE == Adapter->bEndPointHalted) || (TRUE == Adapter->bEndPointHalted)
#endif
); );
} }
...@@ -462,7 +383,6 @@ int tx_pkt_handler(PMINI_ADAPTER Adapter /**< pointer to adapter object*/ ...@@ -462,7 +383,6 @@ int tx_pkt_handler(PMINI_ADAPTER Adapter /**< pointer to adapter object*/
return 0; return 0;
} }
#ifndef BCM_SHM_INTERFACE
if(Adapter->downloadDDR == 1) if(Adapter->downloadDDR == 1)
{ {
...@@ -489,7 +409,6 @@ int tx_pkt_handler(PMINI_ADAPTER Adapter /**< pointer to adapter object*/ ...@@ -489,7 +409,6 @@ int tx_pkt_handler(PMINI_ADAPTER Adapter /**< pointer to adapter object*/
update_per_sf_desc_cnts(Adapter); update_per_sf_desc_cnts(Adapter);
} }
} }
#endif
if( atomic_read(&Adapter->CurrNumFreeTxDesc) && if( atomic_read(&Adapter->CurrNumFreeTxDesc) &&
Adapter->LinkStatus == SYNC_UP_REQUEST && Adapter->LinkStatus == SYNC_UP_REQUEST &&
...@@ -507,17 +426,6 @@ int tx_pkt_handler(PMINI_ADAPTER Adapter /**< pointer to adapter object*/ ...@@ -507,17 +426,6 @@ int tx_pkt_handler(PMINI_ADAPTER Adapter /**< pointer to adapter object*/
wake_up(&Adapter->process_rx_cntrlpkt); wake_up(&Adapter->process_rx_cntrlpkt);
} }
#ifdef BCM_SHM_INTERFACE
spin_lock_bh(&Adapter->txtransmitlock);
if(Adapter->txtransmit_running == 0)
{
Adapter->txtransmit_running = 1;
calltransmit = 1;
}
else
calltransmit = 0;
spin_unlock_bh(&Adapter->txtransmitlock);
#endif
if(calltransmit) if(calltransmit)
transmit_packets(Adapter); transmit_packets(Adapter);
...@@ -527,29 +435,5 @@ int tx_pkt_handler(PMINI_ADAPTER Adapter /**< pointer to adapter object*/ ...@@ -527,29 +435,5 @@ int tx_pkt_handler(PMINI_ADAPTER Adapter /**< pointer to adapter object*/
return 0; return 0;
} }
#ifdef BCM_SHM_INTERFACE
extern PMINI_ADAPTER psAdaptertest;
void virtual_mail_box_interrupt(void)
{
#ifndef GDMA_INTERFACE
PUINT ptr = (PUINT)CPE_VIRTUAL_MAILBOX_REG;
UINT intval = (UINT)((*ptr & 0xFF00) >> 8);
if (intval != 0)
{
atomic_set(&psAdaptertest->CurrNumFreeTxDesc, intval);
atomic_set (&psAdaptertest->uiMBupdate, TRUE);
//make it to 0
*ptr = *ptr & 0xffff00ff;
}
#endif
}
unsigned int total_tx_pkts_pending(void)
{
return atomic_read(&psAdaptertest->TotalPacketCount);
}
#endif
drivers/staging/bcm/headers.h
View file @ 91d29ee1
...@@ -41,21 +41,7 @@ ...@@ -41,21 +41,7 @@
#endif #endif
#include <linux/tcp.h> #include <linux/tcp.h>
#include <linux/udp.h> #include <linux/udp.h>
#ifndef BCM_SHM_INTERFACE
#include <linux/usb.h> #include <linux/usb.h>
#endif
#ifdef BECEEM_TARGET
#include <mac_common.h>
#include <msg_Dsa.h>
#include <msg_Dsc.h>
#include <msg_Dsd.h>
#include <sch_definitions.h>
using namespace Beceem;
#ifdef ENABLE_CORRIGENDUM2_UPDATE
extern B_UINT32 g_u32Corr2MacFlags;
#endif
#endif
#include "Typedefs.h" #include "Typedefs.h"
#include "Version.h" #include "Version.h"
...@@ -80,7 +66,6 @@ extern B_UINT32 g_u32Corr2MacFlags; ...@@ -80,7 +66,6 @@ extern B_UINT32 g_u32Corr2MacFlags;
#include "Queue.h" #include "Queue.h"
#include "vendorspecificextn.h" #include "vendorspecificextn.h"
#ifndef BCM_SHM_INTERFACE
#include "InterfaceMacros.h" #include "InterfaceMacros.h"
#include "InterfaceAdapter.h" #include "InterfaceAdapter.h"
...@@ -89,21 +74,8 @@ extern B_UINT32 g_u32Corr2MacFlags; ...@@ -89,21 +74,8 @@ extern B_UINT32 g_u32Corr2MacFlags;
#include "InterfaceMisc.h" #include "InterfaceMisc.h"
#include "InterfaceRx.h" #include "InterfaceRx.h"
#include "InterfaceTx.h" #include "InterfaceTx.h"
#endif
#include "InterfaceIdleMode.h" #include "InterfaceIdleMode.h"
#include "InterfaceInit.h" #include "InterfaceInit.h"
#ifdef BCM_SHM_INTERFACE
#include <linux/cpe_config.h>
#ifdef GDMA_INTERFACE
#include "GdmaInterface.h"
#include "symphony.h"
#else
#include "virtual_interface.h"
#endif
#endif
#endif #endif
drivers/staging/bcm/led_control.c
View file @ 91d29ee1
...@@ -497,12 +497,10 @@ static int ReadConfigFileStructure(PMINI_ADAPTER Adapter, BOOLEAN *bEnableThread ...@@ -497,12 +497,10 @@ static int ReadConfigFileStructure(PMINI_ADAPTER Adapter, BOOLEAN *bEnableThread
{ {
int Status = STATUS_SUCCESS; int Status = STATUS_SUCCESS;
UCHAR GPIO_Array[NUM_OF_LEDS+1]; /*Array to store GPIO numbers from EEPROM*/ UCHAR GPIO_Array[NUM_OF_LEDS+1]; /*Array to store GPIO numbers from EEPROM*/
#ifndef BCM_SHM_INTERFACE
UINT uiIndex = 0; UINT uiIndex = 0;
UINT uiNum_of_LED_Type = 0; UINT uiNum_of_LED_Type = 0;
PUCHAR puCFGData = NULL; PUCHAR puCFGData = NULL;
UCHAR bData = 0; UCHAR bData = 0;
#endif
memset(GPIO_Array, DISABLE_GPIO_NUM, NUM_OF_LEDS+1); memset(GPIO_Array, DISABLE_GPIO_NUM, NUM_OF_LEDS+1);
if(!Adapter->pstargetparams || IS_ERR(Adapter->pstargetparams)) if(!Adapter->pstargetparams || IS_ERR(Adapter->pstargetparams))
...@@ -524,10 +522,6 @@ static int ReadConfigFileStructure(PMINI_ADAPTER Adapter, BOOLEAN *bEnableThread ...@@ -524,10 +522,6 @@ static int ReadConfigFileStructure(PMINI_ADAPTER Adapter, BOOLEAN *bEnableThread
*bEnableThread = FALSE; *bEnableThread = FALSE;
return Status; return Status;
} }
#ifdef BCM_SHM_INTERFACE
*bEnableThread = FALSE;
return Status ;
#else
/* /*
* CONFIG file read successfully. Deallocate the memory of * CONFIG file read successfully. Deallocate the memory of
* uiFileNameBufferSize * uiFileNameBufferSize
...@@ -578,7 +572,6 @@ static int ReadConfigFileStructure(PMINI_ADAPTER Adapter, BOOLEAN *bEnableThread ...@@ -578,7 +572,6 @@ static int ReadConfigFileStructure(PMINI_ADAPTER Adapter, BOOLEAN *bEnableThread
} }
if(uiNum_of_LED_Type >= NUM_OF_LEDS) if(uiNum_of_LED_Type >= NUM_OF_LEDS)
*bEnableThread = FALSE; *bEnableThread = FALSE;
#endif
#if 0 #if 0
for(uiIndex=0; uiIndex<NUM_OF_LEDS; uiIndex++) for(uiIndex=0; uiIndex<NUM_OF_LEDS; uiIndex++)
......
drivers/staging/bcm/nvm.c
View file @ 91d29ee1
...@@ -2642,20 +2642,8 @@ static INT BcmInitEEPROMQueues(PMINI_ADAPTER Adapter) ...@@ -2642,20 +2642,8 @@ static INT BcmInitEEPROMQueues(PMINI_ADAPTER Adapter)
INT BcmInitNVM(PMINI_ADAPTER ps_adapter) INT BcmInitNVM(PMINI_ADAPTER ps_adapter)
{ {
#ifdef BCM_SHM_INTERFACE
#ifdef FLASH_DIRECT_ACCESS
unsigned int data,data1,data2 = 1;
wrm(ps_adapter, PAD_SELECT_REGISTER, &data2, 4);
data1 = rdm(ps_adapter,SYS_CFG,&data,4);
data1 = rdm(ps_adapter,SYS_CFG,&data,4);
data2 = (data | 0x80 | 0x8000);
wrm(ps_adapter,SYS_CFG, &data2,4); // over-write as Flash boot mode
#endif
ps_adapter->eNVMType = NVM_FLASH;
#else
BcmValidateNvmType(ps_adapter); BcmValidateNvmType(ps_adapter);
BcmInitEEPROMQueues(ps_adapter); BcmInitEEPROMQueues(ps_adapter);
#endif
if(ps_adapter->eNVMType == NVM_AUTODETECT) if(ps_adapter->eNVMType == NVM_AUTODETECT)
{ {
...@@ -3070,7 +3058,6 @@ INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter) ...@@ -3070,7 +3058,6 @@ INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
memset(Adapter->psFlashCSInfo, 0 ,sizeof(FLASH_CS_INFO)); memset(Adapter->psFlashCSInfo, 0 ,sizeof(FLASH_CS_INFO));
memset(Adapter->psFlash2xCSInfo, 0 ,sizeof(FLASH2X_CS_INFO)); memset(Adapter->psFlash2xCSInfo, 0 ,sizeof(FLASH2X_CS_INFO));
#ifndef BCM_SHM_INTERFACE
if(!Adapter->bDDRInitDone) if(!Adapter->bDDRInitDone)
{ {
{ {
...@@ -3079,7 +3066,6 @@ INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter) ...@@ -3079,7 +3066,6 @@ INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
} }
} }
#endif
// Reading first 8 Bytes to get the Flash Layout // Reading first 8 Bytes to get the Flash Layout
// MagicNumber(4 bytes) +FlashLayoutMinorVersion(2 Bytes) +FlashLayoutMajorVersion(2 Bytes) // MagicNumber(4 bytes) +FlashLayoutMinorVersion(2 Bytes) +FlashLayoutMajorVersion(2 Bytes)
...@@ -3147,9 +3133,7 @@ INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter) ...@@ -3147,9 +3133,7 @@ INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
return STATUS_FAILURE; return STATUS_FAILURE;
} }
ConvertEndianOf2XCSStructure(Adapter->psFlash2xCSInfo); ConvertEndianOf2XCSStructure(Adapter->psFlash2xCSInfo);
#ifndef BCM_SHM_INTERFACE
BcmDumpFlash2XCSStructure(Adapter->psFlash2xCSInfo,Adapter); BcmDumpFlash2XCSStructure(Adapter->psFlash2xCSInfo,Adapter);
#endif
if((FLASH_CONTROL_STRUCT_SIGNATURE == Adapter->psFlash2xCSInfo->MagicNumber) && if((FLASH_CONTROL_STRUCT_SIGNATURE == Adapter->psFlash2xCSInfo->MagicNumber) &&
(SCSI_FIRMWARE_MINOR_VERSION <= MINOR_VERSION(Adapter->psFlash2xCSInfo->SCSIFirmwareVersion)) && (SCSI_FIRMWARE_MINOR_VERSION <= MINOR_VERSION(Adapter->psFlash2xCSInfo->SCSIFirmwareVersion)) &&
(FLASH_SECTOR_SIZE_SIG == Adapter->psFlash2xCSInfo->FlashSectorSizeSig) && (FLASH_SECTOR_SIZE_SIG == Adapter->psFlash2xCSInfo->FlashSectorSizeSig) &&
...@@ -3181,9 +3165,7 @@ INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter) ...@@ -3181,9 +3165,7 @@ INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
Concerns: what if CS sector size does not match with this sector size ??? Concerns: what if CS sector size does not match with this sector size ???
what is the indication of AccessBitMap in CS in flash 2.x ???? what is the indication of AccessBitMap in CS in flash 2.x ????
*/ */
#ifndef BCM_SHM_INTERFACE
Adapter->ulFlashID = BcmReadFlashRDID(Adapter); Adapter->ulFlashID = BcmReadFlashRDID(Adapter);
#endif
Adapter->uiFlashLayoutMajorVersion = uiFlashLayoutMajorVersion; Adapter->uiFlashLayoutMajorVersion = uiFlashLayoutMajorVersion;
......
drivers/staging/bcm/nvm.h
View file @ 91d29ee1
...@@ -323,15 +323,6 @@ typedef struct _ISO_HEADER ...@@ -323,15 +323,6 @@ typedef struct _ISO_HEADER
#ifdef BCM_SHM_INTERFACE
#define FLASH_ADDR_MASK 0x1F000000
extern int bcmflash_raw_read(unsigned int flash_id, unsigned int offset, unsigned char *inbuf, unsigned int len);
extern int bcmflash_raw_write(unsigned int flash_id, unsigned int offset, unsigned char *outbuf, unsigned int len);
extern int bcmflash_raw_writenoerase(unsigned int flash_id, unsigned int offset, unsigned char *outbuf, unsigned int len);
#endif
#define FLASH_CONTIGIOUS_START_ADDR_AFTER_INIT 0x1C000000 #define FLASH_CONTIGIOUS_START_ADDR_AFTER_INIT 0x1C000000
#define FLASH_CONTIGIOUS_START_ADDR_BEFORE_INIT 0x1F000000 #define FLASH_CONTIGIOUS_START_ADDR_BEFORE_INIT 0x1F000000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7