xnu-1228.15.4.tar.gz

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

diff --git a/bsd/netat/adsp_Status.c b/bsd/netat/adsp_Status.c
index b420f3fb075a0f84d0fa568b6f155ef08bfaba82..4643504b9c541ee5f09ae38d3d067d27c3354a3b 100644 (file)
--- a/bsd/netat/adsp_Status.c
+++ b/bsd/netat/adsp_Status.c
@@ -1,31 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * 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.
- *
- * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * 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.
+ * 
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and

  * limitations under the License.
  * limitations under the License.

- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /* 
  * dspStatus.c 
  */
 /* 
  * dspStatus.c 


@@ -53,6 +51,8 @@
 #include <netat/adsp.h>
 #include <netat/adsp_internal.h>
 
 #include <netat/adsp.h>
 #include <netat/adsp_internal.h>
 

+int calcSendQ(CCBPtr);
+

 /*
  * calcSendFree
  *
 /*
  * calcSendFree
  *


@@ -74,6 +74,7 @@ int CalcSendQFree(sp)         /* (CCBPtr sp) */
     return bytes;
 }
 
     return bytes;
 }
 

+int

 calcSendQ(sp)
     CCBPtr sp;
 {
 calcSendQ(sp)
     CCBPtr sp;
 {


@@ -81,13 +82,13 @@ calcSendQ(sp)
     int bytes = 0;
 
     if (sp->sData) {           /* There is data in buffer */
     int bytes = 0;
 
     if (sp->sData) {           /* There is data in buffer */

-       if (mp = sp->sbuf_mb) {
+       if ((mp = sp->sbuf_mb)) {

            do {
                bytes += gbuf_msgsize(mp);
                mp = gbuf_next(mp);
            } while (mp);
        }
            do {
                bytes += gbuf_msgsize(mp);
                mp = gbuf_next(mp);
            } while (mp);
        }

-       if (mp = sp->csbuf_mb)
+       if ((mp = sp->csbuf_mb))

            bytes += gbuf_msgsize(mp);
     }
     return bytes;
            bytes += gbuf_msgsize(mp);
     }
     return bytes;


@@ -114,7 +115,6 @@ int adspStatus(sp, pb)      /* (DSPPBPtr pb) */
     CCBPtr sp;
     register struct adspcmd *pb;
 {
     CCBPtr sp;
     register struct adspcmd *pb;
 {

-    short err;

     short bytes;
 
     if (sp == 0) {
     short bytes;
 
     if (sp == 0) {


@@ -149,7 +149,7 @@ int adspStatus(sp, pb)      /* (DSPPBPtr pb) */
     pb->u.statusParams.recvQFree = CalcRecvWdw(sp);
 
     pb->ioResult = 0;
     pb->u.statusParams.recvQFree = CalcRecvWdw(sp);
 
     pb->ioResult = 0;

-    adspioc_ack(0, pb->ioc, pb->gref);
+    adspioc_ack(0, (gbuf_t *)pb->ioc, pb->gref);

     return 0;
 
 }
     return 0;
 
 }