diff options
-rw-r--r-- | sys/amd64/amd64/fpu.c | 40 | ||||
-rw-r--r-- | sys/amd64/isa/icu.h | 4 | ||||
-rw-r--r-- | sys/amd64/isa/npx.c | 40 | ||||
-rw-r--r-- | sys/dev/cy/cy.c | 45 | ||||
-rw-r--r-- | sys/dev/cy/cy_isa.c | 45 | ||||
-rw-r--r-- | sys/dev/mse/mse.c | 33 | ||||
-rw-r--r-- | sys/dev/rc/rc.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/cy.c | 45 | ||||
-rw-r--r-- | sys/i386/isa/icu.h | 4 | ||||
-rw-r--r-- | sys/i386/isa/if_rdp.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/mse.c | 33 | ||||
-rw-r--r-- | sys/i386/isa/npx.c | 40 | ||||
-rw-r--r-- | sys/i386/isa/rc.c | 4 |
13 files changed, 164 insertions, 177 deletions
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 50dfb9e..43b012c 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -118,20 +118,20 @@ #else /* not __GNUC__ */ -void fldcw (caddr_t addr); -void fnclex (void); -void fninit (void); -void fnsave (caddr_t addr); -void fnstcw (caddr_t addr); -void fnstsw (caddr_t addr); -void fp_divide_by_0 (void); -void frstor (caddr_t addr); +void fldcw(caddr_t addr); +void fnclex(void); +void fninit(void); +void fnsave(caddr_t addr); +void fnstcw(caddr_t addr); +void fnstsw(caddr_t addr); +void fp_divide_by_0(void); +void frstor(caddr_t addr); #ifdef CPU_ENABLE_SSE -void fxsave (caddr_t addr); -void fxrstor (caddr_t addr); +void fxsave(caddr_t addr); +void fxrstor(caddr_t addr); #endif -void start_emulating (void); -void stop_emulating (void); +void start_emulating(void); +void stop_emulating(void); #endif /* __GNUC__ */ @@ -159,17 +159,17 @@ void stop_emulating (void); typedef u_char bool_t; -static int npx_attach (device_t dev); -static void npx_identify (driver_t *driver, device_t parent); +static int npx_attach(device_t dev); +static void npx_identify(driver_t *driver, device_t parent); #ifndef SMP -static void npx_intr (void *); +static void npx_intr(void *); #endif -static int npx_probe (device_t dev); -static void fpusave (union savefpu *); -static void fpurstor (union savefpu *); +static int npx_probe(device_t dev); +static void fpusave(union savefpu *); +static void fpurstor(union savefpu *); #ifdef I586_CPU_XXX -static long timezero (const char *funcname, - void (*func)(void *buf, size_t len)); +static long timezero(const char *funcname, + void (*func)(void *buf, size_t len)); #endif /* I586_CPU */ int hw_float; /* XXX currently just alias for npx_exists */ diff --git a/sys/amd64/isa/icu.h b/sys/amd64/isa/icu.h index 36d532a..b73495a 100644 --- a/sys/amd64/isa/icu.h +++ b/sys/amd64/isa/icu.h @@ -55,8 +55,8 @@ * DO NOT access imen directly, use INTREN()/INTRDIS(). */ -void INTREN (u_int); -void INTRDIS (u_int); +void INTREN(u_int); +void INTRDIS(u_int); #ifdef APIC_IO extern unsigned apic_imen; /* APIC interrupt mask enable */ diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c index 50dfb9e..43b012c 100644 --- a/sys/amd64/isa/npx.c +++ b/sys/amd64/isa/npx.c @@ -118,20 +118,20 @@ #else /* not __GNUC__ */ -void fldcw (caddr_t addr); -void fnclex (void); -void fninit (void); -void fnsave (caddr_t addr); -void fnstcw (caddr_t addr); -void fnstsw (caddr_t addr); -void fp_divide_by_0 (void); -void frstor (caddr_t addr); +void fldcw(caddr_t addr); +void fnclex(void); +void fninit(void); +void fnsave(caddr_t addr); +void fnstcw(caddr_t addr); +void fnstsw(caddr_t addr); +void fp_divide_by_0(void); +void frstor(caddr_t addr); #ifdef CPU_ENABLE_SSE -void fxsave (caddr_t addr); -void fxrstor (caddr_t addr); +void fxsave(caddr_t addr); +void fxrstor(caddr_t addr); #endif -void start_emulating (void); -void stop_emulating (void); +void start_emulating(void); +void stop_emulating(void); #endif /* __GNUC__ */ @@ -159,17 +159,17 @@ void stop_emulating (void); typedef u_char bool_t; -static int npx_attach (device_t dev); -static void npx_identify (driver_t *driver, device_t parent); +static int npx_attach(device_t dev); +static void npx_identify(driver_t *driver, device_t parent); #ifndef SMP -static void npx_intr (void *); +static void npx_intr(void *); #endif -static int npx_probe (device_t dev); -static void fpusave (union savefpu *); -static void fpurstor (union savefpu *); +static int npx_probe(device_t dev); +static void fpusave(union savefpu *); +static void fpurstor(union savefpu *); #ifdef I586_CPU_XXX -static long timezero (const char *funcname, - void (*func)(void *buf, size_t len)); +static long timezero(const char *funcname, + void (*func)(void *buf, size_t len)); #endif /* I586_CPU */ int hw_float; /* XXX currently just alias for npx_exists */ diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index ee164d8..dc523c2 100644 --- a/sys/dev/cy/cy.c +++ b/sys/dev/cy/cy.c @@ -344,38 +344,37 @@ struct com_s { }; /* PCI driver entry point. */ -int cyattach_common (cy_addr cy_iobase, int cy_align); +int cyattach_common(cy_addr cy_iobase, int cy_align); ointhand2_t siointr; -static int cy_units (cy_addr cy_iobase, int cy_align); -static int sioattach (struct isa_device *dev); +static int cy_units(cy_addr cy_iobase, int cy_align); +static int sioattach(struct isa_device *dev); static void cd1400_channel_cmd(struct com_s *com, int cmd); static void cd1400_channel_cmd_wait(struct com_s *com); -static void cd_etc (struct com_s *com, int etc); -static int cd_getreg (struct com_s *com, int reg); -static void cd_setreg (struct com_s *com, int reg, int val); +static void cd_etc(struct com_s *com, int etc); +static int cd_getreg(struct com_s *com, int reg); +static void cd_setreg(struct com_s *com, int reg, int val); static timeout_t siodtrwakeup; -static void comhardclose (struct com_s *com); -static void sioinput (struct com_s *com); +static void comhardclose(struct com_s *com); +static void sioinput(struct com_s *com); #if 0 -static void siointr1 (struct com_s *com); -#endif -static int commctl (struct com_s *com, int bits, int how); -static int comparam (struct tty *tp, struct termios *t); -static void siopoll (void *arg); -static int sioprobe (struct isa_device *dev); -static void siosettimeout (void); -static int siosetwater (struct com_s *com, speed_t speed); -static int comspeed (speed_t speed, u_long cy_clock, - int *prescaler_io); -static void comstart (struct tty *tp); -static void comstop (struct tty *tp, int rw); +static void siointr1(struct com_s *com); +#endif +static int commctl(struct com_s *com, int bits, int how); +static int comparam(struct tty *tp, struct termios *t); +static void siopoll(void *arg); +static int sioprobe(struct isa_device *dev); +static void siosettimeout(void); +static int siosetwater(struct com_s *com, speed_t speed); +static int comspeed(speed_t speed, u_long cy_clock, int *prescaler_io); +static void comstart(struct tty *tp); +static void comstop(struct tty *tp, int rw); static timeout_t comwakeup; -static void disc_optim (struct tty *tp, struct termios *t, - struct com_s *com); +static void disc_optim(struct tty *tp, struct termios *t, + struct com_s *com); #ifdef CyDebug -void cystatus (int unit); +void cystatus(int unit); #endif static char driver_name[] = "cy"; diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c index ee164d8..dc523c2 100644 --- a/sys/dev/cy/cy_isa.c +++ b/sys/dev/cy/cy_isa.c @@ -344,38 +344,37 @@ struct com_s { }; /* PCI driver entry point. */ -int cyattach_common (cy_addr cy_iobase, int cy_align); +int cyattach_common(cy_addr cy_iobase, int cy_align); ointhand2_t siointr; -static int cy_units (cy_addr cy_iobase, int cy_align); -static int sioattach (struct isa_device *dev); +static int cy_units(cy_addr cy_iobase, int cy_align); +static int sioattach(struct isa_device *dev); static void cd1400_channel_cmd(struct com_s *com, int cmd); static void cd1400_channel_cmd_wait(struct com_s *com); -static void cd_etc (struct com_s *com, int etc); -static int cd_getreg (struct com_s *com, int reg); -static void cd_setreg (struct com_s *com, int reg, int val); +static void cd_etc(struct com_s *com, int etc); +static int cd_getreg(struct com_s *com, int reg); +static void cd_setreg(struct com_s *com, int reg, int val); static timeout_t siodtrwakeup; -static void comhardclose (struct com_s *com); -static void sioinput (struct com_s *com); +static void comhardclose(struct com_s *com); +static void sioinput(struct com_s *com); #if 0 -static void siointr1 (struct com_s *com); -#endif -static int commctl (struct com_s *com, int bits, int how); -static int comparam (struct tty *tp, struct termios *t); -static void siopoll (void *arg); -static int sioprobe (struct isa_device *dev); -static void siosettimeout (void); -static int siosetwater (struct com_s *com, speed_t speed); -static int comspeed (speed_t speed, u_long cy_clock, - int *prescaler_io); -static void comstart (struct tty *tp); -static void comstop (struct tty *tp, int rw); +static void siointr1(struct com_s *com); +#endif +static int commctl(struct com_s *com, int bits, int how); +static int comparam(struct tty *tp, struct termios *t); +static void siopoll(void *arg); +static int sioprobe(struct isa_device *dev); +static void siosettimeout(void); +static int siosetwater(struct com_s *com, speed_t speed); +static int comspeed(speed_t speed, u_long cy_clock, int *prescaler_io); +static void comstart(struct tty *tp); +static void comstop(struct tty *tp, int rw); static timeout_t comwakeup; -static void disc_optim (struct tty *tp, struct termios *t, - struct com_s *com); +static void disc_optim(struct tty *tp, struct termios *t, + struct com_s *com); #ifdef CyDebug -void cystatus (int unit); +void cystatus(int unit); #endif static char driver_name[] = "cy"; diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c index 258847b..317b6cc 100644 --- a/sys/dev/mse/mse.c +++ b/sys/dev/mse/mse.c @@ -80,12 +80,11 @@ typedef struct mse_softc { bus_space_handle_t sc_ioh; void *sc_ih; void (*sc_enablemouse)(bus_space_tag_t t, - bus_space_handle_t h); + bus_space_handle_t h); void (*sc_disablemouse)(bus_space_tag_t t, - bus_space_handle_t h); - void (*sc_getmouse)(bus_space_tag_t t, - bus_space_handle_t h, - int *dx, int *dy, int *but); + bus_space_handle_t h); + void (*sc_getmouse)(bus_space_tag_t t, bus_space_handle_t h, + int *dx, int *dy, int *but); int sc_deltax; int sc_deltay; int sc_obuttons; @@ -216,12 +215,11 @@ static timeout_t msetimeout; static int mse_probelogi(device_t dev, mse_softc_t *sc); static void mse_disablelogi(bus_space_tag_t t, - bus_space_handle_t h); -static void mse_getlogi(bus_space_tag_t t, - bus_space_handle_t h, - int *dx, int *dy, int *but); + bus_space_handle_t h); +static void mse_getlogi(bus_space_tag_t t, bus_space_handle_t h, + int *dx, int *dy, int *but); static void mse_enablelogi(bus_space_tag_t t, - bus_space_handle_t h); + bus_space_handle_t h); /* * ATI Inport mouse definitions @@ -235,13 +233,10 @@ static void mse_enablelogi(bus_space_tag_t t, #define MSE_INPORT_INTREN 0x09 static int mse_probeati(device_t dev, mse_softc_t *sc); -static void mse_enableati(bus_space_tag_t t, - bus_space_handle_t h); -static void mse_disableati(bus_space_tag_t t, - bus_space_handle_t h); -static void mse_getati(bus_space_tag_t t, - bus_space_handle_t h, - int *dx, int *dy, int *but); +static void mse_enableati(bus_space_tag_t t, bus_space_handle_t h); +static void mse_disableati(bus_space_tag_t t, bus_space_handle_t h); +static void mse_getati(bus_space_tag_t t, bus_space_handle_t h, + int *dx, int *dy, int *but); #define MSEPRI (PZERO + 3) @@ -258,8 +253,8 @@ static struct mse_types { /* Start routine */ void (*m_disable)(bus_space_tag_t t, bus_space_handle_t h); /* Disable interrupts routine */ - void (*m_get)(bus_space_tag_t t, bus_space_handle_t h, - int *dx, int *dy, int *but); + void (*m_get)(bus_space_tag_t t, bus_space_handle_t h, int *dx, + int *dy, int *but); /* and get mouse status */ mousehw_t m_hw; /* buttons iftype type model hwid */ mousemode_t m_mode; /* proto rate res accel level size mask */ diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c index 63b608f..43f77f9 100644 --- a/sys/dev/rc/rc.c +++ b/sys/dev/rc/rc.c @@ -182,14 +182,14 @@ static int rc_modctl(struct rc_chans *, int, int); static void rc_start(struct tty *); static void rc_stop(struct tty *, int rw); static int rc_param(struct tty *, struct termios *); -static void rcpoll (void *); +static void rcpoll(void *); static void rc_reinit(struct rc_softc *); #ifdef RCDEBUG static void printrcflags(); #endif static timeout_t rc_dtrwakeup; static timeout_t rc_wakeup; -static void disc_optim (struct tty *tp, struct termios *t, struct rc_chans *); +static void disc_optim(struct tty *tp, struct termios *t, struct rc_chans *); static void rc_wait0(int nec, int unit, int chan, int line); /**********************************************/ diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c index ee164d8..dc523c2 100644 --- a/sys/i386/isa/cy.c +++ b/sys/i386/isa/cy.c @@ -344,38 +344,37 @@ struct com_s { }; /* PCI driver entry point. */ -int cyattach_common (cy_addr cy_iobase, int cy_align); +int cyattach_common(cy_addr cy_iobase, int cy_align); ointhand2_t siointr; -static int cy_units (cy_addr cy_iobase, int cy_align); -static int sioattach (struct isa_device *dev); +static int cy_units(cy_addr cy_iobase, int cy_align); +static int sioattach(struct isa_device *dev); static void cd1400_channel_cmd(struct com_s *com, int cmd); static void cd1400_channel_cmd_wait(struct com_s *com); -static void cd_etc (struct com_s *com, int etc); -static int cd_getreg (struct com_s *com, int reg); -static void cd_setreg (struct com_s *com, int reg, int val); +static void cd_etc(struct com_s *com, int etc); +static int cd_getreg(struct com_s *com, int reg); +static void cd_setreg(struct com_s *com, int reg, int val); static timeout_t siodtrwakeup; -static void comhardclose (struct com_s *com); -static void sioinput (struct com_s *com); +static void comhardclose(struct com_s *com); +static void sioinput(struct com_s *com); #if 0 -static void siointr1 (struct com_s *com); -#endif -static int commctl (struct com_s *com, int bits, int how); -static int comparam (struct tty *tp, struct termios *t); -static void siopoll (void *arg); -static int sioprobe (struct isa_device *dev); -static void siosettimeout (void); -static int siosetwater (struct com_s *com, speed_t speed); -static int comspeed (speed_t speed, u_long cy_clock, - int *prescaler_io); -static void comstart (struct tty *tp); -static void comstop (struct tty *tp, int rw); +static void siointr1(struct com_s *com); +#endif +static int commctl(struct com_s *com, int bits, int how); +static int comparam(struct tty *tp, struct termios *t); +static void siopoll(void *arg); +static int sioprobe(struct isa_device *dev); +static void siosettimeout(void); +static int siosetwater(struct com_s *com, speed_t speed); +static int comspeed(speed_t speed, u_long cy_clock, int *prescaler_io); +static void comstart(struct tty *tp); +static void comstop(struct tty *tp, int rw); static timeout_t comwakeup; -static void disc_optim (struct tty *tp, struct termios *t, - struct com_s *com); +static void disc_optim(struct tty *tp, struct termios *t, + struct com_s *com); #ifdef CyDebug -void cystatus (int unit); +void cystatus(int unit); #endif static char driver_name[] = "cy"; diff --git a/sys/i386/isa/icu.h b/sys/i386/isa/icu.h index 36d532a..b73495a 100644 --- a/sys/i386/isa/icu.h +++ b/sys/i386/isa/icu.h @@ -55,8 +55,8 @@ * DO NOT access imen directly, use INTREN()/INTRDIS(). */ -void INTREN (u_int); -void INTRDIS (u_int); +void INTREN(u_int); +void INTRDIS(u_int); #ifdef APIC_IO extern unsigned apic_imen; /* APIC interrupt mask enable */ diff --git a/sys/i386/isa/if_rdp.c b/sys/i386/isa/if_rdp.c index 531455f..1611ab8 100644 --- a/sys/i386/isa/if_rdp.c +++ b/sys/i386/isa/if_rdp.c @@ -166,8 +166,8 @@ static u_short allowed_ouis[] = { /* * ISA bus support. */ -static int rdp_probe (struct isa_device *); -static int rdp_attach (struct isa_device *); +static int rdp_probe(struct isa_device *); +static int rdp_attach(struct isa_device *); /* * Required entry points. diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c index 258847b..317b6cc 100644 --- a/sys/i386/isa/mse.c +++ b/sys/i386/isa/mse.c @@ -80,12 +80,11 @@ typedef struct mse_softc { bus_space_handle_t sc_ioh; void *sc_ih; void (*sc_enablemouse)(bus_space_tag_t t, - bus_space_handle_t h); + bus_space_handle_t h); void (*sc_disablemouse)(bus_space_tag_t t, - bus_space_handle_t h); - void (*sc_getmouse)(bus_space_tag_t t, - bus_space_handle_t h, - int *dx, int *dy, int *but); + bus_space_handle_t h); + void (*sc_getmouse)(bus_space_tag_t t, bus_space_handle_t h, + int *dx, int *dy, int *but); int sc_deltax; int sc_deltay; int sc_obuttons; @@ -216,12 +215,11 @@ static timeout_t msetimeout; static int mse_probelogi(device_t dev, mse_softc_t *sc); static void mse_disablelogi(bus_space_tag_t t, - bus_space_handle_t h); -static void mse_getlogi(bus_space_tag_t t, - bus_space_handle_t h, - int *dx, int *dy, int *but); + bus_space_handle_t h); +static void mse_getlogi(bus_space_tag_t t, bus_space_handle_t h, + int *dx, int *dy, int *but); static void mse_enablelogi(bus_space_tag_t t, - bus_space_handle_t h); + bus_space_handle_t h); /* * ATI Inport mouse definitions @@ -235,13 +233,10 @@ static void mse_enablelogi(bus_space_tag_t t, #define MSE_INPORT_INTREN 0x09 static int mse_probeati(device_t dev, mse_softc_t *sc); -static void mse_enableati(bus_space_tag_t t, - bus_space_handle_t h); -static void mse_disableati(bus_space_tag_t t, - bus_space_handle_t h); -static void mse_getati(bus_space_tag_t t, - bus_space_handle_t h, - int *dx, int *dy, int *but); +static void mse_enableati(bus_space_tag_t t, bus_space_handle_t h); +static void mse_disableati(bus_space_tag_t t, bus_space_handle_t h); +static void mse_getati(bus_space_tag_t t, bus_space_handle_t h, + int *dx, int *dy, int *but); #define MSEPRI (PZERO + 3) @@ -258,8 +253,8 @@ static struct mse_types { /* Start routine */ void (*m_disable)(bus_space_tag_t t, bus_space_handle_t h); /* Disable interrupts routine */ - void (*m_get)(bus_space_tag_t t, bus_space_handle_t h, - int *dx, int *dy, int *but); + void (*m_get)(bus_space_tag_t t, bus_space_handle_t h, int *dx, + int *dy, int *but); /* and get mouse status */ mousehw_t m_hw; /* buttons iftype type model hwid */ mousemode_t m_mode; /* proto rate res accel level size mask */ diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c index 50dfb9e..43b012c 100644 --- a/sys/i386/isa/npx.c +++ b/sys/i386/isa/npx.c @@ -118,20 +118,20 @@ #else /* not __GNUC__ */ -void fldcw (caddr_t addr); -void fnclex (void); -void fninit (void); -void fnsave (caddr_t addr); -void fnstcw (caddr_t addr); -void fnstsw (caddr_t addr); -void fp_divide_by_0 (void); -void frstor (caddr_t addr); +void fldcw(caddr_t addr); +void fnclex(void); +void fninit(void); +void fnsave(caddr_t addr); +void fnstcw(caddr_t addr); +void fnstsw(caddr_t addr); +void fp_divide_by_0(void); +void frstor(caddr_t addr); #ifdef CPU_ENABLE_SSE -void fxsave (caddr_t addr); -void fxrstor (caddr_t addr); +void fxsave(caddr_t addr); +void fxrstor(caddr_t addr); #endif -void start_emulating (void); -void stop_emulating (void); +void start_emulating(void); +void stop_emulating(void); #endif /* __GNUC__ */ @@ -159,17 +159,17 @@ void stop_emulating (void); typedef u_char bool_t; -static int npx_attach (device_t dev); -static void npx_identify (driver_t *driver, device_t parent); +static int npx_attach(device_t dev); +static void npx_identify(driver_t *driver, device_t parent); #ifndef SMP -static void npx_intr (void *); +static void npx_intr(void *); #endif -static int npx_probe (device_t dev); -static void fpusave (union savefpu *); -static void fpurstor (union savefpu *); +static int npx_probe(device_t dev); +static void fpusave(union savefpu *); +static void fpurstor(union savefpu *); #ifdef I586_CPU_XXX -static long timezero (const char *funcname, - void (*func)(void *buf, size_t len)); +static long timezero(const char *funcname, + void (*func)(void *buf, size_t len)); #endif /* I586_CPU */ int hw_float; /* XXX currently just alias for npx_exists */ diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c index 63b608f..43f77f9 100644 --- a/sys/i386/isa/rc.c +++ b/sys/i386/isa/rc.c @@ -182,14 +182,14 @@ static int rc_modctl(struct rc_chans *, int, int); static void rc_start(struct tty *); static void rc_stop(struct tty *, int rw); static int rc_param(struct tty *, struct termios *); -static void rcpoll (void *); +static void rcpoll(void *); static void rc_reinit(struct rc_softc *); #ifdef RCDEBUG static void printrcflags(); #endif static timeout_t rc_dtrwakeup; static timeout_t rc_wakeup; -static void disc_optim (struct tty *tp, struct termios *t, struct rc_chans *); +static void disc_optim(struct tty *tp, struct termios *t, struct rc_chans *); static void rc_wait0(int nec, int unit, int chan, int line); /**********************************************/ |