xnu-792.25.20.tar.gz

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

diff --git a/bsd/netat/atp.h b/bsd/netat/atp.h
index 476e926b71d115dae384d14df6bb4570b0651ab7..87a474a8902fd8eaf8b54a78fcf3072b965c75ce 100644 (file)
--- a/bsd/netat/atp.h
+++ b/bsd/netat/atp.h
@@ -46,6 +46,9 @@
 
 #ifndef _NETAT_ATP_H_
 #define _NETAT_ATP_H_
+#include <sys/appleapiopts.h>
+
+#ifdef __APPLE_API_OBSOLETE
 
 /* ATP function codes */
 
@@ -76,13 +79,22 @@
 #define        ATP_XO_8MIN             4
 
 typedef struct {
+#if BYTE_ORDER == BIG_ENDIAN
         unsigned       cmd : 2,
                        xo : 1,
                        eom : 1,
                        sts : 1,
                        xo_relt : 3;
+#endif
+#if BYTE_ORDER == LITTLE_ENDIAN
+               unsigned                xo_relt : 3,
+                                               sts : 1,
+                                               eom : 1,
+                                               xo : 1,
+                                               cmd : 2;
+#endif
         u_char         bitmap;
-       ua_short       tid;
+               ua_short       tid;
         ua_long        user_bytes;
         u_char         data[ATP_DATA_SIZE];
 } at_atp_t;
@@ -183,8 +195,7 @@ typedef struct {
 #define ATP_SENDRESPONSE 2
 #define ATP_GETREQUEST   3
 
-#ifdef KERNEL
-
+#ifdef KERNEL_PRIVATE
 
 
 /*
@@ -403,19 +414,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 +441,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 +466,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_ */