Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/ic Use ANSI function decls.
details: https://anonhg.NetBSD.org/src/rev/2dc9519f5a0c
branches: trunk
changeset: 570123:2dc9519f5a0c
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Sat Sep 25 09:46:17 2004 +0000
description:
Use ANSI function decls.
diffstat:
sys/dev/ic/fmv.c | 12 +-
sys/dev/ic/fmvvar.h | 6 +-
sys/dev/ic/iha.c | 217 ++++++++++++++-----------------------------------
sys/dev/ic/mc146818.c | 23 +---
sys/dev/ic/osiop.c | 76 +++++-----------
5 files changed, 102 insertions(+), 232 deletions(-)
diffs (truncated from 1016 to 300 lines):
diff -r 314fc4fe8961 -r 2dc9519f5a0c sys/dev/ic/fmv.c
--- a/sys/dev/ic/fmv.c Sat Sep 25 08:27:47 2004 +0000
+++ b/sys/dev/ic/fmv.c Sat Sep 25 09:46:17 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fmv.c,v 1.3 2002/11/30 14:15:11 tsutsui Exp $ */
+/* $NetBSD: fmv.c,v 1.4 2004/09/25 09:46:17 tsutsui Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fmv.c,v 1.3 2002/11/30 14:15:11 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fmv.c,v 1.4 2004/09/25 09:46:17 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,10 +53,7 @@
* Determine type and ethernet address.
*/
int
-fmv_detect(iot, ioh, enaddr)
- bus_space_tag_t iot;
- bus_space_handle_t ioh;
- u_int8_t *enaddr;
+fmv_detect(bus_space_tag_t iot, bus_space_handle_t ioh, u_int8_t *enaddr)
{
int model, id, type;
@@ -104,8 +101,7 @@
}
void
-fmv_attach(sc)
- struct mb86960_softc *sc;
+fmv_attach(struct mb86960_softc *sc)
{
bus_space_tag_t iot;
bus_space_handle_t ioh;
diff -r 314fc4fe8961 -r 2dc9519f5a0c sys/dev/ic/fmvvar.h
--- a/sys/dev/ic/fmvvar.h Sat Sep 25 08:27:47 2004 +0000
+++ b/sys/dev/ic/fmvvar.h Sat Sep 25 09:46:17 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fmvvar.h,v 1.1 2002/10/05 15:16:12 tsutsui Exp $ */
+/* $NetBSD: fmvvar.h,v 1.2 2004/09/25 09:46:17 tsutsui Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -31,5 +31,5 @@
* incurred with its use.
*/
-int fmv_detect __P((bus_space_tag_t, bus_space_handle_t, u_int8_t *));
-void fmv_attach __P((struct mb86960_softc *));
+int fmv_detect(bus_space_tag_t, bus_space_handle_t, u_int8_t *);
+void fmv_attach(struct mb86960_softc *);
diff -r 314fc4fe8961 -r 2dc9519f5a0c sys/dev/ic/iha.c
--- a/sys/dev/ic/iha.c Sat Sep 25 08:27:47 2004 +0000
+++ b/sys/dev/ic/iha.c Sat Sep 25 09:46:17 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iha.c,v 1.24 2003/11/02 11:07:45 wiz Exp $ */
+/* $NetBSD: iha.c,v 1.25 2004/09/25 09:46:17 tsutsui Exp $ */
/*-
* Device driver for the INI-9XXXU/UW or INIC-940/950 PCI SCSI Controller.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iha.c,v 1.24 2003/11/02 11:07:45 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iha.c,v 1.25 2004/09/25 09:46:17 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -217,9 +217,7 @@
* everything possible.
*/
static void
-iha_append_free_scb(sc, scb)
- struct iha_softc *sc;
- struct iha_scb *scb;
+iha_append_free_scb(struct iha_softc *sc, struct iha_scb *scb)
{
int s;
@@ -250,10 +248,7 @@
}
static void
-iha_append_done_scb(sc, scb, hastat)
- struct iha_softc *sc;
- struct iha_scb *scb;
- u_int8_t hastat;
+iha_append_done_scb(struct iha_softc *sc, struct iha_scb *scb, u_int8_t hastat)
{
struct tcs *tcs;
int s;
@@ -283,8 +278,7 @@
}
static __inline struct iha_scb *
-iha_pop_done_scb(sc)
- struct iha_softc *sc;
+iha_pop_done_scb(struct iha_softc *sc)
{
struct iha_scb *scb;
int s;
@@ -310,8 +304,7 @@
* is an active SCB, return NULL!
*/
static struct iha_scb *
-iha_find_pend_scb(sc)
- struct iha_softc *sc;
+iha_find_pend_scb(struct iha_softc *sc)
{
struct iha_scb *scb;
struct tcs *tcs;
@@ -365,9 +358,7 @@
}
static __inline void
-iha_append_pend_scb(sc, scb)
- struct iha_softc *sc;
- struct iha_scb *scb;
+iha_append_pend_scb(struct iha_softc *sc, struct iha_scb *scb)
{
/* ASSUMPTION: only called within a splbio()/splx() pair */
@@ -380,9 +371,7 @@
}
static __inline void
-iha_push_pend_scb(sc, scb)
- struct iha_softc *sc;
- struct iha_scb *scb;
+iha_push_pend_scb(struct iha_softc *sc, struct iha_scb *scb)
{
int s;
@@ -402,9 +391,7 @@
* iha_del_pend_scb - remove scb from sc_pendscb
*/
static __inline void
-iha_del_pend_scb(sc, scb)
- struct iha_softc *sc;
- struct iha_scb *scb;
+iha_del_pend_scb(struct iha_softc *sc, struct iha_scb *scb)
{
int s;
@@ -416,8 +403,7 @@
}
static __inline void
-iha_mark_busy_scb(scb)
- struct iha_scb *scb;
+iha_mark_busy_scb(struct iha_scb *scb)
{
int s;
@@ -438,9 +424,7 @@
* one which turns off/on the specified signals.
*/
static __inline void
-iha_set_ssig(sc, offsigs, onsigs)
- struct iha_softc *sc;
- u_int8_t offsigs, onsigs;
+iha_set_ssig(struct iha_softc *sc, u_int8_t offsigs, u_int8_t onsigs)
{
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
@@ -454,8 +438,7 @@
* iha_intr - the interrupt service routine for the iha driver
*/
int
-iha_intr(arg)
- void *arg;
+iha_intr(void *arg)
{
bus_space_tag_t iot;
bus_space_handle_t ioh;
@@ -488,8 +471,7 @@
}
void
-iha_attach(sc)
- struct iha_softc *sc;
+iha_attach(struct iha_softc *sc)
{
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
@@ -622,8 +604,7 @@
* iha_alloc_sglist - allocate and map sglist for SCB's
*/
static int
-iha_alloc_sglist(sc)
- struct iha_softc *sc;
+iha_alloc_sglist(struct iha_softc *sc)
{
bus_dma_segment_t seg;
int error, rseg;
@@ -667,10 +648,8 @@
}
void
-iha_scsipi_request(chan, req, arg)
- struct scsipi_channel *chan;
- scsipi_adapter_req_t req;
- void *arg;
+iha_scsipi_request(struct scsipi_channel *chan, scsipi_adapter_req_t req,
+ void *arg)
{
struct scsipi_xfer *xs;
struct scsipi_periph *periph;
@@ -780,9 +759,7 @@
}
void
-iha_update_xfer_mode(sc, target)
- struct iha_softc *sc;
- int target;
+iha_update_xfer_mode(struct iha_softc *sc, int target)
{
struct tcs *tcs = &sc->sc_tcs[target];
struct scsipi_xfer_mode xm;
@@ -805,8 +782,7 @@
}
static void
-iha_reset_scsi_bus(sc)
- struct iha_softc *sc;
+iha_reset_scsi_bus(struct iha_softc *sc)
{
struct iha_scb *scb;
struct tcs *tcs;
@@ -837,8 +813,7 @@
}
void
-iha_reset_chip(sc)
- struct iha_softc *sc;
+iha_reset_chip(struct iha_softc *sc)
{
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
@@ -860,8 +835,7 @@
* iha_reset_dma - abort any active DMA xfer, reset tulip FIFO.
*/
static void
-iha_reset_dma(sc)
- struct iha_softc *sc;
+iha_reset_dma(struct iha_softc *sc)
{
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
@@ -884,9 +858,7 @@
* the other bits are fixed at initialization.
*/
static void
-iha_reset_tcs(tcs, config0)
- struct tcs *tcs;
- u_int8_t config0;
+iha_reset_tcs(struct tcs *tcs, u_int8_t config0)
{
tcs->flags &= ~(FLAG_SYNC_DONE | FLAG_WIDE_DONE);
@@ -905,8 +877,7 @@
* SCB's that can be started.
*/
static void
-iha_main(sc)
- struct iha_softc *sc;
+iha_main(struct iha_softc *sc)
{
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh =sc->sc_ioh;
@@ -935,8 +906,7 @@
* start another SCB currently in the pending queue.
*/
static void
-iha_scsi(sc)
- struct iha_softc *sc;
+iha_scsi(struct iha_softc *sc)
{
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
@@ -1031,10 +1001,7 @@
}
static void
-iha_select(sc, scb, select_type)
- struct iha_softc *sc;
- struct iha_scb *scb;
- u_int8_t select_type;
+iha_select(struct iha_softc *sc, struct iha_scb *scb, u_int8_t select_type)
{
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
@@ -1083,9 +1050,7 @@
Home |
Main Index |
Thread Index |
Old Index