xnu-792.18.15.tar.gz

[apple/xnu.git] / bsd / netat / adsp_internal.h

diff --git a/bsd/netat/adsp_internal.h b/bsd/netat/adsp_internal.h
index 268cbe068c752295ba40a7ee80cfcbafa5065d8a..57a17c944e814521ce469cd4b6730d8b2d825587 100644 (file)
--- a/bsd/netat/adsp_internal.h
+++ b/bsd/netat/adsp_internal.h
@@ -1,32 +1,37 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * 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,
  * 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@

  */
 #ifndef _NETAT_ADSP_INTERNAL_H_
 #define _NETAT_ADSP_INTERNAL_H_
  */
 #ifndef _NETAT_ADSP_INTERNAL_H_
 #define _NETAT_ADSP_INTERNAL_H_

-#include <sys/appleapiopts.h>

 
 #include <sys/types.h>
 
 
 #include <sys/types.h>
 

-#ifdef KERNEL
-#ifdef __APPLE_API_PRIVATE
+#ifdef __APPLE_API_OBSOLETE
+#ifdef KERNEL_PRIVATE

 
 /* from h/adsp_portab.h */
 
 
 /* from h/adsp_portab.h */
 


@@ -141,9 +146,8 @@ typedef struct TNetworkTransition {
     ProcPtr netValidProc;      /* pointer to the network valid procedure */
 } TNetworkTransition, *TPNetworkTransition;
 
     ProcPtr netValidProc;      /* pointer to the network valid procedure */
 } TNetworkTransition, *TPNetworkTransition;
 

-typedef long (*NetworkTransitionProcPtr)();
-                               /* (TPNetworkTransition nettrans, 
-                                  unsigned long thenet); */
+typedef long (*NetworkTransitionProcPtr)(TPNetworkTransition nettrans, 
+                                  unsigned long thenet);

 /*
  * This is the connection control block
  */
 /*
  * This is the connection control block
  */


@@ -246,9 +250,6 @@ typedef struct ccb {
     ADSP_OPEN_DATA of;         /* Holds the data for the open exchange */
     gref_t *gref;                      /* The queue associated with the CCB */
     gbuf_t *sp_mp;
     ADSP_OPEN_DATA of;         /* Holds the data for the open exchange */
     gref_t *gref;                      /* The queue associated with the CCB */
     gbuf_t *sp_mp;

-    atlock_t lock;
-    atlock_t lockClose;
-    atlock_t lockRemove;

 } CCB, *CCBPtr;
 
 
 } CCB, *CCBPtr;
 
 


@@ -309,34 +310,33 @@ typedef struct {
 
 /* fron h/adsp_supp.h */
 
 
 /* fron h/adsp_supp.h */
 

-void   CallUserRoutine();      /* (CCB FPTR sp); */
+void   CallUserRoutine(CCBPtr sp);     /* (CCB FPTR sp); */

 
 
 /*
  *     Add queue element to end of queue.  Pass Address of ptr to 
  *     1st element of queue
 
 
 /*
  *     Add queue element to end of queue.  Pass Address of ptr to 
  *     1st element of queue

+int    qAddToEnd(struct qlink **qhead, struct qlink *qelem);

  */
  */

-int    qAddToEnd(); /* (void FPTR FPTR qhead, void FPTR qelem); */
+               /* (void FPTR FPTR qhead, void FPTR qelem); */

 
 /*
  *     Hunt down a linked list of queue elements looking for an element with
  *     'data' at 'offset' bytes into the queue element.
  */
 
 /*
  *     Hunt down a linked list of queue elements looking for an element with
  *     'data' at 'offset' bytes into the queue element.
  */

-void *qfind_b();               /* (void *qhead, word offset, word data); */ 
-void *qfind_w();               /* (void *qhead, word offset, word data); */
-void *qfind_p();               /* (void *qhead, word offset, void *ptr); */
-void *qfind_o();               /* (void *qhead, word offset, void *ptr); */
-void *qfind_m();               /* (void *qhead, void *match, 
-                                  ProcPtr compare_fnx); */
+void *qfind_b(void *qhead, word offset, word data);
+void *qfind_w(void *qhead, word offset, word data);
+void *qfind_p(void *qhead, word offset, void *ptr);
+void *qfind_o(void *qhead, word offset, void *ptr);
+void *qfind_m(CCBPtr qhead, void *match, ProcPtr compare_fnx);

 
 
 /*
  * Routines to handle sorted timer queues
  */
 
 
 /*
  * Routines to handle sorted timer queues
  */

-void InsertTimerElem();                /* (TimerElemPtr *qhead, TimerElemPtr t, 
-                                  word val); */
-void RemoveTimerElem();                /* (TimerElemPtr *qhead, TimerElemPtr t); */
-void TimerQueueTick();         /* (TimerElemPtr *qhead);*/
+void InsertTimerElem(TimerElemPtr *qhead, TimerElemPtr t, int val);
+void RemoveTimerElem(TimerElemPtr *qhead, TimerElemPtr t);
+void TimerQueueTick(TimerElemPtr *qhead);

 
 /* from h/adsp_global.h */
 
 
 /* from h/adsp_global.h */
 


@@ -355,7 +355,7 @@ extern GLOBAL adspGlobal;
 /* Address of ptr to list of ccb's */
 #define AT_ADSP_STREAMS ((CCB **)&(adspGlobal.ccbList))
 
 /* Address of ptr to list of ccb's */
 #define AT_ADSP_STREAMS ((CCB **)&(adspGlobal.ccbList))
 

-#endif /* __APPLE_API_PRIVATE */
-#endif /* KERNEL */
+#endif /* KERNEL_PRIVATE */
+#endif /* __APPLE_API_OBSOLETE */

 
 #endif /* _NETAT_ADSP_INTERNAL_H_ */
 
 #endif /* _NETAT_ADSP_INTERNAL_H_ */