Diff: USBHostSerial/USBHostSerial.cpp

Revision:

8:93da8ea2708b

Parent:

5:e48791a1ef18

Child:

13:b58a2204422f

diff -r e7e63ac7ae5f -r 93da8ea2708b USBHostSerial/USBHostSerial.cpp
--- a/USBHostSerial/USBHostSerial.cpp	Wed Mar 13 17:30:42 2013 +0000
+++ b/USBHostSerial/USBHostSerial.cpp	Thu Mar 14 11:49:53 2013 +0000
@@ -1,20 +1,18 @@
-/* Copyright (c) 2010-2011 mbed.org, MIT License
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-* and associated documentation files (the "Software"), to deal in the Software without
-* restriction, including without limitation the rights to use, copy, modify, merge, publish,
-* distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
-* Software is furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all copies or
-* substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-* BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
+/* mbed USBHost Library
+ * Copyright (c) 2006-2013 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 #include "USBHostSerial.h"
 
@@ -38,7 +36,10 @@
     dev_connected = false;
     serial_intf = -1;
     serial_device_found = false;
-    memcpy(&line_coding, 0, sizeof(LINE_CODING));
+    line_coding.baudrate = 9600;
+    line_coding.data_bits = 8;
+    line_coding.parity = None;
+    line_coding.stop_bits = 1;
     circ_buf.flush();
 }
 
@@ -121,7 +122,7 @@
 
 void USBHostSerial::baud(int baudrate) {
     line_coding.baudrate = baudrate;
-    format();
+    format(line_coding.data_bits, (Parity)line_coding.parity, line_coding.stop_bits);
 }
 
 void USBHostSerial::format(int bits, Parity parity, int stop_bits) {