From 12bdaa500f763f6b8c167a8a3e45daf8b011e994 Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Thu, 29 Jan 2015 17:35:34 +0100
Subject: [PATCH] Let encoded user indices start from LABCOMM_USER instead of
hard-coded 0x40
---
lib/c/2006/labcomm2006.c | 2 +-
lib/c/2006/labcomm2006_private.h | 2 +-
lib/c/2014/labcomm.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/c/2006/labcomm2006.c b/lib/c/2006/labcomm2006.c
index 8f628cf..ff09b63 100644
--- a/lib/c/2006/labcomm2006.c
+++ b/lib/c/2006/labcomm2006.c
@@ -237,7 +237,7 @@ void *labcomm2006_signature_array_ref(struct labcomm2006_memory *memory,
}
}
-static int local_index = 0x40;
+static int local_index = LABCOMM_USER;
void labcomm2006_set_local_index(struct labcomm2006_signature *signature)
{
diff --git a/lib/c/2006/labcomm2006_private.h b/lib/c/2006/labcomm2006_private.h
index 4c33610..378719c 100644
--- a/lib/c/2006/labcomm2006_private.h
+++ b/lib/c/2006/labcomm2006_private.h
@@ -42,7 +42,7 @@
#define LABCOMM_SAMPLE 0x02
#define LABCOMM_ARRAY 0x10
#define LABCOMM_STRUCT 0x11
-#define LABCOMM_USER 0x80 /* ..0xffffffff */
+#define LABCOMM_USER 0x40 /* ..0xffffffff */
/*
* Predefined primitive type indices
diff --git a/lib/c/2014/labcomm.c b/lib/c/2014/labcomm.c
index c11f50b..a01c96b 100644
--- a/lib/c/2014/labcomm.c
+++ b/lib/c/2014/labcomm.c
@@ -236,7 +236,7 @@ void *labcomm_signature_array_ref(struct labcomm_memory *memory,
}
}
-static int local_index = 0x40;
+static int local_index = LABCOMM_USER;
void labcomm_set_local_index(struct labcomm_signature *signature)
{
--
GitLab