---

yaml
---
r: 268401
b: refs/heads/master
c: 7a9541c
h: refs/heads/master
i:
  268399: b914351
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47996398c449092ad882119d49022282bb2c94d4
+refs/heads/master: 7a9541c3246a6c8b1129f1668fe5e83f1f8b7354

trunk/drivers/staging/wlags49_h2/hcf.c

@@ -437,7 +437,7 @@ static struct /*CFG_HCF_OPT_STRCT*/ {
 	hcf_16  v17;                        // HCF_NIC_TAL_CNT
 	hcf_16  v18;                        // HCF_HCF_TAL_CNT
 	hcf_16  v19;                        // offset tallies
-	TCHAR   val[sizeof(HCF_VERSION)];
+	char    val[sizeof(HCF_VERSION)];
 } BASED cfg_hcf_opt = {
 	sizeof(cfg_hcf_opt)/sizeof(hcf_16) -1,
 	CFG_HCF_OPT,                // (0x082C)
@@ -473,10 +473,6 @@ static struct /*CFG_HCF_OPT_STRCT*/ {
 }; // cfg_hcf_opt
 #endif // MSF_COMPONENT_ID
 
-#if defined HCF_TALLIES_EXTRA
-	replaced by HCF_EXT_TALLIES_FW ;
-#endif // HCF_TALLIES_EXTRA
-
 #if defined MSF_COMPONENT_ID || (HCF_EXT) & HCF_EXT_MB
 #if (HCF_EXT) & HCF_EXT_MB
 HCF_STATIC LTV_STRCT BASED cfg_null = { 1, CFG_NULL, {0} };

trunk/drivers/staging/wlags49_h2/hcf.h

@@ -335,9 +335,7 @@ typedef struct  {
    CFG_FW_PRINTF_BUFFER_LOCATION_STRCT IFB_FwPfBuff;
 #endif // HCF_ASSERT_PRINTF
 #endif // HCF_ASSERT
-#if ! defined HCF_INT_OFF
   hcf_16 volatile IFB_IntOffCnt;		// 0xFFFF based HCF_ACT_INT_OFF nesting counter, DeepSleep flag
-#endif // HCF_INT_OFF
 #if (HCF_TYPE) & HCF_TYPE_CCX
   hcf_16         IFB_CKIPStat;			// CKIP Status flag
 #endif // HCF_TYPE_CCX

trunk/drivers/staging/wlags49_h2/hcfcfg.h

@@ -447,16 +447,6 @@ typedef unsigned long			hcf_32;
 #define  IN_PORT_STRING_8_16(port, addr, len)	IN_PORT_STRING_16(port, addr, len)
 #define  OUT_PORT_STRING_8_16(port, addr, len)	OUT_PORT_STRING_16(port, addr, len)
 
-
-#ifndef OUTPUTDEBUGMSG
-#define OUTPUTDEBUGMSG(dprintf_exp)
-#endif
-
-
-#ifndef ASSERTDEBUGMSG
-#define ASSERTDEBUGMSG(cond, dprintf_exp)
-#endif
-
 #ifndef CFG_SCAN_CHANNELS_2GHZ
 #define CFG_SCAN_CHANNELS_2GHZ 0xFCC2
 #endif /* CFG_SCAN_CHANNELS_2GHZ */
@@ -487,14 +477,6 @@ typedef unsigned long			hcf_32;
 #define			HCF_ENCAP			HCF_ENC
 #endif //		HCF_ENCAP
 
-#if ! defined	HCF_ENTRY
-#define			HCF_ENTRY( ifbp )
-#endif //		HCF_ENTRY
-
-#if ! defined	HCF_EXIT
-#define			HCF_EXIT( ifbp )
-#endif //		HCF_EXIT
-
 #if ! defined	HCF_EXT
 #define			HCF_EXT				0
 #endif //		HCF_EXT
@@ -711,21 +693,9 @@ err: primary variants 1 and 2 correspond with H-I only;
 #define			TEXT(x)	x
 #endif //		TEXT
 
-#if !defined	_TCHAR_DEFINED
-#define 		TCHAR	char
-#endif //		_TCHAR_DEFINED
-
 /************************************************************************************************************/
 /*********************** C O N F L I C T   D E T E C T I O N  &  R E S O L U T I O N ************************/
 /************************************************************************************************************/
-#if defined HCF_LITTLE_ENDIAN
-err: HCF_LITTLE_ENDIAN is obsolete;
-#endif // 	HCF_LITTLE_ENDIAN
-
-#if defined HCF_INT_OFF
-err: HCF_INT_OFF is obsolete;
-#endif //HCF_INT_OFF
-
 #if HCF_ALIGN != 1 && HCF_ALIGN != 2 && HCF_ALIGN != 4 && HCF_ALIGN != 8
 err: invalid value for HCF_ALIGN;
 #endif // HCF_ALIGN

trunk/drivers/staging/wlags49_h2/hcfdef.h

@@ -686,7 +686,6 @@ err: someone redefined these macros while the implemenation assumes they are equ
 
 #define HCFLOGENTRY( where, what ) do {					\
 		if ( (ifbp->IFB_AssertWhere = where) <= 15 ) {		\
-			HCF_ENTRY( ifbp );				\
 			HCFASSERT( (ifbp->IFB_AssertTrace & 1<<((where)&0xF)) == 0, ifbp->IFB_AssertTrace ); \
 			ifbp->IFB_AssertTrace |= 1<<((where)&0xF);	\
 		}							\
@@ -696,7 +695,6 @@ err: someone redefined these macros while the implemenation assumes they are equ
 
 #define HCFLOGEXIT( where ) do {					\
 		if ( (ifbp->IFB_AssertWhere = where) <= 15 ) {		\
-			HCF_EXIT( ifbp );				\
 			ifbp->IFB_AssertTrace &= ~(1<<((where)&0xF));	\
 		}							\
 		HCFTRACE(ifbp, (where)|HCF_TRACE_EXIT );		\
@@ -705,8 +703,8 @@ err: someone redefined these macros while the implemenation assumes they are equ
 #else // HCF_ASSERT
 #define HCFASSERT( x, q ) do { } while(0)
 #define MMDASSERT( x, q )
-#define HCFLOGENTRY( where, what )      do {HCF_ENTRY( ifbp );} while (0)
-#define HCFLOGEXIT( where )             do {HCF_EXIT( ifbp );} while(0)
+#define HCFLOGENTRY( where, what ) do { } while(0)
+#define HCFLOGEXIT( where )        do { } while(0)
 #endif // HCF_ASSERT
 
 #if HCF_INT_ON