diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2009-10-28 10:42:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-28 10:42:37 -0700 |
| commit | ccaf1159003e724af6b158fd10870297af4fedeb (patch) | |
| tree | 67ac923273603fbcd30d69d7dd76f31872507ff5 | |
| parent | 65c6acaf057ac28e288fabcf4fac1c8f42e17266 (diff) | |
| parent | cd43498901155042b215caad44f2632e1181756d (diff) | |
| download | ti-ccaf1159003e724af6b158fd10870297af4fedeb.tar.gz | |
am cd434989: am 13a77412: Postpone setting complete flag to the real FW start (http://b/issue?id=2198151)
Merge commit 'cd43498901155042b215caad44f2632e1181756d' into eclair-mr2-plus-aosp
* commit 'cd43498901155042b215caad44f2632e1181756d':
Postpone setting complete flag to the real FW start (http://b/issue?id=2198151)
| -rw-r--r-- | wilink_6_1/stad/src/Ctrl_Interface/DrvMain.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wilink_6_1/stad/src/Ctrl_Interface/DrvMain.c b/wilink_6_1/stad/src/Ctrl_Interface/DrvMain.c index 257cf20..9e55fa6 100644 --- a/wilink_6_1/stad/src/Ctrl_Interface/DrvMain.c +++ b/wilink_6_1/stad/src/Ctrl_Interface/DrvMain.c @@ -1588,10 +1588,6 @@ static void drvMain_Sm (TI_HANDLE hDrvMain, ESmEvent eEvent) if (eEvent == SM_EVENT_FW_INIT_COMPLETE) { pDrvMain->eSmState = SM_STATE_FW_CONFIG; - if (!pDrvMain->bRecovery) - { - os_SignalObjectSet(hOs, pDrvMain->hSignalObj); - } TWD_EnableInterrupts(pDrvMain->tStadHandles.hTWD); #ifdef PRIODIC_INTERRUPT /* Start periodic interrupts. It means that every period of time the FwEvent SM will be called */ @@ -1633,6 +1629,10 @@ static void drvMain_Sm (TI_HANDLE hDrvMain, ESmEvent eEvent) eStatus = TI_OK; } + if (!pDrvMain->bRecovery) + { + os_SignalObjectSet(hOs, pDrvMain->hSignalObj); + } break; case SM_STATE_OPERATIONAL: /* |