diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-06-09 18:05:25 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-06-12 21:58:17 -0400 |
| commit | a80249d0a9da850e8971f45beb435ad4f154447d (patch) | |
| tree | bb5aa7f69b22bf52a395d59b8bbcce858dc3b14e | |
| parent | 4218a6dc8b71192ab23dfebb334a9f123375cf3b (diff) | |
| download | binutils-gdb-a80249d0a9da850e8971f45beb435ad4f154447d.tar.gz | |
sim: erc32: replace caddr_t with void*
This BSDism was never accepted into standards, so replace it with the
portable void* type instead.
| -rw-r--r-- | sim/erc32/ChangeLog | 8 | ||||
| -rw-r--r-- | sim/erc32/erc32.c | 20 |
2 files changed, 18 insertions, 10 deletions
diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog index db089091d0f..311da252b6b 100644 --- a/sim/erc32/ChangeLog +++ b/sim/erc32/ChangeLog @@ -1,5 +1,13 @@ 2021-06-12 Mike Frysinger <vapier@gentoo.org> + * erc32.c (uart_rx): Change caddr_t to void*. + (uart_intr): Likewise. + (wdog_intr): Likewise. + (rtc_intr): Likewise. + (gpt_intr): Likewise. + +2021-06-12 Mike Frysinger <vapier@gentoo.org> + * Makefile.in: Add $(EXEEXT) to sis. 2021-06-12 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/erc32/erc32.c b/sim/erc32/erc32.c index 747ac780b89..91f734c07db 100644 --- a/sim/erc32/erc32.c +++ b/sim/erc32/erc32.c @@ -272,17 +272,17 @@ static void write_uart (uint32 addr, uint32 data); static void flush_uart (void); static void uarta_tx (void); static void uartb_tx (void); -static void uart_rx (caddr_t arg); -static void uart_intr (caddr_t arg); +static void uart_rx (void *arg); +static void uart_intr (void *arg); static void uart_irq_start (void); -static void wdog_intr (caddr_t arg); +static void wdog_intr (void *arg); static void wdog_start (void); -static void rtc_intr (caddr_t arg); +static void rtc_intr (void *arg); static void rtc_start (void); static uint32 rtc_counter_read (void); static void rtc_scaler_set (uint32 val); static void rtc_reload_set (uint32 val); -static void gpt_intr (caddr_t arg); +static void gpt_intr (void *arg); static void gpt_start (void); static uint32 gpt_counter_read (void); static void gpt_scaler_set (uint32 val); @@ -1262,7 +1262,7 @@ uartb_tx(void) } static void -uart_rx(caddr_t arg) +uart_rx(void *arg) { int32 rsize; char rxd; @@ -1304,7 +1304,7 @@ uart_rx(caddr_t arg) } static void -uart_intr(caddr_t arg) +uart_intr(void *arg) { read_uart(0xE8); /* Check for UART interrupts every 1000 clk */ flush_uart(); /* Flush UART ports */ @@ -1327,7 +1327,7 @@ uart_irq_start(void) /* Watch-dog */ static void -wdog_intr(caddr_t arg) +wdog_intr(void *arg) { if (wdog_status == disabled) { wdog_status = stopped; @@ -1365,7 +1365,7 @@ wdog_start(void) static void -rtc_intr(caddr_t arg) +rtc_intr(void *arg) { if (rtc_counter == 0) { @@ -1416,7 +1416,7 @@ rtc_reload_set(uint32 val) } static void -gpt_intr(caddr_t arg) +gpt_intr(void *arg) { if (gpt_counter == 0) { mec_irq(12); |