Diff: cpp/Timer.h

Revision:

2:143cac498751

Parent:

0:fd0d7bdfcdc2

--- a/cpp/Timer.h	Thu Nov 29 15:41:14 2012 +0000
+++ b/cpp/Timer.h	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.
  */
 #ifndef MBED_TIMER_H
 #define MBED_TIMER_H
@@ -26,18 +20,18 @@
 
 namespace mbed {
 
-/** A general purpose timer 
+/** A general purpose timer
  *
  * Example:
  * @code
  * // Count the time to toggle a LED
  *
  * #include "mbed.h"
- * 
+ *
  * Timer timer;
  * DigitalOut led(LED1);
  * int begin, end;
- * 
+ *
  * int main() {
  *     timer.start();
  *     begin = timer.read_us();
@@ -51,16 +45,16 @@
 
 public:
     Timer();
-    
+
     /** Start the timer
      */
-    void start(); 
+    void start();
 
     /** Stop the timer
      */
-    void stop(); 
+    void stop();
 
-    /** Reset the timer to 0. 
+    /** Reset the timer to 0.
      *
      * If it was already counting, it will continue
      */
@@ -78,7 +72,7 @@
      */
     int read_us();
 
-#ifdef MBED_OPERATORS 
+#ifdef MBED_OPERATORS
     operator float();
 #endif