xnu-1228.15.4.tar.gz

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

diff --git a/bsd/netat/adsp_RxData.c b/bsd/netat/adsp_RxData.c
index bf420577502d7d21cbe4e2995bc879bdaa9255f5..267e8c3136010bf0a01c0b403516281b70b98ee8 100644 (file)
--- a/bsd/netat/adsp_RxData.c
+++ b/bsd/netat/adsp_RxData.c
@@ -58,6 +58,8 @@
 #include <netat/adsp.h>
 #include <netat/adsp_internal.h>
 
 #include <netat/adsp.h>
 #include <netat/adsp_internal.h>
 

+gbuf_t *releaseData(gbuf_t *, int);
+

 gbuf_t *releaseData(mp, len)
     gbuf_t *mp;
     int len;
 gbuf_t *releaseData(mp, len)
     gbuf_t *mp;
     int len;


@@ -113,20 +115,18 @@ void CheckRecvSeq(sp, f)  /* (CCBPtr sp, ADSP_FRAMEPtr f) */
     register CCBPtr sp;
     register ADSP_FRAMEPtr f;
 {
     register CCBPtr sp;
     register ADSP_FRAMEPtr f;
 {

-    int s;

     int pktNextRecvSeq;
     int sendWdwSeq;
     int eom;
     int hlen;
     register gbuf_t *mp;
        
     int pktNextRecvSeq;
     int sendWdwSeq;
     int eom;
     int hlen;
     register gbuf_t *mp;
        

-    ATDISABLE(s, sp->lock);

     if (f->descriptor & ADSP_ACK_REQ_BIT) { /* He wants an Ack */
        sp->sendDataAck = 1;
        sp->callSend = 1;
     }
        
     if (f->descriptor & ADSP_ACK_REQ_BIT) { /* He wants an Ack */
        sp->sendDataAck = 1;
        sp->callSend = 1;
     }
        

-    pktNextRecvSeq = netdw(UAL_VALUE(f->pktNextRecvSeq)); /* Local copy */
+    pktNextRecvSeq = UAL_VALUE_NTOH(f->pktNextRecvSeq); /* Local copy */

 
     /*
      * Make sure the sequence number corresponds to reality -- i.e. for 
 
     /*
      * Make sure the sequence number corresponds to reality -- i.e. for 


@@ -184,7 +184,7 @@ void CheckRecvSeq(sp, f)    /* (CCBPtr sp, ADSP_FRAMEPtr f) */
 
 
     do {                       /* This acks bytes in our buffer */
 
 
     do {                       /* This acks bytes in our buffer */

-       if (mp = sp->sbuf_mb) { /* Get ptr to oldest data header */
+       if ((mp = sp->sbuf_mb)) {       /* Get ptr to oldest data header */

            sp->sbuf_mb = gbuf_next(mp); /* unlink it from send queue */
            eom = 1;
        } else {
            sp->sbuf_mb = gbuf_next(mp); /* unlink it from send queue */
            eom = 1;
        } else {


@@ -241,7 +241,7 @@ void CheckRecvSeq(sp, f)    /* (CCBPtr sp, ADSP_FRAMEPtr f) */
        sp->callSend = 1;
 
 noack:
        sp->callSend = 1;
 
 noack:

-    sendWdwSeq = netw(UAS_VALUE(f->pktRecvWdw)) - 1 + pktNextRecvSeq;
+    sendWdwSeq = UAS_VALUE_NTOH(f->pktRecvWdw) - 1 + pktNextRecvSeq;

 
     if (GT(sendWdwSeq, sp->sendWdwSeq))        /* Don't make send window smaller */
     {
 
     if (GT(sendWdwSeq, sp->sendWdwSeq))        /* Don't make send window smaller */
     {


@@ -249,7 +249,6 @@ noack:
                                /* if we can send more data */
        sp->sendWdwSeq  = sendWdwSeq;
     }
                                /* if we can send more data */
        sp->sendWdwSeq  = sendWdwSeq;
     }

-    ATENABLE(s, sp->lock);

 }
 
 /*
 }
 
 /*


@@ -275,7 +274,7 @@ int RXData(sp, mp, f, len)  /* (CCBPtr sp, ADSP_FRAMEPtr f, word len) */
     ADSP_FRAMEPtr f;
     int len;
 {
     ADSP_FRAMEPtr f;
     int len;
 {

-    int s, offset;
+    int offset;

     int PktFirstByteSeq;
     short cnt;
     char eom;
     int PktFirstByteSeq;
     short cnt;
     char eom;


@@ -293,14 +292,12 @@ int RXData(sp, mp, f, len)        /* (CCBPtr sp, ADSP_FRAMEPtr f, word len) */
 
     trace_mbufs(D_M_ADSP, "  mp", mp);
 
 
     trace_mbufs(D_M_ADSP, "  mp", mp);
 

-    PktFirstByteSeq = netdw(UAL_VALUE(f->pktFirstByteSeq)); /* Local copy */
+    PktFirstByteSeq = UAL_VALUE_NTOH(f->pktFirstByteSeq); /* Local copy */

 
 

-    ATDISABLE(s, sp->lock);

     if (GT(PktFirstByteSeq, sp->recvSeq)) /* missed a packet (out of order) */
     {
        if (sp->badSeqCnt++ > sp->badSeqCnt) /* Need to send rexmit advice */
            sp->sendCtl |= B_CTL_RETRANSMIT;
     if (GT(PktFirstByteSeq, sp->recvSeq)) /* missed a packet (out of order) */
     {
        if (sp->badSeqCnt++ > sp->badSeqCnt) /* Need to send rexmit advice */
            sp->sendCtl |= B_CTL_RETRANSMIT;

-       ATENABLE(s, sp->lock);

        CheckRecvSeq(sp, f);    /* Will set send ACK flag if requested */
        CheckReadQueue(sp);
        gbuf_freem(mp);
        CheckRecvSeq(sp, f);    /* Will set send ACK flag if requested */
        CheckReadQueue(sp);
        gbuf_freem(mp);


@@ -313,7 +310,6 @@ int RXData(sp, mp, f, len)  /* (CCBPtr sp, ADSP_FRAMEPtr f, word len) */
     }
        
     if (LTE(PktFirstByteSeq + len + eom, sp->recvSeq)) { /* duplicate data? */
     }
        
     if (LTE(PktFirstByteSeq + len + eom, sp->recvSeq)) { /* duplicate data? */

-       ATENABLE(s, sp->lock);

        CheckRecvSeq(sp, f);    /* Will set send ACK flag if requested */
        CheckReadQueue(sp);
        gbuf_freem(mp);
        CheckRecvSeq(sp, f);    /* Will set send ACK flag if requested */
        CheckReadQueue(sp);
        gbuf_freem(mp);


@@ -366,7 +362,7 @@ int RXData(sp, mp, f, len)  /* (CCBPtr sp, ADSP_FRAMEPtr f, word len) */
                mp = sp->crbuf_mb;
                sp->crbuf_mb = 0;
            }
                mp = sp->crbuf_mb;
                sp->crbuf_mb = 0;
            }

-           if (rmp = sp->rbuf_mb) {
+           if ((rmp = sp->rbuf_mb)) {

                /*
                 * Add it to the end
                 */
                /*
                 * Add it to the end
                 */


@@ -388,7 +384,6 @@ int RXData(sp, mp, f, len)  /* (CCBPtr sp, ADSP_FRAMEPtr f, word len) */
      * doing anything that might take a long while
      */
 
      * doing anything that might take a long while
      */
 

-    ATENABLE(s, sp->lock);

     CheckRecvSeq(sp, f);       /* Will set send ACK flag if requested */
     CheckReadQueue(sp);
     KERNEL_DEBUG(DBG_ADSP_RCV, 5, sp, sp->rbuf_mb, 0, 0);
     CheckRecvSeq(sp, f);       /* Will set send ACK flag if requested */
     CheckReadQueue(sp);
     KERNEL_DEBUG(DBG_ADSP_RCV, 5, sp, sp->rbuf_mb, 0, 0);