mirror of
https://github.com/eclipse/upm.git
synced 2025-07-01 01:11:10 +03:00
upmc: Updates for building C modules w/base UPM
Test commit for building C UPM modules. * Added C include directory * Added C utilities directory * Rename C++ upm.h -> upm.hpp to make room for C upm.h * Added upm_mixed_module_init function to src/CMakeLists.txt. This function takes filesnames similar to upm_module_init and does a bit of processing before calling upm_module_init. * Added c example directory. Changed c++ example names. * Added dfrph implemention for testing (C++ wraps C). Added mraa to .pc requires for dfrph. Tested against stand-alone project. Added dfrph c example. * Update implemention of pkg-config file generation. * Added two cmake cache variables: BUILDCPP and BUILDFTI * Removed src from swig_add_module calls, added libname to swig_link_libraries calls. Shrinks swig'ed binaries by ~13%. * Added install target in upm/CMakeLists.txt to install C header, directory. Is this where we want this? * C FTI header directory is include/fti Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
4
src/utilities/CMakeLists.txt
Normal file
4
src/utilities/CMakeLists.txt
Normal file
@ -0,0 +1,4 @@
|
||||
upm_mixed_module_init (NAME utilities
|
||||
DESCRIPTION "UPM Utilities Library"
|
||||
C_HDR upm_utilities.h
|
||||
C_SRC upm_utilities.c)
|
69
src/utilities/upm_utilities.c
Normal file
69
src/utilities/upm_utilities.c
Normal file
@ -0,0 +1,69 @@
|
||||
#include <upm_utilities.h>
|
||||
|
||||
void* upm_malloc(int mem_map, int size){
|
||||
void *mem;
|
||||
#if defined(linux)
|
||||
mem = malloc(size);
|
||||
if(mem == NULL){
|
||||
printf("unable to allocate memory");
|
||||
}
|
||||
else{
|
||||
printf("memory allocated successfully\n");
|
||||
}
|
||||
#elif defined(CONFIG_BOARD_ARDUINO_101) || defined(CONFIG_BOARD_ARDUINO_101_SSS) || defined(CONFIG_BOARD_QUARK_D2000_CRB)
|
||||
kmemory_map_t map_name = (kmemory_map_t) mem_map;
|
||||
if(task_mem_map_alloc(map_name, &mem, TICKS_UNLIMITED) == RC_OK){
|
||||
printf("memory allocated successfully\n");
|
||||
}
|
||||
else{
|
||||
printf("unable to allocate memory");
|
||||
mem = NULL;
|
||||
}
|
||||
#endif
|
||||
return mem;
|
||||
}
|
||||
|
||||
void upm_free(int mem_map, void* ptr){
|
||||
#if defined(linux)
|
||||
free(ptr);
|
||||
#elif defined(CONFIG_BOARD_ARDUINO_101) || defined(CONFIG_BOARD_ARDUINO_101_SSS) || defined(CONFIG_BOARD_QUARK_D2000_CRB)
|
||||
kmemory_map_t map_name = (kmemory_map_t) mem_map;
|
||||
task_mem_map_free(map_name, &ptr);
|
||||
#endif
|
||||
}
|
||||
|
||||
void upm_delay(int time){
|
||||
#if defined(linux)
|
||||
sleep(time);
|
||||
#elif defined(CONFIG_BOARD_ARDUINO_101) || defined(CONFIG_BOARD_ARDUINO_101_SSS) || defined(CONFIG_BOARD_QUARK_D2000_CRB)
|
||||
struct nano_timer timer;
|
||||
void *timer_data[1];
|
||||
nano_timer_init(&timer, timer_data);
|
||||
nano_timer_start(&timer, SECONDS(time));
|
||||
nano_timer_test(&timer, TICKS_UNLIMITED);
|
||||
#endif
|
||||
}
|
||||
|
||||
void upm_delay_ms(int time){
|
||||
#if defined(linux)
|
||||
usleep(1000 * time);
|
||||
#elif defined(CONFIG_BOARD_ARDUINO_101) || defined(CONFIG_BOARD_ARDUINO_101_SSS) || defined(CONFIG_BOARD_QUARK_D2000_CRB)
|
||||
struct nano_timer timer;
|
||||
void *timer_data[1];
|
||||
nano_timer_init(&timer, timer_data);
|
||||
nano_timer_start(&timer, MSEC(time));
|
||||
nano_timer_test(&timer, TICKS_UNLIMITED);
|
||||
#endif
|
||||
}
|
||||
|
||||
void upm_delay_us(int time){
|
||||
#if defined(linux)
|
||||
usleep(time);
|
||||
#elif defined(CONFIG_BOARD_ARDUINO_101) || defined(CONFIG_BOARD_ARDUINO_101_SSS) || defined(CONFIG_BOARD_QUARK_D2000_CRB)
|
||||
struct nano_timer timer;
|
||||
void *timer_data[1];
|
||||
nano_timer_init(&timer, timer_data);
|
||||
nano_timer_start(&timer, USEC(time));
|
||||
nano_timer_test(&timer, TICKS_UNLIMITED);
|
||||
#endif
|
||||
}
|
68
src/utilities/upm_utilities.h
Normal file
68
src/utilities/upm_utilities.h
Normal file
@ -0,0 +1,68 @@
|
||||
/*
|
||||
* Authors:
|
||||
* Copyright (c) 2016 Intel Corporation.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be
|
||||
* included in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
#ifndef UPM_UTILITIES_H_
|
||||
#define UPM_UTILITIES_H_
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#if defined(linux)
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_BOARD_ARDUINO_101) || defined(CONFIG_BOARD_ARDUINO_101_SSS) || defined(CONFIG_BOARD_QUARK_D2000_CRB)
|
||||
#include <zephyr.h>
|
||||
#include <device.h>
|
||||
#include <sys_clock.h>
|
||||
|
||||
#if defined(CONFIG_STDOUT_CONSOLE)
|
||||
#include <stdio.h>
|
||||
#define PRINT printf
|
||||
#else
|
||||
#include <misc/printk.h>
|
||||
#define PRINT printk
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* Get filename w/o path */
|
||||
#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
|
||||
|
||||
void upm_delay(int time);
|
||||
|
||||
void upm_delay_ms(int time);
|
||||
|
||||
void upm_delay_us(int time);
|
||||
|
||||
void* upm_malloc(int mem_map, int size);
|
||||
|
||||
void upm_free(int mem_map, void* ptr);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* UPM_UTILITIES_H_ */
|
Reference in New Issue
Block a user