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 0b49fda3fe95c3dbcaed428e356079c877e0c966..4643504b9c541ee5f09ae38d3d067d27c3354a3b 100644 (file)
--- a/bsd/netat/adsp_Status.c
+++ b/bsd/netat/adsp_Status.c
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* 
  * dspStatus.c 
@@ -48,6 +51,8 @@
 #include <netat/adsp.h>
 #include <netat/adsp_internal.h>
 
+int calcSendQ(CCBPtr);
+
 /*
  * calcSendFree
  *
@@ -69,6 +74,7 @@ int CalcSendQFree(sp)         /* (CCBPtr sp) */
     return bytes;
 }
 
+int
 calcSendQ(sp)
     CCBPtr sp;
 {
@@ -76,13 +82,13 @@ calcSendQ(sp)
     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);
        }
-       if (mp = sp->csbuf_mb)
+       if ((mp = sp->csbuf_mb))
            bytes += gbuf_msgsize(mp);
     }
     return bytes;
@@ -109,9 +115,7 @@ int adspStatus(sp, pb)      /* (DSPPBPtr pb) */
     CCBPtr sp;
     register struct adspcmd *pb;
 {
-    short err;
     short bytes;
-    int        s;
 
     if (sp == 0) {
        pb->ioResult = errRefNum;
@@ -119,7 +123,6 @@ int adspStatus(sp, pb)      /* (DSPPBPtr pb) */
     }
        
     pb->u.statusParams.ccbPtr  = (TPCCB)sp;
-    ATDISABLE(s, sp->lock);    
        
     /*
      * pending bytes in send queue
@@ -145,9 +148,8 @@ int adspStatus(sp, pb)      /* (DSPPBPtr pb) */
                                /* available buffer space in receive queue */
     pb->u.statusParams.recvQFree = CalcRecvWdw(sp);
 
-    ATENABLE(s, sp->lock);     
     pb->ioResult = 0;
-    adspioc_ack(0, pb->ioc, pb->gref);
+    adspioc_ack(0, (gbuf_t *)pb->ioc, pb->gref);
     return 0;
 
 }