aboutsummaryrefslogtreecommitdiffstats
path: root/Demos/Device
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-07-30 10:54:57 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-07-30 10:54:57 +0000
commitce3ea6fb2513d3aa14c354e2ed78c7eb4a38ee0e (patch)
tree20b47413eb5f24317cbef4d08a9cafe4abc157c4 /Demos/Device
parent5ca1d7bf8f1aa774c076b614fa692c2026d7e854 (diff)
downloadlufa-ce3ea6fb2513d3aa14c354e2ed78c7eb4a38ee0e.tar.gz
lufa-ce3ea6fb2513d3aa14c354e2ed78c7eb4a38ee0e.tar.bz2
lufa-ce3ea6fb2513d3aa14c354e2ed78c7eb4a38ee0e.zip
Added standard stream example to the ClassDriver CDC device demo.
Fix incorrect HWB button mask in the STK526 Buttons driver.
Diffstat (limited to 'Demos/Device')
-rw-r--r--Demos/Device/ClassDriver/CDC/CDC.c22
-rw-r--r--Demos/Device/LowLevel/CDC/CDC.c4
2 files changed, 24 insertions, 2 deletions
diff --git a/Demos/Device/ClassDriver/CDC/CDC.c b/Demos/Device/ClassDriver/CDC/CDC.c
index 3e83ec269..836a6e098 100644
--- a/Demos/Device/ClassDriver/CDC/CDC.c
+++ b/Demos/Device/ClassDriver/CDC/CDC.c
@@ -57,6 +57,28 @@ USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
},
};
+#if 0
+/* NOTE: Here you can set up a standard stream using the created virtual serial port, so that the standard stream functions in
+ * <stdio.h> can be used on the virtual serial port (e.g. fprintf(&USBSerial, "Test"); to print a string).
+ */
+
+static int CDC_putchar(char c, FILE *stream)
+{
+ CDC_Device_SendByte(&VirtualSerial_CDC_Interface, c);
+ return 0;
+}
+
+static int CDC_getchar(FILE *stream)
+{
+ if (!(CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface)))
+ return -1;
+
+ return CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);
+}
+
+static FILE USBSerial = FDEV_SETUP_STREAM(CDC_putchar, CDC_getchar, _FDEV_SETUP_RW);
+#endif
+
/** Main program entry point. This routine contains the overall program flow, including initial
* setup of all components and the main program loop.
*/
diff --git a/Demos/Device/LowLevel/CDC/CDC.c b/Demos/Device/LowLevel/CDC/CDC.c
index e63257dbd..8a992c767 100644
--- a/Demos/Device/LowLevel/CDC/CDC.c
+++ b/Demos/Device/LowLevel/CDC/CDC.c
@@ -55,7 +55,7 @@ CDC_Line_Coding_t LineCoding = { .BaudRateBPS = 9600,
* <stdio.h> can be used on the virtual serial port (e.g. fprintf(&USBSerial, "Test"); to print a string).
*/
-static int CDC_putchar (char c, FILE *stream)
+static int CDC_putchar(char c, FILE *stream)
{
Endpoint_SelectEndpoint(CDC_TX_EPNUM);
@@ -71,7 +71,7 @@ static int CDC_putchar (char c, FILE *stream)
return 0;
}
-static int CDC_getchar (FILE *stream)
+static int CDC_getchar(FILE *stream)
{
int c;