Update to FreeBSD head 2016-08-23

Git mirror commit 9fe7c416e6abb28b1398fd3e5687099846800cfd.

1 files changed, 54 insertions, 142 deletions

diff --git a/rtemsbsd/local/bus_if.c b/rtemsbsd/local/bus_if.c
index 558888af..169ea7d5 100644
--- a/rtemsbsd/local/bus_if.c
+++ b/rtemsbsd/local/bus_if.c
@@ -24,8 +24,8 @@
 
 static struct resource *
 null_alloc_resource(device_t dev, device_t child,
-    int type, int *rid, u_long start, u_long end,
-    u_long count, u_int flags)
+    int type, int *rid, rman_res_t start, rman_res_t end,
+    rman_res_t count, u_int flags)
 {
     return (0);
 }
@@ -47,243 +47,155 @@ null_add_child(device_t bus, int order, const char *name,
 	panic("bus_add_child is not implemented");
 }
 
-struct kobj_method bus_print_child_method_default = {
-	&bus_print_child_desc, (kobjop_t) bus_generic_print_child
-};
-
 struct kobjop_desc bus_print_child_desc = {
-	0, &bus_print_child_method_default
-};
-
-struct kobj_method bus_probe_nomatch_method_default = {
-	&bus_probe_nomatch_desc, (kobjop_t) kobj_error_method
+	0, { &bus_print_child_desc, (kobjop_t)bus_generic_print_child }
 };
 
 struct kobjop_desc bus_probe_nomatch_desc = {
-	0, &bus_probe_nomatch_method_default
-};
-
-struct kobj_method bus_read_ivar_method_default = {
-	&bus_read_ivar_desc, (kobjop_t) kobj_error_method
+	0, { &bus_probe_nomatch_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_read_ivar_desc = {
-	0, &bus_read_ivar_method_default
-};
-
-struct kobj_method bus_write_ivar_method_default = {
-	&bus_write_ivar_desc, (kobjop_t) kobj_error_method
+	0, { &bus_read_ivar_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_write_ivar_desc = {
-	0, &bus_write_ivar_method_default
-};
-
-struct kobj_method bus_child_deleted_method_default = {
-	&bus_child_deleted_desc, (kobjop_t) kobj_error_method
+	0, { &bus_write_ivar_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_child_deleted_desc = {
-	0, &bus_child_deleted_method_default
-};
-
-struct kobj_method bus_child_detached_method_default = {
-	&bus_child_detached_desc, (kobjop_t) kobj_error_method
+	0, { &bus_child_deleted_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_child_detached_desc = {
-	0, &bus_child_detached_method_default
-};
-
-struct kobj_method bus_driver_added_method_default = {
-	&bus_driver_added_desc, (kobjop_t) bus_generic_driver_added
+	0, { &bus_child_detached_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_driver_added_desc = {
-	0, &bus_driver_added_method_default
-};
-
-struct kobj_method bus_add_child_method_default = {
-	&bus_add_child_desc, (kobjop_t) null_add_child
+	0, { &bus_driver_added_desc, (kobjop_t)bus_generic_driver_added }
 };
 
 struct kobjop_desc bus_add_child_desc = {
-	0, &bus_add_child_method_default
+	0, { &bus_add_child_desc, (kobjop_t)null_add_child }
 };
 
-struct kobj_method bus_alloc_resource_method_default = {
-	&bus_alloc_resource_desc, (kobjop_t) null_alloc_resource
+struct kobjop_desc bus_rescan_desc = {
+	0, { &bus_rescan_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_alloc_resource_desc = {
-	0, &bus_alloc_resource_method_default
-};
-
-struct kobj_method bus_activate_resource_method_default = {
-	&bus_activate_resource_desc, (kobjop_t) kobj_error_method
+	0, { &bus_alloc_resource_desc, (kobjop_t)null_alloc_resource }
 };
 
 struct kobjop_desc bus_activate_resource_desc = {
-	0, &bus_activate_resource_method_default
+	0, { &bus_activate_resource_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobj_method bus_deactivate_resource_method_default = {
-	&bus_deactivate_resource_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc bus_map_resource_desc = {
+	0, { &bus_map_resource_desc, (kobjop_t)bus_generic_map_resource }
 };
 
-struct kobjop_desc bus_deactivate_resource_desc = {
-	0, &bus_deactivate_resource_method_default
+struct kobjop_desc bus_unmap_resource_desc = {
+	0, { &bus_unmap_resource_desc, (kobjop_t)bus_generic_unmap_resource }
 };
 
-struct kobj_method bus_adjust_resource_method_default = {
-	&bus_adjust_resource_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc bus_deactivate_resource_desc = {
+	0, { &bus_deactivate_resource_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_adjust_resource_desc = {
-	0, &bus_adjust_resource_method_default
-};
-
-struct kobj_method bus_release_resource_method_default = {
-	&bus_release_resource_desc, (kobjop_t) kobj_error_method
+	0, { &bus_adjust_resource_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_release_resource_desc = {
-	0, &bus_release_resource_method_default
-};
-
-struct kobj_method bus_setup_intr_method_default = {
-	&bus_setup_intr_desc, (kobjop_t) kobj_error_method
+	0, { &bus_release_resource_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_setup_intr_desc = {
-	0, &bus_setup_intr_method_default
-};
-
-struct kobj_method bus_teardown_intr_method_default = {
-	&bus_teardown_intr_desc, (kobjop_t) kobj_error_method
+	0, { &bus_setup_intr_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_teardown_intr_desc = {
-	0, &bus_teardown_intr_method_default
-};
-
-struct kobj_method bus_set_resource_method_default = {
-	&bus_set_resource_desc, (kobjop_t) kobj_error_method
+	0, { &bus_teardown_intr_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_set_resource_desc = {
-	0, &bus_set_resource_method_default
-};
-
-struct kobj_method bus_get_resource_method_default = {
-	&bus_get_resource_desc, (kobjop_t) kobj_error_method
+	0, { &bus_set_resource_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_get_resource_desc = {
-	0, &bus_get_resource_method_default
-};
-
-struct kobj_method bus_delete_resource_method_default = {
-	&bus_delete_resource_desc, (kobjop_t) kobj_error_method
+	0, { &bus_get_resource_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_delete_resource_desc = {
-	0, &bus_delete_resource_method_default
-};
-
-struct kobj_method bus_get_resource_list_method_default = {
-	&bus_get_resource_list_desc, (kobjop_t) bus_generic_get_resource_list
+	0, { &bus_delete_resource_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_get_resource_list_desc = {
-	0, &bus_get_resource_list_method_default
-};
-
-struct kobj_method bus_child_present_method_default = {
-	&bus_child_present_desc, (kobjop_t) bus_generic_child_present
+	0, { &bus_get_resource_list_desc, (kobjop_t)bus_generic_get_resource_list }
 };
 
 struct kobjop_desc bus_child_present_desc = {
-	0, &bus_child_present_method_default
-};
-
-struct kobj_method bus_child_pnpinfo_str_method_default = {
-	&bus_child_pnpinfo_str_desc, (kobjop_t) kobj_error_method
+	0, { &bus_child_present_desc, (kobjop_t)bus_generic_child_present }
 };
 
 struct kobjop_desc bus_child_pnpinfo_str_desc = {
-	0, &bus_child_pnpinfo_str_method_default
-};
-
-struct kobj_method bus_child_location_str_method_default = {
-	&bus_child_location_str_desc, (kobjop_t) kobj_error_method
+	0, { &bus_child_pnpinfo_str_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_child_location_str_desc = {
-	0, &bus_child_location_str_method_default
-};
-
-struct kobj_method bus_bind_intr_method_default = {
-	&bus_bind_intr_desc, (kobjop_t) bus_generic_bind_intr
+	0, { &bus_child_location_str_desc, (kobjop_t)kobj_error_method }
 };
 
 struct kobjop_desc bus_bind_intr_desc = {
-	0, &bus_bind_intr_method_default
-};
-
-struct kobj_method bus_config_intr_method_default = {
-	&bus_config_intr_desc, (kobjop_t) bus_generic_config_intr
+	0, { &bus_bind_intr_desc, (kobjop_t)bus_generic_bind_intr }
 };
 
 struct kobjop_desc bus_config_intr_desc = {
-	0, &bus_config_intr_method_default
-};
-
-struct kobj_method bus_describe_intr_method_default = {
-	&bus_describe_intr_desc, (kobjop_t) bus_generic_describe_intr
+	0, { &bus_config_intr_desc, (kobjop_t)bus_generic_config_intr }
 };
 
 struct kobjop_desc bus_describe_intr_desc = {
-	0, &bus_describe_intr_method_default
+	0, { &bus_describe_intr_desc, (kobjop_t)bus_generic_describe_intr }
 };
 
-struct kobj_method bus_hinted_child_method_default = {
-	&bus_hinted_child_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc bus_hinted_child_desc = {
+	0, { &bus_hinted_child_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobjop_desc bus_hinted_child_desc = {
-	0, &bus_hinted_child_method_default
+struct kobjop_desc bus_get_dma_tag_desc = {
+	0, { &bus_get_dma_tag_desc, (kobjop_t)bus_generic_get_dma_tag }
 };
 
-struct kobj_method bus_get_dma_tag_method_default = {
-	&bus_get_dma_tag_desc, (kobjop_t) bus_generic_get_dma_tag
+struct kobjop_desc bus_get_bus_tag_desc = {
+	0, { &bus_get_bus_tag_desc, (kobjop_t)bus_generic_get_bus_tag }
 };
 
-struct kobjop_desc bus_get_dma_tag_desc = {
-	0, &bus_get_dma_tag_method_default
+struct kobjop_desc bus_hint_device_unit_desc = {
+	0, { &bus_hint_device_unit_desc, (kobjop_t)kobj_error_method }
 };
 
-struct kobj_method bus_hint_device_unit_method_default = {
-	&bus_hint_device_unit_desc, (kobjop_t) kobj_error_method
+struct kobjop_desc bus_new_pass_desc = {
+	0, { &bus_new_pass_desc, (kobjop_t)bus_generic_new_pass }
 };
 
-struct kobjop_desc bus_hint_device_unit_desc = {
-	0, &bus_hint_device_unit_method_default
+struct kobjop_desc bus_remap_intr_desc = {
+	0, { &bus_remap_intr_desc, (kobjop_t)null_remap_intr }
 };
 
-struct kobj_method bus_new_pass_method_default = {
-	&bus_new_pass_desc, (kobjop_t) bus_generic_new_pass
+struct kobjop_desc bus_suspend_child_desc = {
+	0, { &bus_suspend_child_desc, (kobjop_t)bus_generic_suspend_child }
 };
 
-struct kobjop_desc bus_new_pass_desc = {
-	0, &bus_new_pass_method_default
+struct kobjop_desc bus_resume_child_desc = {
+	0, { &bus_resume_child_desc, (kobjop_t)bus_generic_resume_child }
 };
 
-struct kobj_method bus_remap_intr_method_default = {
-	&bus_remap_intr_desc, (kobjop_t) null_remap_intr
+struct kobjop_desc bus_get_domain_desc = {
+	0, { &bus_get_domain_desc, (kobjop_t)bus_generic_get_domain }
 };
 
-struct kobjop_desc bus_remap_intr_desc = {
-	0, &bus_remap_intr_method_default
+struct kobjop_desc bus_get_cpus_desc = {
+	0, { &bus_get_cpus_desc, (kobjop_t)bus_generic_get_cpus }
 };