Commit cf2b006f authored by Jeroen Vreeken's avatar Jeroen Vreeken
Browse files

Merge remote branch 'origin/jeroen' into controller_bus

Conflicts:
	controller/controller/controller_load.h
parents 2322081c 10771f9b
......@@ -25,6 +25,7 @@
#include "controller_load_parser.tab.h"
#include "controller_load_parser.yy.h"
#include "controller_load.h"
#include "controller_load_int.h"
#include "controller_sample.h"
#include "controller_block.h"
#include "../../common/include/dynarg.h"
......
......@@ -21,35 +21,11 @@
#define _INCLUDE_CONTROLLER_LOAD_H_
#include <stdarg.h>
#include <controller/controller_load_parser.tab.h>
int controller_load_shell_add(void);
int controller_load(char *filename);
int controller_load_yy_input(char *buf, int *readbytes, int sizebytes, yyscan_t scanner);
void controller_load_fatal_error (char* msg , yyscan_t yyscanner);
void controller_load_var_add_str(char *string, yyscan_t scanner);
void controller_load_var_add_dbl(double dbl, yyscan_t scanner);
void controller_load_var_add_flt(float flt, yyscan_t scanner);
void controller_load_var_add_ul(unsigned long ul, yyscan_t scanner);
void controller_load_var_add_int(int i, yyscan_t scanner);
void controller_load_var_clear(yyscan_t scanner);
void controller_load_var_add_float_array_start(yyscan_t scanner);
void controller_load_var_add_float_array_end(yyscan_t scanner);
void controller_load_frequency(double frequency);
int controller_load_include(char *file_name);
int controller_load_import(char *file_name);
double controller_load_variable_double_get(char *varname);
void controller_load_variable_double_set(char *varname, double val);
char * controller_load_variable_string_get(char *varname);
void controller_load_variable_string_set(char *varname, char *val);
int controller_load_block_create(char *type, char *name, yyscan_t scanner);
int controller_load_block_param_set(char *block, char *param, yyscan_t scanner);
#endif /* _INCLUDE_CONTROLLER_LOAD_H_ */
/*
Copyright Jeroen Vreeken (pe1rxq@amsat.org), 2009, 2013
Copyright Stichting C.A. Muller Radioastronomiestation, 2009, 2013
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _INCLUDE_CONTROLLER_LOAD_INT_H_
#define _INCLUDE_CONTROLLER_LOAD_INT_H_
#include <stdarg.h>
#ifndef YY_TYPEDEF_YY_SCANNER_T
#define YY_TYPEDEF_YY_SCANNER_T
typedef void* yyscan_t;
#endif
int controller_load_yy_input(char *buf, int *readbytes, int sizebytes, yyscan_t scanner);
void controller_load_fatal_error (char* msg , yyscan_t yyscanner);
void controller_load_var_add_str(char *string, yyscan_t scanner);
void controller_load_var_add_dbl(double dbl, yyscan_t scanner);
void controller_load_var_add_flt(float flt, yyscan_t scanner);
void controller_load_var_add_ul(unsigned long ul, yyscan_t scanner);
void controller_load_var_add_int(int i, yyscan_t scanner);
void controller_load_var_clear(yyscan_t scanner);
void controller_load_var_add_float_array_start(yyscan_t scanner);
void controller_load_var_add_float_array_end(yyscan_t scanner);
void controller_load_frequency(double frequency);
int controller_load_include(char *file_name);
int controller_load_import(char *file_name);
double controller_load_variable_double_get(char *varname);
void controller_load_variable_double_set(char *varname, double val);
char * controller_load_variable_string_get(char *varname);
void controller_load_variable_string_set(char *varname, char *val);
int controller_load_block_create(char *type, char *name, yyscan_t scanner);
int controller_load_block_param_set(char *block, char *param, yyscan_t scanner);
#endif /* _INCLUDE_CONTROLLER_LOAD_INT_H_ */
......@@ -26,7 +26,7 @@
#include <stdio.h>
#include <inttypes.h>
#include "controller_load_parser.tab.h"
#include "controller_load.h"
#include "controller_load_int.h"
#include "log.h"
#undef YY_INPUT
......
......@@ -25,7 +25,7 @@ typedef void* yyscan_t;
#include <stdio.h>
#include <controller/controller_block.h>
#include <controller/controller_load.h>
#include <controller/controller_load_int.h>
#include <controller/controller_trace.h>
#include <controller/controller_sample.h>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment