aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/bcm
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/bcm')
-rw-r--r--drivers/staging/bcm/Adapter.h44
-rw-r--r--drivers/staging/bcm/Bcmchar.c35
-rw-r--r--drivers/staging/bcm/CmHost.c60
-rw-r--r--drivers/staging/bcm/DDRInit.c11
-rw-r--r--drivers/staging/bcm/HandleControlPacket.c23
-rw-r--r--drivers/staging/bcm/InterfaceDld.c104
-rw-r--r--drivers/staging/bcm/InterfaceIdleMode.c8
-rw-r--r--drivers/staging/bcm/InterfaceInit.c26
-rw-r--r--drivers/staging/bcm/InterfaceRx.c6
-rw-r--r--drivers/staging/bcm/InterfaceTx.c9
-rw-r--r--drivers/staging/bcm/LeakyBucket.c3
-rw-r--r--drivers/staging/bcm/Misc.c60
-rw-r--r--drivers/staging/bcm/Qos.c9
-rw-r--r--drivers/staging/bcm/led_control.c111
-rw-r--r--drivers/staging/bcm/nvm.c314
15 files changed, 1 insertions, 822 deletions
diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index a411c03f5c7..9f8954bfd5b 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -7,42 +7,6 @@
7#define MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES 256 7#define MAX_FRAGMENTEDIP_CLASSIFICATION_ENTRIES 256
8#include "Debug.h" 8#include "Debug.h"
9 9
10typedef struct _LIST_ENTRY{
11 struct _LIST_ENTRY *next;
12 struct _LIST_ENTRY *prev;
13} LIST_ENTRY, *PLIST_ENTRY;
14
15typedef struct _BCM_LIST_ENTRY {
16
17 LIST_ENTRY Link;
18
19} BCM_LIST_ENTRY, *PBCM_LIST_ENTRY;
20
21typedef enum _RCB_STATUS
22{
23 DRIVER_PROCESSED=1,
24 APPLICATION_PROCESSED
25} RCB_STATUS, *PRCB_STATUS;
26
27#define fFILLED 1
28#define fEMPTY 0
29
30struct _BCM_CB
31{
32 // The network packet that this RCB is receiving
33 PVOID pv_packet;
34 // Describes the length of the packet .
35 UINT ui_packet_length;
36 // Pointer to the first buffer in the packet (only one buffer for Rx)
37 PUCHAR buffer;
38 atomic_t status;
39 UINT filled;
40} __attribute__((packed));
41typedef struct _BCM_CB BCM_CB,*PBCM_CB;
42
43typedef BCM_CB BCM_RCB, *PBCM_RCB;
44typedef BCM_CB BCM_TCB, *PBCM_TCB;
45
46struct _LEADER 10struct _LEADER
47{ 11{
48 USHORT Vcid; 12 USHORT Vcid;
@@ -555,7 +519,7 @@ struct _MINI_ADAPTER
555 unsigned int usIdleModePattern; 519 unsigned int usIdleModePattern;
556 //BOOLEAN bTriedToWakeUpFromShutdown; 520 //BOOLEAN bTriedToWakeUpFromShutdown;
557 BOOLEAN bLinkDownRequested; 521 BOOLEAN bLinkDownRequested;
558 unsigned int check_for_hang; 522
559 int downloadDDR; 523 int downloadDDR;
560 PHS_DEVICE_EXTENSION stBCMPhsContext; 524 PHS_DEVICE_EXTENSION stBCMPhsContext;
561 S_HDR_SUPRESSION_CONTEXTINFO stPhsTxContextInfo; 525 S_HDR_SUPRESSION_CONTEXTINFO stPhsTxContextInfo;
@@ -625,12 +589,6 @@ typedef struct _MINI_ADAPTER MINI_ADAPTER, *PMINI_ADAPTER;
625 589
626#define GET_BCM_ADAPTER(net_dev) netdev_priv(net_dev) 590#define GET_BCM_ADAPTER(net_dev) netdev_priv(net_dev)
627 591
628typedef struct _DEVICE_EXTENSION
629{
630 PMINI_ADAPTER pAdapt;
631}DEVICE_EXTENSION,*PDEVICE_EXTENSION;
632
633
634struct _ETH_HEADER_STRUC { 592struct _ETH_HEADER_STRUC {
635 UCHAR au8DestinationAddress[6]; 593 UCHAR au8DestinationAddress[6];
636 UCHAR au8SourceAddress[6]; 594 UCHAR au8SourceAddress[6];
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 5dbd96aab54..6c9db7227ca 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -1207,10 +1207,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1207 Adapter->usIdleModePattern = ABORT_IDLE_MODE; 1207 Adapter->usIdleModePattern = ABORT_IDLE_MODE;
1208 Adapter->bWakeUpDevice = TRUE; 1208 Adapter->bWakeUpDevice = TRUE;
1209 wake_up(&Adapter->process_rx_cntrlpkt); 1209 wake_up(&Adapter->process_rx_cntrlpkt);
1210 #if 0
1211 Adapter->bTriedToWakeUpFromlowPowerMode = TRUE;
1212 InterfaceAbortIdlemode (Adapter, Adapter->usIdleModePattern);
1213 #endif
1214 } 1210 }
1215 Status = STATUS_SUCCESS; 1211 Status = STATUS_SUCCESS;
1216 break; 1212 break;
@@ -1750,14 +1746,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1750 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"\nsFlash2xRead.offset :%d" ,sFlash2xWrite.offset); 1746 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"\nsFlash2xRead.offset :%d" ,sFlash2xWrite.offset);
1751 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"\nsFlash2xRead.numOfBytes :%x" ,sFlash2xWrite.numOfBytes); 1747 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"\nsFlash2xRead.numOfBytes :%x" ,sFlash2xWrite.numOfBytes);
1752 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"\nsFlash2xRead.bVerify :%x\n" ,sFlash2xWrite.bVerify); 1748 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"\nsFlash2xRead.bVerify :%x\n" ,sFlash2xWrite.bVerify);
1753 #if 0
1754 if((sFlash2xWrite.Section == ISO_IMAGE1) ||(sFlash2xWrite.Section == ISO_IMAGE2) ||
1755 (sFlash2xWrite.Section == DSD0) || (sFlash2xWrite.Section == DSD1) || (sFlash2xWrite.Section == DSD2))
1756 {
1757 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"ISO/DSD Image write is not allowed.... ");
1758 return STATUS_FAILURE ;
1759 }
1760 #endif
1761 if((sFlash2xWrite.Section != VSA0) && (sFlash2xWrite.Section != VSA1) && 1749 if((sFlash2xWrite.Section != VSA0) && (sFlash2xWrite.Section != VSA1) &&
1762 (sFlash2xWrite.Section != VSA2) ) 1750 (sFlash2xWrite.Section != VSA2) )
1763 { 1751 {
@@ -1940,29 +1928,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
1940 Adapter->bAllDSDWriteAllow = FALSE ; 1928 Adapter->bAllDSDWriteAllow = FALSE ;
1941 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"IOCTL_BCM_IDENTIFY_ACTIVE_SECTION called"); 1929 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"IOCTL_BCM_IDENTIFY_ACTIVE_SECTION called");
1942 1930
1943 #if 0
1944 SECTION_TYPE section = 0 ;
1945
1946
1947 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "IOCTL_BCM_IDENTIFY_ACTIVE_SECTION Called");
1948 Status = copy_from_user((PCHAR)&IoBuffer, (PCHAR)arg, sizeof(IOCTL_BUFFER));
1949 if(Status)
1950 {
1951 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Copy of IOCTL BUFFER failed");
1952 return -EFAULT;
1953 }
1954 Status = copy_from_user((PCHAR)section,(PCHAR)&IoBuffer, sizeof(INT));
1955 if(Status)
1956 {
1957 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Copy of section type failed failed");
1958 return -EFAULT;
1959 }
1960 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,"Read Section :%d", section);
1961 if(section == DSD)
1962 Adapter->ulFlashCalStart = Adapter->uiActiveDSDOffsetAtFwDld ;
1963 else
1964 Status = STATUS_FAILURE ;
1965 #endif
1966 Status = STATUS_SUCCESS ; 1931 Status = STATUS_SUCCESS ;
1967 } 1932 }
1968 break ; 1933 break ;
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 1c3ca1e49fe..d0bfdbbeee3 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -1063,12 +1063,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
1063 pstAddIndication->sfAuthorizedSet.u32MaxTrafficBurst); 1063 pstAddIndication->sfAuthorizedSet.u32MaxTrafficBurst);
1064 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u32MinReservedTrafficRate : 0x%X", 1064 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u32MinReservedTrafficRate : 0x%X",
1065 pstAddIndication->sfAuthorizedSet.u32MinReservedTrafficRate); 1065 pstAddIndication->sfAuthorizedSet.u32MinReservedTrafficRate);
1066#if 0
1067 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u32MinimumTolerableTrafficRate : 0x%X",
1068 pstAddIndication->sfAuthorizedSet.u32MinimumTolerableTrafficRate);
1069 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u32RequesttransmissionPolicy : 0x%X",
1070 pstAddIndication->sfAuthorizedSet.u32RequesttransmissionPolicy);
1071#endif
1072 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8VendorSpecificQoSParamLength : 0x%X", 1066 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8VendorSpecificQoSParamLength : 0x%X",
1073 pstAddIndication->sfAuthorizedSet.u8VendorSpecificQoSParamLength); 1067 pstAddIndication->sfAuthorizedSet.u8VendorSpecificQoSParamLength);
1074 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8VendorSpecificQoSParam : 0x%X", 1068 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8VendorSpecificQoSParam : 0x%X",
@@ -1116,13 +1110,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
1116 pstAddIndication->sfAuthorizedSet.u8PagingPreference); 1110 pstAddIndication->sfAuthorizedSet.u8PagingPreference);
1117 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u16UnsolicitedPollingInterval : 0x%X", 1111 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u16UnsolicitedPollingInterval : 0x%X",
1118 pstAddIndication->sfAuthorizedSet.u16UnsolicitedPollingInterval); 1112 pstAddIndication->sfAuthorizedSet.u16UnsolicitedPollingInterval);
1119#if 0
1120 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "MBSZoneIdentifierassignmentLength : 0x%X",
1121 pstAddIndication->sfAuthorizedSet.MBSZoneIdentifierassignmentLength);
1122 for(uiLoopIndex=0; uiLoopIndex < MAX_STRING_LEN; uiLoopIndex++)
1123 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "MBSZoneIdentifierassignment : 0x%X",
1124 pstAddIndication->sfAuthorizedSet.MBSZoneIdentifierassignment[uiLoopIndex]);
1125#endif
1126 1113
1127 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "sfAuthorizedSet.u8HARQChannelMapping %x %x %x ", 1114 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "sfAuthorizedSet.u8HARQChannelMapping %x %x %x ",
1128 *(unsigned int*)pstAddIndication->sfAuthorizedSet.u8HARQChannelMapping, 1115 *(unsigned int*)pstAddIndication->sfAuthorizedSet.u8HARQChannelMapping,
@@ -1160,11 +1147,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
1160 psfCSType->cCPacketClassificationRule.u8IPTypeOfService[0], 1147 psfCSType->cCPacketClassificationRule.u8IPTypeOfService[0],
1161 psfCSType->cCPacketClassificationRule.u8IPTypeOfService[1], 1148 psfCSType->cCPacketClassificationRule.u8IPTypeOfService[1],
1162 psfCSType->cCPacketClassificationRule.u8IPTypeOfService[2]); 1149 psfCSType->cCPacketClassificationRule.u8IPTypeOfService[2]);
1163#if 0
1164
1165 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "u8ProtocolLength :0x%X ",
1166 psfCSType->cCPacketClassificationRule.u8ProtocolLength);
1167#endif
1168 1150
1169 for(uiLoopIndex=0; uiLoopIndex < 1; uiLoopIndex++) 1151 for(uiLoopIndex=0; uiLoopIndex < 1; uiLoopIndex++)
1170 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8Protocol : 0x%02X ", 1152 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8Protocol : 0x%02X ",
@@ -1280,14 +1262,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
1280 pstAddIndication->sfAdmittedSet.u8QosParamSet); 1262 pstAddIndication->sfAdmittedSet.u8QosParamSet);
1281 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8TrafficPriority : 0x%02X", 1263 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8TrafficPriority : 0x%02X",
1282 pstAddIndication->sfAdmittedSet.u8TrafficPriority); 1264 pstAddIndication->sfAdmittedSet.u8TrafficPriority);
1283#if 0
1284 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "u32MaxSustainedTrafficRate : 0x%02X",
1285 ntohl(pstAddIndication->sfAdmittedSet.u32MaxSustainedTrafficRate));
1286 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "u32MinimumTolerableTrafficRate : 0x%X",
1287 pstAddIndication->sfAdmittedSet.u32MinimumTolerableTrafficRate);
1288 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "u32RequesttransmissionPolicy : 0x%X",
1289 pstAddIndication->sfAdmittedSet.u32RequesttransmissionPolicy);
1290#endif
1291 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u32MaxTrafficBurst : 0x%X", 1265 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u32MaxTrafficBurst : 0x%X",
1292 pstAddIndication->sfAdmittedSet.u32MaxTrafficBurst); 1266 pstAddIndication->sfAdmittedSet.u32MaxTrafficBurst);
1293 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u32MinReservedTrafficRate : 0x%X", 1267 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u32MinReservedTrafficRate : 0x%X",
@@ -1341,13 +1315,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
1341 pstAddIndication->sfAdmittedSet.u16TimeBase); 1315 pstAddIndication->sfAdmittedSet.u16TimeBase);
1342 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8PagingPreference : 0x%X", 1316 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8PagingPreference : 0x%X",
1343 pstAddIndication->sfAdmittedSet.u8PagingPreference); 1317 pstAddIndication->sfAdmittedSet.u8PagingPreference);
1344#if 0
1345 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "MBSZoneIdentifierassignmentLength : 0x%X",
1346 pstAddIndication->sfAdmittedSet.MBSZoneIdentifierassignmentLength);
1347 for(uiLoopIndex=0; uiLoopIndex < MAX_STRING_LEN; uiLoopIndex++)
1348 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "MBSZoneIdentifierassignment : 0x%X",
1349 pstAddIndication->sfAdmittedSet.MBSZoneIdentifierassignment[uiLoopIndex]);
1350#endif
1351 1318
1352 1319
1353 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8TrafficIndicationPreference : 0x%02X", 1320 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8TrafficIndicationPreference : 0x%02X",
@@ -1380,11 +1347,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
1380 psfCSType->cCPacketClassificationRule.u8IPTypeOfService[0], 1347 psfCSType->cCPacketClassificationRule.u8IPTypeOfService[0],
1381 psfCSType->cCPacketClassificationRule.u8IPTypeOfService[1], 1348 psfCSType->cCPacketClassificationRule.u8IPTypeOfService[1],
1382 psfCSType->cCPacketClassificationRule.u8IPTypeOfService[2]); 1349 psfCSType->cCPacketClassificationRule.u8IPTypeOfService[2]);
1383#if 0
1384
1385 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8ProtocolLength :0x%02X ",
1386 psfCSType->cCPacketClassificationRule.u8ProtocolLength);
1387#endif
1388 for(uiLoopIndex=0; uiLoopIndex < 1; uiLoopIndex++) 1350 for(uiLoopIndex=0; uiLoopIndex < 1; uiLoopIndex++)
1389 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8Protocol: 0x%02X ", 1351 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8Protocol: 0x%02X ",
1390 psfCSType->cCPacketClassificationRule.u8Protocol); 1352 psfCSType->cCPacketClassificationRule.u8Protocol);
@@ -1499,20 +1461,10 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
1499 pstAddIndication->sfActiveSet.u8QosParamSet); 1461 pstAddIndication->sfActiveSet.u8QosParamSet);
1500 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8TrafficPriority : 0x%02X", 1462 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8TrafficPriority : 0x%02X",
1501 pstAddIndication->sfActiveSet.u8TrafficPriority); 1463 pstAddIndication->sfActiveSet.u8TrafficPriority);
1502#if 0
1503 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "u32MaxSustainedTrafficRate : 0x%02X",
1504 ntohl(pstAddIndication->sfActiveSet.u32MaxSustainedTrafficRate));
1505#endif
1506 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u32MaxTrafficBurst : 0x%X", 1464 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u32MaxTrafficBurst : 0x%X",
1507 pstAddIndication->sfActiveSet.u32MaxTrafficBurst); 1465 pstAddIndication->sfActiveSet.u32MaxTrafficBurst);
1508 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u32MinReservedTrafficRate : 0x%X", 1466 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u32MinReservedTrafficRate : 0x%X",
1509 pstAddIndication->sfActiveSet.u32MinReservedTrafficRate); 1467 pstAddIndication->sfActiveSet.u32MinReservedTrafficRate);
1510#if 0
1511 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "u32MinimumTolerableTrafficRate : 0x%X",
1512 pstAddIndication->sfActiveSet.u32MinimumTolerableTrafficRate);
1513 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "u32RequesttransmissionPolicy : 0x%X",
1514 pstAddIndication->sfActiveSet.u32RequesttransmissionPolicy);
1515#endif
1516 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8VendorSpecificQoSParamLength : 0x%02X", 1468 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8VendorSpecificQoSParamLength : 0x%02X",
1517 pstAddIndication->sfActiveSet.u8VendorSpecificQoSParamLength); 1469 pstAddIndication->sfActiveSet.u8VendorSpecificQoSParamLength);
1518 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8VendorSpecificQoSParam : 0x%02X", 1470 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8VendorSpecificQoSParam : 0x%02X",
@@ -1560,13 +1512,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
1560 pstAddIndication->sfActiveSet.u16TimeBase); 1512 pstAddIndication->sfActiveSet.u16TimeBase);
1561 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " u8PagingPreference : 0x%X", 1513 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " u8PagingPreference : 0x%X",
1562 pstAddIndication->sfActiveSet.u8PagingPreference); 1514 pstAddIndication->sfActiveSet.u8PagingPreference);
1563#if 0
1564 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " MBSZoneIdentifierassignmentLength : 0x%X",
1565 pstAddIndication->sfActiveSet.MBSZoneIdentifierassignmentLength);
1566 for(uiLoopIndex=0; uiLoopIndex < MAX_STRING_LEN; uiLoopIndex++)
1567 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " MBSZoneIdentifierassignment : 0x%X",
1568 pstAddIndication->sfActiveSet.MBSZoneIdentifierassignment[uiLoopIndex]);
1569#endif
1570 1515
1571 1516
1572 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " u8TrafficIndicationPreference : 0x%X", 1517 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " u8TrafficIndicationPreference : 0x%X",
@@ -1599,11 +1544,6 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
1599 psfCSType->cCPacketClassificationRule.u8IPTypeOfService[0], 1544 psfCSType->cCPacketClassificationRule.u8IPTypeOfService[0],
1600 psfCSType->cCPacketClassificationRule.u8IPTypeOfService[1], 1545 psfCSType->cCPacketClassificationRule.u8IPTypeOfService[1],
1601 psfCSType->cCPacketClassificationRule.u8IPTypeOfService[2]); 1546 psfCSType->cCPacketClassificationRule.u8IPTypeOfService[2]);
1602#if 0
1603
1604 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, " u8ProtocolLength :0x%X ",
1605 psfCSType->cCPacketClassificationRule.u8ProtocolLength);
1606#endif
1607 for(uiLoopIndex=0; uiLoopIndex < 1; uiLoopIndex++) 1547 for(uiLoopIndex=0; uiLoopIndex < 1; uiLoopIndex++)
1608 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " u8Protocol : 0x%X ", 1548 BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, " u8Protocol : 0x%X ",
1609 psfCSType->cCPacketClassificationRule.u8Protocol); 1549 psfCSType->cCPacketClassificationRule.u8Protocol);
diff --git a/drivers/staging/bcm/DDRInit.c b/drivers/staging/bcm/DDRInit.c
index 454eb8d8992..411f02a6b6e 100644
--- a/drivers/staging/bcm/DDRInit.c
+++ b/drivers/staging/bcm/DDRInit.c
@@ -187,17 +187,6 @@ static DDR_SET_NODE asDPLL_266MHZ[] = {
187 {0x0f000840,0x0FFF1B00}, 187 {0x0f000840,0x0FFF1B00},
188 {0x0f000870,0x00000002} 188 {0x0f000870,0x00000002}
189 }; 189 };
190#if 0
191static DDR_SET_NODE asDPLL_800MHZ[] = {
192 {0x0f000810,0x00000F95},
193 {0x0f000810,0x00000F95},
194 {0x0f000810,0x00000F95},
195 {0x0f000820,0x03F1365B},
196 {0x0f000840,0x0FFF0000},
197 {0x0f000880,0x000003DD},
198 {0x0f000860,0x00000000}
199 };
200#endif
201 190
202#define T3B_SKIP_CLOCK_PROGRAM_DUMP_133MHZ 11 //index for 0x0F007000 191#define T3B_SKIP_CLOCK_PROGRAM_DUMP_133MHZ 11 //index for 0x0F007000
203static DDR_SET_NODE asT3B_DDRSetting133MHz[] = {// # DPLL Clock Setting 192static DDR_SET_NODE asT3B_DDRSetting133MHz[] = {// # DPLL Clock Setting
diff --git a/drivers/staging/bcm/HandleControlPacket.c b/drivers/staging/bcm/HandleControlPacket.c
index 8cfccaa3803..2d4dbcc215e 100644
--- a/drivers/staging/bcm/HandleControlPacket.c
+++ b/drivers/staging/bcm/HandleControlPacket.c
@@ -186,29 +186,6 @@ int control_packet_handler (PMINI_ADAPTER Adapter /**< pointer to adapter obje
186 DEQUEUEPACKET(Adapter->RxControlHead,Adapter->RxControlTail); 186 DEQUEUEPACKET(Adapter->RxControlHead,Adapter->RxControlTail);
187// Adapter->RxControlHead=ctrl_packet->next; 187// Adapter->RxControlHead=ctrl_packet->next;
188 } 188 }
189 #if 0 //Idle mode debug profiling...
190 if(*(PUSHORT)ctrl_packet->data == IDLE_MODE_STATUS)
191 {
192 puiBuffer = (PUINT)(ctrl_packet->data +sizeof(USHORT));
193 if((ntohl(*puiBuffer) == GO_TO_IDLE_MODE_PAYLOAD))
194 {
195 memset(&tv, 0, sizeof(tv));
196 do_gettimeofday(&tv);
197 if((ntohl(*(puiBuffer+1)) == 0))
198 {
199 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);
200 }
201 else
202 {
203 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);
204 }
205 }
206 else if((ntohl(*puiBuffer) == IDLE_MODE_SF_UPDATE_MSG))
207 {
208 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);
209 }
210 }
211 #endif
212 189
213 spin_unlock_irqrestore (&Adapter->control_queue_lock, flags); 190 spin_unlock_irqrestore (&Adapter->control_queue_lock, flags);
214 handle_rx_control_packet(Adapter, ctrl_packet); 191 handle_rx_control_packet(Adapter, ctrl_packet);
diff --git a/drivers/staging/bcm/InterfaceDld.c b/drivers/staging/bcm/InterfaceDld.c
index e640b75e7dc..1fc36a15f18 100644
--- a/drivers/staging/bcm/InterfaceDld.c
+++ b/drivers/staging/bcm/InterfaceDld.c
@@ -230,41 +230,6 @@ static int bcm_download_config_file(PMINI_ADAPTER Adapter,
230 230
231 return retval; 231 return retval;
232} 232}
233#if 0
234static int bcm_download_buffer(PMINI_ADAPTER Adapter,
235 unsigned char *mappedbuffer, unsigned int u32FirmwareLength,
236 unsigned long u32StartingAddress)
237{
238 char *buff=NULL;
239 unsigned int len = 0;
240 int retval = STATUS_SUCCESS;
241 buff = kzalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_KERNEL);
242
243 len = u32FirmwareLength;
244
245 while(u32FirmwareLength)
246 {
247 len = MIN_VAL (u32FirmwareLength, MAX_TRANSFER_CTRL_BYTE_USB);
248 if(STATUS_SUCCESS != (retval = copy_from_user(buff,
249 (unsigned char *)mappedbuffer, len)))
250 {
251 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "copy_from_user failed\n");
252 break;
253 }
254 retval = wrm (Adapter, u32StartingAddress, buff, len);
255 if(retval)
256 {
257 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "wrm failed\n");
258 break;
259 }
260 u32StartingAddress += len;
261 u32FirmwareLength -= len;
262 mappedbuffer +=len;
263 }
264 kfree(buff);
265 return retval;
266}
267#endif
268static int bcm_compare_buff_contents(unsigned char *readbackbuff, 233static int bcm_compare_buff_contents(unsigned char *readbackbuff,
269 unsigned char *buff,unsigned int len) 234 unsigned char *buff,unsigned int len)
270{ 235{
@@ -296,58 +261,6 @@ static int bcm_compare_buff_contents(unsigned char *readbackbuff,
296 } 261 }
297 return retval; 262 return retval;
298} 263}
299#if 0
300static int bcm_buffer_readback(PMINI_ADAPTER Adapter,
301 unsigned char *mappedbuffer, unsigned int u32FirmwareLength,
302 unsigned long u32StartingAddress)
303{
304 unsigned char *buff = NULL;
305 unsigned char *readbackbuff = NULL;
306 unsigned int len = u32FirmwareLength;
307 int retval = STATUS_SUCCESS;
308
309 buff=(unsigned char *)kzalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_KERNEL);
310 if(NULL == buff)
311 return -ENOMEM;
312 readbackbuff = (unsigned char *)kzalloc(MAX_TRANSFER_CTRL_BYTE_USB,
313 GFP_KERNEL);
314 if(NULL == readbackbuff)
315 {
316 kfree(buff);
317 return -ENOMEM;
318 }
319 while (u32FirmwareLength && !retval)
320 {
321 len = MIN_VAL (u32FirmwareLength, MAX_TRANSFER_CTRL_BYTE_USB);
322
323 /* read from the appl buff and then read from the target, compare */
324 if(STATUS_SUCCESS != (retval = copy_from_user(buff,
325 (unsigned char *)mappedbuffer, len)))
326 {
327 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "copy_from_user failed\n");
328 break;
329 }
330 retval = rdm (Adapter, u32StartingAddress, readbackbuff, len);
331 if(retval)
332 {
333 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "rdm failed\n");
334 break;
335 }
336
337 if (STATUS_SUCCESS !=
338 (retval = bcm_compare_buff_contents (readbackbuff, buff, len)))
339 {
340 break;
341 }
342 u32StartingAddress += len;
343 u32FirmwareLength -= len;
344 mappedbuffer +=len;
345 }/* end of while (u32FirmwareLength && !retval) */
346 kfree(buff);
347 kfree(readbackbuff);
348 return retval;
349}
350#endif
351int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo) 264int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo)
352{ 265{
353 int retval = STATUS_SUCCESS; 266 int retval = STATUS_SUCCESS;
@@ -388,23 +301,6 @@ int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo)
388 goto error ; 301 goto error ;
389 } 302 }
390 303
391 #if 0
392 retval = bcm_download_buffer(Adapter,
393 (unsigned char *)psFwInfo->pvMappedFirmwareAddress,
394 psFwInfo->u32FirmwareLength, psFwInfo->u32StartingAddress);
395 if(retval != STATUS_SUCCESS)
396 {
397 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "User space buffer download fails....");
398 }
399 retval = bcm_buffer_readback (Adapter,
400 (unsigned char *)psFwInfo->pvMappedFirmwareAddress,
401 psFwInfo->u32FirmwareLength, psFwInfo->u32StartingAddress);
402
403 if(retval != STATUS_SUCCESS)
404 {
405 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "read back verifier failed ....");
406 }
407 #endif
408 retval = buffDnldVerify(Adapter, 304 retval = buffDnldVerify(Adapter,
409 buff, 305 buff,
410 psFwInfo->u32FirmwareLength, 306 psFwInfo->u32FirmwareLength,
diff --git a/drivers/staging/bcm/InterfaceIdleMode.c b/drivers/staging/bcm/InterfaceIdleMode.c
index 0750382733f..3a7780be7fe 100644
--- a/drivers/staging/bcm/InterfaceIdleMode.c
+++ b/drivers/staging/bcm/InterfaceIdleMode.c
@@ -98,14 +98,6 @@ int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer)
98 Adapter->bTriedToWakeUpFromlowPowerMode = FALSE; 98 Adapter->bTriedToWakeUpFromlowPowerMode = FALSE;
99 99
100 wake_up(&Adapter->lowpower_mode_wait_queue); 100 wake_up(&Adapter->lowpower_mode_wait_queue);
101 #if 0
102 if(Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY)
103 {
104 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL,"LED Thread is Running. Hence Setting the LED Event as IDLEMODE_EXIT");
105 Adapter->DriverState = IDLEMODE_EXIT;
106 wake_up(&Adapter->LEDInfo.notify_led_event);
107 }
108 #endif
109 101
110 } 102 }
111 else 103 else
diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/InterfaceInit.c
index 845ced1670e..dddf34bb7c8 100644
--- a/drivers/staging/bcm/InterfaceInit.c
+++ b/drivers/staging/bcm/InterfaceInit.c
@@ -419,32 +419,6 @@ static int device_run(PS_INTERFACE_ADAPTER psIntfAdapter)
419 return 0; 419 return 0;
420} 420}
421 421
422#if 0
423static void print_usb_interface_desc(struct usb_interface_descriptor *usb_intf_desc)
424{
425 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "**************** INTERFACE DESCRIPTOR *********************");
426 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bLength: %x", usb_intf_desc->bLength);
427 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bDescriptorType: %x", usb_intf_desc->bDescriptorType);
428 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bInterfaceNumber: %x", usb_intf_desc->bInterfaceNumber);
429 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bAlternateSetting: %x", usb_intf_desc->bAlternateSetting);
430 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bNumEndpoints: %x", usb_intf_desc->bNumEndpoints);
431 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bInterfaceClass: %x", usb_intf_desc->bInterfaceClass);
432 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bInterfaceSubClass: %x", usb_intf_desc->bInterfaceSubClass);
433 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bInterfaceProtocol: %x", usb_intf_desc->bInterfaceProtocol);
434 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "iInterface :%x\n",usb_intf_desc->iInterface);
435}
436static void print_usb_endpoint_descriptor(struct usb_endpoint_descriptor *usb_ep_desc)
437{
438 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "**************** ENDPOINT DESCRIPTOR *********************");
439 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bLength :%x ", usb_ep_desc->bLength);
440 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bDescriptorType :%x ", usb_ep_desc->bDescriptorType);
441 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bEndpointAddress :%x ", usb_ep_desc->bEndpointAddress);
442 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bmAttributes :%x ", usb_ep_desc->bmAttributes);
443 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "wMaxPacketSize :%x ",usb_ep_desc->wMaxPacketSize);
444 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "bInterval :%x ",usb_ep_desc->bInterval);
445}
446
447#endif
448 422
449static inline int bcm_usb_endpoint_num(const struct usb_endpoint_descriptor *epd) 423static inline int bcm_usb_endpoint_num(const struct usb_endpoint_descriptor *epd)
450{ 424{
diff --git a/drivers/staging/bcm/InterfaceRx.c b/drivers/staging/bcm/InterfaceRx.c
index ab33895bfe5..6f1ed78c975 100644
--- a/drivers/staging/bcm/InterfaceRx.c
+++ b/drivers/staging/bcm/InterfaceRx.c
@@ -39,12 +39,6 @@ static void read_bulk_callback(struct urb *urb)
39 PLEADER pLeader = urb->transfer_buffer; 39 PLEADER pLeader = urb->transfer_buffer;
40 40
41 41
42 #if 0
43 int *puiBuffer = NULL;
44 struct timeval tv;
45 memset(&tv, 0, sizeof(tv));
46 do_gettimeofday(&tv);
47 #endif
48 42
49 if((Adapter->device_removed == TRUE) || 43 if((Adapter->device_removed == TRUE) ||
50 (TRUE == Adapter->bEndPointHalted) || 44 (TRUE == Adapter->bEndPointHalted) ||
diff --git a/drivers/staging/bcm/InterfaceTx.c b/drivers/staging/bcm/InterfaceTx.c
index b53848b6fc0..a3dadf19538 100644
--- a/drivers/staging/bcm/InterfaceTx.c
+++ b/drivers/staging/bcm/InterfaceTx.c
@@ -9,10 +9,6 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
9 PMINI_ADAPTER psAdapter = psIntfAdapter->psAdapter ; 9 PMINI_ADAPTER psAdapter = psIntfAdapter->psAdapter ;
10 BOOLEAN bpowerDownMsg = FALSE ; 10 BOOLEAN bpowerDownMsg = FALSE ;
11 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev); 11 PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
12#if 0
13 struct timeval tv;
14 UINT time_ms = 0;
15#endif
16 if(urb->status != STATUS_SUCCESS) 12 if(urb->status != STATUS_SUCCESS)
17 { 13 {
18 if(urb->status == -EPIPE) 14 if(urb->status == -EPIPE)
@@ -33,11 +29,6 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
33 29
34 if(TRUE == psAdapter->bPreparingForLowPowerMode) 30 if(TRUE == psAdapter->bPreparingForLowPowerMode)
35 { 31 {
36 #if 0
37 do_gettimeofday(&tv);
38 time_ms = tv.tv_sec *1000 + tv.tv_usec/1000;
39 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, " %s Idle Mode ACK_Sent got from device at time :0x%x", __FUNCTION__, time_ms);
40 #endif
41 32
42 if(((pControlMsg->szData[0] == GO_TO_IDLE_MODE_PAYLOAD) && 33 if(((pControlMsg->szData[0] == GO_TO_IDLE_MODE_PAYLOAD) &&
43 (pControlMsg->szData[1] == TARGET_CAN_GO_TO_IDLE_MODE))) 34 (pControlMsg->szData[1] == TARGET_CAN_GO_TO_IDLE_MODE)))
diff --git a/drivers/staging/bcm/LeakyBucket.c b/drivers/staging/bcm/LeakyBucket.c
index 9c73862d512..f9e8f2bb06d 100644
--- a/drivers/staging/bcm/LeakyBucket.c
+++ b/drivers/staging/bcm/LeakyBucket.c
@@ -183,9 +183,6 @@ static VOID CheckAndSendPacketFromIndex(PMINI_ADAPTER Adapter, PacketInfo *psSF)
183 return ; 183 return ;
184 } 184 }
185 185
186#if 0
187 PruneQueue(Adapter,(psSF-Adapter->PackInfo));
188#endif
189 spin_lock_bh(&psSF->SFQueueLock); 186 spin_lock_bh(&psSF->SFQueueLock);
190 QueuePacket=psSF->FirstTxQueue; 187 QueuePacket=psSF->FirstTxQueue;
191 188
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index dfc4f3fff2b..0ada848fe1e 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -365,13 +365,6 @@ INT CopyBufferToControlPacket(PMINI_ADAPTER Adapter,/**<Logical Adapter*/
365 /*Setting bIdleMode_tx_from_host to TRUE to indicate LED control thread to represent 365 /*Setting bIdleMode_tx_from_host to TRUE to indicate LED control thread to represent
366 the wake up from idlemode is from host*/ 366 the wake up from idlemode is from host*/
367 //Adapter->LEDInfo.bIdleMode_tx_from_host = TRUE; 367 //Adapter->LEDInfo.bIdleMode_tx_from_host = TRUE;
368#if 0
369 if(STATUS_SUCCESS != InterfaceIdleModeWakeup(Adapter))
370 {
371 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Idle Mode Wake up Failed\n");
372 return STATUS_FAILURE;
373 }
374#endif
375 Adapter->bWakeUpDevice = TRUE; 368 Adapter->bWakeUpDevice = TRUE;
376 wake_up(&Adapter->process_rx_cntrlpkt); 369 wake_up(&Adapter->process_rx_cntrlpkt);
377 370
@@ -1220,12 +1213,6 @@ int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter)
1220 goto OUT; 1213 goto OUT;
1221 } 1214 }
1222 } 1215 }
1223#if 0
1224 else if(psAdapter->eNVMType == NVM_EEPROM)
1225 {
1226 PropagateCalParamsFromEEPROMToMemory();
1227 }
1228#endif
1229 1216
1230 /* Download Firmare */ 1217 /* Download Firmare */
1231 if ((status = BcmFileDownload( ps_adapter, BIN_FILE, FIRMWARE_BEGIN_ADDR))) 1218 if ((status = BcmFileDownload( ps_adapter, BIN_FILE, FIRMWARE_BEGIN_ADDR)))
@@ -1405,16 +1392,6 @@ VOID doPowerAutoCorrection(PMINI_ADAPTER psAdapter)
1405 if (psAdapter->bIsAutoCorrectEnabled && (psAdapter->chip_id >= T3LPB)) 1392 if (psAdapter->bIsAutoCorrectEnabled && (psAdapter->chip_id >= T3LPB))
1406 { 1393 {
1407 //If reporting mode is enable, switch PMU to PMC 1394 //If reporting mode is enable, switch PMU to PMC
1408 #if 0
1409 if(reporting_mode == FALSE)
1410 {
1411 psAdapter->ulPowerSaveMode = DEVICE_POWERSAVE_MODE_AS_PMU_SHUTDOWN;
1412 psAdapter->bDoSuspend = TRUE;
1413 BCM_DEBUG_PRINT(psAdapter,DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL,"PMU selected ....");
1414
1415 }
1416 else
1417 #endif
1418 { 1395 {
1419 psAdapter->ulPowerSaveMode = DEVICE_POWERSAVE_MODE_AS_PMU_CLOCK_GATING; 1396 psAdapter->ulPowerSaveMode = DEVICE_POWERSAVE_MODE_AS_PMU_CLOCK_GATING;
1420 psAdapter->bDoSuspend =FALSE; 1397 psAdapter->bDoSuspend =FALSE;
@@ -1481,43 +1458,6 @@ OUT:
1481} 1458}
1482#endif 1459#endif
1483 1460
1484#if 0
1485INT ReadMacAddressFromEEPROM(PMINI_ADAPTER Adapter)
1486{
1487 unsigned char *puMacAddr = NULL;
1488 int i =0;
1489
1490 puMacAddr = ReadMacAddrEEPROM(Adapter,0x200);
1491 if(!puMacAddr)
1492 {
1493 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Couldn't retrieve the Mac Address\n");
1494 return STATUS_FAILURE;
1495 }
1496 else
1497 {
1498 if((puMacAddr[0] == 0x0 && puMacAddr[1] == 0x0 &&
1499 puMacAddr[2] == 0x0 && puMacAddr[3] == 0x0 &&
1500 puMacAddr[4] == 0x0 && puMacAddr[5] == 0x0) ||
1501 (puMacAddr[0] == 0xFF && puMacAddr[1] == 0xFF &&
1502 puMacAddr[2] == 0xFF && puMacAddr[3] == 0xFF &&
1503 puMacAddr[4] == 0xFF && puMacAddr[5] == 0xFF))
1504 {
1505 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "Invalid Mac Address\n");
1506 kfree(puMacAddr);
1507 return STATUS_FAILURE;
1508 }
1509 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL, "The Mac Address received is: \n");
1510 memcpy(Adapter->dev->dev_addr, puMacAddr, MAC_ADDRESS_SIZE);
1511 for(i=0;i<MAC_ADDRESS_SIZE;i++)
1512 {
1513 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"%02x ", Adapter->dev->dev_addr[i]);
1514 }
1515 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"\n");
1516 kfree(puMacAddr);
1517 }
1518 return STATUS_SUCCESS;
1519}
1520#endif
1521 1461
1522static void convertEndian(B_UINT8 rwFlag, PUINT puiBuffer, UINT uiByteCount) 1462static void convertEndian(B_UINT8 rwFlag, PUINT puiBuffer, UINT uiByteCount)
1523{ 1463{
diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index f85a5a85ad5..7e8013c105a 100644
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -254,15 +254,6 @@ USHORT IpVersion4(PMINI_ADAPTER Adapter, /**< Pointer to the driver control stru
254 //if protocol is not TCP or UDP then no need of comparing source port and destination port 254 //if protocol is not TCP or UDP then no need of comparing source port and destination port
255 if(iphd->protocol!=TCP && iphd->protocol!=UDP) 255 if(iphd->protocol!=TCP && iphd->protocol!=UDP)
256 break; 256 break;
257#if 0
258 //check if memory is available of src and Dest port
259 if(ETH_AND_IP_HEADER_LEN + L4_SRC_PORT_LEN + L4_DEST_PORT_LEN > Packet->len)
260 {
261 //This is not an erroneous condition and pkt will be checked for next classification.
262 bClassificationSucceed = FALSE;
263 break;
264 }
265#endif
266 //******************Checking Transport Layer Header field if present *****************// 257 //******************Checking Transport Layer Header field if present *****************//
267 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Source Port %04x", 258 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Source Port %04x",
268 (iphd->protocol==UDP)?xprt_hdr->uhdr.source:xprt_hdr->thdr.source); 259 (iphd->protocol==UDP)?xprt_hdr->uhdr.source:xprt_hdr->thdr.source);
diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c
index 79c7bd74804..a21d219f428 100644
--- a/drivers/staging/bcm/led_control.c
+++ b/drivers/staging/bcm/led_control.c
@@ -116,44 +116,7 @@ static INT LED_Proportional_Blink(PMINI_ADAPTER Adapter, UCHAR GPIO_Num_tx,
116 116
117 while((Adapter->device_removed == FALSE)) 117 while((Adapter->device_removed == FALSE))
118 { 118 {
119 #if 0
120 if(0 == num_of_time_tx && 0 == num_of_time_rx)
121 {
122 timeout = 1000;
123 Status = wait_event_interruptible_timeout(Adapter->LEDInfo.notify_led_event,
124 currdriverstate!= Adapter->DriverState || kthread_should_stop(),
125 msecs_to_jiffies (timeout));
126 if(kthread_should_stop())
127 {
128 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL, "Led thread got signal to exit..hence exiting");
129 Adapter->LEDInfo.led_thread_running= BCM_LED_THREAD_DISABLED;
130 return EVENT_SIGNALED;
131 }
132 if(Status)
133 return EVENT_SIGNALED;
134
135 }
136 #endif
137
138 timeout = 50; 119 timeout = 50;
139 #if 0
140 /*Turn on LED if Tx is high bandwidth*/
141 if(num_of_time_tx > MAX_NUM_OF_BLINKS)
142 {
143 TURN_ON_LED(1<<GPIO_Num_tx, uiTxLedIndex);
144 num_of_time_tx = 0;
145 bBlinkBothLED = FALSE;
146 num_of_time = num_of_time_rx;
147 }
148 /*Turn on LED if Rx is high bandwidth*/
149 if(num_of_time_rx > MAX_NUM_OF_BLINKS)
150 {
151 TURN_ON_LED(1<<GPIO_Num_rx, uiRxLedIndex);
152 num_of_time_rx = 0;
153 bBlinkBothLED = FALSE;
154 num_of_time = num_of_time_tx;
155 }
156 #endif
157 /*Blink Tx and Rx LED when both Tx and Rx is in normal bandwidth*/ 120 /*Blink Tx and Rx LED when both Tx and Rx is in normal bandwidth*/
158 if(bBlinkBothLED) 121 if(bBlinkBothLED)
159 { 122 {
@@ -570,21 +533,6 @@ static int ReadConfigFileStructure(PMINI_ADAPTER Adapter, BOOLEAN *bEnableThread
570 if(uiNum_of_LED_Type >= NUM_OF_LEDS) 533 if(uiNum_of_LED_Type >= NUM_OF_LEDS)
571 *bEnableThread = FALSE; 534 *bEnableThread = FALSE;
572 535
573#if 0
574 for(uiIndex=0; uiIndex<NUM_OF_LEDS; uiIndex++)
575 {
576 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LEDState[%d].LED_Type = %x\n", uiIndex,
577 Adapter->LEDInfo.LEDState[uiIndex].LED_Type);
578 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LEDState[%d].LED_On_State = %x\n", uiIndex,
579 Adapter->LEDInfo.LEDState[uiIndex].LED_On_State);
580 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LEDState[%d].LED_Blink_State = %x\n", uiIndex,
581 Adapter->LEDInfo.LEDState[uiIndex].LED_Blink_State);
582 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LEDState[%d].GPIO_Num = %x\n", uiIndex,
583 Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num);
584 }
585 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: Polarity = %d\n",
586 Adapter->LEDInfo.BitPolarty);
587#endif
588 return Status; 536 return Status;
589} 537}
590//-------------------------------------------------------------------------- 538//--------------------------------------------------------------------------
@@ -711,20 +659,6 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
711 TURN_OFF_LED(1<<GPIO_num, uiLedIndex); 659 TURN_OFF_LED(1<<GPIO_num, uiLedIndex);
712 return ;//STATUS_FAILURE; 660 return ;//STATUS_FAILURE;
713 } 661 }
714 #if 0
715 if(Adapter->device_removed)
716 {
717 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"Device removed hence exiting from Led Thread..");
718 return ; //-ENODEV;
719 }
720 #endif
721 #if 0
722 if((GPIO_num != DISABLE_GPIO_NUM) &&
723 ((currdriverstate != FW_DOWNLOAD) &&
724 (currdriverstate != NORMAL_OPERATION) &&
725 (currdriverstate != IDLEMODE_EXIT)))
726 TURN_OFF_LED(1<<GPIO_num, uiLedIndex);
727 #endif
728 662
729 if(GPIO_num != DISABLE_GPIO_NUM) 663 if(GPIO_num != DISABLE_GPIO_NUM)
730 { 664 {
@@ -742,10 +676,6 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
742 case DRIVER_INIT: 676 case DRIVER_INIT:
743 { 677 {
744 currdriverstate = DRIVER_INIT;//Adapter->DriverState; 678 currdriverstate = DRIVER_INIT;//Adapter->DriverState;
745 #if 0
746 LedGpioInit(Adapter);
747 Adapter->LEDInfo.bLedInitDone = TRUE;
748 #endif
749 BcmGetGPIOPinInfo(Adapter, &GPIO_num, &dummyGPIONum, &uiLedIndex, &dummyIndex, currdriverstate); 679 BcmGetGPIOPinInfo(Adapter, &GPIO_num, &dummyGPIONum, &uiLedIndex, &dummyIndex, currdriverstate);
750 680
751 if(GPIO_num != DISABLE_GPIO_NUM) 681 if(GPIO_num != DISABLE_GPIO_NUM)
@@ -758,13 +688,6 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
758 { 688 {
759 //BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: FW_DN_DONE called\n"); 689 //BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: FW_DN_DONE called\n");
760 currdriverstate = FW_DOWNLOAD; 690 currdriverstate = FW_DOWNLOAD;
761 #if 0
762 if(Adapter->LEDInfo.bLedInitDone == FALSE)
763 {
764 LedGpioInit(Adapter);
765 Adapter->LEDInfo.bLedInitDone = TRUE;
766 }
767 #endif
768 BcmGetGPIOPinInfo(Adapter, &GPIO_num, &dummyGPIONum, &uiLedIndex, &dummyIndex, currdriverstate); 691 BcmGetGPIOPinInfo(Adapter, &GPIO_num, &dummyGPIONum, &uiLedIndex, &dummyIndex, currdriverstate);
769 692
770 if(GPIO_num != DISABLE_GPIO_NUM) 693 if(GPIO_num != DISABLE_GPIO_NUM)
@@ -786,12 +709,6 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
786 break; 709 break;
787 710
788 case SHUTDOWN_EXIT: 711 case SHUTDOWN_EXIT:
789 #if 0
790 if(Adapter->ulPowerSaveMode == DEVICE_POWERSAVE_MODE_AS_PMU_SHUTDOWN)
791 {
792 LedGpioInit(Adapter);
793 }
794 #endif
795 //no break, continue to NO_NETWORK_ENTRY state as well. 712 //no break, continue to NO_NETWORK_ENTRY state as well.
796 713
797 case NO_NETWORK_ENTRY: 714 case NO_NETWORK_ENTRY:
@@ -865,34 +782,6 @@ static VOID LEDControlThread(PMINI_ADAPTER Adapter)
865 break; 782 break;
866 case IDLEMODE_EXIT: 783 case IDLEMODE_EXIT:
867 { 784 {
868#if 0
869 UCHAR GPIO_num_tx = DISABLE_GPIO_NUM;
870 UCHAR GPIO_num_rx = DISABLE_GPIO_NUM;
871 UCHAR uiTxLedIndex = 0;
872 UCHAR uiRxLedIndex = 0;
873
874 currdriverstate = IDLEMODE_EXIT;
875 if(DEVICE_POWERSAVE_MODE_AS_PMU_SHUTDOWN == Adapter->ulPowerSaveMode)
876 {
877 LedGpioInit(Adapter);
878 }
879 BcmGetGPIOPinInfo(Adapter, &GPIO_num_tx, &GPIO_num_rx, &uiTxLedIndex,&uiRxLedIndex,currdriverstate);
880
881 Adapter->LEDInfo.bIdle_led_off = FALSE;
882
883 if((GPIO_num_tx == DISABLE_GPIO_NUM) && (GPIO_num_rx == DISABLE_GPIO_NUM))
884 {
885 GPIO_num = DISABLE_GPIO_NUM ;
886 }
887 else
888 {
889 timeout = 50;
890 if(Adapter->LEDInfo.bIdleMode_tx_from_host)
891 LED_Blink(Adapter, 1<<GPIO_num_tx, uiTxLedIndex, timeout, -1,currdriverstate);
892 else
893 LED_Blink(Adapter, 1<<GPIO_num_rx, uiRxLedIndex, timeout, -1,currdriverstate);
894 }
895#endif
896 } 785 }
897 break; 786 break;
898 case DRIVER_HALT: 787 case DRIVER_HALT:
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index 4a020533474..4f1b35a68b7 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -234,168 +234,6 @@ INT ReadBeceemEEPROM( PMINI_ADAPTER Adapter,
234} /* ReadBeceemEEPROM() */ 234} /* ReadBeceemEEPROM() */
235 235
236 236
237#if 0
238//-----------------------------------------------------------------------------
239// Procedure: IsEEPROMWriteDone
240//
241// Description: Reads the SPI status to see the status of previous write.
242//
243// Arguments:
244// Adapter - ptr to Adapter object instance
245//
246// Returns:
247// BOOLEAN - TRUE - write went through
248// - FALSE - Write Failed.
249//-----------------------------------------------------------------------------
250
251BOOLEAN IsEEPROMWriteDone(PMINI_ADAPTER Adapter)
252{
253 UINT uiRetries = 16;
254 //UINT uiStatus = 0;
255 UINT value;
256
257 //sleep for 1.2ms ..worst case EEPROM write can take up to 1.2ms.
258 mdelay(2);
259
260 value = 0;
261 rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &value, sizeof(value));
262
263 while(((value >> 14) & 1) == 1)
264 {
265 // EEPROM_SPI_Q_STATUS1_REG will be cleared only if write back to that.
266 value = (0x1 << 14);
267 wrmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG,&value, sizeof(value));
268 udelay(1000);
269 uiRetries--;
270 if(uiRetries == 0)
271 {
272 return FALSE;
273 }
274 value = 0;
275 rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &value, sizeof(value));
276 }
277 return TRUE;
278
279
280}
281
282
283//-----------------------------------------------------------------------------
284// Procedure: ReadBeceemEEPROMBulk
285//
286// Description: This routine reads 16Byte data from EEPROM
287//
288// Arguments:
289// Adapter - ptr to Adapter object instance
290// dwAddress - EEPROM Offset to read the data from.
291// pdwData - Pointer to double word where data needs to be stored in.
292//
293// Returns:
294// OSAL_STATUS_CODE:
295//-----------------------------------------------------------------------------
296
297INT ReadBeceemEEPROMBulk(PMINI_ADAPTER Adapter,DWORD dwAddress, DWORD *pdwData)
298{
299 DWORD dwRetries = 16;
300 DWORD dwIndex = 0;
301 UINT value, tmpVal;
302
303
304 value = 0;
305 rdmalt (Adapter, 0x0f003008, &value, sizeof(value));
306
307 //read 0x0f003020 untill bit 1 of 0x0f003008 is set.
308 while(((value >> 1) & 1) == 0)
309 {
310
311 rdmalt (Adapter, 0x0f003020, &tmpVal, sizeof(tmpVal));
312 dwRetries--;
313 if(dwRetries == 0)
314 {
315 return -1;
316 }
317 value = 0;
318 rdmalt (Adapter, 0x0f003008, &value, sizeof(value));
319 }
320
321 value = dwAddress | 0xfb000000;
322 wrmalt (Adapter, 0x0f003018, &value, sizeof(value));
323
324 udelay(1000);
325 value = 0;
326 for(dwIndex = 0;dwIndex < 4 ; dwIndex++)
327 {
328 value = 0;
329 rdmalt (Adapter, 0x0f003020, &value, sizeof(value));
330 pdwData[dwIndex] = value;
331
332 value = 0;
333 rdmalt (Adapter, 0x0f003020, &value, sizeof(value));
334 pdwData[dwIndex] |= (value << 8);
335
336 value = 0;
337 rdmalt (Adapter, 0x0f003020, &value, sizeof(value));
338 pdwData[dwIndex] |= (value << 16);
339
340 value = 0;
341 rdmalt (Adapter, 0x0f003020, &value, sizeof(value));
342 pdwData[dwIndex] |= (value << 24);
343
344 }
345 return 0;
346}
347
348//-----------------------------------------------------------------------------
349// Procedure: ReadBeceemEEPROM
350//
351// Description: This routine reads 4Byte data from EEPROM
352//
353// Arguments:
354// Adapter - ptr to Adapter object instance
355// dwAddress - EEPROM Offset to read the data from.
356// pdwData - Pointer to double word where data needs to be stored in.
357//
358// Returns:
359// OSAL_STATUS_CODE:
360//-----------------------------------------------------------------------------
361
362INT ReadBeceemEEPROM(PMINI_ADAPTER Adapter,DWORD dwAddress, DWORD *pdwData)
363{
364
365 DWORD dwReadValue = 0;
366 DWORD dwRetries = 16, dwCompleteWord = 0;
367 UINT value, tmpVal;
368
369 rdmalt(Adapter, 0x0f003008, &value, sizeof(value));
370 while (((value >> 1) & 1) == 0) {
371 rdmalt(Adapter, 0x0f003020, &tmpVal, sizeof(tmpVal));
372
373 if (dwRetries == 0) {
374 return -1;
375 }
376 rdmalt(Adapter, 0x0f003008, &value, sizeof(value));
377 }
378
379
380 //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)
381 // Follow it up by N executions of rdm(0x0f003020) to read the rxed bytes from rx queue.
382 dwAddress |= 0x3b000000;
383 wrmalt(Adapter, 0x0f003018,&dwAddress,4);
384 mdelay(10);
385 rdmalt(Adapter, 0x0f003020,&dwReadValue,4);
386 dwCompleteWord=dwReadValue;
387 rdmalt(Adapter, 0x0f003020,&dwReadValue,4);
388 dwCompleteWord|=(dwReadValue<<8);
389 rdmalt(Adapter, 0x0f003020,&dwReadValue,4);
390 dwCompleteWord|=(dwReadValue<<16);
391 rdmalt(Adapter, 0x0f003020,&dwReadValue,4);
392 dwCompleteWord|=(dwReadValue<<24);
393
394 *pdwData = dwCompleteWord;
395
396 return 0;
397}
398#endif
399 237
400INT ReadMacAddressFromNVM(PMINI_ADAPTER Adapter) 238INT ReadMacAddressFromNVM(PMINI_ADAPTER Adapter)
401{ 239{
@@ -655,14 +493,6 @@ INT BeceemFlashBulkRead(
655 493
656UINT BcmGetFlashSize(PMINI_ADAPTER Adapter) 494UINT BcmGetFlashSize(PMINI_ADAPTER Adapter)
657{ 495{
658#if 0
659 if(Adapter->bDDRInitDone)
660 {
661 return rdm(Adapter,FLASH_CONTIGIOUS_START_ADDR_AFTER_INIT|FLASH_SIZE_ADDR);
662 }
663
664 return rdm(Adapter,FLASH_CONTIGIOUS_START_ADDR_BEFORE_INIT|FLASH_SIZE_ADDR);
665#endif
666 if(IsFlash2x(Adapter)) 496 if(IsFlash2x(Adapter))
667 return (Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + sizeof(DSD_HEADER)); 497 return (Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + sizeof(DSD_HEADER));
668 else 498 else
@@ -733,60 +563,6 @@ UINT BcmGetEEPROMSize(PMINI_ADAPTER Adapter)
733 return 0; 563 return 0;
734} 564}
735 565
736#if 0
737/***********************************************************************************/
738//
739// WriteBeceemEEPROM: Writes 4 byte data to EEPROM offset.
740//
741// uiEEPROMOffset - Offset to be written to.
742// uiData - Data to be written.
743//
744/***********************************************************************************/
745
746INT WriteBeceemEEPROM(PMINI_ADAPTER Adapter,UINT uiEEPROMOffset, UINT uiData)
747{
748 INT Status = 0;
749 ULONG ulRdBk = 0;
750 ULONG ulRetryCount = 3;
751 UINT value;
752
753 if(uiEEPROMOffset > EEPROM_END)
754 {
755
756 return -1;
757 }
758
759 uiData = htonl(uiData);
760 while(ulRetryCount--)
761 {
762 value = 0x06000000;
763 wrmalt(Adapter, 0x0F003018,&value, sizeof(value));//flush the EEPROM FIFO.
764 wrmalt(Adapter, 0x0F00301C,&uiData, sizeof(uiData));
765 value = 0x3A000000 | uiEEPROMOffset;
766 wrmalt(Adapter, 0x0F003018,&value, sizeof(value));
767 __udelay(100000);
768 //read back and verify.
769 Status = ReadBeceemEEPROM(Adapter,uiEEPROMOffset,(UINT *)&ulRdBk);
770 if(Status == 0)
771 {
772 if(ulRdBk == uiData)
773 {
774 return Status;
775 }
776 else
777 {
778 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "WriteBeceemEEPROM: Readback does not match\n");
779 }
780 }
781 else
782 {
783 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "WriteBeceemEEPROM: Readback failed\n");
784 }
785 }
786
787 return 0;
788}
789#endif
790 566
791//----------------------------------------------------------------------------- 567//-----------------------------------------------------------------------------
792// Procedure: FlashSectorErase 568// Procedure: FlashSectorErase
@@ -1353,15 +1129,6 @@ INT BeceemFlashBulkWrite(
1353 UINT uiTemp = 0; 1129 UINT uiTemp = 0;
1354 UINT index = 0; 1130 UINT index = 0;
1355 UINT uiPartOffset = 0; 1131 UINT uiPartOffset = 0;
1356 #if 0
1357 struct timeval tv1 = {0};
1358 struct timeval tv2 = {0};
1359
1360 struct timeval tr = {0};
1361 struct timeval te = {0};
1362 struct timeval tw = {0};
1363 struct timeval twv = {0};
1364 #endif
1365 1132
1366#if defined(BCM_SHM_INTERFACE) && !defined(FLASH_DIRECT_ACCESS) 1133#if defined(BCM_SHM_INTERFACE) && !defined(FLASH_DIRECT_ACCESS)
1367 Status = bcmflash_raw_write((uiOffset/FLASH_PART_SIZE),(uiOffset % FLASH_PART_SIZE),( unsigned char *)pBuffer,uiNumBytes); 1134 Status = bcmflash_raw_write((uiOffset/FLASH_PART_SIZE),(uiOffset % FLASH_PART_SIZE),( unsigned char *)pBuffer,uiNumBytes);
@@ -1396,7 +1163,6 @@ INT BeceemFlashBulkWrite(
1396 uiNumSectTobeRead++; 1163 uiNumSectTobeRead++;
1397 } 1164 }
1398 } 1165 }
1399 #if 1
1400 //Check whether Requested sector is writable or not in case of flash2x write. But if write call is 1166 //Check whether Requested sector is writable or not in case of flash2x write. But if write call is
1401 // for DSD calibration, allow it without checking of sector permission 1167 // for DSD calibration, allow it without checking of sector permission
1402 1168
@@ -1417,7 +1183,6 @@ INT BeceemFlashBulkWrite(
1417 index = index + 1 ; 1183 index = index + 1 ;
1418 } 1184 }
1419 } 1185 }
1420 #endif
1421 Adapter->SelectedChip = RESET_CHIP_SELECT; 1186 Adapter->SelectedChip = RESET_CHIP_SELECT;
1422 while(uiNumSectTobeRead) 1187 while(uiNumSectTobeRead)
1423 { 1188 {
@@ -1689,21 +1454,6 @@ static INT BeceemFlashBulkWriteStatus(
1689 { 1454 {
1690 for(uiIndex = 0;uiIndex < Adapter->uiSectorSize;uiIndex += MAX_RW_SIZE) 1455 for(uiIndex = 0;uiIndex < Adapter->uiSectorSize;uiIndex += MAX_RW_SIZE)
1691 { 1456 {
1692#if 0
1693 if(0 == BeceemFlashBulkRead(Adapter,uiReadBk,uiOffsetFromSectStart+uiIndex + Adapter->ulFlashCalStart ,MAX_RW_SIZE))
1694 {
1695 for(uiReadIndex = 0;uiReadIndex < 4; uiReadIndex++)
1696 {
1697 if(*((PUINT)&pTempBuff[uiIndex+uiReadIndex*4]) != uiReadBk[uiReadIndex])
1698 {
1699 Status = -1;
1700 goto BeceemFlashBulkWriteStatus_EXIT;
1701
1702 }
1703 }
1704
1705 }
1706#endif
1707 1457
1708 if(STATUS_SUCCESS == BeceemFlashBulkRead(Adapter,(PUINT)ucReadBk,uiOffsetFromSectStart+uiIndex,MAX_RW_SIZE)) 1458 if(STATUS_SUCCESS == BeceemFlashBulkRead(Adapter,(PUINT)ucReadBk,uiOffsetFromSectStart+uiIndex,MAX_RW_SIZE))
1709 { 1459 {
@@ -3158,15 +2908,6 @@ INT BcmGetFlashCSInfo(PMINI_ADAPTER Adapter)
3158 2908
3159 Adapter->uiFlashLayoutMajorVersion = uiFlashLayoutMajorVersion; 2909 Adapter->uiFlashLayoutMajorVersion = uiFlashLayoutMajorVersion;
3160 2910
3161 #if 0
3162 if(FLASH_PART_SST25VF080B == Adapter->ulFlashID)
3163 {
3164 //
3165 // 1MB flash has been selected. we have to use 64K as sector size no matter what is kept in FLASH_CS.
3166 //
3167 Adapter->uiSectorSize = 0x10000;
3168 }
3169 #endif
3170 2911
3171 return STATUS_SUCCESS ; 2912 return STATUS_SUCCESS ;
3172} 2913}
@@ -4837,20 +4578,6 @@ INT BcmCopySection(PMINI_ADAPTER Adapter,
4837 return -EINVAL; 4578 return -EINVAL;
4838 } 4579 }
4839 4580
4840 #if 0
4841 else
4842 {
4843 if((SrcSection == VSA0) || (SrcSection == VSA1) || (SrcSection == VSA2))
4844 {
4845 if((DstSection != VSA0) && (DstSection != VSA1) && (DstSection != VSA2))
4846 {
4847 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Source and Destion secton is not of same type");
4848 return -EINVAL;
4849 }
4850 }
4851
4852 }
4853 #endif
4854 //if offset zero means have to copy complete secton 4581 //if offset zero means have to copy complete secton
4855 4582
4856 if(numOfBytes == 0) 4583 if(numOfBytes == 0)
@@ -4950,14 +4677,6 @@ INT SaveHeaderIfPresent(PMINI_ADAPTER Adapter, PUCHAR pBuff, UINT uiOffset)
4950 UINT uiSectAlignAddr = 0; 4677 UINT uiSectAlignAddr = 0;
4951 UINT sig = 0; 4678 UINT sig = 0;
4952 4679
4953 #if 0
4954 //if Chenges in Header is allowed, Return back
4955 if(Adapter->bHeaderChangeAllowed == TRUE)
4956 {
4957 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL, "Header Change is allowed");
4958 return STATUS_SUCCESS ;
4959 }
4960 #endif
4961 //making the offset sector alligned 4680 //making the offset sector alligned
4962 uiSectAlignAddr = uiOffset & ~(Adapter->uiSectorSize - 1); 4681 uiSectAlignAddr = uiOffset & ~(Adapter->uiSectorSize - 1);
4963 4682
@@ -5336,39 +5055,6 @@ INT WriteToFlashWithoutSectorErase(PMINI_ADAPTER Adapter,
5336 return Status; 5055 return Status;
5337} 5056}
5338 5057
5339#if 0
5340UINT getNumOfSubSectionWithWRPermisson(PMINI_ADAPTER Adapter, SECTION_TYPE secType)
5341{
5342
5343 UINT numOfWRSubSec = 0;
5344 switch(secType)
5345 {
5346 case ISO :
5347 if(IsSectionWritable(Adapter,ISO_IMAGE1))
5348 numOfWRSubSec = numOfWRSubSec + 1;
5349 if(IsSectionWritable(Adapter,ISO_IMAGE2))
5350 numOfWRSubSec = numOfWRSubSec + 1;
5351 break;
5352
5353 case DSD :
5354 if(IsSectionWritable(Adapter,DSD2))
5355 numOfWRSubSec = numOfWRSubSec + 1;
5356 if(IsSectionWritable(Adapter,DSD1))
5357 numOfWRSubSec = numOfWRSubSec + 1;
5358 if(IsSectionWritable(Adapter,DSD0))
5359 numOfWRSubSec = numOfWRSubSec + 1;
5360 break ;
5361
5362 case VSA :
5363 //for VSA Add code Here
5364 default :
5365 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, NVM_RW, DBG_LVL_ALL,"Invalid secton<%d> is passed", secType);\
5366 numOfWRSubSec = 0;
5367
5368 }
5369 return numOfWRSubSec;
5370}
5371#endif
5372BOOLEAN IsSectionExistInFlash(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section) 5058BOOLEAN IsSectionExistInFlash(PMINI_ADAPTER Adapter, FLASH2X_SECTION_VAL section)
5373{ 5059{
5374 5060
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-20 05:31:28 -0400