callback is always static

2 files changed, 3 insertions, 16 deletions

diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c
index 491258812f5..b543e949f82 100644
--- a/sys/dev/pci/hifn7751.c
+++ b/sys/dev/pci/hifn7751.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hifn7751.c,v 1.38 2000/05/04 02:23:16 jason Exp $	*/
+/*	$OpenBSD: hifn7751.c,v 1.39 2000/06/02 22:36:44 deraadt Exp $	*/
 
 /*
  * Invertex AEON / Hi/fn 7751 driver
@@ -1047,8 +1047,7 @@ hifn_intr(arg)
 			macbuf += 12;
 		}
 
-		/* position is done, notify producer with callback */
-		cmd->dest_ready_callback(sc, cmd, macbuf);
+		hifn_callback(sc, cmd, macbuf);
 	
 		if (++dma->resk == HIFN_D_RES_RSIZE)
 			dma->resk = 0;
@@ -1326,7 +1325,6 @@ hifn_process(crp)
 	if (sc->sc_sessions[session].hs_flags == 1)
 		sc->sc_sessions[session].hs_flags = 2;
 
-	cmd->dest_ready_callback = hifn_callback;
 	cmd->private_data = (u_long)crp;
 	cmd->session_num = session;
 	cmd->softc = sc;
diff --git a/sys/dev/pci/hifn7751var.h b/sys/dev/pci/hifn7751var.h
index b92f33c06d0..78e7ca3f471 100644
--- a/sys/dev/pci/hifn7751var.h
+++ b/sys/dev/pci/hifn7751var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hifn7751var.h,v 1.17 2000/05/08 17:21:46 jason Exp $	*/
+/*	$OpenBSD: hifn7751var.h,v 1.18 2000/06/02 22:36:45 deraadt Exp $	*/
 
 /*
  * Invertex AEON / Hi/fn 7751 driver
@@ -160,16 +160,6 @@
  *  the dest_length does not have to be exact, values larger than required
  *  are fine.
  *
- *  dest_ready_callback
- *  -------------------
- *  Callback routine called from HIFN's interrupt handler.  The routine
- *  must be quick and non-blocking.  The callback routine is passed a
- *  pointer to the same hifn_command_t structure used to initiate the
- *  command.
- *
- *  If this value is null, the hifn_crypto() routine will block until the
- *  dest data is ready.
- *
  *  private_data
  *  ------------
  *  An unsigned long quantity (i.e. large enough to hold a pointer), that
@@ -200,7 +190,6 @@ typedef struct hifn_command {
 	u_short mac_header_skip, mac_process_len;
 	u_short crypt_header_skip, crypt_process_len;
 
-	void (*dest_ready_callback)(struct hifn_softc *, struct hifn_command *, u_int8_t *);
 	u_long private_data;
 	struct hifn_softc *softc;
 } hifn_command_t;