Fixed bug #703.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8847 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
36ea3ee8a8
commit
28e566ccfd
|
@ -343,8 +343,8 @@
|
|||
/*
|
||||
* USB driver system settings.
|
||||
*/
|
||||
#define STM32_USB_USE_OTG1 TRUE
|
||||
#define STM32_USB_USE_OTG2 FALSE
|
||||
#define STM32_USB_USE_OTG1 FALSE
|
||||
#define STM32_USB_USE_OTG2 TRUE
|
||||
#define STM32_USB_OTG1_IRQ_PRIORITY 14
|
||||
#define STM32_USB_OTG2_IRQ_PRIORITY 14
|
||||
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
|
||||
|
|
|
@ -20,11 +20,11 @@
|
|||
SerialUSBDriver SDU1;
|
||||
|
||||
/*
|
||||
* Endpoints to be used for USBD1.
|
||||
* Endpoints to be used for USBD2.
|
||||
*/
|
||||
#define USBD1_DATA_REQUEST_EP 1
|
||||
#define USBD1_DATA_AVAILABLE_EP 1
|
||||
#define USBD1_INTERRUPT_REQUEST_EP 2
|
||||
#define USBD2_DATA_REQUEST_EP 1
|
||||
#define USBD2_DATA_AVAILABLE_EP 1
|
||||
#define USBD2_INTERRUPT_REQUEST_EP 2
|
||||
|
||||
/*
|
||||
* USB Device Descriptor.
|
||||
|
@ -102,7 +102,7 @@ static const uint8_t vcom_configuration_descriptor_data[67] = {
|
|||
USB_DESC_BYTE (0x01), /* bSlaveInterface0 (Data Class
|
||||
Interface). */
|
||||
/* Endpoint 2 Descriptor.*/
|
||||
USB_DESC_ENDPOINT (USBD1_INTERRUPT_REQUEST_EP|0x80,
|
||||
USB_DESC_ENDPOINT (USBD2_INTERRUPT_REQUEST_EP|0x80,
|
||||
0x03, /* bmAttributes (Interrupt). */
|
||||
0x0008, /* wMaxPacketSize. */
|
||||
0xFF), /* bInterval. */
|
||||
|
@ -118,12 +118,12 @@ static const uint8_t vcom_configuration_descriptor_data[67] = {
|
|||
4.7). */
|
||||
0x00), /* iInterface. */
|
||||
/* Endpoint 3 Descriptor.*/
|
||||
USB_DESC_ENDPOINT (USBD1_DATA_AVAILABLE_EP, /* bEndpointAddress.*/
|
||||
USB_DESC_ENDPOINT (USBD2_DATA_AVAILABLE_EP, /* bEndpointAddress.*/
|
||||
0x02, /* bmAttributes (Bulk). */
|
||||
0x0040, /* wMaxPacketSize. */
|
||||
0x00), /* bInterval. */
|
||||
/* Endpoint 1 Descriptor.*/
|
||||
USB_DESC_ENDPOINT (USBD1_DATA_REQUEST_EP|0x80, /* bEndpointAddress.*/
|
||||
USB_DESC_ENDPOINT (USBD2_DATA_REQUEST_EP|0x80, /* bEndpointAddress.*/
|
||||
0x02, /* bmAttributes (Bulk). */
|
||||
0x0040, /* wMaxPacketSize. */
|
||||
0x00) /* bInterval. */
|
||||
|
@ -277,8 +277,8 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
|
|||
/* Enables the endpoints specified into the configuration.
|
||||
Note, this callback is invoked from an ISR so I-Class functions
|
||||
must be used.*/
|
||||
usbInitEndpointI(usbp, USBD1_DATA_REQUEST_EP, &ep1config);
|
||||
usbInitEndpointI(usbp, USBD1_INTERRUPT_REQUEST_EP, &ep2config);
|
||||
usbInitEndpointI(usbp, USBD2_DATA_REQUEST_EP, &ep1config);
|
||||
usbInitEndpointI(usbp, USBD2_INTERRUPT_REQUEST_EP, &ep2config);
|
||||
|
||||
/* Resetting the state of the CDC subsystem.*/
|
||||
sduConfigureHookI(&SDU1);
|
||||
|
@ -327,8 +327,8 @@ const USBConfig usbcfg = {
|
|||
* Serial over USB driver configuration.
|
||||
*/
|
||||
const SerialUSBConfig serusbcfg = {
|
||||
&USBD1,
|
||||
USBD1_DATA_REQUEST_EP,
|
||||
USBD1_DATA_AVAILABLE_EP,
|
||||
USBD1_INTERRUPT_REQUEST_EP
|
||||
&USBD2,
|
||||
USBD2_DATA_REQUEST_EP,
|
||||
USBD2_DATA_AVAILABLE_EP,
|
||||
USBD2_INTERRUPT_REQUEST_EP
|
||||
};
|
||||
|
|
|
@ -76,6 +76,7 @@
|
|||
- RT: Removed the p_msg field from the thread_t structure saving a
|
||||
msg_t-sized field from the structure. Messages now use a new field
|
||||
into the p_u union. Now synchronous messages are even faster.
|
||||
- HAL: Fixed broken demo for STM32F429 (bug #703)(backported to 16.1.3).
|
||||
- HAL: Fixed wrong macro definition for palWriteLine (bug #702)(backported
|
||||
to 16.1.3).
|
||||
- HAL: Fixed error is buffer queues (bug #701)(backported to 16.1.3).
|
||||
|
|
Loading…
Reference in New Issue