Diff: cpp/I2C.cpp

Revision:

2:143cac498751

Parent:

0:fd0d7bdfcdc2

diff -r 62685faffa05 -r 143cac498751 cpp/I2C.cpp
--- a/cpp/I2C.cpp	Thu Nov 29 15:41:14 2012 +0000
+++ b/cpp/I2C.cpp	Mon Feb 18 11:44:18 2013 +0000
@@ -1,23 +1,17 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2006-2012 ARM Limited
+ * Copyright (c) 2006-2013 ARM Limited
  *
- * 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:
+ * 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
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * 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.
+ * 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 "I2C.h"
 
@@ -31,17 +25,17 @@
     // The init function also set the frequency to 100000
     i2c_init(&_i2c, sda, scl);
     _hz = 100000;
-    
+
     // Used to avoid unnecessary frequency updates
     _owner = this;
 }
 
 void I2C::frequency(int hz) {
     _hz = hz;
-    
+
     // We want to update the frequency even if we are already the bus owners
     i2c_frequency(&_i2c, _hz);
-    
+
     // Updating the frequency of the bus we become the owners of it
     _owner = this;
 }
@@ -55,11 +49,11 @@
 
 // write - Master Transmitter Mode
 int I2C::write(int address, const char* data, int length, bool repeated) {
-    aquire(); 
-    
+    aquire();
+
     int stop = (repeated) ? 0 : 1;
     int retval = i2c_write(&_i2c, address, data, length, stop);
-    
+
     return retval;
 }
 
@@ -70,10 +64,10 @@
 // read - Master Reciever Mode
 int I2C::read(int address, char* data, int length, bool repeated) {
     aquire();
-    
+
     int stop = (repeated) ? 0 : 1;
     int retval = i2c_read(&_i2c, address, data, length, stop);
-    
+
     return retval;
 }