X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/6601e61aa18bf4f09af135ff61fc7f4771d23b06..0c530ab8987f0ae6a1a3d9284f40182b88852816:/bsd/netat/adsp_Control.c

diff --git a/bsd/netat/adsp_Control.c b/bsd/netat/adsp_Control.c
index fe9d6803a..44e521158 100644
--- a/bsd/netat/adsp_Control.c
+++ b/bsd/netat/adsp_Control.c
@@ -129,7 +129,6 @@ void CheckSend(sp)		/* (CCBPtr sp) */
 {
     int i;
     int	attnMsg;		/* True if attention message */
-    int	s;
     register gbuf_t *mp;	/* send message block */
 #ifdef notdef
     register gbuf_t *tmp;
@@ -155,7 +154,6 @@ top:
 		gbuf_freel(mlist);
 	return;		/* can't get buffers... do nothing! */
     }
-    ATDISABLE(s, sp->lock);
     sp->callSend = 0;		/* Clear flag */
     use_attention_code = 0;
     len = 0;
@@ -176,24 +174,24 @@ top:
 
 	    /* point past ADSP header (no attention) */
 	    dp = ((char *) gbuf_wptr(mp)) + ADSP_FRAME_LEN; 
-	    UAL_ASSIGN(sp->f.pktFirstByteSeq, netdw(sp->firstRtmtSeq));
+	    UAL_ASSIGN_HTON(sp->f.pktFirstByteSeq, sp->firstRtmtSeq);
 	    
-	    UAS_ASSIGN(sp->of.version, netw(0x0100)); /* Fill in open connection parms */
-	    UAS_ASSIGN(sp->of.dstCID, sp->remCID);	/* Destination CID */
-	    UAL_ASSIGN(sp->of.pktAttnRecvSeq, netdw(sp->attnRecvSeq));
+	    UAS_ASSIGN_HTON(sp->of.version, netw(0x0100)); /* Fill in open connection parms */
+	    UAS_ASSIGN_HTON(sp->of.dstCID, sp->remCID);	/* Destination CID */
+	    UAL_ASSIGN_HTON(sp->of.pktAttnRecvSeq, sp->attnRecvSeq);
 	    bcopy((caddr_t) &sp->of, (caddr_t) dp, ADSP_OPEN_FRAME_LEN);
 	    len += ADSP_OPEN_FRAME_LEN;
 
 	    if (i & B_CTL_OREQ) {
-		UAS_ASSIGN(sp->f.CID, sp->locCID);
+		UAS_ASSIGN_HTON(sp->f.CID, sp->locCID);
 		mask = B_CTL_OREQ;
 		sp->f.descriptor = ADSP_CONTROL_BIT | ADSP_CTL_OREQ;
 	    } else if (i & B_CTL_OACK) {
-		UAS_ASSIGN(sp->f.CID, sp->locCID);
+		UAS_ASSIGN_HTON(sp->f.CID, sp->locCID);
 		mask = B_CTL_OACK;
 		sp->f.descriptor = ADSP_CONTROL_BIT | ADSP_CTL_OACK;
 	    } else if (i & B_CTL_OREQACK) {
-		UAS_ASSIGN(sp->f.CID, sp->locCID);
+		UAS_ASSIGN_HTON(sp->f.CID, sp->locCID);
 		mask = B_CTL_OREQACK;
 		sp->f.descriptor = ADSP_CONTROL_BIT | ADSP_CTL_OREQACK;
 	    } else 		/* Deny */
@@ -219,7 +217,7 @@ top:
 	    }
 	} else {
 	    /* seq # of next byte to send */
-	    UAL_ASSIGN(sp->f.pktFirstByteSeq, netdw(sp->sendSeq));	
+	    UAL_ASSIGN_HTON(sp->f.pktFirstByteSeq, sp->sendSeq);	
 			
 	    if (i & B_CTL_CLOSE) {
 		sp->state = sClosed; /* Now we're closed */
@@ -298,7 +296,7 @@ top:
     }
 
     if (sp->sendDataAck) {
-	UAL_ASSIGN(sp->f.pktFirstByteSeq, netdw(sp->sendSeq)); /* seq # of next byte */
+	UAL_ASSIGN_HTON(sp->f.pktFirstByteSeq, sp->sendSeq); /* seq # of next byte */
 	attnMsg = 0;
 	sp->f.descriptor = ADSP_CONTROL_BIT;
 	goto sendit;
@@ -309,7 +307,6 @@ top:
      */
     if (mp)
 	gbuf_freem(mp);
-    ATENABLE(s, sp->lock);
     if (mlist)
 	adsp_sendddp(sp, mlist, 0, &sp->remoteAddress, DDP_ADSP);
     return;
@@ -317,13 +314,13 @@ top:
 sendit:
 
     if (attnMsg) {
-	UAL_ASSIGN(sp->f.pktFirstByteSeq, netdw(sp->attnSendSeq));
-	UAL_ASSIGN(sp->f.pktNextRecvSeq, netdw(sp->attnRecvSeq));
+	UAL_ASSIGN_HTON(sp->f.pktFirstByteSeq, sp->attnSendSeq);
+	UAL_ASSIGN_HTON(sp->f.pktNextRecvSeq, sp->attnRecvSeq);
 	UAS_ASSIGN(sp->f.pktRecvWdw, 0);	/* Always zero in attn pkt */
     } else {
 	sp->sendDataAck = 0;
-	UAL_ASSIGN(sp->f.pktNextRecvSeq, netdw(sp->recvSeq));
-	UAS_ASSIGN(sp->f.pktRecvWdw, netw(CalcRecvWdw(sp)));
+	UAL_ASSIGN_HTON(sp->f.pktNextRecvSeq, sp->recvSeq);
+	UAS_ASSIGN_HTON(sp->f.pktRecvWdw, CalcRecvWdw(sp));
     }
     if (use_attention_code) {
 	bcopy((caddr_t) &sp->f, (caddr_t) gbuf_wptr(mp), ADSP_FRAME_LEN + 2);
@@ -341,12 +338,10 @@ sendit:
 
     if (sp->state == sClosed) {	/* must have sent a close advice */
 				/* send header + data */
-	ATENABLE(s, sp->lock);
 	adsp_sendddp(sp, mlist, 0, &sp->remoteAddress, DDP_ADSP);
 	DoClose(sp, 0, -1);	/* complete close! */
 	return;
     }
-    ATENABLE(s, sp->lock);
     if (sp->state == sClosing) /* See if we were waiting on this write */
 	CheckOkToClose(sp);
     goto top;
@@ -401,7 +396,7 @@ attachData(sp, mp)
      * The easiest fix to this timing dilemma seems to be to reset 
      * sendSeq to first Rtmt Seq if we're sending the first packet.
      */
-    UAL_ASSIGN(sp->f.pktFirstByteSeq, netdw(sp->sendSeq));
+    UAL_ASSIGN_HTON(sp->f.pktFirstByteSeq, sp->sendSeq);
 		
     if (smp = sp->sbuf_mb) /* Get oldest header */
 	eom = 1;