Update patch to the latest changes to master.

Author: petterreinholdtsen

src/hal/hal_priv.h

@@ -202,16 +202,6 @@ static_assert(sizeof(hal_shmfield<void>) == sizeof(int), "hal_shmfield size matc
 *            PRIVATE HAL DATA STRUCTURES AND DECLARATIONS              *
 ************************************************************************/
 
-/** HAL "data union" structure
- ** This structure may hold any type of hal data
-*/
-typedef union hal_data_u {
-    hal_bit_t b;
-    hal_s32_t s;
-    hal_u32_t u;
-    hal_float_t f;
-} hal_data_u;
-
 /** HAL "list element" data structure.
     This structure is used to implement generic double linked circular
     lists.  Such lists have the following characteristics:

src/hal/halmodule.cc

@@ -865,7 +865,7 @@ PyObject *connect(PyObject *self, PyObject *args) {
 PyObject *disconnect(PyObject *self, PyObject *args) {
     char *pinname;
     if(!PyArg_ParseTuple(args, "s", &pinname)) return NULL;
-    if(!SHMPTR(0)) {
+    if(!hal_shmem_base) {
 	PyErr_Format(PyExc_RuntimeError,
 		"Cannot call before creating component");
 	return NULL;
@@ -1008,7 +1008,7 @@ PyObject *get_value(PyObject *self, PyObject *args) {
     void *d_ptr;
 
     if(!PyArg_ParseTuple(args, "s", &name)) return NULL;
-    if(!SHMPTR(0)) {
+    if(!hal_shmem_base) {
 	PyErr_Format(PyExc_RuntimeError,
 		"Cannot call before creating component");
 	return NULL;
@@ -1085,7 +1085,7 @@ PyObject *get_value(PyObject *self, PyObject *args) {
 /*######################################*/
 /* Get a dict of pin info for all pins in system */
 PyObject *get_info_pins(PyObject *self, PyObject *args) {
-    int next;
+    SHMFIELD(hal_pin_t) next;
     int type;
     char str_n[] = "NAME";
     char str_v[] = "VALUE";
@@ -1099,7 +1099,7 @@ PyObject *get_info_pins(PyObject *self, PyObject *args) {
     PyObject* python_list = PyList_New(0);
     PyObject *obj;
 
-    if(!SHMPTR(0)) {
+    if(!hal_shmem_base) {
 	PyErr_Format(PyExc_RuntimeError,
 		"Cannot call before creating component");
 	return NULL;
@@ -1109,7 +1109,7 @@ PyObject *get_info_pins(PyObject *self, PyObject *args) {
     rtapi_mutex_get(&(hal_data->mutex));
     next = hal_data->pin_list_ptr;
     while (next != 0) {
-	    pin = (hal_pin_t*)SHMPTR(next);
+	    pin = SHMPTR(next);
         type = pin->type;
         if (pin->signal != 0) {
             sig = (hal_sig_t*)SHMPTR(pin->signal);
@@ -1174,7 +1174,7 @@ PyObject *get_info_pins(PyObject *self, PyObject *args) {
 /*######################################*/
 /* Get a dict of signal info for all signals in system */
 PyObject *get_info_signals(PyObject *self, PyObject *args) {
-    int next;
+    SHMFIELD(hal_sig_t) next;
     int type;
     char str_n[] = "NAME";
     char str_v[] = "VALUE";
@@ -1186,7 +1186,7 @@ PyObject *get_info_signals(PyObject *self, PyObject *args) {
     PyObject* python_list = PyList_New(0);
     PyObject *obj;
 
-    if(!SHMPTR(0)) {
+    if(!hal_shmem_base) {
 	PyErr_Format(PyExc_RuntimeError,
 		"Cannot call before creating component");
 	return NULL;
@@ -1196,7 +1196,7 @@ PyObject *get_info_signals(PyObject *self, PyObject *args) {
     rtapi_mutex_get(&(hal_data->mutex));
     next = hal_data->sig_list_ptr;
     while (next != 0) {
-	    sig = (hal_sig_t*)SHMPTR(next);
+	    sig = SHMPTR(next);
         type = sig->type;
         d_ptr = SHMPTR(sig->data_ptr);
 
@@ -1259,7 +1259,7 @@ PyObject *get_info_signals(PyObject *self, PyObject *args) {
 /*######################################*/
 /* Get a dict of parameter info for all parameters in system */
 PyObject *get_info_params(PyObject *self, PyObject *args) {
-    int next;
+    SHMFIELD(hal_param_t) next;
     int type;
     char str_n[] = "NAME";
     char str_v[] = "VALUE";
@@ -1269,7 +1269,7 @@ PyObject *get_info_params(PyObject *self, PyObject *args) {
     PyObject* python_list = PyList_New(0);
     PyObject *obj;
 
-    if(!SHMPTR(0)) {
+    if(!hal_shmem_base) {
 	PyErr_Format(PyExc_RuntimeError,
 		"Cannot call before creating component");
 	return NULL;
@@ -1279,7 +1279,7 @@ PyObject *get_info_params(PyObject *self, PyObject *args) {
     rtapi_mutex_get(&(hal_data->mutex));
     next = hal_data->param_list_ptr;
     while (next != 0) {
-	    param = (hal_param_t*)SHMPTR(next);
+	    param = SHMPTR(next);
         type = param->type;
         d_ptr = SHMPTR(param->data_ptr);
 

src/hal/utils/halcmd_commands.cc

@@ -2791,7 +2791,7 @@ static void save_unconnected_input_pin_values(FILE *dst)
 {
     hal_pin_t *pin;
     void *dptr;
-    int next;
+    SHMFIELD(hal_pin_t) next;
     fprintf(dst, "# unconnected pin values\n");
     for(next = hal_data->pin_list_ptr; next; next=pin->next_ptr)
     {