rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-10 18:24:11 +01:00
Code Issues Releases Activity

usb: clean up pios hooks into stm32 usb_core

Browse Source 
Reduced scope of many variables since they were being
exposed unnecessarily.

Renamed pios_usb_hid_prop code to pios_usbhook to reflect
the fact that it implements all of the callout functions
that are hooked into the stm32 usb library.
This commit is contained in:
Stacey Sheldon 2011-09-09 23:26:19 -04:00
parent c0259dc616
commit 59cb489e01
9 changed files with 100 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flight/Bootloaders/CopterControl/Makefile
View File

@ -106,10 +106,10 @@ SRC += $(PIOSSTM32F10X)/pios_gpio.c
# PIOS USB related files (seperated to make code maintenance more easy) # PIOS USB related files (seperated to make code maintenance more easy)
SRC += $(PIOSSTM32F10X)/pios_usbhook.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid.c SRC += $(PIOSSTM32F10X)/pios_usb_hid.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_desc.c SRC += $(PIOSSTM32F10X)/pios_usb_hid_desc.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_istr.c SRC += $(PIOSSTM32F10X)/pios_usb_hid_istr.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_prop.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_pwr.c SRC += $(PIOSSTM32F10X)/pios_usb_hid_pwr.c
SRC += $(PIOSSTM32F10X)/pios_usb_com.c SRC += $(PIOSSTM32F10X)/pios_usb_com.c

2
flight/Bootloaders/OpenPilot/Makefile
View File

@ -109,10 +109,10 @@ SRC += $(PIOSSTM32F10X)/pios_debug.c
SRC += $(PIOSSTM32F10X)/pios_gpio.c SRC += $(PIOSSTM32F10X)/pios_gpio.c
# PIOS USB related files (seperated to make code maintenance more easy) # PIOS USB related files (seperated to make code maintenance more easy)
SRC += $(PIOSSTM32F10X)/pios_usbhook.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid.c SRC += $(PIOSSTM32F10X)/pios_usb_hid.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_desc.c SRC += $(PIOSSTM32F10X)/pios_usb_hid_desc.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_istr.c SRC += $(PIOSSTM32F10X)/pios_usb_hid_istr.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_prop.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_pwr.c SRC += $(PIOSSTM32F10X)/pios_usb_hid_pwr.c
SRC += $(PIOSSTM32F10X)/pios_usb_com.c SRC += $(PIOSSTM32F10X)/pios_usb_com.c

2
flight/Bootloaders/PipXtreme/Makefile
View File

@ -105,10 +105,10 @@ SRC += $(PIOSSTM32F10X)/pios_debug.c
SRC += $(PIOSSTM32F10X)/pios_gpio.c SRC += $(PIOSSTM32F10X)/pios_gpio.c
# PIOS USB related files (seperated to make code maintenance more easy) # PIOS USB related files (seperated to make code maintenance more easy)
SRC += $(PIOSSTM32F10X)/pios_usbhook.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid.c SRC += $(PIOSSTM32F10X)/pios_usb_hid.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_desc.c SRC += $(PIOSSTM32F10X)/pios_usb_hid_desc.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_istr.c SRC += $(PIOSSTM32F10X)/pios_usb_hid_istr.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_prop.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_pwr.c SRC += $(PIOSSTM32F10X)/pios_usb_hid_pwr.c
SRC += $(PIOSSTM32F10X)/pios_usb_com.c SRC += $(PIOSSTM32F10X)/pios_usb_com.c

2
flight/CopterControl/Makefile
View File

@ -204,9 +204,9 @@ SRC += $(PIOSSTM32F10X)/pios_tim.c
# PIOS USB related files (separated to make code maintenance more easy) # PIOS USB related files (separated to make code maintenance more easy)
SRC += $(PIOSSTM32F10X)/pios_usbhook.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid.c SRC += $(PIOSSTM32F10X)/pios_usb_hid.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_istr.c SRC += $(PIOSSTM32F10X)/pios_usb_hid_istr.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_prop.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_pwr.c SRC += $(PIOSSTM32F10X)/pios_usb_hid_pwr.c
SRC += $(PIOSSTM32F10X)/pios_usb_com.c SRC += $(PIOSSTM32F10X)/pios_usb_com.c

2
flight/OpenPilot/Makefile
View File

@ -180,11 +180,11 @@ SRC += $(PIOSSTM32F10X)/pios_wdg.c
# PIOS USB related files (seperated to make code maintenance more easy) # PIOS USB related files (seperated to make code maintenance more easy)
SRC += $(PIOSSTM32F10X)/pios_usbhook.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid.c SRC += $(PIOSSTM32F10X)/pios_usb_hid.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_desc.c SRC += $(PIOSSTM32F10X)/pios_usb_hid_desc.c
#SRC += $(PIOSSTM32F10X)/pios_usb_hid_endp.c #SRC += $(PIOSSTM32F10X)/pios_usb_hid_endp.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_istr.c SRC += $(PIOSSTM32F10X)/pios_usb_hid_istr.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_prop.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_pwr.c SRC += $(PIOSSTM32F10X)/pios_usb_hid_pwr.c
SRC += $(PIOSSTM32F10X)/pios_usb_com.c SRC += $(PIOSSTM32F10X)/pios_usb_com.c

8
flight/PiOS/STM32F10x/Libraries/STM32_USB-FS-Device_Driver/inc/usb_core.h
View File

@ -232,10 +232,10 @@ RESULT Standard_ClearFeature(void);
void SetDeviceAddress(uint8_t); void SetDeviceAddress(uint8_t);
void NOP_Process(void); void NOP_Process(void);
/*extern*/ DEVICE_PROP Device_Property; extern DEVICE_PROP Device_Property;
/*extern*/ USER_STANDARD_REQUESTS User_Standard_Requests; extern USER_STANDARD_REQUESTS User_Standard_Requests;
/*extern*/ DEVICE Device_Table; extern DEVICE Device_Table;
/*extern*/ DEVICE_INFO Device_Info; extern DEVICE_INFO Device_Info;
/* cells saving status during interrupt servicing */ /* cells saving status during interrupt servicing */
extern __IO uint16_t SaveRState; extern __IO uint16_t SaveRState;

154
flight/PiOS/STM32F10x/pios_usb_hid_prop.c → flight/PiOS/STM32F10x/pios_usbhook.c
View File

@ -1,5 +1,5 @@
/******************** (C) COPYRIGHT 2010 STMicroelectronics ******************** /******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
* File Name : usb_prop.c * File Name : pios_usbhook.c
* Author : MCD Application Team * Author : MCD Application Team
* Version : V3.2.1 * Version : V3.2.1
* Date : 07/05/2010 * Date : 07/05/2010
@ -18,7 +18,7 @@
#include "usb_lib.h" #include "usb_lib.h"
#include "usb_conf.h" #include "usb_conf.h"
#include "pios.h" #include "pios.h"
#include "pios_usb_hid_prop.h" #include "pios_usbhook.h"
#include "pios_usb_hid_desc.h" #include "pios_usb_hid_desc.h"
#include "pios_usb_hid_pwr.h" #include "pios_usb_hid_pwr.h"
#include "pios_usb_hid.h" #include "pios_usb_hid.h"
@ -40,54 +40,68 @@ DEVICE Device_Table = {
1 1
}; };
static void PIOS_USBHOOK_Init(void);
static void PIOS_USBHOOK_Reset(void);
static void PIOS_USBHOOK_Status_In(void);
static void PIOS_USBHOOK_Status_Out(void);
static RESULT PIOS_USBHOOK_Data_Setup(uint8_t RequestNo);
static RESULT PIOS_USBHOOK_NoData_Setup(uint8_t RequestNo);
static RESULT PIOS_USBHOOK_Get_Interface_Setting(uint8_t Interface, uint8_t AlternateSetting);
static uint8_t *PIOS_USBHOOK_GetDeviceDescriptor(uint16_t Length);
static uint8_t *PIOS_USBHOOK_GetConfigDescriptor(uint16_t Length);
static uint8_t *PIOS_USBHOOK_GetStringDescriptor(uint16_t Length);
DEVICE_PROP Device_Property = { DEVICE_PROP Device_Property = {
PIOS_HID_init, .Init = PIOS_USBHOOK_Init,
PIOS_HID_Reset, .Reset = PIOS_USBHOOK_Reset,
PIOS_HID_Status_In, .Process_Status_IN = PIOS_USBHOOK_Status_In,
PIOS_HID_Status_Out, .Process_Status_OUT = PIOS_USBHOOK_Status_Out,
PIOS_HID_Data_Setup, .Class_Data_Setup = PIOS_USBHOOK_Data_Setup,
PIOS_HID_NoData_Setup, .Class_NoData_Setup = PIOS_USBHOOK_NoData_Setup,
PIOS_HID_Get_Interface_Setting, .Class_Get_Interface_Setting = PIOS_USBHOOK_Get_Interface_Setting,
PIOS_HID_GetDeviceDescriptor, .GetDeviceDescriptor = PIOS_USBHOOK_GetDeviceDescriptor,
PIOS_HID_GetConfigDescriptor, .GetConfigDescriptor = PIOS_USBHOOK_GetConfigDescriptor,
PIOS_HID_GetStringDescriptor, .GetStringDescriptor = PIOS_USBHOOK_GetStringDescriptor,
0, .RxEP_buffer = 0,
0x40 /*MAX PACKET SIZE */ .MaxPacketSize = 0x40,
}; };
static void PIOS_USBHOOK_SetConfiguration(void);
static void PIOS_USBHOOK_SetDeviceAddress(void);
USER_STANDARD_REQUESTS User_Standard_Requests = { USER_STANDARD_REQUESTS User_Standard_Requests = {
PIOS_HID_GetConfiguration, .User_GetConfiguration = NOP_Process,
PIOS_HID_SetConfiguration, .User_SetConfiguration = PIOS_USBHOOK_SetConfiguration,
PIOS_HID_GetInterface, .User_GetInterface = NOP_Process,
PIOS_HID_SetInterface, .User_SetInterface = NOP_Process,
PIOS_HID_GetStatus, .User_GetStatus = NOP_Process,
PIOS_HID_ClearFeature, .User_ClearFeature = NOP_Process,
PIOS_HID_SetEndPointFeature, .User_SetEndPointFeature = NOP_Process,
PIOS_HID_SetDeviceFeature, .User_SetDeviceFeature = NOP_Process,
PIOS_HID_SetDeviceAddress .User_SetDeviceAddress = PIOS_USBHOOK_SetDeviceAddress
}; };
ONE_DESCRIPTOR Device_Descriptor = { static ONE_DESCRIPTOR Device_Descriptor = {
(uint8_t *) PIOS_HID_DeviceDescriptor, (uint8_t *) PIOS_HID_DeviceDescriptor,
PIOS_HID_SIZ_DEVICE_DESC PIOS_HID_SIZ_DEVICE_DESC
}; };
ONE_DESCRIPTOR Config_Descriptor = { static ONE_DESCRIPTOR Config_Descriptor = {
(uint8_t *) PIOS_HID_ConfigDescriptor, (uint8_t *) PIOS_HID_ConfigDescriptor,
PIOS_HID_SIZ_CONFIG_DESC PIOS_HID_SIZ_CONFIG_DESC
}; };
ONE_DESCRIPTOR PIOS_HID_Report_Descriptor = { static ONE_DESCRIPTOR PIOS_HID_Report_Descriptor = {
(uint8_t *) PIOS_HID_ReportDescriptor, (uint8_t *) PIOS_HID_ReportDescriptor,
PIOS_HID_SIZ_REPORT_DESC PIOS_HID_SIZ_REPORT_DESC
}; };
ONE_DESCRIPTOR PIOS_HID_Hid_Descriptor = { static ONE_DESCRIPTOR PIOS_HID_Hid_Descriptor = {
(uint8_t *) PIOS_HID_ConfigDescriptor + PIOS_HID_OFF_HID_DESC, (uint8_t *) PIOS_HID_ConfigDescriptor + PIOS_HID_OFF_HID_DESC,
PIOS_HID_SIZ_HID_DESC PIOS_HID_SIZ_HID_DESC
}; };
ONE_DESCRIPTOR String_Descriptor[4] = { static ONE_DESCRIPTOR String_Descriptor[4] = {
{(uint8_t *) PIOS_HID_StringLangID, PIOS_HID_SIZ_STRING_LANGID} {(uint8_t *) PIOS_HID_StringLangID, PIOS_HID_SIZ_STRING_LANGID}
, ,
{(uint8_t *) PIOS_HID_StringVendor, PIOS_HID_SIZ_STRING_VENDOR} {(uint8_t *) PIOS_HID_StringVendor, PIOS_HID_SIZ_STRING_VENDOR}
@ -99,17 +113,21 @@ ONE_DESCRIPTOR String_Descriptor[4] = {
/* Extern variables ----------------------------------------------------------*/ /* Extern variables ----------------------------------------------------------*/
/* Private function prototypes -----------------------------------------------*/ /* Private function prototypes -----------------------------------------------*/
static RESULT PIOS_USBHOOK_SetProtocol(void);
static uint8_t *PIOS_USBHOOK_GetProtocolValue(uint16_t Length);
static uint8_t *PIOS_USBHOOK_GetReportDescriptor(uint16_t Length);
static uint8_t *PIOS_USBHOOK_GetHIDDescriptor(uint16_t Length);
/* Extern function prototypes ------------------------------------------------*/ /* Extern function prototypes ------------------------------------------------*/
/* Private functions ---------------------------------------------------------*/ /* Private functions ---------------------------------------------------------*/
/******************************************************************************* /*******************************************************************************
* Function Name : PIOS_HID_init. * Function Name : PIOS_USBHOOK_Init.
* Description : Custom HID init routine. * Description : Custom HID init routine.
* Input : None. * Input : None.
* Output : None. * Output : None.
* Return : None. * Return : None.
*******************************************************************************/ *******************************************************************************/
void PIOS_HID_init(void) static void PIOS_USBHOOK_Init(void)
{ {
/* Update the serial number string descriptor with the data from the unique /* Update the serial number string descriptor with the data from the unique
ID */ ID */
@ -126,15 +144,15 @@ void PIOS_HID_init(void)
} }
/******************************************************************************* /*******************************************************************************
* Function Name : PIOS_HID_Reset. * Function Name : PIOS_USBHOOK_Reset.
* Description : Custom HID reset routine. * Description : Custom HID reset routine.
* Input : None. * Input : None.
* Output : None. * Output : None.
* Return : None. * Return : None.
*******************************************************************************/ *******************************************************************************/
void PIOS_HID_Reset(void) static void PIOS_USBHOOK_Reset(void)
{ {
/* Set Joystick_DEVICE as not configured */ /* Set 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 */
@ -201,13 +219,13 @@ void PIOS_HID_Reset(void)
} }
/******************************************************************************* /*******************************************************************************
* Function Name : PIOS_HID_SetConfiguration. * Function Name : PIOS_USBHOOK_SetConfiguration.
* Description : Update the device state to configured * Description : Update the device state to configured
* Input : None. * Input : None.
* Output : None. * Output : None.
* Return : None. * Return : None.
*******************************************************************************/ *******************************************************************************/
void PIOS_HID_SetConfiguration(void) static void PIOS_USBHOOK_SetConfiguration(void)
{ {
if (pInformation->Current_Configuration != 0) { if (pInformation->Current_Configuration != 0) {
/* Device configured */ /* Device configured */
@ -219,47 +237,47 @@ void PIOS_HID_SetConfiguration(void)
} }
/******************************************************************************* /*******************************************************************************
* Function Name : PIOS_HID_SetConfiguration. * Function Name : PIOS_USBHOOK_SetConfiguration.
* Description : Update the device state to addressed. * Description : Update the device state to addressed.
* Input : None. * Input : None.
* Output : None. * Output : None.
* Return : None. * Return : None.
*******************************************************************************/ *******************************************************************************/
void PIOS_HID_SetDeviceAddress(void) static void PIOS_USBHOOK_SetDeviceAddress(void)
{ {
bDeviceState = ADDRESSED; bDeviceState = ADDRESSED;
} }
/******************************************************************************* /*******************************************************************************
* Function Name : PIOS_HID_Status_In. * Function Name : PIOS_USBHOOK_Status_In.
* Description : Joystick status IN routine. * Description : status IN routine.
* Input : None. * Input : None.
* Output : None. * Output : None.
* Return : None. * Return : None.
*******************************************************************************/ *******************************************************************************/
void PIOS_HID_Status_In(void) static void PIOS_USBHOOK_Status_In(void)
{ {
} }
/******************************************************************************* /*******************************************************************************
* Function Name : PIOS_HID_Status_Out * Function Name : PIOS_USBHOOK_Status_Out
* Description : Joystick status OUT routine. * Description : status OUT routine.
* Input : None. * Input : None.
* Output : None. * Output : None.
* Return : None. * Return : None.
*******************************************************************************/ *******************************************************************************/
void PIOS_HID_Status_Out(void) static void PIOS_USBHOOK_Status_Out(void)
{ {
} }
/******************************************************************************* /*******************************************************************************
* Function Name : PIOS_HID_Data_Setup * Function Name : PIOS_USBHOOK_Data_Setup
* Description : Handle the data class specific requests. * Description : Handle the data class specific requests.
* Input : Request Nb. * Input : Request Nb.
* Output : None. * Output : None.
* Return : USB_UNSUPPORT or USB_SUCCESS. * Return : USB_UNSUPPORT or USB_SUCCESS.
*******************************************************************************/ *******************************************************************************/
RESULT PIOS_HID_Data_Setup(uint8_t RequestNo) static RESULT PIOS_USBHOOK_Data_Setup(uint8_t RequestNo)
{ {
uint8_t *(*CopyRoutine) (uint16_t); uint8_t *(*CopyRoutine) (uint16_t);
@ -273,10 +291,10 @@ RESULT PIOS_HID_Data_Setup(uint8_t RequestNo)
case GET_DESCRIPTOR: case GET_DESCRIPTOR:
switch (pInformation->USBwValue1) { switch (pInformation->USBwValue1) {
case REPORT_DESCRIPTOR: case REPORT_DESCRIPTOR:
CopyRoutine = PIOS_HID_GetReportDescriptor; CopyRoutine = PIOS_USBHOOK_GetReportDescriptor;
break; break;
case HID_DESCRIPTOR_TYPE: case HID_DESCRIPTOR_TYPE:
CopyRoutine = PIOS_HID_GetHIDDescriptor; CopyRoutine = PIOS_USBHOOK_GetHIDDescriptor;
break; break;
} }
} }
@ -288,7 +306,7 @@ RESULT PIOS_HID_Data_Setup(uint8_t RequestNo)
case 0: /* HID Interface */ case 0: /* HID Interface */
switch (RequestNo) { switch (RequestNo) {
case GET_PROTOCOL: case GET_PROTOCOL:
CopyRoutine = PIOS_HID_GetProtocolValue; CopyRoutine = PIOS_USBHOOK_GetProtocolValue;
break; break;
} }
@ -326,13 +344,13 @@ RESULT PIOS_HID_Data_Setup(uint8_t RequestNo)
} }
/******************************************************************************* /*******************************************************************************
* Function Name : PIOS_HID_NoData_Setup * Function Name : PIOS_USBHOOK_NoData_Setup
* Description : handle the no data class specific requests * Description : handle the no data class specific requests
* Input : Request Nb. * Input : Request Nb.
* Output : None. * Output : None.
* Return : USB_UNSUPPORT or USB_SUCCESS. * Return : USB_UNSUPPORT or USB_SUCCESS.
*******************************************************************************/ *******************************************************************************/
RESULT PIOS_HID_NoData_Setup(uint8_t RequestNo) static RESULT PIOS_USBHOOK_NoData_Setup(uint8_t RequestNo)
{ {
switch (Type_Recipient) { switch (Type_Recipient) {
case (CLASS_REQUEST | INTERFACE_RECIPIENT): case (CLASS_REQUEST | INTERFACE_RECIPIENT):
@ -340,7 +358,7 @@ RESULT PIOS_HID_NoData_Setup(uint8_t RequestNo)
case 0: /* HID */ case 0: /* HID */
switch (RequestNo) { switch (RequestNo) {
case SET_PROTOCOL: case SET_PROTOCOL:
return PIOS_HID_SetProtocol(); return PIOS_USBHOOK_SetProtocol();
break; break;
} }
@ -368,37 +386,37 @@ RESULT PIOS_HID_NoData_Setup(uint8_t RequestNo)
} }
/******************************************************************************* /*******************************************************************************
* Function Name : PIOS_HID_GetDeviceDescriptor. * Function Name : PIOS_USBHOOK_GetDeviceDescriptor.
* Description : Gets the device descriptor. * Description : Gets the device descriptor.
* Input : Length * Input : Length
* Output : None. * Output : None.
* Return : The address of the device descriptor. * Return : The address of the device descriptor.
*******************************************************************************/ *******************************************************************************/
uint8_t *PIOS_HID_GetDeviceDescriptor(uint16_t Length) static uint8_t *PIOS_USBHOOK_GetDeviceDescriptor(uint16_t Length)
{ {
return Standard_GetDescriptorData(Length, &Device_Descriptor); return Standard_GetDescriptorData(Length, &Device_Descriptor);
} }
/******************************************************************************* /*******************************************************************************
* Function Name : PIOS_HID_GetConfigDescriptor. * Function Name : PIOS_USBHOOK_GetConfigDescriptor.
* Description : Gets the configuration descriptor. * Description : Gets the configuration descriptor.
* Input : Length * Input : Length
* Output : None. * Output : None.
* Return : The address of the configuration descriptor. * Return : The address of the configuration descriptor.
*******************************************************************************/ *******************************************************************************/
uint8_t *PIOS_HID_GetConfigDescriptor(uint16_t Length) static uint8_t *PIOS_USBHOOK_GetConfigDescriptor(uint16_t Length)
{ {
return Standard_GetDescriptorData(Length, &Config_Descriptor); return Standard_GetDescriptorData(Length, &Config_Descriptor);
} }
/******************************************************************************* /*******************************************************************************
* Function Name : PIOS_HID_GetStringDescriptor * Function Name : PIOS_USBHOOK_GetStringDescriptor
* Description : Gets the string descriptors according to the needed index * Description : Gets the string descriptors according to the needed index
* Input : Length * Input : Length
* Output : None. * Output : None.
* Return : The address of the string descriptors. * Return : The address of the string descriptors.
*******************************************************************************/ *******************************************************************************/
uint8_t *PIOS_HID_GetStringDescriptor(uint16_t Length) static uint8_t *PIOS_USBHOOK_GetStringDescriptor(uint16_t Length)
{ {
uint8_t wValue0 = pInformation->USBwValue0; uint8_t wValue0 = pInformation->USBwValue0;
if (wValue0 > 4) { if (wValue0 > 4) {
@ -409,31 +427,31 @@ uint8_t *PIOS_HID_GetStringDescriptor(uint16_t Length)
} }
/******************************************************************************* /*******************************************************************************
* Function Name : PIOS_HID_GetReportDescriptor. * Function Name : PIOS_USBHOOK_GetReportDescriptor.
* Description : Gets the HID report descriptor. * Description : Gets the HID report descriptor.
* Input : Length * Input : Length
* Output : None. * Output : None.
* Return : The address of the configuration descriptor. * Return : The address of the configuration descriptor.
*******************************************************************************/ *******************************************************************************/
uint8_t *PIOS_HID_GetReportDescriptor(uint16_t Length) static uint8_t *PIOS_USBHOOK_GetReportDescriptor(uint16_t Length)
{ {
return Standard_GetDescriptorData(Length, &PIOS_HID_Report_Descriptor); return Standard_GetDescriptorData(Length, &PIOS_HID_Report_Descriptor);
} }
/******************************************************************************* /*******************************************************************************
* Function Name : PIOS_HID_GetHIDDescriptor. * Function Name : PIOS_USBHOOK_GetHIDDescriptor.
* Description : Gets the HID descriptor. * Description : Gets the HID descriptor.
* Input : Length * Input : Length
* Output : None. * Output : None.
* Return : The address of the configuration descriptor. * Return : The address of the configuration descriptor.
*******************************************************************************/ *******************************************************************************/
uint8_t *PIOS_HID_GetHIDDescriptor(uint16_t Length) static uint8_t *PIOS_USBHOOK_GetHIDDescriptor(uint16_t Length)
{ {
return Standard_GetDescriptorData(Length, &PIOS_HID_Hid_Descriptor); return Standard_GetDescriptorData(Length, &PIOS_HID_Hid_Descriptor);
} }
/******************************************************************************* /*******************************************************************************
* Function Name : PIOS_HID_Get_Interface_Setting. * Function Name : PIOS_USBHOOK_Get_Interface_Setting.
* Description : tests the interface and the alternate setting according to the * Description : tests the interface and the alternate setting according to the
* supported one. * supported one.
* Input : - Interface : interface number. * Input : - Interface : interface number.
@ -441,7 +459,7 @@ uint8_t *PIOS_HID_GetHIDDescriptor(uint16_t Length)
* Output : None. * Output : None.
* Return : USB_SUCCESS or USB_UNSUPPORT. * Return : USB_SUCCESS or USB_UNSUPPORT.
*******************************************************************************/ *******************************************************************************/
RESULT PIOS_HID_Get_Interface_Setting(uint8_t Interface, uint8_t AlternateSetting) static RESULT PIOS_USBHOOK_Get_Interface_Setting(uint8_t Interface, uint8_t AlternateSetting)
{ {
if (AlternateSetting > 0) { if (AlternateSetting > 0) {
return USB_UNSUPPORT; return USB_UNSUPPORT;
@ -452,13 +470,13 @@ RESULT PIOS_HID_Get_Interface_Setting(uint8_t Interface, uint8_t AlternateSettin
} }
/******************************************************************************* /*******************************************************************************
* Function Name : PIOS_HID_SetProtocol * Function Name : PIOS_USBHOOK_SetProtocol
* Description : Joystick Set Protocol request routine. * Description : Set Protocol request routine.
* Input : None. * Input : None.
* Output : None. * Output : None.
* Return : USB SUCCESS. * Return : USB SUCCESS.
*******************************************************************************/ *******************************************************************************/
RESULT PIOS_HID_SetProtocol(void) static RESULT PIOS_USBHOOK_SetProtocol(void)
{ {
uint8_t wValue0 = pInformation->USBwValue0; uint8_t wValue0 = pInformation->USBwValue0;
ProtocolValue = wValue0; ProtocolValue = wValue0;
@ -466,13 +484,13 @@ RESULT PIOS_HID_SetProtocol(void)
} }
/******************************************************************************* /*******************************************************************************
* Function Name : PIOS_HID_GetProtocolValue * Function Name : PIOS_USBHOOK_GetProtocolValue
* Description : get the protocol value * Description : get the protocol value
* Input : Length. * Input : Length.
* Output : None. * Output : None.
* Return : address of the protcol value. * Return : address of the protcol value.
*******************************************************************************/ *******************************************************************************/
uint8_t *PIOS_HID_GetProtocolValue(uint16_t Length) static uint8_t *PIOS_USBHOOK_GetProtocolValue(uint16_t Length)
{ {
if (Length == 0) { if (Length == 0) {
pInformation->Ctrl_Info.Usb_wLength = 1; pInformation->Ctrl_Info.Usb_wLength = 1;

36
flight/PiOS/inc/pios_usb_hid_prop.h → flight/PiOS/inc/pios_usbhook.h
View File

@ -1,5 +1,5 @@
/******************** (C) COPYRIGHT 2010 STMicroelectronics ******************** /******************** (C) COPYRIGHT 2010 STMicroelectronics ********************
* File Name : usb_prop.h * File Name : pios_usbhook.h
* Author : MCD Application Team * Author : MCD Application Team
* Version : V3.2.1 * Version : V3.2.1
* Date : 07/05/2010 * Date : 07/05/2010
@ -14,8 +14,8 @@
*******************************************************************************/ *******************************************************************************/
/* Define to prevent recursive inclusion -------------------------------------*/ /* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __USB_PROP_H #ifndef PIOS_USBHOOK_H
#define __USB_PROP_H #define PIOS_USBHOOK_H
/* Includes ------------------------------------------------------------------*/ /* Includes ------------------------------------------------------------------*/
/* Exported types ------------------------------------------------------------*/ /* Exported types ------------------------------------------------------------*/
@ -38,37 +38,9 @@ typedef enum CDC_REQUESTS {
/* Exported constants --------------------------------------------------------*/ /* Exported constants --------------------------------------------------------*/
/* Exported macro ------------------------------------------------------------*/ /* Exported macro ------------------------------------------------------------*/
/* Exported functions ------------------------------------------------------- */ /* Exported functions ------------------------------------------------------- */
void PIOS_HID_init(void);
void PIOS_HID_Reset(void);
void PIOS_HID_SetConfiguration(void);
void PIOS_HID_SetDeviceAddress(void);
void PIOS_HID_Status_In(void);
void PIOS_HID_Status_Out(void);
RESULT PIOS_HID_Data_Setup(uint8_t);
RESULT PIOS_HID_NoData_Setup(uint8_t);
RESULT PIOS_HID_Get_Interface_Setting(uint8_t Interface, uint8_t AlternateSetting);
uint8_t *PIOS_HID_GetDeviceDescriptor(uint16_t);
uint8_t *PIOS_HID_GetConfigDescriptor(uint16_t);
uint8_t *PIOS_HID_GetStringDescriptor(uint16_t);
RESULT PIOS_HID_SetProtocol(void);
uint8_t *PIOS_HID_GetProtocolValue(uint16_t Length);
RESULT PIOS_HID_SetProtocol(void);
uint8_t *PIOS_HID_GetReportDescriptor(uint16_t Length);
uint8_t *PIOS_HID_GetHIDDescriptor(uint16_t Length);
/* Exported define -----------------------------------------------------------*/ /* Exported define -----------------------------------------------------------*/
#define PIOS_HID_GetConfiguration NOP_Process
//#define PIOS_HID_SetConfiguration NOP_Process
#define PIOS_HID_GetInterface NOP_Process
#define PIOS_HID_SetInterface NOP_Process
#define PIOS_HID_GetStatus NOP_Process
#define PIOS_HID_ClearFeature NOP_Process
#define PIOS_HID_SetEndPointFeature NOP_Process
#define PIOS_HID_SetDeviceFeature NOP_Process
//#define PIOS_HID_SetDeviceAddress NOP_Process
#define REPORT_DESCRIPTOR 0x22 #define REPORT_DESCRIPTOR 0x22
#endif /* __USB_PROP_H */ #endif /* PIOS_USBHOOK_H */
/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/ /******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

2
flight/PipXtreme/Makefile
View File

@ -115,11 +115,11 @@ SRC += $(PIOSSTM32F10X)/pios_ppm.c
# PIOS USB related files (seperated to make code maintenance more easy) # PIOS USB related files (seperated to make code maintenance more easy)
ifeq ($(USE_USB), YES) ifeq ($(USE_USB), YES)
SRC += $(PIOSSTM32F10X)/pios_usbhook.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid.c SRC += $(PIOSSTM32F10X)/pios_usb_hid.c
#SRC += $(PIOSSTM32F10X)/pios_usb_hid_desc.c #SRC += $(PIOSSTM32F10X)/pios_usb_hid_desc.c
#SRC += $(PIOSSTM32F10X)/pios_usb_hid_endp.c #SRC += $(PIOSSTM32F10X)/pios_usb_hid_endp.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_istr.c SRC += $(PIOSSTM32F10X)/pios_usb_hid_istr.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_prop.c
SRC += $(PIOSSTM32F10X)/pios_usb_hid_pwr.c SRC += $(PIOSSTM32F10X)/pios_usb_hid_pwr.c
SRC += $(PIOSSTM32F10X)/pios_usb_com.c SRC += $(PIOSSTM32F10X)/pios_usb_com.c
endif endif