xnu-6153.61.1.tar.gz

[apple/xnu.git] / osfmk / kern / kern_cdata.h

diff --git a/osfmk/kern/kern_cdata.h b/osfmk/kern/kern_cdata.h
index fd7543342233076675cb9247ffa4167bc90ad558..398e8a122459bae1de4174cb84eeedb8a3370476 100644 (file)
--- a/osfmk/kern/kern_cdata.h
+++ b/osfmk/kern/kern_cdata.h
@@ -52,7 +52,7 @@
 #define KCDATA_ITEM_DATA_PTR(item)      kcdata_iter_payload(KCDATA_ITEM_ITER(item))
 #define KCDATA_ITEM_FIND_TYPE(itemx, type) (kcdata_iter_find_type(KCDATA_ITEM_ITER(itemx), type).item)
 #define kcdata_get_container_type(buffer) kcdata_iter_container_type(KCDATA_ITEM_ITER(buffer))
-#define kcdata_get_data_with_desc(buf,desc,data) kcdata_iter_get_data_with_desc(KCDATA_ITEM_ITER(buf),desc,data,NULL)
+#define kcdata_get_data_with_desc(buf, desc, data) kcdata_iter_get_data_with_desc(KCDATA_ITEM_ITER(buf),desc,data,NULL)
 /* Do not use these macros! */
 
 #ifdef KERNEL
@@ -62,10 +62,11 @@
 /* Structure to save information about corpse data */
 struct kcdata_descriptor {
        uint32_t            kcd_length;
-       uint32_t kcd_flags;
+       uint16_t kcd_flags;
 #define KCFLAG_USE_MEMCOPY 0x0
 #define KCFLAG_USE_COPYOUT 0x1
 #define KCFLAG_NO_AUTO_ENDBUFFER 0x2
+       uint16_t kcd_user_flags; /* reserved for subsystems using kcdata */
        mach_vm_address_t kcd_addr_begin;
        mach_vm_address_t kcd_addr_end;
 };
@@ -74,15 +75,15 @@ typedef struct kcdata_descriptor * kcdata_descriptor_t;
 
 kcdata_descriptor_t kcdata_memory_alloc_init(mach_vm_address_t crash_data_p, unsigned data_type, unsigned size, unsigned flags);
 kern_return_t kcdata_memory_static_init(
-    kcdata_descriptor_t data, mach_vm_address_t buffer_addr_p, unsigned data_type, unsigned size, unsigned flags);
+       kcdata_descriptor_t data, mach_vm_address_t buffer_addr_p, unsigned data_type, unsigned size, unsigned flags);
 kern_return_t kcdata_memory_destroy(kcdata_descriptor_t data);
 kern_return_t
 kcdata_add_container_marker(kcdata_descriptor_t data, uint32_t header_type, uint32_t container_type, uint64_t identifier);
 kern_return_t kcdata_add_type_definition(kcdata_descriptor_t data,
-                                         uint32_t type_id,
-                                         char * type_name,
-                                         struct kcdata_subtype_descriptor * elements_array_addr,
-                                         uint32_t elements_count);
+    uint32_t type_id,
+    char * type_name,
+    struct kcdata_subtype_descriptor * elements_array_addr,
+    uint32_t elements_count);
 
 kern_return_t kcdata_add_uint64_with_description(kcdata_descriptor_t crashinfo, uint64_t data, const char * description);
 kern_return_t kcdata_add_uint32_with_description(kcdata_descriptor_t crashinfo, uint32_t data, const char * description);
@@ -90,6 +91,7 @@ kern_return_t kcdata_add_uint32_with_description(kcdata_descriptor_t crashinfo,
 kern_return_t kcdata_undo_add_container_begin(kcdata_descriptor_t data);
 
 kern_return_t kcdata_write_buffer_end(kcdata_descriptor_t data);
+void *kcdata_memory_get_begin_addr(kcdata_descriptor_t data);
 
 #else /* XNU_KERNEL_PRIVATE */
 
@@ -99,10 +101,11 @@ typedef void * kcdata_descriptor_t;
 
 uint32_t kcdata_estimate_required_buffer_size(uint32_t num_items, uint32_t payload_size);
 uint64_t kcdata_memory_get_used_bytes(kcdata_descriptor_t kcd);
-kern_return_t kcdata_memcpy(kcdata_descriptor_t data, mach_vm_address_t dst_addr, void * src_addr, uint32_t size);
+kern_return_t kcdata_memcpy(kcdata_descriptor_t data, mach_vm_address_t dst_addr, const void * src_addr, uint32_t size);
+kern_return_t kcdata_bzero(kcdata_descriptor_t data, mach_vm_address_t dst_addr, uint32_t size);
 kern_return_t kcdata_get_memory_addr(kcdata_descriptor_t data, uint32_t type, uint32_t size, mach_vm_address_t * user_addr);
 kern_return_t kcdata_get_memory_addr_for_array(
-    kcdata_descriptor_t data, uint32_t type_of_element, uint32_t size_of_element, uint32_t count, mach_vm_address_t * user_addr);
+       kcdata_descriptor_t data, uint32_t type_of_element, uint32_t size_of_element, uint32_t count, mach_vm_address_t * user_addr);
 
 #endif /* KERNEL */
 #endif /* _KERN_CDATA_H_ */