Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/hal/Submakefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ $(HALLIB).0: $(call TOOBJS, $(HALLIBSRCS))
@rm -f $@
$(Q)$(CC) $(LDFLAGS) -Wl,-soname,$(notdir $@) -shared -o $@ $^ $(HALLIB_LIBS) $(ULAPI_LDFLAGS)

HALMODULESRCS := hal/halmodule.cc
HALMODULESRCS := hal/halmodule.cc hal/utils/setps_util.c
PYSRCS += $(HALMODULESRCS)

HALMODULE := ../lib/python/_hal.so
Expand Down
3 changes: 3 additions & 0 deletions src/hal/hal.h
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,9 @@ int hal_pin_new_uint(int compid, hal_pdir_t dir, hal_uint_t *ref, rtapi_uint def
int hal_pin_new_real(int compid, hal_pdir_t dir, hal_real_t *ref, rtapi_real def, const char *fmt, ...) __HAL_PFMT(5,6);
// Note: port has no initial default as it is an 'internal' reference
//int hal_pin_new_port(int compid, hal_pin_dir_t dir, hal_port_t *ref, const char *fmt, ...) __HAL_PFMT(4,5);
// FIXME: This needs to change into hal_port_t argument when we break the API
// It is here so we may add halmodule without too much trouble until then.
int hal_pin_new_port(int compid, hal_pin_dir_t dir, hal_sint_t *ref, const char *fmt, ...) __HAL_PFMT(4,5);

int hal_param_new_bool(int compid, hal_pdir_t dir, hal_bool_t *ref, rtapi_bool def, const char *fmt, ...) __HAL_PFMT(5,6);
int hal_param_new_si32(int compid, hal_pdir_t dir, hal_sint_t *ref, rtapi_s32 def, const char *fmt, ...) __HAL_PFMT(5,6);
Expand Down
10 changes: 5 additions & 5 deletions src/hal/hal_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -1046,18 +1046,18 @@ int hal_pin_new_real(int compid, hal_pdir_t dir, hal_real_t *ref, rtapi_real def
return 0;
}

#if 0
// Must wait until switch
// Note: port has no initial default as it is an 'internal' reference
int hal_pin_new_port(int compid, hal_pdir_t dir, hal_port_t *ref, const char *fmt, ...)
//int hal_pin_new_port(int compid, hal_pdir_t dir, hal_port_t *ref, const char *fmt, ...)
// FIXME: This needs to change into hal_port_t argument when we break the API
// It is here so we may add halmodule without too much trouble until then.
int hal_pin_new_port(int compid, hal_pdir_t dir, hal_sint_t *ref, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
int ret = hal_pin_newfv(HAL_PORT, dir, (void**)ref, compid, fmt, ap);
va_end(ap);
return ret;
}
#endif

/* this is a generic function that does the majority of the work. */

Expand Down Expand Up @@ -5173,7 +5173,7 @@ EXPORT_SYMBOL(hal_pin_new_ui32);
EXPORT_SYMBOL(hal_pin_new_sint);
EXPORT_SYMBOL(hal_pin_new_uint);
EXPORT_SYMBOL(hal_pin_new_real);
//EXPORT_SYMBOL(hal_pin_new_port);
EXPORT_SYMBOL(hal_pin_new_port);

EXPORT_SYMBOL(hal_pin_bit_new);
EXPORT_SYMBOL(hal_pin_float_new);
Expand Down
Loading
Loading