PERFORCE change 54541 for review
Scott Long
scottl at FreeBSD.org
Thu Jun 10 04:54:13 GMT 2004
http://perforce.freebsd.org/chv.cgi?CH=54541
Change 54541 by scottl at scottl-esp-sparc64 on 2004/06/10 04:54:06
Remove K&R function arguments
Affected files ...
.. //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#18 edit
.. //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854.c#6 edit
.. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#19 edit
Differences ...
==== //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#18 (text+ko) ====
@@ -493,9 +493,7 @@
#endif
u_char
-esp_read_reg(sc, reg)
- struct ncr53c9x_softc *sc;
- int reg;
+esp_read_reg(struct ncr53c9x_softc *sc, int reg)
{
struct esp_softc *esc = (struct esp_softc *)sc;
u_char v;
@@ -510,10 +508,7 @@
}
void
-esp_write_reg(sc, reg, v)
- struct ncr53c9x_softc *sc;
- int reg;
- u_char v;
+esp_write_reg(struct ncr53c9x_softc *sc, int reg, u_char v)
{
struct esp_softc *esc = (struct esp_softc *)sc;
@@ -526,8 +521,7 @@
}
int
-esp_dma_isintr(sc)
- struct ncr53c9x_softc *sc;
+esp_dma_isintr(struct ncr53c9x_softc *sc)
{
struct esp_softc *esc = (struct esp_softc *)sc;
@@ -535,8 +529,7 @@
}
void
-esp_dma_reset(sc)
- struct ncr53c9x_softc *sc;
+esp_dma_reset(struct ncr53c9x_softc *sc)
{
struct esp_softc *esc = (struct esp_softc *)sc;
@@ -544,8 +537,7 @@
}
int
-esp_dma_intr(sc)
- struct ncr53c9x_softc *sc;
+esp_dma_intr(struct ncr53c9x_softc *sc)
{
struct esp_softc *esc = (struct esp_softc *)sc;
@@ -553,12 +545,8 @@
}
int
-esp_dma_setup(sc, addr, len, datain, dmasize)
- struct ncr53c9x_softc *sc;
- caddr_t *addr;
- size_t *len;
- int datain;
- size_t *dmasize;
+esp_dma_setup(struct ncr53c9x_softc *sc, caddr_t *addr, size_t *len,
+ int datain, size_t *dmasize)
{
struct esp_softc *esc = (struct esp_softc *)sc;
@@ -566,8 +554,7 @@
}
void
-esp_dma_go(sc)
- struct ncr53c9x_softc *sc;
+esp_dma_go(struct ncr53c9x_softc *sc)
{
struct esp_softc *esc = (struct esp_softc *)sc;
@@ -575,8 +562,7 @@
}
void
-esp_dma_stop(sc)
- struct ncr53c9x_softc *sc;
+esp_dma_stop(struct ncr53c9x_softc *sc)
{
struct esp_softc *esc = (struct esp_softc *)sc;
u_int32_t csr;
@@ -587,8 +573,7 @@
}
int
-esp_dma_isactive(sc)
- struct ncr53c9x_softc *sc;
+esp_dma_isactive(struct ncr53c9x_softc *sc)
{
struct esp_softc *esc = (struct esp_softc *)sc;
==== //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854.c#6 (text+ko) ====
@@ -114,8 +114,7 @@
* sc_client (one of SCSI, ENET, PP `soft_c' pointers)
*/
void
-lsi64854_attach(sc)
- struct lsi64854_softc *sc;
+lsi64854_attach(struct lsi64854_softc *sc)
{
u_int32_t csr;
@@ -250,8 +249,7 @@
} while(0)
void
-lsi64854_reset(sc)
- struct lsi64854_softc *sc;
+lsi64854_reset(struct lsi64854_softc *sc)
{
u_int32_t csr;
@@ -345,12 +343,8 @@
* setup a DMA transfer
*/
int
-lsi64854_setup(sc, addr, len, datain, dmasize)
- struct lsi64854_softc *sc;
- caddr_t *addr;
- size_t *len;
- int datain;
- size_t *dmasize; /* IN-OUT */
+lsi64854_setup(struct lsi64854_softc *sc, caddr_t *addr, size_t *len,
+ int datain, size_t *dmasize)
{
u_int32_t csr;
@@ -428,8 +422,7 @@
* return 1 if it was a DMA continue.
*/
int
-lsi64854_scsi_intr(arg)
- void *arg;
+lsi64854_scsi_intr(void *arg)
{
struct lsi64854_softc *sc = arg;
struct ncr53c9x_softc *nsc = sc->sc_client;
@@ -554,8 +547,7 @@
* Pseudo (chained) interrupt to le driver to handle DMA errors.
*/
int
-lsi64854_enet_intr(arg)
- void *arg;
+lsi64854_enet_intr(void *arg)
{
struct lsi64854_softc *sc = arg;
u_int32_t csr;
@@ -613,12 +605,8 @@
* setup a DMA transfer
*/
int
-lsi64854_setup_pp(sc, addr, len, datain, dmasize)
- struct lsi64854_softc *sc;
- caddr_t *addr;
- size_t *len;
- int datain;
- size_t *dmasize; /* IN-OUT */
+lsi64854_setup_pp(struct lsi64854_softc *sc, caddr_t *addr, size_t *len,
+ int datain, size_t *dmasize)
{
u_int32_t csr;
@@ -676,8 +664,7 @@
* Parallel port DMA interrupt.
*/
int
-lsi64854_pp_intr(arg)
- void *arg;
+lsi64854_pp_intr(void *arg)
{
struct lsi64854_softc *sc = arg;
int ret, trans, resid = 0;
==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#19 (text+ko) ====
@@ -104,7 +104,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$")
+__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
@@ -210,9 +210,7 @@
* Search linked list for LUN info by LUN id.
*/
static struct ncr53c9x_linfo *
-ncr53c9x_lunsearch(ti, lun)
- struct ncr53c9x_tinfo *ti;
- int64_t lun;
+ncr53c9x_lunsearch(struct ncr53c9x_tinfo *ti, int64_t lun)
{
struct ncr53c9x_linfo *li;
LIST_FOREACH(li, &ti->luns, link)
@@ -340,9 +338,7 @@
}
int
-ncr53c9x_detach(sc, flags)
- struct ncr53c9x_softc *sc;
- int flags;
+ncr53c9x_detach(struct ncr53c9x_softc *sc, int flags)
{
#if 0 /* don't allow detach for now */
@@ -362,8 +358,7 @@
* routine above.
*/
void
-ncr53c9x_reset(sc)
- struct ncr53c9x_softc *sc;
+ncr53c9x_reset(struct ncr53c9x_softc *sc)
{
/* reset DMA first */
@@ -436,8 +431,7 @@
* Reset the SCSI bus, but not the chip
*/
static void
-ncr53c9x_scsi_reset(sc)
- struct ncr53c9x_softc *sc;
+ncr53c9x_scsi_reset(struct ncr53c9x_softc *sc)
{
(*sc->sc_glue->gl_dma_stop)(sc);
@@ -451,9 +445,7 @@
* Initialize ncr53c9x state machine
*/
void
-ncr53c9x_init(sc, doreset)
- struct ncr53c9x_softc *sc;
- int doreset;
+ncr53c9x_init(struct ncr53c9x_softc *sc, int doreset)
{
struct ncr53c9x_ecb *ecb;
struct ncr53c9x_linfo *li;
@@ -555,8 +547,7 @@
* if an interrupt is pending.
*/
static __inline void
-ncr53c9x_readregs(sc)
- struct ncr53c9x_softc *sc;
+ncr53c9x_readregs(struct ncr53c9x_softc *sc)
{
sc->sc_espstat = NCR_READ_REG(sc, NCR_STAT);
@@ -587,9 +578,7 @@
* Convert Synchronous Transfer Period to chip register Clock Per Byte value.
*/
static __inline int
-ncr53c9x_stp2cpb(sc, period)
- struct ncr53c9x_softc *sc;
- int period;
+ncr53c9x_stp2cpb(struct ncr53c9x_softc *sc, int period)
{
int v;
v = (sc->sc_freq * period) / 250;
@@ -600,9 +589,7 @@
}
static __inline void
-ncr53c9x_setsync(sc, ti)
- struct ncr53c9x_softc *sc;
- struct ncr53c9x_tinfo *ti;
+ncr53c9x_setsync(struct ncr53c9x_softc *sc, struct ncr53c9x_tinfo *ti)
{
u_char syncoff, synctp;
u_char cfg3 = sc->sc_cfg3 | ti->cfg3;
@@ -653,9 +640,7 @@
* by DMA instead of programmed I/O soon.
*/
static void
-ncr53c9x_select(sc, ecb)
- struct ncr53c9x_softc *sc;
- struct ncr53c9x_ecb *ecb;
+ncr53c9x_select(struct ncr53c9x_softc *sc, struct ncr53c9x_ecb *ecb)
{
int target = ecb->ccb->ccb_h.target_id;
int lun = ecb->ccb->ccb_h.target_lun;
@@ -802,9 +787,7 @@
}
static void
-ncr53c9x_free_ecb(sc, ecb)
- struct ncr53c9x_softc *sc;
- struct ncr53c9x_ecb *ecb;
+ncr53c9x_free_ecb(struct ncr53c9x_softc *sc, struct ncr53c9x_ecb *ecb)
{
ecb->flags = 0;
@@ -813,8 +796,7 @@
}
static struct ncr53c9x_ecb *
-ncr53c9x_get_ecb(sc)
- struct ncr53c9x_softc *sc;
+ncr53c9x_get_ecb(struct ncr53c9x_softc *sc)
{
struct ncr53c9x_ecb *ecb;
@@ -1078,8 +1060,7 @@
* things going. Should only be called when state == NCR_IDLE and at bio pl.
*/
static void
-ncr53c9x_sched(sc)
- struct ncr53c9x_softc *sc;
+ncr53c9x_sched(struct ncr53c9x_softc *sc)
{
struct ncr53c9x_ecb *ecb;
struct ncr53c9x_tinfo *ti;
@@ -1167,9 +1148,7 @@
}
static void
-ncr53c9x_sense(sc, ecb)
- struct ncr53c9x_softc *sc;
- struct ncr53c9x_ecb *ecb;
+ncr53c9x_sense(struct ncr53c9x_softc *sc, struct ncr53c9x_ecb *ecb)
{
union ccb *ccb = ecb->ccb;
struct ncr53c9x_tinfo *ti;
@@ -1213,9 +1192,7 @@
* POST PROCESSING OF SCSI_CMD (usually current)
*/
static void
-ncr53c9x_done(sc, ecb)
- struct ncr53c9x_softc *sc;
- struct ncr53c9x_ecb *ecb;
+ncr53c9x_done(struct ncr53c9x_softc *sc, struct ncr53c9x_ecb *ecb)
{
union ccb *ccb = ecb->ccb;
struct ncr53c9x_tinfo *ti;
@@ -1304,9 +1281,7 @@
}
static void
-ncr53c9x_dequeue(sc, ecb)
- struct ncr53c9x_softc *sc;
- struct ncr53c9x_ecb *ecb;
+ncr53c9x_dequeue(struct ncr53c9x_softc *sc, struct ncr53c9x_ecb *ecb)
{
struct ncr53c9x_tinfo *ti;
struct ncr53c9x_linfo *li;
@@ -1461,10 +1436,8 @@
}
static int
-ncr53c9x_reselect(sc, message, tagtype, tagid)
- struct ncr53c9x_softc *sc;
- int message;
- int tagtype, tagid;
+ncr53c9x_reselect(struct ncr53c9x_softc *sc, int message, int tagtype,
+ int tagid)
{
u_char selid, target, lun;
struct ncr53c9x_ecb *ecb = NULL;
@@ -1577,8 +1550,7 @@
* byte in the FIFO
*/
static void
-ncr53c9x_msgin(sc)
- struct ncr53c9x_softc *sc;
+ncr53c9x_msgin(struct ncr53c9x_softc *sc)
{
NCR_TRACE(("[ncr53c9x_msgin(curmsglen:%ld)] ", (long)sc->sc_imlen));
@@ -1917,8 +1889,7 @@
* Send the highest priority, scheduled message
*/
static void
-ncr53c9x_msgout(sc)
- struct ncr53c9x_softc *sc;
+ncr53c9x_msgout(struct ncr53c9x_softc *sc)
{
struct ncr53c9x_tinfo *ti;
struct ncr53c9x_ecb *ecb;
@@ -2086,8 +2057,7 @@
* Most of this needs verifying.
*/
void
-ncr53c9x_intr(arg)
- void *arg;
+ncr53c9x_intr(void *arg)
{
struct ncr53c9x_softc *sc = arg;
struct ncr53c9x_ecb *ecb;
@@ -2884,8 +2854,7 @@
}
static void
-ncr53c9x_timeout(arg)
- void *arg;
+ncr53c9x_timeout(void *arg)
{
struct ncr53c9x_ecb *ecb = arg;
union ccb *ccb = ecb->ccb;
@@ -2935,8 +2904,7 @@
}
static void
-ncr53c9x_watch(arg)
- void *arg;
+ncr53c9x_watch(void *arg)
{
struct ncr53c9x_softc *sc = (struct ncr53c9x_softc *)arg;
struct ncr53c9x_tinfo *ti;
More information about the p4-projects
mailing list