diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-06-13 16:13:00 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-06-13 16:13:00 +0000 |
| commit | f620f29e0a803ed942134ac8a801d5204cebe034 (patch) | |
| tree | b2085f49e6b84e76ecc122a521c65a442381213f /os/hal/include | |
| parent | 93ed653e57fb9947feadf43d36442658e00d4339 (diff) | |
| download | ChibiOS-f620f29e0a803ed942134ac8a801d5204cebe034.tar.gz ChibiOS-f620f29e0a803ed942134ac8a801d5204cebe034.tar.bz2 ChibiOS-f620f29e0a803ed942134ac8a801d5204cebe034.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4273 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/include')
| -rw-r--r-- | os/hal/include/io_channel.h | 2 | ||||
| -rw-r--r-- | os/hal/include/serial_usb.h | 1 | ||||
| -rw-r--r-- | os/hal/include/usb.h | 14 |
3 files changed, 16 insertions, 1 deletions
diff --git a/os/hal/include/io_channel.h b/os/hal/include/io_channel.h index 3357bf6bd..2f2809bf8 100644 --- a/os/hal/include/io_channel.h +++ b/os/hal/include/io_channel.h @@ -275,7 +275,7 @@ typedef struct { /** @brief No pending conditions.*/
#define CHN_NO_ERROR 0
/** @brief Connection happened.*/
-#define ICHN_CONNECTED 1
+#define CHN_CONNECTED 1
/** @brief Disconnection happened.*/
#define CHN_DISCONNECTED 2
/** @brief Data available in the input queue.*/
diff --git a/os/hal/include/serial_usb.h b/os/hal/include/serial_usb.h index c5b118e70..4ad65d76d 100644 --- a/os/hal/include/serial_usb.h +++ b/os/hal/include/serial_usb.h @@ -160,6 +160,7 @@ extern "C" { void sduObjectInit(SerialUSBDriver *sdp);
void sduStart(SerialUSBDriver *sdup, const SerialUSBConfig *config);
void sduStop(SerialUSBDriver *sdup);
+ void sduConfigureHookI(USBDriver *usbp);
bool_t sduRequestsHook(USBDriver *usbp);
void sduDataTransmitted(USBDriver *usbp, usbep_t ep);
void sduDataReceived(USBDriver *usbp, usbep_t ep);
diff --git a/os/hal/include/usb.h b/os/hal/include/usb.h index d2a154949..751128c7c 100644 --- a/os/hal/include/usb.h +++ b/os/hal/include/usb.h @@ -322,8 +322,20 @@ typedef const USBDescriptor * (*usbgetdescriptor_t)(USBDriver *usbp, * @{
*/
/**
+ * @brief Returns the sriver state.
+ *
+ * @param[in] usbp pointer to the @p USBDriver object
+ * @return The driver state.
+ *
+ * @iclass
+ */
+#define usbGetDriverStateI(usbp) ((usbp)->state)
+
+/**
* @brief Connects the USB device.
*
+ * @param[in] usbp pointer to the @p USBDriver object
+ *
* @api
*/
#define usbConnectBus(usbp) usb_lld_connect_bus(usbp)
@@ -331,6 +343,8 @@ typedef const USBDescriptor * (*usbgetdescriptor_t)(USBDriver *usbp, /**
* @brief Disconnect the USB device.
*
+ * @param[in] usbp pointer to the @p USBDriver object
+ *
* @api
*/
#define usbDisconnectBus(usbp) usb_lld_disconnect_bus(usbp)
|