xnu-792.18.15.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 2441642044d00cd7bd1f38da2b6658821b8031a6..132f9b405bb573ced07a20fea7f82447ffcd6484 100644 (file)
--- a/bsd/netat/adsp_Open.c
+++ b/bsd/netat/adsp_Open.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@
  */
 /* adspOpen.c v01.20
  *
@@ -50,7 +53,6 @@
 #include <netat/adsp.h>
 #include <netat/adsp_internal.h>
 
-extern atlock_t adspgen_lock;
 
 /*
  * NextCID
@@ -64,12 +66,10 @@ extern atlock_t adspgen_lock;
  */
 unsigned short NextCID()
 {
-       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 */
@@ -80,7 +80,6 @@ unsigned short NextCID()
                        break;
                    queue = queue->ccbLink;
            }
-           ATENABLE(s, adspgen_lock);
            if (queue == (CCBPtr)NULL)
                break;  
        }
@@ -244,7 +243,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);