X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/2d21ac55c334faf3a56e5634905ed6987fc787d4..13f56ec4e58bf8687e2a68032c093c0213dd519b:/osfmk/device/device.defs?ds=sidebyside

diff --git a/osfmk/device/device.defs b/osfmk/device/device.defs
index 32052fec1..458d89540 100644
--- a/osfmk/device/device.defs
+++ b/osfmk/device/device.defs
@@ -96,6 +96,7 @@ type NDR_record_t         = struct[8] of char;
 type io_user_scalar_t     = uint64_t;
 type io_user_reference_t  = uint64_t;
 type io_scalar_inband_t   = array[*:16] of int;
+// must be the same type as OSAsyncReference
 type io_async_ref_t 	  = array[*:8]  of natural_t;
 type io_scalar_inband64_t = array[*:16] of io_user_scalar_t;
 type io_async_ref64_t 	  = array[*:8]  of io_user_reference_t;
@@ -214,12 +215,14 @@ routine io_registry_entry_get_parent_iterator(
 	out iterator		: io_object_t
 	);
 
-routine io_service_open(
+skip;
+/* was routine io_service_open
 	    service		: io_object_t;
 	in  owningTask		: task_t;
 	in  connect_type	: uint32_t;
 	out connection		: io_connect_t
 	);
+*/
 
 routine io_service_close(
 	    connection		: io_connect_t
@@ -242,8 +245,13 @@ routine io_connect_map_memory(
 	    connection		: io_connect_t;
 	in  memory_type		: uint32_t;
 	in  into_task		: task_t;
+#if  KERNEL_SERVER
+	inout address		: uint32_t;
+	inout size		: uint32_t;
+#else
 	inout address		: vm_address_t;
 	inout size		: vm_size_t;
+#endif
 	in  flags		: uint32_t
 	);
 #else
@@ -484,7 +492,11 @@ routine io_connect_unmap_memory(
 	    connection		: io_connect_t;
 	in  memory_type		: uint32_t;
 	in  into_task		: task_t;
+#if KERNEL_SERVER
+	in  address		: uint32_t
+#else
 	in  address		: vm_address_t
+#endif
 	);
 #else
 skip;
@@ -504,10 +516,11 @@ routine io_registry_entry_get_property_recursively(
 	out properties		: io_buf_ptr_t, physicalcopy
 	);
 
-
 routine io_service_get_state(
 	    service		: io_object_t;
-	out state		: uint64_t
+	out state		: uint64_t;
+	out busy_state		: uint32_t;
+	out accumulated_busy_time : uint64_t
 	);
 
 routine io_service_get_matching_services_ool(
@@ -588,8 +601,8 @@ routine io_connect_method(
 	in  ool_input		: mach_vm_address_t;
 	in  ool_input_size	: mach_vm_size_t;
 
-	out scalar_output	: io_scalar_inband64_t, CountInOut;
 	out inband_output	: io_struct_inband_t, CountInOut;
+	out scalar_output	: io_scalar_inband64_t, CountInOut;
 	in  ool_output		: mach_vm_address_t;
 	inout ool_output_size	: mach_vm_size_t
 	);
@@ -605,8 +618,8 @@ routine io_connect_async_method(
 	in  ool_input		: mach_vm_address_t;
 	in  ool_input_size	: mach_vm_size_t;
 
-	out scalar_output	: io_scalar_inband64_t, CountInOut;
 	out inband_output	: io_struct_inband_t, CountInOut;
+	out scalar_output	: io_scalar_inband64_t, CountInOut;
 	in  ool_output		: mach_vm_address_t;
 	inout  ool_output_size	: mach_vm_size_t
 	);
@@ -654,9 +667,34 @@ routine FUNC_NAME(io_service_add_notification_ool)(
 	out notification	: io_object_t
 	);
 
+#else
+
+    skip;
+    skip;
+    skip;
+    skip;
 
 #endif /* KERNEL_SERVER || __LP64__ */
 
+routine io_registry_entry_get_registry_entry_id(
+	    registry_entry	: io_object_t;
+	out entry_id		: uint64_t
+	);
+
+routine io_connect_method_var_output(
+	    connection		: io_connect_t;
+	in  selector		: uint32_t;
+
+	in  scalar_input	: io_scalar_inband64_t;
+	in  inband_input	: io_struct_inband_t;
+	in  ool_input		: mach_vm_address_t;
+	in  ool_input_size	: mach_vm_size_t;
+
+	out inband_output	: io_struct_inband_t, CountInOut;
+	out scalar_output	: io_scalar_inband64_t, CountInOut;
+	out var_output		: io_buf_ptr_t, physicalcopy
+	);
+
 #endif /* IOKIT */
 
 /* vim: set ft=c : */