From a9afee1d12336ccdd09641c30d39efe4de05f588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fin=20Maa=C3=9F?= Date: Wed, 3 Apr 2024 15:49:16 +0200 Subject: [PATCH] samples: use appropriate sys_randX_get() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit use the appropriate sys_randX_get() instead of always sys_rand32_get(). Signed-off-by: Fin Maaß --- samples/arch/smp/pktqueue/src/main.c | 2 +- samples/bluetooth/peripheral_csc/src/main.c | 6 +++--- samples/net/cloud/mqtt_azure/src/main.c | 4 ++-- samples/net/mqtt_publisher/src/main.c | 4 ++-- samples/net/wpan_serial/src/main.c | 6 ++---- samples/subsys/usb/hid-cdc/src/main.c | 4 ++-- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/samples/arch/smp/pktqueue/src/main.c b/samples/arch/smp/pktqueue/src/main.c index 07363a8d234..009cd2de966 100644 --- a/samples/arch/smp/pktqueue/src/main.c +++ b/samples/arch/smp/pktqueue/src/main.c @@ -45,7 +45,7 @@ void init_datagram_queue(struct phdr_desc_queue *queue, int queue_num) for (int j = 0; j < SIZE_OF_HEADER; j++) { /* leave crc field zeroed */ if (j < CRC_BYTE_1 || j > CRC_BYTE_2) { - descriptors[queue_num][i].ptr[j] = (uint8_t)sys_rand32_get(); + descriptors[queue_num][i].ptr[j] = sys_rand8_get(); } else { descriptors[queue_num][i].ptr[j] = 0; } diff --git a/samples/bluetooth/peripheral_csc/src/main.c b/samples/bluetooth/peripheral_csc/src/main.c index eba60137097..d6a2f3d01e5 100644 --- a/samples/bluetooth/peripheral_csc/src/main.c +++ b/samples/bluetooth/peripheral_csc/src/main.c @@ -304,18 +304,18 @@ static uint16_t lcet; /* Last Crank Event Time */ static void csc_simulation(void) { static uint8_t i; - uint32_t rand = sys_rand32_get(); + uint8_t rnd = sys_rand8_get(); bool nfy_crank = false, nfy_wheel = false; /* Measurements don't have to be updated every second */ if (!(i % 2)) { - lwet += 1050 + rand % 50; + lwet += 1050 + rnd % 50; c_wheel_revs += 2U; nfy_wheel = true; } if (!(i % 3)) { - lcet += 1000 + rand % 50; + lcet += 1000 + rnd % 50; ccr += 1U; nfy_crank = true; } diff --git a/samples/net/cloud/mqtt_azure/src/main.c b/samples/net/cloud/mqtt_azure/src/main.c index 75590b5065d..46ee6c66820 100644 --- a/samples/net/cloud/mqtt_azure/src/main.c +++ b/samples/net/cloud/mqtt_azure/src/main.c @@ -298,7 +298,7 @@ static int publish(struct mqtt_client *client, enum mqtt_qos qos) param.message.topic.topic.size = len; param.message.payload.data = payload; param.message.payload.len = strlen(payload); - param.message_id = sys_rand32_get(); + param.message_id = sys_rand16_get(); param.dup_flag = 0U; param.retain_flag = 0U; @@ -324,7 +324,7 @@ static void poll_mqtt(void) */ static uint8_t timeout_for_publish(void) { - return (10 + sys_rand32_get() % 5); + return (10 + sys_rand8_get() % 5); } static void publish_timeout(struct k_work *work) diff --git a/samples/net/mqtt_publisher/src/main.c b/samples/net/mqtt_publisher/src/main.c index 2d8408d1191..231c9c2b2f3 100644 --- a/samples/net/mqtt_publisher/src/main.c +++ b/samples/net/mqtt_publisher/src/main.c @@ -219,7 +219,7 @@ static char *get_mqtt_payload(enum mqtt_qos qos) static APP_BMEM char payload[30]; snprintk(payload, sizeof(payload), "{d:{temperature:%d}}", - (uint8_t)sys_rand32_get()); + sys_rand8_get()); #else static APP_DMEM char payload[] = "DOORS:OPEN_QoSx"; @@ -250,7 +250,7 @@ static int publish(struct mqtt_client *client, enum mqtt_qos qos) param.message.payload.data = get_mqtt_payload(qos); param.message.payload.len = strlen(param.message.payload.data); - param.message_id = sys_rand32_get(); + param.message_id = sys_rand16_get(); param.dup_flag = 0U; param.retain_flag = 0U; diff --git a/samples/net/wpan_serial/src/main.c b/samples/net/wpan_serial/src/main.c index 04b98a449bb..2f589aa33de 100644 --- a/samples/net/wpan_serial/src/main.c +++ b/samples/net/wpan_serial/src/main.c @@ -448,14 +448,12 @@ static void init_tx_queue(void) */ static uint8_t *get_mac(const struct device *dev) { - uint32_t *ptr = (uint32_t *)mac_addr; - mac_addr[7] = 0x00; mac_addr[6] = 0x12; mac_addr[5] = 0x4b; - mac_addr[4] = 0x00; - UNALIGNED_PUT(sys_rand32_get(), ptr); + + sys_rand_get(mac_addr, 4U); mac_addr[0] = (mac_addr[0] & ~0x01) | 0x02; diff --git a/samples/subsys/usb/hid-cdc/src/main.c b/samples/subsys/usb/hid-cdc/src/main.c index 7e06a2c5d0b..936afb76f0a 100644 --- a/samples/subsys/usb/hid-cdc/src/main.c +++ b/samples/subsys/usb/hid-cdc/src/main.c @@ -652,8 +652,8 @@ int main(void) case GPIO_BUTTON_0: { /* Move the mouse in random direction */ - uint8_t rep[] = {0x00, sys_rand32_get(), - sys_rand32_get(), 0x00}; + uint8_t rep[] = {0x00, sys_rand8_get(), + sys_rand8_get(), 0x00}; k_sem_take(&usb_sem, K_FOREVER); hid_int_ep_write(hid0_dev, rep,