pio: Remove pio headers from MRAA
The Native PIO API provides both the libraries and headers for use with the Android Things Peripheralanager client. This commit removes these from the MRAA repo in favor of the FindAndroidThings.cmake provided by the Native PIO API. Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
@@ -138,10 +138,18 @@ endif()
|
||||
|
||||
if (PERIPHERALMAN)
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPERIPHERALMAN=1")
|
||||
|
||||
# Use the find_package provided by Android Things. Make sure this is
|
||||
# available in CMAKE_MODULE_PATH.
|
||||
find_package(AndroidThings REQUIRED)
|
||||
|
||||
# Add Android Things libraries
|
||||
set (mraa_LIBS ${mraa_LIBS} ${ANDROIDTHINGS_LIBRARIES})
|
||||
|
||||
# Add Android Things include directories
|
||||
include_directories(${ANDROIDTHINGS_INCLUDE_DIRS})
|
||||
|
||||
# Add the peripheral manager source to the build
|
||||
add_subdirectory(peripheralman)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
#include "uart.h"
|
||||
|
||||
#if defined(PERIPHERALMAN)
|
||||
#include "peripheralman.h"
|
||||
#include "peripheralmanager/peripheralman.h"
|
||||
#else
|
||||
#define IIO_DEVICE_WILDCARD "iio:device*"
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <syslog.h>
|
||||
|
||||
#include "mraa_internal.h"
|
||||
#include "peripheralman.h"
|
||||
#include "peripheralmanager/peripheralman.h"
|
||||
|
||||
APeripheralManagerClient *client = NULL;
|
||||
char **gpios = NULL;
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
#endif
|
||||
#include <sys/ioctl.h>
|
||||
#if defined(PERIPHERALMAN)
|
||||
#include "peripheralmanager/spi_device.h"
|
||||
#include "linux/spi_kernel_headers.h"
|
||||
#elif defined(MSYS)
|
||||
// There's no spidev.h on MSYS, so we need to provide our own,
|
||||
|
||||
Reference in New Issue
Block a user