DragonFly BSD
DragonFly submit List (threaded) for 2005-11
[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]

/sys/bus cleanup

From: Alexey Slynko <slynko@xxxxxxxxx>
Date: Wed, 23 Nov 2005 21:58:21 +0300
Hi,

1)Ansify function definitions 
Index: cam/scsi/scsi_low.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/bus/cam/scsi/scsi_low.c,v
retrieving revision 1.13
diff -u -r1.13 scsi_low.c
--- cam/scsi/scsi_low.c	2 Jun 2005 20:40:31 -0000	1.13
+++ cam/scsi/scsi_low.c	23 Nov 2005 16:05:53 -0000
@@ -209,8 +209,7 @@
 SCSI_LOW_INLINE void scsi_low_init_msgsys (struct scsi_low_softc *, struct targ_info *);
 
 SCSI_LOW_INLINE void
-scsi_low_activate_qtag(cb)
-	struct slccb *cb;
+scsi_low_activate_qtag(struct slccb *cb)
 {
 	struct lun_info *li = cb->li;
 
@@ -222,8 +221,7 @@
 }
 	
 SCSI_LOW_INLINE void
-scsi_low_deactivate_qtag(cb)
-	struct slccb *cb;
+scsi_low_deactivate_qtag(struct slccb *cb)
 {
 	struct lun_info *li = cb->li;
 
@@ -235,9 +233,7 @@
 }
 	
 SCSI_LOW_INLINE void
-scsi_low_ccb_message_exec(slp, cb)
-	struct scsi_low_softc *slp;
-	struct slccb *cb;
+scsi_low_ccb_message_exec(struct scsi_low_softc *slp, struct slccb *cb)
 {
 
 	scsi_low_assert_msg(slp, cb->ti, cb->ccb_msgoutflag, 0);
@@ -245,32 +241,26 @@
 }
 
 SCSI_LOW_INLINE void
-scsi_low_ccb_message_assert(cb, msg)
-	struct slccb *cb;
-	u_int msg;
+scsi_low_ccb_message_assert(struct slccb *cb, u_int msg)
 {
 
 	cb->ccb_msgoutflag = cb->ccb_omsgoutflag = msg;
 }
 
 SCSI_LOW_INLINE void
-scsi_low_ccb_message_retry(cb)
-	struct slccb *cb;
+scsi_low_ccb_message_retry(struct slccb *cb)
 {
 	cb->ccb_msgoutflag = cb->ccb_omsgoutflag;
 }
 
 SCSI_LOW_INLINE void
-scsi_low_ccb_message_clear(cb)
-	struct slccb *cb;
+scsi_low_ccb_message_clear(struct slccb *cb)
 {
 	cb->ccb_msgoutflag = 0;
 }
 
 SCSI_LOW_INLINE void
-scsi_low_init_msgsys(slp, ti)
-	struct scsi_low_softc *slp;
-	struct targ_info *ti;
+scsi_low_init_msgsys(struct scsi_low_softc *slp, struct targ_info *ti)
 {
 
 	ti->ti_msginptr = 0;
@@ -304,10 +294,7 @@
 static int scsi_low_translate_error_code (struct slccb *, struct scsi_low_error_code *);
 
 static struct slccb *
-scsi_low_find_ccb(slp, target, lun, osdep)
-	struct scsi_low_softc *slp;
-	u_int target, lun;
-	void *osdep;
+scsi_low_find_ccb(struct scsi_low_softc *slp, u_int target, u_int lun, void *osdep)
 {
 	struct targ_info *ti;
 	struct lun_info *li;
@@ -338,9 +325,7 @@
 }
 
 static int 
-scsi_low_translate_error_code(cb, tp)
-	struct slccb *cb;
-	struct scsi_low_error_code *tp;
+scsi_low_translate_error_code(struct slccb *cb, struct scsi_low_error_code *tp)
 {
 
 	if (cb->ccb_error == 0)
@@ -403,8 +388,7 @@
 #define	SCSI_LOW_CAM_POLL_HZ	1000	/* OK ? */
 
 static void
-scsi_low_poll_cam(sim)
-	struct cam_sim *sim;
+scsi_low_poll_cam(struct cam_sim *sim)
 {
 	struct scsi_low_softc *slp = SIM2SLP(sim);
 
@@ -419,9 +403,7 @@
 }
 
 static void
-scsi_low_cam_rescan_callback(periph, ccb)
-	struct cam_periph *periph;
-	union ccb *ccb;
+scsi_low_cam_rescan_callback(struct cam_periph *periph, union ccb *ccb)
 {
 
 	xpt_free_path(ccb->ccb_h.path);
@@ -429,8 +411,7 @@
 }
 
 static void
-scsi_low_rescan_bus_cam(slp)
-	struct scsi_low_softc *slp;
+scsi_low_rescan_bus_cam(struct scsi_low_softc *slp)
 {
   	struct cam_path *path;
 	union ccb *ccb = malloc(sizeof(union ccb), M_DEVBUF, M_INTWAIT | M_ZERO);
@@ -449,9 +430,7 @@
 }
 
 void
-scsi_low_scsi_action_cam(sim, ccb)
-	struct cam_sim *sim;
-	union ccb *ccb;
+scsi_low_scsi_action_cam(struct cam_sim *sim, union ccb *ccb)
 {
 	struct scsi_low_softc *slp = SIM2SLP(sim);
 	struct targ_info *ti;
@@ -851,8 +830,7 @@
 }
 
 static int
-scsi_low_attach_cam(slp)
-	struct scsi_low_softc *slp;
+scsi_low_attach_cam(struct scsi_low_softc *slp)
 {
 	struct cam_devq *devq;
 	int tagged_openings;
@@ -898,8 +876,7 @@
 }
 
 static int
-scsi_low_world_start_cam(slp)
-	struct scsi_low_softc *slp;
+scsi_low_world_start_cam(struct scsi_low_softc *slp)
 {
 
 	if (!cold)
@@ -908,8 +885,7 @@
 }
 
 static int
-scsi_low_dettach_cam(slp)
-	struct scsi_low_softc *slp;
+scsi_low_dettach_cam(struct scsi_low_softc *slp)
 {
 
 	xpt_async(AC_LOST_DEVICE, slp->sl_si.path, NULL);
@@ -921,9 +897,7 @@
 }
 
 static int
-scsi_low_ccb_setup_cam(slp, cb)
-	struct scsi_low_softc *slp;
-	struct slccb *cb;
+scsi_low_ccb_setup_cam(struct scsi_low_softc *slp, struct slccb *cb)
 {
         union ccb *ccb = (union ccb *) cb->osdep;
 
@@ -947,9 +921,7 @@
 }
 
 static int
-scsi_low_done_cam(slp, cb)
-	struct scsi_low_softc *slp;
-	struct slccb *cb;
+scsi_low_done_cam(struct scsi_low_softc *slp, struct slccb *cb)
 {
 	union ccb *ccb;
 
@@ -1005,10 +977,7 @@
 }
 
 static void
-scsi_low_timeout_cam(slp, ch, action)
-	struct scsi_low_softc *slp;
-	int ch;
-	int action;
+scsi_low_timeout_cam(struct scsi_low_softc *slp, int ch, int action)
 {
 
 	switch (ch)
@@ -1047,8 +1016,7 @@
  * scsi low deactivate and activate
  **************************************************************/
 int
-scsi_low_is_busy(slp)
-	struct scsi_low_softc *slp;
+scsi_low_is_busy(struct scsi_low_softc *slp)
 {
 
 	if (slp->sl_nio > 0)
@@ -1057,8 +1025,7 @@
 }
 
 int
-scsi_low_deactivate(slp)
-	struct scsi_low_softc *slp;
+scsi_low_deactivate(struct scsi_low_softc *slp)
 {
 	crit_enter();
 	slp->sl_flags |= HW_INACTIVE;
@@ -1071,8 +1038,7 @@
 }
 
 int
-scsi_low_activate(slp)
-	struct scsi_low_softc *slp;
+scsi_low_activate(struct scsi_low_softc *slp)
 {
 	int error;
 
@@ -1102,18 +1068,14 @@
 static void scsi_low_msg_log_show (struct scsi_low_msg_log *, char *, int);
 
 static void
-scsi_low_msg_log_init(slmlp)
-	struct scsi_low_msg_log *slmlp;
+scsi_low_msg_log_init(struct scsi_low_msg_log *slmlp)
 {
 
 	slmlp->slml_ptr = 0;
 }
 
 static void
-scsi_low_msg_log_write(slmlp, datap, len)
-	struct scsi_low_msg_log *slmlp;
-	u_int8_t *datap;
-	int len;
+scsi_low_msg_log_write(struct scsi_low_msg_log *slmlp, u_int8_t *datap, int len)
 {
 	int ptr, ind;
 
@@ -1128,10 +1090,7 @@
 }
 	
 static void
-scsi_low_msg_log_show(slmlp, s, len)
-	struct scsi_low_msg_log *slmlp;
-	char *s;
-	int len;
+scsi_low_msg_log_show(struct scsi_low_msg_log *slmlp, char *s, int len)
 {
 	int ptr, ind;
 
@@ -1153,8 +1112,7 @@
  * power control
  **************************************************************/
 static void
-scsi_low_engage(arg)
-	void *arg;
+scsi_low_engage(void *arg)
 {
 	struct scsi_low_softc *slp = arg;
 
@@ -1182,9 +1140,7 @@
 }
 
 static int
-scsi_low_init(slp, flags)
-	struct scsi_low_softc *slp;
-	u_int flags;
+scsi_low_init(struct scsi_low_softc *slp, u_int flags)
 {
 	int rv = 0;
 
@@ -1222,10 +1178,7 @@
  * allocate lun_info
  **************************************************************/
 static struct lun_info *
-scsi_low_alloc_li(ti, lun, alloc)
-	struct targ_info *ti;
-	int lun;
-	int alloc;
+scsi_low_alloc_li(struct targ_info *ti, int lun, int alloc)
 {
 	struct scsi_low_softc *slp = ti->ti_sc;
 	struct lun_info *li;
@@ -1283,9 +1236,7 @@
  * allocate targ_info
  **************************************************************/
 static struct targ_info *
-scsi_low_alloc_ti(slp, targ)
-	struct scsi_low_softc *slp;
-	int targ;
+scsi_low_alloc_ti(struct scsi_low_softc *slp, int targ)
 {
 	struct targ_info *ti;
 
@@ -1321,8 +1272,7 @@
 }
 
 static void
-scsi_low_free_ti(slp)
-	struct scsi_low_softc *slp;
+scsi_low_free_ti(struct scsi_low_softc *slp)
 {
 	struct targ_info *ti, *tib;
 	struct lun_info *li, *nli;
@@ -1354,8 +1304,7 @@
  * timeout
  **************************************************************/
 void
-scsi_low_bus_idle(slp)
-	struct scsi_low_softc *slp;
+scsi_low_bus_idle(struct scsi_low_softc *slp)
 {
 
 	slp->sl_retry_sel = 0;
@@ -1364,8 +1313,7 @@
 }
 
 static void
-scsi_low_timeout(arg)
-	void *arg;
+scsi_low_timeout(void *arg)
 {
 	struct scsi_low_softc *slp = arg;
 
@@ -1377,8 +1325,7 @@
 }
 
 static int
-scsi_low_timeout_check(slp)
-	struct scsi_low_softc *slp;
+scsi_low_timeout_check(struct scsi_low_softc *slp)
 {
 	struct targ_info *ti;
 	struct lun_info *li;
@@ -1492,9 +1439,7 @@
 
 
 static int
-scsi_low_abort_ccb(slp, cb)
-	struct scsi_low_softc *slp;
-	struct slccb *cb;
+scsi_low_abort_ccb(struct scsi_low_softc *slp, struct slccb *cb)
 {
 	struct targ_info *ti;
 	struct lun_info *li;
@@ -1544,9 +1489,8 @@
  * Generic SCSI INTERFACE
  **************************************************************/
 int
-scsi_low_attach(slp, openings, ntargs, nluns, targsize, lunsize)
-	struct scsi_low_softc *slp;
-	int openings, ntargs, nluns, targsize, lunsize;
+scsi_low_attach(struct scsi_low_softc *slp, int openings, int ntargs, int nluns,
+		int targsize, int lunsize)
 {
 	struct targ_info *ti;
 	struct lun_info *li;
@@ -1638,8 +1582,7 @@
 }
 
 int
-scsi_low_dettach(slp)
-	struct scsi_low_softc *slp;
+scsi_low_dettach(struct scsi_low_softc *slp)
 {
 	int rv;
 
@@ -1669,12 +1612,9 @@
  * Generic enqueue
  **************************************************************/
 static int
-scsi_low_enqueue(slp, ti, li, cb, flags, msg)
-	struct scsi_low_softc *slp;
-	struct targ_info *ti;
-	struct lun_info *li;
-	struct slccb *cb;
-	u_int flags, msg;
+scsi_low_enqueue(struct scsi_low_softc *slp, struct targ_info *ti,
+		 struct lun_info *li, struct slccb *cb, u_int flags,
+		 u_int msg)
 {	
 
 	cb->ti = ti;
@@ -1706,11 +1646,8 @@
 }
 
 static int
-scsi_low_message_enqueue(slp, ti, li, flags)
-	struct scsi_low_softc *slp;
-	struct targ_info *ti;
-	struct lun_info *li;
-	u_int flags;
+scsi_low_message_enqueue(struct scsi_low_softc *slp, struct targ_info *ti,
+			 struct lun_info *li, u_int flags)
 {
 	struct slccb *cb;
 	u_int tmsgflags;
@@ -1743,8 +1680,7 @@
 static int scsi_low_resume (struct scsi_low_softc *);
 
 static void
-scsi_low_unit_ready_cmd(cb)
-	struct slccb *cb;
+scsi_low_unit_ready_cmd(struct slccb *cb)
 {
 
 	cb->ccb_scp.scp_cmd = unit_ready_cmd;
@@ -1755,11 +1691,8 @@
 }
 
 static int
-scsi_low_sense_abort_start(slp, ti, li, cb)
-	struct scsi_low_softc *slp;
-	struct targ_info *ti;
-	struct lun_info *li;
-	struct slccb *cb;
+scsi_low_sense_abort_start(struct scsi_low_softc *slp, struct targ_info *ti,
+			   struct lun_info *li, struct slccb *cb)
 {
 
 	cb->ccb_scp.scp_cmdlen = 6;
@@ -1788,11 +1721,8 @@
 }
 
 static int
-scsi_low_setup_start(slp, ti, li, cb)
-	struct scsi_low_softc *slp;
-	struct targ_info *ti;
-	struct lun_info *li;
-	struct slccb *cb;
+scsi_low_setup_start(struct scsi_low_softc *slp, struct targ_info *ti,
+		     struct lun_info *li, struct slccb *cb)
 {
 
 	switch(li->li_state)
@@ -1835,8 +1765,7 @@
 }
 
 static int
-scsi_low_resume(slp)
-	struct scsi_low_softc *slp;
+scsi_low_resume(struct scsi_low_softc *slp)
 {
 
 	if (slp->sl_flags & HW_RESUME)
@@ -1856,8 +1785,7 @@
 }
 
 static void
-scsi_low_start(slp)
-	struct scsi_low_softc *slp;
+scsi_low_start(struct scsi_low_softc *slp)
 {
 	struct targ_info *ti;
 	struct lun_info *li;
@@ -2004,9 +1932,7 @@
 }
 
 void
-scsi_low_arbit_fail(slp, cb)
-	struct scsi_low_softc *slp;
-	struct slccb *cb;
+scsi_low_arbit_fail(struct scsi_low_softc *slp, struct slccb *cb)
 {
 	struct targ_info *ti = cb->ti;
 
@@ -2028,9 +1954,7 @@
 }
 
 static void
-scsi_low_bus_release(slp, ti)
-	struct scsi_low_softc *slp;
-	struct targ_info *ti;
+scsi_low_bus_release(struct scsi_low_softc *slp, struct targ_info *ti)
 {
 
 	if (ti->ti_disc > 0)
@@ -2058,9 +1982,7 @@
 }
 
 static int
-scsi_low_setup_done(slp, cb)
-	struct scsi_low_softc *slp;
-	struct slccb *cb;
+scsi_low_setup_done(struct scsi_low_softc *slp, struct slccb *cb)
 {
 	struct targ_info *ti;
 	struct lun_info *li;
@@ -2180,9 +2102,7 @@
 }
 
 static int
-scsi_low_done(slp, cb)
-	struct scsi_low_softc *slp;
-	struct slccb *cb;
+scsi_low_done(struct scsi_low_softc *slp, struct slccb *cb)
 {
 	int rv;
 
@@ -2337,10 +2257,8 @@
  * Reset
  **************************************************************/
 static void
-scsi_low_reset_nexus_target(slp, ti, fdone)
-	struct scsi_low_softc *slp;
-	struct targ_info *ti;
-	int fdone;
+scsi_low_reset_nexus_target(struct scsi_low_softc *slp, struct targ_info *ti,
+			    int fdone)
 {
 	struct lun_info *li;
 
@@ -2387,9 +2305,7 @@
 }
 
 static void
-scsi_low_reset_nexus(slp, fdone)
-	struct scsi_low_softc *slp;
-	int fdone;
+scsi_low_reset_nexus(struct scsi_low_softc *slp, int fdone)
 {
 	struct targ_info *ti;
 	struct slccb *cb, *topcb;
@@ -2438,8 +2354,7 @@
 }
 
 void
-scsi_low_bus_reset(slp)
-	struct scsi_low_softc *slp;
+scsi_low_bus_reset(struct scsi_low_softc *slp)
 {
 	int i;
 
@@ -2453,10 +2368,7 @@
 }
 
 int
-scsi_low_restart(slp, flags, s)
-	struct scsi_low_softc *slp;
-	int flags;
-	u_char *s;
+scsi_low_restart(struct scsi_low_softc *slp, int flags, u_char *s)
 {
 	int error;
 
@@ -2476,10 +2388,7 @@
 #define	MSGCMD_LUN(msg)	(msg & 0x07)
 
 static struct slccb *
-scsi_low_establish_ccb(ti, li, tag)
-	struct targ_info *ti;
-	struct lun_info *li;
-	scsi_low_tag_t tag;
+scsi_low_establish_ccb(struct targ_info *ti, struct lun_info *li, scsi_low_tag_t tag)
 {
 	struct scsi_low_softc *slp = ti->ti_sc;
 	struct slccb *cb;
@@ -2538,9 +2447,7 @@
 }
 
 struct targ_info *
-scsi_low_reselected(slp, targ)
-	struct scsi_low_softc *slp;
-	u_int targ;
+scsi_low_reselected(struct scsi_low_softc *slp, u_int targ)
 {
 	struct targ_info *ti;
 	struct slccb *cb;
@@ -2613,9 +2520,7 @@
  * cmd out pointer setup
  **************************************************************/
 int
-scsi_low_cmd(slp, ti)
-	struct scsi_low_softc *slp;
-	struct targ_info *ti;
+scsi_low_cmd(struct scsi_low_softc *slp, struct targ_info *ti)
 {
 	struct slccb *cb = slp->sl_Qnexus;
 	
@@ -2650,11 +2555,8 @@
  * data out pointer setup
  **************************************************************/
 int
-scsi_low_data(slp, ti, bp, direction)
-	struct scsi_low_softc *slp;
-	struct targ_info *ti;
-	struct buf **bp;
-	int direction;
+scsi_low_data(struct scsi_low_softc *slp, struct targ_info *ti,
+	      struct buf **bp, int direction)
 {
 	struct slccb *cb = slp->sl_Qnexus;
 
@@ -2809,8 +2711,7 @@
  * msgout
  **************************************************************/
 static int
-scsi_low_msgfunc_synch(slp)
-	struct scsi_low_softc *slp;
+scsi_low_msgfunc_synch(struct scsi_low_softc *slp)
 {
 	struct targ_info *ti = slp->sl_Tnexus;
 	int ptr = ti->ti_msgoutlen;
@@ -2823,8 +2724,7 @@
 }
 
 static int
-scsi_low_msgfunc_wide(slp)
-	struct scsi_low_softc *slp;
+scsi_low_msgfunc_wide(struct scsi_low_softc *slp)
 {
 	struct targ_info *ti = slp->sl_Tnexus;
 	int ptr = ti->ti_msgoutlen;
@@ -2836,8 +2736,7 @@
 }
 
 static int
-scsi_low_msgfunc_identify(slp)
-	struct scsi_low_softc *slp;
+scsi_low_msgfunc_identify(struct scsi_low_softc *slp)
 {
 	struct targ_info *ti = slp->sl_Tnexus;
 	struct lun_info *li = slp->sl_Lnexus;
@@ -2873,8 +2772,7 @@
 }
 
 static int
-scsi_low_msgfunc_abort(slp)
-	struct scsi_low_softc *slp;
+scsi_low_msgfunc_abort(struct scsi_low_softc *slp)
 {
 
 	SCSI_LOW_SETUP_MSGPHASE(slp, MSGPH_ABORT);
@@ -2882,8 +2780,7 @@
 }
 
 static int
-scsi_low_msgfunc_qabort(slp)
-	struct scsi_low_softc *slp;
+scsi_low_msgfunc_qabort(struct scsi_low_softc *slp)
 {
 
 	SCSI_LOW_SETUP_MSGPHASE(slp, MSGPH_TERM);
@@ -2891,8 +2788,7 @@
 }
 
 static int
-scsi_low_msgfunc_reset(slp)
-	struct scsi_low_softc *slp;
+scsi_low_msgfunc_reset(struct scsi_low_softc *slp)
 {
 
 	SCSI_LOW_SETUP_MSGPHASE(slp, MSGPH_RESET);
@@ -2900,8 +2796,7 @@
 }
 
 static int
-scsi_low_msgfunc_qtag(slp)
-	struct scsi_low_softc *slp;
+scsi_low_msgfunc_qtag(struct scsi_low_softc *slp)
 {
 	struct targ_info *ti = slp->sl_Tnexus;
 	struct slccb *cb = slp->sl_Qnexus;
@@ -2928,9 +2823,7 @@
  * responces in msgin (after msgout).
  */
 static int
-scsi_low_errfunc_identify(slp, msgflags)
-	struct scsi_low_softc *slp;
-	u_int msgflags;
+scsi_low_errfunc_identify(struct scsi_low_softc *slp, u_int msgflags)
 {
 
 	if (slp->sl_Lnexus != NULL)
@@ -2942,9 +2835,7 @@
 }
 
 static int
-scsi_low_errfunc_synch(slp, msgflags)
-	struct scsi_low_softc *slp;
-	u_int msgflags;
+scsi_low_errfunc_synch(struct scsi_low_softc *slp, u_int msgflags)
 {
 	struct targ_info *ti = slp->sl_Tnexus;
 
@@ -2955,9 +2846,7 @@
 }
 
 static int
-scsi_low_errfunc_wide(slp, msgflags)
-	struct scsi_low_softc *slp;
-	u_int msgflags;
+scsi_low_errfunc_wide(struct scsi_low_softc *slp, u_int msgflags)
 {
 	struct targ_info *ti = slp->sl_Tnexus;
 
@@ -2967,9 +2856,7 @@
 }
 
 static int
-scsi_low_errfunc_qtag(slp, msgflags)
-	struct scsi_low_softc *slp;
-	u_int msgflags;
+scsi_low_errfunc_qtag(struct scsi_low_softc *slp, u_int msgflags)
 {
 
 	if ((msgflags & SCSI_LOW_MSG_REJECT) != 0)
@@ -2990,10 +2877,7 @@
 
 
 int
-scsi_low_msgout(slp, ti, fl)
-	struct scsi_low_softc *slp;
-	struct targ_info *ti;
-	u_int fl;
+scsi_low_msgout(struct scsi_low_softc *slp, struct targ_info *ti, u_int fl)
 {
 	struct scsi_low_msgout_data *mdp;
 	int len = 0;
@@ -3095,16 +2979,14 @@
  * msgin
  **************************************************************/
 static int
-scsi_low_msginfunc_noop(slp)
-	struct scsi_low_softc *slp;
+scsi_low_msginfunc_noop(struct scsi_low_softc *slp)
 {
 
 	return 0;
 }
 
 static int
-scsi_low_msginfunc_rejop(slp)
-	struct scsi_low_softc *slp;
+scsi_low_msginfunc_rejop(struct scsi_low_softc *slp)
 {
 	struct targ_info *ti = slp->sl_Tnexus;
 	u_int8_t msg = ti->ti_msgin[0];
@@ -3115,8 +2997,7 @@
 }
 
 static int
-scsi_low_msginfunc_cc(slp)
-	struct scsi_low_softc *slp;
+scsi_low_msginfunc_cc(struct scsi_low_softc *slp)
 {
 	struct lun_info *li;
 
@@ -3162,8 +3043,7 @@
 }
 
 static int
-scsi_low_msginfunc_lcc(slp)
-	struct scsi_low_softc *slp;
+scsi_low_msginfunc_lcc(struct scsi_low_softc *slp)
 {
 	struct targ_info *ti;
 	struct lun_info *li;
@@ -3248,8 +3128,7 @@
 }
 
 static int
-scsi_low_msginfunc_disc(slp)
-	struct scsi_low_softc *slp;
+scsi_low_msginfunc_disc(struct scsi_low_softc *slp)
 {
 
 	SCSI_LOW_SETUP_MSGPHASE(slp, MSGPH_DISC);
@@ -3257,8 +3136,7 @@
 }
 
 static int
-scsi_low_msginfunc_sdp(slp)
-	struct scsi_low_softc *slp;
+scsi_low_msginfunc_sdp(struct scsi_low_softc *slp)
 {
 	struct slccb *cb = slp->sl_Qnexus;
 
@@ -3273,8 +3151,7 @@
 }
 
 static int
-scsi_low_msginfunc_rp(slp)
-	struct scsi_low_softc *slp;
+scsi_low_msginfunc_rp(struct scsi_low_softc *slp)
 {
 
 	if (slp->sl_Qnexus != NULL)
@@ -3285,8 +3162,7 @@
 }
 
 static int
-scsi_low_synch(slp)
-	struct scsi_low_softc *slp;
+scsi_low_synch(struct scsi_low_softc *slp)
 {
 	struct targ_info *ti = slp->sl_Tnexus;
 	u_int period = 0, offset = 0, speed;
@@ -3360,8 +3236,7 @@
 }
 
 static int
-scsi_low_wide(slp)
-	struct scsi_low_softc *slp;
+scsi_low_wide(struct scsi_low_softc *slp)
 {
 	struct targ_info *ti = slp->sl_Tnexus;
 	int error;
@@ -3403,8 +3278,7 @@
 }
 
 static int
-scsi_low_msginfunc_simple_qtag(slp)
-	struct scsi_low_softc *slp;
+scsi_low_msginfunc_simple_qtag(struct scsi_low_softc *slp)
 {
 	struct targ_info *ti = slp->sl_Tnexus;
 	scsi_low_tag_t etag = (scsi_low_tag_t) ti->ti_msgin[1];
@@ -3433,8 +3307,7 @@
 }
 
 static int
-scsi_low_msginfunc_i_wide_residue(slp)
-	struct scsi_low_softc *slp;
+scsi_low_msginfunc_i_wide_residue(struct scsi_low_softc *slp)
 {
 	struct targ_info *ti = slp->sl_Tnexus;
 	struct slccb *cb = slp->sl_Qnexus;
@@ -3455,8 +3328,7 @@
 }
 
 static int
-scsi_low_msginfunc_ext(slp)
-	struct scsi_low_softc *slp;
+scsi_low_msginfunc_ext(struct scsi_low_softc *slp)
 {
 	struct slccb *cb = slp->sl_Qnexus;
 	struct lun_info *li = slp->sl_Lnexus;
@@ -3521,8 +3393,7 @@
 }
 
 static int
-scsi_low_msginfunc_parity(slp)
-	struct scsi_low_softc *slp;
+scsi_low_msginfunc_parity(struct scsi_low_softc *slp)
 {
 	struct targ_info *ti = slp->sl_Tnexus;
 
@@ -3532,8 +3403,7 @@
 }
 
 static int
-scsi_low_msginfunc_msg_reject(slp)
-	struct scsi_low_softc *slp;
+scsi_low_msginfunc_msg_reject(struct scsi_low_softc *slp)
 {
 	struct targ_info *ti = slp->sl_Tnexus;
 	struct scsi_low_msgout_data *mdp;
@@ -3566,10 +3436,7 @@
 }
 
 int
-scsi_low_msgin(slp, ti, c)
-	struct scsi_low_softc *slp;
-	struct targ_info *ti;
-	u_int c;
+scsi_low_msgin(struct scsi_low_softc *slp, struct targ_info *ti, u_int c)
 {
 	struct scsi_low_msgin_data *sdp;
 	struct lun_info *li;
@@ -3710,9 +3577,7 @@
  * disconnect
  **********************************************************/
 int
-scsi_low_disconnected(slp, ti)
-	struct scsi_low_softc *slp;
-	struct targ_info *ti;
+scsi_low_disconnected(struct scsi_low_softc *slp, struct targ_info *ti)
 {
 	struct slccb *cb = slp->sl_Qnexus;
 
@@ -3807,8 +3672,7 @@
  * TAG operations
  **********************************************************/
 int
-scsi_low_alloc_qtag(cb)
-	struct slccb *cb;
+scsi_low_alloc_qtag(struct slccb *cb)
 {
 	struct lun_info *li = cb->li;
 	scsi_low_tag_t etag;
@@ -3844,8 +3708,7 @@
 }
 	
 int
-scsi_low_dealloc_qtag(cb)
-	struct slccb *cb;
+scsi_low_dealloc_qtag(struct slccb *cb)
 {
 	struct lun_info *li = cb->li;
 	scsi_low_tag_t etag;
@@ -3875,10 +3738,7 @@
 }
 
 struct slccb *
-scsi_low_revoke_ccb(slp, cb, fdone)
-	struct scsi_low_softc *slp;
-	struct slccb *cb;
-	int fdone;
+scsi_low_revoke_ccb(struct scsi_low_softc *slp, struct slccb *cb, int fdone)
 {
 	struct targ_info *ti = cb->ti;
 	struct lun_info *li = cb->li;
@@ -3928,10 +3788,7 @@
 }
 
 void
-scsi_low_reset_nexus_lun(slp, li, fdone)
-	struct scsi_low_softc *slp;
-	struct lun_info *li;
-	int fdone;
+scsi_low_reset_nexus_lun(struct scsi_low_softc *slp, struct lun_info *li, int fdone)
 {
 	struct slccb *cb, *ncb, *ecb;
 
@@ -3968,8 +3825,7 @@
  * Qurik setup
  **************************************************************/
 static void
-	struct lun_info *li;
+scsi_low_calcf_lun(struct lun_info *li)
 {
 	struct targ_info *ti = li->li_ti;
 	struct scsi_low_softc *slp = ti->ti_sc;
@@ -4032,8 +3888,7 @@
 }
 
 static void
-scsi_low_calcf_target(ti)
-	struct targ_info *ti;
+scsi_low_calcf_target(struct targ_info *ti)
 {
 	struct scsi_low_softc *slp = ti->ti_sc;
 	u_int offset, period, diskflags;
@@ -4091,8 +3946,7 @@
 }
 
 static void
-scsi_low_calcf_show(li)
-	struct lun_info *li;
+scsi_low_calcf_show(struct lun_info *li)
 {
 	struct targ_info *ti = li->li_ti;
 	struct scsi_low_softc *slp = ti->ti_sc;
@@ -4112,8 +3966,7 @@
 static int scsi_low_poll (struct scsi_low_softc *, struct slccb *);
 
 static int
-scsi_low_start_up(slp)
-	struct scsi_low_softc *slp;
+scsi_low_start_up(struct scsi_low_softc *slp)
 {
 	struct targ_info *ti;
 	struct lun_info *li;
@@ -4174,9 +4027,7 @@
 }
 
 static int
-scsi_low_poll(slp, cb)
-	struct scsi_low_softc *slp;
-	struct slccb *cb;
+scsi_low_poll(struct scsi_low_softc *slp, struct slccb *cb)
 {
 	int tcount;
 
@@ -4202,10 +4053,8 @@
  **********************************************************/
 #ifdef	SCSI_LOW_DEBUG
 static void
-scsi_low_test_abort(slp, ti, li)
-	struct scsi_low_softc *slp;
-	struct targ_info *ti;
-	struct lun_info *li;
+scsi_low_test_abort(struct scsi_low_softc *slp, struct targ_info *ti,
+		    struct lun_info *li)
 {
 	struct slccb *acb;
 
@@ -4221,10 +4070,7 @@
 }
 
 static void
-scsi_low_test_atten(slp, ti, msg)
-	struct scsi_low_softc *slp;
-	struct targ_info *ti;
-	u_int msg;
+scsi_low_test_atten(struct scsi_low_softc *slp, struct targ_info *ti, u_int msg)
 {
 
 	if (slp->sl_ph_count < SCSI_LOW_MAX_ATTEN_CHECK)
@@ -4234,9 +4080,7 @@
 }
 
 static void
-scsi_low_test_cmdlnk(slp, cb)
-	struct scsi_low_softc *slp;
-	struct slccb *cb;
+scsi_low_test_cmdlnk(struct scsi_low_softc *slp, struct slccb *cb)
 {
 #define	SCSI_LOW_CMDLNK_NOK	(CCB_INTERNAL | CCB_SENSE | CCB_CLEARQ)
 
@@ -4250,11 +4094,9 @@
 }
 #endif	/* SCSI_LOW_DEBUG */
 
-/* static */ void
-scsi_low_info(slp, ti, s)
-	struct scsi_low_softc *slp;
-	struct targ_info *ti;
-	u_char *s;
+/* static */
+void
+scsi_low_info(struct scsi_low_softc *slp, struct targ_info *ti, u_char *s)
 {
 
 	if (slp == NULL)
@@ -4284,9 +4126,7 @@
 };
 
 void
-scsi_low_print(slp, ti)
-	struct scsi_low_softc *slp;
-	struct targ_info *ti;
+scsi_low_print(struct scsi_low_softc *slp, struct targ_info *ti)
 {
 	struct lun_info *li;
 	struct slccb *cb;
Index: cam/scsi/scsi_low.h
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/bus/cam/scsi/scsi_low.h,v
retrieving revision 1.8
diff -u -r1.8 scsi_low.h
--- cam/scsi/scsi_low.h	2 Jun 2005 20:40:31 -0000	1.8
+++ cam/scsi/scsi_low.h	23 Nov 2005 15:27:58 -0000
@@ -706,17 +706,14 @@
 static __inline int scsi_low_is_disconnect_ok (struct slccb *);
 
 static __inline int
-scsi_low_is_msgout_continue(ti, mask)
-	struct targ_info *ti;
-	u_int mask;
+scsi_low_is_msgout_continue(struct targ_info *ti, u_int mask)
 {
 	
 	return ((ti->ti_msgflags & (~mask)) != 0);
 }
 
 static __inline int
-scsi_low_is_disconnect_ok(cb)
-	struct slccb *cb;
+scsi_low_is_disconnect_ok(struct slccb *cb)
 {
 
 	return ((cb->li->li_flags & SCSI_LOW_DISC) != 0 &&
@@ -724,8 +721,7 @@
 }
 
 static __inline void
-scsi_low_attention(slp)
-	struct scsi_low_softc *slp;
+scsi_low_attention(struct scsi_low_softc *slp)
 {
 
 	if (slp->sl_atten != 0)
@@ -736,11 +732,7 @@
 }
 
 static __inline int
-scsi_low_assert_msg(slp, ti, msg, now)
-	struct scsi_low_softc *slp;
-	struct targ_info *ti;
-	u_int msg;
-	int now;
+scsi_low_assert_msg(struct scsi_low_softc *slp, struct targ_info *ti, u_int msg, int now)
 {
 
 	ti->ti_msgflags |= msg;
@@ -750,16 +742,14 @@
 }
 
 static __inline void
-scsi_low_arbit_win(slp)
-	struct scsi_low_softc *slp;
+scsi_low_arbit_win(struct scsi_low_softc *slp)
 {
 
 	slp->sl_selid = NULL;
 }
 
 static __inline void
-scsi_low_data_finish(slp)
-	struct scsi_low_softc *slp;
+scsi_low_data_finish(struct scsi_low_softc *slp)
 {
 
 	if (slp->sl_Qnexus != NULL)
@@ -769,10 +759,7 @@
 }
 
 static __inline int
-scsi_low_statusin(slp, ti, c)
-	struct scsi_low_softc *slp;
-	struct targ_info *ti;
-	u_int c;
+scsi_low_statusin(struct scsi_low_softc *slp, struct targ_info *ti, u_int c)
 {
 
 	slp->sl_ph_count ++;
Index: cam/scsi/scsi_low_pisa.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/bus/cam/scsi/scsi_low_pisa.c,v
retrieving revision 1.5
diff -u -r1.5 scsi_low_pisa.c
--- cam/scsi/scsi_low_pisa.c	17 Sep 2004 01:50:06 -0000	1.5
+++ cam/scsi/scsi_low_pisa.c	23 Nov 2005 16:04:40 -0000
@@ -46,8 +46,7 @@
 #include <bus/cam/scsi/scsi_low_pisa.h>
 
 int
-scsi_low_deactivate_pisa(sc)
-	struct scsi_low_softc *sc;
+scsi_low_deactivate_pisa(struct scsi_low_softc *sc)
 {
 
 	if (scsi_low_deactivate(sc) != 0)
@@ -56,9 +55,7 @@
 }
 
 int
-scsi_low_activate_pisa(sc, flags)
-	struct scsi_low_softc *sc;
-	int flags;
+scsi_low_activate_pisa(struct scsi_low_softc *sc, int flags)
 {
 
 	sc->sl_cfgflags = ((sc->sl_cfgflags & 0xffff0000) |

[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]