diff options
| author | wiz <wiz@pkgsrc.org> | 2015-01-25 18:46:09 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2015-01-25 18:46:09 +0000 |
| commit | 03c4a685abd3f18827052e085ee57fba999c6176 (patch) | |
| tree | fcd5f1cca1d4cc6ec279f3398b7f5071bd796bae /sysutils/hal/files | |
| parent | 7787020e268b305d3559955812634a5108a1b778 (diff) | |
| download | pkgsrc-03c4a685abd3f18827052e085ee57fba999c6176.tar.gz | |
Apply some bug fixes for the NetBSD hald from sergio lenzi in PR 49604.
Bump PKGREVISION.
Diffstat (limited to 'sysutils/hal/files')
| -rw-r--r-- | sysutils/hal/files/hald-netbsd/devinfo_mass.c | 4 | ||||
| -rw-r--r-- | sysutils/hal/files/hald-netbsd/devinfo_misc.c | 4 | ||||
| -rw-r--r-- | sysutils/hal/files/hald-netbsd/drvctl.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sysutils/hal/files/hald-netbsd/devinfo_mass.c b/sysutils/hal/files/hald-netbsd/devinfo_mass.c index ee77206d322..c6835439bf9 100644 --- a/sysutils/hal/files/hald-netbsd/devinfo_mass.c +++ b/sysutils/hal/files/hald-netbsd/devinfo_mass.c @@ -1,4 +1,4 @@ -/* $NetBSD: devinfo_mass.c,v 1.4 2010/12/26 20:59:31 markd Exp $ */ +/* $NetBSD: devinfo_mass.c,v 1.5 2015/01/25 18:46:09 wiz Exp $ */ /*- * Copyright (c) 2008 Jared D. McNeill <jmcneill@invisible.ca> @@ -230,7 +230,7 @@ devinfo_mass_add(HalDevice *parent, const char *devnode, char *devfs_path, char } if (gparent_devnode && strstr (gparent_devnode, "umass") == gparent_devnode) hal_device_property_set_string (d, "storage.bus", "usb"); - else if (strstr (parent_devnode, "atabus") == parent_devnode) + else if (parent_devnode && strstr (parent_devnode, "atabus") == parent_devnode) hal_device_property_set_string (d, "storage.bus", "ide"); else hal_device_property_set_string (d, "storage.bus", "scsi"); diff --git a/sysutils/hal/files/hald-netbsd/devinfo_misc.c b/sysutils/hal/files/hald-netbsd/devinfo_misc.c index 6efa98140e6..ffb8d2a0791 100644 --- a/sysutils/hal/files/hald-netbsd/devinfo_misc.c +++ b/sysutils/hal/files/hald-netbsd/devinfo_misc.c @@ -137,12 +137,12 @@ devinfo_default_apply_quirks(HalDevice *d, const char *devnode) /* acpiacad(4) */ if (strncmp (devnode, "acpiacad", 8) == 0) { - HAL_INFO (("%s: applying acpiacad quirks")); + HAL_INFO (("%s: applying acpiacad quirks",devnode)); hal_device_add_capability (d, "ac_adapter"); /* acpibat(4) */ } else if (strncmp (devnode, "acpibat", 7) == 0) { - HAL_INFO (("%s: applying acpibat quirks")); + HAL_INFO (("%s: applying acpibat quirks",devnode)); hal_device_add_capability (d, "battery"); hal_device_property_set_string (d, "battery.type", "primary"); } diff --git a/sysutils/hal/files/hald-netbsd/drvctl.c b/sysutils/hal/files/hald-netbsd/drvctl.c index 573aa27ad9f..5384a1f7928 100644 --- a/sysutils/hal/files/hald-netbsd/drvctl.c +++ b/sysutils/hal/files/hald-netbsd/drvctl.c @@ -123,7 +123,7 @@ drvctl_dev_add(gchar *name) parent = hal_device_store_match_key_value_string ( hald_get_gdl(), "netbsd.device", pdevnode); if (parent == NULL) - HAL_INFO (("dev_add: name=%s but netbsd.device=%s not found", pdevnode)); + HAL_INFO (("dev_add: name=%s but netbsd.device=%s not found",name, pdevnode)); } d = devinfo_add_node (parent, name); @@ -245,7 +245,7 @@ drvctl_find_device_with_child(const gchar *curnode, const gchar *devnode, if (laa.l_childname) free(laa.l_childname); - /* HAL_INFO (("%s: couldn't find device with child %s", curnode, devnode)); */ + HAL_INFO (("%s: couldn't find device with child %s", curnode, devnode)); return FALSE; } |