Merge branch 'master' into temp

Author: nomis52

.gitignore

@@ -12,7 +12,7 @@
 *.zip
 .deps
 .dirstamp
-googlemock-read-only/
+gtest-read-only/
 Makefile
 Makefile.in
 aclocal.m4

.travis.yml

@@ -77,11 +77,11 @@ before_install:
  - if [ "$TASK" = "compile" -o "$TASK" = "doxygen" -o "$TASK" = "coverage" -o "$TASK" = "coverity" ]; then ./install-gmock.sh; fi
 
 after_success:
- - if [ "$TASK" = "coverity" ]; then cat /home/travis/build/${TRAVIS_REPO_SLUG}/tests/cov-int/scm_log.txt; fi
- - if [ "$TASK" = "coverage" ]; then cd tests && coveralls --gcov /usr/bin/gcov-5 -b . -e include -e harmony -e mocks -e config.h -e system_config -e tests --gcov-options '\-lp' --follow-symlinks > /dev/null; fi
+ - if [ "$TASK" = "coverity" ]; then cat /home/travis/build/${TRAVIS_REPO_SLUG}/cov-int/scm_log.txt; fi
+ - if [ "$TASK" = "coverage" ]; then coveralls --gcov /usr/bin/gcov-5 -b . -e tests/include -e tests/harmony -e tests/mocks -e config.h -e tests/system_config -e tests/tests --gcov-options '\-lp' --follow-symlinks > /dev/null; fi
 
 after_failure:
- - cat /home/travis/build/${TRAVIS_REPO_SLUG}/tests/config.log
+ - cat /home/travis/build/${TRAVIS_REPO_SLUG}/config.log
 
 
 #No notifications for now

Makefile.am

@@ -34,4 +34,3 @@ include tests/Makefile.mk
 include tools/Makefile.mk
 
 check_PROGRAMS = $(TESTS)
-

common/uid_store.c

@@ -48,12 +48,12 @@ void UIDStore_Init() {
   // To support more than one responder per device, we set the lower 4 bits of
   // the UID to 0 so we have 16 responders per device. These means the complete
   // UID takes the form:
-  //   MMMM:0AAAAAA0
+  //   MMMM:1AAAAAA0
   // Where M is the PLASA manufacturer ID and A are the values from the MAC
   // address.
   kUIDArray[0] = CFG_MANUFACTURER_ID >> 8;
   kUIDArray[1] = CFG_MANUFACTURER_ID & 0xff;
-  kUIDArray[2] = ShiftRight(PLIB_ETH_StationAddressGet(ETH_ID_0, 4));
+  kUIDArray[2] = 0x10 + ShiftRight(PLIB_ETH_StationAddressGet(ETH_ID_0, 4));
   kUIDArray[3] = ShiftLeft(PLIB_ETH_StationAddressGet(ETH_ID_0, 4)) +
                  ShiftRight(PLIB_ETH_StationAddressGet(ETH_ID_0, 5));
   kUIDArray[4] = ShiftLeft(PLIB_ETH_StationAddressGet(ETH_ID_0, 5)) +

configure.ac

@@ -7,16 +7,24 @@ AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([config])
 AM_INIT_AUTOMAKE([subdir-objects foreign])
-AC_LANG_PUSH([C++])
+AC_LANG([C++])
 
 # Checks for programs.
 AC_PROG_CXX
+AC_LANG_PUSH(C)
+AC_PROG_CC
+AC_LANG_POP(C)
 
 # Checks for libraries.
 
 LT_INIT
 AC_PROG_LIBTOOL
 
+AC_LANG_PUSH(C)
+# Switch the C compiler into C99 mode
+AC_PROG_CC_C99
+AC_LANG_POP(C)
+
 # Check we have -std=c++11 support
 AX_CXX_COMPILE_STDCXX_11(noext,mandatory)
 
@@ -113,7 +121,8 @@ echo \
 ${PACKAGE_NAME} Version ${PACKAGE_VERSION}
 
 Prefix: '${prefix}'
-Compiler: '${CXX} ${CXXFLAGS} ${CPPFLAGS}'
+C++ Compiler: '${CXX} ${CXXFLAGS} ${CPPFLAGS}'
+C Compiler: '${CC} ${CFLAGS} ${CPPFLAGS}'
 Linker: '${LD} ${LDFLAGS} ${LIBS}'
 
 Now type 'make @<:@<target>@:>@'