diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-26 13:07:19 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-26 13:07:19 +0000 |
| commit | c8dff54685e5e904f7e7c6382144ac22035aad10 (patch) | |
| tree | 06787ca72a0b8f3cf6acd1ab8c60450ba0251a8a /os/hal | |
| parent | 611c3138873b38fd26c19c43ce3436fe0528604a (diff) | |
| download | ChibiOS-c8dff54685e5e904f7e7c6382144ac22035aad10.tar.gz ChibiOS-c8dff54685e5e904f7e7c6382144ac22035aad10.tar.bz2 ChibiOS-c8dff54685e5e904f7e7c6382144ac22035aad10.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6226 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal')
| -rw-r--r-- | os/hal/osal/chibios/osal.h | 8 | ||||
| -rw-r--r-- | os/hal/platforms/STM32/USBv1/usb_lld.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/os/hal/osal/chibios/osal.h b/os/hal/osal/chibios/osal.h index 55141960b..b03681f09 100644 --- a/os/hal/osal/chibios/osal.h +++ b/os/hal/osal/chibios/osal.h @@ -408,9 +408,9 @@ static inline void osalSysUnlockFromISR(void) { *
* @xclass
*/
-static inline syssts_t osalSysGetAndLockX(void) {
+static inline syssts_t osalSysGetStatusAndLockX(void) {
- return chSysGetAndLockX();
+ return chSysGetStatusAndLockX();
}
/**
@@ -420,9 +420,9 @@ static inline syssts_t osalSysGetAndLockX(void) { *
* @xclass
*/
-static inline void osalSysRestoreLockX(syssts_t sts) {
+static inline void osalSysRestoreLockAndRescheduleX(syssts_t sts) {
- chSysRestoreLockX(sts);
+ chSysRestoreLockAndRescheduleX(sts);
}
/**
diff --git a/os/hal/platforms/STM32/USBv1/usb_lld.c b/os/hal/platforms/STM32/USBv1/usb_lld.c index 6f1dbc099..b1e721556 100644 --- a/os/hal/platforms/STM32/USBv1/usb_lld.c +++ b/os/hal/platforms/STM32/USBv1/usb_lld.c @@ -248,12 +248,12 @@ static void usb_packet_write_from_queue(stm32_usb_descriptor_t *udp, }
/* Updating queue.*/
- sts = osalSysGetAndLockX();
+ sts = osalSysGetStatusAndLockX();
oqp->q_counter += n;
osalQueueWakeupAllI(&oqp->q_waiting, Q_OK);
- osalSysRestoreLockX(sts);
+ osalSysRestoreLockAndRescheduleX(sts);
}
/*===========================================================================*/
|