[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-300-g87cfe2e

[Julien B a. A. <ar...@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  87cfe2e87bdd1bdb61a86170470983eeb5c276de (commit)
      from  2c49dcd504faddca6379b6be6d29c1af3057bd19 (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 87cfe2e87bdd1bdb61a86170470983eeb5c276de
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Jun 24 08:32:25 2014 +0200

    [ASDEVICES] Fixes C++ modules build

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

Summary of changes:
 target/packages/as_devices/Makefile     |    3 ++-
 target/packages/as_devices/c/as_dac.h   |    6 ++++--
 target/packages/as_devices/cpp/Makefile |   13 ++++++++-----
 target/packages/as_devices/test_cpp.h   |   11 ++++++-----
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/target/packages/as_devices/Makefile b/target/packages/as_devices/Makefile
index c3cb475..471744d 100644
--- a/target/packages/as_devices/Makefile
+++ b/target/packages/as_devices/Makefile
@@ -34,7 +34,8 @@ $(C_BINARY): main.c test_c.h $(C_LIB)
 	$(CC) $(CFLAGS) main.c $(C_LIB) -o $(C_BINARY) -I$(C_INCLUDE) -lm
 
 $(CPP_BINARY): main.c test_cpp.h $(CPP_LIB) $(C_LIB)
-	$(CXX) $(CFLAGS) main.c $(C_LIB) $(CPP_LIB) -I$(C_INCLUDE) -I$(CPP_INCLUDE) -o $(CPP_BINARY) -D__cplusplus
+	$(CXX) $(CFLAGS) main.c $(C_LIB) $(CPP_LIB) -I$(C_INCLUDE) -I$(CPP_INCLUDE) -o $(CPP_BINARY)
+#-D__cplusplus is automatically defined by compiler
 
 $(CPP_LIB): $(C_LIB)
 	+make -C cpp/
diff --git a/target/packages/as_devices/c/as_dac.h b/target/packages/as_devices/c/as_dac.h
index 140b968..878d655 100644
--- a/target/packages/as_devices/c/as_dac.h
+++ b/target/packages/as_devices/c/as_dac.h
@@ -22,6 +22,8 @@
 #ifndef __AS_DAC_H__
 #define __AS_DAC_H__
 
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -73,5 +75,5 @@ int32_t as_dac_close(struct as_dac_device *dac);
 
 #ifdef __cplusplus
 }
-#endif				/* __cplusplus */
-#endif				/* __AS_DAC_H__ */
+#endif	/* __cplusplus */
+#endif	/* __AS_DAC_H__ */
diff --git a/target/packages/as_devices/cpp/Makefile b/target/packages/as_devices/cpp/Makefile
index 9b034f5..59e2d4c 100644
--- a/target/packages/as_devices/cpp/Makefile
+++ b/target/packages/as_devices/cpp/Makefile
@@ -2,7 +2,7 @@
 # make CXX=../../../buildroot/build_armv5te/staging_dir/usr/bin/arm-linux-g++
 # 
 # Default values for local compiling:
-ARMADEUS_BASE_DIR=../../../../
+ARMADEUS_BASE_DIR = ../../../../
 -include $(ARMADEUS_BASE_DIR)/Makefile.in
 CXX = $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
 CXXFLAGS =-Wall -g -O0
@@ -26,19 +26,22 @@ LIBNAME = ${SO_NAME}.${LIB_VERS}
 ARCHIVE_CMD = ar
 ARCHIVE_OPTS = -cvq
 
-C_INCLUDE=../c/
-C_LIB=../c/libas_devices.so.1
+C_INCLUDE = ../c/
+C_LIB = ../c/libas_devices.so.1
 
 .PHONY: install install-exe clean
 
 $(SO_NAME): ${OBJS}
-	${CXX} -shared -Wl,-soname,${SO_NAME} -o ${SO_NAME} ${OBJS} ${C_LIB} -lc 
+	@echo "  LNK $@"
+	@${CXX} -shared -Wl,-soname,${SO_NAME} -o ${SO_NAME} ${OBJS} ${C_LIB} -lc
 
 ${STAT_LIB}: ${OBJS} 
 	${ARCHIVE_CMD} ${ARCHIVE_OPTS} ${STAT_LIB} ${OBJS}
 
 %.o: %.cpp
-	$(CXX) -fPIC -o $@ -c $< ${CXXFLAGS} -I${C_INCLUDE} -D__cplusplus
+	@echo "  CPP $@"
+	@$(CXX) -fPIC -o $@ -c $< ${CXXFLAGS} -I${C_INCLUDE}
+#-D__cplusplus is automatically defined by compiler
 
 install: $(SO_NAME)
 	mkdir -p $(INSTALL_DIR)/usr/lib
diff --git a/target/packages/as_devices/test_cpp.h b/target/packages/as_devices/test_cpp.h
index b12f406..6e99f05 100644
--- a/target/packages/as_devices/test_cpp.h
+++ b/target/packages/as_devices/test_cpp.h
@@ -127,8 +127,6 @@ void test_gpio()
     int32_t ret;
     int32_t value;
     int pin_num = (5 *32) + 13;
-    int port_direction = 0;
-    int port_value = 1;
 
     gpio_dev = new AsGpio(pin_num);
     if (gpio_dev == NULL)
@@ -143,7 +141,6 @@ void test_gpio()
         printf("Error, can't get pin value\n");
         return;
     }
-    port_value = ret;
 
     while(buffer[0] != 'q')
     {
@@ -186,7 +183,6 @@ void test_gpio()
                             pressEnterToContinue();
                             break;
                         }
-                        port_direction = value;
                         printf("Ok direction changed\n");
                         pressEnterToContinue();
                         break;
@@ -211,7 +207,6 @@ void test_gpio()
                             break;
                         }
                         printf("Value is %d\n", ret);
-                        port_value = ret;
                         pressEnterToContinue();
                         break;
             case '5' :
@@ -1058,3 +1053,9 @@ void test_i2c_eeprom()
         }
     }
 }
+
+void test_tcs3472(void)
+{
+    printf("TODO\n");
+    pressEnterToContinue();
+}


hooks/post-receive
-- 
armadeus