[src/trunk]: src/sys/dev/pci Remove #ifdef _OpenBSD__ code which sets the sof...

[jonathan <jonathan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/66529bda503c
branches:  trunk
changeset: 550791:66529bda503c
user:      jonathan <jonathan%NetBSD.org@localhost>
date:      Thu Aug 21 20:00:15 2003 +0000

description:
Remove #ifdef _OpenBSD__ code which sets the softc pointer `sc' by
passing an index into ubsec_cd.cd_devs[]: that causes too much
confusion with the checks that sc is non-null.

diffstat:

 sys/dev/pci/ubsec.c |  47 +++++++----------------------------------------
 1 files changed, 7 insertions(+), 40 deletions(-)

diffs (94 lines):

diff -r 4b9e52a18e92 -r 66529bda503c sys/dev/pci/ubsec.c
--- a/sys/dev/pci/ubsec.c       Thu Aug 21 19:44:14 2003 +0000
+++ b/sys/dev/pci/ubsec.c       Thu Aug 21 20:00:15 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ubsec.c,v 1.1 2003/08/01 00:08:55 jonathan Exp $       */
+/*     $NetBSD: ubsec.c,v 1.2 2003/08/21 20:00:15 jonathan Exp $       */
 /* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.6 2003/01/23 21:06:43 sam Exp $ */
 /*     $OpenBSD: ubsec.c,v 1.127 2003/06/04 14:04:58 jason Exp $       */
 
@@ -125,10 +125,6 @@
 static void    ubsec_dma_free(struct ubsec_softc *, struct ubsec_dma_alloc *);
 static int     ubsec_dmamap_aligned(bus_dmamap_t);
 
-#ifdef __OpenBSD__
-struct ubsec_softc *ubsec_kfind(struct cryptkop *);
-#endif
-
 static int     ubsec_kprocess(void*, struct cryptkop *, int);
 static int     ubsec_kprocess_modexp_sw(struct ubsec_softc *,
                                         struct cryptkop *, int);
@@ -710,22 +706,12 @@
        SHA1_CTX sha1ctx;
        int i, sesn;
 
+       sc = arg;
+       KASSERT(sc != NULL /*, ("ubsec_newsession: null softc")*/);
+
        if (sidp == NULL || cri == NULL || sc == NULL)
                return (EINVAL);
 
-#ifdef __OpenBSD__
-       for (i = 0; i < ubsec_cd.cd_ndevs; i++) {
-               sc = ubsec_cd.cd_devs[i];
-               if (sc == NULL || sc->sc_cid == (*sidp))
-                       break;
-       }
-       if (sc == NULL)
-               return (EINVAL);
-#else
-       sc = arg;
-       KASSERT(sc != NULL /*, ("ubsec_newsession: null softc")*/);
-#endif /* __OpenBSD__ */
-
        for (c = cri; c != NULL; c = c->cri_next) {
                if (c->cri_alg == CRYPTO_MD5_HMAC ||
                    c->cri_alg == CRYPTO_SHA1_HMAC) {
@@ -863,17 +849,8 @@
        int session;
        u_int32_t sid = ((u_int32_t) tid) & 0xffffffff;
 
-#ifdef __OpenBSD__
-       int card;
-
-       card = UBSEC_CARD(sid);
-       if (card >= ubsec_cd.cd_ndevs || ubsec_cd.cd_devs[card] == NULL)
-               return (EINVAL);
-       sc = ubsec_cd.cd_devs[card];
-#else
        sc = arg;
        KASSERT(sc != NULL /*, ("ubsec_freesession: null softc")*/);
-#endif
 
        session = UBSEC_SESSION(sid);
        if (session >= sc->sc_nsessions)
@@ -919,6 +896,9 @@
        struct ubsec_pktctx ctx;
        struct ubsec_dma *dmap = NULL;
 
+       sc = arg;
+       KASSERT(sc != NULL /*, ("ubsec_process: null softc")*/);
+
        if (crp == NULL || crp->crp_callback == NULL || sc == NULL) {
                ubsecstats.hst_invalid++;
                return (EINVAL);
@@ -927,19 +907,6 @@
                ubsecstats.hst_badsession++;
                return (EINVAL);
        }
-#ifdef __OpenBSD__
-       card = UBSEC_CARD(crp->crp_sid);
-       if (card >= ubsec_cd.cd_ndevs || ubsec_cd.cd_devs[card] == NULL) {
-               ubsecstats.hst_invalid++;
-               return (EINVAL);
-       }
-       sc = ubsec_cd.cd_devs[card];
-#else
-       sc = arg;
-       KASSERT(sc != NULL /*, ("ubsec_process: null softc")*/);
-#endif
-
-
 
        s = splnet();