xnu-792.tar.gz

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

diff --git a/bsd/netat/adsp.h b/bsd/netat/adsp.h
index bf40ffbd573a486e8fa3f0e61bdb836f4b0c7bc9..315a7decc18e6576bed901ff7a43be53a229aebd 100644 (file)
--- a/bsd/netat/adsp.h
+++ b/bsd/netat/adsp.h
@@ -31,6 +31,10 @@
 #ifndef _NETAT_ADSP_H_
 #define _NETAT_ADSP_H_
 #include <sys/appleapiopts.h>
+#include <netat/appletalk.h>
+
+#ifdef __APPLE_API_OBSOLETE
+
 /* ADSP flags for read, write, and close routines */
 
 #define        ADSP_EOM        0x01    /* Sent or received EOM with data */
@@ -269,7 +273,7 @@ struct tpb {
 #endif
 */
 
-typedef long (*ProcPtr)();
+typedef long (*ProcPtr)();     /* XXX */
 typedef ProcPtr *ProcHandle;
 typedef char *Ptr;
 typedef Ptr *Handle;
@@ -663,8 +667,7 @@ typedef struct {
 #define ADSPGETSOCK    ((AT_MID_ADSP<<8) | 239)
 #define ADSPGETPEER    ((AT_MID_ADSP<<8) | 238)
 
-#ifdef KERNEL
-#ifdef __APPLE_API_PRIVATE
+#ifdef KERNEL_PRIVATE
 
 /* from h/adsp_adsp.h */
 
@@ -674,19 +677,22 @@ typedef struct {
 #define STR_PUTBACK    2
 #define STR_QTIME      (HZ >> 3)
 
-extern int adspInit();
-extern int adspOpen();
-extern int adspCLListen();
-extern int adspClose();
-extern int adspCLDeny();
-extern int adspStatus();
-extern int adspRead();
-extern int adspWrite();
-extern int adspAttention();
-extern int adspOptions();
-extern int adspReset();
-extern int adspNewCID();
-extern int adspPacket();
+struct ccb;
+#define CCBPtr  struct ccb *
+extern int adspInit(CCBPtr sp, struct adspcmd *ap);
+extern int adspOpen(register CCBPtr sp, register struct adspcmd *pb);
+extern int adspCLListen( register CCBPtr sp, register struct adspcmd *pb);
+extern int adspClose(register CCBPtr sp, register struct adspcmd *pb);
+extern int adspCLDeny(struct adspcmd *pb, CCBPtr sp);
+extern int adspStatus(CCBPtr sp, register struct adspcmd *pb);
+extern int adspRead(register CCBPtr sp, register struct adspcmd *pb);
+extern int adspWrite(CCBPtr sp, struct adspcmd *pb);
+extern int adspAttention(register struct adspcmd *pb, register CCBPtr sp);
+extern int adspOptions(CCBPtr sp, struct adspcmd *pb);
+extern int adspReset(CCBPtr sp, struct adspcmd *pb);
+extern int adspNewCID(CCBPtr sp, struct adspcmd *pb);
+extern int adspPacket(gref_t *gref, gbuf_t *mp);
+#undef CCBPtr
 
 
 struct adsp_debug {
@@ -701,6 +707,6 @@ struct adsp_debug {
     int ad_sendWdwSeq;
 };
 
-#endif /* __APPLE_API_PRIVATE */
-#endif /* KERNEL */
+#endif /* KERNEL_PRIVATE */
+#endif /* __APPLE_API_OBSOLETE */
 #endif /* _NETAT_ADSP_H_ */