WebSVN - NaviCtrl - Diff - Rev 111 and 275

-/******************** (C) COPYRIGHT 2006 STMicroelectronics ********************
+/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
 * File Name          : usb_pwr.c
 * Author             : MCD Application Team
+* Version            : V2.0.0
-* Date First Issued  : 10/01/2006 : V1.0
+* Date               : 09/29/2008
 * Description        : Connection/disconnection & power management
 ********************************************************************************
-* History:
-* 10/01/2006 : V1.0
-********************************************************************************
-* THE PRESENT SOFTWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
+* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
 * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
 * AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
 * INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
 * CONTENT OF SUCH SOFTWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
 * INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
 *******************************************************************************/
 /* Includes ------------------------------------------------------------------*/
+#include "91x_lib.h"
 #include "usb_lib.h"
+#include "usb_conf.h"
 #include "usb_pwr.h"
 #include "usb.h"
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
 /* Private macro -------------------------------------------------------------*/
 /* Private variables ---------------------------------------------------------*/
-volatile bool fCellSuspended;
-volatile u8 bDeviceState=UNCONNECTED; /* USB device status */
+vu32 bDeviceState = UNCONNECTED; /* USB device status */
-volatile bool fSuspendEnabled=TRUE;  /* true when suspend is possible */
+volatile bool fSuspendEnabled = TRUE;  /* true when suspend is possible */
+struct
 struct {
-        volatile RESUME_STATE eState;
+  volatile RESUME_STATE eState;
+  volatile u8 bESOFcnt;
-        volatile u8 bESOFcnt;
+}
+ResumeS;
 } ResumeS;
 /* Extern variables ----------------------------------------------------------*/
 /* Private function prototypes -----------------------------------------------*/
 /* Extern function prototypes ------------------------------------------------*/
+/* Private functions ---------------------------------------------------------*/
 /* Private functions ---------------------------------------------------------*/
 /*******************************************************************************
 * Function Name  : PowerOn
-* Description    :
+* Description    : USB IP power ON Routine.
 * Input          : None.
 * Output         : None.
 * Return         : USB_SUCCESS.
 *******************************************************************************/
 RESULT PowerOn(void)
+{
- u16 wRegVal;
+  u16 wRegVal;
         /*** cable plugged-in ? ***/
-        /*while(!CablePluggedIn());*/
+  /*** cable plugged-in ? ***/
-    USB_CableConfig(ENABLE);
+  USB_CableConfig(ENABLE);
-    wInterrupt_Mask = CNTR_RESETM | CNTR_SUSPM | CNTR_WKUPM;
+  wInterrupt_Mask = CNTR_RESETM | CNTR_SUSPM | CNTR_WKUPM;
-    _SetCNTR(wInterrupt_Mask);
+  _SetCNTR(wInterrupt_Mask);
-        return USB_SUCCESS;
+  return USB_SUCCESS;
+}
 /*******************************************************************************
 * Function Name  : PowerOff
 * Description    : handles switch-off conditions
 * Input          : None.
-    /* sw variables reset */
+  /* sw variables reset */
-        /* ... */
+  /* ... */
-        return USB_SUCCESS;
+  return USB_SUCCESS;
+}
 /*******************************************************************************
 * Function Name  : Suspend
 * Description    : sets suspend mode operating conditions
 * Input          : None.
 * Output         : None.
 * Return         : USB_SUCCESS.
 *******************************************************************************/
 void Suspend(void)
+{
- u16 wCNTR;
-    fCellSuspended= TRUE;
+  u16 wCNTR;
-        /* suspend preparation */
+  /* suspend preparation */
-        /* ... */
+  /* ... */
-/* ------------------ ONLY WITH BUS-POWERED DEVICES ---------------------- */
+  /* ------------------ ONLY WITH BUS-POWERED DEVICES ---------------------- */
-        /* power reduction */
+  /* power reduction */
+  /* ... on connected devices */
         /* ... on connected devices */
-    /* force low-power mode in the macrocell */
+  /* force low-power mode in the macrocell */
-    wCNTR = _GetCNTR();
+  wCNTR = _GetCNTR();
-    wCNTR |= CNTR_LPMODE;
+  wCNTR |= CNTR_LPMODE;
-    _SetCNTR(wCNTR);
+  _SetCNTR(wCNTR);
-    /* switch-off the clocks */
-    /* ... */
+  /* switch-off the clocks */
+  /* ... */
   USB_EnterLowPowerMode();
+}
 /*******************************************************************************
 * Function Name  : Resume_Init
 * Description    : Handles wake-up restoring normal operations
 * Input          : None.
 * Output         : None.
 * Return         : USB_SUCCESS.
 *******************************************************************************/
-void Resume_Init(void)
-{
-  u16 wCNTR;
 void Resume_Init(void)
     fCellSuspended= FALSE;
   u16 wCNTR;
-/* ------------------ ONLY WITH BUS-POWERED DEVICES ---------------------- */
+  /* ------------------ ONLY WITH BUS-POWERED DEVICES ---------------------- */
-    wCNTR &= (~CNTR_LPMODE);
+  wCNTR &= (~CNTR_LPMODE);
-    _SetCNTR(wCNTR);
+  _SetCNTR(wCNTR);
-        /* restore full power */
+  /* restore full power */
+  /* ... on connected devices */
-        /* ... on connected devices */
+  USB_LeaveLowPowerMode();
-        /* reset FSUSP bit */
+  /* reset FSUSP bit */
-        _SetCNTR(IMR_MSK);
+  _SetCNTR(IMR_MSK);
         /* reverse suspend preparation */
+  /* reverse suspend preparation */
-        /* ... */
+  /* ... */
+}
 /*******************************************************************************
 * Function Name  : Resume
 * Return         : None.
 *******************************************************************************/
 void Resume(RESUME_STATE eResumeSetVal)
+{
- u16 wCNTR;
+  u16 wCNTR;
- u16 wRegVal;
-        if(eResumeSetVal != RESUME_ESOF)
+  if (eResumeSetVal != RESUME_ESOF)
-                        ResumeS.eState = eResumeSetVal;
+    ResumeS.eState = eResumeSetVal;
-        switch(ResumeS.eState)
+  switch (ResumeS.eState)
+  {
-                case RESUME_EXTERNAL:
-                Resume_Init();
-          wRegVal = GetFNR();
-                if(wRegVal & FNR_RXDP) //10 & 11 false conditions
-                {
-                        Suspend();
+    case RESUME_EXTERNAL:
       Resume_Init();
-                    ResumeS.eState = RESUME_OFF;
+      ResumeS.eState = RESUME_OFF;
-                        break;
+      break;
-                case RESUME_INTERNAL:
+    case RESUME_INTERNAL:
-                default:
+    default:
-                    ResumeS.eState = RESUME_OFF;
+      ResumeS.eState = RESUME_OFF;
-                        break;
+      break;
+  }
+}
-/******************* (C) COPYRIGHT 2006 STMicroelectronics *****END OF FILE****/
+/******************* (C) COPYRIGHT 2008 STMicroelectronics *****END OF FILE****/

Subversion Repositories NaviCtrl

(root)/tags/V0.26e/usb_pwr.c @ 387 - Rev 111 → 275