[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-517-ga41ef6c

[Fabien M <fa...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  a41ef6cf042f3ec149c01b3c9e3da3798b4d286a (commit)
       via  7f16ae290fbf4da9705f8f35d20a622505c74ba6 (commit)
      from  c827f8a4e123e8cef72014d484642934699f5ead (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a41ef6cf042f3ec149c01b3c9e3da3798b4d286a
Merge: 7f16ae290fbf4da9705f8f35d20a622505c74ba6 c827f8a4e123e8cef72014d484642934699f5ead
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Jul 6 18:12:36 2010 +0200

    Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 7f16ae290fbf4da9705f8f35d20a622505c74ba6
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Jul 6 18:12:10 2010 +0200

    [package][as_devices] Change data lenght for spi msg command

-----------------------------------------------------------------------

Summary of changes:
 target/packages/as_devices/c/as_spi.c |   20 ++++++++++----------
 target/packages/as_devices/c/as_spi.h |   20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/target/packages/as_devices/c/as_spi.c b/target/packages/as_devices/c/as_spi.c
index b5af328..2aaccb5 100644
--- a/target/packages/as_devices/c/as_spi.c
+++ b/target/packages/as_devices/c/as_spi.c
@@ -3,18 +3,18 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation; either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This library 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
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *
- * Copyright (C) 2009-2010 Fabien Marteau <fab...@ar...> 
+ * Copyright (C) 2009-2010 Fabien Marteau <fab...@ar...>
  *
  */
 
@@ -158,17 +158,17 @@ int as_spi_set_bits_per_word(int aFd, uint8_t aBits)
 
 /*--------------------------------------------------------------*/
 
-uint32_t as_spi_msg(int aFd, 
-                    uint32_t aMsg, 
-                    size_t aLen,
-                    uint32_t aSpeed)
+unsigned long long as_spi_msg(int aFd,
+                              unsigned long long aMsg,
+                              size_t aLen,
+                              uint32_t aSpeed)
 {
     uint32_t msg;
     int len;
 
     struct spi_ioc_transfer xfer[1];
-    unsigned char buf[32];
-    unsigned char buf_read[32];
+    unsigned char buf[64];
+    unsigned char buf_read[64];
 
     int status;
     int i;
@@ -208,7 +208,7 @@ uint32_t as_spi_msg(int aFd,
         msg = msg << 1;
         msg = msg | buf_read[i];
     }
-    return msg; 
+    return msg;
 }
 
 /*--------------------------------------------------------------*/
diff --git a/target/packages/as_devices/c/as_spi.h b/target/packages/as_devices/c/as_spi.h
index 8253723..511f2fc 100644
--- a/target/packages/as_devices/c/as_spi.h
+++ b/target/packages/as_devices/c/as_spi.h
@@ -3,18 +3,18 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation; either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This library 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
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *
- * Copyright (C) 2009 Fabien Marteau <fab...@ar...> 
+ * Copyright (C) 2009 Fabien Marteau <fab...@ar...>
  *
  */
 
@@ -36,7 +36,7 @@ extern "C" {
 
 /** @brief Open a SPI bus.
  *
- * @param aSpidev_name path name  
+ * @param aSpidev_name path name
  *
  * @return the file descriptor of the opened device, -1 on error
  */
@@ -76,7 +76,7 @@ int as_spi_set_mode(int aFd, uint8_t aMode);
  * @param aFd spidev file handler
  *
  * @return mode if positive value, negative value on error
- * TODO: test it 
+ * TODO: test it
  */
 int as_spi_get_mode(int aFd);
 
@@ -85,7 +85,7 @@ int as_spi_get_mode(int aFd);
  * @param aFd spidev file handler
  *
  * @return lsb first if positive, msb first if 0, negative value on error
- * 
+ *
  */
 int as_spi_get_lsb(int aFd);
 
@@ -135,10 +135,10 @@ int as_spi_set_bits_per_word(int aFd, uint8_t aBits);
  *
  * @return message read
  */
-uint32_t as_spi_msg(int aFd, 
-                    uint32_t aMsg, 
-                    size_t aLen,
-                    uint32_t aSpeed);
+unsigned long long as_spi_msg(int aFd,
+                              unsigned long long aMsg,
+                              size_t aLen,
+                              uint32_t aSpeed);
 
 /** @brief Close a SPI bus.
  *


hooks/post-receive
-- 
armadeus