xnu-1228.15.4.tar.gz

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

diff --git a/bsd/netat/adsp_Open.c b/bsd/netat/adsp_Open.c
index d73e2ee94f0c40dabf2a22236e7efb5512b5a502..b41ee11986e36ab4d7a5f78c9e5d7d59b0d1174f 100644 (file)
--- a/bsd/netat/adsp_Open.c
+++ b/bsd/netat/adsp_Open.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@
  */
 /* adspOpen.c v01.20
  *
@@ -47,7 +53,8 @@
 #include <netat/adsp.h>
 #include <netat/adsp_internal.h>
 
-extern atlock_t adspgen_lock;
+extern int *adsp_pidM;
+
 
 /*
  * NextCID
@@ -59,14 +66,13 @@ extern atlock_t adspgen_lock;
  * OUTPUTS:
  *             unique connection ID
  */
-unsigned short NextCID()
+
+unsigned short NextCID(void)
 {
-       int s;
        unsigned short num;
        register CCB *queue;
 
        while (1) {
-           ATDISABLE(s, adspgen_lock);         /* Disable interrupts */
            num = ++adspGlobal.lastCID;
            /* qfind_w below is in 68K assembly */
            /* point to the first element */
@@ -77,7 +83,6 @@ unsigned short NextCID()
                        break;
                    queue = queue->ccbLink;
            }
-           ATENABLE(s, adspgen_lock);
            if (queue == (CCBPtr)NULL)
                break;  
        }
@@ -133,8 +138,6 @@ int adspOpen(sp, pb)                /* (DSPPBPtr pb) */
     register CCBPtr sp;
     register struct adspcmd *pb;
 {
-    extern int adsp_pidM[];
-
     int ocMode;
     register gbuf_t *mp;
 
@@ -241,7 +244,7 @@ int adspOpen(sp, pb)                /* (DSPPBPtr pb) */
     if (ocMode == ocEstablish) { /* Only set these if establish mode */
        sp->recvSeq = pb->u.openParams.recvSeq;
        sp->attnRecvSeq = pb->u.openParams.attnRecvSeq;
-       UAS_ASSIGN(sp->f.CID, sp->locCID); /* Preset the CID in the ADSP header */
+       UAS_ASSIGN_HTON(sp->f.CID, sp->locCID); /* Preset the CID in the ADSP header */
        /* This is done elsewhere for all other modes */
        InsertTimerElem(&adspGlobal.slowTimers, &sp->ProbeTimer, 
                        sp->probeInterval);
@@ -261,7 +264,7 @@ int adspOpen(sp, pb)                /* (DSPPBPtr pb) */
        
     if (ocMode == ocEstablish) { /* For establish call, we're done */
        pb->ioResult = 0;
-       adspioc_ack(0, pb->ioc, pb->gref);
+       adspioc_ack(0, (gbuf_t *)pb->ioc, pb->gref);
        return 0;
     }
     
@@ -273,7 +276,7 @@ int adspOpen(sp, pb)                /* (DSPPBPtr pb) */
            return ENOBUFS;
     }
     pb->ioResult = 1;  /* not open -> not done */
-    adspioc_ack(0, pb->ioc, pb->gref); /* release user */
+    adspioc_ack(0, (gbuf_t *)pb->ioc, pb->gref); /* release user */
     sp->opb = (struct adspcmd *)gbuf_rptr(mp);
     sp->opb->ioc = 0;          /* unlink saved pb from ioctl block */
     sp->opb->mp = mp;