Merge branches 'master' and 'rm48/master'

[pes-rpp/rpp-test-sw.git] / rpp-test-sw / commands / cmd_spi.c

diff --git a/rpp-test-sw/commands/cmd_spi.c b/rpp-test-sw/commands/cmd_spi.c
index 873a299b0f444873b3fdfc24cabfd86b7d5fa83b..e1d1ca4a2c82544ba6b931dc0258b0a264cde4c9 100644 (file)
--- a/rpp-test-sw/commands/cmd_spi.c
+++ b/rpp-test-sw/commands/cmd_spi.c
@@ -1,23 +1,15 @@
 /*
- * Copyright (C) 2012-2013 Czech Technical University in Prague
+ * Copyright (C) 2012-2013, 2015 Czech Technical University in Prague
  *
  * Created on: 28.2.2013
  *
  * Authors:
  *     - Michal Horn
  *
- * This program 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 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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/>.
+ * This document contains proprietary information belonging to Czech
+ * Technical University in Prague. Passing on and copying of this
+ * document, and communication of its contents is not permitted
+ * without prior written authorization.
  *
  * File : cmd_spi.c
  *
@@ -36,6 +28,8 @@
 #include "cmdproc_utils.h"
 #include "drv/drv.h"
 #include <_isfuncdcl.h>
+#include "hal/spi.h"
+#include "hal/spi_resp_transl.h"
 
 /**
  *  @brief     Translate SPI response according the command and peripheral type