Diff: capi/pinmap_common.c

Revision:

2:143cac498751

Parent:

0:fd0d7bdfcdc2

--- a/capi/pinmap_common.c	Thu Nov 29 15:41:14 2012 +0000
+++ b/capi/pinmap_common.c	Mon Feb 18 11:44:18 2013 +0000
@@ -1,30 +1,24 @@
 /* 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 "pinmap.h"
 #include "error.h"
 
 void pinmap_pinout(PinName pin, const PinMap *map) {
     if (pin == NC) return;
-    
+
     while (map->pin != NC) {
         if (map->pin == pin) {
             pin_function(pin, map->function);
@@ -39,11 +33,11 @@
 uint32_t pinmap_merge(uint32_t a, uint32_t b) {
     // both are the same (inc both NC)
     if (a == b) return a;
-    
+
     // one (or both) is not connected
     if (a == (uint32_t)NC) return b;
     if (b == (uint32_t)NC) return a;
-    
+
     // mis-match error case
     error("pinmap mis-match");
     return (uint32_t)NC;
@@ -52,13 +46,13 @@
 uint32_t pinmap_peripheral(PinName pin, const PinMap* map) {
     if (pin == (uint32_t)NC)
         return (uint32_t)NC;
-    
+
     while (map->pin != NC) {
         if (map->pin == pin)
             return map->peripheral;
         map++;
     }
-    
+
     // no mapping available
     error("pinmap not found for peripheral");
     return (uint32_t)NC;