xnu-792.6.56.tar.gz

[apple/xnu.git] / bsd / isofs / cd9660 / cd9660_mount.h

diff --git a/bsd/isofs/cd9660/cd9660_mount.h b/bsd/isofs/cd9660/cd9660_mount.h
index 8be4d37063c08d7f79a58fa585b72519167136b4..b022b234d3913ba27b146cedf65afe422b535b60 100644 (file)
--- a/bsd/isofs/cd9660/cd9660_mount.h
+++ b/bsd/isofs/cd9660/cd9660_mount.h
@@ -1,10 +1,8 @@
 /*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
  * 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
@@ -66,21 +64,51 @@
 #define __ISOFS_CD9660_CD9660_MOUNT_H__
 
 #include <sys/appleapiopts.h>
+#include <sys/cdefs.h>
 
 #ifdef __APPLE_API_UNSTABLE
 /*
  * Arguments to mount ISO 9660 filesystems.
  */
+struct CDTOC;
 struct iso_args {
+#ifndef KERNEL
        char    *fspec;                 /* block special device to mount */
-       struct  export_args export;     /* network export info */
+#endif
        int     flags;                  /* mounting flags, see below */
        int     ssector;                /* starting sector, 0 for 1st session */
+       int     toc_length;             /* Size of *toc, including the toc.length field */
+       struct CDTOC *toc;
 };
 #define        ISOFSMNT_NORRIP   0x00000001    /* disable Rock Ridge Ext.*/
 #define        ISOFSMNT_GENS     0x00000002    /* enable generation numbers */
 #define        ISOFSMNT_EXTATT   0x00000004    /* enable extended attributes */
 #define        ISOFSMNT_NOJOLIET 0x00000008    /* disable Joliet Ext.*/
+#define ISOFSMNT_TOC     0x00000010    /* iso_args.toc is valid */
+
+#ifdef KERNEL
+/* LP64 version of iso_args.  all pointers 
+ * grow when we're dealing with a 64-bit process.
+ * WARNING - keep in sync with iso_args
+ */
+/* LP64todo - should this move? */
+
+#if __DARWIN_ALIGN_NATURAL
+#pragma options align=natural
+#endif
+
+struct user_iso_args {
+       int     flags;                  /* mounting flags, see below */
+       int     ssector;                /* starting sector, 0 for 1st session */
+       int     toc_length;             /* Size of *toc, including the toc.length field */
+       user_addr_t toc;
+};
+
+#if __DARWIN_ALIGN_NATURAL
+#pragma options align=reset
+#endif
+
+#endif /* KERNEL */
 
 #endif /* __APPLE_API_UNSTABLE */
 #endif /* __ISOFS_CD9660_CD9660_MOUNT_H__ */