From 3e275cd4f18a97bb227afd80f3923e91e3e4b40f Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Sat, 18 Aug 2012 01:07:16 +0900 Subject: [PATCH] --- yaml --- r: 324607 b: refs/heads/master c: ae0c514cce96fa8eb68f1fdb1563eba1ff61056f h: refs/heads/master i: 324605: 73a1550f5668d7c6f4a84b5c8877ce657bf52745 324603: 7e2957d58a34efa47151cfb5d816369466298638 324599: d0450005c5ea6896f01bfb55110bd8a3ee1b4e99 324591: 3ba5790bb8f9482c865f887d2c0469fe4006d6b4 324575: ac90a05f215df93c5362b71a6651662c8ef26bfa 324543: f5ea9b56643c233a3a332bfa3b9260e0d3a93845 324479: ea7ca3e30f92b28f5baf29eb6bd2555bff193ad8 324351: 1bcfbc7da019ee6f787e158b3b6b0ffcb0d4906a 324095: 3da3b066dad61e3bea619d8deae2fb1a328f3fc3 323583: 375e9e592b0105b5df2a309561edfe803bd6ef7b v: v3 --- [refs] | 2 +- trunk/drivers/staging/bcm/PHSModule.c | 4 ++-- trunk/drivers/staging/bcm/cntrl_SignalingInterface.h | 2 +- trunk/drivers/staging/bcm/nvm.c | 2 +- trunk/drivers/staging/bcm/target_params.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index abbe537dc62e..a05913511829 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac9bbd085f5d22a2f01a03cb79abe740412bdae1 +refs/heads/master: ae0c514cce96fa8eb68f1fdb1563eba1ff61056f diff --git a/trunk/drivers/staging/bcm/PHSModule.c b/trunk/drivers/staging/bcm/PHSModule.c index 479574234e4c..6dc0bbcfeab0 100644 --- a/trunk/drivers/staging/bcm/PHSModule.c +++ b/trunk/drivers/staging/bcm/PHSModule.c @@ -66,7 +66,7 @@ Input parameters: IN struct bcm_mini_adapter *Adapter - Miniport Adapte BOOLEAN bHeaderSuppressionEnabled - indicates if header suprression is enabled for SF. Return: STATUS_SUCCESS - If the send was successful. - Other - If an error occured. + Other - If an error occurred. */ int PHSTransmit(struct bcm_mini_adapter *Adapter, @@ -346,7 +346,7 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension, struct bcm_mini_adapter - BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\n phs_init Successfull"); + BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\n phs_init Successful"); return STATUS_SUCCESS; } diff --git a/trunk/drivers/staging/bcm/cntrl_SignalingInterface.h b/trunk/drivers/staging/bcm/cntrl_SignalingInterface.h index 7619e4b819bd..41d732d8ca42 100644 --- a/trunk/drivers/staging/bcm/cntrl_SignalingInterface.h +++ b/trunk/drivers/staging/bcm/cntrl_SignalingInterface.h @@ -223,7 +223,7 @@ typedef struct _stServiceFlowParamSI{ /** 8bit Indicates whether or not MBS service is requested for this Serivce Flow*/ B_UINT8 u8MBSService; - /** 8bit QOS Parameter Set specifies proper application of QoS paramters to Provisioned, Admitted and Active sets*/ + /** 8bit QOS Parameter Set specifies proper application of QoS parameters to Provisioned, Admitted and Active sets*/ B_UINT8 u8QosParamSet; /** 8bit Traffic Priority Of the Service Flow */ diff --git a/trunk/drivers/staging/bcm/nvm.c b/trunk/drivers/staging/bcm/nvm.c index b179dbab93b5..ed592e09f868 100644 --- a/trunk/drivers/staging/bcm/nvm.c +++ b/trunk/drivers/staging/bcm/nvm.c @@ -3932,7 +3932,7 @@ int validateFlash2xReadWrite(struct bcm_mini_adapter *Adapter, PFLASH2X_READWRIT BcmGetSectionValStartOffset(Adapter, ISO_IMAGE2_PART3); } - /* since this uiSectEndoffset is the size of iso Image. hence for calculating the vitual endoffset + /* since this uiSectEndoffset is the size of iso Image. hence for calculating the virtual endoffset * it should be added in startoffset. so that check done in last of this function can be valued. */ uiSectEndOffset = uiSectStartOffset + uiSectEndOffset; diff --git a/trunk/drivers/staging/bcm/target_params.h b/trunk/drivers/staging/bcm/target_params.h index 14876388b879..ad7ec0054938 100644 --- a/trunk/drivers/staging/bcm/target_params.h +++ b/trunk/drivers/staging/bcm/target_params.h @@ -32,7 +32,7 @@ typedef struct _TARGET_PARAMS B_UINT32 m_u32PowerSavingModesEnable; //bit 1: 1 Idlemode enable; bit2: 1 Sleepmode Enable /* PowerSaving Mode Options: bit 0 = 1: CPE mode - to keep pcmcia if alive; - bit 1 = 1: CINR reporing in Idlemode Msg + bit 1 = 1: CINR reporting in Idlemode Msg bit 2 = 1: Default PSC Enable in sleepmode*/ B_UINT32 m_u32PowerSavingModeOptions;