WebSVN - NaviCtrl - Diff - Rev 111 and 275

-/******************** (C) COPYRIGHT 2006 STMicroelectronics ********************
+/******************** (C) COPYRIGHT 2008 STMicroelectronics ********************
 * File Name          : usb_prop.c
 * Author             : MCD Application Team
-* Date First Issued  : 10/01/2006 : V1.0
+* Date First Issued  : 10/01/2008 : V1.0
 * Description        : All processings related to Virtual Com Port Demo
 ********************************************************************************
 * History:
-* 10/01/2006 : V1.0
+* 10/01/2008 : V1.0
 ********************************************************************************
 * THE PRESENT SOFTWARE 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 ------------------------------------------------------------------*/
-/* Includes ------------------------------------------------------------------*/
+#include "usb.h"
+#include "usb_lib.h"
+#include "usb_conf.h"
-#include "usb_lib.h"
+#include "usb_prop.h"
 #include "usb_desc.h"
-#include "usb_pwr.h"
+#include "usb_pwr.h"
 #include "usb_prop.h"
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
 /* Private macro -------------------------------------------------------------*/
 /* Private variables ---------------------------------------------------------*/
 u32 Request = 0;
 LINE_CODING linecoding =
-{
+  {
-,          /* baud rate*/
+,  /* baud rate*/
-x00,           /* stop bits-1*/
+x00,  /* stop bits-1*/
-x00,           /* parity - none*/
+x00,  /* parity - none*/
-x08            /* no. of bits 8*/
+x08  /* no. of bits 8*/
-};
+  };
 /* -------------------------------------------------------------------------- */
 /*  Structures initializations */
 /* -------------------------------------------------------------------------- */
 DEVICE Device_Table = {
-  EP_NUM,
+                        EP_NUM,
-};
+                      };
 DEVICE_PROP Device_Property = {
-  Virtual_Com_Port_init,
+                                Virtual_Com_Port_init,
-  Virtual_Com_Port_Reset,
+                                Virtual_Com_Port_Reset,
-  Virtual_Com_Port_Status_In,
+                                Virtual_Com_Port_Status_In,
-  Virtual_Com_Port_Status_Out,
+                                Virtual_Com_Port_Status_Out,
-  Virtual_Com_Port_Data_Setup,
+                                Virtual_Com_Port_Data_Setup,
-  Virtual_Com_Port_NoData_Setup,
+                                Virtual_Com_Port_NoData_Setup,
-  Virtual_Com_Port_Get_Interface_Setting,
+                                Virtual_Com_Port_Get_Interface_Setting,
-  Virtual_Com_Port_GetDeviceDescriptor,
+                                Virtual_Com_Port_GetDeviceDescriptor,
-  Virtual_Com_Port_GetConfigDescriptor,
+                                Virtual_Com_Port_GetConfigDescriptor,
-  Virtual_Com_Port_GetStringDescriptor,
+                                Virtual_Com_Port_GetStringDescriptor,
 ,
 x40 /*MAX PACKET SIZE*/
-};
+                              };
 USER_STANDARD_REQUESTS User_Standard_Requests = {
-  Virtual_Com_Port_GetConfiguration,
+      Virtual_Com_Port_GetConfiguration,
-  Virtual_Com_Port_SetConfiguration,
+      Virtual_Com_Port_SetConfiguration,
-  Virtual_Com_Port_GetInterface,
+      Virtual_Com_Port_GetInterface,
-  Virtual_Com_Port_SetInterface,
+      Virtual_Com_Port_SetInterface,
-  Virtual_Com_Port_GetStatus,
+      Virtual_Com_Port_GetStatus,
-  Virtual_Com_Port_ClearFeature,
+      Virtual_Com_Port_ClearFeature,
-  Virtual_Com_Port_SetEndPointFeature,
+      Virtual_Com_Port_SetEndPointFeature,
-  Virtual_Com_Port_SetDeviceFeature,
+      Virtual_Com_Port_SetDeviceFeature,
-  Virtual_Com_Port_SetDeviceAddress
+      Virtual_Com_Port_SetDeviceAddress
-};
+    };
 ONE_DESCRIPTOR Device_Descriptor = {
-  (u8*)Virtual_Com_Port_DeviceDescriptor,
+                                     (u8*)Virtual_Com_Port_DeviceDescriptor,
-  VIRTUAL_COM_PORT_SIZ_DEVICE_DESC
+                                     VIRTUAL_COM_PORT_SIZ_DEVICE_DESC
-};
+                                   };
 ONE_DESCRIPTOR Config_Descriptor = {
-  (u8*)Virtual_Com_Port_ConfigDescriptor,
+                                     (u8*)Virtual_Com_Port_ConfigDescriptor,
-  VIRTUAL_COM_PORT_SIZ_CONFIG_DESC
+                                     VIRTUAL_COM_PORT_SIZ_CONFIG_DESC
-};
+                                   };
 ONE_DESCRIPTOR String_Descriptor[5] = {
-  {(u8*)Virtual_Com_Port_StringLangID, VIRTUAL_COM_PORT_SIZ_STRING_LANGID},
+                                        {(u8*)Virtual_Com_Port_StringLangID, VIRTUAL_COM_PORT_SIZ_STRING_LANGID},
-  {(u8*)Virtual_Com_Port_StringVendor, VIRTUAL_COM_PORT_SIZ_STRING_VENDOR},
+                                        {(u8*)Virtual_Com_Port_StringVendor, VIRTUAL_COM_PORT_SIZ_STRING_VENDOR},
-  {(u8*)Virtual_Com_Port_StringProduct, VIRTUAL_COM_PORT_SIZ_STRING_PRODUCT},
+                                        {(u8*)Virtual_Com_Port_StringProduct, VIRTUAL_COM_PORT_SIZ_STRING_PRODUCT},
 * Output         : None.
 * Return         : None.
 *******************************************************************************/
 void Virtual_Com_Port_init(void)
+{
-        u32 timeout = 0;
-        pInformation->Current_Configuration = 0;
+  pInformation->Current_Configuration = 0;
-        /* Connect the device */
+  /* Connect the device */
-        PowerOn();
+  PowerOn();
-        /* USB interrupts initialization */
+  /* USB interrupts initialization */
-        _SetISTR(0);               /* clear pending interrupts */
+  _SetISTR(0);               /* clear pending interrupts */
-        wInterrupt_Mask = IMR_MSK;
+  wInterrupt_Mask = IMR_MSK;
-        _SetCNTR(wInterrupt_Mask); /* set interrupts mask */
+  _SetCNTR(wInterrupt_Mask); /* set interrupts mask */
-        pInformation->Current_Feature = Virtual_Com_Port_ConfigDescriptor[7];
-        /* Wait until device is configured */
+  //UART0_Config_Default();
-        while (pInformation->Current_Configuration == 0 && (timeout++<600000)) NOP_Process();
-        if(pInformation->Current_Configuration !=0) bDeviceState = CONFIGURED;
+  bDeviceState = UNCONNECTED;
+}
 /*******************************************************************************
 * Function Name  : Virtual_Com_Port_Reset
 * Description    : Virtual_Com_Port Mouse reset routine
 * Input          : None.
 * Output         : None.
 * Return         : None.
 *******************************************************************************/
 void Virtual_Com_Port_Reset(void)
+{
-        /* Set Virtual_Com_Port_DEVICE as not configured */
+  /* Set Virtual_Com_Port_DEVICE as not configured */
-        pInformation->Current_Configuration = 0;
+  pInformation->Current_Configuration = 0;
-        pInformation->Current_Interface = 0;/*the default Interface*/
+  pInformation->Current_Interface = 0;/*the default Interface*/
+  /* Current Feature initialization */
+  pInformation->Current_Feature = Virtual_Com_Port_ConfigDescriptor[7];
-        SetBTABLE(BTABLE_ADDRESS);
+  SetBTABLE(BTABLE_ADDRESS);
-        /* Initialize Endpoint 0 */
+  /* Initialize Endpoint 0 */
-        SetEPType(ENDP0, EP_CONTROL);
+  SetEPType(ENDP0, EP_CONTROL);
-        SetEPTxStatus(ENDP0, EP_TX_STALL);
+  SetEPTxStatus(ENDP0, EP_TX_STALL);
-        SetEPRxAddr(ENDP0, ENDP0_RXADDR);
+  SetEPRxAddr(ENDP0, ENDP0_RXADDR);
-        SetEPTxAddr(ENDP0, ENDP0_TXADDR);
+  SetEPTxAddr(ENDP0, ENDP0_TXADDR);
-        Clear_Status_Out(ENDP0);
+  Clear_Status_Out(ENDP0);
-        SetEPRxCount(ENDP0, Device_Property.MaxPacketSize);
+  SetEPRxCount(ENDP0, Device_Property.MaxPacketSize);
-        SetEPRxValid(ENDP0);
+  SetEPRxValid(ENDP0);
-        /* Initialize Endpoint 1 */
+  /* Initialize Endpoint 1 */
-        SetEPType(ENDP1, EP_BULK);
+  SetEPType(ENDP1, EP_BULK);
-        SetEPTxAddr(ENDP1, ENDP1_TXADDR);
+  SetEPTxAddr(ENDP1, ENDP1_TXADDR);
-        SetEPTxStatus(ENDP1, EP_TX_NAK);
+  SetEPTxStatus(ENDP1, EP_TX_NAK);
-        SetEPRxStatus(ENDP1, EP_RX_DIS);
+  SetEPRxStatus(ENDP1, EP_RX_DIS);
-        /* Initialize Endpoint 2 */
+  /* Initialize Endpoint 2 */
-        SetEPType(ENDP2, EP_INTERRUPT);
+  SetEPType(ENDP2, EP_INTERRUPT);
-        SetEPTxAddr(ENDP2, ENDP2_TXADDR);
+  SetEPTxAddr(ENDP2, ENDP2_TXADDR);
-        SetEPRxStatus(ENDP2, EP_RX_DIS);
+  SetEPRxStatus(ENDP2, EP_RX_DIS);
-        SetEPTxStatus(ENDP2, EP_TX_NAK);
+  SetEPTxStatus(ENDP2, EP_TX_NAK);
-        /* Initialize Endpoint 3 */
+  /* Initialize Endpoint 3 */
-        SetEPType(ENDP3, EP_BULK);
+  SetEPType(ENDP3, EP_BULK);
-        SetEPRxAddr(ENDP3, ENDP3_RXADDR);
+  SetEPRxAddr(ENDP3, ENDP3_RXADDR);
-        SetEPRxCount(ENDP3, VIRTUAL_COM_PORT_DATA_SIZE);
+  SetEPRxCount(ENDP3, VIRTUAL_COM_PORT_DATA_SIZE);
-        SetEPRxStatus(ENDP3, EP_RX_VALID);
+  SetEPRxStatus(ENDP3, EP_RX_VALID);
-        SetEPTxStatus(ENDP3, EP_TX_DIS);
+  SetEPTxStatus(ENDP3, EP_TX_DIS);
-        /* Set this device to response on default address */
+  /* Set this device to response on default address */
-        SetDeviceAddress(0);
+  SetDeviceAddress(0);
+  bDeviceState = ATTACHED;
+}
+/*******************************************************************************
+* Function Name  : Virtual_Com_Port_SetConfiguration.
+* Description    : Udpade the device state to configured.
+* Input          : None.
+* Output         : None.
+* Return         : None.
+*******************************************************************************/
+void Virtual_Com_Port_SetConfiguration(void)
+{
+  DEVICE_INFO *pInfo = &Device_Info;
+  if (pInfo->Current_Configuration != 0)
+  {
+    /* Device configured */
+    bDeviceState = CONFIGURED;
+  }
+}
+/*******************************************************************************
+* Function Name  : Virtual_Com_Port_SetConfiguration.
+* Description    : Udpade the device state to addressed.
+* Input          : None.
+* Output         : None.
+* Return         : None.
+*******************************************************************************/
+void Virtual_Com_Port_SetDeviceAddress (void)
+{
+  bDeviceState = ADDRESSED;
+}
 /*******************************************************************************
 * Function Name  : Virtual_Com_Port_Status_In
 * Description    :
 * Input          : None.
 * Output         : None.
 * Return         : None.
 *******************************************************************************/
 void Virtual_Com_Port_Status_In(void)
+{
-        if (Request == SET_LINE_CODING)
+  if (Request == SET_LINE_CODING)
-        {
+  {
+    //UART0_Config();
-        Request = 0;
+    Request = 0;
-        }
+  }
+}
 /*******************************************************************************
 * Function Name  : Virtual_Com_Port_Status_Out
 * Description    :
 * Input          : None.
 * Output         : None.
 * Return         : None.
 *******************************************************************************/
 void Virtual_Com_Port_Status_Out (void)
-{
-}
+{}
 /*******************************************************************************
 * Function Name  : Virtual_Com_Port_Data_Setup
 * Description    : handle the data class specific requests
 * Input          : Request Nb.
 * Output         : None.
 * Return         : USB_UNSUPPORT or USB_SUCCESS.
 *******************************************************************************/
 RESULT Virtual_Com_Port_Data_Setup(u8 RequestNo)
+{
-        u8      *(*CopyRoutine)(u16);
+  u8 *(*CopyRoutine)(u16);
-        CopyRoutine = NULL;
+  CopyRoutine = NULL;
-        if (RequestNo == GET_LINE_CODING)
+  if (RequestNo == GET_LINE_CODING)
-        {
+  {
-                if (Type_Recipient == (CLASS_REQUEST | INTERFACE_RECIPIENT)) CopyRoutine = Virtual_Com_Port_GetLineCoding;
+    if (Type_Recipient == (CLASS_REQUEST | INTERFACE_RECIPIENT))
+      CopyRoutine = Virtual_Com_Port_GetLineCoding;
-        }
+  }
-        else if (RequestNo == SET_LINE_CODING)
+  else if (RequestNo == SET_LINE_CODING)
-        {
+  {
-                if (Type_Recipient == (CLASS_REQUEST | INTERFACE_RECIPIENT)) CopyRoutine = Virtual_Com_Port_SetLineCoding;
+    if (Type_Recipient == (CLASS_REQUEST | INTERFACE_RECIPIENT))
+      CopyRoutine = Virtual_Com_Port_SetLineCoding;
-                Request = SET_LINE_CODING;
+    Request = SET_LINE_CODING;
-        }
+  }
-        if (CopyRoutine == NULL) return USB_UNSUPPORT;
+  if (CopyRoutine == NULL) return USB_UNSUPPORT;
-        pInformation->Ctrl_Info.CopyData = CopyRoutine;
+  pInformation->Ctrl_Info.CopyData = CopyRoutine;
-        pInformation->Ctrl_Info.Usb_wOffset = 0;
+  pInformation->Ctrl_Info.Usb_wOffset = 0;
-        (*CopyRoutine)(0);
+  (*CopyRoutine)(0);
-        return USB_SUCCESS;
+  return USB_SUCCESS;
+}
 /*******************************************************************************
 * Function Name  : Virtual_Com_Port_NoData_Setup
 * Description    : handle the no data class specific requests
 * Input          : Request Nb.
 * Output         : None.
 * Return         : USB_UNSUPPORT or USB_SUCCESS.
 *******************************************************************************/
 RESULT Virtual_Com_Port_NoData_Setup(u8 RequestNo)
+{
-        if (Type_Recipient == (CLASS_REQUEST | INTERFACE_RECIPIENT))
+  if (Type_Recipient == (CLASS_REQUEST | INTERFACE_RECIPIENT))
-        {
+  {
-                if (RequestNo == SET_COMM_FEATURE)      return USB_SUCCESS;
+    if (RequestNo == SET_COMM_FEATURE) return USB_SUCCESS;
-                else if (RequestNo == SET_CONTROL_LINE_STATE) return USB_SUCCESS;
+    else if (RequestNo == SET_CONTROL_LINE_STATE) return USB_SUCCESS;
-        }
+  }
-        return USB_UNSUPPORT;
+  return USB_UNSUPPORT;
+}
 /*******************************************************************************
 * Function Name  : Virtual_Com_Port_GetDeviceDescriptor.
 * Description    : Gets the device descriptor.
 * Input          : Length
 * Output         : None.
 * Return         : The address of the device descriptor.
 *******************************************************************************/
 u8 *Virtual_Com_Port_GetDeviceDescriptor(u16 Length)
+{
-        return Standard_GetDescriptorData( Length, &Device_Descriptor );
+  return Standard_GetDescriptorData(Length, &Device_Descriptor);
+}
 /*******************************************************************************
 * Function Name  : Virtual_Com_Port_GetConfigDescriptor.
 * Description    : get the configuration descriptor.
 * Input          : Length
 * Output         : None.
 * Return         : The address of the configuration descriptor.
 *******************************************************************************/
 u8 *Virtual_Com_Port_GetConfigDescriptor(u16 Length)
+{
-        return Standard_GetDescriptorData( Length, &Config_Descriptor );
+  return Standard_GetDescriptorData(Length, &Config_Descriptor);
+}
 /*******************************************************************************
 * Function Name  : Virtual_Com_Port_GetStringDescriptor
 * Description    : Gets the string descriptors according to the needed index
 * Input          : Length
 * Output         : None.
 * Return         : The address of the string descriptors.
 *******************************************************************************/
 u8 *Virtual_Com_Port_GetStringDescriptor(u16 Length)
+{
-        u8 wValue0 = pInformation->USBwValue0;
+  u8 wValue0 = pInformation->USBwValue0;
+  if (wValue0 > 5)
+  {
+    return NULL;
+  }
+  else
+  {
-        return Standard_GetDescriptorData( Length, &String_Descriptor[wValue0] );
+    return Standard_GetDescriptorData(Length, &String_Descriptor[wValue0]);
+  }
+}
 /*******************************************************************************
 * Function Name  : Virtual_Com_Port_Get_Interface_Setting.
 * Description    : test the interface and the alternate setting according to the
 *                  supported one.
 * Input1         : u8: Interface : interface number.
 * Input2         : u8: AlternateSetting : Alternate Setting number.
 * Output         : None.
 * Return         : The address of the string descriptors.
 *******************************************************************************/
-RESULT Virtual_Com_Port_Get_Interface_Setting(u8 Interface,u8 AlternateSetting)
+RESULT Virtual_Com_Port_Get_Interface_Setting(u8 Interface, u8 AlternateSetting)
+{
+  if (AlternateSetting > 0)
+  {
-        if(AlternateSetting >0) return USB_UNSUPPORT;
+    return USB_UNSUPPORT;
+  }
+  else if (Interface > 1)
+  {
-        else if(Interface > 1) return USB_UNSUPPORT;
+    return USB_UNSUPPORT;
+  }
-        return USB_SUCCESS;
+  return USB_SUCCESS;
+}
 /*******************************************************************************
 * Function Name  : Virtual_Com_Port_GetLineCoding.
 * Description    : send the linecoding structure to the PC host.
 * Input          : Length
 * Output         : None.
 * Return         : Inecoding structure base address.
 *******************************************************************************/
 u8 *Virtual_Com_Port_GetLineCoding(u16 Length)
+{
-        if(Length==0)
+  if (Length == 0)
-    {
+  {
-                pInformation->Ctrl_Info.Usb_wLength = sizeof(linecoding);;
+    pInformation->Ctrl_Info.Usb_wLength = sizeof(linecoding);
-                return NULL;
+    return NULL;
-    }
+  }
-        return(u8 *)&linecoding;
+  return(u8 *)&linecoding;
+}
 /*******************************************************************************
 * Function Name  : Virtual_Com_Port_SetLineCoding.
 * Description    : Set the linecoding structure fields.
 * Input          : Length
 * Output         : None
 * Return         : Linecoding structure base address.
 *******************************************************************************/
 u8 *Virtual_Com_Port_SetLineCoding(u16 Length)
+{
-        if(Length==0)
+  if (Length == 0)
-    {
+  {
-                pInformation->Ctrl_Info.Usb_wLength = sizeof(linecoding);;
+    pInformation->Ctrl_Info.Usb_wLength = sizeof(linecoding);
-                return NULL;
+    return NULL;
-    }
+  }
-        return(u8 *)&linecoding;
+  return(u8 *)&linecoding;
+}

Subversion Repositories NaviCtrl

(root)/tags/V0.26f/usb_prop.c @ 648 - Rev 111 → 275