mirror of https://github.com/rusefi/ChibiOS.git
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7589 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
2e7aee242c
commit
6184745e4e
|
@ -65,6 +65,14 @@ typedef struct {
|
||||||
* @brief Buffer Table Address.
|
* @brief Buffer Table Address.
|
||||||
*/
|
*/
|
||||||
volatile uint32_t BTABLE;
|
volatile uint32_t BTABLE;
|
||||||
|
/*
|
||||||
|
* @brief LPM Control and Status Register.
|
||||||
|
*/
|
||||||
|
volatile uint32_t LPMCSR;
|
||||||
|
/*
|
||||||
|
* @brief Battery Charging Detector
|
||||||
|
*/
|
||||||
|
volatile uint32_t BCDR;
|
||||||
} stm32_usb_t;
|
} stm32_usb_t;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -95,14 +103,6 @@ typedef struct {
|
||||||
* @brief RX counter register 1.
|
* @brief RX counter register 1.
|
||||||
*/
|
*/
|
||||||
volatile uint16_t RXCOUNT1;
|
volatile uint16_t RXCOUNT1;
|
||||||
/*
|
|
||||||
* @brief LPM Control and Status Register.
|
|
||||||
*/
|
|
||||||
volatile uint32_t LPMCSR;
|
|
||||||
/*
|
|
||||||
* @brief Battery Charging Detector
|
|
||||||
*/
|
|
||||||
volatile uint32_t BCDR;
|
|
||||||
} stm32_usb_descriptor_t;
|
} stm32_usb_descriptor_t;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -404,6 +404,26 @@ struct USBDriver {
|
||||||
#define usb_lld_get_transaction_size(usbp, ep) \
|
#define usb_lld_get_transaction_size(usbp, ep) \
|
||||||
((usbp)->epc[ep]->out_state->rxcnt)
|
((usbp)->epc[ep]->out_state->rxcnt)
|
||||||
|
|
||||||
|
#if STM32_USB_HAS_BCDR || defined(__DOXYGEN__)
|
||||||
|
/**
|
||||||
|
* @brief Connects the USB device.
|
||||||
|
*
|
||||||
|
* @api
|
||||||
|
*/
|
||||||
|
#if !defined(usb_lld_connect_bus)
|
||||||
|
#define usb_lld_connect_bus(usbp) (STM32_USB->BCDR |= USB_BCDR_DPPU)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Disconnect the USB device.
|
||||||
|
*
|
||||||
|
* @api
|
||||||
|
*/
|
||||||
|
#if !defined(usb_lld_disconnect_bus)
|
||||||
|
#define usb_lld_disconnect_bus(usbp) (STM32_USB->BCDR &= ~USB_BCDR_DPPU)
|
||||||
|
#endif
|
||||||
|
#endif /* STM32_USB_HAS_BCDR */
|
||||||
|
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
/* External declarations. */
|
/* External declarations. */
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
|
@ -195,6 +195,7 @@
|
||||||
#if defined(STM32F042x6) || defined(STM32F048xx) || defined(STM32F072xB) || \
|
#if defined(STM32F042x6) || defined(STM32F048xx) || defined(STM32F072xB) || \
|
||||||
defined(STM32F078xx)
|
defined(STM32F078xx)
|
||||||
#define STM32_HAS_USB TRUE
|
#define STM32_HAS_USB TRUE
|
||||||
|
#define STM32_USB_HAS_BCDR TRUE
|
||||||
#else
|
#else
|
||||||
#define STM32_HAS_USB FALSE
|
#define STM32_HAS_USB FALSE
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -582,6 +582,7 @@
|
||||||
|
|
||||||
/* USB attributes.*/
|
/* USB attributes.*/
|
||||||
#define STM32_HAS_USB TRUE
|
#define STM32_HAS_USB TRUE
|
||||||
|
#define STM32_USB_HAS_BCDR FALSE
|
||||||
#define STM32_HAS_OTG1 FALSE
|
#define STM32_HAS_OTG1 FALSE
|
||||||
#define STM32_HAS_OTG2 FALSE
|
#define STM32_HAS_OTG2 FALSE
|
||||||
/** @} */
|
/** @} */
|
||||||
|
@ -756,6 +757,7 @@
|
||||||
|
|
||||||
/* USB attributes.*/
|
/* USB attributes.*/
|
||||||
#define STM32_HAS_USB TRUE
|
#define STM32_HAS_USB TRUE
|
||||||
|
#define STM32_USB_HAS_BCDR FALSE
|
||||||
#define STM32_HAS_OTG1 FALSE
|
#define STM32_HAS_OTG1 FALSE
|
||||||
#define STM32_HAS_OTG2 FALSE
|
#define STM32_HAS_OTG2 FALSE
|
||||||
/** @} */
|
/** @} */
|
||||||
|
@ -930,6 +932,7 @@
|
||||||
|
|
||||||
/* USB attributes.*/
|
/* USB attributes.*/
|
||||||
#define STM32_HAS_USB TRUE
|
#define STM32_HAS_USB TRUE
|
||||||
|
#define STM32_USB_HAS_BCDR FALSE
|
||||||
#define STM32_HAS_OTG1 FALSE
|
#define STM32_HAS_OTG1 FALSE
|
||||||
#define STM32_HAS_OTG2 FALSE
|
#define STM32_HAS_OTG2 FALSE
|
||||||
/** @} */
|
/** @} */
|
||||||
|
|
|
@ -206,6 +206,7 @@
|
||||||
|
|
||||||
/* USB attributes.*/
|
/* USB attributes.*/
|
||||||
#define STM32_HAS_USB TRUE
|
#define STM32_HAS_USB TRUE
|
||||||
|
#define STM32_USB_HAS_BCDR FALSE
|
||||||
#define STM32_HAS_OTG1 FALSE
|
#define STM32_HAS_OTG1 FALSE
|
||||||
#define STM32_HAS_OTG2 FALSE
|
#define STM32_HAS_OTG2 FALSE
|
||||||
#endif /* defined(STM32F373xC) */
|
#endif /* defined(STM32F373xC) */
|
||||||
|
|
|
@ -204,6 +204,7 @@
|
||||||
|
|
||||||
/* USB attributes.*/
|
/* USB attributes.*/
|
||||||
#define STM32_HAS_USB TRUE
|
#define STM32_HAS_USB TRUE
|
||||||
|
#define STM32_USB_HAS_BCDR FALSE
|
||||||
#define STM32_HAS_OTG1 FALSE
|
#define STM32_HAS_OTG1 FALSE
|
||||||
#define STM32_HAS_OTG2 FALSE
|
#define STM32_HAS_OTG2 FALSE
|
||||||
#endif /* defined(STM32F303xC) */
|
#endif /* defined(STM32F303xC) */
|
||||||
|
@ -658,6 +659,7 @@
|
||||||
|
|
||||||
/* USB attributes.*/
|
/* USB attributes.*/
|
||||||
#define STM32_HAS_USB TRUE
|
#define STM32_HAS_USB TRUE
|
||||||
|
#define STM32_USB_HAS_BCDR FALSE
|
||||||
#define STM32_HAS_OTG1 FALSE
|
#define STM32_HAS_OTG1 FALSE
|
||||||
#define STM32_HAS_OTG2 FALSE
|
#define STM32_HAS_OTG2 FALSE
|
||||||
#endif /* defined(STM32F302x8) */
|
#endif /* defined(STM32F302x8) */
|
||||||
|
@ -821,6 +823,7 @@
|
||||||
|
|
||||||
/* USB attributes.*/
|
/* USB attributes.*/
|
||||||
#define STM32_HAS_USB TRUE
|
#define STM32_HAS_USB TRUE
|
||||||
|
#define STM32_USB_HAS_BCDR FALSE
|
||||||
#define STM32_HAS_OTG1 FALSE
|
#define STM32_HAS_OTG1 FALSE
|
||||||
#define STM32_HAS_OTG2 FALSE
|
#define STM32_HAS_OTG2 FALSE
|
||||||
#endif /* defined(STM32F302xC) */
|
#endif /* defined(STM32F302xC) */
|
||||||
|
@ -971,6 +974,7 @@
|
||||||
|
|
||||||
/* USB attributes.*/
|
/* USB attributes.*/
|
||||||
#define STM32_HAS_USB TRUE
|
#define STM32_HAS_USB TRUE
|
||||||
|
#define STM32_USB_HAS_BCDR FALSE
|
||||||
#define STM32_HAS_OTG1 FALSE
|
#define STM32_HAS_OTG1 FALSE
|
||||||
#define STM32_HAS_OTG2 FALSE
|
#define STM32_HAS_OTG2 FALSE
|
||||||
#endif /* defined(STM32F318x8) */
|
#endif /* defined(STM32F318x8) */
|
||||||
|
@ -1283,6 +1287,7 @@
|
||||||
|
|
||||||
/* USB attributes.*/
|
/* USB attributes.*/
|
||||||
#define STM32_HAS_USB TRUE
|
#define STM32_HAS_USB TRUE
|
||||||
|
#define STM32_USB_HAS_BCDR FALSE
|
||||||
#define STM32_HAS_OTG1 FALSE
|
#define STM32_HAS_OTG1 FALSE
|
||||||
#define STM32_HAS_OTG2 FALSE
|
#define STM32_HAS_OTG2 FALSE
|
||||||
#endif /* defined(STM32F358xC) */
|
#endif /* defined(STM32F358xC) */
|
||||||
|
|
|
@ -178,6 +178,7 @@
|
||||||
|
|
||||||
/* USB attributes.*/
|
/* USB attributes.*/
|
||||||
#define STM32_HAS_USB TRUE
|
#define STM32_HAS_USB TRUE
|
||||||
|
#define STM32_USB_HAS_BCDR FALSE
|
||||||
#define STM32_HAS_OTG1 FALSE
|
#define STM32_HAS_OTG1 FALSE
|
||||||
#define STM32_HAS_OTG2 FALSE
|
#define STM32_HAS_OTG2 FALSE
|
||||||
|
|
||||||
|
@ -333,6 +334,7 @@
|
||||||
|
|
||||||
/* USB attributes.*/
|
/* USB attributes.*/
|
||||||
#define STM32_HAS_USB TRUE
|
#define STM32_HAS_USB TRUE
|
||||||
|
#define STM32_USB_HAS_BCDR FALSE
|
||||||
#define STM32_HAS_OTG1 FALSE
|
#define STM32_HAS_OTG1 FALSE
|
||||||
#define STM32_HAS_OTG2 FALSE
|
#define STM32_HAS_OTG2 FALSE
|
||||||
|
|
||||||
|
|
|
@ -35,13 +35,6 @@
|
||||||
#define USBD1_DATA_AVAILABLE_EP 1
|
#define USBD1_DATA_AVAILABLE_EP 1
|
||||||
#define USBD1_INTERRUPT_REQUEST_EP 2
|
#define USBD1_INTERRUPT_REQUEST_EP 2
|
||||||
|
|
||||||
/*
|
|
||||||
* DP resistor control is not possible on the STM32F3-Discovery, using stubs
|
|
||||||
* for the connection macros.
|
|
||||||
*/
|
|
||||||
#define usb_lld_connect_bus(usbp)
|
|
||||||
#define usb_lld_disconnect_bus(usbp)
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Serial over USB Driver structure.
|
* Serial over USB Driver structure.
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue