Merge pull request #4742 from BsAtHome/hal64_streamer-sampler

hal: Update streamer/sampler to use 64-bit accesses

Author: grandixximo

src/hal/components/sampler.c

@@ -157,7 +157,7 @@ static void sample(void *arg, long period)
 
     /* are we enabled? */
     if (!hal_get_bool(samp->enable)) {
-        hal_set_si32(samp->curr_depth, hal_stream_depth(&samp->fifo));
+        hal_set_sint(samp->curr_depth, hal_stream_depth(&samp->fifo));
         hal_set_bool(samp->full, !hal_stream_writable(&samp->fifo));
         return;
     }
@@ -178,12 +178,12 @@ static void sample(void *arg, long period)
     if ( hal_stream_write(&samp->fifo, data) < 0) {
         /* fifo is full, data is lost */
         /* log the overrun */
-        hal_set_si32(samp->overruns, hal_get_si32(samp->overruns) + 1);
+        hal_set_sint(samp->overruns, hal_get_sint(samp->overruns) + 1);
         hal_set_bool(samp->full, 1);
-        hal_set_si32(samp->curr_depth, hal_stream_maxdepth(&samp->fifo));
+        hal_set_sint(samp->curr_depth, hal_stream_maxdepth(&samp->fifo));
     } else {
         hal_set_bool(samp->full, 0);
-        hal_set_si32(samp->curr_depth, hal_stream_depth(&samp->fifo));
+        hal_set_sint(samp->curr_depth, hal_stream_depth(&samp->fifo));
     }
 }
 
@@ -207,17 +207,17 @@ static int init_sampler(int num, sampler_t *str)
         rtapi_print_msg(RTAPI_MSG_ERR, "SAMPLER: ERROR: 'enable' pin export failed\n");
         return -EIO;
     }
-    retval = hal_pin_new_si32(comp_id, HAL_OUT, &str->curr_depth, 0, "%s%d.curr-depth", strbase, num);
+    retval = hal_pin_new_sint(comp_id, HAL_OUT, &str->curr_depth, 0, "%s%d.curr-depth", strbase, num);
     if (retval != 0 ) {
         rtapi_print_msg(RTAPI_MSG_ERR, "SAMPLER: ERROR: 'curr_depth' pin export failed\n");
         return -EIO;
     }
-    retval = hal_pin_new_si32(comp_id, HAL_IO, &str->overruns, 0, "%s%d.overruns", strbase, num);
+    retval = hal_pin_new_sint(comp_id, HAL_IO, &str->overruns, 0, "%s%d.overruns", strbase, num);
     if (retval != 0 ) {
         rtapi_print_msg(RTAPI_MSG_ERR, "SAMPLER: ERROR: 'overruns' parameter export failed\n");
         return -EIO;
     }
-    retval = hal_pin_new_si32(comp_id, HAL_IO, &str->sample_num, 0, "%s%d.sample-num", strbase, num);
+    retval = hal_pin_new_sint(comp_id, HAL_IO, &str->sample_num, 0, "%s%d.sample-num", strbase, num);
     if (retval != 0 ) {
         rtapi_print_msg(RTAPI_MSG_ERR, "SAMPLER: ERROR: 'sample-num' parameter export failed\n");
         return -EIO;

src/hal/components/streamer.c

@@ -176,7 +176,7 @@ static void update(void *arg, long period)
     /* are we enabled? - generate doclock if enabled and right mode  */
     if (hal_get_bool(str->enable)) {
         doclk = 1;
-        switch (hal_get_si32(str->clock_mode)) {
+        switch (hal_get_sint(str->clock_mode)) {
         /* clock-mode 0 means do clock if enabled */
         case 0:
             break;
@@ -204,19 +204,19 @@ static void update(void *arg, long period)
     }
     /* point at user/RT fifo in other shmem */
     int depth = hal_stream_depth(&str->fifo);
-    hal_set_si32(str->curr_depth, depth);
+    hal_set_sint(str->curr_depth, depth);
     hal_set_bool(str->empty, depth == 0);
     if(!doclk)
         return; /* done - output pins retain current values */
     if(depth == 0) {
         /* increase underrun only for valid clock*/
-        hal_set_si32(str->underruns, hal_get_si32(str->underruns) + 1);
+        hal_set_sint(str->underruns, hal_get_sint(str->underruns) + 1);
         return;
     }
     union hal_stream_data data[HAL_STREAM_MAX_PINS];
     if(hal_stream_read(&str->fifo, data, NULL) < 0) {
         /* should not happen (single reader invariant) */
-        hal_set_si32(str->underruns, hal_get_si32(str->underruns) + 1);
+        hal_set_sint(str->underruns, hal_get_sint(str->underruns) + 1);
         return;
     }
     int num_pins = hal_stream_element_count(&str->fifo);
@@ -248,12 +248,12 @@ static int init_streamer(int num, streamer_t *str)
         rtapi_print_msg(RTAPI_MSG_ERR, "STREAMER: ERROR: 'enable' pin export failed\n");
         return -EIO;
     }
-    retval = hal_pin_new_si32(comp_id, HAL_OUT, &str->curr_depth, 0, "%s%d.curr-depth", strbase, num);
+    retval = hal_pin_new_sint(comp_id, HAL_OUT, &str->curr_depth, 0, "%s%d.curr-depth", strbase, num);
     if (retval != 0 ) {
         rtapi_print_msg(RTAPI_MSG_ERR, "STREAMER: ERROR: 'curr_depth' pin export failed\n");
         return -EIO;
     }
-    retval = hal_pin_new_si32(comp_id, HAL_IO, &str->underruns, 0, "%s%d.underruns", strbase, num);
+    retval = hal_pin_new_sint(comp_id, HAL_IO, &str->underruns, 0, "%s%d.underruns", strbase, num);
     if (retval != 0 ) {
         rtapi_print_msg(RTAPI_MSG_ERR, "STREAMER: ERROR: 'underruns' pin export failed\n");
         return -EIO;
@@ -263,7 +263,7 @@ static int init_streamer(int num, streamer_t *str)
         rtapi_print_msg(RTAPI_MSG_ERR, "STREAMER: ERROR: 'clock' pin export failed\n");
         return -EIO;
     }
-    retval = hal_pin_new_si32(comp_id, HAL_IN, &str->clock_mode, 0, "%s%d.clock-mode", strbase, num);
+    retval = hal_pin_new_sint(comp_id, HAL_IN, &str->clock_mode, 0, "%s%d.clock-mode", strbase, num);
     if (retval != 0 ) {
         rtapi_print_msg(RTAPI_MSG_ERR, "STREAMER: ERROR: 'clock_mode' pin export failed\n");
         return -EIO;