xnu-1228.15.4.tar.gz

[apple/xnu.git] / bsd / netat / adsp.c

diff --git a/bsd/netat/adsp.c b/bsd/netat/adsp.c
index 6d283436831306d7677de631869801a717b507c6..65fe77206890a069b08eb6566be6e0f276b1d65e 100644 (file)
--- a/bsd/netat/adsp.c
+++ b/bsd/netat/adsp.c
@@ -56,8 +56,7 @@ struct adsp_debug adsp_dtable[1025];
 int ad_entry = 0;
 #endif
 
-extern atlock_t adspgen_lock;
-
+int
 adspAllocateCCB(gref)
     register gref_t *gref;     /* READ queue */
 {
@@ -75,29 +74,22 @@ adspAllocateCCB(gref)
     sp->pid = gref->pid; /* save the caller process pointer */
     sp->gref = gref;           /* save a back pointer to the WRITE queue */
     sp->sp_mp = ccb_mp;                /* and its message block */
-    ATLOCKINIT(sp->lock);
-    ATLOCKINIT(sp->lockClose);
-    ATLOCKINIT(sp->lockRemove);
     return 1;
 }
 
+int
 adspRelease(gref)
     register gref_t *gref;     /* READ queue */
 {
     register CCBPtr sp;
-    int s, l;
 
-    ATDISABLE(l, adspgen_lock);
     if (gref->info) {
        sp = (CCBPtr)gbuf_rptr(((gbuf_t *)gref->info));
-       ATDISABLE(s, sp->lock);
-       ATENABLE(s, adspgen_lock);
                                /* Tells completion routine of close */
                                /* packet to remove us. */
 
        if (sp->state == sPassive || sp->state == sClosed || 
            sp->state == sOpening || sp->state == sListening) {
-           ATENABLE(l, sp->lock);
            if (sp->state == sListening)
                CompleteQueue(&sp->opb, errAborted);
            sp->removing = 1;   /* Prevent allowing another dspClose. */
@@ -106,7 +98,6 @@ adspRelease(gref)
        } else {                        /* sClosing & sOpen */
            sp->state = sClosing;
        }
-       ATENABLE(l, sp->lock);
 
        if (CheckOkToClose(sp)) { /* going to close */
            sp->sendCtl = B_CTL_CLOSE; /* Send close advice */
@@ -116,18 +107,16 @@ adspRelease(gref)
                    sp->sendCtl = B_CTL_CLOSE; /* Setup to send close advice */
        }
        CheckSend(sp);          /* and force out the close */
-       ATDISABLE(s, sp->lock);
            sp->removing = 1;   /* Prevent allowing another dspClose. */
            sp->state = sClosed;
-       ATENABLE(s, sp->lock);
            DoClose(sp, errAborted, 0);  /* to closed and remove CCB */
-    } else
-       ATENABLE(l, adspgen_lock);
+    } 
+       return 0;
 }
 
 
 
-
+int
 adspWriteHandler(gref, mp)
     gref_t *gref;                      /* WRITE queue */
     gbuf_t *mp;
@@ -158,7 +147,7 @@ adspWriteHandler(gref, mp)
                                gbuf_freem(mp);
                                return(STR_IGNORE);
                        case dspAttention:
-                               if ((error = adspAttention(sp, ap)))
+                               if ((error = adspAttention(sp, (CCBPtr)ap)))
                                gbuf_freem(mp);
                                return(STR_IGNORE);
                }
@@ -237,7 +226,7 @@ adspWriteHandler(gref, mp)
                                return(STR_IGNORE);
                        case ADSPCLDENY:
                                ap->csCode = dspCLDeny;
-                               if ((error = adspCLDeny(sp, ap))) {
+                               if ((error = adspCLDeny(sp, (CCBPtr)ap))) {
                                adspioc_ack(error, mp, gref);
                                }
                                return(STR_IGNORE);
@@ -255,7 +244,7 @@ adspWriteHandler(gref, mp)
                                return(STR_IGNORE);
                        case ADSPATTENTION:
                                ap->csCode = dspAttention;
-                               if ((error = adspReadAttention(sp, ap))) {
+                               if ((error = adspReadAttention((CCBPtr)sp, ap))) {
                                adspioc_ack(error, mp, gref);
                                }
                                return(STR_IGNORE);
@@ -285,9 +274,10 @@ adspWriteHandler(gref, mp)
                default:
                gbuf_freem(mp);
     }
+       return(STR_IGNORE);
 }
 
-
+int
 adspReadHandler(gref, mp)
     gref_t *gref;
     gbuf_t *mp;
@@ -339,7 +329,7 @@ adspReadHandler(gref, mp)
  * Side Effects:
  *      NONE
  */
-
+int
 adsp_sendddp(sp, mp, length, dstnetaddr, ddptype)
    CCBPtr sp;
    gbuf_t *mp;
@@ -365,11 +355,11 @@ adsp_sendddp(sp, mp, length, dstnetaddr, ddptype)
    /* Set up the DDP header */
 
    ddp = (DDPX_FRAME *) gbuf_rptr(mp);
-   UAS_ASSIGN(ddp->ddpx_length, (length + DDPL_FRAME_LEN));
+   UAS_ASSIGN_HTON(ddp->ddpx_length, (length + DDPL_FRAME_LEN));
    UAS_ASSIGN(ddp->ddpx_cksm, 0);
    if (sp) {
        if (sp->useCheckSum)
-          UAS_ASSIGN(ddp->ddpx_cksm, 1);
+          UAS_ASSIGN_HTON(ddp->ddpx_cksm, 1);
    }
 
    NET_ASSIGN(ddp->ddpx_dnet, dstnetaddr->a.net);
@@ -387,8 +377,8 @@ adsp_sendddp(sp, mp, length, dstnetaddr, ddptype)
    return 0;
 }
 
-void NotifyUser(sp)
-    register CCBPtr sp;
+void NotifyUser(
+       __unused CCBPtr sp)
 
 {
 /*
@@ -396,8 +386,8 @@ void NotifyUser(sp)
 */
 }
 
-void UrgentUser(sp)
-    register CCBPtr sp;
+void UrgentUser(
+    __unused CCBPtr sp)
 {
 /*
     pidsig(sp->pid, SIGURG);