xnu-1228.tar.gz

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

diff --git a/bsd/netat/adsp.h b/bsd/netat/adsp.h
index 9da7c99c09c80c530f8809ab733b457af44ab185..7641f8d22494d7732c02a862b28b33bc200ec0ef 100644 (file)
--- a/bsd/netat/adsp.h
+++ b/bsd/netat/adsp.h
@@ -1,23 +1,29 @@
 /*
  * 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@

  */
 /*
  *
  */
 /*
  *


@@ -31,6 +37,10 @@
 #ifndef _NETAT_ADSP_H_
 #define _NETAT_ADSP_H_
 #include <sys/appleapiopts.h>
 #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 */
 /* ADSP flags for read, write, and close routines */
 
 #define        ADSP_EOM        0x01    /* Sent or received EOM with data */


@@ -269,7 +279,7 @@ struct tpb {
 #endif
 */
 
 #endif
 */
 

-typedef long (*ProcPtr)();
+typedef long (*ProcPtr)(void *, void *);       /* XXX */

 typedef ProcPtr *ProcHandle;
 typedef char *Ptr;
 typedef Ptr *Handle;
 typedef ProcPtr *ProcHandle;
 typedef char *Ptr;
 typedef Ptr *Handle;


@@ -473,7 +483,7 @@ typedef struct {
 } DDP_FRAME;
 
 #define DDPS_FRAME_LEN     5
 } DDP_FRAME;
 
 #define DDPS_FRAME_LEN     5

-#endif NOT_USED
+#endif /* NOT_USED */

 
 typedef struct {
   ua_short   ddpx_length;            /* length and hop count        */
 
 typedef struct {
   ua_short   ddpx_length;            /* length and hop count        */


@@ -591,7 +601,7 @@ typedef struct
    u_char  ResponderLink;
    u_char  data[1];
 } RESPONDER_FRAME;
    u_char  ResponderLink;
    u_char  data[1];
 } RESPONDER_FRAME;

-#endif NOT_USED
+#endif /* NOT_USED */

 
 /*
  * ADSP Frame
 
 /*
  * ADSP Frame


@@ -663,8 +673,7 @@ typedef struct {
 #define ADSPGETSOCK    ((AT_MID_ADSP<<8) | 239)
 #define ADSPGETPEER    ((AT_MID_ADSP<<8) | 238)
 
 #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 */
 
 
 /* from h/adsp_adsp.h */
 


@@ -674,19 +683,26 @@ typedef struct {
 #define STR_PUTBACK    2
 #define STR_QTIME      (HZ >> 3)
 
 #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);
+
+int adsp_open(gref_t *);
+void adsp_input(gbuf_t *);
+
+#undef CCBPtr

 
 
 struct adsp_debug {
 
 
 struct adsp_debug {


@@ -701,6 +717,6 @@ struct adsp_debug {
     int ad_sendWdwSeq;
 };
 
     int ad_sendWdwSeq;
 };
 

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

 #endif /* _NETAT_ADSP_H_ */
 #endif /* _NETAT_ADSP_H_ */