From 1fbe72b7ddfc5613fbf3106724b7e2140529fb0d Mon Sep 17 00:00:00 2001
From: Martin Stein <martin.stein@genode-labs.com>
Date: Mon, 11 Jul 2022 09:56:15 +0200
Subject: [PATCH] lx_emul: fixed types in lx_emul_gen_random_u*

* Rename lx_emul_gen_random_uint lx_emul_gen_random_u32.
* Use genode_uint*_t as return types for the lx_emul_gen_random_u* functions.

Ref #4544
---
 repos/dde_linux/src/app/wireguard/lx_emul.c              | 4 ++--
 repos/dde_linux/src/include/lx_emul/random.h             | 6 ++++--
 repos/dde_linux/src/lib/lx_emul/random.cc                | 8 ++++----
 repos/pc/src/lib/pc/lx_emul/shadow/drivers/char/random.c | 2 +-
 repos/pc/src/lib/wifi/lx_emul.c                          | 2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/repos/dde_linux/src/app/wireguard/lx_emul.c b/repos/dde_linux/src/app/wireguard/lx_emul.c
index 19adc25fea..f0dcb94780 100644
--- a/repos/dde_linux/src/app/wireguard/lx_emul.c
+++ b/repos/dde_linux/src/app/wireguard/lx_emul.c
@@ -49,7 +49,7 @@ int wait_for_random_bytes(void)
 
 u32 get_random_u32(void)
 {
-	return lx_emul_gen_random_uint();
+	return lx_emul_gen_random_u32();
 }
 
 
@@ -57,7 +57,7 @@ u32 get_random_u32(void)
 
 u32 prandom_u32(void)
 {
-	return lx_emul_gen_random_uint();
+	return lx_emul_gen_random_u32();
 }
 
 
diff --git a/repos/dde_linux/src/include/lx_emul/random.h b/repos/dde_linux/src/include/lx_emul/random.h
index 52a3b65ad9..d35faf6b04 100644
--- a/repos/dde_linux/src/include/lx_emul/random.h
+++ b/repos/dde_linux/src/include/lx_emul/random.h
@@ -27,6 +27,8 @@
 #ifndef _LX_EMUL__RANDOM_H_
 #define _LX_EMUL__RANDOM_H_
 
+#include <base/fixed_stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -41,8 +43,8 @@ void lx_emul_gen_random_bytes(void          *dst,
 /**
  * Return a random unsigned integer value.
  */
-unsigned int lx_emul_gen_random_uint(void);
-unsigned long long lx_emul_gen_random_u64(void);
+genode_uint32_t lx_emul_gen_random_u32(void);
+genode_uint64_t lx_emul_gen_random_u64(void);
 
 #ifdef __cplusplus
 }
diff --git a/repos/dde_linux/src/lib/lx_emul/random.cc b/repos/dde_linux/src/lib/lx_emul/random.cc
index a48f1515cb..7accd38cc6 100644
--- a/repos/dde_linux/src/lib/lx_emul/random.cc
+++ b/repos/dde_linux/src/lib/lx_emul/random.cc
@@ -217,13 +217,13 @@ void lx_emul_gen_random_bytes(void          *dst,
 }
 
 
-unsigned int lx_emul_gen_random_uint()
+genode_uint32_t lx_emul_gen_random_u32()
 {
-	return (unsigned int)xoroshiro().get_u64();
+	return (genode_uint32_t)xoroshiro().get_u64();
 }
 
 
-unsigned long long lx_emul_gen_random_u64()
+genode_uint64_t lx_emul_gen_random_u64()
 {
-	return xoroshiro().get_u64();
+	return (genode_uint64_t)xoroshiro().get_u64();
 }
diff --git a/repos/pc/src/lib/pc/lx_emul/shadow/drivers/char/random.c b/repos/pc/src/lib/pc/lx_emul/shadow/drivers/char/random.c
index 07b57fcca6..4f4068eee3 100644
--- a/repos/pc/src/lib/pc/lx_emul/shadow/drivers/char/random.c
+++ b/repos/pc/src/lib/pc/lx_emul/shadow/drivers/char/random.c
@@ -26,7 +26,7 @@ void add_input_randomness(unsigned int type,unsigned int code,unsigned int value
 
 u32 get_random_u32(void)
 {
-	return lx_emul_gen_random_uint();
+	return lx_emul_gen_random_u32();
 }
 
 
diff --git a/repos/pc/src/lib/wifi/lx_emul.c b/repos/pc/src/lib/wifi/lx_emul.c
index 7d56801eaa..57305e989c 100644
--- a/repos/pc/src/lib/wifi/lx_emul.c
+++ b/repos/pc/src/lib/wifi/lx_emul.c
@@ -465,7 +465,7 @@ void prandom_bytes(void *buf, size_t bytes)
 
 u32 prandom_u32(void)
 {
-	return lx_emul_gen_random_uint();
+	return lx_emul_gen_random_u32();
 }