xnu-1228.15.4.tar.gz

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

diff --git a/bsd/netat/adsp_Control.c b/bsd/netat/adsp_Control.c
index 44e52115802b587ef7c28f608f3401aeca6580b9..040683e0b5891bebb05b913bab3c53aaed3aa695 100644 (file)
--- a/bsd/netat/adsp_Control.c
+++ b/bsd/netat/adsp_Control.c
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  *     Copyright (c) 1990, 1995-1998 Apple Computer, Inc.
@@ -59,6 +65,8 @@
 
 int adsp_window = 1;
 
+int attachData(CCBPtr, gbuf_t *mp);
+
 /*
  * CalcRecvWdw
  *
@@ -75,7 +83,7 @@ int CalcRecvWdw(sp)           /* (CCBPtr sp) */
     bytes = calcRecvQ(sp);
     bytes = sp->rbuflen - bytes; /* get what is left */
 
-    if (bytes <= 16) {         /* %%% this should be zero */
+    if ((bytes <= 16)) {               /* %%% this should be zero */
        sp->rbufFull = 1;       /* Save flag that our recv buf is full */
        return 0;
     }
@@ -83,6 +91,7 @@ int CalcRecvWdw(sp)           /* (CCBPtr sp) */
        return ((bytes+bytes+bytes) >> 2) + 1; /* %%% */
 }
 
+int
 calcRecvQ(sp)
     CCBPtr sp;
 {
@@ -98,13 +107,13 @@ calcRecvQ(sp)
     register gbuf_t *mb;
 
     if (sp->rData) {           /* There is data in buffer */
-       if (mb = sp->rbuf_mb) {
+       if ((mb = sp->rbuf_mb)) {
            do {
                bytes += gbuf_msgsize(mb);
                mb = gbuf_next(mb);
            } while (mb);
        }
-       if (mb = sp->crbuf_mb)
+       if ((mb = sp->crbuf_mb))
            bytes += gbuf_msgsize(mb);
     }
 #endif
@@ -138,7 +147,7 @@ void CheckSend(sp)          /* (CCBPtr sp) */
     int use_attention_code;
     int len;                   /* length used in allocd mblk */
     int datalen;               /* amount of data attached to mblk */
-    gbuf_t *mprev, *mlist = 0;
+    gbuf_t *mprev = 0, *mlist = 0;
 
 top:
 
@@ -291,7 +300,7 @@ top:
                                            * in a row. */
     {
        attnMsg = 0;
-       if (datalen = attachData(sp, mp)) /* attach data to mp */
+       if ((datalen = attachData(sp, mp))) /* attach data to mp */
            goto sendit;        /* if successful, sendit */
     }
 
@@ -369,6 +378,8 @@ void completepb(sp, pb)
        gbuf_freem(pb->mp);
 }
 
+
+int
 attachData(sp, mp)
     register CCBPtr sp;
     register gbuf_t *mp;
@@ -398,9 +409,9 @@ attachData(sp, mp)
      */
     UAL_ASSIGN_HTON(sp->f.pktFirstByteSeq, sp->sendSeq);
                
-    if (smp = sp->sbuf_mb) /* Get oldest header */
+    if ((smp = sp->sbuf_mb)) /* Get oldest header */
        eom = 1;
-    else if (smp = sp->csbuf_mb)
+    else if ((smp = sp->csbuf_mb))
        eom = 0;
 
     if (smp == 0) {            /* this shouldn't happen... */