xnu-1228.15.4.tar.gz

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

diff --git a/bsd/netat/adsp.c b/bsd/netat/adsp.c
index cc5a44e2354267efab0b02679035f3b84c570e7b..65fe77206890a069b08eb6566be6e0f276b1d65e 100644 (file)
--- a/bsd/netat/adsp.c
+++ b/bsd/netat/adsp.c
@@ -1,31 +1,29 @@
 /*
  * 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.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Change log:
@@ -58,7 +56,7 @@ struct adsp_debug adsp_dtable[1025];
 int ad_entry = 0;
 #endif
 
-
+int
 adspAllocateCCB(gref)
     register gref_t *gref;     /* READ queue */
 {
@@ -79,6 +77,7 @@ adspAllocateCCB(gref)
     return 1;
 }
 
+int
 adspRelease(gref)
     register gref_t *gref;     /* READ queue */
 {
@@ -112,11 +111,12 @@ adspRelease(gref)
            sp->state = sClosed;
            DoClose(sp, errAborted, 0);  /* to closed and remove CCB */
     } 
+       return 0;
 }
 
 
 
-
+int
 adspWriteHandler(gref, mp)
     gref_t *gref;                      /* WRITE queue */
     gbuf_t *mp;
@@ -147,7 +147,7 @@ adspWriteHandler(gref, mp)
                                gbuf_freem(mp);
                                return(STR_IGNORE);
                        case dspAttention:
-                               if ((error = adspAttention(sp, ap)))
+                               if ((error = adspAttention(sp, (CCBPtr)ap)))
                                gbuf_freem(mp);
                                return(STR_IGNORE);
                }
@@ -226,7 +226,7 @@ adspWriteHandler(gref, mp)
                                return(STR_IGNORE);
                        case ADSPCLDENY:
                                ap->csCode = dspCLDeny;
-                               if ((error = adspCLDeny(sp, ap))) {
+                               if ((error = adspCLDeny(sp, (CCBPtr)ap))) {
                                adspioc_ack(error, mp, gref);
                                }
                                return(STR_IGNORE);
@@ -244,7 +244,7 @@ adspWriteHandler(gref, mp)
                                return(STR_IGNORE);
                        case ADSPATTENTION:
                                ap->csCode = dspAttention;
-                               if ((error = adspReadAttention(sp, ap))) {
+                               if ((error = adspReadAttention((CCBPtr)sp, ap))) {
                                adspioc_ack(error, mp, gref);
                                }
                                return(STR_IGNORE);
@@ -274,9 +274,10 @@ adspWriteHandler(gref, mp)
                default:
                gbuf_freem(mp);
     }
+       return(STR_IGNORE);
 }
 
-
+int
 adspReadHandler(gref, mp)
     gref_t *gref;
     gbuf_t *mp;
@@ -328,7 +329,7 @@ adspReadHandler(gref, mp)
  * Side Effects:
  *      NONE
  */
-
+int
 adsp_sendddp(sp, mp, length, dstnetaddr, ddptype)
    CCBPtr sp;
    gbuf_t *mp;
@@ -376,8 +377,8 @@ adsp_sendddp(sp, mp, length, dstnetaddr, ddptype)
    return 0;
 }
 
-void NotifyUser(sp)
-    register CCBPtr sp;
+void NotifyUser(
+       __unused CCBPtr sp)
 
 {
 /*
@@ -385,8 +386,8 @@ void NotifyUser(sp)
 */
 }
 
-void UrgentUser(sp)
-    register CCBPtr sp;
+void UrgentUser(
+    __unused CCBPtr sp)
 {
 /*
     pidsig(sp->pid, SIGURG);