aboutsummaryrefslogtreecommitdiff
path: root/library/include
diff options
context:
space:
mode:
Diffstat (limited to 'library/include')
-rw-r--r--library/include/mipi_syst.h.in9
-rw-r--r--library/include/mipi_syst/api.h5
-rw-r--r--library/include/mipi_syst/inline.h42
-rw-r--r--library/include/mipi_syst/message.h2
4 files changed, 33 insertions, 25 deletions
diff --git a/library/include/mipi_syst.h.in b/library/include/mipi_syst.h.in
index 23b96ac..54a6839 100644
--- a/library/include/mipi_syst.h.in
+++ b/library/include/mipi_syst.h.in
@@ -466,6 +466,13 @@ typedef void (*mipi_syst_msg_write_t)(
#if defined(_WIN64) || defined(__x86_64__) || defined (__LP64__)
#define MIPI_SYST_PCFG_ENABLE_64BIT_ADDR
#endif
+
+#if defined(MIPI_SYST_PCFG_ENABLE_64BIT_ADDR)
+typedef mipi_syst_u64 mipi_syst_param;
+#else
+typedef mipi_syst_u32 mipi_syst_param;
+#endif
+
/**
* Enable atomic 64-bit write operations
*
@@ -804,7 +811,7 @@ struct mipi_syst_handle_flags {
#endif
mipi_syst_u32 systh_param_count; /**< number of parameters */
- mipi_syst_u32 systh_param[6]; /**< catalog msg parameters */
+ mipi_syst_param systh_param[6]; /**< catalog msg parameters */
#if defined(MIPI_SYST_PCFG_ENABLE_PLATFORM_HANDLE_DATA)
struct mipi_syst_platform_handle systh_platform;
diff --git a/library/include/mipi_syst/api.h b/library/include/mipi_syst/api.h
index 6849039..3fa3f4b 100644
--- a/library/include/mipi_syst/api.h
+++ b/library/include/mipi_syst/api.h
@@ -1570,7 +1570,8 @@ enum mipi_syst_catalog_parameter_types {
/**
* Send catalog message with 0-6 parameters.<BR>
* This family of Macros is used to send 32 or 64-bit wide catalog
- * message IDs with up to six 32-bit wide parameters into the trace stream.
+ * message IDs with up to six 32/64-bit wide parameters into the trace stream.
+ * Size of parameters are chosen depending on MIPI_SYST_PCFG_ENABLE_64BIT_ADDR.
* The macro names are encoded in the following way:
* MIPI_SYST_CATALOG{ID-WIDTH}_{PARAMETER-COUNT}
*
@@ -1581,7 +1582,7 @@ enum mipi_syst_catalog_parameter_types {
* @param sev mipi_syst_severity severity level (0..7)
* @param id catalog ID
*
- * Up to 6 32-Bit numeric parameter follow the catalog ID.
+ * Up to 6 32/64-bit numeric parameter follow the catalog ID.
*
* Example:
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.c}
diff --git a/library/include/mipi_syst/inline.h b/library/include/mipi_syst/inline.h
index 65996e7..d68dfed 100644
--- a/library/include/mipi_syst/inline.h
+++ b/library/include/mipi_syst/inline.h
@@ -117,7 +117,7 @@ MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param0(struct mipi_syst_
* Setup handle for 1 parameter passed to catid message.
*/
MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param1(struct mipi_syst_handle* h,
- mipi_syst_u32 p1)
+ mipi_syst_param p1)
{
if (h) {
h->systh_param_count = 1;
@@ -129,8 +129,8 @@ MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param1(struct mipi_syst_
* Setup handle for 2 parameters passed to catid message.
*/
MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param2(struct mipi_syst_handle* h,
- mipi_syst_u32 p1,
- mipi_syst_u32 p2)
+ mipi_syst_param p1,
+ mipi_syst_param p2)
{
if (h) {
h->systh_param_count = 2;
@@ -143,9 +143,9 @@ MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param2(struct mipi_syst_
* Setup handle for 3 parameters passed to catid message.
*/
MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param3(struct mipi_syst_handle* h,
- mipi_syst_u32 p1,
- mipi_syst_u32 p2,
- mipi_syst_u32 p3)
+ mipi_syst_param p1,
+ mipi_syst_param p2,
+ mipi_syst_param p3)
{
if (h) {
h->systh_param_count = 3;
@@ -159,10 +159,10 @@ MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param3(struct mipi_syst_
* Setup handle for 4 parameters passed to catid message.
*/
MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param4(struct mipi_syst_handle* h,
- mipi_syst_u32 p1,
- mipi_syst_u32 p2,
- mipi_syst_u32 p3,
- mipi_syst_u32 p4)
+ mipi_syst_param p1,
+ mipi_syst_param p2,
+ mipi_syst_param p3,
+ mipi_syst_param p4)
{
if (h) {
h->systh_param_count = 4;
@@ -177,11 +177,11 @@ MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param4(struct mipi_syst_
* Setup handle for 5 parameters passed to catid message.
*/
MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param5(struct mipi_syst_handle* h,
- mipi_syst_u32 p1,
- mipi_syst_u32 p2,
- mipi_syst_u32 p3,
- mipi_syst_u32 p4,
- mipi_syst_u32 p5)
+ mipi_syst_param p1,
+ mipi_syst_param p2,
+ mipi_syst_param p3,
+ mipi_syst_param p4,
+ mipi_syst_param p5)
{
if (h) {
h->systh_param_count = 5;
@@ -197,12 +197,12 @@ MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param5(struct mipi_syst_
* Setup handle for 6 parameters passed to catid message.
*/
MIPI_SYST_INLINE void MIPI_SYST_CALLCONV mipi_syst_make_param6(struct mipi_syst_handle* h,
- mipi_syst_u32 p1,
- mipi_syst_u32 p2,
- mipi_syst_u32 p3,
- mipi_syst_u32 p4,
- mipi_syst_u32 p5,
- mipi_syst_u32 p6)
+ mipi_syst_param p1,
+ mipi_syst_param p2,
+ mipi_syst_param p3,
+ mipi_syst_param p4,
+ mipi_syst_param p5,
+ mipi_syst_param p6)
{
if (h) {
h->systh_param_count = 6;
diff --git a/library/include/mipi_syst/message.h b/library/include/mipi_syst/message.h
index beb528d..eaaf4e9 100644
--- a/library/include/mipi_syst/message.h
+++ b/library/include/mipi_syst/message.h
@@ -99,7 +99,7 @@ union mipi_syst_sbd_id {
struct {
union mipi_syst_catid id;
- mipi_syst_u32 *param;
+ mipi_syst_param *param;
} data_catid;
#if defined(MIPI_SYST_PCFG_ENABLE_SBD_API)
generated by cgit v1.1 at 2024-06-30 12:10:42 +0000