]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
beceem: remove dead code
authorStephen Hemminger <stephen.hemminger@vyatta.com>
Mon, 1 Nov 2010 04:03:03 +0000 (00:03 -0400)
committerStephen Hemminger <stephen.hemminger@vyatta.com>
Mon, 1 Nov 2010 13:54:43 +0000 (09:54 -0400)
Remove commented out with '#if 0'

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
15 files changed:
drivers/staging/bcm/Adapter.h
drivers/staging/bcm/Bcmchar.c
drivers/staging/bcm/CmHost.c
drivers/staging/bcm/DDRInit.c
drivers/staging/bcm/HandleControlPacket.c
drivers/staging/bcm/InterfaceDld.c
drivers/staging/bcm/InterfaceIdleMode.c
drivers/staging/bcm/InterfaceInit.c
drivers/staging/bcm/InterfaceRx.c
drivers/staging/bcm/InterfaceTx.c
drivers/staging/bcm/LeakyBucket.c
drivers/staging/bcm/Misc.c
drivers/staging/bcm/Qos.c
drivers/staging/bcm/led_control.c
drivers/staging/bcm/nvm.c

index a411c03f5c7193538ba231fd538547c54f5a3df3..9f8954bfd5bdba3e817d711cbddb6bea03eff44b 100644 (file)
@@ -7,42 +7,6 @@
 #define MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES 256
 #include "Debug.h"
 
-typedef struct _LIST_ENTRY{
-       struct _LIST_ENTRY      *next;
-       struct _LIST_ENTRY      *prev;
-} LIST_ENTRY, *PLIST_ENTRY;
-
-typedef struct _BCM_LIST_ENTRY {
-
-    LIST_ENTRY                 Link;
-
-} BCM_LIST_ENTRY, *PBCM_LIST_ENTRY;
-
-typedef enum _RCB_STATUS
-{
-       DRIVER_PROCESSED=1,
-       APPLICATION_PROCESSED
-} RCB_STATUS, *PRCB_STATUS;
-
-#define fFILLED 1
-#define fEMPTY 0
-
-struct _BCM_CB
-{
-       // The network packet that this RCB is receiving
-       PVOID                           pv_packet;
-       // Describes the length of the packet .
-       UINT                ui_packet_length;
-       // Pointer to the first buffer in the packet (only one buffer for Rx)
-       PUCHAR                          buffer;
-       atomic_t                status;
-       UINT                filled;
-} __attribute__((packed));
-typedef struct _BCM_CB BCM_CB,*PBCM_CB;
-
-typedef BCM_CB BCM_RCB, *PBCM_RCB;
-typedef BCM_CB BCM_TCB, *PBCM_TCB;
-
 struct _LEADER
 {
        USHORT  Vcid;
@@ -555,7 +519,7 @@ struct _MINI_ADAPTER
        unsigned int    usIdleModePattern;
        //BOOLEAN                       bTriedToWakeUpFromShutdown;
        BOOLEAN                 bLinkDownRequested;
-       unsigned int    check_for_hang;
+
        int                     downloadDDR;
        PHS_DEVICE_EXTENSION stBCMPhsContext;
        S_HDR_SUPRESSION_CONTEXTINFO    stPhsTxContextInfo;
@@ -625,12 +589,6 @@ typedef struct _MINI_ADAPTER MINI_ADAPTER, *PMINI_ADAPTER;
 
 #define GET_BCM_ADAPTER(net_dev)       netdev_priv(net_dev)
 
-typedef struct _DEVICE_EXTENSION
-{
-       PMINI_ADAPTER pAdapt;
-}DEVICE_EXTENSION,*PDEVICE_EXTENSION;
-
-
 struct _ETH_HEADER_STRUC {
     UCHAR       au8DestinationAddress[6];
     UCHAR       au8SourceAddress[6];
index 5dbd96aab54e89452618bf14fe1c1faad6c5436a..6c9db7227ca2f119bf41ee120d460b4ca8174d9f 100644 (file)
@@ -1207,10 +1207,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                Adapter->usIdleModePattern = ABORT_IDLE_MODE;
                                Adapter->bWakeUpDevice = TRUE;
                                wake_up(&Adapter->process_rx_cntrlpkt);
-                               #if 0
-                               Adapter->bTriedToWakeUpFromlowPowerMode = TRUE;
-                               InterfaceAbortIdlemode (Adapter, Adapter->usIdleModePattern);
-                               #endif
                        }
                        Status = STATUS_SUCCESS;
                        break;
@@ -1750,14 +1746,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"\nsFlash2xRead.offset :%d" ,sFlash2xWrite.offset);
                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"\nsFlash2xRead.numOfBytes :%x" ,sFlash2xWrite.numOfBytes);
                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"\nsFlash2xRead.bVerify :%x\n" ,sFlash2xWrite.bVerify);
-                               #if 0
-                               if((sFlash2xWrite.Section == ISO_IMAGE1) ||(sFlash2xWrite.Section == ISO_IMAGE2) ||
-                                       (sFlash2xWrite.Section == DSD0) || (sFlash2xWrite.Section == DSD1) || (sFlash2xWrite.Section == DSD2))
-                               {
-                                       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"ISO/DSD Image write is not allowed....  ");
-                                       return STATUS_FAILURE ;
-                               }
-                               #endif
                                if((sFlash2xWrite.Section != VSA0) && (sFlash2xWrite.Section != VSA1) &&
                                        (sFlash2xWrite.Section != VSA2) )
                                {
@@ -1940,29 +1928,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                                Adapter->bAllDSDWriteAllow = FALSE ;
                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"IOCTL_BCM_IDENTIFY_ACTIVE_SECTION called");
 
-                               #if 0
-                               SECTION_TYPE section = 0 ;
-
-
-                               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_IDENTIFY_ACTIVE_SECTION Called");
-                               Status = copy_from_user((PCHAR)&IoBuffer, (PCHAR)arg, sizeof(IOCTL_BUFFER));
-                               if(Status)
-                               {
-                                       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Copy of IOCTL BUFFER failed");
-                                       return -EFAULT;
-                               }
-                               Status = copy_from_user((PCHAR)section,(PCHAR)&IoBuffer, sizeof(INT));
-                               if(Status)
-                               {
-                                       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Copy of section type failed failed");
-                                       return -EFAULT;
-                               }
-                               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Read Section :%d", section);
-                               if(section == DSD)
-                                       Adapter->ulFlashCalStart = Adapter->uiActiveDSDOffsetAtFwDld ;
-                               else
-                                       Status = STATUS_FAILURE ;
-                               #endif
                                Status = STATUS_SUCCESS ;
                         }
                         break ;
index 1c3ca1e49feedd88d0cfd334108fc3559a855755..d0bfdbbeee3ffb0936b17ba0c73aa353ff7710f0 100644 (file)
@@ -1063,12 +1063,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                pstAddIndication->sfAuthorizedSet.u32MaxTrafficBurst);
        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u32MinReservedTrafficRate : 0x%X",
                pstAddIndication->sfAuthorizedSet.u32MinReservedTrafficRate);
-#if 0
-       BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32MinimumTolerableTrafficRate   : 0x%X",
-               pstAddIndication->sfAuthorizedSet.u32MinimumTolerableTrafficRate);
-       BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32RequesttransmissionPolicy     : 0x%X",
-               pstAddIndication->sfAuthorizedSet.u32RequesttransmissionPolicy);
-#endif
        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8VendorSpecificQoSParamLength    : 0x%X",
                pstAddIndication->sfAuthorizedSet.u8VendorSpecificQoSParamLength);
        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8VendorSpecificQoSParam          : 0x%X",
@@ -1116,13 +1110,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                pstAddIndication->sfAuthorizedSet.u8PagingPreference);
        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u16UnsolicitedPollingInterval            : 0x%X",
                pstAddIndication->sfAuthorizedSet.u16UnsolicitedPollingInterval);
-#if 0
-       BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "MBSZoneIdentifierassignmentLength        : 0x%X",
-               pstAddIndication->sfAuthorizedSet.MBSZoneIdentifierassignmentLength);
-       for(uiLoopIndex=0; uiLoopIndex < MAX_STRING_LEN; uiLoopIndex++)
-               BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "MBSZoneIdentifierassignment : 0x%X",
-                       pstAddIndication->sfAuthorizedSet.MBSZoneIdentifierassignment[uiLoopIndex]);
-#endif
 
        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "sfAuthorizedSet.u8HARQChannelMapping %x  %x %x ",
                                *(unsigned int*)pstAddIndication->sfAuthorizedSet.u8HARQChannelMapping,
@@ -1160,11 +1147,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                        psfCSType->cCPacketClassificationRule.u8IPTypeOfService[0],
                        psfCSType->cCPacketClassificationRule.u8IPTypeOfService[1],
                        psfCSType->cCPacketClassificationRule.u8IPTypeOfService[2]);
-#if 0
-
-               BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "u8ProtocolLength                             :0x%X ",
-                       psfCSType->cCPacketClassificationRule.u8ProtocolLength);
-#endif
 
                for(uiLoopIndex=0; uiLoopIndex < 1; uiLoopIndex++)
                        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8Protocol : 0x%02X ",
@@ -1280,14 +1262,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                        pstAddIndication->sfAdmittedSet.u8QosParamSet);
        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8TrafficPriority                        : 0x%02X",
                        pstAddIndication->sfAdmittedSet.u8TrafficPriority);
-#if 0
-       BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "u32MaxSustainedTrafficRate   : 0x%02X",
-                       ntohl(pstAddIndication->sfAdmittedSet.u32MaxSustainedTrafficRate));
-       BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "u32MinimumTolerableTrafficRate       : 0x%X",
-               pstAddIndication->sfAdmittedSet.u32MinimumTolerableTrafficRate);
-       BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "u32RequesttransmissionPolicy : 0x%X",
-               pstAddIndication->sfAdmittedSet.u32RequesttransmissionPolicy);
-#endif
        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32MaxTrafficBurst                       : 0x%X",
                        pstAddIndication->sfAdmittedSet.u32MaxTrafficBurst);
        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32MinReservedTrafficRate        : 0x%X",
@@ -1341,13 +1315,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                pstAddIndication->sfAdmittedSet.u16TimeBase);
        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8PagingPreference               : 0x%X",
                pstAddIndication->sfAdmittedSet.u8PagingPreference);
-#if 0
-       BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "MBSZoneIdentifierassignmentLength        : 0x%X",
-               pstAddIndication->sfAdmittedSet.MBSZoneIdentifierassignmentLength);
-       for(uiLoopIndex=0; uiLoopIndex < MAX_STRING_LEN; uiLoopIndex++)
-               BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "MBSZoneIdentifierassignment : 0x%X",
-       pstAddIndication->sfAdmittedSet.MBSZoneIdentifierassignment[uiLoopIndex]);
-#endif
 
 
        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8TrafficIndicationPreference    : 0x%02X",
@@ -1380,11 +1347,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                        psfCSType->cCPacketClassificationRule.u8IPTypeOfService[0],
                        psfCSType->cCPacketClassificationRule.u8IPTypeOfService[1],
                        psfCSType->cCPacketClassificationRule.u8IPTypeOfService[2]);
-#if 0
-
-               BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8ProtocolLength                 :0x%02X ",
-                       psfCSType->cCPacketClassificationRule.u8ProtocolLength);
-#endif
                for(uiLoopIndex=0; uiLoopIndex < 1; uiLoopIndex++)
                        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8Protocol: 0x%02X ",
                        psfCSType->cCPacketClassificationRule.u8Protocol);
@@ -1499,20 +1461,10 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                pstAddIndication->sfActiveSet.u8QosParamSet);
        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8TrafficPriority                        : 0x%02X",
                pstAddIndication->sfActiveSet.u8TrafficPriority);
-#if 0
-       BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "u32MaxSustainedTrafficRate   : 0x%02X",
-               ntohl(pstAddIndication->sfActiveSet.u32MaxSustainedTrafficRate));
-#endif
        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32MaxTrafficBurst                       : 0x%X",
                pstAddIndication->sfActiveSet.u32MaxTrafficBurst);
        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u32MinReservedTrafficRate        : 0x%X",
                pstAddIndication->sfActiveSet.u32MinReservedTrafficRate);
-#if 0
-       BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "u32MinimumTolerableTrafficRate       : 0x%X",
-               pstAddIndication->sfActiveSet.u32MinimumTolerableTrafficRate);
-       BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "u32RequesttransmissionPolicy : 0x%X",
-               pstAddIndication->sfActiveSet.u32RequesttransmissionPolicy);
-#endif
        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8VendorSpecificQoSParamLength   : 0x%02X",
                pstAddIndication->sfActiveSet.u8VendorSpecificQoSParamLength);
        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  "u8VendorSpecificQoSParam         : 0x%02X",
@@ -1560,13 +1512,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                pstAddIndication->sfActiveSet.u16TimeBase);
        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8PagingPreference              : 0x%X",
                pstAddIndication->sfActiveSet.u8PagingPreference);
-#if 0
-       BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " MBSZoneIdentifierassignmentLength       : 0x%X",
-               pstAddIndication->sfActiveSet.MBSZoneIdentifierassignmentLength);
-       for(uiLoopIndex=0; uiLoopIndex < MAX_STRING_LEN; uiLoopIndex++)
-               BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " MBSZoneIdentifierassignment : 0x%X",
-               pstAddIndication->sfActiveSet.MBSZoneIdentifierassignment[uiLoopIndex]);
-#endif
 
 
        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8TrafficIndicationPreference   : 0x%X",
@@ -1599,11 +1544,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
                        psfCSType->cCPacketClassificationRule.u8IPTypeOfService[0],
                        psfCSType->cCPacketClassificationRule.u8IPTypeOfService[1],
                        psfCSType->cCPacketClassificationRule.u8IPTypeOfService[2]);
-#if 0
-
-               BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  " u8ProtocolLength                            :0x%X ",
-                       psfCSType->cCPacketClassificationRule.u8ProtocolLength);
-#endif
                for(uiLoopIndex=0; uiLoopIndex < 1; uiLoopIndex++)
                        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL,  " u8Protocol      : 0x%X ",
                        psfCSType->cCPacketClassificationRule.u8Protocol);
index 454eb8d8992b2de6eb88af1c18f9b876ed0c96bf..411f02a6b6ea67dc2471a9bb1a790f763ed987c8 100644 (file)
@@ -187,17 +187,6 @@ static DDR_SET_NODE asDPLL_266MHZ[] = {
                                         {0x0f000840,0x0FFF1B00},
                                         {0x0f000870,0x00000002}
                                                                          };
-#if 0
-static DDR_SET_NODE asDPLL_800MHZ[] = {
-                                                                               {0x0f000810,0x00000F95},
-                                                                               {0x0f000810,0x00000F95},
-                                        {0x0f000810,0x00000F95},
-                                        {0x0f000820,0x03F1365B},
-                                        {0x0f000840,0x0FFF0000},
-                                        {0x0f000880,0x000003DD},
-                                        {0x0f000860,0x00000000}
-                                                                         };
-#endif
 
 #define T3B_SKIP_CLOCK_PROGRAM_DUMP_133MHZ 11  //index for 0x0F007000
 static DDR_SET_NODE asT3B_DDRSetting133MHz[] = {//      # DPLL Clock Setting
index 8cfccaa3803ab49374a8d2090487e3425eca7e9a..2d4dbcc215e3d7ee79168da1fa233862d9cad8d5 100644 (file)
@@ -186,29 +186,6 @@ int control_packet_handler  (PMINI_ADAPTER Adapter  /**< pointer to adapter obje
                                DEQUEUEPACKET(Adapter->RxControlHead,Adapter->RxControlTail);
 //                             Adapter->RxControlHead=ctrl_packet->next;
                        }
-                       #if 0  //Idle mode debug profiling...
-                       if(*(PUSHORT)ctrl_packet->data == IDLE_MODE_STATUS)
-                       {
-                               puiBuffer = (PUINT)(ctrl_packet->data +sizeof(USHORT));
-                               if((ntohl(*puiBuffer) == GO_TO_IDLE_MODE_PAYLOAD))
-                               {
-                                       memset(&tv, 0, sizeof(tv));
-                                       do_gettimeofday(&tv);
-                                       if((ntohl(*(puiBuffer+1)) == 0))
-                                       {
-                                               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "IdleMode Wake-up Msg from f/w at time :%ld ms", tv.tv_sec *1000 + tv.tv_usec /1000);
-                                       }
-                                       else
-                                       {
-                                       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "IdleMode req Msg from f/w at time :%ld ms", tv.tv_sec *1000 + tv.tv_usec /1000);
-                                       }
-                               }
-                               else if((ntohl(*puiBuffer) == IDLE_MODE_SF_UPDATE_MSG))
-                               {
-                                       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "GOT IDLE_MODE_SF_UPDATE MSG at time :%ld ms", tv.tv_sec *1000 + tv.tv_usec /1000);
-                               }
-                       }
-                       #endif
 
                        spin_unlock_irqrestore (&Adapter->control_queue_lock, flags);
                        handle_rx_control_packet(Adapter, ctrl_packet);
index e640b75e7dc43b5356920dbdec39e0c7cc9c0d3f..1fc36a15f187e62e964a0ec071b2073a154d1153 100644 (file)
@@ -230,41 +230,6 @@ static int bcm_download_config_file(PMINI_ADAPTER Adapter,
 
        return retval;
 }
-#if 0
-static int bcm_download_buffer(PMINI_ADAPTER Adapter,
-       unsigned char *mappedbuffer, unsigned int u32FirmwareLength,
-       unsigned long u32StartingAddress)
-{
-    char            *buff=NULL;
-    unsigned int    len = 0;
-       int                     retval = STATUS_SUCCESS;
-       buff = kzalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_KERNEL);
-
-       len = u32FirmwareLength;
-
-       while(u32FirmwareLength)
-       {
-               len = MIN_VAL (u32FirmwareLength, MAX_TRANSFER_CTRL_BYTE_USB);
-               if(STATUS_SUCCESS != (retval = copy_from_user(buff,
-                               (unsigned char *)mappedbuffer, len)))
-               {
-                       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "copy_from_user failed\n");
-                       break;
-               }
-               retval = wrm (Adapter, u32StartingAddress, buff, len);
-               if(retval)
-               {
-                       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "wrm failed\n");
-                       break;
-               }
-               u32StartingAddress      += len;
-               u32FirmwareLength       -= len;
-               mappedbuffer            +=len;
-       }
-       kfree(buff);
-       return retval;
-}
-#endif
 static int bcm_compare_buff_contents(unsigned char *readbackbuff,
        unsigned char *buff,unsigned int len)
 {
@@ -296,58 +261,6 @@ static int bcm_compare_buff_contents(unsigned char *readbackbuff,
        }
        return retval;
 }
-#if 0
-static int bcm_buffer_readback(PMINI_ADAPTER Adapter,
-       unsigned char *mappedbuffer, unsigned int u32FirmwareLength,
-       unsigned long u32StartingAddress)
-{
-       unsigned char *buff = NULL;
-       unsigned char *readbackbuff = NULL;
-       unsigned int  len = u32FirmwareLength;
-       int retval = STATUS_SUCCESS;
-
-    buff=(unsigned char *)kzalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_KERNEL);
-       if(NULL == buff)
-               return -ENOMEM;
-       readbackbuff =  (unsigned char *)kzalloc(MAX_TRANSFER_CTRL_BYTE_USB,
-                                       GFP_KERNEL);
-       if(NULL == readbackbuff)
-       {
-               kfree(buff);
-               return -ENOMEM;
-       }
-       while (u32FirmwareLength && !retval)
-       {
-               len = MIN_VAL (u32FirmwareLength, MAX_TRANSFER_CTRL_BYTE_USB);
-
-               /* read from the appl buff and then read from the target, compare */
-               if(STATUS_SUCCESS != (retval = copy_from_user(buff,
-                               (unsigned char *)mappedbuffer, len)))
-               {
-                       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "copy_from_user failed\n");
-                       break;
-               }
-               retval = rdm (Adapter, u32StartingAddress, readbackbuff, len);
-               if(retval)
-               {
-                       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "rdm failed\n");
-                       break;
-               }
-
-               if (STATUS_SUCCESS !=
-                       (retval = bcm_compare_buff_contents (readbackbuff, buff, len)))
-               {
-                       break;
-               }
-               u32StartingAddress      += len;
-               u32FirmwareLength       -= len;
-               mappedbuffer            +=len;
-       }/* end of while (u32FirmwareLength && !retval) */
-       kfree(buff);
-       kfree(readbackbuff);
-       return retval;
-}
-#endif
 int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo)
 {
        int retval = STATUS_SUCCESS;
@@ -388,23 +301,6 @@ int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo)
                        goto error ;
                }
 
-               #if 0
-               retval = bcm_download_buffer(Adapter,
-                               (unsigned char *)psFwInfo->pvMappedFirmwareAddress,
-                               psFwInfo->u32FirmwareLength, psFwInfo->u32StartingAddress);
-               if(retval != STATUS_SUCCESS)
-               {
-                       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "User space buffer download fails....");
-               }
-               retval = bcm_buffer_readback (Adapter,
-                               (unsigned char *)psFwInfo->pvMappedFirmwareAddress,
-                               psFwInfo->u32FirmwareLength, psFwInfo->u32StartingAddress);
-
-               if(retval != STATUS_SUCCESS)
-               {
-                       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "read back verifier failed ....");
-               }
-               #endif
                retval = buffDnldVerify(Adapter,
                                        buff,
                                        psFwInfo->u32FirmwareLength,
index 0750382733ff098432d0e448059b3555868c0710..3a7780be7fe46ec622699ba8fe22ace9909909c4 100644 (file)
@@ -98,14 +98,6 @@ int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer)
                        Adapter->bTriedToWakeUpFromlowPowerMode = FALSE;
 
                        wake_up(&Adapter->lowpower_mode_wait_queue);
-               #if 0
-                       if(Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY)
-                       {
-                               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL,"LED Thread is Running. Hence Setting the LED Event as IDLEMODE_EXIT");
-                               Adapter->DriverState = IDLEMODE_EXIT;
-                               wake_up(&Adapter->LEDInfo.notify_led_event);
-                       }
-               #endif
 
                }
                else
index 845ced1670eeb4a6c331172a23833d50a9eab5d6..dddf34bb7c8bb54716fd675aea4ecb7a606934e4 100644 (file)
@@ -419,32 +419,6 @@ static int device_run(PS_INTERFACE_ADAPTER psIntfAdapter)
        return 0;
 }
 
-#if 0
-static void    print_usb_interface_desc(struct usb_interface_descriptor *usb_intf_desc)
-{
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "**************** INTERFACE DESCRIPTOR *********************");
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bLength: %x", usb_intf_desc->bLength);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bDescriptorType: %x", usb_intf_desc->bDescriptorType);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bInterfaceNumber: %x", usb_intf_desc->bInterfaceNumber);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bAlternateSetting: %x", usb_intf_desc->bAlternateSetting);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bNumEndpoints: %x", usb_intf_desc->bNumEndpoints);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bInterfaceClass: %x", usb_intf_desc->bInterfaceClass);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bInterfaceSubClass: %x", usb_intf_desc->bInterfaceSubClass);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bInterfaceProtocol: %x", usb_intf_desc->bInterfaceProtocol);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "iInterface :%x\n",usb_intf_desc->iInterface);
-}
-static void    print_usb_endpoint_descriptor(struct usb_endpoint_descriptor *usb_ep_desc)
-{
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "**************** ENDPOINT DESCRIPTOR *********************");
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bLength  :%x ", usb_ep_desc->bLength);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bDescriptorType  :%x ", usb_ep_desc->bDescriptorType);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bEndpointAddress  :%x ", usb_ep_desc->bEndpointAddress);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bmAttributes  :%x ", usb_ep_desc->bmAttributes);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "wMaxPacketSize  :%x ",usb_ep_desc->wMaxPacketSize);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bInterval  :%x ",usb_ep_desc->bInterval);
-}
-
-#endif
 
 static inline int bcm_usb_endpoint_num(const struct usb_endpoint_descriptor *epd)
 {
index ab33895bfe5635318ea4a3cf29dc502a3f43bfb6..6f1ed78c975b490178756f0ef6711de308f2f62e 100644 (file)
@@ -39,12 +39,6 @@ static void read_bulk_callback(struct urb *urb)
        PLEADER pLeader = urb->transfer_buffer;
 
 
-       #if 0
-       int *puiBuffer = NULL;
-       struct timeval tv;
-       memset(&tv, 0, sizeof(tv));
-       do_gettimeofday(&tv);
-       #endif
 
        if((Adapter->device_removed == TRUE)  ||
                (TRUE == Adapter->bEndPointHalted) ||
index b53848b6fc00c81b6e4030cf1824da952443147f..a3dadf19538b773bf5d5c270f8f82f9c910e52db 100644 (file)
@@ -9,10 +9,6 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
        PMINI_ADAPTER psAdapter = psIntfAdapter->psAdapter ;
        BOOLEAN bpowerDownMsg = FALSE ;
     PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
-#if 0
-       struct timeval tv;
-       UINT time_ms = 0;
-#endif
        if(urb->status != STATUS_SUCCESS)
        {
                if(urb->status == -EPIPE)
@@ -33,11 +29,6 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
 
        if(TRUE == psAdapter->bPreparingForLowPowerMode)
        {
-               #if 0
-               do_gettimeofday(&tv);
-               time_ms = tv.tv_sec *1000 + tv.tv_usec/1000;
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, " %s Idle Mode ACK_Sent got from device at time :0x%x", __FUNCTION__, time_ms);
-               #endif
 
                if(((pControlMsg->szData[0] == GO_TO_IDLE_MODE_PAYLOAD) &&
                        (pControlMsg->szData[1] == TARGET_CAN_GO_TO_IDLE_MODE)))
index 9c73862d51207f0362788b58857f88cd157bc9bd..f9e8f2bb06d39ad7e6191a3d5e76d4d99c82196b 100644 (file)
@@ -183,9 +183,6 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
                        return ;
                }
 
-#if 0
-               PruneQueue(Adapter,(psSF-Adapter->PackInfo));
-#endif
                spin_lock_bh(&psSF->SFQueueLock);
                QueuePacket=psSF->FirstTxQueue;
 
index dfc4f3fff2b2e89fd8d9e6b63fac834b61c97ce4..0ada848fe1e1a79879ca83ded8438a0ff87791aa 100644 (file)
@@ -365,13 +365,6 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter,/**<Logical Adapter*/
                        /*Setting bIdleMode_tx_from_host to TRUE to indicate LED control thread to represent
                          the wake up from idlemode is from host*/
                        //Adapter->LEDInfo.bIdleMode_tx_from_host = TRUE;
-#if 0
-                       if(STATUS_SUCCESS != InterfaceIdleModeWakeup(Adapter))
-                       {
-                               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Idle Mode Wake up Failed\n");
-                               return STATUS_FAILURE;
-                       }
-#endif
                        Adapter->bWakeUpDevice = TRUE;
                        wake_up(&Adapter->process_rx_cntrlpkt);
 
@@ -1220,12 +1213,6 @@ int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter)
                        goto OUT;
                }
        }
-#if 0
-       else if(psAdapter->eNVMType == NVM_EEPROM)
-       {
-               PropagateCalParamsFromEEPROMToMemory();
-       }
-#endif
 
        /* Download Firmare */
        if ((status = BcmFileDownload( ps_adapter, BIN_FILE, FIRMWARE_BEGIN_ADDR)))
@@ -1405,16 +1392,6 @@ VOID doPowerAutoCorrection(PMINI_ADAPTER psAdapter)
        if (psAdapter->bIsAutoCorrectEnabled && (psAdapter->chip_id >= T3LPB))
        {
                //If reporting mode is enable, switch PMU to PMC
-               #if 0
-               if(reporting_mode == FALSE)
-               {
-                       psAdapter->ulPowerSaveMode = DEVICE_POWERSAVE_MODE_AS_PMU_SHUTDOWN;
-                       psAdapter->bDoSuspend = TRUE;
-                       BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL,"PMU selected ....");
-
-               }
-               else
-               #endif
                {
                        psAdapter->ulPowerSaveMode = DEVICE_POWERSAVE_MODE_AS_PMU_CLOCK_GATING;
                        psAdapter->bDoSuspend =FALSE;
@@ -1481,43 +1458,6 @@ OUT:
 }
 #endif
 
-#if 0
-INT ReadMacAddressFromEEPROM(PMINI_ADAPTER Adapter)
-{
-       unsigned char *puMacAddr = NULL;
-       int i =0;
-
-       puMacAddr = ReadMacAddrEEPROM(Adapter,0x200);
-       if(!puMacAddr)
-       {
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Couldn't retrieve the Mac Address\n");
-               return STATUS_FAILURE;
-       }
-       else
-       {
-               if((puMacAddr[0] == 0x0  && puMacAddr[1] == 0x0  &&
-                       puMacAddr[2] == 0x0  && puMacAddr[3] == 0x0  &&
-                       puMacAddr[4] == 0x0  && puMacAddr[5] == 0x0) ||
-                  (puMacAddr[0] == 0xFF && puMacAddr[1] == 0xFF &&
-                       puMacAddr[2] == 0xFF && puMacAddr[3] == 0xFF &&
-                       puMacAddr[4] == 0xFF && puMacAddr[5] == 0xFF))
-               {
-                       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Invalid Mac Address\n");
-                       kfree(puMacAddr);
-                       return STATUS_FAILURE;
-               }
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "The Mac Address received is: \n");
-               memcpy(Adapter->dev->dev_addr, puMacAddr, MAC_ADDRESS_SIZE);
-        for(i=0;i<MAC_ADDRESS_SIZE;i++)
-        {
-            BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"%02x ", Adapter->dev->dev_addr[i]);
-        }
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"\n");
-               kfree(puMacAddr);
-       }
-       return STATUS_SUCCESS;
-}
-#endif
 
 static void convertEndian(B_UINT8 rwFlag, PUINT puiBuffer, UINT uiByteCount)
 {
index f85a5a85ad5cd667e122ec82d65d6c90ce64d85a..7e8013c105a2865fba41f52061f39d3a829a132a 100644 (file)
@@ -254,15 +254,6 @@ USHORT     IpVersion4(PMINI_ADAPTER Adapter, /**< Pointer to the driver control stru
                //if protocol is not TCP or UDP then no need of comparing source port and destination port
                if(iphd->protocol!=TCP && iphd->protocol!=UDP)
                        break;
-#if 0
-               //check if memory is available of src and Dest port
-               if(ETH_AND_IP_HEADER_LEN + L4_SRC_PORT_LEN + L4_DEST_PORT_LEN > Packet->len)
-               {
-                       //This is not an erroneous condition and pkt will be checked for next classification.
-                       bClassificationSucceed = FALSE;
-                       break;
-               }
-#endif
                //******************Checking Transport Layer Header field if present *****************//
                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Source Port %04x",
                        (iphd->protocol==UDP)?xprt_hdr->uhdr.source:xprt_hdr->thdr.source);
index 79c7bd74804d79edd5c3f746c977bfcc6c34c2f4..a21d219f428c47654ac27eae9514da36d6a1c0df 100644 (file)
@@ -116,44 +116,7 @@ static INT LED_Proportional_Blink(PMINI_ADAPTER Adapter, UCHAR GPIO_Num_tx,
 
        while((Adapter->device_removed == FALSE))
        {
-               #if 0
-               if(0 == num_of_time_tx && 0 == num_of_time_rx)
-               {
-                       timeout = 1000;
-                       Status = wait_event_interruptible_timeout(Adapter->LEDInfo.notify_led_event,
-                               currdriverstate!= Adapter->DriverState || kthread_should_stop(),
-                               msecs_to_jiffies (timeout));
-                       if(kthread_should_stop())
-                       {
-                               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL, "Led thread got signal to exit..hence exiting");
-                               Adapter->LEDInfo.led_thread_running= BCM_LED_THREAD_DISABLED;
-                               return EVENT_SIGNALED;
-                       }
-                       if(Status)
-                               return EVENT_SIGNALED;
-
-               }
-               #endif
-
                timeout = 50;
-               #if 0
-               /*Turn on LED if Tx is high bandwidth*/
-               if(num_of_time_tx > MAX_NUM_OF_BLINKS)
-               {
-                       TURN_ON_LED(1<<GPIO_Num_tx, uiTxLedIndex);
-                       num_of_time_tx = 0;
-                       bBlinkBothLED = FALSE;
-                       num_of_time = num_of_time_rx;
-               }
-                       /*Turn on LED if Rx is high bandwidth*/
-               if(num_of_time_rx > MAX_NUM_OF_BLINKS)
-               {
-                       TURN_ON_LED(1<<GPIO_Num_rx, uiRxLedIndex);
-                       num_of_time_rx = 0;
-                       bBlinkBothLED = FALSE;
-                       num_of_time = num_of_time_tx;
-               }
-               #endif
                /*Blink Tx and Rx LED when both Tx and Rx is in normal bandwidth*/
                if(bBlinkBothLED)
                {
@@ -570,21 +533,6 @@ static int ReadConfigFileStructure(PMINI_ADAPTER Adapter, BOOLEAN *bEnableThread
        if(uiNum_of_LED_Type >= NUM_OF_LEDS)
                *bEnableThread = FALSE;
 
-#if 0
-       for(uiIndex=0; uiIndex<NUM_OF_LEDS; uiIndex++)
-       {
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LEDState[%d].LED_Type = %x\n", uiIndex,
-                       Adapter->LEDInfo.LEDState[uiIndex].LED_Type);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LEDState[%d].LED_On_State = %x\n", uiIndex,
-                       Adapter->LEDInfo.LEDState[uiIndex].LED_On_State);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LEDState[%d].LED_Blink_State = %x\n", uiIndex,
-                       Adapter->LEDInfo.LEDState[uiIndex].LED_Blink_State);
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LEDState[%d].GPIO_Num = %x\n", uiIndex,
-                       Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num);
-       }
-       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: Polarity = %d\n",
-                       Adapter->LEDInfo.BitPolarty);
-#endif
        return Status;
 }
 //--------------------------------------------------------------------------
@@ -711,20 +659,6 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
                        TURN_OFF_LED(1<<GPIO_num, uiLedIndex);
                        return ;//STATUS_FAILURE;
                }
-       #if 0
-               if(Adapter->device_removed)
-               {
-                       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"Device removed hence exiting from Led Thread..");
-                       return ; //-ENODEV;
-               }
-       #endif
-               #if 0
-               if((GPIO_num != DISABLE_GPIO_NUM) &&
-                       ((currdriverstate != FW_DOWNLOAD) &&
-                       (currdriverstate != NORMAL_OPERATION) &&
-                       (currdriverstate != IDLEMODE_EXIT)))
-                       TURN_OFF_LED(1<<GPIO_num, uiLedIndex);
-               #endif
 
                if(GPIO_num != DISABLE_GPIO_NUM)
                {
@@ -742,10 +676,6 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
                        case DRIVER_INIT:
                        {
                                currdriverstate = DRIVER_INIT;//Adapter->DriverState;
-       #if 0
-                               LedGpioInit(Adapter);
-                               Adapter->LEDInfo.bLedInitDone = TRUE;
-       #endif
                                BcmGetGPIOPinInfo(Adapter, &GPIO_num, &dummyGPIONum, &uiLedIndex, &dummyIndex, currdriverstate);
 
                                if(GPIO_num  != DISABLE_GPIO_NUM)
@@ -758,13 +688,6 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
                        {
                                //BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: FW_DN_DONE called\n");
                                currdriverstate = FW_DOWNLOAD;
-                       #if 0
-                               if(Adapter->LEDInfo.bLedInitDone == FALSE)
-                               {
-                                       LedGpioInit(Adapter);
-                                       Adapter->LEDInfo.bLedInitDone = TRUE;
-                               }
-                       #endif
                                BcmGetGPIOPinInfo(Adapter, &GPIO_num, &dummyGPIONum,  &uiLedIndex, &dummyIndex, currdriverstate);
 
                                if(GPIO_num != DISABLE_GPIO_NUM)
@@ -786,12 +709,6 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
                        break;
 
                        case SHUTDOWN_EXIT:
-                       #if 0
-                       if(Adapter->ulPowerSaveMode == DEVICE_POWERSAVE_MODE_AS_PMU_SHUTDOWN)
-                       {
-                               LedGpioInit(Adapter);
-                       }
-                       #endif
                        //no break, continue to NO_NETWORK_ENTRY state as well.
 
                        case NO_NETWORK_ENTRY:
@@ -865,34 +782,6 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
                        break;
                        case IDLEMODE_EXIT:
                        {
-#if 0
-                               UCHAR GPIO_num_tx = DISABLE_GPIO_NUM;
-                               UCHAR GPIO_num_rx = DISABLE_GPIO_NUM;
-                               UCHAR uiTxLedIndex = 0;
-                               UCHAR uiRxLedIndex = 0;
-
-                               currdriverstate  = IDLEMODE_EXIT;
-                               if(DEVICE_POWERSAVE_MODE_AS_PMU_SHUTDOWN == Adapter->ulPowerSaveMode)
-                               {
-                                       LedGpioInit(Adapter);
-                               }
-                               BcmGetGPIOPinInfo(Adapter, &GPIO_num_tx, &GPIO_num_rx, &uiTxLedIndex,&uiRxLedIndex,currdriverstate);
-
-                               Adapter->LEDInfo.bIdle_led_off =  FALSE;
-
-                               if((GPIO_num_tx == DISABLE_GPIO_NUM) && (GPIO_num_rx == DISABLE_GPIO_NUM))
-                               {
-                                       GPIO_num = DISABLE_GPIO_NUM ;
-                               }
-                               else
-                               {
-                                       timeout = 50;
-                                       if(Adapter->LEDInfo.bIdleMode_tx_from_host)
-                                               LED_Blink(Adapter, 1<<GPIO_num_tx, uiTxLedIndex, timeout, -1,currdriverstate);
-                                       else
-                                               LED_Blink(Adapter, 1<<GPIO_num_rx, uiRxLedIndex, timeout, -1,currdriverstate);
-                               }
-#endif
                        }
                        break;
                        case DRIVER_HALT:
index 4a02053347491a3222a3f6979794023b6ac193a5..4f1b35a68b7f5a3cef2e3271a3d0507ffbbefc6a 100644 (file)
@@ -234,168 +234,6 @@ INT ReadBeceemEEPROM( PMINI_ADAPTER Adapter,
 } /* ReadBeceemEEPROM() */
 
 
-#if 0
-//-----------------------------------------------------------------------------
-// Procedure:  IsEEPROMWriteDone
-//
-// Description: Reads the SPI status to see the status of previous write.
-//
-// Arguments:
-//             Adapter    - ptr to Adapter object instance
-//
-// Returns:
-//             BOOLEAN - TRUE  - write went through
-//              - FALSE - Write Failed.
-//-----------------------------------------------------------------------------
-
-BOOLEAN IsEEPROMWriteDone(PMINI_ADAPTER Adapter)
-{
-       UINT uiRetries = 16;
-       //UINT uiStatus  = 0;
-       UINT value;
-
-       //sleep for 1.2ms ..worst case EEPROM write can take up to 1.2ms.
-       mdelay(2);
-
-       value = 0;
-       rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &value, sizeof(value));
-
-       while(((value >> 14) & 1) == 1)
-       {
-               // EEPROM_SPI_Q_STATUS1_REG will be cleared only if write back to that.
-               value = (0x1 << 14);
-               wrmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG,&value, sizeof(value));
-               udelay(1000);
-               uiRetries--;
-               if(uiRetries == 0)
-               {
-                       return FALSE;
-               }
-               value = 0;
-               rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &value, sizeof(value));
-       }
-       return TRUE;
-
-
-}
-
-
-//-----------------------------------------------------------------------------
-// Procedure:  ReadBeceemEEPROMBulk
-//
-// Description: This routine reads 16Byte data from EEPROM
-//
-// Arguments:
-//             Adapter     - ptr to Adapter object instance
-//          dwAddress - EEPROM Offset to read the data from.
-//          pdwData    - Pointer to double word where data needs to be stored in.
-//
-// Returns:
-//             OSAL_STATUS_CODE:
-//-----------------------------------------------------------------------------
-
-INT ReadBeceemEEPROMBulk(PMINI_ADAPTER Adapter,DWORD dwAddress, DWORD *pdwData)
-{
-       DWORD dwRetries = 16;
-       DWORD dwIndex = 0;
-       UINT value, tmpVal;
-
-
-       value = 0;
-       rdmalt (Adapter, 0x0f003008, &value, sizeof(value));
-
-       //read 0x0f003020 untill  bit 1 of 0x0f003008 is set.
-       while(((value >> 1) & 1) == 0)
-       {
-
-               rdmalt (Adapter, 0x0f003020, &tmpVal, sizeof(tmpVal));
-               dwRetries--;
-               if(dwRetries == 0)
-               {
-                       return -1;
-               }
-               value = 0;
-               rdmalt (Adapter, 0x0f003008, &value, sizeof(value));
-       }
-
-       value = dwAddress | 0xfb000000;
-       wrmalt (Adapter, 0x0f003018, &value, sizeof(value));
-
-       udelay(1000);
-       value = 0;
-       for(dwIndex = 0;dwIndex < 4 ; dwIndex++)
-       {
-               value = 0;
-               rdmalt (Adapter, 0x0f003020, &value, sizeof(value));
-               pdwData[dwIndex] = value;
-
-               value = 0;
-               rdmalt (Adapter, 0x0f003020, &value, sizeof(value));
-               pdwData[dwIndex] |= (value << 8);
-
-               value = 0;
-               rdmalt (Adapter, 0x0f003020, &value, sizeof(value));
-               pdwData[dwIndex] |= (value << 16);
-
-               value = 0;
-               rdmalt (Adapter, 0x0f003020, &value, sizeof(value));
-               pdwData[dwIndex] |= (value << 24);
-
-       }
-       return 0;
-}
-
-//-----------------------------------------------------------------------------
-// Procedure:  ReadBeceemEEPROM
-//
-// Description: This routine reads 4Byte data from EEPROM
-//
-// Arguments:
-//             Adapter     - ptr to Adapter object instance
-//          dwAddress - EEPROM Offset to read the data from.
-//          pdwData    - Pointer to double word where data needs to be stored in.
-//
-// Returns:
-//             OSAL_STATUS_CODE:
-//-----------------------------------------------------------------------------
-
-INT ReadBeceemEEPROM(PMINI_ADAPTER Adapter,DWORD dwAddress, DWORD *pdwData)
-{
-
-       DWORD dwReadValue = 0;
-       DWORD dwRetries = 16, dwCompleteWord = 0;
-       UINT    value, tmpVal;
-
-       rdmalt(Adapter, 0x0f003008, &value, sizeof(value));
-       while (((value >> 1) & 1) == 0) {
-               rdmalt(Adapter, 0x0f003020, &tmpVal, sizeof(tmpVal));
-
-               if (dwRetries == 0) {
-                       return -1;
-               }
-               rdmalt(Adapter, 0x0f003008, &value, sizeof(value));
-       }
-
-
-       //wrm (0x0f003018, 0xNbXXXXXX)      // N is the number of bytes u want to read  (0 means 1, f means 16,   b is the opcode for page read)
-       //     Follow it up by N executions of  rdm(0x0f003020) to read the rxed bytes from rx queue.
-       dwAddress |= 0x3b000000;
-       wrmalt(Adapter, 0x0f003018,&dwAddress,4);
-       mdelay(10);
-       rdmalt(Adapter, 0x0f003020,&dwReadValue,4);
-       dwCompleteWord=dwReadValue;
-       rdmalt(Adapter, 0x0f003020,&dwReadValue,4);
-       dwCompleteWord|=(dwReadValue<<8);
-       rdmalt(Adapter, 0x0f003020,&dwReadValue,4);
-       dwCompleteWord|=(dwReadValue<<16);
-       rdmalt(Adapter, 0x0f003020,&dwReadValue,4);
-       dwCompleteWord|=(dwReadValue<<24);
-
-       *pdwData = dwCompleteWord;
-
-       return 0;
-}
-#endif
 
 INT ReadMacAddressFromNVM(PMINI_ADAPTER Adapter)
 {
@@ -655,14 +493,6 @@ INT BeceemFlashBulkRead(
 
 UINT BcmGetFlashSize(PMINI_ADAPTER Adapter)
 {
-#if 0
-       if(Adapter->bDDRInitDone)
-       {
-               return rdm(Adapter,FLASH_CONTIGIOUS_START_ADDR_AFTER_INIT|FLASH_SIZE_ADDR);
-       }
-
-       return rdm(Adapter,FLASH_CONTIGIOUS_START_ADDR_BEFORE_INIT|FLASH_SIZE_ADDR);
-#endif
        if(IsFlash2x(Adapter))
                return  (Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + sizeof(DSD_HEADER));
        else
@@ -733,60 +563,6 @@ UINT BcmGetEEPROMSize(PMINI_ADAPTER Adapter)
        return 0;
 }
 
-#if 0
-/***********************************************************************************/
-//
-//  WriteBeceemEEPROM: Writes 4 byte data to EEPROM offset.
-//
-//                     uiEEPROMOffset - Offset to be written to.
-//                     uiData         - Data to be written.
-//
-/***********************************************************************************/
-
-INT WriteBeceemEEPROM(PMINI_ADAPTER Adapter,UINT uiEEPROMOffset, UINT uiData)
-{
-       INT Status = 0;
-       ULONG ulRdBk = 0;
-       ULONG ulRetryCount = 3;
-       UINT value;
-
-       if(uiEEPROMOffset > EEPROM_END)
-       {
-
-               return -1;
-       }
-
-       uiData = htonl(uiData);
-       while(ulRetryCount--)
-       {
-               value = 0x06000000;
-               wrmalt(Adapter, 0x0F003018,&value, sizeof(value));//flush the EEPROM FIFO.
-               wrmalt(Adapter, 0x0F00301C,&uiData, sizeof(uiData));
-               value = 0x3A000000 | uiEEPROMOffset;
-               wrmalt(Adapter, 0x0F003018,&value, sizeof(value));
-               __udelay(100000);
-               //read back and verify.
-               Status = ReadBeceemEEPROM(Adapter,uiEEPROMOffset,(UINT *)&ulRdBk);
-               if(Status == 0)
-               {
-                       if(ulRdBk == uiData)
-                       {
-                               return Status;
-                       }
-                       else
-                       {
-                               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "WriteBeceemEEPROM: Readback does not match\n");
-                       }
-               }
-               else
-               {
-                       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "WriteBeceemEEPROM: Readback failed\n");
-               }
-       }
-
-       return 0;
-}
-#endif
 
 //-----------------------------------------------------------------------------
 // Procedure:  FlashSectorErase
@@ -1353,15 +1129,6 @@ INT BeceemFlashBulkWrite(
        UINT uiTemp                             = 0;
        UINT index                                      = 0;
        UINT uiPartOffset                       = 0;
-       #if 0
-       struct timeval tv1 = {0};
-       struct timeval tv2 = {0};
-
-       struct timeval tr = {0};
-       struct timeval te = {0};
-       struct timeval tw = {0};
-       struct timeval twv = {0};
-       #endif
 
 #if defined(BCM_SHM_INTERFACE) && !defined(FLASH_DIRECT_ACCESS)
   Status = bcmflash_raw_write((uiOffset/FLASH_PART_SIZE),(uiOffset % FLASH_PART_SIZE),( unsigned char *)pBuffer,uiNumBytes);
@@ -1396,7 +1163,6 @@ INT BeceemFlashBulkWrite(
                        uiNumSectTobeRead++;
                }
        }
-       #if 1
        //Check whether Requested sector is writable or not in case of flash2x write. But if  write call is
        // for DSD calibration, allow it without checking of sector permission
 
@@ -1417,7 +1183,6 @@ INT BeceemFlashBulkWrite(
                         index = index + 1 ;
                }
        }
-       #endif
        Adapter->SelectedChip = RESET_CHIP_SELECT;
        while(uiNumSectTobeRead)
        {
@@ -1689,21 +1454,6 @@ static INT BeceemFlashBulkWriteStatus(
                {
                        for(uiIndex = 0;uiIndex < Adapter->uiSectorSize;uiIndex += MAX_RW_SIZE)
                        {
-#if 0
-                               if(0 == BeceemFlashBulkRead(Adapter,uiReadBk,uiOffsetFromSectStart+uiIndex + Adapter->ulFlashCalStart ,MAX_RW_SIZE))
-                               {
-                                       for(uiReadIndex = 0;uiReadIndex < 4; uiReadIndex++)
-                                       {
-                                               if(*((PUINT)&pTempBuff[uiIndex+uiReadIndex*4]) != uiReadBk[uiReadIndex])
-                                               {
-                                                       Status = -1;
-                                                       goto BeceemFlashBulkWriteStatus_EXIT;
-
-                                               }
-                                       }
-
-                               }
-#endif
 
                                if(STATUS_SUCCESS == BeceemFlashBulkRead(Adapter,(PUINT)ucReadBk,uiOffsetFromSectStart+uiIndex,MAX_RW_SIZE))
                                {
@@ -3158,15 +2908,6 @@ INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
 
        Adapter->uiFlashLayoutMajorVersion = uiFlashLayoutMajorVersion;
 
-       #if 0
-       if(FLASH_PART_SST25VF080B == Adapter->ulFlashID)
-       {
-       //
-       // 1MB flash has been selected. we have to use 64K as sector size no matter what is kept in FLASH_CS.
-       //
-               Adapter->uiSectorSize = 0x10000;
-       }
-       #endif
 
        return STATUS_SUCCESS ;
 }
@@ -4837,20 +4578,6 @@ INT      BcmCopySection(PMINI_ADAPTER Adapter,
                return  -EINVAL;
        }
 
-       #if 0
-       else
-       {
-               if((SrcSection == VSA0) || (SrcSection == VSA1) || (SrcSection == VSA2))
-               {
-                       if((DstSection != VSA0) && (DstSection != VSA1) && (DstSection != VSA2))
-                       {
-                               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Source and Destion secton is not of same type");
-                               return -EINVAL;
-                       }
-               }
-
-       }
-       #endif
        //if offset zero means have to copy complete secton
 
        if(numOfBytes == 0)
@@ -4950,14 +4677,6 @@ INT SaveHeaderIfPresent(PMINI_ADAPTER Adapter, PUCHAR pBuff, UINT uiOffset)
        UINT uiSectAlignAddr = 0;
        UINT sig = 0;
 
-       #if 0
-       //if Chenges in Header is allowed, Return back
-       if(Adapter->bHeaderChangeAllowed == TRUE)
-       {
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "Header Change is allowed");
-               return STATUS_SUCCESS ;
-       }
-       #endif
        //making the offset sector alligned
        uiSectAlignAddr = uiOffset & ~(Adapter->uiSectorSize - 1);
 
@@ -5336,39 +5055,6 @@ INT WriteToFlashWithoutSectorErase(PMINI_ADAPTER Adapter,
        return Status;
 }
 
-#if 0
-UINT getNumOfSubSectionWithWRPermisson(PMINI_ADAPTER Adapter, SECTION_TYPE secType)
-{
-
-       UINT numOfWRSubSec = 0;
-       switch(secType)
-       {
-               case ISO :
-                       if(IsSectionWritable(Adapter,ISO_IMAGE1))
-                               numOfWRSubSec = numOfWRSubSec + 1;
-                       if(IsSectionWritable(Adapter,ISO_IMAGE2))
-                               numOfWRSubSec = numOfWRSubSec + 1;
-                       break;
-
-               case DSD :
-                       if(IsSectionWritable(Adapter,DSD2))
-                               numOfWRSubSec = numOfWRSubSec + 1;
-                       if(IsSectionWritable(Adapter,DSD1))
-                               numOfWRSubSec = numOfWRSubSec + 1;
-                       if(IsSectionWritable(Adapter,DSD0))
-                               numOfWRSubSec = numOfWRSubSec + 1;
-                       break ;
-
-               case VSA :
-                               //for VSA Add code Here
-                default :
-                       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Invalid secton<%d> is passed", secType);\
-                       numOfWRSubSec = 0;
-
-       }
-       return numOfWRSubSec;
-}
-#endif
 BOOLEAN IsSectionExistInFlash(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section)
 {