Diff: cpp/CAN.cpp

Revision:

2:143cac498751

Parent:

0:fd0d7bdfcdc2

diff -r 62685faffa05 -r 143cac498751 cpp/CAN.cpp
--- a/cpp/CAN.cpp	Thu Nov 29 15:41:14 2012 +0000
+++ b/cpp/CAN.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 "CAN.h"
 
@@ -34,7 +28,7 @@
 CAN::~CAN() {
     can_free(&_can);
 }
-  
+
 int CAN::frequency(int f) {
     return can_frequency(&_can, f);
 }
@@ -42,7 +36,7 @@
 int CAN::write(CANMessage msg) {
     return can_write(&_can, msg, 0);
 }
-    
+
 int CAN::read(CANMessage &msg) {
     return can_read(&_can, &msg);
 }
@@ -69,15 +63,15 @@
 // Control Register, or the mbed hangs
 void can_irq(void) {
     uint32_t icr;
-    
+
     if(LPC_SC->PCONP & (1 << 13)) {
         icr = LPC_CAN1->ICR;
-        
+
         if(icr && (can_obj[0] != NULL)) {
             can_obj[0]->call();
         }
     }
-    
+
     if(LPC_SC->PCONP & (1 << 14)) {
         icr = LPC_CAN2->ICR;
         if(icr && (can_obj[1] != NULL)) {
@@ -104,7 +98,7 @@
         case CAN_1: can_obj[0] = NULL; break;
         case CAN_2: can_obj[1] = NULL; break;
     }
-    
+
     _can.dev->IER &= ~(1);
     if ((can_obj[0] == NULL) && (can_obj[1] == NULL)) {
         NVIC_DisableIRQ(CAN_IRQn);