xnu-2050.9.2.tar.gz

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

diff --git a/bsd/netat/sysglue.h b/bsd/netat/sysglue.h
index 2c84a83f42754eb1e3794c6be5ba38d55e7ea083..10d74f988317ba3063d2ed60e81a2cd10cced365 100644 (file)
--- a/bsd/netat/sysglue.h
+++ b/bsd/netat/sysglue.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -64,21 +64,13 @@ typedef struct {
  * grow when we're dealing with a 64-bit process.
  * WARNING - keep in sync with ioccmd_t
  */
  * grow when we're dealing with a 64-bit process.
  * WARNING - keep in sync with ioccmd_t
  */

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=natural
-#endif
-

 typedef struct {
        int             ic_cmd;
        int             ic_timout;
        int             ic_len;
 typedef struct {
        int             ic_cmd;
        int             ic_timout;
        int             ic_len;

-       user_addr_t     ic_dp;
+       user_addr_t     ic_dp __attribute__((aligned(8)));

 } user_ioccmd_t;
 
 } user_ioccmd_t;
 

-#if __DARWIN_ALIGN_NATURAL
-#pragma options align=reset
-#endif
-

 #endif // KERNEL_PRIVATE
 #endif // KERNEL
 
 #endif // KERNEL_PRIVATE
 #endif // KERNEL
 


@@ -164,10 +156,6 @@ typedef struct {
 typedef int atevent_t;
 
 typedef int atlock_t;
 typedef int atevent_t;
 
 typedef int atlock_t;

-typedef int *atomic_p; 
-#define ATLOCKINIT(a)  (a = (atlock_t) EVENT_NULL)
-#define ATDISABLE(l, a)
-#define ATENABLE(l, a)

 #define ATEVENTINIT(a)  (a = (atevent_t) EVENT_NULL)
 #define DDP_OUTPUT(m) ddp_putmsg(0,m)
 #define StaticProc static
 #define ATEVENTINIT(a)  (a = (atevent_t) EVENT_NULL)
 #define DDP_OUTPUT(m) ddp_putmsg(0,m)
 #define StaticProc static


@@ -188,6 +176,8 @@ int gbuf_freel(gbuf_t *m);
 void gbuf_linkb(gbuf_t *m1, gbuf_t *m2);
 void gbuf_linkpkt(gbuf_t *m1, gbuf_t *m2);
 int gbuf_msgsize(gbuf_t *m);
 void gbuf_linkb(gbuf_t *m1, gbuf_t *m2);
 void gbuf_linkpkt(gbuf_t *m1, gbuf_t *m2);
 int gbuf_msgsize(gbuf_t *m);

+struct mbuf *copy_pkt(struct mbuf *, int);
+int append_copy(struct mbuf *, struct mbuf *, int);

 
 #define gbuf_cont(m)   m->m_next
 #define gbuf_next(m)   m->m_nextpkt
 
 #define gbuf_cont(m)   m->m_next
 #define gbuf_next(m)   m->m_nextpkt


@@ -220,6 +210,12 @@ int gbuf_msgsize(gbuf_t *m);
 #undef timeout
 #undef untimeout
 
 #undef timeout
 #undef untimeout
 

+struct atpBDS;
+int _ATPgetrsp(int, struct atpBDS *, int *, void *);
+int _ATPgetreq(int , unsigned char *, int , int *, void *);
+int _ATPsndrsp(int , unsigned char *, int , int, int *, void *);
+int _ATPsndreq(int , unsigned char *, int , int, int *, void *);
+

 #endif /* KERNEL_PRIVATE */
 #endif /* KERNEL */
 #endif /* __APPLE_API_OBSOLETE */
 #endif /* KERNEL_PRIVATE */
 #endif /* KERNEL */
 #endif /* __APPLE_API_OBSOLETE */