Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

Platform_extender: FT4222 library refactor

Browse Source 
Updates to make the FT4222 platform extender more usable.

Previous implementation opened libft4222.so and loaded symbols as
needed.  This implementation removes dynamic loading of libft4222 in
favor of creating a new shared libary which links against libft4222.so.
The dynamic loading is now done in mraa.c.  One C method is exposed in
libmraa-platform-ft4222.so for finding/initializing an FT4222:

mraa_platform_t mraa_usb_platform_extender(mraa_board_t* board);

Mraa.c attempts to open this platform library and calls the
mraa_usb_platform_extender method.  If an ftdi4222 is connected, the
user gets added IO from the extender.  If no FT4222 device is connected,
continue as normal.

    * Create a new platform library for the FT4222
    * Expose only 1 C method from the library -
      mraa_usb_platform_extender
    * libmraa-platform-ft4222.so contains CXX code (as well as previous
      C code).  All *allocs have been removed in favor of global
      C++ stl containers.
    * Previously, the FT4222 would only initialize correctly if 2 ftdi
      devices existed.  Now, initialize FT4222 devices based on the
      device id.
    * Many fixes for various problems with the FT4222
    * Added unit test for platform extender (minimal functionality w/o hw)
    * Updated to FindFtd4222.cmake module to handle standard arguments
    * Removed CMAKE_C_FLAGS addition of -DFTDID2XX and -DFTDI4222 since
      these are NOT used anywhere in source.
    * Building the FTDI4222 shim requires libft4222.h which requires
      ftd2xx.h.  Updated CMakeLists.txt to require both when building
      the shim.

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck
2018-06-01 14:59:39 -07:00
parent 47728b4c1d
commit fc4b2a554d
15 changed files with 1591 additions and 1291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/mraa.c
View File

@@ -29,6 +29,7 @@
#endif
#include <stddef.h>
#include <dlfcn.h>
#include <stdlib.h>
#include <sched.h>
#include <string.h>
@@ -195,18 +196,21 @@ imraa_init()
}
#if defined(USBPLAT)
// Now detect sub platform, note this is not an else since we could be in
// an error case and fall through to MRAA_ERROR_PLATFORM_NOT_INITIALISED
if (plat != NULL) {
mraa_platform_t usb_platform_type = mraa_usb_platform_extender(plat);
// if we have no known platform just replace usb platform with platform
if (plat->platform_type == MRAA_UNKNOWN_PLATFORM && usb_platform_type != MRAA_UNKNOWN_PLATFORM) {
plat->platform_type = usb_platform_type;
}
}
if (plat == NULL) {
printf("mraa: FATAL error, failed to initialise platform\n");
return MRAA_ERROR_PLATFORM_NOT_INITIALISED;
syslog(LOG_NOTICE, "Searching for USB plaform extender libraries...");
/* If a usb platform lib is present, attempt to load and look for
* necessary symbols for adding extended I/O */
void* usblib = dlopen("libmraa-platform-ft4222.so", RTLD_LAZY);
if (usblib)
{
syslog(LOG_NOTICE, "Found USB platform extender library: libmraa-platform-ft4222.so");
syslog(LOG_NOTICE, "Detecting FT4222 subplatforms...");
fptr_add_platform_extender add_ft4222_platform =
(fptr_add_platform_extender)dlsym(usblib, "mraa_usb_platform_extender");
/* If this method exists, call it to add a subplatform */
syslog(LOG_NOTICE, "Detecting FT4222 subplatforms complete, found %i subplatform/s",
((add_ft4222_platform != NULL) && (add_ft4222_platform(plat) == MRAA_SUCCESS))
? 1 : 0);
}
#endif
@@ -273,7 +277,8 @@ mraa_deinit()
free(plat->adv_func);
}
mraa_board_t* sub_plat = plat->sub_platform;
if (sub_plat != NULL) {
/* No alloc's in an FTDI_FT4222 platform structure */
if ((sub_plat != NULL) && (sub_plat->platform_type != MRAA_FTDI_FT4222)) {
if (sub_plat->pins != NULL) {
free(sub_plat->pins);
}