Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/scsipi - De-__P.
details: https://anonhg.NetBSD.org/src/rev/4789687d44fc
branches: trunk
changeset: 569474:4789687d44fc
user: thorpej <thorpej%NetBSD.org@localhost>
date: Sat Aug 21 20:40:36 2004 +0000
description:
- De-__P.
- Use ANSI function decls.
diffstat:
sys/dev/scsipi/scsiconf.h | 16 +-
sys/dev/scsipi/scsipi_base.h | 26 +--
sys/dev/scsipi/scsipiconf.h | 275 +++++++++++++++++-------------------------
sys/dev/scsipi/ssvar.h | 22 +-
sys/dev/scsipi/stvar.h | 10 +-
5 files changed, 147 insertions(+), 202 deletions(-)
diffs (truncated from 571 to 300 lines):
diff -r 6a1783d1040c -r 4789687d44fc sys/dev/scsipi/scsiconf.h
--- a/sys/dev/scsipi/scsiconf.h Sat Aug 21 18:58:31 2004 +0000
+++ b/sys/dev/scsipi/scsiconf.h Sat Aug 21 20:40:36 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: scsiconf.h,v 1.50 2003/01/06 21:02:18 matt Exp $ */
+/* $NetBSD: scsiconf.h,v 1.51 2004/08/21 20:40:36 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
#include <dev/scsipi/scsipiconf.h>
-int scsiprint __P((void *, const char *));
+int scsiprint(void *, const char *);
struct scsibus_softc {
struct device sc_dev;
@@ -72,11 +72,11 @@
extern const struct scsipi_bustype scsi_bustype;
-int scsi_change_def __P((struct scsipi_periph *, int));
-void scsi_kill_pending __P((struct scsipi_periph *));
-void scsi_print_addr __P((struct scsipi_periph *));
-int scsi_probe_bus __P((struct scsibus_softc *, int, int));
-int scsi_scsipi_cmd __P((struct scsipi_periph *, struct scsipi_generic *,
- int, void *, size_t, int, int, struct buf *, int));
+int scsi_change_def(struct scsipi_periph *, int);
+void scsi_kill_pending(struct scsipi_periph *);
+void scsi_print_addr(struct scsipi_periph *);
+int scsi_probe_bus(struct scsibus_softc *, int, int);
+int scsi_scsipi_cmd(struct scsipi_periph *, struct scsipi_generic *,
+ int, void *, size_t, int, int, struct buf *, int);
#endif /* _DEV_SCSIPI_SCSICONF_H_ */
diff -r 6a1783d1040c -r 4789687d44fc sys/dev/scsipi/scsipi_base.h
--- a/sys/dev/scsipi/scsipi_base.h Sat Aug 21 18:58:31 2004 +0000
+++ b/sys/dev/scsipi/scsipi_base.h Sat Aug 21 20:40:36 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_base.h,v 1.13 2003/01/06 21:02:18 matt Exp $ */
+/* $NetBSD: scsipi_base.h,v 1.14 2004/08/21 20:40:36 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -39,30 +39,22 @@
#ifndef _DEV_SCSIPI_SCSIPI_BASE_H_
#define _DEV_SCSIPI_SCSIPI_BASE_H_
-struct scsipi_xfer *scsipi_get_xs __P((struct scsipi_periph *, int));
-void scsipi_put_xs __P((struct scsipi_xfer *));
+struct scsipi_xfer *scsipi_get_xs(struct scsipi_periph *, int);
+void scsipi_put_xs(struct scsipi_xfer *);
-static __inline struct scsipi_xfer *scsipi_make_xs __P((struct scsipi_periph *,
+static __inline struct scsipi_xfer *scsipi_make_xs(struct scsipi_periph *,
struct scsipi_generic *, int cmdlen, u_char *data_addr,
int datalen, int retries, int timeout, struct buf *,
- int flags)) __attribute__ ((__unused__));
+ int flags) __unused;
/*
* Make a scsipi_xfer, and return a pointer to it.
*/
-static __inline struct scsipi_xfer *
-scsipi_make_xs(periph, scsipi_cmd, cmdlen, data_addr, datalen,
- retries, timeout, bp, flags)
- struct scsipi_periph *periph;
- struct scsipi_generic *scsipi_cmd;
- int cmdlen;
- u_char *data_addr;
- int datalen;
- int retries;
- int timeout;
- struct buf *bp;
- int flags;
+static __inline struct scsipi_xfer * __unused
+scsipi_make_xs(struct scsipi_periph *periph, struct scsipi_generic *scsipi_cmd,
+ int cmdlen, u_char *data_addr, int datalen, int retries, int timeout,
+ struct buf *bp, int flags)
{
struct scsipi_xfer *xs;
diff -r 6a1783d1040c -r 4789687d44fc sys/dev/scsipi/scsipiconf.h
--- a/sys/dev/scsipi/scsipiconf.h Sat Aug 21 18:58:31 2004 +0000
+++ b/sys/dev/scsipi/scsipiconf.h Sat Aug 21 20:40:36 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipiconf.h,v 1.84 2004/03/16 19:10:44 bouyer Exp $ */
+/* $NetBSD: scsipiconf.h,v 1.85 2004/08/21 20:40:36 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -167,11 +167,11 @@
* psw_done Called by the midlayer when an xfer has completed.
*/
struct scsipi_periphsw {
- int (*psw_error) __P((struct scsipi_xfer *));
- void (*psw_start) __P((struct scsipi_periph *));
- int (*psw_async) __P((struct scsipi_periph *,
- scsipi_async_event_t, void *));
- void (*psw_done) __P((struct scsipi_xfer *));
+ int (*psw_error)(struct scsipi_xfer *);
+ void (*psw_start)(struct scsipi_periph *);
+ int (*psw_async)(struct scsipi_periph *,
+ scsipi_async_event_t, void *);
+ void (*psw_done)(struct scsipi_xfer *);
};
struct disk_parms;
@@ -199,16 +199,16 @@
int adapt_max_periph; /* max openings per periph */
int adapt_flags;
- void (*adapt_request) __P((struct scsipi_channel *,
- scsipi_adapter_req_t, void *));
- void (*adapt_minphys) __P((struct buf *));
- int (*adapt_ioctl) __P((struct scsipi_channel *, u_long,
- caddr_t, int, struct proc *));
- int (*adapt_enable) __P((struct device *, int));
- int (*adapt_getgeom) __P((struct scsipi_periph *,
- struct disk_parms *, u_long));
- int (*adapt_accesschk) __P((struct scsipi_periph *,
- struct scsipi_inquiry_pattern *));
+ void (*adapt_request)(struct scsipi_channel *,
+ scsipi_adapter_req_t, void *);
+ void (*adapt_minphys)(struct buf *);
+ int (*adapt_ioctl)(struct scsipi_channel *, u_long,
+ caddr_t, int, struct proc *);
+ int (*adapt_enable)(struct device *, int);
+ int (*adapt_getgeom)(struct scsipi_periph *,
+ struct disk_parms *, u_long);
+ int (*adapt_accesschk)(struct scsipi_periph *,
+ struct scsipi_inquiry_pattern *);
};
/* adapt_flags */
@@ -237,12 +237,12 @@
struct scsipi_bustype {
int bustype_type; /* symbolic name of type */
- int (*bustype_cmd) __P((struct scsipi_periph *,
+ int (*bustype_cmd)(struct scsipi_periph *,
struct scsipi_generic *, int, void *, size_t, int,
- int, struct buf *, int));
- int (*bustype_interpret_sense) __P((struct scsipi_xfer *));
- void (*bustype_printaddr) __P((struct scsipi_periph *));
- void (*bustype_kill_pending) __P((struct scsipi_periph *));
+ int, struct buf *, int);
+ int (*bustype_interpret_sense)(struct scsipi_xfer *);
+ void (*bustype_printaddr)(struct scsipi_periph *);
+ void (*bustype_kill_pending)(struct scsipi_periph *);
};
/* bustype_type */
@@ -296,11 +296,11 @@
struct scsipi_xfer_queue chan_complete;
/* callback we may have to call from completion thread */
- void (*chan_callback) __P((struct scsipi_channel *, void *));
+ void (*chan_callback)(struct scsipi_channel *, void *);
void *chan_callback_arg;
/* callback we may have to call after forking the kthread */
- void (*chan_init_cb) __P((struct scsipi_channel *, void *));
+ void (*chan_init_cb)(struct scsipi_channel *, void *);
void *chan_init_cb_arg;
};
@@ -625,126 +625,94 @@
#ifdef _KERNEL
-void scsipi_init __P((void));
-int scsipi_command __P((struct scsipi_periph *,
+void scsipi_init(void);
+int scsipi_command(struct scsipi_periph *,
struct scsipi_generic *, int, u_char *, int,
- int, int, struct buf *, int));
-void scsipi_create_completion_thread __P((void *));
-caddr_t scsipi_inqmatch __P((struct scsipi_inquiry_pattern *, caddr_t,
- int, int, int *));
-char *scsipi_dtype __P((int));
-void scsipi_strvis __P((u_char *, int, u_char *, int));
-int scsipi_execute_xs __P((struct scsipi_xfer *));
-u_int64_t scsipi_size __P((struct scsipi_periph *, int));
-int scsipi_test_unit_ready __P((struct scsipi_periph *, int));
-int scsipi_prevent __P((struct scsipi_periph *, int, int));
-int scsipi_inquire __P((struct scsipi_periph *,
- struct scsipi_inquiry_data *, int));
-int scsipi_mode_select __P((struct scsipi_periph *, int,
- struct scsipi_mode_header *, int, int, int, int));
-int scsipi_mode_select_big __P((struct scsipi_periph *, int,
- struct scsipi_mode_header_big *, int, int, int, int));
-int scsipi_mode_sense __P((struct scsipi_periph *, int, int,
- struct scsipi_mode_header *, int, int, int, int));
-int scsipi_mode_sense_big __P((struct scsipi_periph *, int, int,
- struct scsipi_mode_header_big *, int, int, int, int));
-int scsipi_start __P((struct scsipi_periph *, int, int));
-void scsipi_done __P((struct scsipi_xfer *));
-void scsipi_user_done __P((struct scsipi_xfer *));
-int scsipi_interpret_sense __P((struct scsipi_xfer *));
-void scsipi_wait_drain __P((struct scsipi_periph *));
-void scsipi_kill_pending __P((struct scsipi_periph *));
-struct scsipi_periph *scsipi_alloc_periph __P((int));
+ int, int, struct buf *, int);
+void scsipi_create_completion_thread(void *);
+caddr_t scsipi_inqmatch(struct scsipi_inquiry_pattern *, caddr_t,
+ int, int, int *);
+char *scsipi_dtype(int);
+void scsipi_strvis(u_char *, int, u_char *, int);
+int scsipi_execute_xs(struct scsipi_xfer *);
+u_int64_t scsipi_size(struct scsipi_periph *, int);
+int scsipi_test_unit_ready(struct scsipi_periph *, int);
+int scsipi_prevent(struct scsipi_periph *, int, int);
+int scsipi_inquire(struct scsipi_periph *,
+ struct scsipi_inquiry_data *, int);
+int scsipi_mode_select(struct scsipi_periph *, int,
+ struct scsipi_mode_header *, int, int, int, int);
+int scsipi_mode_select_big(struct scsipi_periph *, int,
+ struct scsipi_mode_header_big *, int, int, int, int);
+int scsipi_mode_sense(struct scsipi_periph *, int, int,
+ struct scsipi_mode_header *, int, int, int, int);
+int scsipi_mode_sense_big(struct scsipi_periph *, int, int,
+ struct scsipi_mode_header_big *, int, int, int, int);
+int scsipi_start(struct scsipi_periph *, int, int);
+void scsipi_done(struct scsipi_xfer *);
+void scsipi_user_done(struct scsipi_xfer *);
+int scsipi_interpret_sense(struct scsipi_xfer *);
+void scsipi_wait_drain(struct scsipi_periph *);
+void scsipi_kill_pending(struct scsipi_periph *);
+struct scsipi_periph *scsipi_alloc_periph(int);
#ifdef SCSIVERBOSE
-void scsipi_print_sense __P((struct scsipi_xfer *, int));
-void scsipi_print_sense_data __P((struct scsipi_sense_data *, int));
-char *scsipi_decode_sense __P((void *, int));
+void scsipi_print_sense(struct scsipi_xfer *, int);
+void scsipi_print_sense_data(struct scsipi_sense_data *, int);
+char *scsipi_decode_sense(void *, int);
#endif
-void scsipi_print_cdb __P((struct scsipi_generic *cmd));
-int scsipi_thread_call_callback __P((struct scsipi_channel *,
- void (*callback) __P((struct scsipi_channel *, void *)),
- void *));
-void scsipi_async_event __P((struct scsipi_channel *,
- scsipi_async_event_t, void *));
-int scsipi_do_ioctl __P((struct scsipi_periph *, dev_t, u_long, caddr_t,
- int, struct proc *));
+void scsipi_print_cdb(struct scsipi_generic *cmd);
+int scsipi_thread_call_callback(struct scsipi_channel *,
+ void (*callback)(struct scsipi_channel *, void *),
+ void *);
+void scsipi_async_event(struct scsipi_channel *,
+ scsipi_async_event_t, void *);
+int scsipi_do_ioctl(struct scsipi_periph *, dev_t, u_long, caddr_t,
+ int, struct proc *);
-void scsipi_print_xfer_mode __P((struct scsipi_periph *));
-void scsipi_set_xfer_mode __P((struct scsipi_channel *, int, int));
+void scsipi_print_xfer_mode(struct scsipi_periph *);
+void scsipi_set_xfer_mode(struct scsipi_channel *, int, int);
-int scsipi_channel_init __P((struct scsipi_channel *));
-void scsipi_channel_shutdown __P((struct scsipi_channel *));
+int scsipi_channel_init(struct scsipi_channel *);
+void scsipi_channel_shutdown(struct scsipi_channel *);
-void scsipi_insert_periph __P((struct scsipi_channel *,
- struct scsipi_periph *));
-void scsipi_remove_periph __P((struct scsipi_channel *,
- struct scsipi_periph *));
-struct scsipi_periph *scsipi_lookup_periph __P((struct scsipi_channel *,
- int, int));
-int scsipi_target_detach __P((struct scsipi_channel *, int, int, int));
+void scsipi_insert_periph(struct scsipi_channel *,
+ struct scsipi_periph *);
+void scsipi_remove_periph(struct scsipi_channel *,
+ struct scsipi_periph *);
+struct scsipi_periph *scsipi_lookup_periph(struct scsipi_channel *,
+ int, int);
+int scsipi_target_detach(struct scsipi_channel *, int, int, int);
-int scsipi_adapter_addref __P((struct scsipi_adapter *));
-void scsipi_adapter_delref __P((struct scsipi_adapter *));
+int scsipi_adapter_addref(struct scsipi_adapter *);
+void scsipi_adapter_delref(struct scsipi_adapter *);
-void scsipi_channel_freeze __P((struct scsipi_channel *, int));
-void scsipi_channel_thaw __P((struct scsipi_channel *, int));
-void scsipi_channel_timed_thaw __P((void *));
+void scsipi_channel_freeze(struct scsipi_channel *, int);
+void scsipi_channel_thaw(struct scsipi_channel *, int);
+void scsipi_channel_timed_thaw(void *);
-void scsipi_periph_freeze __P((struct scsipi_periph *, int));
-void scsipi_periph_thaw __P((struct scsipi_periph *, int));
-void scsipi_periph_timed_thaw __P((void *));
+void scsipi_periph_freeze(struct scsipi_periph *, int);
+void scsipi_periph_thaw(struct scsipi_periph *, int);
+void scsipi_periph_timed_thaw(void *);
Home |
Main Index |
Thread Index |
Old Index