From ab85c69b2ba54ca76e12f2444bee9eec051c39c4 Mon Sep 17 00:00:00 2001
From: dak664 <dak664>
Date: Thu, 28 Oct 2010 19:31:28 +0000
Subject: [PATCH] Fix error when RS232 not enabled

---
 cpu/avr/dev/usb/usb_standard_request.c | 6 ++++--
 platform/avr-ravenusb/cdc_task.c       | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cpu/avr/dev/usb/usb_standard_request.c b/cpu/avr/dev/usb/usb_standard_request.c
index 58ef9db3..93ac02d0 100644
--- a/cpu/avr/dev/usb/usb_standard_request.c
+++ b/cpu/avr/dev/usb/usb_standard_request.c
@@ -458,11 +458,13 @@ void usb_get_descriptor(void)
 		data_to_transfer = Usb_get_conf_desc_length(string_type); //!< sizeof (usb_user_configuration_descriptor);
 		pbuffer          = Usb_get_conf_desc_pointer(string_type);
 	  break;
+#if 1 
 	case STRING_DESCRIPTOR:
 	  if(string_type!=LANG_ID) {
 		usb_get_string_descriptor(string_type);
 		return;
 	  }
+#endif
 	default:
 		dummy = Usb_read_byte();
 		dummy = Usb_read_byte();
@@ -470,8 +472,8 @@ void usb_get_descriptor(void)
 		MSBwLength = Usb_read_byte();
 		byteswereread=1;
 		if( usb_user_get_descriptor(descriptor_type, string_type)==FALSE ) {
-		    Usb_enable_stall_handshake(); //TODO:is this necessary?
-			Usb_ack_receive_setup();  //TODO:is this necessary?
+		    Usb_enable_stall_handshake(); //TODO:is this necessary, Win7 flaky without?
+			Usb_ack_receive_setup();
 			return;
 		}
 	  break;
diff --git a/platform/avr-ravenusb/cdc_task.c b/platform/avr-ravenusb/cdc_task.c
index 8ff91c92..49e740a8 100644
--- a/platform/avr-ravenusb/cdc_task.c
+++ b/platform/avr-ravenusb/cdc_task.c
@@ -152,7 +152,9 @@ PROCESS_THREAD(cdc_process, ev, data_proc)
 				} else {
 					stdout = previous_stdout;
 				}
+#if USB_CONF_RS232
 				usb_stdout=stdout;
+#endif
 			}
 
 			//Flush buffer if timeout
-- 
2.11.4.GIT