diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-11-12 12:47:15 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-11-12 12:47:15 +0000 |
| commit | 652042111c7c058bd56d9847002f166507f492d4 (patch) | |
| tree | e32f27653cd516ae4c2353e8087d1386ac4e7dc9 /LUFA/Drivers/USB/Class/Host | |
| parent | 6a46f0025a4d44ca2c747745f542e8f475dd9b28 (diff) | |
| download | lufa-652042111c7c058bd56d9847002f166507f492d4.tar.gz lufa-652042111c7c058bd56d9847002f166507f492d4.tar.bz2 lufa-652042111c7c058bd56d9847002f166507f492d4.zip | |
Add blocking versions of the CDC Class driver streams, for applications requiring blocking reads.
Diffstat (limited to 'LUFA/Drivers/USB/Class/Host')
| -rw-r--r-- | LUFA/Drivers/USB/Class/Host/CDC.c | 11 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Class/Host/CDC.h | 9 |
2 files changed, 20 insertions, 0 deletions
diff --git a/LUFA/Drivers/USB/Class/Host/CDC.c b/LUFA/Drivers/USB/Class/Host/CDC.c index 5467e3df3..fcfa86d79 100644 --- a/LUFA/Drivers/USB/Class/Host/CDC.c +++ b/LUFA/Drivers/USB/Class/Host/CDC.c @@ -353,6 +353,17 @@ static int CDC_Host_getchar(FILE* Stream) return CDC_Host_ReceiveByte((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream));
}
+static int CDC_Host_getchar_Blocking(FILE* Stream)
+{
+ while (!(CDC_Host_BytesReceived((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream))))
+ {
+ CDC_Host_USBTask((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream));
+ USB_USBTask();
+ }
+
+ return CDC_Host_ReceiveByte((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream));
+}
+
void CDC_Host_Event_Stub(void)
{
diff --git a/LUFA/Drivers/USB/Class/Host/CDC.h b/LUFA/Drivers/USB/Class/Host/CDC.h index 0ee24be48..9b5fb0c2b 100644 --- a/LUFA/Drivers/USB/Class/Host/CDC.h +++ b/LUFA/Drivers/USB/Class/Host/CDC.h @@ -219,6 +219,14 @@ */
void CDC_Host_CreateStream(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, FILE* Stream);
+ /** Identical to CDC_Host_CreateStream(), except that reads are blocking until the calling stream function terminates
+ * the transfer. While blocking, the USB and CDC service tasks are called repeatedly to maintain USB communications.
+ *
+ * \param[in,out] CDCInterfaceInfo Pointer to a structure containing a CDC Class configuration and state
+ * \param[in,out] Stream Pointer to a FILE structure where the created stream should be placed
+ */
+ void CDC_Host_CreateBlockingStream(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, FILE* Stream);
+
/** CDC class driver event for a control line state change on a CDC host interface. This event fires each time the device notifies
* the host of a control line state change (containing the virtual serial control line states, such as DCD) and may be hooked in the
* user program by declaring a handler function with the same name and parameters listed here. The new control line states
@@ -247,6 +255,7 @@ #if defined(INCLUDE_FROM_CDC_CLASS_HOST_C)
static int CDC_Host_putchar(char c, FILE* Stream);
static int CDC_Host_getchar(FILE* Stream);
+ static int CDC_Host_getchar_Blocking(FILE* Stream);
void CDC_Host_Event_Stub(void);
void EVENT_CDC_Host_ControLineStateChanged(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
|