Etienne Brateau, le jeu. 20 janv. 2022 18:00:04 +0100, a ecrit:
> * hardclock.c: convert to ANSI
> * com.c: ditto
> * lpr.c: ditto
> * mem.c: ditto
Applied, thanks!
> ---
> i386/i386/hardclock.c | 13 ++++++-------
> i386/i386/hardclock.h | 2 +-
> i386/i386at/com.c | 27 ++++++++++-----------------
> i386/i386at/lpr.c | 31 +++++++++++--------------------
> i386/i386at/mem.c | 5 +----
> 5 files changed, 29 insertions(+), 49 deletions(-)
>
> diff --git a/i386/i386/hardclock.c b/i386/i386/hardclock.c
> index eb6ff34f..57259ff3 100644
> --- a/i386/i386/hardclock.c
> +++ b/i386/i386/hardclock.c
> @@ -46,13 +46,12 @@
> extern char return_to_iret[];
>
> void
> -hardclock(iunit, old_ipl, irq, ret_addr, regs)
> - int iunit; /* 'unit' number */
> - int old_ipl; /* old interrupt level */
> - int irq; /* irq number */
> - const char * ret_addr; /* return address in interrupt handler
> */
> - struct i386_interrupt_state *regs;
> - /* saved registers */
> +hardclock(int iunit, /* 'unit' number */
> + int old_ipl, /* old interrupt level */
> + int irq, /* irq number */
> + const char *ret_addr, /* return address in interrupt handler */
> + struct i386_interrupt_state *regs /* saved registers */
> + )
> {
> if (ret_addr == return_to_iret)
> /*
> diff --git a/i386/i386/hardclock.h b/i386/i386/hardclock.h
> index 38c51ea6..96ebf52d 100644
> --- a/i386/i386/hardclock.h
> +++ b/i386/i386/hardclock.h
> @@ -23,7 +23,7 @@ void hardclock(
> int iunit,
> int old_ipl,
> int irq,
> - char *ret_addr,
> + const char *ret_addr,
> struct i386_interrupt_state *regs);
>
> #endif /* _I386_HARDCLOCK_H_ */
> diff --git a/i386/i386at/com.c b/i386/i386at/com.c
> index 3402a025..d565a053 100644
> --- a/i386/i386at/com.c
> +++ b/i386/i386at/com.c
> @@ -405,9 +405,7 @@ io_return_t comopen(
> return result;
> }
>
> -void comclose(dev, flag)
> -dev_t dev;
> -int flag;
> +void comclose(dev_t dev, int flag)
> {
> struct tty *tp = &com_tty[minor(dev)];
> u_short addr = (uintptr_t)tp->t_addr;
> @@ -424,33 +422,28 @@ int flag;
> return;
> }
>
> -io_return_t comread(dev, ior)
> -dev_t dev;
> -io_req_t ior;
> +io_return_t comread(dev_t dev, io_req_t ior)
> {
> return char_read(&com_tty[minor(dev)], ior);
> }
>
> -io_return_t comwrite(dev, ior)
> -dev_t dev;
> -io_req_t ior;
> +io_return_t comwrite(dev_t dev, io_req_t ior)
> {
> return char_write(&com_tty[minor(dev)], ior);
> }
>
> -io_return_t comportdeath(dev, port)
> -dev_t dev;
> -mach_port_t port;
> +io_return_t comportdeath(dev_t dev, mach_port_t port)
> {
> return (tty_portdeath(&com_tty[minor(dev)], (ipc_port_t)port));
> }
>
> io_return_t
> -comgetstat(dev, flavor, data, count)
> -dev_t dev;
> -dev_flavor_t flavor;
> -dev_status_t data; /* pointer to OUT array */
> -mach_msg_type_number_t *count; /* out */
> +comgetstat(
> + dev_t dev,
> + dev_flavor_t flavor,
> + dev_status_t data, /* pointer to OUT array */
> + mach_msg_type_number_t *count /* out */
> + )
> {
> io_return_t result = D_SUCCESS;
> int unit = minor(dev);
> diff --git a/i386/i386at/lpr.c b/i386/i386at/lpr.c
> index fe088771..9b55a5f2 100644
> --- a/i386/i386at/lpr.c
> +++ b/i386/i386at/lpr.c
> @@ -62,9 +62,7 @@ struct tty lpr_tty[NLPR];
> int lpr_alive[NLPR];
>
> int
> -lprprobe(port, dev)
> -vm_offset_t port;
> -struct bus_ctlr *dev;
> +lprprobe(vm_offset_t port, struct bus_ctlr *dev)
> {
> u_short addr = (u_short) dev->address;
> int unit = dev->unit;
> @@ -141,9 +139,7 @@ lpropen(dev_t dev, int flag, io_req_t ior)
> }
>
> void
> -lprclose(dev, flag)
> -dev_t dev;
> -int flag;
> +lprclose(dev_t dev, int flag)
> {
> int unit = minor(dev);
> struct tty *tp = &lpr_tty[unit];
> @@ -157,35 +153,30 @@ u_short addr = (u_short)
> lprinfo[unit]->address;
> }
>
> int
> -lprread(dev, ior)
> -dev_t dev;
> -io_req_t ior;
> +lprread(dev_t dev, io_req_t ior)
> {
> return char_read(&lpr_tty[minor(dev)], ior);
> }
>
> int
> -lprwrite(dev, ior)
> -dev_t dev;
> -io_req_t ior;
> +lprwrite(dev_t dev, io_req_t ior)
> {
> return char_write(&lpr_tty[minor(dev)], ior);
> }
>
> int
> -lprportdeath(dev, port)
> -dev_t dev;
> -mach_port_t port;
> +lprportdeath(dev_t dev, mach_port_t port)
> {
> return (tty_portdeath(&lpr_tty[minor(dev)], (ipc_port_t)port));
> }
>
> io_return_t
> -lprgetstat(dev, flavor, data, count)
> -dev_t dev;
> -dev_flavor_t flavor;
> -dev_status_t data; /* pointer to OUT array */
> -mach_msg_type_number_t *count; /* out */
> +lprgetstat(
> + dev_t dev,
> + dev_flavor_t flavor,
> + dev_status_t data, /* pointer to OUT array */
> + mach_msg_type_number_t *count /* out */
> + )
> {
> io_return_t result = D_SUCCESS;
> int unit = minor(dev);
> diff --git a/i386/i386at/mem.c b/i386/i386at/mem.c
> index e42e995d..07acc169 100644
> --- a/i386/i386at/mem.c
> +++ b/i386/i386at/mem.c
> @@ -31,10 +31,7 @@
>
> /*ARGSUSED*/
> vm_offset_t
> -memmmap(dev, off, prot)
> -dev_t dev;
> -vm_offset_t off;
> -vm_prot_t prot;
> +memmmap(dev_t dev, vm_offset_t off, vm_prot_t prot)
> {
> if (biosmem_addr_available(off))
> return -1;
> --
> 2.34.1
