xnu-1228.0.2.tar.gz

[apple/xnu.git] / bsd / sys / disk.h

diff --git a/bsd/sys/disk.h b/bsd/sys/disk.h
index f7e627b64c73ab9780f2f797ad0cdde1a60c694e..b36277729cac25e1453db1e0cb6b1396b231466b 100644 (file)
--- a/bsd/sys/disk.h
+++ b/bsd/sys/disk.h
@@ -1,31 +1,36 @@
 /*
 /*

- * Copyright (c) 1998-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2006 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@

  */
 
 #ifndef        _SYS_DISK_H_
 #define        _SYS_DISK_H_
 
  */
 
 #ifndef        _SYS_DISK_H_
 #define        _SYS_DISK_H_
 

+#include <stdint.h>

 #include <sys/ioctl.h>
 #include <sys/ioctl.h>

-#include <sys/types.h>
-#include <sys/cdefs.h>

 
 /*
  * Definitions
 
 /*
  * Definitions


@@ -59,8 +64,6 @@
  * DKIOCGETMAXSEGMENTADDRESSABLEBITCOUNT get maximum segment width in bits
  */
 
  * DKIOCGETMAXSEGMENTADDRESSABLEBITCOUNT get maximum segment width in bits
  */
 

-#pragma pack(4)
-

 typedef struct
 {
     char path[128];
 typedef struct
 {
     char path[128];


@@ -68,55 +71,58 @@ typedef struct
 
 typedef struct
 {
 
 typedef struct
 {

-    u_int64_t              blockCount;
-    u_int32_t              blockSize;
+    uint64_t               blockCount;
+    uint32_t               blockSize;

 
 

-    u_int8_t               reserved0096[4];        /* reserved, clear to zero */
+    uint8_t                reserved0096[4];        /* reserved, clear to zero */

 } dk_format_capacity_t;
 
 } dk_format_capacity_t;
 

-/* LP64todo: not 64-bit clean */

 typedef struct
 {
     dk_format_capacity_t * capacities;
 typedef struct
 {
     dk_format_capacity_t * capacities;

-    u_int32_t              capacitiesCount;        /* use zero to probe count */
+    uint32_t               capacitiesCount;        /* use zero to probe count */

 
 

-    u_int8_t               reserved0064[8];        /* reserved, clear to zero */
+#ifdef __LP64__
+    uint8_t                reserved0096[4];        /* reserved, clear to zero */
+#else /* !__LP64__ */
+    uint8_t                reserved0064[8];        /* reserved, clear to zero */
+#endif /* !__LP64__ */

 } dk_format_capacities_t;
 
 } dk_format_capacities_t;
 

-#pragma pack()
-

 #define DKIOCEJECT                            _IO('d', 21)
 #define DKIOCSYNCHRONIZECACHE                 _IO('d', 22)
 
 #define DKIOCFORMAT                           _IOW('d', 26, dk_format_capacity_t)
 #define DKIOCGETFORMATCAPACITIES              _IOWR('d', 26, dk_format_capacities_t)
 
 #define DKIOCEJECT                            _IO('d', 21)
 #define DKIOCSYNCHRONIZECACHE                 _IO('d', 22)
 
 #define DKIOCFORMAT                           _IOW('d', 26, dk_format_capacity_t)
 #define DKIOCGETFORMATCAPACITIES              _IOWR('d', 26, dk_format_capacities_t)
 

-#define DKIOCGETBLOCKSIZE                     _IOR('d', 24, u_int32_t)
-#define DKIOCGETBLOCKCOUNT                    _IOR('d', 25, u_int64_t)
+#define DKIOCGETBLOCKSIZE                     _IOR('d', 24, uint32_t)
+#define DKIOCGETBLOCKCOUNT                    _IOR('d', 25, uint64_t)

 #define DKIOCGETFIRMWAREPATH                  _IOR('d', 28, dk_firmware_path_t)
 
 #define DKIOCGETFIRMWAREPATH                  _IOR('d', 28, dk_firmware_path_t)
 

-#define DKIOCISFORMATTED                      _IOR('d', 23, u_int32_t)
-#define DKIOCISWRITABLE                       _IOR('d', 29, u_int32_t)
+#define DKIOCISFORMATTED                      _IOR('d', 23, uint32_t)
+#define DKIOCISWRITABLE                       _IOR('d', 29, uint32_t)

 
 

-#define DKIOCGETMAXBLOCKCOUNTREAD             _IOR('d', 64, u_int64_t)
-#define DKIOCGETMAXBLOCKCOUNTWRITE            _IOR('d', 65, u_int64_t)
-#define DKIOCGETMAXBYTECOUNTREAD              _IOR('d', 70, u_int64_t)
-#define DKIOCGETMAXBYTECOUNTWRITE             _IOR('d', 71, u_int64_t)
+#define DKIOCGETMAXBLOCKCOUNTREAD             _IOR('d', 64, uint64_t)
+#define DKIOCGETMAXBLOCKCOUNTWRITE            _IOR('d', 65, uint64_t)
+#define DKIOCGETMAXBYTECOUNTREAD              _IOR('d', 70, uint64_t)
+#define DKIOCGETMAXBYTECOUNTWRITE             _IOR('d', 71, uint64_t)

 
 

-#define DKIOCGETMAXSEGMENTCOUNTREAD           _IOR('d', 66, u_int64_t)
-#define DKIOCGETMAXSEGMENTCOUNTWRITE          _IOR('d', 67, u_int64_t)
-#define DKIOCGETMAXSEGMENTBYTECOUNTREAD       _IOR('d', 68, u_int64_t)
-#define DKIOCGETMAXSEGMENTBYTECOUNTWRITE      _IOR('d', 69, u_int64_t)
+#define DKIOCGETMAXSEGMENTCOUNTREAD           _IOR('d', 66, uint64_t)
+#define DKIOCGETMAXSEGMENTCOUNTWRITE          _IOR('d', 67, uint64_t)
+#define DKIOCGETMAXSEGMENTBYTECOUNTREAD       _IOR('d', 68, uint64_t)
+#define DKIOCGETMAXSEGMENTBYTECOUNTWRITE      _IOR('d', 69, uint64_t)

 
 

-#define DKIOCGETMINSEGMENTALIGNMENTBYTECOUNT  _IOR('d', 74, u_int64_t)
-#define DKIOCGETMAXSEGMENTADDRESSABLEBITCOUNT _IOR('d', 75, u_int64_t)
+#define DKIOCGETMINSEGMENTALIGNMENTBYTECOUNT  _IOR('d', 74, uint64_t)
+#define DKIOCGETMAXSEGMENTADDRESSABLEBITCOUNT _IOR('d', 75, uint64_t)

 
 #ifdef KERNEL
 
 #ifdef KERNEL

-#define DKIOCGETBLOCKCOUNT32                  _IOR('d', 25, u_int32_t)
-#define DKIOCSETBLOCKSIZE                     _IOW('d', 24, u_int32_t)
-#define DKIOCGETBSDUNIT                       _IOR('d', 27, u_int32_t)
-#define DKIOCISVIRTUAL                        _IOR('d', 72, u_int32_t)
-#define DKIOCGETBASE                          _IOR('d', 73, u_int64_t)
+#define DK_FEATURE_FORCE_UNIT_ACCESS          0x00000001
+#define DKIOCGETBLOCKCOUNT32                  _IOR('d', 25, uint32_t)
+#define DKIOCSETBLOCKSIZE                     _IOW('d', 24, uint32_t)
+#define DKIOCGETBSDUNIT                       _IOR('d', 27, uint32_t)
+#define DKIOCISVIRTUAL                        _IOR('d', 72, uint32_t)
+#define DKIOCGETBASE                          _IOR('d', 73, uint64_t)
+#define DKIOCGETFEATURES                      _IOR('d', 76, uint32_t)

 #endif /* KERNEL */
 
 #endif /* _SYS_DISK_H_ */
 #endif /* KERNEL */
 
 #endif /* _SYS_DISK_H_ */