summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>2002-03-23 16:01:49 +0000
committerbde <bde@FreeBSD.org>2002-03-23 16:01:49 +0000
commit8e5d7bb37a4e4d8ae1e1fefe6ad47b7c8865400d (patch)
treebd7beb118d2c1429655390b451bdab3ec851ab01 /sys/dev
parent82395b7295123f4d9a786ebd89495ef101103a61 (diff)
downloadFreeBSD-src-8e5d7bb37a4e4d8ae1e1fefe6ad47b7c8865400d.zip
FreeBSD-src-8e5d7bb37a4e4d8ae1e1fefe6ad47b7c8865400d.tar.gz
Fixed some style bugs in the removal of __P(()). The main ones were
not removing tabs before "__P((", and not outdenting continuation lines to preserve non-KNF lining up of code with parentheses. Switch to KNF formatting and/or rewrap the whole prototype in some cases.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/cy/cy.c45
-rw-r--r--sys/dev/cy/cy_isa.c45
-rw-r--r--sys/dev/mse/mse.c33
-rw-r--r--sys/dev/rc/rc.c4
4 files changed, 60 insertions, 67 deletions
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);
/**********************************************/
OpenPOWER on IntegriCloud