From ce3ea6fb2513d3aa14c354e2ed78c7eb4a38ee0e Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Thu, 30 Jul 2009 10:54:57 +0000 Subject: Added standard stream example to the ClassDriver CDC device demo. Fix incorrect HWB button mask in the STK526 Buttons driver. --- Demos/Device/ClassDriver/CDC/CDC.c | 22 ++++++++++++++++++++++ Demos/Device/LowLevel/CDC/CDC.c | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) (limited to 'Demos/Device') 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 + * 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, * 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; -- cgit v1.2.3