xnu-792.12.6.tar.gz

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

diff --git a/bsd/netat/atp.h b/bsd/netat/atp.h
index 476e926b71d115dae384d14df6bb4570b0651ab7..e90dc9c5730cd7e0a1a01b60251828d29e13806e 100644 (file)
--- a/bsd/netat/atp.h
+++ b/bsd/netat/atp.h
@@ -1,23 +1,31 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_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.
+ * Copyright (c) 2006 Apple Computer, Inc. All Rights Reserved.
  * 
- * This 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.
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * 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@
  */
 /*
  *
@@ -46,6 +54,9 @@
 
 #ifndef _NETAT_ATP_H_
 #define _NETAT_ATP_H_
+#include <sys/appleapiopts.h>
+
+#ifdef __APPLE_API_OBSOLETE
 
 /* ATP function codes */
 
@@ -183,8 +194,7 @@ typedef struct {
 #define ATP_SENDRESPONSE 2
 #define ATP_GETREQUEST   3
 
-#ifdef KERNEL
-
+#ifdef KERNEL_PRIVATE
 
 
 /*
@@ -403,19 +413,18 @@ struct atp_state {
 #ifdef ATP_DECLARE
 struct atp_trans *atp_trans_free_list = NULL;  /* free transactions */
 struct atp_rcb *atp_rcb_free_list = NULL;              /* free rcbs */
-static struct atp_state *atp_free_list = NULL; /* free atp states */
+struct atp_state *atp_free_list = NULL;                /* free atp states */
 struct atp_trans_qhead atp_trans_abort;                /* aborted trans list */
-static struct atp_rcb atp_rcb_data[NATP_RCB];
-static struct atp_state atp_state_data[NATP_STATE];
-
+struct atp_rcb* atp_rcb_data = NULL;
+struct atp_state* atp_state_data=NULL;
 
 
 #else
 extern struct atp_trans *atp_trans_free_list;          /* free transactions */
 extern struct atp_rcb *atp_rcb_free_list;                      /* free rcbs */
 extern struct atp_state *atp_free_list;                                /* free atp states */
-extern struct atp_rcb atp_rcb_data[];
-extern struct atp_state atp_state_data[];
+extern struct atp_rcb* atp_rcb_data;
+extern struct atp_state* atp_state_data;
 extern struct atp_trans_qhead atp_trans_abort;         /* aborting trans list */
 
 extern void atp_req_timeout();
@@ -431,7 +440,7 @@ void atp_drop_req(gref_t *, gbuf_t *);
 void atp_send_rsp(gref_t *, gbuf_t *, int);
 void atp_wput(gref_t *, gbuf_t *);
 void atp_rput(gref_t *, gbuf_t *);
-void atp_retry_req(gbuf_t *);
+void atp_retry_req(void *);
 void atp_stop(gbuf_t *, int);
 void atp_cancel_req(gref_t *, unsigned short);
 int atp_open(gref_t *, int);
@@ -456,5 +465,6 @@ void atp_timout(void (*func)(), struct atp_trans *, int);
 void atp_untimout(void (*func)(), struct atp_trans *);
 int atp_tid(struct atp_state *);
 
-#endif /* KERNEL */
+#endif /* KERNEL_PRIVATE */
+#endif /* __APPLE_API_OBSOLETE */
 #endif /* _NETAT_ATP_H_ */