xnu-1228.tar.gz

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

diff --git a/bsd/netat/adsp_Options.c b/bsd/netat/adsp_Options.c
index 5e302bcaaf36f86c621608484471c9a94fd9f2f6..f40ce433be1e1206788224afb01a8dd49e4cbabe 100644 (file)
--- a/bsd/netat/adsp_Options.c
+++ b/bsd/netat/adsp_Options.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@
  */
 /*
  * dspOptions.c 
@@ -66,8 +72,6 @@ int adspOptions(sp, pb)       /* (DSPPBPtr pb) */
     CCBPtr             sp;
     struct adspcmd *pb;
 {
-    short err;
-       
     if (sp == 0) {
        pb->ioResult = errRefNum; 
        return EINVAL;
@@ -93,7 +97,7 @@ int adspOptions(sp, pb)       /* (DSPPBPtr pb) */
     if (pb->u.optionParams.newPID)
        sp->pid = pb->u.optionParams.newPID;
     pb->ioResult = 0;
-    adspioc_ack(0, pb->ioc, pb->gref);
+    adspioc_ack(0, (gbuf_t *)pb->ioc, pb->gref);
     return 0;
 
 }