 @@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.79 2017/10/10 13:51:21 jperkin Exp $
+# $NetBSD: Makefile,v 1.80 2018/05/19 13:25:36 jmcneill Exp $
 DISTNAME=		hal-0.5.14
-PKGREVISION=		18
+PKGREVISION=		19
 CATEGORIES=		sysutils
 MASTER_SITES=		http://hal.freedesktop.org/releases/
 EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://hal.freedesktop.org/
 COMMENT=		FreeDesktop hardware abstraction layer
 LICENSE=		gnu-gpl-v2
 DEPENDS+=		pciids-[0-9]*:../../misc/pciids
 BUILD_DEFS+=		VARBASE PKG_SYSCONFBASE

 @@ -38,26 +38,41 @@
 #include "devinfo_cpu.h"
 #include "devinfo_optical.h"
 /* #include "devinfo_scsipi.h" */
 #include "drvctl.h"
 void devinfo_add_subtree(HalDevice *parent, const char *devnode, gboolean is_root);
 void
 devinfo_add(HalDevice *parent, gchar *name)
+{
 	devinfo_add_subtree (parent, name, TRUE);
+}
 gboolean
 devinfo_probe(HalDevice *parent, gchar *name)
+{
 	struct devlistargs laa;
 	if (drvctl_list (name, &laa) == -1) {
 		HAL_INFO (("devinfo_probe: no %s device found", name));
 		return FALSE;
+	}
 	free (laa.l_childname);
 	return TRUE;
+}
 void
 devinfo_add_subtree(HalDevice *parent, const char *devnode, gboolean is_root)
+{
 	HalDevice *d;
 	struct devlistargs laa;
 	int i;
 	HAL_INFO (("add_subtree: %s", devnode));
 	if (parent == NULL) {
 		parent = devinfo_add_node (NULL, devnode);
+	}
 @@ -77,38 +92,38 @@ devinfo_add_subtree(HalDevice *parent, c
+}
 void
 devinfo_set_default_properties (HalDevice *d, HalDevice *parent, const char *devnode, char *devfs_path)
+{
 	char	*driver_name, *s;
 	const char *s1;
 	char	udi[HAL_PATH_MAX];
 	if (parent != NULL) {
 		char *pdevice = hal_device_property_get_string (parent, "netbsd.device");
 		if (pdevice) {
 			gchar *path;
-			if (strcmp (pdevice, "mainbus0") == 0)
+			if (strcmp (pdevice, "mainbus0") == 0 || strcmp (pdevice, "armfdt0") == 0)
 				pdevice = "computer";
 			path = g_strdup_printf ("/org/freedesktop/Hal/devices/%s", pdevice);
 			hal_device_property_set_string (d, "info.parent", path);
 			g_free (path);
+		}
 	} else {
 		gchar pdevnode[512];
 		char *pdevice = pdevnode;
 		if (drvctl_find_parent (devnode, pdevnode) == TRUE) {
 			gchar *path;
-			if (strcmp (pdevnode, "mainbus0") == 0)
+			if (strcmp (pdevnode, "mainbus0") == 0 || strcmp (pdevnode, "armfdt0") == 0)
 				pdevice = "computer";
 			path = g_strdup_printf ("/org/freedesktop/Hal/devices/%s", pdevice);
 			hal_device_property_set_string (d, "info.parent", path);
 			g_free (path);
 		} else
 			hal_device_property_set_string (d, "info.parent", "/org/freedesktop/Hal/devices/local");
+	}
 	hald_compute_udi (udi, sizeof (udi),
 			  "/org/freedesktop/Hal/devices/%s", devnode);
 	hal_device_set_udi (d, udi);
 #if notyet

 @@ -42,26 +42,27 @@ typedef struct DevinfoDevHandler_s
 #define PROP_STR(d, node, v, diprop, halprop) \
 	if (di_prop_lookup_strings(DDI_DEV_T_ANY, node, diprop, &(v)) > 0) { \
 		hal_device_property_set_string (d, halprop, v); \
+	}
 #define PROP_BOOL(d, node, v, diprop, halprop) \
 	hal_device_property_set_bool (d, halprop, \
 	    (di_prop_lookup_ints(DDI_DEV_T_ANY, node, diprop, &(v)) >= 0));
 #define	NELEM(a)	(sizeof (a) / sizeof (*(a)))
 void devinfo_add (HalDevice *parent, gchar *path);
 gboolean devinfo_probe (HalDevice *parent, gchar *path);
 HalDevice *devinfo_add_node(HalDevice *parent, const char *devnode);
 void devinfo_set_default_properties (HalDevice *d, HalDevice *parent, const char *devnode, char *devfs_path);
 void devinfo_callouts_preprobing_done (HalDevice *d, gpointer userdata1, gpointer userdata2);
 void devinfo_callouts_probing_done (HalDevice *d, guint32 exit_type, gint return_code, char **error,
 	gpointer userdata1, gpointer userdata2);
 void devinfo_callouts_add_done (HalDevice *d, gpointer userdata1, gpointer userdata2);
 void devinfo_callouts_remove_done (HalDevice *d, gpointer userdata1, gpointer userdata2);
 void hotplug_event_begin_add_devinfo (HalDevice *d, HalDevice *parent, DevinfoDevHandler *handler, void *end_token);
 void devinfo_remove (gchar *path);
 void devinfo_remove_branch (gchar *path, HalDevice *d);
 void hotplug_event_begin_remove_devinfo (HalDevice *d, gchar *devfs_path, void *end_token);
 void devinfo_hotplug_enqueue(HalDevice *d, gchar *devfs_path, DevinfoDevHandler *handler, int action, int front);
 void devinfo_add_enqueue(HalDevice *d, gchar *devfs_path, DevinfoDevHandler *handler);

 @@ -56,27 +56,27 @@ DevinfoDevHandler devinfo_default_handle
 	NULL,
 	NULL,
         NULL
 };
 static HalDevice *
 devinfo_computer_add(HalDevice *parent, const char *devnode, char *devfs_path, char *device_type)
+{
 	HalDevice *d;
 	struct utsname un;
 	char acpi_supported_states[20];
 	size_t len = sizeof(acpi_supported_states);
-	if (strcmp (devnode, "mainbus0") != 0) {
+	if (strcmp (devnode, "mainbus0") != 0 && strcmp (devnode, "armfdt0") != 0) {
 		return (NULL);
+	}
 	HAL_INFO (("devinfo_computer_add parent=%p devnode=%s devfs_path=%s device_type=%s",
 	    parent, devnode, devfs_path, device_type));
 	d = hal_device_new ();
         hal_device_property_set_string (d, "info.subsystem", "unknown");
         hal_device_property_set_string (d, "info.product", "Computer");
         hal_device_set_udi (d, "/org/freedesktop/Hal/devices/computer");
 	hal_device_property_set_string (d, "netbsd.device", devnode);

 @@ -169,26 +169,27 @@ drvctl_list(const gchar *name, struct de
 	if (children == 0)
 		return -1;
 	laa->l_childname = malloc (children * sizeof (laa->l_childname[0]));
 	if (laa->l_childname == NULL) {
 		HAL_INFO (("drvctl_list couldn't allocate %d children: %s\n", children, strerror(errno)));
 		return -1;
+	}
 	if (ioctl (drvctl_fd, DRVLISTDEV, laa) == -1) {
 		HAL_INFO (("DRVLISTDEV/2 failed: %s", strerror(errno)));
 		return -1;
+	}
 	if (children != laa->l_children)
 		HAL_WARNING (("DRVLISTDEV/3 expected %d children, got %d", children, laa->l_childname));
 	return 0;
+}
 gboolean
 drvctl_find_device(const gchar *devnode, prop_dictionary_t *properties)
+{
 	prop_dictionary_t command_dict;
 	prop_dictionary_t args_dict;
 	prop_dictionary_t results_dict;
 	int err;
 	command_dict = prop_dictionary_create ();
 	args_dict = prop_dictionary_create ();
 @@ -242,27 +243,34 @@ drvctl_find_device_with_child(const gcha
+		}
+	}
 	if (laa.l_childname)
 		free(laa.l_childname);
 	HAL_INFO (("%s: couldn't find device with child %s", curnode, devnode));
 	return FALSE;
+}
 gboolean
 drvctl_find_parent(const gchar *devnode, char *parent)
+{
-	return drvctl_find_device_with_child("mainbus0", devnode, parent);
+	gboolean ret;
 	ret = drvctl_find_device_with_child("mainbus0", devnode, parent);
 	if (ret == FALSE) {
 		ret = drvctl_find_device_with_child("armfdt0", devnode, parent);
+	}
 	return ret;
+}
 #if 0
 static void
 drvctl_lofi_add(gchar *devfs_path, gchar *name)
+{
 	di_node_t node;
 	const char *parent_udi;
 	HalDevice *d, *parent;
 	HAL_INFO (("lofi_add: %s %s", name, devfs_path));
 	if ((d = hal_device_store_match_key_value_string (hald_get_gdl (),

	@@ -62,27 +62,32 @@ osspec_privileged_init (void)		@@ -62,27 +62,32 @@ osspec_privileged_init (void)
62		62
63	void	63	void
64	hotplug_queue_now_empty (void)	64	hotplug_queue_now_empty (void)
65	{	65	{
66	if (hald_is_initialising) {	66	if (hald_is_initialising) {
67	osspec_probe_done ();	67	osspec_probe_done ();
68	}	68	}
69	}	69	}
70		70
71	void	71	void
72	osspec_probe (void)	72	osspec_probe (void)
73	{	73	{
74	/* add entire device tree */	74	/* add entire device tree */
75	devinfo_add (NULL, "mainbus0");	75	if (devinfo_probe (NULL, "mainbus0") == TRUE) {
		76	devinfo_add (NULL, "mainbus0");
		77	}
		78	if (devinfo_probe (NULL, "armfdt0") == TRUE) {
		79	devinfo_add (NULL, "armfdt0");
		80	}
76		81
77	/* start processing events */	82	/* start processing events */
78	hotplug_event_process_queue ();	83	hotplug_event_process_queue ();
79	}	84	}
80		85
81	gboolean	86	gboolean
82	osspec_device_rescan (HalDevice *d)	87	osspec_device_rescan (HalDevice *d)
83	{	88	{
84	return (devinfo_device_rescan (d));	89	return (devinfo_device_rescan (d));
85	}	90	}
86		91
87	gboolean	92	gboolean
88	osspec_device_reprobe (HalDevice *d)	93	osspec_device_reprobe (HalDevice *d)

	@@ -79,27 +79,27 @@ hotplug_event_begin_devfs_add (HotplugEv		@@ -79,27 +79,27 @@ hotplug_event_begin_devfs_add (HotplugEv
79	if (parent == NULL)	79	if (parent == NULL)
80	HAL_INFO (("no info.udi=%s parameter found", parent_udi));	80	HAL_INFO (("no info.udi=%s parameter found", parent_udi));
81	}	81	}
82		82
83	if (parent == NULL) {	83	if (parent == NULL) {
84	gchar pdevnode[512];	84	gchar pdevnode[512];
85	HAL_INFO (("couldn't look up %s parent by udi, trying netbsd.device", hotplug_event->un.devfs.devfs_path));	85	HAL_INFO (("couldn't look up %s parent by udi, trying netbsd.device", hotplug_event->un.devfs.devfs_path));
86	if (drvctl_find_parent (hotplug_event->un.devfs.devfs_path, pdevnode) == TRUE)	86	if (drvctl_find_parent (hotplug_event->un.devfs.devfs_path, pdevnode) == TRUE)
87	parent = hal_device_store_match_key_value_string (hald_get_gdl (), "netbsd.device", pdevnode);	87	parent = hal_device_store_match_key_value_string (hald_get_gdl (), "netbsd.device", pdevnode);
88	}	88	}
89		89
90	/* only root node is allowed to be orphan */	90	/* only root node is allowed to be orphan */
91	if (parent == NULL) {	91	if (parent == NULL) {
92	if (strcmp(hotplug_event->un.devfs.devfs_path, "mainbus0") != 0) {	92	if (strcmp(hotplug_event->un.devfs.devfs_path, "mainbus0") != 0 && strcmp(hotplug_event->un.devfs.devfs_path, "armfdt0") != 0) {
93	HAL_ERROR (("Parent is NULL devfs_path=%s parent_udi=%s", hotplug_event->un.devfs.devfs_path, parent_udi ? parent_udi : "<null>"));	93	HAL_ERROR (("Parent is NULL devfs_path=%s parent_udi=%s", hotplug_event->un.devfs.devfs_path, parent_udi ? parent_udi : "<null>"));
94	hotplug_event_end ((void *) hotplug_event);	94	hotplug_event_end ((void *) hotplug_event);
95	return;	95	return;
96	}	96	}
97	}	97	}
98		98
99	/* children of ignored parent should be ignored */	99	/* children of ignored parent should be ignored */
100	if (hal_device_property_get_bool (parent, "info.ignore")) {	100	if (hal_device_property_get_bool (parent, "info.ignore")) {
101	HAL_INFO (("parent ignored %s", parent_udi));	101	HAL_INFO (("parent ignored %s", parent_udi));
102	hotplug_event_end ((void *) hotplug_event);	102	hotplug_event_end ((void *) hotplug_event);
103	return;	103	return;
104	}	104	}
105		105