git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6916 35acf78f-673a-0410-8e92-d51de3d6d3f4

2 files changed, 15 insertions, 12 deletions

diff --git a/os/various/devices_lib/accel/lis302dl.c b/os/various/devices_lib/accel/lis302dl.c
index 14e2a0ad1..77c2566ad 100644
--- a/os/various/devices_lib/accel/lis302dl.c
+++ b/os/various/devices_lib/accel/lis302dl.c
@@ -22,7 +22,6 @@
  * @{

  */

 

-#include "ch.h"

 #include "hal.h"

 #include "lis302dl.h"

 

@@ -81,7 +80,7 @@ void lis302dlWriteRegister(SPIDriver *spip, uint8_t reg, uint8_t value) {
   default:

     /* Reserved register must not be written, according to the datasheet

        this could permanently damage the device.*/

-    chDbgAssert(FALSE, "lis302dlWriteRegister(), #1", "reserved register");

+    osalDbgAssert(FALSE, "reserved register");

   case LIS302DL_WHO_AM_I:

   case LIS302DL_HP_FILTER_RESET:

   case LIS302DL_STATUS_REG:

diff --git a/os/various/devices_lib/accel/lis302dl.dox b/os/various/devices_lib/accel/lis302dl.dox
index 7b9530f10..02f51606a 100644
--- a/os/various/devices_lib/accel/lis302dl.dox
+++ b/os/various/devices_lib/accel/lis302dl.dox
@@ -1,17 +1,21 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011,2012,2013 Giovanni Di Sirio.

 

-    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

+    This file is part of ChibiOS/RT.

 

-        http://www.apache.org/licenses/LICENSE-2.0

+    ChibiOS/RT is free software; you can redistribute it and/or modify

+    it under the terms of the GNU General Public License as published by

+    the Free Software Foundation; either version 3 of the License, or

+    (at your option) any later version.

 

-    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.

+    ChibiOS/RT is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License

+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 

 /**