Merge commit '57cc0523f600575feda09bd9fae13f685ce85b0f'

4 files changed, 7 insertions, 13 deletions

diff --git a/libhw/host_alarmclock.c b/libhw/host_alarmclock.c
index 8b9bdcf..5f7e494 100644
--- a/libhw/host_alarmclock.c
+++ b/libhw/host_alarmclock.c
@@ -54,8 +54,6 @@ implements_alarmclock *bootclock = &clock_monotonic;
 
 /* Main implementation ********************************************************/
 
-#define UNUSED(name)
-
 static uint64_t hostclock_get_time_ns(implements_alarmclock *_alarmclock) {
 	struct hostclock *alarmclock =
 		VCALL_SELF(struct hostclock, implements_alarmclock, _alarmclock);
@@ -69,7 +67,7 @@ static uint64_t hostclock_get_time_ns(implements_alarmclock *_alarmclock) {
 	return ns_from_host_ns_time(ts);
 }
 
-static void hostclock_handle_sig_alarm(int UNUSED(sig), siginfo_t *info, void *UNUSED(ucontext)) {
+static void hostclock_handle_sig_alarm(int LM_UNUSED(sig), siginfo_t *info, void *LM_UNUSED(ucontext)) {
 	struct hostclock *alarmclock = info->si_value.sival_ptr;
 	assert(alarmclock);
 
diff --git a/libhw/host_net.c b/libhw/host_net.c
index 2ba8b23..917e764 100644
--- a/libhw/host_net.c
+++ b/libhw/host_net.c
@@ -20,6 +20,7 @@
 
 #include <libcr/coroutine.h>
 #include <libmisc/assert.h>
+#include <libmisc/macro.h>
 #include <libmisc/vcall.h>
 
 #include <libhw/generic/alarmclock.h>
@@ -31,11 +32,9 @@
 
 /* common *********************************************************************/
 
-#define UNUSED(name)
-
 static int hostnet_sig_io = 0;
 
-static void hostnet_handle_sig_io(int UNUSED(sig), siginfo_t *info, void *UNUSED(ucontext)) {
+static void hostnet_handle_sig_io(int LM_UNUSED(sig), siginfo_t *info, void *LM_UNUSED(ucontext)) {
 	cr_unpause_from_intrhandler((cid_t)info->si_value.sival_int);
 }
 
diff --git a/libhw/rp2040_hwtimer.c b/libhw/rp2040_hwtimer.c
index 4499642..c8c281e 100644
--- a/libhw/rp2040_hwtimer.c
+++ b/libhw/rp2040_hwtimer.c
@@ -68,7 +68,7 @@ static uint64_t rp2040_hwtimer_get_time_ns(implements_alarmclock *) {
 	return timer_time_us_64(timer_hw) * (NS_PER_S/US_PER_S);
 }
 
-#define NS_TO_US_ROUNDUP(x) ( ( (x) + (NS_PER_S/US_PER_S)-1) / (NS_PER_S/US_PER_S) )
+#define NS_TO_US_ROUNDUP(x) LM_CEILDIV(x, NS_PER_S/US_PER_S)
 
 static void rp2040_hwtimer_intrhandler(void) {
 	uint irq_num = __get_current_exception() - VTABLE_FIRST_IRQ;
diff --git a/libhw/w5500.c b/libhw/w5500.c
index f36b9cf..cebcf8e 100644
--- a/libhw/w5500.c
+++ b/libhw/w5500.c
@@ -105,9 +105,6 @@
 
 /* C language *****************************************************************/
 
-#define UNUSED(name)
-#define ARRAY_LEN(ary) (sizeof(ary)/sizeof((ary)[0]))
-
 static const char *w5500_state_str(uint8_t state) {
 	switch (state) {
 	case STATE_CLOSED:          return "STATE_CLOSED";
@@ -328,9 +325,9 @@ static inline void w5500_socket_close(struct _w5500_socket *socket) {
 
 static struct w5500 *w5500_chips[CONFIG_W5500_NUM] = {0};
 
-static void w5500_intrhandler(uint gpio, uint32_t UNUSED(event_mask)) {
+static void w5500_intrhandler(uint gpio, uint32_t LM_UNUSED(event_mask)) {
 	debugf("w5500_intrhandler(): interrupt on pin %u", gpio);
-	for (size_t i = 0; i < ARRAY_LEN(w5500_chips); i++)
+	for (size_t i = 0; i < LM_ARRAY_LEN(w5500_chips); i++)
 		if (w5500_chips[i] && w5500_chips[i]->pin_intr == gpio)
 			cr_sema_signal_from_intrhandler(&w5500_chips[i]->intr);
 }
@@ -374,7 +371,7 @@ void _w5500_init(struct w5500 *chip,
 
 	/* Finally, wire in the interrupt handler.  */
 	bool saved = cr_save_and_disable_interrupts();
-	for (size_t i = 0; i < ARRAY_LEN(w5500_chips); i++) {
+	for (size_t i = 0; i < LM_ARRAY_LEN(w5500_chips); i++) {
 		if (w5500_chips[i] == NULL) {
 			w5500_chips[i] = chip;
 			break;