diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-10-23 12:21:44 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-10-23 12:21:44 +0000 |
| commit | 2f572f109a463e7faa46ed544c91198e72e63343 (patch) | |
| tree | 357162e59b91596a8441d9cd6a48f07458a95771 /os | |
| parent | 53df7ed814f665ebeef75b379941f9c0cebcba55 (diff) | |
| download | ChibiOS-2f572f109a463e7faa46ed544c91198e72e63343.tar.gz ChibiOS-2f572f109a463e7faa46ed544c91198e72e63343.tar.bz2 ChibiOS-2f572f109a463e7faa46ed544c91198e72e63343.zip | |
USB enhancements, phase two.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3451 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/hal/include/usb.h | 10 | ||||
| -rw-r--r-- | os/various/shell.c | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/os/hal/include/usb.h b/os/hal/include/usb.h index 18842abd3..bc4418f6b 100644 --- a/os/hal/include/usb.h +++ b/os/hal/include/usb.h @@ -322,6 +322,16 @@ typedef const USBDescriptor * (*usbgetdescriptor_t)(USBDriver *usbp, * @{
*/
/**
+ * @brief Connects the USB device.
+ */
+#define usbConnectBus(usbp) usb_lld_connect_bus(usbp)
+
+/**
+ * @brief Disconnect the USB device.
+ */
+#define usbDisconnectBus(usbp) usb_lld_disconnect_bus(usbp)
+
+/**
* @brief Returns the current frame number.
*
* @param[in] usbp pointer to the @p USBDriver object
diff --git a/os/various/shell.c b/os/various/shell.c index a99f2657c..4c84a7b51 100644 --- a/os/various/shell.c +++ b/os/various/shell.c @@ -204,7 +204,7 @@ static msg_t shell_thread(void *p) { there is not a chSysUnlock() because the thread terminates upon return.*/
chSysLock();
chEvtBroadcastI(&shell_terminated);
- return msg;
+ chThdExitS(msg);
}
/**
|