From fe640d9339f5a243da017baa32cb51b600e47d4b Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Sun, 7 Apr 2024 20:58:47 +0200 Subject: [PATCH] pcmcia: fix compilation warnings and errors Needed for the echo indigo soundcard driver build. IRQ is used as a field name in pmcia/cs.h. The IRQ() macro should only be used with parameters. So we can avoid the use of IRQ in cs.h being accidentally replaced by the macro. Change-Id: Ib10f3c5148cfb7c87a0b258a95a590778b6e5cb4 Reviewed-on: https://review.haiku-os.org/c/haiku/+/7608 Reviewed-by: waddlesplash Tested-by: Commit checker robot --- headers/os/drivers/pcmcia/k_compat.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/headers/os/drivers/pcmcia/k_compat.h b/headers/os/drivers/pcmcia/k_compat.h index c19d762918..779d26c6d3 100644 --- a/headers/os/drivers/pcmcia/k_compat.h +++ b/headers/os/drivers/pcmcia/k_compat.h @@ -79,7 +79,7 @@ static inline void *ioremap(u_long base, u_long size) area_id id; void *virt; sprintf(tag, "pccard %08lx", base); - id = map_physical_memory(tag, (void *)base, + id = map_physical_memory(tag, (phys_addr_t)base, size, B_ANY_KERNEL_ADDRESS, B_READ_AREA | B_WRITE_AREA, &virt); return (id < 0) ? NULL : virt; @@ -184,7 +184,7 @@ void free(void *); //#define REQUEST_IRQ(i,h,f,n,d) install_io_interrupt_handler(i,h,d,0) //#define FREE_IRQ(i,h,d) remove_io_interrupt(i,h) //#define IRQ(i,d,r) (d) -#define IRQ +#define IRQ(i,d,r) #define DEV_ID dev_id #define NR_IRQS 16 #define SA_SHIRQ 1