From a63684da6bb7214b8d7d354bde94338f4745a3e5 Mon Sep 17 00:00:00 2001 From: Bertho Stultiens Date: Thu, 23 Jan 2025 10:29:05 +0100 Subject: [PATCH] Fix incompatibility between uspace and kernel build by using rtapi abstractions. --- src/hal/components/conv.comp.in | 2 +- src/hal/components/mkconv.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/hal/components/conv.comp.in b/src/hal/components/conv.comp.in index fc1d05688f3..0ea5c41123b 100644 --- a/src/hal/components/conv.comp.in +++ b/src/hal/components/conv.comp.in @@ -8,7 +8,7 @@ license "GPL"; author "Jeff Epler"; ;; -#include +#include FUNCTION(_) { @TYPI@ val = in; @CC@ if(clamp) { diff --git a/src/hal/components/mkconv.sh b/src/hal/components/mkconv.sh index bc7248778c7..15f48a1f33b 100644 --- a/src/hal/components/mkconv.sh +++ b/src/hal/components/mkconv.sh @@ -23,10 +23,10 @@ utype() { maxval() { case "$1" in "bit") echo "1" ;; - "s32") echo "INT32_MAX" ;; - "u32") echo "UINT32_MAX" ;; - "s64") echo "INT64_MAX" ;; - "u64") echo "UINT64_MAX" ;; + "s32") echo "RTAPI_INT32_MAX" ;; + "u32") echo "RTAPI_UINT32_MAX" ;; + "s64") echo "RTAPI_INT64_MAX" ;; + "u64") echo "RTAPI_UINT64_MAX" ;; "float") echo "Never_Used" ;; *) echo "This_Will_Generate_An_Error" ;; esac @@ -36,9 +36,9 @@ maxval() { minval() { case "$1" in "bit") echo "0" ;; - "s32") echo "INT32_MIN" ;; + "s32") echo "RTAPI_INT32_MIN" ;; "u32") echo "0" ;; - "s64") echo "INT64_MIN" ;; + "s64") echo "RTAPI_INT64_MIN" ;; "u64") echo "0" ;; "float") echo "Never_Used" ;; *) echo "This_Will_Generate_An_Error" ;;