diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-08-21 11:04:42 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-08-21 11:04:42 +0000 |
| commit | 659ae9692564f5bd99435cfbf3564a5e78d09ace (patch) | |
| tree | 10eb788864f585ce7b1409667edcae9b8b26b9ca /os/hal/platforms/STM32 | |
| parent | 603771beb4849042327ac5164e6a52f1d74ec6a7 (diff) | |
| download | ChibiOS-659ae9692564f5bd99435cfbf3564a5e78d09ace.tar.gz ChibiOS-659ae9692564f5bd99435cfbf3564a5e78d09ace.tar.bz2 ChibiOS-659ae9692564f5bd99435cfbf3564a5e78d09ace.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4602 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/platforms/STM32')
| -rw-r--r-- | os/hal/platforms/STM32/OTGv1/usb_lld.c | 8 | ||||
| -rw-r--r-- | os/hal/platforms/STM32/OTGv1/usb_lld.h | 20 |
2 files changed, 14 insertions, 14 deletions
diff --git a/os/hal/platforms/STM32/OTGv1/usb_lld.c b/os/hal/platforms/STM32/OTGv1/usb_lld.c index 0aff84c3c..31212f28e 100644 --- a/os/hal/platforms/STM32/OTGv1/usb_lld.c +++ b/os/hal/platforms/STM32/OTGv1/usb_lld.c @@ -513,8 +513,8 @@ static bool_t otg_txfifo_handler(USBDriver *usbp, usbep_t ep) { if (((usbp->otg->ie[ep].DTXFSTS & DTXFSTS_INEPTFSAV_MASK) * 4) < n)
return FALSE;
-#if STM32_USB_FIFO_FILL_PRIORITY_MASK
- __set_BASEPRI(CORTEX_PRIORITY_MASK(STM32_USB_FIFO_FILL_PRIORITY_MASK));
+#if STM32_USB_OTGFIFO_FILL_BASEPRI
+ __set_BASEPRI(CORTEX_PRIORITY_MASK(STM32_USB_OTGFIFO_FILL_BASEPRI));
#endif
/* Handles the two cases: linear buffer or queue.*/
if (usbp->epc[ep]->in_state->txqueued) {
@@ -532,7 +532,7 @@ static bool_t otg_txfifo_handler(USBDriver *usbp, usbep_t ep) { }
usbp->epc[ep]->in_state->txcnt += n;
}
-#if STM32_USB_FIFO_FILL_PRIORITY_MASK
+#if STM32_USB_OTGFIFO_FILL_BASEPRI
__set_BASEPRI(0);
#endif
}
@@ -871,7 +871,7 @@ void usb_lld_start(USBDriver *usbp) { if (usbp->thd_ptr == NULL)
usbp->thd_ptr = usbp->thd_wait = chThdCreateI(usbp->wa_pump,
sizeof usbp->wa_pump,
- STM32_USB_THREAD_PRIORITY,
+ STM32_USB_OTG_THREAD_PRIO,
usb_lld_pump,
usbp);
diff --git a/os/hal/platforms/STM32/OTGv1/usb_lld.h b/os/hal/platforms/STM32/OTGv1/usb_lld.h index f2c0633df..424d523c5 100644 --- a/os/hal/platforms/STM32/OTGv1/usb_lld.h +++ b/os/hal/platforms/STM32/OTGv1/usb_lld.h @@ -61,7 +61,7 @@ * @note The default is @p TRUE.
*/
#if !defined(STM32_USB_USE_OTG1) || defined(__DOXYGEN__)
-#define STM32_USB_USE_OTG1 TRUE
+#define STM32_USB_USE_OTG1 FALSE
#endif
/**
@@ -70,7 +70,7 @@ * @note The default is @p TRUE.
*/
#if !defined(STM32_USB_USE_OTG2) || defined(__DOXYGEN__)
-#define STM32_USB_USE_OTG2 TRUE
+#define STM32_USB_USE_OTG2 FALSE
#endif
/**
@@ -100,21 +100,21 @@ * @note Must be a multiple of 4.
*/
#if !defined(STM32_USB_OTG2_RX_FIFO_SIZE) || defined(__DOXYGEN__)
-#define STM32_USB_OTG2_RX_FIFO_SIZE 512
+#define STM32_USB_OTG2_RX_FIFO_SIZE 1024
#endif
/**
* @brief Dedicated data pump threads priority.
*/
-#if !defined(STM32_USB_THREAD_PRIORITY) || defined(__DOXYGEN__)
-#define STM32_USB_THREAD_PRIORITY LOWPRIO
+#if !defined(STM32_USB_OTG_THREAD_PRIORITY) || defined(__DOXYGEN__)
+#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
#endif
/**
* @brief Dedicated data pump threads stack size.
*/
-#if !defined(STM32_USB_THREAD_STACK_SIZE) || defined(__DOXYGEN__)
-#define STM32_USB_THREAD_STACK_SIZE 128
+#if !defined(STM32_USB_OTG_THREAD_STACK_SIZE) || defined(__DOXYGEN__)
+#define STM32_USB_OTG_THREAD_STACK_SIZE 128
#endif
/**
@@ -132,8 +132,8 @@ * functions is only safe from thread level or from USB
* callbacks.
*/
-#if !defined(STM32_USB_FIFO_FILL_PRIORITY_MASK) || defined(__DOXYGEN__)
-#define STM32_USB_FIFO_FILL_PRIORITY_MASK 0
+#if !defined(STM32_USB_OTGFIFO_FILL_BASEPRI) || defined(__DOXYGEN__)
+#define STM32_USB_OTGFIFO_FILL_BASEPRI 0
#endif
/*===========================================================================*/
@@ -447,7 +447,7 @@ struct USBDriver { /**
* @brief Working area for the dedicated data pump thread;
*/
- WORKING_AREA(wa_pump, STM32_USB_THREAD_STACK_SIZE);
+ WORKING_AREA(wa_pump, STM32_USB_OTG_THREAD_STACK_SIZE);
};
/*===========================================================================*/
|