--- hal-0.5.11~rc2.orig/debian/rules +++ hal-0.5.11~rc2/debian/rules @@ -0,0 +1,44 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk + +# List any files which are not installed +include /usr/share/cdbs/1/rules/utils.mk +common-binary-post-install-arch:: list-missing + +ifneq ($(findstring $(DEB_BUILD_ARCH), i386 amd64),) +MACBOOK_SUPPORT = --with-macbookpro --with-macbook +endif + +DEB_CONFIGURE_EXTRA_FLAGS := --enable-hotplug-map \ + --with-pid-file=/var/run/hald/hald.pid \ + --enable-pcmcia-support \ + --with-hwdata=/usr/share/misc \ + $(MACBOOK_SUPPORT) \ + --enable-policy-kit \ + --enable-console-kit \ + --enable-acl-management \ + --enable-umount-helper \ + --enable-docbook-docs \ + --with-deprecated-keys \ + --docdir=/usr/share/doc/hal-doc + +DEB_DH_INSTALLINIT_ARGS := -- start 24 2 3 4 5 . stop 16 1 . + +common-install-impl:: + # Remove hal's default udev rules files.. We ship our own + rm -rf $(DEB_DESTDIR)/etc/udev + + install -m 644 -D debian/hal.udev.rules \ + $(DEB_DESTDIR)/etc/udev/rules.d/95-hal.rules + +install/hal:: + # Remove executable bit as this is nothing that can be executed + chmod -x $(DEB_DESTDIR)/usr/lib/hal/scripts/hal-functions + # Don't install 10-x11-input.fdi until xorg input hotplugging is fixed to + # properly support non-US keyboard layouts (see also: #442316). + rm -f $(DEB_DESTDIR)/usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi + --- hal-0.5.11~rc2.orig/debian/libhal-storage-dev.install +++ hal-0.5.11~rc2/debian/libhal-storage-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/hal/libhal-storage.h +debian/tmp/usr/lib/pkgconfig/hal-storage.pc +debian/tmp/usr/lib/libhal-storage.so +debian/tmp/usr/lib/libhal-storage.a --- hal-0.5.11~rc2.orig/debian/changelog +++ hal-0.5.11~rc2/debian/changelog @@ -0,0 +1,1955 @@ +hal (0.5.11~rc2-1ubuntu8.3) hardy-proposed; urgency=low + + * Add 00upstream-long_storage_size.patch: Fix mounting of devices with a + very large number of reported blocks by making it a 64 bit property. + Cherrypicked from upstream. (LP: #209483) + + -- Martin Pitt Thu, 16 Apr 2009 13:43:19 +0200 + +hal (0.5.11~rc2-1ubuntu8.2) hardy-proposed; urgency=low + + * Add 05_dell_backlight_lockups.patch: + -Resolves lockups caused if a BIOS password of some type is active. + Changing backlight via BIOS w/ a BIOS password is an unsupported + mechanism currently. (LP: #189814) + * debian/control: + - Depend on libsmbios 0.13.10-1ubuntu1.1 or later for the above patch + to work. + + -- Mario Limonciello Fri, 18 Jul 2008 13:18:17 -0500 + +hal (0.5.11~rc2-1ubuntu8.1) hardy-proposed; urgency=low + + * debian/control: Update Vcs-Bzr, updates to hardy are in the 'hardy' branch + now. + * Add 03_increase_helper_timeout.patch: Increase helper timeout from 10 to + 20 seconds. Some CD-ROMs are too slow to do all the detection in 10 + seconds. (LP: #218834) + + -- Martin Pitt Tue, 06 May 2008 12:15:55 +0200 + +hal (0.5.11~rc2-1ubuntu8) hardy-proposed; urgency=low + + * debian/hal.postinst: If hal has any start rc symlinks, force them back to + 24. A lot of people end up with priority 12 for some reason, which races + with dbus startup, especially with CONCURRENCY=shell. (LP: #25931) + * Add 00upstream-fix-macbook-backlight.patch: Fix backlight control on + MacBooks. Thanks to godlygeek! (LP: #206921) + + -- Martin Pitt Mon, 28 Apr 2008 07:44:11 +0200 + +hal (0.5.11~rc2-1ubuntu7) hardy; urgency=low + + * Add 02_input_spin_removed_fd.patch: + - Avoid spinning on already invalidated/closed file descriptors in the + input addon. This fixes "hal takes 100% CPU and breaks input device + handling" on a lot of machines. (LP: #203679) + - Thanks to Jon Oberheide for the patch! + + -- Martin Pitt Mon, 21 Apr 2008 10:36:50 +0200 + +hal (0.5.11~rc2-1ubuntu6) hardy; urgency=low + + * debian/patches/01_default_suspend_quirks.patch: Use quirks on i845 and + i865, too; thanks, Matthew Garrett. + * debian/hal.postinst: Fix rc.d symlinks harder on upgrades from dapper. + (LP: #211343) + + -- Martin Pitt Tue, 08 Apr 2008 18:24:15 -0500 + +hal (0.5.11~rc2-1ubuntu5) hardy; urgency=low + + * 01_default_suspend_quirks.patch: Apply the same logic to the + suspend-hybrid and hibernate script. + * debian/hal.postinst: Fix /var/run/hal -> /var/run/hald as well and drop + the chown'ing completely, since the init script does it already. + (LP: #175525) + * debian/hal.postinst: Fix upgrade version comparison to also force-reload + dbus when installing from scratch. (LP: #206787) + + -- Martin Pitt Wed, 26 Mar 2008 18:12:24 +0100 + +hal (0.5.11~rc2-1ubuntu4) hardy; urgency=low + + * debian/{hal.init,rules}: Use /var/run/hald/ as PID file directory, not + /var/run/hal/, since the former is needed for sockets, ACL caches, etc. + (LP: #205496) + + -- Martin Pitt Tue, 25 Mar 2008 16:50:58 +0100 + +hal (0.5.11~rc2-1ubuntu3) hardy; urgency=low + + * 01_default_suspend_quirks.patch: Disable video quirks when running on a + known-good video driver (proprietary nvidia and fglrx, and Intel >= + 915GM). Doing this here is better than the previously applied pm-utils + patch, since it avoids ignoring explicit pm-utils command line arguments, + consistently uses the same behaviour for suspend and resume, and keeps the + logic where it actually belongs. + + -- Martin Pitt Mon, 24 Mar 2008 17:35:38 +0100 + +hal (0.5.11~rc2-1ubuntu2) hardy; urgency=low + + * debian/rules: build using --with-deprecated-keys, since we don't want to + break packages that were assuming this worked right up through beta. + LP: #204768. + + -- Steve Langasek Fri, 21 Mar 2008 13:24:43 -0700 + +hal (0.5.11~rc2-1ubuntu1) hardy; urgency=low + + * Update our git snapshot from March 01 to current 0.5.11-RC2, which brings + a few bug fixes. + - Adds properties for tablet PCs (LP: #90451) + - Fixes operation on MacBookPro third generation. (LP: #129869) + * Remove patches applied upstream: + - 02_allow_ufs_ufstype.patch + - 05_fix_dell_brightness.patch + * Adapt patches to new upstream version: + - 96_uinput_device_support.patch + - 96_uinput_device_support.patch + * Merge with Debian unstable; see 0.5.10+git20080301-1ubuntu1 for remaining + Ubuntu changes. + * Replace 88_change_pm_quirk_policy.patch with + 01_default_suspend_quirks.patch: Only set the default suspend quirks for + kernel problem workarounds if hal-info does not define any quirks at all + for the hardware. (LP: #198808) + + -- Martin Pitt Fri, 21 Mar 2008 13:39:03 +0100 + +hal (0.5.11~rc2-1) unstable; urgency=low + + * New upstream release candidate + * debian/libhal-storage1.{symbols,shlibs}, debian/libhal1.{symbols,shlibs}: + - Updated symbols and shlibs + + -- Sjoerd Simons Tue, 18 Mar 2008 14:46:04 +0100 + +hal (0.5.10+git20080301-1ubuntu3) hardy; urgency=low + + * debian/hal.postinst: + - make sure that the start scripts are installed on + dapper->hardy upgrades (LP: #203756) + + -- Michael Vogt Thu, 20 Mar 2008 10:17:43 +0100 + +hal (0.5.10+git20080301-1ubuntu2) hardy; urgency=low + + * debian/hal.preinst: Fix copy&paste error in mv_conffile(), so that the + udev rules transition actually works and a standard dapper->hardy upgrade + does not produce a conffile prompt. (LP: #172837) + + -- Martin Pitt Thu, 13 Mar 2008 19:01:51 +0100 + +hal (0.5.10+git20080301-1ubuntu1) hardy; urgency=low + + * Merge with Debian to pull in a current snapshot from upstream git head + (upstream neglects doing a long-overdue 0.5.11 release). This pulls in two + tons of bug fixes and reduces our insane stack of patches to a + maintainable level again. (LP: #198295) + - Uses MMC profile reading for CDs/DVDs. (LP: #66254) + * Remove the following patches which are upstream now: + - 01_proc_sys_batteries.patch + - 02_sysfs_battery_serial.patch + - 92_gxx43.patch + - 94_batter-model_name.patch + - 97_fix_power_info_via_sysfs.patch + * Drop 80_allow_vfat_usefree.patch; Using 'usefree' VFAT mount option is not + necessary with the current Hardy kernel any more. + * Drop debian/patches/82_ignore_fixed_nonmedia.patch: Obsolete, GVFS treats + fixed partitions correctly. + * Tag and forward the subset of our remaining patches which have some kind + of documentation and justification. Rename them to clean up patch order + prefixes a bit. + * 96_uinput_device_support.patch: Adapt to new upstream version. + * Remaining Ubuntu changes: + - debian/hal.init: Remove stray gparted-disable-automount.fdi on startup. + Needs to be kept until Gnome #324220 is fixed properly. + (LP #134712) + - debian/hal.init: Unconditionally chown the directory in the init script. + (LP #175525) + - Ubuntu udev world order: + + debian/hal.links: Remove rules symlink, we install the rules file + directly into rules/. + + debian/rules: Install udev rules into /etc/udev/rules.d/. + + debian/hal.{preinst,postinst,postrm}: Transition code for changing the + udev rule priority (see 0.5.8.1-3ubuntu7, needs to be kept until after + Hardy's release). + - debian/hal.preinst, debian/libhal1.preinst: Clean up doc directory + symlinking when upgrading from Gutsy. Needs to be kept until after + Hardy's release. + - debian/rules: Enable MacBook (Pro) support on i386 and amd64. Add + pciutils-dev build dependency. + - debian/rules: Do not run stop init.d script for levels 1 and 6 + (TearDown). + - debian/preferences.fdi: Disable automounting for fixed disks. On session + startup it is not done anyway (since that disables the gnome-mount UI + which would ask for authentication) and it leads to confusion when + restarting hal while a session is running. (LP #138537) + - Various bug fixes, see their patch headers: + + 02_allow_ufs_ufstype.patch + + 03_virtual_net_devices.patch + + 04_read_brightness_not_actual_brightness.patch + + 96_uinput_device_support.patch + + ubuntu_01_ignore_single_slash_label.patch + - 83_ssb_bus_support.patch: Add support for devices on the SSB bus; patch + by Matthew Garrett (not applied upstream yet, this needs to update the + spec, too). + - 84_memstick_bus_support.patch: Add support for devices on the "memstick" + bus; patch by Matthew Garrett (not reported upstream yet, this needs to + update the spec, too). + - 88_change_pm_quirk_policy.patch: Patch by Matthew Garret, undocumented, + non-obvious purpose. + - Use PolicyKit/ConsoleKit: + + Add libpolkit-dev build dependency and policykit, consolekit, acl + runtime dependencies. + + debian/rules: Enable PK, CK, and automatic ACL management. + + hal.install, debian/hal.manpages: Ship usr/share/PolicyKit/ and + hal-is-caller-privileged.1. + + hal.postinst: Allow haldaemon user to query the PolicyKit database to + enforce privileges. + + debian/README.Debian: Adapt description for dynamic privileges. + + debian/hal.postinst: Do not create the powerdev/plugdev system groups. + + Drop Debian's 01_hal_debian_dbuspolicy.patch (which assumes + powerdev/plugdev system groups). + - debian/hal.postinst: Do not restart hal when upgrading from 6.06. This + needs to be kept until after Hardy's release. + * Add policykit build dependency so that the build can use + polkit-policy-file-validate. + * Add debian/patches/05_fix_dell_brightness.patch: Fix Dell brightness + backend. (LP: #191725) + * Remove debian/patches/03_virtual_net_devices.patch. While being correct, + it would require fixing client applications, too, which is too late for + hardy. By request from Kees Cook. (See LP #199140, #198541) + + -- Martin Pitt Wed, 05 Mar 2008 18:14:57 +0100 + +hal (0.5.10+git20080301-1) unstable; urgency=low + + [ Michael Biebl ] + * debian/rules + - Explicitly disable the macbook addon to ensure reliable build results + with unclean build chroots. + * debian/dbus.init + - Fix LSB init header. Use $remote_fs instead of $local_fs as the + daemon requires /usr to be mounted. Remove S from Should-Stop. + * debian/copyright + - The documentation in the doc/ subdirectory is licensed under the GFDL. + Update the copyright notice accordingly. + + [ Sjoerd Simons ] + * New upstream release + - Fixes issues with sysfs batteries present since 2.6.24 + (Closes: #462723, 463740, #460072, #463480, #455198) + - Correctly handles batteries with 0% charge (Closes: #463878) + - No longer leak fd when input devices get removed (Closes: #460133) + + * Remove patches that have been merged upstream: + - debian/patches/65_keyboard-addon-repeated.patch + - debian/patches/68_alternative-cdrw-capacity-detection.patch + - debian/patches/70_killswitch_dell.patch + - debian/patches/71_realpath.patch + - debian/patches/75_glist_memleak.patch + - debian/patches/80_fix_int_outof.patch + - debian/patches/81_dont_deref_reason_why_locked_if_null.patch + - debian/patches/82_partutil_dont_deref_null.patch + - debian/patches/84_fix_uninitialised_memory_usage_in_pci_add.patch + - debian/patches/85_fix_strlist_to_string.patch + - debian/patches/86_fix_killswitch_callout.patch + - debian/patches/87_fix_hurd_compilation.patch + - debian/patches/88_fix_hurd_compilation2.patch + - debian/patches/89_hurd_compile_autofoo.patch + - debian/patches/90_fix_crash_after_fdi_cache_generation.patch + - debian/patches/91_fix_invalid_fdi_cache_on_empty_matches.patch + * debian/rules: Add list-missing + * debian/libhal-storage1.symbols, debian/libhal1.symbols + - Add symbol files for the various libraries + + -- Sjoerd Simons Mon, 03 Mar 2008 15:22:39 +0100 + +hal (0.5.10-5ubuntu8) hardy; urgency=low + + [ Scott James Remnant ] + * Add debian/patches/96_uinput_device_support.patch: This creates a HAL + device for the uinput device, allowing us to set ACLs for it using + PolicyKit/ConsoleKit. (LP: #187130) + + [ Daniel T Chen ] + * Add debian/patches/97_fix_power_info_via_sysfs.patch: Fix battery status + reading from /sys. Patches taken from upstream GIT head. + (LP: #194052, #194719) + + [ Martin Pitt ] + * Add debian/patches/02_sysfs_battery_serial.patch: Get battery serial + number from sysfs. Patch taken fro upstream GIT head. + + -- Martin Pitt Mon, 03 Mar 2008 15:02:40 +0100 + +hal (0.5.10-5ubuntu7) hardy; urgency=low + + * Add debian/patches/95_virtual_net_devices.patch: Include virtual network + devices which do not have a physical parent. Thanks to Kees Cook for the + patch. + * Add debian/patches/01_proc_sys_batteries.patch: Fix showing batteries + twice. Taken from upstream git head, see patch header for details. + (LP: #177570) + + -- Martin Pitt Wed, 20 Feb 2008 12:09:48 +0100 + +hal (0.5.10-5ubuntu6) hardy; urgency=low + + * debian/patches/94_batter-model_name.patch: Battery probe was using + 'technology' for info.product, instead of 'model_name' attribute. + + -- Ben Collins Fri, 25 Jan 2008 11:30:47 +0000 + +hal (0.5.10-5ubuntu5) hardy; urgency=low + + * Fix build failure with g++-4.3. + + -- Matthias Klose Thu, 24 Jan 2008 16:53:58 +0000 + +hal (0.5.10-5ubuntu4) hardy; urgency=low + + * debian/hal.postinst: + - do not restart hal on dapper upgrades (that breaks) + + -- Michael Vogt Wed, 23 Jan 2008 10:48:43 +0000 + +hal (0.5.10-5ubuntu3) hardy; urgency=low + + * debian/hal.postinst: Allow user haldaemon to query the PolicyKit database. + Bump policykit dependency accordingly. + + -- Martin Pitt Tue, 15 Jan 2008 22:41:12 +0100 + +hal (0.5.10-5ubuntu2) hardy; urgency=low + + * debian/patches/88_change_pm_quirk_policy.patch: Change default pm + quirk policy to match previous Ubuntu behaviour. + + -- Matthew Garrett Sun, 30 Dec 2007 19:57:28 +0000 + +hal (0.5.10-5ubuntu1) hardy; urgency=low + + * Merge with Debian unstable. See 0.5.10-1ubuntu1 for remaining changes. + * debian/rules: Configure with --enable-acl-management, and add dependency + to 'acl'. (See hardy-hardware-detection spec.) + * Stop using the 'plugdev' and 'powerdev' system groups: + - Drop debian/patches/01_hal_debian_dbuspolicy.patch. + - debian/hal.postinst: Do not create these groups any more. + - debian/README.Debian: Adapt text about volume and power management + (users must be on a local console instead of in these groups). + + -- Martin Pitt Wed, 02 Jan 2008 14:51:43 +0100 + +hal (0.5.10-5) unstable; urgency=low + + [ Michael Biebl ] + * debian/hal.postinst + - Remove superfluous getent calls. adduser is clever enough to omit + creating accounts if they already exist. + - Don't ignore addgroup errors. + - Set the home directory of the haldaemon user to /var/run/hal. + * debian/hal.dirs + - Make sure the directory /var/run/hal is created. + * debian/hal.postrm + - As /var/run/hal is managed by dpkg now, there is no need anymore to + clean up this directory manually. + * debian/control + - The Vcs-* fields are now officially supported, so remove the XS- prefix. + - Change maintainer address to + pkg-utopia-maintainers@lists.alioth.debian.org. + - Add sjoerd, slomo and myself to Uploaders. + - Bump Standards-Version to 3.7.3. No further changes required. + + [ Sjoerd Simons ] + * debian/patches/86_fix_killswitch_callout.patch: + - Added. Fixes errors from the killswitch callouts on non-dell machines + (Closes: #453203) + * debian/control: Don't build-depend on libusb-dev on hurd-i386 + * debian/patches/87_fix_hurd_compilation.patch: + - Added. Fix compilation on the Hurd. Based on a patch by Samuel Thibault + (Closes: #444574) + * debian/patches/90_fix_crash_after_fdi_cache_generation.patch: + - Added. Fix a hal crash when the fdi cache is regenerated while + hal is running (From upstream git). + * debian/patches/91_fix_invalid_fdi_cache_on_empty_matches.patch: + - Added. Fix a bug causing the fdi cache to be invalid when an fdi files + contains empty match rules. (Closes: #456310) + * debian/hal.postinst + - Ignore errors from addgroup. These aren't fatal and can occur when + trying to add groups are added on installation (thus aren't system + groups). + - Add --quiet to the adduser invocation. We're not interested in adduser + noting that user haldaemon already exists + * debian/patches/88_fix_hurd_compilation2.patchx + - Added. Some more patched to fix compilation on the Hurd. Thanks to + Samuel Thibault + * debian/patches/89_hurd_compile_autofoo.patch + - Added. Regenerate tools/Makefile.in to include the changes needed for + hurd support. + * debian/hal.install + - Include everything in /usr/bin as the hal package is now the only thing + to have things from /usr/bin. Prevents issues on arch that don't build + all binaries (like the Hurd). Thanks to Samuel Thibault + + -- Sjoerd Simons Sat, 22 Dec 2007 18:12:30 +0100 + +hal (0.5.10-5~ubuntu3) hardy; urgency=low + + * debian/postinst: Drop chown'ing of /var/run/hal/, it does not exist on + fresh installations yet. Unconditionally chown the directory in the init + script instead. (LP: #175525) + + -- Martin Pitt Wed, 12 Dec 2007 09:55:46 +0100 + +hal (0.5.10-5~ubuntu2) hardy; urgency=low + + * Re-add accidentally dropped pciutils-dev build dependency. + + -- Martin Pitt Tue, 11 Dec 2007 09:36:59 +0100 + +hal (0.5.10-5~ubuntu1) hardy; urgency=low + + * Merge to Debian svn head to collect some bug fixes. See 0.5.10-1ubuntu1 + for remaining changes. + * debian/hal.postinst: Do not fail if haldaemon user or system groups + already exist. Debian removed these check recently, but it does not seem + to work for Ubuntu, or under all conditions. + + -- Martin Pitt Mon, 10 Dec 2007 17:06:20 +0100 + +hal (0.5.10-4) unstable; urgency=low + + * debian/patches/85_fix_strlist_to_string.patch: + - Added. Fix strlist to string conversion to no longer use a static + buffer. As a side-effect fix an issue of strings not being properly + terminated on overflow. Which would cause garbage being sent over dbus + to the runner, causing it to exit (Closes: #445861, #447860) + + -- Sjoerd Simons Sun, 02 Dec 2007 22:40:30 +0100 + +hal (0.5.10-3) unstable; urgency=low + + * debian/patches/75_glist_memleak.patch + - Added. Fixes some memleaks by not probably freeing GSList object (from + upstream git) + * debian/patches/80_fix_int_outof.patch + - Added. Fixes int_outof match target in fdi files (from upstream git) + * debian/patches/70_killswitch_dell.patch + - Replaced by the version as applied to upstream git. + * debian/patches/81_dont_deref_reason_why_locked_if_null.patch + - Added. If dbus_malloc0 failed (returned NULL), don't deref the NULL + pointer. (from upstream git) + * debian/patches/82_partutil_dont_deref_null.patch + - Added. Fixes partutils to not deref a pointer before checking it's not + NULL (from upstream git) + * debian/patches/83_crash_if_singleton_hashtable_is_null.patch + - Added. Fixes crash when the singleton hashable isn't initialized (from + upstream git) + * debian/patches/84_fix_uninitialised_memory_usage_in_pci_add.patch + - Added. Properly initialise various field in pci_add. (From Rob Taylor) + + -- Sjoerd Simons Sun, 25 Nov 2007 13:24:59 +0100 + +hal (0.5.10-2ubuntu3) hardy; urgency=low + + * debian/hal.postinst: + - do not hal force-reload on upgrades from dapper (otherwise dbus + breaks badly) + + -- Michael Vogt Tue, 04 Dec 2007 13:41:27 +0100 + +hal (0.5.10-2ubuntu2) hardy; urgency=low + + * Merge Debian's experimental version to enable PolicyKit. + + -- Martin Pitt Tue, 20 Nov 2007 12:56:05 +0100 + +hal (0.5.10-2exp1) experimental; urgency=low + + * Enable the ConsoleKit/PolicyKit support in hal. Upload to experimental to + give this feature some wider testing. + * debian/control + - Add a Build-Depends on libpolkit-dev (>= 0.5). + - Add a Depends on policykit and consolekit to the hal package. + - The Vcs-* fields are now officially supported, so remove the XS- prefix. + - Change maintainer address to pkg-utopia-maintainers@l.a.d.o. + - Add sjoerd, slomo and myself to Uploaders. + * debian/rules + - Add --enable-console-kit and --enable-policy-kit to + DEB_CONFIGURE_EXTRA_FLAGS. + * debian/hal.install + - Install the hal-is-caller-privileged binary. + - Install the policy files in /usr/share/PolicyKit/. + * debian/hal.manpages + - Install the man page for hal-is-caller-privileged. + * debian/patches/55_nonpolkit-mount-policy.patch + - Removed. Patch has become obsolete as we use PolicyKit now. + * debian/patches/41_no_policy_validate.patch + - Don't fail during configure if polkit-policy-file-validate is not found. + This avoids an unnecessary build dependency on policykit. + + -- Michael Biebl Mon, 05 Nov 2007 10:36:25 +0100 + +hal (0.5.10-2ubuntu1) hardy; urgency=low + + * Merge with Debian unstable to get the X.org input hotplug reversion for + the time being. + * *.preinst: On upgrades from Gutsy, remove the symlinks to entire + /usr/share/doc// directories which got introduced in Gutsy. They + break upgrades all over, and current cdbs just symlinks individual files. + + -- Martin Pitt Wed, 31 Oct 2007 10:46:49 -0400 + +hal (0.5.10-2) unstable; urgency=low + + * debian/rules + - Remove /usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi which + effectively disables xorg input hotplugging again + (Closes: #447666, #447676, #447841). + This is only a temporary workaround until xserver-xorg has been fixed + to provide a clean upgrade path for non-US keyboard layouts. + * debian/hal.examples + - Install 10-x11-input.fdi under /usr/share/doc/hal/examples/ for the time + being. + * debian/patches/71_realpath.patch + - Include stdlib.h in tools/hal-disable-polling.c for the realpath + function prototype definition (Closes: #447657). + Patch by dann frazier, thanks. + + -- Michael Biebl Wed, 24 Oct 2007 15:38:34 +0200 + +hal (0.5.10-1ubuntu1) hardy; urgency=low + + * Redo the bzr branch of this package as clean fork from the Debian svn + (https://code.launchpad.net/~ubuntu-core-dev/hal/debian, thanks bzr-svn!) + and commit the remaining relevant Ubuntu patches to it: + https://code.launchpad.net/~ubuntu-core-dev/hal/ubuntu + * Merge with Debian unstable; remaining Ubuntu changes: + - Ubuntu udev world order: + + debian/hal.links: Remove rules symlink, we install the rules file + directly into rules/. + + debian/rules: Install udev rules into /etc/udev/rules.d/. + + debian/hal.{preinst,postinst,postrm}: Transition code for changing the + udev rule priority (see 0.5.8.1-3ubuntu7, needs to be kept until after + next LTS). + - debian/rules: Enable MacBook (Pro) support on i386 and amd64. Add + pciutils-dev build dependency. + - debian/hal.init: Remove stray gparted-disable-automount.fdi on startup. + (LP #134712) + - debian/rules: Do not run stop init.d script for levels 1 and 6 + (TearDown). + - debian/preferences.fdi: Disable automounting for fixed disks. On session + startup it is not done anyway (since that disables the gnome-mount UI + which would ask for authentication) and it leads to confusion when + restarting hal while a session is running. (LP #138537) + - 80_allow_vfat_usefree.patch: Allow vfat mount option "usefree". + (LP #133567) + - 81_ignore_single_slash_label.patch: Ignore labels which only consist of a + slash, so that they do not end up as /media/-. An earlier Ubuntu + d-i/ubiquity created those labels by default. (LP #83323) + - 82_ignore_fixed_nonmedia.patch: Ignore fixed partitions which mounted, + but not below /media/. + - 83_ssb_bus_support.patch: Add support for devices on the SSB bus; patch + by Matthew Garrett (not applied upstream yet, this needs to update the + spec, too). + - 84_memstick_bus_support.patch: Add support for devices on the "memstick" + bus; patch by Matthew Garrett (not reported upstream yet, this needs to + update the spec, too). + - 85_read_brightness_not_actual_brightness.patch: Read the brightness from + /sys/class/backlight/foo/brightness, not actual_brightness. It makes more + sense to change based on the brightness that we wanted to set, not the + brightness that we actually set. Patch by Matthew Garrett. Forwarded to + FD#12891. + * Now build with libsmbios to get Dell backlight support. (LP: #43572) + * Dropped the following Ubuntu changes: + - hwdb icons and patches, python-launchpad-integration, .desktop file + translation fixes: hal-device-manager is gone, will be replaced by + indepentent gnome-device-manager project. + - symlinking of doc directories in debian/rules: current cdbs does that + automatically now. + - 02_powerscripts.patch, 90_pmi.patch: pm-utils is the only supported + backend now. + - 26-addon-acpi-fix-free-before-init.diff, + 63_my_dbus_is_full_of_uints.patch, 69_set_dmi_before_matching.patch, + macbook-backlight.diff: Applied upstream. + - 56_probe_fstab.patch and the disabling of mounting for unmounted + partitions which are 'auto' in fstab: The patch does not fit into hal's + design to always show current information, was rejected upstream, + only handles a corner case, and we do not automount fixed drives anyway. + * Add 86_allow_ufs_ufstype.patch: Allow ufs mount option 'ufstype', thanks + to Georges Discry. (LP: #110865, FD#10998) + + -- Martin Pitt Tue, 23 Oct 2007 12:33:58 +0200 + +hal (0.5.10-1) unstable; urgency=low + + [ Michael Biebl ] + * New upstream release. + - Ships the x11-input.fdi file which is required for the xorg input + hotplugging (Closes: #446851). + - Correctly initializes the dbus error struct in the acpi addon + (Closes: #438802). + + hal-device-manager has been removed from the upstream tarball. There is + now a separate project called gnome-device-manager which is intended to + replace hal-device-manager. + * Remove obsolete files + - debian/hal-device-manager.1 + - debian/hal-device-manager.desktop + - debian/hal-device-manager.install + - debian/hal-device-manager.manpages + - debian/patches/62_dbus-python-0.80.patch + - debian/pyversions + * debian/rules + - Remove the dh_pysupport call. + - Enable the hal umount helper. + * debian/control + - Remove Build-Depends: python, python-dbus, python-support. + - Remove binary package hal-device-manager. + - Replace Suggests: hal-device-manager with gnome-device-manager. + - Use the new "Homepage:" field to specify the upstream URL. + - Add a Build-Depends: gperf. This utility is required for building the + hal-setup-keymap binary that is necessary for the multimedia key + re-mapping support. + - Add a Recommends: libsmbios-bin [i386 amd64]. The libsmbios-bin + package ships the dellWirelessCtl utility which is required for the + RF kill switch support on DELL laptops. + - Add a Depends: pm-utils. Beginning with this release we will only + support pm-utils as suspend infrastructure. + - Add a versioned Depends on mount (>= 2.13). This is a requirement of the + hal umount helper. + * debian/libhal1.shlibs, debian/libhal-storage1.shlibs + - Bump shlibs to >= 0.5.10 due to ABI additions. + * debian/hal.install + - Install the hal-setup-keymap binary. + - Install the hal umount helper to /usr/sbin as it has dependencies on + libraries in /usr/lib. + * debian/hal.links + - Create a symlink from /usr/sbin/umount.hal to /sbin. + * debian/watch + - Update to new download location at http://hal.freedesktop.org/releases/. + * Remove patches that were merged upstream + - debian/patches/68-pass-noquirks-to-pm-utils.patch + - debian/patches/70-libhal-changeset-memleak.patch + - debian/patches/75-hal-serial-null.patch + * debian/patches/70_killswitch_dell.patch + - Fix the path for the dellWirelessCtl utility (Closes: #443583). + * debian/patches/02_powerscripts.patch, + debian/patches/14_power_suspend_linux_pmu_fix.patch + - As we only support pm-utils, these patches have become obsolete and are + thus removed. + * debian/patches/55_nonpolkit-mount-policy.patch + - Rework patch for this hal version. Throw a Volume.PermissionDenied error + if a non-removable device is mounted by a user other than root. + + [ Sebastian Dröge ] + * debian/patches/68_alternative-cdrw-capacity-detection.patch + - Add an alternative method of detecting the capacity of CDR/CDRW discs. + Only using the old method fails for some drives, for more information + see http://bugs.freedesktop.org/show_bug.cgi?id=12822 . + * debian/rules: + - Don't mark /usr/lib/hal/scripts/hal-functions executable, this is + nothing that can be executed. + + -- Michael Biebl Mon, 22 Oct 2007 14:42:59 +0200 + +hal (0.5.9.1-6) unstable; urgency=low + + * debian/hal.init: + + Don't start hal if sysfs is not mounted on /sys or a chrooted session + is detected. + + -- Sebastian Dröge Tue, 25 Sep 2007 15:46:11 +0200 + +hal (0.5.9.1-5) unstable; urgency=low + + [ Sjoerd Simons ] + * debian/patches/75-hal-serial-null.patch: Fix crash when linux.device_file + of a serial device isn't known (Closes: #439919, #440468) + + -- Sjoerd Simons Sun, 23 Sep 2007 16:26:38 +0200 + +hal (0.5.9.1-4) unstable; urgency=low + + * debian/rules + - Do not explicitly enable the dell-backlight support as libsmbios-dev is + only available on amd64/i386. The ./configure script will automatically + enable the feature for platforms where libsmbios-dev is installed. + (Closes: #438459) + + -- Michael Biebl Fri, 17 Aug 2007 09:58:08 +0200 + +hal (0.5.9.1-3) unstable; urgency=low + + * Check for inotify support in the init script and fail gracefully with a + proper error message. (Closes: #426049, #434615) + * Check if dbus is running in the init script and fail gracefully with a + proper error message. (Closes: #426420, #427332) + * debian/hal-device-manager.desktop + - Remove invalid category "Application" from the Categories field. + + -- Michael Biebl Thu, 16 Aug 2007 09:57:24 +0200 + +hal (0.5.9.1-2) unstable; urgency=low + + [ Sjoerd Simons ] + * debian/control + + Add libsmbios-dev build-depend on amd64 and i386 to build the dell + backlight addon (Closes: #429871) + * debian/patches/70-libhal-changeset-memleak.patch + + Added. Fixes a memleak when freeing hal changesets. (Closes: #429823) + + [ Michael Biebl ] + * debian/hal.preinst + - Do not parse /var/lib/dpkg/status directly but use dpkg-query instead. + + -- Michael Biebl Fri, 22 Jun 2007 19:35:08 +0100 + +hal (0.5.9.1-1) unstable; urgency=low + + [ Sjoerd Simons ] + * debian/hal.udev.rules + + No longer try calling pumount or umount when devices are removed but not + unmounted. Leave this to hal itself + * debian/hal-unmount.sh + + Removed. No longer needed + + [ Tim Dijkstra ] + * Tell pm-utils if we know a machine doesn't need a quirk + + [ Michael Biebl ] + * New upstream release. + * Patches removed as they were merged upstream: + - debian/patches/10_repeated_property_changed_signals.patch + - debian/patches/11_fix_luks_mounting.patch + - debian/patches/12_powerscripts_quirks.patch + - debian/patches/16_ntfs_allowed_mount_options.patch + - debian/patches/66-NULL-fstype-crash.patch + - debian/patches/67-fix-probe-volume.patch + * debian/control + - Replace ${Source-Version} with ${binary:Version}. + - Add build dependency on autotools-dev for up-to-date config.{guess,sub} + files. + * debian/hal.init + - Don't fail to start if hal daemon is already running. + + -- Michael Biebl Tue, 19 Jun 2007 21:23:03 +0100 + +hal (0.5.9-3) unstable; urgency=low + + * Install the hal start script as regular SysV init script + (Closes: #407132, #397223) + - Rename debian/hal.init.dbus to debian/hal.init. + - Add proper LSB header to debian/hal.init and cleanup some cruft. + - debian/rules + + Don't install /etc/dbus-1/event.d/20hal anymore. + + Set DEB_DH_INSTALLINIT_ARGS to start at 24 and stop at 16. + - debian/hal.{preinst,postinst,prerm} + + The shell code to start/stop the hal daemon is now automatically + created by dh_installinit, so remove the manually written code. + hal.prerm is empty and therefore removed completely. + - debian/hal.preinst + + Remove the old conffile /etc/dbus-1/event.d/20hal or rename it to + *.dpkg-bak if it was modified locally. + + -- Michael Biebl Wed, 23 May 2007 12:33:08 +0200 + +hal (0.5.9-2) unstable; urgency=low + + [ Michael Biebl ] + * Upload to unstable. + + * Changes merged from Ubuntu: + - debian/patches/16_ntfs_allowed_mount_options.patch + + Allow NTFS mount option 'utf8' (LP #78142). + - debian/patches/62_dbus-python-0.80.patch + + Correctly show HAL properties in hal-device-manager with dbus-python. + (FD #9343; rejected upstream because h-d-m is going away). + - debian/patches/65-keyboard-addon-repeated.patch + + Do not ignore key repeat events in the keyboard addon. (FD #9767) + - debian/patches/66-NULL-fstype-crash.patch + + Do not crash on NULL volume.fstypes, and assing some fallback values + to them. (FD #10429, LP #87800) + - debian/patches/67-fix-probe-volume.patch + + Fix scrambled labels. (FD #10362, LP #69914) + - debian/hal.init.dbus + + Use actual init script path in usage help. + - debian/run-hald.sh + + Put absolute paths in HALD_RUNNER_PATH so that callouts are found, + too. + + * debian/control + - Drop Build-Depends: linux-kernel-headers (>= 2.6.17). + linux-libc-dev in unstable is recent enough. + - Drop Build-Depends: libcap-dev. It's only needed for compiling some of + the test programs. (Closes: #398933) + * debian/hal.postrm + - Reload dbus only on purge, i.e. when the conffile + /etc/dbus-1/system.d/hal.conf is removed. + - Remove the fdi-cache file on purge. + - Check for deluser being available. If not, print a warning message and + do not remove the haldaemon system account. (Closes: #416760) + * debian/hal.{preinst,postinst} + - Remove some old upgrade paths for the hal init script. + + [ Sjoerd Simons ] + * debian/libhal1.shlibs, debian/libhal-storage1.shlibs: Bump shlibs + + -- Michael Biebl Mon, 07 May 2007 15:41:16 +0200 + +hal (0.5.9-1) experimental; urgency=low + + * New upstream release. + - Fixes detection of wireless devices with dscape stack. (Closes: #399507) + - Adds support for fuse mounts. (Closes: #418570) + - Adds support for new sysfs layout of kernels > 2.6.20. (Closes: #410868) + * Patches removed as they were applied or fixed upstream: + - debian/patches/03_macbookpro_configure.patch + - debian/patches/04_cd_write.patch + - debian/patches/05_one_formfactor_fallback.patch + - debian/patches/06_smbios_return.patch + - debian/patches/07_ppc_suspend.patch + - debian/patches/08_openfirmware.patch + - debian/patches/09_check_hashtable_initialisation.patch + - debian/patches/10_callout_errors.patch + - debian/patches/11_no_useless_runner_errors.patch + - debian/patches/12_pegasus_pmu_crash_fix.patch + - debian/patches/13_hal_callout_bashism.patch + - debian/patches/15_partition_probing.patch + - debian/patches/24_dbus_connection_close.patch + - debian/patches/25_correctly_free_lists.patch + - debian/patches/26_fix_hald_not_running_coredump.patch + - debian/patches/27_hal_fix_dbus_error_is_set.patch + - debian/patches/29_handle_non_hal_mounts.patch + - debian/patches/30_cdrom_bogus_tocinfo.patch + * Revised patches: + - debian/patches/02_powerscripts.patch + - debian/patches/55_nonpolkit-mount-policy.patch + - debian/patches/14_power_suspend_linux_pmu_fix.patch + * debian/patches/19_sonypi_support.patch + - Removed. Instead of relying on the external spicctrl tool, /dev/sonypi + is used directly now by the hal-system-sonypic addon. + * Patches taken from upstream: + - debian/patches/10_repeated_property_changed_signals.patch + + Do not trigger the "device_property_changed" signal twice. + - debian/patches/11_fix_luks_mounting.patch + + Fix the lock checking for LUKS setup/teardown. + - debian/patches/12_powerscripts_quirks.patch + + Pass the correct quirks to pm-supend and pm-hibernate. + * debian/control + - Add Depends: hal-info (>= 20070402) to hal package. + - Change the Build-Depends: docbook-utils to xmlto which is now used for + building the API documentation. + * debian/libhal(-storage)-dev.install + - Do not install libtool *.la files anymore. + * debian/rules + - Remove cdbs tarball.mk rules file. + - Cleanup obsolete rm commands from common-install-impl. + * debian/hal.install + - Install the binaries hal-disable-polling, hal-is-caller-locked-out and + hal-lock. + * debian/hal.dirs + - Create the directories /var/cache/hald (fdi files cache) and + /var/lib/hal (dev acl management list). + * debian/hald.8, debian/lshal.1 + - Removed. Shipped upstream. + * debian/hal.manpages + - Install upstream manpages. (Closes: #277399) + + -- Michael Biebl Tue, 03 Apr 2007 09:31:47 +0200 + +hal (0.5.8.1-9) unstable; urgency=low + + * debian/no-cd-media-check.fdi + - Re-added "HL-DT-ST DVD-RW GCA-4080N" product string + + -- Sjoerd Simons Wed, 14 Mar 2007 21:31:28 +0100 + +hal (0.5.8.1-8) unstable; urgency=low + + [ Michael Biebl ] + * debian/control: + - Add an explicit build dependency on docbook-xml so we don't fail on + buildds without network access. + + [ Sjoerd Simons ] + * debian/hal-unmount.sh: Always run pumount/umount if a block device is + removed, not only when it's mounted. This ensure that dm devices can be + properly deconfigured by pumount. + * debian/debian-storage-policy-ignore-fixed-crypto-drives.fdi + - Added. Ignore non-removable devices with crypto volumes again + (Closes: #414417) + + -- Sjoerd Simons Wed, 14 Mar 2007 20:36:26 +0100 + +hal (0.5.8.1-7) unstable; urgency=low + + [ Sjoerd Simons ] + * Acknowledge Steve Langasek's NMU. (Closes: #370186) + * debian/patches/29_handle_non_hal_mounts.patch + - Added. Handle volume removal for mounted volumed that weren't mounted by + hal correctly. + * debian/patches/30_cdrom_bogus_tocinfo.patch + - Added. Some cdrom drives/discs report a wrong start of the session in the + TOC, causing hal to not detect the filesystem. Work around this by + rescanning at offset 0 for discs when filesystem detection fails. + + [ Michael Biebl ] + * Add XS-Vcs-* fields to debian/control. + * Drop debian-storage-policy-fixed-drives.fdi in favor of + debian/patches/55_nonpolkit-mount-policy.patch. + This fixes the problem that local devices are not shown in nautilus. + (Closes: #394155, #395169, #409879) + * debian/patches/02_powerscripts.patch + - Add support for pm-utils and prefer it over other solutions. This is in + anticipation of hal-0.5.9, where pm-utils will be the preferred backend. + * Install HAL specification document. (Closes: #413813) + - debian/control: Build-Depend on docbook-utils and libxml2-utils. + - debian/rules: Pass --enable-docbook-docs to ./configure. + * debian/watch + - Fix regexp to not match non-hal releases, like hal-info. + + -- Sjoerd Simons Wed, 7 Mar 2007 23:50:11 +0100 + +hal (0.5.8.1-6.1) unstable; urgency=high + + * Non-maintainer upload. + * High-urgency upload for RC bugfix. + * Provide /usr/share/doc/hal/examples/no-cd-media-check.fdi as an example + for disabling CD ROM media checks, and document this in README.Debian, as + a workaround for CD drives with broken firmware. Closes: #370186. + + -- Steve Langasek Mon, 12 Feb 2007 16:42:29 -0800 + +hal (0.5.8.1-6) unstable; urgency=low + + * debian/patches/19_sonypi_support.patch + - Added. Fixes the sonypi brightness setting method + (Patch from Mike Hommey) (Closes: #391528) + + -- Sjoerd Simons Mon, 15 Jan 2007 22:53:09 +0100 + +hal (0.5.8.1-5) unstable; urgency=high + + [ Michael Biebl ] + * debian/hal-doc.install, debian/hal-doc.links + - Install API documentation into /usr/share/doc/hal-doc/html and create a + link back to /usr/share/gtk-doc/html/hal so devhelp can find it. + (Closes: #398803) + * debian/control + - Add a Suggests on devhelp for the hal-doc package which allows to + access the API documentation more easily. + + [ Sebastian Dröge ] + * debian/control: + + Updated to use my debian.org mail address + + [ Sjoerd Simons ] + * debian/patches/28_runner_64bit_values.patch + - Added. Ensure 64 bit values are correctly aligned before passing them to + dbus (Closes: #404937) + * Urgency high, fixes an RC bug + + -- Sjoerd Simons Mon, 15 Jan 2007 14:28:45 +0100 + +hal (0.5.8.1-4) unstable; urgency=low + + [ Michael Biebl ] + * Improve short description of the hal-doc package. (Closes: #387374) + + [ Sebastian Dröge ] + * Patches from upstream GIT: + + debian/patches/24_dbus_connection_close.patch: + - Don't call dbus_connection_close() in lshal and hal-device. This is + invalid usage of DBus API. + GIT changeset c85e02d58d6503b494bb4c8584a7c44ac6923208 + + debian/patches/25_correctly_free_lists.patch: + - Correctly free lists to prevent accessing free'd memory. + GIT changeset a56a15b90177734c70a8b03d961a7bcabdea2af8 + + debian/patches/26_fix_hald_not_running_coredump.patch: + - Don't coredump utilities when hald is not running but print a usefull + error message. GIT changeset c2053bf825cd9d81949d63ad83790a68310bb808 + + [ Sjoerd Simons ] + * debian/patches/02_powerscripts.patch + + Prefer hibernate over uswsusp. (Closes: #397302) + * debian/patches/27_hal_fix_dbus_error_is_set.patch + + Added. Ensure libhal never calls dbus_error_is_set(NULL) as that's not + allowed in the D-Bus API + + -- Sjoerd Simons Sat, 11 Nov 2006 14:16:52 +0100 + +hal (0.5.8.1-3) unstable; urgency=low + + * debian/control + - Add a Recommends on eject to the hal package. + - Add myself to Uploaders. + * 15_partition_probing.patch + - Added. Fixes problems with extended partition tables. + (Closes: #393245, #392978) + * Update to new python policy using python-support + - Tightened Build-Depends on python-support (>= 0.5.3). + - Drop X[SB]-P-V fields from debian/control, add a debian/pyversions file + instead specifying the supported python versions. + - Drop debian/pycompat. + - Drop dh_python call from debian/rules, call dh_pysupport with the + correct path to the modules directory. + - Call dh_pysupport in binary-install instead of binary-predeb. + + -- Michael Biebl Tue, 24 Oct 2006 13:33:55 +0200 + +hal (0.5.8.1-2) unstable; urgency=low + + * 12_pegasus_pmu_crash_fix.patch + - Added. Check if power_management.type was set before doing strcmp and + detect Pegasos machines as having the desktop formfactor + (Closes: #391124) + * /debian/patches/13_hal_callout_bashism.patch + - Added. Fix some bashisms in the hal callout scripts + * debian/patches/02_powerscripts.patch + - Updated. Use s2ram instead of s2both to let uswsusp suspend to ram + (Closes: #388558) + * debian/patches/14_power_suspend_linux_pmu_fix.patch + - Added. Use the correct hal property to check the powermanagement type. + (Closes: #393203) + + -- Sjoerd Simons Wed, 18 Oct 2006 23:45:26 +0200 + +hal (0.5.8.1-1) unstable; urgency=low + + * New upstream release + * debian/patches/01_hal_debian_dbuspolicy.patch + - Updated. + * debian/patches/05_pmu_nohibernate.patch + - Removed. Recent kernels don't crash my machine anymore + * debian/patches/04_hald_scripts.patch + debian/patches/06_more_buttons.patch + debian/patches/08_probe_serial.patch + debian/patches/09_sony_brightness.patch + debian/patches/12_refresh_acpi_states.patch + debian/patches/14_probe_volume_invalidlabel.patch + debian/patches/16_dont_stat_autofs.patch + debian/patches/17_fix_dbus_090_build.patch + debian/patches/18_hald_runner_fd_leak.patch + debian/patches/22_recognize_partitions.patch + - Removed. All fixed upstream + * debian/patches/07_suspend2.patch + debian/patches/20_uswsusp.patch + debian/patches/21_acpi_support.patch + - Merged into 02_powerscripts.patch + * debian/patches/hdm-python2.4.patch + - Removed. Not needed anymore since the default python is 2.4 now + * debian/patches/19_sonypi_support.patch + - Updated. Upstream supports spicctrl but assumes it's in a different path + * debian/patches/15_mount_scripts_pmount.patch + - Removed. Replaced by the new version of the mount scripts + * debian/rules: Disable PolicyKit + * debian/control: Add build-depend on libvolume-id-dev + * debian/patches/23_addon_acpi.patch + - Updated. + * debian/control: Add linux-kernel-headers (>= 2.6.17) to the build-depends + for the definition of ARPHRD_IEEE80211_RADIOTAP + * debian/hal.install: Scripts are no longer in /usr/share/hal but in + /usr/lib/hal + * debian/patches/03_macbookpro_configure.patch + - Added. Change configure so the macbook pro utils can actually be + disabled. + * debian/rules: Disable the macbook pro backlight addon. + * debian/patches/04_cd_write.patch + - Added. don't crash on cd drives without write capabilities (From + upstream git) + * debian/patches/05_one_formfactor_fallback.patch + - Added. Use one fallback to an unknown formfactor instead of three. Fixes + bugs caused by falling back when not needed. + * debian/patches/06_smbios_return.patch + - Added. Only let the prober return success if it actually found some + usefull info. + * debian/patches/07_ppc_suspend.patch + - Added. pmu systems can suspend by using hal's own tool. So actually flag + it as being able to suspend even though mem isn't in /sys/power/state + * debian/patches/08_openfirmware.patch + - Added. Extra model and machine compatibility from openfirmware and + use that info to detect the formfactor. + * debian/debian-storage-policy-fixed-drives.fdi + - Added. Add policy to hal so it refuses to mount and unmount fixed + drives. + * debian/patches/09_check_hashtable_initialisation.patch + - Added. Check if the udi to method queue hashtable is initialized before + using it. (From upstream) + * debian/patches/10_callout_errors.patch + - Added. Use dbus_error_free instead of LIBHAL_FREE_DBUS_ERROR. Ensures + errors correctly reach hald-runner. + * debian/patches/11_no_useless_runner_errors.patch + - Added. Only let hald-runner output warnings if there was actually an + error. + + -- Sjoerd Simons Mon, 2 Oct 2006 18:55:05 +0200 + +hal (0.5.7.1-2) unstable; urgency=low + + * debian/patches/22_recognize_partitions.patch + - Added. More robust recognition that a block device is a partition. Fixes + detecting scsi cdrom drives as partitions (From upstream git) + (Closes: #383792) + * debian/patches/23_addon_acpi.patch + - Added. Don't use the kernel acpi event interface if acpid is installed. + (Closes: #380520, #352512) + * debian/README.Debian: Update documentations about the configuration of the + callouts. Also mention how hal's acpi addon interacts with acpid. + * debian/hal.dirs: Remove /var/run/hal from hal.dirs. Let the init scripts + takes care of its creation. (Closes: #385270) + * debian/hal.postinst: Don't create a homedir for hal. + * debian/hal.preinst: Remove the old hal user. As deluser --system only + removes system users this should be safe. + * debian/hal.postrm: Don't delgroup the daemon user on purge, deluser + already takes care of that. + * debian/hal.postrm: Remove the /var/run/hal dir on purge + * debian/patches/21_acpi_support.patch: + - Updated. Use the force argument to the sleep and hibernate call + (Closes: #384120) + * debian/patches/debian/patches/19_sonypi_support.patch: + - Updated. The spicctrl tool is installed in a different location on + debian then what upstream assumes. + + -- Sjoerd Simons Mon, 4 Sep 2006 23:22:49 +0200 + + +hal (0.5.7.1-1) unstable; urgency=low + + [ Sjoerd Simons ] + * New upstream release + * debian/hal.postinst,debian/hal.postrm,debian/rules: Rename the hal daemon + user to haldaemon (was hal) + * debian/hal.postinst: Created the plugdev system group if it doesn't exist + * debian/hal.links: Change the udev rules.d link from 050_hal-plugdev.rules + to z99_hal.rules to ensure hal gets its data after all the udev magic. + * debian/patches/09_sony_brightness.patch: + - Apply trivial upstream patch to fix LCD brightness setting on Sony + laptops. + - From the ubuntu hal package which took it from upstream, thanks to Paolo + Borelli + * debian/patches/12_refresh_acpi_states.patch: + - Added. refresh ACPI events after suspend/hibernate + - From the ubuntu hal package, patch created by Paul Sladen based on + upstream CVS. + * debian/patches/14_probe_volume_invalidlabel.patch + - Added. Don't try to fix device labels with invalid UTF-8 characters if + more than 20% of the characters is invalid. This avoids totally + unintelligible labels while still preserving only mildly damaged ones. + - From the ubuntu hal package, patch created by Martin Pitt + * debian/patches/15_mount_scripts_pmount.patch: + - Change mount/umount scripts to call pmount-hal/pumount as the + destination user instead of mount/umount as root. This way, we do not + have to rely on hal properties for sanity checking, which are unreliable + in hal's current trust model. + - Change eject script to call eject as the destination user instead of + root. + - This change should be completely transparent to the outside world, so + that KDE and gnome-mount will just work. (Closes: #377689) + - From the ubuntu hal package, patch created by Martin Pitt. + * debian/patches/16_dont_stat_autofs.patch: + - Added. Don't stat autofs filesystems as that will remount. + (Closes: #361785) (From upstream git) + * debian/patches/17_fix_dbus_090_build.patch: + - Added. Fix build with dbus >= 0.90 (From upstream git) + * debian/patches/18_hald_runner_fd_leak.patch + - Added. Fix fd leak in hald-runner. Patch by Mike Hommey (Closes: #375143) + * debian/patches/debian/patches/19_sonypi_support.patch: + - Added. Support sonypi using laptops (Closes: #375144) (From upstream git) + * debian/patches/07_suspend2.patch: + - Updated. Don't try to use suspend2 to suspend a pmu machine, which can + crash the machine. (Closes: #366008) + * debian/patches/20_uswsusp.patch: + - Added. Use uswsusp for suspend and hibernation if available. Patch by + Tim Dijkstra. (Closes: #382183) + * debian/patches/21_acpi_support.patch: + - Added. Use acpi-support for suspend and hibernation if available. + (Closes: #381708) + + [ Sebastian Dröge ] + * debian/pycompat, + debian/control, + debian/rules: + + update to the new Python Policy + * debian/control: + + Bump Standards-Version to 3.7.2 + + Add myself to Uploaders + + -- Sjoerd Simons Tue, 15 Aug 2006 15:45:35 +0200 + +hal (0.5.7-2) unstable; urgency=low + + * debian/hal.udev.rules + + Fix broken udev syntax (Closes: #364324) + * Bump compat version to 5 + * Killing hal with brute force in prerm shouldn't be needed anymore + * Don't install hal's default udev rules file, we ship our own + (Closes: 359749) + * debian/patches/07_suspend2.patch + + Added. Possibility to use hibernate to suspend-to-ram + * debian/patches/08_probe_serial.patch + + Only probe legacy serial ports. Fixes issue with usb serial ports from + wince pda's that can't handle the probing (Closes: #352934) + + -- Sjoerd Simons Mon, 1 May 2006 22:42:50 +0200 + +hal (0.5.7-1) unstable; urgency=low + + * New upstream release + * debian/patches/02_hal_addon_pmu.patch + + Removed. Fixed upstream + * debian/patches/03_hald_runnerpath.patch + + Removed. Fixed upstream + * debian/patches/05_pmu_nohibernate.patch + + Updated. Fix crash when power_management.type is not set (Thanks Martin + Pitt) + * debian/patches/06_more_buttons.patch + + Added. Update button signal names to the new convention and also + recognize mute, volume up/down buttons, switchvideo mode button and + keyboard illumination toggle/down/up buttons. + * Update debian/README.Debian + + -- Sjoerd Simons Thu, 2 Mar 2006 18:56:03 +0100 + +hal (0.5.6+cvs20060219-1) experimental; urgency=low + + * CVS snapshot + * debian/patches/01_hal_privsep.patch + + Removed. Fixed upstream + * debian/patches/02_hal_addon_pmu.patch + + Updated + * debian/patches/03_storage_sigio.patch + + Removed. Fixed upstream + * debian/patches/04_hald-no-patch.patch + + Removed. Fixed upstream + * debian/patches/05_hald_clear_udev_buffer.patch + + Removed. Fixed upstream + * Sync with Ubuntu + + Remove unneeded build-depends (libsysfs-dev and libcap-dev) + + force-reload dbus instead of reload + + Remove obsolete fdi example conffile + + Add small utility script to run hald from the debian dir. + * debian/patches/storage-policy-debian.patch + + Removed. Obsolete + * debian/patches/03_hald_runnerpath.patch + + Added. Give programs run by the runner a save PATH + * debian/patches/04_hald_scripts.patch + + Added. Fix various bugs in the hal scripts + * Add the powerdev group in postinst + * debian/patches/01_hal_debian_dbuspolicy.patch + + Added. Change the hal dbus policy to allow user part of the powerdev + group to use the org.freedesktop.Hal.Device.SystemPowerManagement and + org.freedesktop.Hal.Device.LaptopPanel interfaces. + + -- Sjoerd Simons Mon, 20 Feb 2006 23:24:34 +0100 + +hal (0.5.6-4) unstable; urgency=high + + * debian/patches/05_hald_clear_udev_buffer.patch + + Added. Clear the buffer where udev events are received before using + (from hal CVS) + + -- Sjoerd Simons Mon, 13 Feb 2006 18:59:12 +0100 + +hal (0.5.6-3) unstable; urgency=high + + * debian/patches/01_hal_privsep.patch + + Updated. Fix deadlock when using ATAPI Zip-drives (Closes: #351296) + + -- Sjoerd Simons Sun, 12 Feb 2006 17:52:58 +0100 + +hal (0.5.6-2) unstable; urgency=low + + * debian/patches/01_hal_privsep.patch + + Updated to current CVS version + * udev communicated events to hal via a socket now, which as a side-effect + fixes incompatibility with udev 0.83 (Closes: #350639, #350762) + * Let hal look in the right location for the pci.ids and usb.ids files + (Closes: #341824) + * Because the addons run with root privs. now, harddisk properties are + available (Closes: #290653) + * debian/patches/03_storage_sigio.patch + + Added. Switch EjectButton detection to SG_IO interface. Solves some + problems with scsi cdrom drives (from hal CVS) + * debian/patches/04_hald-no-patch.patch + + Added. Also start correctly when PATH is not set (Closes: #345391) + + -- Sjoerd Simons Wed, 1 Feb 2006 23:59:58 +0100 + +hal (0.5.6-1) experimental; urgency=low + + * New upstream release + * debian/patches/hal-dbus_max_match_rules_per_connection.patch + + Removed. Default max_match_rules in dbus is high enough these days + * Don't add the hal to group floppy and cdrom + * Stop using the hotplug helper, instead let udev pass data via a socket to + hal + * debian/patches/01_hal_privsep.patch + + Added. Let the addons and probes be called by a little helper running as + root while the main hal database runs as an unpriviledged user. + * No longer chown removable device to group hal + * debian/patches/02_hal_addon_pmu.patch + + Added. Use a direct connection to hal, because it might not be on the + system bus yet. Open /dev/adb non-block so read blocks instead of + getting EAGAIN and failing. + + -- Sjoerd Simons Thu, 19 Jan 2006 23:12:56 +0100 + +hal (0.5.5.1-5) unstable; urgency=low + + * Tighten depends on dbus and python2.4-dbus a little bit more + * Fix a bashim in the postinst script (Closes: 347326) + + -- Sjoerd Simons Thu, 12 Jan 2006 00:38:47 +0100 + +hal (0.5.5.1-4) unstable; urgency=low + + * Upload to unstable + * Add python to the build-depends for dh_python + + -- Sjoerd Simons Thu, 5 Jan 2006 22:36:33 +0100 + +hal (0.5.5.1-3) experimental; urgency=low + + * Let libhal-dev and libhal-storage-dev depend on libdbus-1-dev (>= 0.60) + + -- Sjoerd Simons Fri, 16 Dec 2005 15:37:21 +0100 + +hal (0.5.5.1-2) experimental; urgency=low + + * Use log_daemon_msg instead of log_begin_msg in the init script + (Closes: #339728) + * Build against dbus 0.60 + + -- Sjoerd Simons Thu, 15 Dec 2005 12:02:22 +0100 + +hal (0.5.5.1-1) experimental; urgency=low + + * New upstream release + * Sync with ubuntu (Thanks Martin Pitt) + + Make libhal-storage-dev depend libhal-dev + + Fix rm_conffile in hal.preinst + + Install hal-find-by-capability and hal-find-by-property + + Translation updates for hal-device-manager.desktop + * Never restart dbus in postinst or postrm . Only reload it's config. + * Depend on libusb-dev to build hald-addon-usb-csr (Closes: #335530) + * Build hal-device-manager again. + * debian/patches/hdm-python2.4.patch + + Force hal-device-manager to use python2.4 + * Install /usr/bin/hal-device + + -- Sjoerd Simons Tue, 15 Nov 2005 14:18:58 +0100 + +hal (0.5.4-2) experimental; urgency=low + + * Hal doesn't include hal.dev anymore, so don't try to execute it in the + udev rules (Closes: #326957) + * Package doesn't ship fstab-sync, so also don't ship it's manpage. + + -- Sjoerd Simons Thu, 8 Sep 2005 10:36:03 +0200 + +hal (0.5.4-1) experimental; urgency=low + + * New upstream release + * use udev RUN rules instead of the hotplug.d and dev.d script dirs + * Install hal-umount.sh in /usr/lib/hal instead of usr/lib/hal/hal-umount.sh + * debian/patches/property-null-values.patch + + Removed. Fixed upstream + * Sync with ubuntu + + Switched the init script to lsb-base + + hal.init.dbus: If hald does not want to die in do_stop, use the "yes, + we really mean it" approach to ensure clean restarts. + + debian/patches/storage-policy-debian.patch + - Dropped noatime/sync handling hunk since upstream now does the right + thing. + - Enable storage.requires_eject on USB storage devices to always + eject them (which causes them to properly power off). + + Only (re)start dbus when hal isn't already running. + + Update the manpage + + -- Sjoerd Simons Sat, 27 Aug 2005 22:31:21 +0200 + +hal (0.5.2-1) experimental; urgency=low + + * New upstream release + * Don't build hal-device-manager for now as it needs python2.4 gnome + packages + * Based on Ubuntu's hal 0.5.2 by Martin Pitt. + * Removed no longer relevant patches: + + debian/patches/harddisk-volumes.patch + + debian/patches/ids-search.patch + + debian/patches/hal-fdi.patch + + debian/patches/hotplug_timeout.patch + + debian/patches/patches/no_sysdevice.patch + + debian/paches/hal-hotplug-map.patch + * debian/ipod-music-player.fdi + + Fixed upstream + * debian/hal-device-manager.desktop + + Updated with new translations from the Ubuntu package + + -- Sjoerd Simons Tue, 21 Jun 2005 15:28:18 +0200 + +hal (0.4.8-2) unstable; urgency=low + + * debian/ipod-music-player.fdi + + Fix xml errors (Closes: #312817) + * debian/patches/storage-policy-debian.patch + + Enable the utf8 mount option for cdrom drives and iso9660 and udf + filesystems. (Closes: #312818) + + -- Sjoerd Simons Fri, 10 Jun 2005 15:50:45 +0200 + +hal (0.4.8-1) unstable; urgency=low + + * New upstream release + * debian/patches/storage-policy-zip.patch + + Removed. Merged upstream + * debian/patches/ids-search.patch + + Updated + * debian/patches/hotplug_timeout.patch + + Updated to work with dbs-edit-patch + * debian/hal.udev.device-removable.sh + + Fixed problem with detection of firewire disks (Closes: #309822) + * debian/patches/storage-policy-debian.patch + Don't set the sync mount option by default on smaller drives (flash + drives). Especially on newer kernels this can wear out media too fast. + * debian/preferences.fdi + Warn for media wear in the example fdi file when enabling the sync option. + + + -- Sjoerd Simons Mon, 23 May 2005 19:49:56 +0200 + +hal (0.4.7-4) unstable; urgency=low + + * Add fdi file to recognize Apple Ipods + * Improved udev script for removable drives detection (Thanks to Marco d'Itri) + * Move hal-plugdev.rules link after the setting of permissions, but before + naming of devices files. Enables the hal/gnome-volume-manager combination to + work with systems using devfs like naming (Closes: #302134) + * Added an example to set the group id and umask of a mounted volume to + preferences.fdi. (Closes: #303720) + * Have the dbus init script wait for hal to actually shutdown, when stopping. + + -- Sjoerd Simons Sat, 7 May 2005 00:17:11 +0200 + +hal (0.4.7-3) unstable; urgency=low + + * Remove 50-fstab-sync.hal symlink from the package, it's not supposed to be + used in hal's default config. (Closes: #298562) + * Added debian/patches/hotplug_timeout.patch + + Don't run the hotplug timeout handler while processing hotplug events. + (Closes: #292256) + * Fixes from the ubuntu package: + + Added debian/patches/hal-dbus_max_match_rules_per_connection.diff + - Allow more matching rules per connection. Fixes problems with + hal-device-manager on systems with lots of devices. + + Added debian/patches/harddisk-volumes.patch + - fdi/90defaultpolicy/storage-policy.fdi: If a volume has an empty + fsusage, set it to "filesystem" to work around the fact that the + non-root hald cannot read harddisk partitions. + - libhal-storage/libhal-storage.c: Do not declare a volume as invisible + if hal does not know the file system (hald cannot read harddisk + partitions). + + -- Sjoerd Simons Fri, 18 Mar 2005 19:25:04 +0100 + +hal (0.4.7-2) unstable; urgency=low + + * debian/patches/storage-policy-debian.patch + + Updated. Enable the quiet option for vfat volumes. (Closes: #292661) + * debian/hal.dbus.init + + Show a warning message when trying to start with an unsupported kernel. + (Closes: #292644) + * debian/patches/no_sysdevice.path + + Don't die when a device doesn't have a sysfs path when finalizing the + class device. (Closes: #293630) + * debian/patches/storage-policy-zip.patch + + Added. Correctly name partitioned zip mountpoints. Patch from Daniel + Serpell. (Closes: #294033) + + -- Sjoerd Simons Tue, 15 Feb 2005 11:51:34 +0100 + +hal (0.4.7-1) unstable; urgency=medium + + * New upstream release + + hal-device-manager handles ieee1394 now (Closes: #290931) + * Added watch file + + -- Sjoerd Simons Tue, 25 Jan 2005 15:25:51 +0100 + +hal (0.4.6-1) unstable; urgency=low + + * New upstream release + + Fixes various problems with vfat label detection (Closes: #271997) + * Enable building of fstab-sync as some people seem to like it + (Closes: #290780) + * debian/patches/storage-policy-debian.patch. + + Updated. Copy block.policy.desired_mount_point from block.storage to + volume.policy.desired_mount_point if the blockdevice has no partitions + (Closes: #290963) + + -- Sjoerd Simons Fri, 21 Jan 2005 17:27:34 +0100 + +hal (0.4.5-1) unstable; urgency=low + + * New upstream release + * Removed patches that were fixed/merged upstream + + debian/patches/check-ide-floppy-for-zip.patch + + debian/patches/volume_id-fat.patch + + -- Sjoerd Simons Thu, 13 Jan 2005 16:46:12 +0100 + +hal (0.4.4-2) unstable; urgency=low + + * debian/patches/volume_id-fat.patch + + Added. Fixes label reading on large FAT volumes. Patch from Kay Sievers. + (Closes: #271997) + * debian/patches/check-ide-floppy-for-zip.patch + + Added. Support IDE Zip drives that appear as IDE floppies. Patch from + David Zeuthen. + + -- Sjoerd Simons Mon, 10 Jan 2005 09:28:55 +0100 + +hal (0.4.4-1) unstable; urgency=low + + * New upstream release + * Removed patched that were merged/fixed upstream: + + debian/patches/netdev-recovery.patch + + -- Sjoerd Simons Fri, 7 Jan 2005 11:29:56 +0100 + +hal (0.4.3-1) unstable; urgency=low + + * New upstream release + * Start using tarball.mk from cdbs + * Removed patched that were merged/fixed upstream: + + debian/patches/cdrom-fdleak.patch + + debian/patches/cdrom-media-check.patch + + debian/patches/fix-ide-fdi.patch + + debian/patches/fstab-sync-crash.patch + + debian/patches/poll-only-cdroms.patch + + debian/patches/special_mtab_chars.patch + * debian/patches/netdev-recovery.patch + + Added. Fixes a crash in the netdev recovery code (Closes: #288089) + * debian/hal.udev.rules + + The only ide drives hal polls are cdroms, so it's unnecessary to set the + group of other removable ide drives to hal. (Closes: #288301) + * Stop shipping sony_dsc.fdi, it just causes problems. + * debian/patches/ids-search.patch + + Updated + * debian/patches/z_update_autofoo.patch + + Removed, not necessary anymore because of the ids-search.patch update + + -- Sjoerd Simons Tue, 4 Jan 2005 18:26:44 +0100 + +hal (0.4.2-6) unstable; urgency=low + + * debian/patches/cdrom-fdleak.patch + + Added. Don't leak a filedescriptor to the cdrom device when the + filesystem on a data cd isn't recognized. Patch from Peter Österlund + (Closes: #287779) + + -- Sjoerd Simons Thu, 30 Dec 2004 15:29:04 +0100 + +hal (0.4.2-5) unstable; urgency=high + + * Create /var/run/hal dir on start if it's not there (Closes: #287258) + + -- Sjoerd Simons Sun, 26 Dec 2004 15:27:45 +0100 + +hal (0.4.2-4) unstable; urgency=high + + * Only add hal to group cdrom and floppy when creating the user. This way it + won't get added on upgrade if the admin removed it. (Closes: #286790) + * debian/hal-unmount.dev + + Also check /etc/mtab to see if the device is mounted. (Closes: #286579) + * Urgency high. Fixes an RC bug. + + -- Sjoerd Simons Sun, 19 Dec 2004 20:42:37 +0100 + +hal (0.4.2-3) unstable; urgency=low + + * debian/patches/special_mtab_chars.patch + + Added. In /etc/mtab and /proc/mounts some special chars (like space) are + encoded in octal from. Decode these into normal chars again. Fixes + problems with spaces in mountpoints (Closes: #284322) + * debian/hal-unmount.dev: + + Sanity-check $DEVNAME to make sure it begins with a slash, so we don't + get bitten by DEVNAME=-a or DEVNAME="". Thanks to Scott James Remnant + + -- Sjoerd Simons Sun, 19 Dec 2004 18:32:47 +0100 + +hal (0.4.2-2) unstable; urgency=medium + + * debian/patches/fstab-sync-crash.patch + + Added. Don't crash on cleaning fstab in certain + circumstances (Closes: #284721) + * debian/patches/ids-search.patch + + Added. Search for pci.ids and usb.ids runtime. Fixes problems when the + location changes or if it is different then on the machine hal was build + on. + * debian/patches/fix-ide-fdi.patch + + Added. Correct syntax error in the fdi file + * debian/patches/cdrom-media-check.patch + + Added. Some CD-ROMs report that they contain a CD even if the tray is + open; probe CDROM_MEDIA_CHANGED twice to check whether there is indeed a + CD inside.Thanks to Michael Hofmann for discovering this and + finding the fix. + * debian/patches/poll-only-cdroms.patch: + + Added. Instead of trying to work around broken ide pcmcia device just + poll cdrom on the ide bus. Patch from David Zeuthen (Closes: #284164) + * debian/patches/z_update_autofoo.patch: + + Added. Update configure, this is needed by ids-search.patch. + + -- Sjoerd Simons Wed, 08 Dec 2004 16:18:14 +0100 + +hal (0.4.2-1) unstable; urgency=low + + * New upstream release + * Remove patches that have been merged upstream: + + debian/patches/device-manager-glade.patch + + debian/patches/device-manager.patch + + -- Sjoerd Simons Thu, 2 Dec 2004 13:13:50 +0100 + +hal (0.4.1-2) unstable; urgency=low + + * Rename the hal dbus start script from hal to 20hal. Makes it simpler to + order startup of dbus services. + * Let hald run as non-root by default + * Use a dev.d script for lazy device umount. So hald doesn't need too. + (Script from the ubuntu package) + * Install udev configuration to make removable devices owned by group hal + (Adapted from the ubuntu package) + * Call udevsend for all block devices in the postinst. To ensure + the permissions are set right for already available devices. + * debian/README. Updated to reflect we run as user hal by default now. + * debian/patches/storage-policy-debian.patch. + + Updated. turn off sync and noatime for drivers bigger then 2GB. + * /etc/hal/fdi/preferences.fdi + + Added. Some examples of system settings that can be tweaked via hal's + database. + * debian/patches/storage-policy-debian.patch. + + Updated. Disable the managed keyword again, so we don't have to depend + on a mount version that's already frozen. + + -- Sjoerd Simons Mon, 8 Nov 2004 23:59:23 +0100 + +hal (0.4.1-1) unstable; urgency=low + + * New upstream release + + Fixes fstab-sync crash when called without options (Closes: #278468) + + Detects highpoint ata raid configurations (Closes: #277534) + * debian/hald.8: Fixed typos + * debian/rules: Correctly generate the python dependencies for + hal-device-manager + * debian/hal.postinst: Don't fail when the dbus-1 init script isn't + available yet + * Removed patches (adopted upstream): + + debian/patches/fstab-sync.patch + + debian/patches/nonblock.patch + + debian/patches/storage-policy-uudi.patch + * debian/patches/storage-policy-debian.patch + Updated. Usage comment=fstabsync as option for fstab-sync mount lines + * debian/patches/hal-fdi.patch + Added. Look for user fdi files in /etc/hal/fdi + * debian/patches/device-manager.patch + Added. Fill the Device type and Capabilities field (Patch from Bryan Clark) + * debian/patches/device-manager-glade.patch + Added. Improve the appearance of the Device tab in h-d-m + * debian/patches/hal-hotplug-map.patch + Added. Check if the usb device isn't actually an usb mass storage device + before setting libgphoto2 support properties. Fixes problems with + olympus cameras, because PtP and UMS versions have the same usb id's + (Closes: #279395) + + -- Sjoerd Simons Sat, 06 Nov 2004 19:59:37 +0100 + +hal (0.4.0-1) experimental; urgency=low + + * New upstream release + * Marin Pitt: + + New packages libhal-storage0 and libhal-storage-dev for new hal-storage + library + + Removed patches (adopted upstrem): + - add_device_nullarg.patch + - fix_first_hotplug.diff + - hal-cdspeed.patch + - nofail_nocaps.patch + - pci_pre_process_check_null.diff + + debian/lshal.1: properly quoted dashes + + * Sjoerd Simons: + + Removed patches (adopted upstream): + - pciid-fdleak.patch + - usbdb-fdleak.patch + - fs_probing.patch + - haldb-require-privs.patch + - libgphoto2-usermap.patch + - netlink_spoofing.patch + + No longer shipping the fstab-update script + + debian/hal.preinst: Stop hal in preinst instead of dbus + + debian/hal.preinst: Add missing debhelper token + + debian/hal.preinst: Remove fstab-update.h transition. + + Added /etc/default/hal to easily configure running hal as non-root + + Added debian/patches/fstab-sync.patch (from CVS HEAD) + - Use the name of the special device file instead of 'foo' when writing + to the syslog. + - clean wasn't being called on hald startup because of missing defines + due to the removal of fstab-sync options + + Added debian/patches/nonblock.patch (from CVS HEAD) + - Fixes wrong handling of O_NONBLOCK by hal when probing the fileystem + type (by removing it) + + Added debian/patches//storage-policy-uudi.patch (from CVS HEAD) + - Never use filesystem UUDI for mount points in the default policy + + Ship fstab-sync.8 manpage + + Added debian/patches/storage-policy-debian.patch + - Change to storage policy to match the behaviour of previous hal + debian packages. + + -- Sjoerd Simons Mon, 18 Oct 2004 16:30:01 +0200 + +hal (0.2.98-5) unstable; urgency=high + + * Restart dbus on postinst instead of starting, fixes problems on upgrade + and install (Closes: #277050) (Closes: #277035) + * debian/patches/netlink_spoofing.patch + + Added. Check PID of netlink packets to prevent spoofing from user + processes (from CVS HEAD) + * High priority because it fixes upgrade and install problems. + + -- Sjoerd Simons Sun, 17 Oct 2004 20:19:48 +0200 + +hal (0.2.98-4) unstable; urgency=medium + + * Also restart dbus when hal is freshly installed. + + -- Sjoerd Simons Sun, 17 Oct 2004 19:45:26 +0200 + +hal (0.2.98-3) unstable; urgency=medium + + * debian/patches/haldb-require-privs.patch + + Added. Only allow root and the hal's current user to change things in + the hal's database (from CVS HEAD with some enhancements) + * Doesn't crash when SIOCGMIIREG fails (Closes: #276297) + + -- Sjoerd Simons Sun, 10 Oct 2004 19:57:52 +0200 + +hal (0.2.98-2) unstable; urgency=medium + + * Goodies from the Ubuntu hal packages (thanks to Martin Pitt) + + Properly quote dashes in the manpages + + German translation of hal-device-manager.desktop + * debian/patches/add_device_nullarg.patch + + Added. check whether given_sysfs_path is NULL and + immediately return in this case; previously, this parameter was copied + and compared without checking. (from ubuntu package) + * debian/patches/fix_first_hotplug.patch + + Added. Fixes race conditions with regard to the first hotplug event + (from CVS HEAD) + * debian/patches/fs_probing.patch + + Added. Fixes some file probing issues (from CVS HEAD) + * debian/patches/nofail_nocaps.patch + + Added. Don't fail on a kernel without capablities if privileges are + dropped (from Ubuntu package) + * debian/patches/pci_pre_process_check_null.patch + + Added. Added extra NULL pointing checking (from Ubuntu package) + * debian/patches/pciid-fdleak.patch + + Added. Close file descriptors after reading the pci id database + * debian/patches/usbdb-fdleak.patch + + Added. Close file descriptors after reading the usb id database + * Make fstab-update.hal POSIX compliant (patch from Martin Waitz) + (Closes: #274937) + + -- Sjoerd Simons Sun, 10 Oct 2004 17:31:40 +0200 + +hal (0.2.98-1) unstable; urgency=high + + * New upstream release + * Fixes endless loop in FAT32 label reading code (Closes: #273001) + * Make it possible to run hal with dropped priviledges + (not enabled by default) + * Put hal-device-manager in it's own package (Closes: Bug#239122) + * Install hal-hotplug-map helper + * Updated hald manpage + * Created hal-device-manager manpage + * Disable selinux for now. A newer libselinux then in debian is needed. + * debian/patches/hal-cdspeed.patch + + Added. Fix for unchecked buffer access from Martin Pitt + * debian/patches/libgphoto2-usermap.patch + + Added. Let hal-hotplug-map work correctly with the libgphoto2 hotplug + config. + * Urgency high because this fixes RC bugs + + -- Sjoerd Simons Sun, 26 Sep 2004 11:10:45 +0200 + +hal (0.2.97+cvs20040907-1) unstable; urgency=high + + * New maintainer. + * New CVS snapshot (Closes: Bug#266158) + * More robust hotplugging code (Closes: Bug#264597) + * libhal.la no long declares a bogus dependency on libexpat + (Closes: Bug#266667) + * debian/patches/hal_volume_utf8.patch + + removed. Already fixed upstream + * Changed fstab-update.sh to fstab-update.hal. Only callouts with the .hal + extension are invoked now. + * Conflict with old gnome-volume-manager + * Urgency high because it fixes RC bugs in testing + + -- Sjoerd Simons Tue, 7 Sep 2004 22:17:15 +0200 + +hal (0.2.97-0.1) unstable; urgency=low + + * NMU for New upstream release. + + sarge freezes tomorrow, this should beat the deadline. + + Works with D-BUS 0.22 and above. + * Tighten D-BUS Build-Deps/Depends to >= 0.22. + + -- Daniel Stone Mon, 16 Aug 2004 17:34:37 -0700 + +hal (0.2.95-5) unstable; urgency=medium + + * Urgency medium as this release should enter testing soon + * Replace hal_volume_utf8.patch with hal_validate_utf8.patch + + -- Martin Waitz Mon, 2 Aug 2004 20:23:51 +0200 + +hal (0.2.95-4) unstable; urgency=low + + * Manage patches with quilt. + * Apply hal_volume_utf8.patch and hal_mounted_on_startup.patch + from Sjoerd Simons (Closes: #261723) + + -- Martin Waitz Wed, 28 Jul 2004 21:34:56 +0200 + +hal (0.2.95-3) unstable; urgency=low + + * Explicitly depend on dbus 0.21-7 to get hald started (Closes: #261582) + + -- Martin Waitz Tue, 27 Jul 2004 23:15:40 +0200 + +hal (0.2.95-2) unstable; urgency=low + + * Build-depend on libpopt-dev + + -- Martin Waitz Sat, 24 Jul 2004 21:43:18 +0200 + +hal (0.2.95-1) unstable; urgency=low + + * New upstream release (Closes: #259860) + - hal hotplug helper executes in background (Closes: #237836) + - hal-device-manager shows error message in dialog (Closes: #233854) + * debian/rules: use upstream doc/api Makefiles to build docs. + * debian/{rules,hal.postinst,hal.init,hal.init.dbus}: + Start hald together with dbus (Closes: #231704) + * Apply patch from David Weinehall to make + the fstab update script not require bash (Closes: #259293) + * Cleanup syslog usage in the hotplug helper + * remove HACKING reference from README (Closes: #260241) + * fix hal-device-manager when info.product key misses + + -- Martin Waitz Fri, 23 Jul 2004 21:33:03 +0200 + +hal (0.2.93+20040711-2) unstable; urgency=low + + * rerun libtoolize to fix libhal0, argh. (Closes: #259111) + + -- Martin Waitz Tue, 13 Jul 2004 21:45:20 +0200 + +hal (0.2.93+20040711-1) unstable; urgency=low + + * New CVS checkout (Closes: #257781) + - includes part of my get-properties patch (Closes: #238175) + * debian/control: build-depend on python (Closes: #258461) + * add shlib file (Closes: #253779) + * support vc class in linux hotplug helper (Closes: #258112) + + -- Martin Waitz Mon, 12 Jul 2004 23:43:54 +0200 + +hal (0.2.92-1) unstable; urgency=low + + * New upstream release + * debian/README.Debian: add note about fstab-update callout + * fix COPYING, by accident it only contained the GPL + + -- Martin Waitz Tue, 8 Jun 2004 21:51:44 +0200 + +hal (0.2.91-1) unstable; urgency=low + + * New upstream release + + -- Martin Waitz Wed, 26 May 2004 00:28:25 +0200 + +hal (0.2.90+20040515-1) unstable; urgency=low + + * New CVS checkout + * debian/fstab-update.sh: add example from cvs tree + * debian/rules: install fstab-update.sh as example into hal/device.d + (but leave it -x for now to disable it) + + -- Martin Waitz Sat, 15 May 2004 19:55:11 +0200 + +hal (0.2.90+20040511-1) unstable; urgency=low + + * New CVS checkout + + -- Martin Waitz Tue, 11 May 2004 20:13:53 +0200 + +hal (0.2.90+20040424-1) unstable; urgency=low + + * New CVS checkout + + -- Martin Waitz Sat, 24 Apr 2004 13:15:48 +0200 + +hal (0.2.6+20040331-1) unstable; urgency=low + + * New CVS checkout + + -- Martin Waitz Wed, 31 Mar 2004 22:25:22 +0200 + +hal (0.2.6+20040311-1) unstable; urgency=low + + * New CVS checkout (Closes: #237436) + * don't die if usbfs is not mounted (Closes: # 234364) + * print better error message if hald is not runnig (one part of #233854) + + -- Martin Waitz Thu, 11 Mar 2004 20:51:59 +0100 + +hal (0.2.6-4) unstable; urgency=low + + * debian/hal.postinst: restart dbus on configure, so that it + reads our dbus policy configuration file + * debian/control: add dependency on some python modules and usbutils + (Closes: #231312, #231555, #231607) + + -- Martin Waitz Sat, 7 Feb 2004 21:49:57 +0100 + +hal (0.2.6-3) unstable; urgency=low + + * first upload to unstable + * debian/control: add phython2.3-dbus dependency + + -- Martin Waitz Thu, 5 Feb 2004 22:07:22 +0100 + +hal (0.2.6-2) experimental; urgency=low + + * Merge with package from Ross Burton + - debian/control: add hal-doc, update build-depends + - debian/rules: build documentation + - debian/hal-doc.install: include dokumentation in hal-doc + - debian/hal.postrm: new file + - debian/hal-device-manager.desktop: new file + - debian/hal.install: add desktop file + + -- Martin Waitz Tue, 27 Jan 2004 02:31:10 +0100 + +hal (0.2.6-1) experimental; urgency=low + + * Initial Release. (Closes: #217468) + + -- Martin Waitz Tue, 20 Jan 2004 01:41:51 +0100 + --- hal-0.5.11~rc2.orig/debian/hal.examples +++ hal-0.5.11~rc2/debian/hal.examples @@ -0,0 +1,2 @@ +debian/no-cd-media-check.fdi +fdi/policy/10osvendor/10-x11-input.fdi --- hal-0.5.11~rc2.orig/debian/libhal1.preinst +++ hal-0.5.11~rc2/debian/libhal1.preinst @@ -0,0 +1,11 @@ +#!/bin/sh -e + +# clean up doc directory symlinking from Gutsy +if [ "$1" = install ] || [ "$1" = upgrade ]; then + if dpkg --compare-versions "$2" lt-nl 0.5.10; then + for p in hal libhal-dev libhal-storage1 libhal-storage-dev; do + f=/usr/share/doc/$p + [ -e "$f" ] && rm -f $f || true + done + fi +fi --- hal-0.5.11~rc2.orig/debian/libhal-storage1.symbols +++ hal-0.5.11~rc2/debian/libhal-storage1.symbols @@ -0,0 +1,93 @@ +libhal-storage.so.1 libhal-storage1 #MINVER# + libhal_drive_find_all_volumes@Base 0.5.8.1 + libhal_drive_free@Base 0.5.8.1 + libhal_drive_from_device_file@Base 0.5.8.1 + libhal_drive_from_udi@Base 0.5.8.1 + libhal_drive_get_bus@Base 0.5.8.1 + libhal_drive_get_cdrom_caps@Base 0.5.8.1 + libhal_drive_get_dedicated_icon_drive@Base 0.5.8.1 + libhal_drive_get_dedicated_icon_volume@Base 0.5.8.1 + libhal_drive_get_device_file@Base 0.5.8.1 + libhal_drive_get_device_major@Base 0.5.8.1 + libhal_drive_get_device_minor@Base 0.5.8.1 + libhal_drive_get_firmware_version@Base 0.5.8.1 + libhal_drive_get_media_size@Base 0.5.8.1 + libhal_drive_get_model@Base 0.5.8.1 + libhal_drive_get_partition_scheme@Base 0.5.8.1 + libhal_drive_get_physical_device_udi@Base 0.5.8.1 + libhal_drive_get_serial@Base 0.5.8.1 + libhal_drive_get_size@Base 0.5.8.1 + libhal_drive_get_type@Base 0.5.8.1 + libhal_drive_get_type_textual@Base 0.5.8.1 + libhal_drive_get_udi@Base 0.5.8.1 + libhal_drive_get_vendor@Base 0.5.8.1 + libhal_drive_is_hotpluggable@Base 0.5.8.1 + libhal_drive_is_media_detected@Base 0.5.8.1 + libhal_drive_is_media_detection_automatic@Base 0.5.11~rc2 + libhal_drive_no_partitions_hint@Base 0.5.8.1 + libhal_drive_policy_compute_display_name@Base 0.5.8.1 + libhal_drive_policy_compute_icon_name@Base 0.5.8.1 + libhal_drive_policy_default_get_managed_keyword_primary@Base 0.5.8.1 + libhal_drive_policy_default_get_managed_keyword_secondary@Base 0.5.8.1 + libhal_drive_policy_default_get_mount_root@Base 0.5.8.1 + libhal_drive_policy_default_use_managed_keyword@Base 0.5.8.1 + libhal_drive_policy_get_desired_mount_point@Base 0.5.8.1 + libhal_drive_policy_get_mount_fs@Base 0.5.8.1 + libhal_drive_policy_get_mount_options@Base 0.5.8.1 + libhal_drive_policy_is_mountable@Base 0.5.8.1 + libhal_drive_requires_eject@Base 0.5.8.1 + libhal_drive_uses_removable_media@Base 0.5.8.1 + libhal_storage_policy_free@Base 0.5.8.1 + libhal_storage_policy_lookup_icon@Base 0.5.8.1 + libhal_storage_policy_new@Base 0.5.8.1 + libhal_storage_policy_set_icon_mapping@Base 0.5.8.1 + libhal_storage_policy_set_icon_path@Base 0.5.8.1 + libhal_volume_crypto_get_backing_volume_udi@Base 0.5.8.1 + libhal_volume_crypto_get_clear_volume_udi@Base 0.5.8.1 + libhal_volume_disc_has_audio@Base 0.5.8.1 + libhal_volume_disc_has_data@Base 0.5.8.1 + libhal_volume_disc_is_appendable@Base 0.5.8.1 + libhal_volume_disc_is_blank@Base 0.5.8.1 + libhal_volume_disc_is_rewritable@Base 0.5.8.1 + libhal_volume_free@Base 0.5.8.1 + libhal_volume_from_device_file@Base 0.5.8.1 + libhal_volume_from_mount_point@Base 0.5.9.1 + libhal_volume_from_udi@Base 0.5.8.1 + libhal_volume_get_device_file@Base 0.5.8.1 + libhal_volume_get_device_major@Base 0.5.8.1 + libhal_volume_get_device_minor@Base 0.5.8.1 + libhal_volume_get_disc_capacity@Base 0.5.8.1 + libhal_volume_get_disc_type@Base 0.5.8.1 + libhal_volume_get_fstype@Base 0.5.8.1 + libhal_volume_get_fsusage@Base 0.5.8.1 + libhal_volume_get_fsversion@Base 0.5.8.1 + libhal_volume_get_label@Base 0.5.8.1 + libhal_volume_get_mount_point@Base 0.5.8.1 + libhal_volume_get_msdos_part_table_size@Base 0.5.8.1 + libhal_volume_get_msdos_part_table_start@Base 0.5.8.1 + libhal_volume_get_msdos_part_table_type@Base 0.5.8.1 + libhal_volume_get_partition_flags@Base 0.5.8.1 + libhal_volume_get_partition_label@Base 0.5.8.1 + libhal_volume_get_partition_media_size@Base 0.5.8.1 + libhal_volume_get_partition_number@Base 0.5.8.1 + libhal_volume_get_partition_scheme@Base 0.5.8.1 + libhal_volume_get_partition_start_offset@Base 0.5.8.1 + libhal_volume_get_partition_type@Base 0.5.8.1 + libhal_volume_get_partition_uuid@Base 0.5.8.1 + libhal_volume_get_size@Base 0.5.8.1 + libhal_volume_get_storage_device_udi@Base 0.5.8.1 + libhal_volume_get_udi@Base 0.5.8.1 + libhal_volume_get_uuid@Base 0.5.8.1 + libhal_volume_is_disc@Base 0.5.8.1 + libhal_volume_is_mounted@Base 0.5.8.1 + libhal_volume_is_mounted_read_only@Base 0.5.8.1 + libhal_volume_is_partition@Base 0.5.8.1 + libhal_volume_policy_compute_display_name@Base 0.5.8.1 + libhal_volume_policy_compute_icon_name@Base 0.5.8.1 + libhal_volume_policy_compute_size_as_string@Base 0.5.8.1 + libhal_volume_policy_get_desired_mount_point@Base 0.5.8.1 + libhal_volume_policy_get_mount_fs@Base 0.5.8.1 + libhal_volume_policy_get_mount_options@Base 0.5.8.1 + libhal_volume_policy_is_mountable@Base 0.5.8.1 + libhal_volume_policy_should_be_visible@Base 0.5.8.1 + libhal_volume_should_ignore@Base 0.5.8.1 --- hal-0.5.11~rc2.orig/debian/watch +++ hal-0.5.11~rc2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://hal.freedesktop.org/releases/hal-([\d\.]+)\.tar\.gz --- hal-0.5.11~rc2.orig/debian/preferences.fdi +++ hal-0.5.11~rc2/debian/preferences.fdi @@ -0,0 +1,59 @@ + + + + + + + + + + false + + + + + + + + + + --- hal-0.5.11~rc2.orig/debian/libhal-storage1.shlibs +++ hal-0.5.11~rc2/debian/libhal-storage1.shlibs @@ -0,0 +1 @@ +libhal-storage 1 libhal-storage1 (>= 0.5.11~rc2) --- hal-0.5.11~rc2.orig/debian/hal.postinst +++ hal-0.5.11~rc2/debian/hal.postinst @@ -0,0 +1,81 @@ +#! /bin/sh +# postinst script for hal +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +case "$1" in + configure) + getent passwd haldaemon >/dev/null || \ + adduser --system \ + --quiet \ + --disabled-password \ + --no-create-home \ + --home "/var/run/hald" \ + --gecos "Hardware abstraction layer" \ + --quiet \ + --group haldaemon + + if [ -x /etc/init.d/dbus ] && dpkg --compare-versions "$2" gt-nl 0.5.7.1; then + invoke-rc.d dbus force-reload || true + fi + + # Allow hal to query the PolicyKit database to enforce privileges + if ! /usr/bin/polkit-auth --user haldaemon --explicit | grep -q 'org.freedesktop.policykit.read'; then + /usr/bin/polkit-auth --user haldaemon --grant 'org.freedesktop.policykit.read' + fi + + # finish the udev rules rename on upgrades + if dpkg --compare-versions "$2" le-nl "0.5.8.1-3ubuntu7"; then + rm -f /etc/udev/rules.d/85-hal.rules.moved-by-preinst + fi + + # do not restart (this happens in DEBHELPER later) if we + # upgrade from dapper but install the start links + if dpkg --compare-versions "$2" lt-nl "0.5.7.1-0ubuntu17"; then + update-rc.d -f hal remove >/dev/null + update-rc.d hal start 24 2 3 4 5 . stop 16 1 . >/dev/null + exit 0 + fi + + # Force rc level sanity on upgrades, a lot of people have level 12 for some + # reason + if dpkg --compare-versions "$2" lt-nl "0.5.11~rc2-1ubuntu8" && + ls /etc/rc*.d/S*[0-9]hal >/dev/null 2>/dev/null; then + update-rc.d -f hal remove >/dev/null + update-rc.d hal start 24 2 3 4 5 . stop 16 1 . >/dev/null + fi + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- hal-0.5.11~rc2.orig/debian/hal-doc.links +++ hal-0.5.11~rc2/debian/hal-doc.links @@ -0,0 +1,2 @@ +usr/share/doc/hal-doc/api/libhal usr/share/gtk-doc/html/libhal +usr/share/doc/hal-doc/api/libhal-storage usr/share/gtk-doc/html/libhal-storage --- hal-0.5.11~rc2.orig/debian/no-cd-media-check.fdi +++ hal-0.5.11~rc2/debian/no-cd-media-check.fdi @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- hal-0.5.11~rc2.orig/debian/libhal1.shlibs +++ hal-0.5.11~rc2/debian/libhal1.shlibs @@ -0,0 +1 @@ +libhal 1 libhal1 (>= 0.5.11~rc2) --- hal-0.5.11~rc2.orig/debian/libhal1.symbols +++ hal-0.5.11~rc2/debian/libhal1.symbols @@ -0,0 +1,106 @@ +libhal.so.1 libhal1 #MINVER# + libhal_acquire_global_interface_lock@Base 0.5.9.1 + libhal_changeset_set_property_bool@Base 0.5.8.1 + libhal_changeset_set_property_double@Base 0.5.8.1 + libhal_changeset_set_property_int@Base 0.5.8.1 + libhal_changeset_set_property_string@Base 0.5.8.1 + libhal_changeset_set_property_strlist@Base 0.5.8.1 + libhal_changeset_set_property_uint64@Base 0.5.8.1 + libhal_ctx_free@Base 0.5.8.1 + libhal_ctx_get_dbus_connection@Base 0.5.8.1 + libhal_ctx_get_user_data@Base 0.5.8.1 + libhal_ctx_init@Base 0.5.8.1 + libhal_ctx_init_direct@Base 0.5.8.1 + libhal_ctx_new@Base 0.5.8.1 + libhal_ctx_set_cache@Base 0.5.8.1 + libhal_ctx_set_dbus_connection@Base 0.5.8.1 + libhal_ctx_set_device_added@Base 0.5.8.1 + libhal_ctx_set_device_condition@Base 0.5.8.1 + libhal_ctx_set_device_lost_capability@Base 0.5.8.1 + libhal_ctx_set_device_new_capability@Base 0.5.8.1 + libhal_ctx_set_device_property_modified@Base 0.5.8.1 + libhal_ctx_set_device_removed@Base 0.5.8.1 + libhal_ctx_set_global_interface_lock_acquired@Base 0.5.9.1 + libhal_ctx_set_global_interface_lock_released@Base 0.5.9.1 + libhal_ctx_set_interface_lock_acquired@Base 0.5.9.1 + libhal_ctx_set_interface_lock_released@Base 0.5.9.1 + libhal_ctx_set_singleton_device_added@Base 0.5.10 + libhal_ctx_set_singleton_device_removed@Base 0.5.10 + libhal_ctx_set_user_data@Base 0.5.8.1 + libhal_ctx_shutdown@Base 0.5.8.1 + libhal_device_acquire_interface_lock@Base 0.5.9.1 + libhal_device_add_capability@Base 0.5.8.1 + libhal_device_add_property_watch@Base 0.5.8.1 + libhal_device_addon_is_ready@Base 0.5.8.1 + libhal_device_claim_interface@Base 0.5.8.1 + libhal_device_commit_changeset@Base 0.5.8.1 + libhal_device_commit_to_gdl@Base 0.5.8.1 + libhal_device_emit_condition@Base 0.5.8.1 + libhal_device_exists@Base 0.5.8.1 + libhal_device_free_changeset@Base 0.5.8.1 + libhal_device_get_all_properties@Base 0.5.8.1 + libhal_device_get_property_bool@Base 0.5.8.1 + libhal_device_get_property_double@Base 0.5.8.1 + libhal_device_get_property_int@Base 0.5.8.1 + libhal_device_get_property_string@Base 0.5.8.1 + libhal_device_get_property_strlist@Base 0.5.8.1 + libhal_device_get_property_type@Base 0.5.8.1 + libhal_device_get_property_uint64@Base 0.5.8.1 + libhal_device_is_caller_locked_out@Base 0.5.9.1 + libhal_device_is_caller_privileged@Base 0.5.10 + libhal_device_is_locked_by_others@Base 0.5.9.1 + libhal_device_lock@Base 0.5.8.1 + libhal_device_matches@Base 0.5.8.1 + libhal_device_new_changeset@Base 0.5.8.1 + libhal_device_print@Base 0.5.8.1 + libhal_device_property_exists@Base 0.5.8.1 + libhal_device_property_strlist_append@Base 0.5.8.1 + libhal_device_property_strlist_prepend@Base 0.5.8.1 + libhal_device_property_strlist_remove@Base 0.5.8.1 + libhal_device_property_strlist_remove_index@Base 0.5.8.1 + libhal_device_property_watch_all@Base 0.5.8.1 + libhal_device_query_capability@Base 0.5.8.1 + libhal_device_release_interface_lock@Base 0.5.9.1 + libhal_device_remove_property@Base 0.5.8.1 + libhal_device_remove_property_watch@Base 0.5.8.1 + libhal_device_reprobe@Base 0.5.8.1 + libhal_device_rescan@Base 0.5.8.1 + libhal_device_set_property_bool@Base 0.5.8.1 + libhal_device_set_property_double@Base 0.5.8.1 + libhal_device_set_property_int@Base 0.5.8.1 + libhal_device_set_property_string@Base 0.5.8.1 + libhal_device_set_property_uint64@Base 0.5.8.1 + libhal_device_singleton_addon_is_ready@Base 0.5.10 + libhal_device_unlock@Base 0.5.8.1 + libhal_find_device_by_capability@Base 0.5.8.1 + libhal_free_property_set@Base 0.5.8.1 + libhal_free_string@Base 0.5.8.1 + libhal_free_string_array@Base 0.5.8.1 + libhal_get_all_devices@Base 0.5.8.1 + libhal_get_all_devices_with_properties@Base 0.5.11~rc2 + libhal_manager_find_device_string_match@Base 0.5.8.1 + libhal_merge_properties@Base 0.5.8.1 + libhal_new_device@Base 0.5.8.1 + libhal_property_set_get_num_elems@Base 0.5.8.1 + libhal_property_set_sort@Base 0.5.9.1 + libhal_ps_get_bool@Base 0.5.10 + libhal_ps_get_double@Base 0.5.10 + libhal_ps_get_int32@Base 0.5.10 + libhal_ps_get_string@Base 0.5.10 + libhal_ps_get_strlist@Base 0.5.10 + libhal_ps_get_type@Base 0.5.10 + libhal_ps_get_uint64@Base 0.5.10 + libhal_psi_get_bool@Base 0.5.8.1 + libhal_psi_get_double@Base 0.5.8.1 + libhal_psi_get_int@Base 0.5.8.1 + libhal_psi_get_key@Base 0.5.8.1 + libhal_psi_get_string@Base 0.5.8.1 + libhal_psi_get_strlist@Base 0.5.8.1 + libhal_psi_get_type@Base 0.5.8.1 + libhal_psi_get_uint64@Base 0.5.8.1 + libhal_psi_has_more@Base 0.5.8.1 + libhal_psi_init@Base 0.5.8.1 + libhal_psi_next@Base 0.5.8.1 + libhal_release_global_interface_lock@Base 0.5.9.1 + libhal_remove_device@Base 0.5.8.1 + libhal_string_array_length@Base 0.5.8.1 --- hal-0.5.11~rc2.orig/debian/hal.preinst +++ hal-0.5.11~rc2/debian/hal.preinst @@ -0,0 +1,77 @@ +#!/bin/sh + +set -e + +rm_conffile() { + PKGNAME="hal" + CONFFILE="$1" + + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" + fi + fi +} + +mv_conffile() { + OLD="$1" + NEW="$2" + PKGNAME="hal" + if [ -e "$OLD" ]; then + md5sum="`md5sum \"$OLD\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $OLD'{s/ obsolete$//;s/.* //p}\"`" + if [ "$md5sum" = "$old_md5sum" ]; then + mv -f "$OLD" "$OLD.moved-by-preinst" + else + mv -f "$OLD" "$NEW" + fi + fi +} + + +case "$1" in + install|upgrade) + if dpkg --compare-versions "$2" le "0.5.2-1"; then + rm_conffile "/etc/hal/fdi/preferences.fdi" + rm_conffile "/etc/dev.d/block/hal-unmount.dev" + fi + if dpkg --compare-versions "$2" le "0.5.6-2"; then + rm_conffile "/etc/udev/scripts/device-removable.sh" + fi + if dpkg --compare-versions "$2" le "0.5.6-4"; then + rm_conffile "/etc/hal/fdi/preferences.fdi" + fi + if dpkg --compare-versions "$2" le "0.5.7-2"; then + rm_conffile "/etc/udev/rules.d/90-hal.rules" + fi + if dpkg --compare-versions "$2" le "0.5.7.1-1"; then + deluser --quiet --system hal > /dev/null || true + fi + if dpkg --compare-versions "$2" le "0.5.8.1-3ubuntu7"; then + mv_conffile /etc/udev/rules.d/85-hal.rules /etc/udev/rules.d/95-hal.rules + fi + if dpkg --compare-versions "$2" lt "0.5.9-3"; then + if [ -x /etc/dbus-1/event.d/20hal ]; then + /etc/dbus-1/event.d/20hal stop + fi + rm_conffile "/etc/dbus-1/event.d/20hal" + fi + # clean up doc directory symlinking from Gutsy + if dpkg --compare-versions "$2" lt-nl 0.5.10; then + for p in hal libhal-dev libhal-storage1 libhal-storage-dev; do + f=/usr/share/doc/$p + [ -e "$f" ] && rm -f $f || true + done + fi +esac + +#DEBHELPER# + +exit 0 --- hal-0.5.11~rc2.orig/debian/README.ubuntu-dev +++ hal-0.5.11~rc2/debian/README.ubuntu-dev @@ -0,0 +1,8 @@ +This package can not (currently) be build with "debuild -S --merge" because +of a bug in the upstream makefiles. + +Build it with + bzr-buildpackage --dont-purge +and then run + debuils -S +in the ../build-area/hal-$version dir. --- hal-0.5.11~rc2.orig/debian/hal.install +++ hal-0.5.11~rc2/debian/hal.install @@ -0,0 +1,9 @@ +debian/tmp/etc/ +debian/tmp/usr/bin/ +debian/tmp/usr/sbin/ +debian/tmp/sbin/umount.hal usr/sbin +debian/tmp/usr/lib/hal/ +debian/tmp/usr/share/hal/fdi/ +debian/tmp/usr/share/PolicyKit/ +debian/preferences.fdi etc/hal/fdi/policy +debian/debian-storage-policy-ignore-fixed-crypto-drives.fdi usr/share/hal/fdi/policy/10osvendor --- hal-0.5.11~rc2.orig/debian/copyright +++ hal-0.5.11~rc2/debian/copyright @@ -0,0 +1,249 @@ +This package was debianized by Martin Waitz on +Fri, 24 Oct 2003 22:54:43 +0200. + +It was downloaded from www.freedesktop.org + +Upstream Author: David Zeuthen + +Copyright: + +HAL is licensed to you under your choice of the Academic Free +License version 2.0, or the GNU General Public License version 2. +Both licenses are included here. Some individual source code files +and/or binaries may be under the GPL only or under the LGPG. + +Each source code file is marked with the proper copyright information. + + The Academic Free License + v. 2.0 + +This Academic Free License (the "License") applies to any original +work of authorship (the "Original Work") whose owner (the "Licensor") +has placed the following notice immediately following the copyright +notice for the Original Work: + +Licensed under the Academic Free License version 2.0 + +1) Grant of Copyright License. Licensor hereby grants You a +world-wide, royalty-free, non-exclusive, perpetual, sublicenseable +license to do the following: + +a) to reproduce the Original Work in copies; + +b) to prepare derivative works ("Derivative Works") based upon the Original Work; + +c) to distribute copies of the Original Work and Derivative Works to the public; + +d) to perform the Original Work publicly; and + +e) to display the Original Work publicly. + +2) Grant of Patent License. Licensor hereby grants You a world-wide, +royalty-free, non-exclusive, perpetual, sublicenseable license, under +patent claims owned or controlled by the Licensor that are embodied in +the Original Work as furnished by the Licensor, to make, use, sell and +offer for sale the Original Work and Derivative Works. + +3) Grant of Source Code License. The term "Source Code" means the +preferred form of the Original Work for making modifications to it and +all available documentation describing how to modify the Original +Work. Licensor hereby agrees to provide a machine-readable copy of +the Source Code of the Original Work along with each copy of the +Original Work that Licensor distributes. Licensor reserves the right +to satisfy this obligation by placing a machine-readable copy of the +Source Code in an information repository reasonably calculated to +permit inexpensive and convenient access by You for as long as +Licensor continues to distribute the Original Work, and by publishing +the address of that information repository in a notice immediately +following the copyright notice that applies to the Original Work. + +4) Exclusions From License Grant. Neither the names of Licensor, nor +the names of any contributors to the Original Work, nor any of their +trademarks or service marks, may be used to endorse or promote +products derived from this Original Work without express prior written +permission of the Licensor. Nothing in this License shall be deemed +to grant any rights to trademarks, copyrights, patents, trade secrets +or any other intellectual property of Licensor except as expressly +stated herein. No patent license is granted to make, use, sell or +offer to sell embodiments of any patent claims other than the licensed +claims defined in Section 2. No right is granted to the trademarks of +Licensor even if such marks are included in the Original Work. +Nothing in this License shall be interpreted to prohibit Licensor from +licensing under different terms from this License any Original Work +that Licensor otherwise would have a right to license. + +5) This section intentionally omitted. + +6) Attribution Rights. You must retain, in the Source Code of any +Derivative Works that You create, all copyright, patent or trademark +notices from the Source Code of the Original Work, as well as any +notices of licensing and any descriptive text identified therein as an +"Attribution Notice." You must cause the Source Code for any +Derivative Works that You create to carry a prominent Attribution +Notice reasonably calculated to inform recipients that You have +modified the Original Work. + +7) Warranty of Provenance and Disclaimer of Warranty. Licensor +warrants that the copyright in and to the Original Work and the patent +rights granted herein by Licensor are owned by the Licensor or are +sublicensed to You under the terms of this License with the permission +of the contributor(s) of those copyrights and patent rights. Except +as expressly stated in the immediately proceeding sentence, the +Original Work is provided under this License on an "AS IS" BASIS and +WITHOUT WARRANTY, either express or implied, including, without +limitation, the warranties of NON-INFRINGEMENT, MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY +OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY +constitutes an essential part of this License. No license to Original +Work is granted hereunder except under this disclaimer. + +8) Limitation of Liability. Under no circumstances and under no legal +theory, whether in tort (including negligence), contract, or +otherwise, shall the Licensor be liable to any person for any direct, +indirect, special, incidental, or consequential damages of any +character arising as a result of this License or the use of the +Original Work including, without limitation, damages for loss of +goodwill, work stoppage, computer failure or malfunction, or any and +all other commercial damages or losses. This limitation of liability +shall not apply to liability for death or personal injury resulting +from Licensor's negligence to the extent applicable law prohibits such +limitation. Some jurisdictions do not allow the exclusion or +limitation of incidental or consequential damages, so this exclusion +and limitation may not apply to You. + +9) Acceptance and Termination. If You distribute copies of the +Original Work or a Derivative Work, You must make a reasonable effort +under the circumstances to obtain the express assent of recipients to +the terms of this License. Nothing else but this License (or another +written agreement between Licensor and You) grants You permission to +create Derivative Works based upon the Original Work or to exercise +any of the rights granted in Section 1 herein, and any attempt to do +so except under the terms of this License (or another written +agreement between Licensor and You) is expressly prohibited by +U.S. copyright law, the equivalent laws of other countries, and by +international treaty. Therefore, by exercising any of the rights +granted to You in Section 1 herein, You indicate Your acceptance of +this License and all of its terms and conditions. + +10) Termination for Patent Action. This License shall terminate +automatically and You may no longer exercise any of the rights granted +to You by this License as of the date You commence an action, +including a cross-claim or counterclaim, for patent infringement (i) +against Licensor with respect to a patent applicable to software or +(ii) against any entity with respect to a patent applicable to the +Original Work (but excluding combinations of the Original Work with +other software or hardware). + +11) Jurisdiction, Venue and Governing Law. Any action or suit relating +to this License may be brought only in the courts of a jurisdiction +wherein the Licensor resides or in which Licensor conducts its primary +business, and under the laws of that jurisdiction excluding its +conflict-of-law provisions. The application of the United Nations +Convention on Contracts for the International Sale of Goods is +expressly excluded. Any use of the Original Work outside the scope of +this License or after its termination shall be subject to the +requirements and penalties of the U.S. Copyright Act, 17 U.S.C. \u00a4 +101 et seq., the equivalent laws of other countries, and international +treaty. This section shall survive the termination of this License. + +12) Attorneys Fees. In any action to enforce the terms of this License +or seeking damages relating thereto, the prevailing party shall be +entitled to recover its costs and expenses, including, without +limitation, reasonable attorneys' fees and costs incurred in +connection with such action, including any appeal of such action. +This section shall survive the termination of this License. + +13) Miscellaneous. This License represents the complete agreement +concerning the subject matter hereof. If any provision of this +License is held to be unenforceable, such provision shall be reformed +only to the extent necessary to make it enforceable. + +14) Definition of "You" in This License. "You" throughout this +License, whether in upper or lower case, means an individual or a +legal entity exercising rights under, and complying with all of the +terms of, this License. For legal entities, "You" includes any entity +that controls, is controlled by, or is under common control with you. +For purposes of this definition, "control" means (i) the power, direct +or indirect, to cause the direction or management of such entity, +whether by contract or otherwise, or (ii) ownership of fifty percent +(50%) or more of the outstanding shares, or (iii) beneficial ownership +of such entity. + +15) Right to Use. You may use the Original Work in all ways not +otherwise restricted or conditioned by this License or by law, and +Licensor promises not to interfere with or be responsible for such +uses by You. + +This license is Copyright (C) 2003 Lawrence E. Rosen. All rights +reserved. Permission is hereby granted to copy and distribute this +license without modification. This license may not be modified +without the express written permission of its copyright owner. + +-- +END OF ACADEMIC FREE LICENSE. The following is intended to describe the essential +differences between the Academic Free License (AFL) version 1.0 and other +open source licenses: + +The Academic Free License is similar to the BSD, MIT, UoI/NCSA and Apache +licenses in many respects but it is intended to solve a few problems with +those licenses. + +* The AFL is written so as to make it clear what software is being +licensed (by the inclusion of a statement following the copyright notice +in the software). This way, the license functions better than a template +license. The BSD, MIT and UoI/NCSA licenses apply to unidentified software. + +* The AFL contains a complete copyright grant to the software. The BSD +and Apache licenses are vague and incomplete in that respect. + +* The AFL contains a complete patent grant to the software. The BSD, MIT, +UoI/NCSA and Apache licenses rely on an implied patent license and contain +no explicit patent grant. + +* The AFL makes it clear that no trademark rights are granted to the +licensor's trademarks. The Apache license contains such a provision, but the +BSD, MIT and UoI/NCSA licenses do not. + +* The AFL includes the warranty by the licensor that it either owns the +copyright or that it is distributing the software under a license. None of +the other licenses contain that warranty. All other warranties are disclaimed, +as is the case for the other licenses. + +* The AFL is itself copyrighted (with the right granted to copy and distribute +without modification). This ensures that the owner of the copyright to the +license will control changes. The Apache license contains a copyright notice, +but the BSD, MIT and UoI/NCSA licenses do not. + + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +A copy of the GPL is available in /usr/share/common-licenses/GPL + +=============================================================================== + +The API documentation in the doc/ subdirectory is licensed under the GFDL. + + Permission is granted to copy, distribute and/or modify this document under + the terms of the GNU Free Documentation License, Version 1.1 or any later + version published by the Free Software Foundation with no Invariant Sections, + no Front-Cover Texts, and no Back-Cover Texts. You may obtain a copy of the + GNU Free Documentation License from the Free Software Foundation by visiting + their Web site or by writing to: + + Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU Free Documentation +License can be found in `/usr/share/common-licenses/GFDL'. --- hal-0.5.11~rc2.orig/debian/libhal1.install +++ hal-0.5.11~rc2/debian/libhal1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libhal.so.* --- hal-0.5.11~rc2.orig/debian/hal.dirs +++ hal-0.5.11~rc2/debian/hal.dirs @@ -0,0 +1,3 @@ +/var/cache/hald +/var/lib/hal +/var/run/hal --- hal-0.5.11~rc2.orig/debian/hal.default +++ hal-0.5.11~rc2/debian/hal.default @@ -0,0 +1 @@ +DAEMON_OPTS= --- hal-0.5.11~rc2.orig/debian/compat +++ hal-0.5.11~rc2/debian/compat @@ -0,0 +1 @@ +5 --- hal-0.5.11~rc2.orig/debian/hal.postrm +++ hal-0.5.11~rc2/debian/hal.postrm @@ -0,0 +1,34 @@ +#!/bin/sh + +set -e + +# gracefully handle udev rules renaming on upgrade errors +if [ "$1" = abort-install ] || [ "$1" = abort-upgrade ]; then + if dpkg --compare-versions "$2" le-nl "0.5.8.1-3ubuntu7"; then + F=/etc/udev/rules.d/85-hal.rules + if [ -e $F.moved-by-preinst ]; then + mv -f $F.moved-by-preinst $F + fi + fi +fi + +#DEBHELPER# + +if [ "$1" = "purge" ] ; then + # Tell dbus to reload it's configuration files only, when we purge the + # package, i.e. when we remove its conffiles in /etc/dbus-1/system.d/ + if [ -x /etc/init.d/dbus ]; then + invoke-rc.d dbus force-reload || true + fi + + if [ -x "$(command -v deluser)" ]; then + deluser --quiet --system haldaemon > /dev/null || true + else + echo >&2 "Not removing haldaemon system account because deluser command was not found" + fi + + rm -f /var/cache/hald/fdi-cache + rmdir /var/cache/hald || true +fi + +exit 0 --- hal-0.5.11~rc2.orig/debian/hal.udev.rules +++ hal-0.5.11~rc2/debian/hal.udev.rules @@ -0,0 +1,2 @@ +# Have udev pass data over a socket to hal +RUN+="socket:/org/freedesktop/hal/udev_event" --- hal-0.5.11~rc2.orig/debian/hal.manpages +++ hal-0.5.11~rc2/debian/hal.manpages @@ -0,0 +1,10 @@ +debian/tmp/usr/share/man/man8/hald.8 +debian/tmp/usr/share/man/man1/hal-disable-polling.1 +debian/tmp/usr/share/man/man1/hal-find-by-capability.1 +debian/tmp/usr/share/man/man1/hal-find-by-property.1 +debian/tmp/usr/share/man/man1/hal-get-property.1 +debian/tmp/usr/share/man/man1/hal-is-caller-locked-out.1 +debian/tmp/usr/share/man/man1/hal-is-caller-privileged.1 +debian/tmp/usr/share/man/man1/hal-lock.1 +debian/tmp/usr/share/man/man1/hal-set-property.1 +debian/tmp/usr/share/man/man1/lshal.1 --- hal-0.5.11~rc2.orig/debian/debian-storage-policy-ignore-fixed-crypto-drives.fdi +++ hal-0.5.11~rc2/debian/debian-storage-policy-ignore-fixed-crypto-drives.fdi @@ -0,0 +1,13 @@ + + + + + + + + true + + + + + --- hal-0.5.11~rc2.orig/debian/hal-doc.install +++ hal-0.5.11~rc2/debian/hal-doc.install @@ -0,0 +1,3 @@ +debian/tmp/usr/share/doc/hal-doc +debian/tmp/usr/share/gtk-doc/html/libhal usr/share/doc/hal-doc/api +debian/tmp/usr/share/gtk-doc/html/libhal-storage usr/share/doc/hal-doc/api --- hal-0.5.11~rc2.orig/debian/hal.links +++ hal-0.5.11~rc2/debian/hal.links @@ -0,0 +1 @@ +/usr/sbin/umount.hal sbin/umount.hal --- hal-0.5.11~rc2.orig/debian/run-hald.sh +++ hal-0.5.11~rc2/debian/run-hald.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +cd hald +P="`pwd`" +export HALD_RUNNER_PATH=$P/linux:$P/linux/probing:$P/linux/addons:.:../tools:../tools/linux +export PATH=../hald-runner:$PATH +export HAL_FDI_SOURCE_PREPROBE=../fdi/preprobe +export HAL_FDI_SOURCE_INFORMATION=../fdi/information +export HAL_FDI_SOURCE_POLICY=../fdi/policy +./hald --daemon=no --verbose=yes + --- hal-0.5.11~rc2.orig/debian/hal.docs +++ hal-0.5.11~rc2/debian/hal.docs @@ -0,0 +1 @@ +build-tree/*/doc/TODO --- hal-0.5.11~rc2.orig/debian/shlibs.local +++ hal-0.5.11~rc2/debian/shlibs.local @@ -0,0 +1 @@ +libhal 1 libhal1 (>= 0.5) --- hal-0.5.11~rc2.orig/debian/README.Debian +++ hal-0.5.11~rc2/debian/README.Debian @@ -0,0 +1,25 @@ + + The powermanagement callouts in the default hal config + (org.freedesktop.Hal.Device.SystemPowerManagement and + org.freedesktop.Hal.Device.LaptopPanel) and the storage callouts + (org.freedesktop.Hal.Device.Volume.*) can be used by users on a local + physical console. + + The acpi addon won't use the kernel acpi events interface but the acpid's + event socket if acpid is installed. If acpid is removed, hal needs to be + restarted to enable monitoring of acpi events again. And if apci is installed, + hal needs a restart to free the kernels acpi events interface for acpid. + + + Some CD and DVD drives, such as the GDR8162B model found in some Dell + laptops, do not correctly handle media status inquiries and incorrectly + spin up the drive when they should not. Since hal regularly polls CD + drives for media changes, this results in increased power consumption and + mechanical wear and tear on such drives, which remain spinning constantly + while hal is running. + + If you have a CD/DVD drive exhibiting this problem, you can copy + /usr/share/doc/hal/examples/no-cd-media-check.fdi to /etc/hal/fdi/policy/ to + disable media checks for your drive. This file disables media checks for + all CD drives on the system, and also includes an example config for + disabling media checks only on a specific drive. --- hal-0.5.11~rc2.orig/debian/hal.init +++ hal-0.5.11~rc2/debian/hal.init @@ -0,0 +1,96 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: hal +# Required-Start: $remote_fs dbus +# Required-Stop: $remote_fs dbus +# Should-Start: $syslog acpid +# Should-Stop: $syslog acpid +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Hardware abstraction layer +# Description: The HAL daemon collects and maintains information about +# your hardware. +### END INIT INFO + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/hald +PIDDIR=/var/run/hald +PIDFILE=$PIDDIR/hald.pid +NAME=hald +DAEMONUSER=haldaemon +DESC="Hardware abstraction layer" + +. /lib/lsb/init-functions + +test -x $DAEMON || exit 0 + +# Include hal defaults if available +if [ -f /etc/default/hal ] ; then + . /etc/default/hal +fi + +set -e + +do_start() { + # a crashing gparted sometimes leaves this behind; a bad hack, but we + # should keep this in place until hal offers a native interface for + # temporarily disabling automount (see LP #134712) + rm -f /usr/share/hal/fdi/policy/gparted-disable-automount.fdi + + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + fi + chown $DAEMONUSER:$DAEMONUSER $PIDDIR + start-stop-daemon --start --oknodo --pidfile $PIDFILE \ + --exec $DAEMON -- $DAEMON_OPTS +} + +do_stop() { + start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE \ + --exec $DAEMON +} + +case "$1" in + start) + if [ ! -d /proc/sys/fs/inotify ]; then + log_failure_msg "Can't start $DESC - enable inotify support in your kernel" + exit 0 + fi + if [ ! -e /var/run/dbus/system_bus_socket ]; then + log_failure_msg "Can't start $DESC - please ensure dbus is running" + exit 0 + fi + + if [ ! -d /sys/kernel ]; then + log_failure_msg "Can't start $DESC - sysfs not mounted on /sys" + exit 0 + fi + + if [ "$(stat -c %d/%i /)" != "$(stat -Lc %d/%i /proc/1/root 2>/dev/null)" ]; then + log_failure_msg "Can't start $DESC - detected chrooted session" + exit 0 + fi + + log_daemon_msg "Starting $DESC" "$NAME" + do_start + log_end_msg $? + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + log_end_msg $? + ;; + restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + sleep 1 + do_start + log_end_msg $? + ;; + *) + log_success_msg "Usage: $0 {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 --- hal-0.5.11~rc2.orig/debian/control +++ hal-0.5.11~rc2/debian/control @@ -0,0 +1,103 @@ +Source: hal +Section: admin +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Utopia Maintenance Team +Uploaders: Sjoerd Simons , Sebastian Dröge , Michael Biebl +Build-Depends: debhelper (>= 5.0.37.2), cdbs, autotools-dev, libdbus-glib-1-dev (>= 0.61), libglib2.0-dev, libsysfs-dev, libexpat1-dev, libpopt-dev, pkg-config, pciutils-dev, doxygen, intltool (>= 0.22), libusb-dev [!hurd-i386], libvolume-id-dev, xmlto, libxml2-utils, gtk-doc-tools, libsmbios-dev(>= 0.13.10-1ubuntu1.1) [i386 amd64], gperf, libpolkit-dev (>= 0.5), policykit +Standards-Version: 3.7.3 +Homepage: http://hal.freedesktop.org/ +Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/hal/hardy + +Package: hal +Architecture: any +Depends: ${shlibs:Depends}, adduser, pciutils, usbutils, udev (>= 0.065), dbus (>= 0.61), lsb-base, hal-info (>= 20070402), pm-utils, mount (>= 2.13), policykit (>= 0.7), consolekit, acl +Recommends: eject, libsmbios-bin [i386 amd64] +Suggests: gnome-device-manager +Description: Hardware Abstraction Layer + HAL provides an abstract view on hardware. + . + This abstraction layer is simply an interface that makes it possible to + add support for new devices and new ways of connecting devices to the + computer, without modifying every application that uses the device. + It maintains a list of devices that currently exist, and can provide + information about those upon request. + +Package: hal-doc +Architecture: all +Section: doc +Suggests: devhelp +Description: Hardware Abstraction Layer - documentation + HAL provides an abstract view on hardware. + . + This abstraction layer is simply an interface that makes it possible to + add support for new devices and new ways of connecting devices to the + computer, without modifying every application that uses the device. + It maintains a list of devices that currently exist, and can provide + information about those upon request. + . + This package contains the API documentation for HAL. + +Package: libhal1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: Hardware Abstraction Layer - shared library + HAL provides an abstract view on hardware. + . + This abstraction layer is simply an interface that makes it possible to + add support for new devices and new ways of connecting devices to the + computer, without modifying every application that uses the device. + It maintains a list of devices that currently exist, and can provide + information about those upon request. + . + This package contains shared libraries to be used by applications. + +Package: libhal-storage1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: Hardware Abstraction Layer - shared library for storage devices + HAL provides an abstract view on hardware. + . + This abstraction layer is simply an interface that makes it possible to + add support for new devices and new ways of connecting devices to the + computer, without modifying every application that uses the device. + It maintains a list of devices that currently exist, and can provide + information about those upon request. + . + This library provides an interface for handling storage devices. + +Package: libhal-dev +Section: libdevel +Architecture: any +Depends: libhal1 (= ${binary:Version}), libdbus-1-dev (>= 0.60) +Suggests: hal-doc +Description: Hardware Abstraction Layer - development files + HAL provides an abstract view on hardware. + . + This abstraction layer is simply an interface that makes it possible to + add support for new devices and new ways of connecting devices to the + computer, without modifying every application that uses the device. + It maintains a list of devices that currently exist, and can provide + information about those upon request. + . + This package contains files that are needed to build applications. + +Package: libhal-storage-dev +Section: libdevel +Architecture: any +Depends: libhal-storage1 (= ${binary:Version}), libdbus-1-dev (>= 0.60), libhal-dev +Suggests: hal-doc +Description: Hardware Abstraction Layer - development files + HAL provides an abstract view on hardware. + . + This abstraction layer is simply an interface that makes it possible to + add support for new devices and new ways of connecting devices to the + computer, without modifying every application that uses the device. + It maintains a list of devices that currently exist, and can provide + information about those upon request. + . + This package contains files that are needed to build applications that use + libhal-storage1. + --- hal-0.5.11~rc2.orig/debian/libhal-dev.install +++ hal-0.5.11~rc2/debian/libhal-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/hal/libhal.h +debian/tmp/usr/lib/pkgconfig/hal.pc +debian/tmp/usr/lib/libhal.so +debian/tmp/usr/lib/libhal.a --- hal-0.5.11~rc2.orig/debian/libhal-storage1.install +++ hal-0.5.11~rc2/debian/libhal-storage1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libhal-storage.so.* --- hal-0.5.11~rc2.orig/debian/patches/00upstream-fix-macbook-backlight.patch +++ hal-0.5.11~rc2/debian/patches/00upstream-fix-macbook-backlight.patch @@ -0,0 +1,15 @@ +# Description: fix macbook-backlight for ix86 +# Ubuntu: https://launchpad.net/bugs/206921 +# Upstream: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=9f5219eaa6c7423870b031fdfa07de6a84f25d6e + +--- a/hald/linux/addons/addon-macbook-backlight.c ++++ b/hald/linux/addons/addon-macbook-backlight.c +@@ -115,7 +115,7 @@ end: + static gboolean + map_register_page (void) + { +- long address; ++ unsigned long address; + int fd; + + address = determine_video_base_address (); --- hal-0.5.11~rc2.orig/debian/patches/40_readme_remove_hacking.patch +++ hal-0.5.11~rc2/debian/patches/40_readme_remove_hacking.patch @@ -0,0 +1,12 @@ +diff -ruN hal-0.5.0-old/README hal-0.5.0/README +--- hal-0.5.0-old/README 2004-12-14 03:47:58.000000000 +0100 ++++ hal-0.5.0/README 2005-04-13 12:32:18.448771192 +0200 +@@ -2,8 +2,6 @@ + HAL is a hardware abstraction layer + + +-See also the file HACKING for notes of interest to developers working on HAL. +- + See http://www.freedesktop.org/Software/hal for lots of documentation, + mailing lists, etc. + --- hal-0.5.11~rc2.orig/debian/patches/55_nonpolkit-mount-policy.patch +++ hal-0.5.11~rc2/debian/patches/55_nonpolkit-mount-policy.patch @@ -0,0 +1,33 @@ +diff --git a/tools/hal-storage-mount.c b/tools/hal-storage-mount.c +index ae14181..4628067 100644 +--- a/tools/hal-storage-mount.c ++++ b/tools/hal-storage-mount.c +@@ -92,6 +92,14 @@ permission_denied_etc_fstab (const char *device) + } + + static void ++permission_denied_uid (const char *device, const char *uid) ++{ ++ fprintf (stderr, "org.freedesktop.Hal.Device.Volume.PermissionDenied\n"); ++ fprintf (stderr, "Refusing to mount device %s for uid=%s.\n", device, uid); ++ exit (1); ++} ++ ++static void + already_mounted (const char *device) + { + fprintf (stderr, "org.freedesktop.Hal.Device.Volume.AlreadyMounted\n"); +@@ -812,6 +820,13 @@ handle_mount (LibHalContext *hal_ctx, + } + libhal_free_string (polkit_result); + } ++#else ++ /* root can do everything; only allow handling removable devices ++ * without uid change to non-root users */ ++ if (!invoked_by_uid || strcmp(invoked_by_uid, "0")) ++ if (!action || strcmp (action, "org.freedesktop.hal.storage.mount-removable")) ++ permission_denied_uid (device, invoked_by_uid); ++ + #endif + + #ifdef DEBUG --- hal-0.5.11~rc2.orig/debian/patches/00upstream-long_storage_size.patch +++ hal-0.5.11~rc2/debian/patches/00upstream-long_storage_size.patch @@ -0,0 +1,29 @@ +commit f7d7779d0fd2438479c9de4b8dd76f986941f0a4 +Author: Martin Pitt +Date: Sun Aug 10 15:52:36 2008 +0200 + + volume.num_blocks can become larger than 2G + + Fix mounting of devices with a very large number of reported blocks by + making it a 64 bit property. (https://launchpad.net/bugs/209483) + +diff --git a/hald/linux/blockdev.c b/hald/linux/blockdev.c +index f00a2c2..369035d 100644 +--- a/hald/linux/blockdev.c ++++ b/hald/linux/blockdev.c +@@ -1457,13 +1457,13 @@ hotplug_event_begin_add_blockdev (const gchar *sysfs_path, const gchar *device_f + * (block size requires opening the device file) + */ + hal_device_property_set_int (d, "volume.block_size", 512); +- if (!hal_util_set_int_from_file (d, "volume.num_blocks", sysfs_path_real, "size", 0)) { ++ if (!hal_util_set_uint64_from_file (d, "volume.num_blocks", sysfs_path_real, "size", 0)) { + HAL_INFO (("Ignoring hotplug event - cannot read 'size'")); + goto error; + } + hal_device_property_set_uint64 ( + d, "volume.size", +- ((dbus_uint64_t)(512)) * ((dbus_uint64_t)(hal_device_property_get_int (d, "volume.num_blocks")))); ++ ((dbus_uint64_t)(512)) * ((dbus_uint64_t)(hal_device_property_get_uint64 (d, "volume.num_blocks")))); + /* TODO: move to prober? */ + if (is_physical_partition) { + guint64 start_block; --- hal-0.5.11~rc2.orig/debian/patches/ubuntu_01_ignore_single_slash_label.patch +++ hal-0.5.11~rc2/debian/patches/ubuntu_01_ignore_single_slash_label.patch @@ -0,0 +1,14 @@ +# Description: Ignore volume labels which are '/' +# Ubuntu: https://launchpad.net/bugs/83323 +# UbuntuSpecific: automatic labelling from Ubiquity/d-i, earlier releases created those by default +--- hal-0.5.8.1/tools/hal-storage-mount.c 2007-03-09 18:13:01.000000000 +0100 ++++ hal-0.5.8.1/tools/hal-storage-mount.c 2007-03-09 18:19:42.000000000 +0100 +@@ -591,7 +591,7 @@ + else + label = NULL; + +- if (label != NULL) { ++ if (label != NULL && strcmp(label, "/") != 0) { + /* best - use label */ + g_strlcpy (mount_point, label, sizeof (mount_point)); + --- hal-0.5.11~rc2.orig/debian/patches/05_dell_backlight_lockups.patch +++ hal-0.5.11~rc2/debian/patches/05_dell_backlight_lockups.patch @@ -0,0 +1,47 @@ +diff -Nur -x '*.orig' -x '*~' hal-0.5.11~rc2/hald/linux/addons/addon-dell-backlight.cpp hal-0.5.11~rc2.new/hald/linux/addons/addon-dell-backlight.cpp +--- hal-0.5.11~rc2/hald/linux/addons/addon-dell-backlight.cpp 2008-03-17 16:25:13.000000000 -0500 ++++ hal-0.5.11~rc2.new/hald/linux/addons/addon-dell-backlight.cpp 2008-07-18 13:24:16.000000000 -0500 +@@ -48,6 +48,8 @@ + static u32 minValue = 0; + static u32 maxValue = 0; + ++static bool hasPass = false; ++ + using namespace std; + using namespace smi; + +@@ -89,6 +91,13 @@ + return curValue; + } + ++static void ++check_bios_password() ++{ ++ if (smi::getPasswordStatus((u16)9) || smi::getPasswordStatus((u16)10)) ++ hasPass=true; ++} ++ + static void + write_backlight (u32 newBacklightValue, dbus_bool_t onAC) + { +@@ -96,6 +105,11 @@ + u32 curValue; + writefn writeFunction; + string password(""); /* FIXME: Implement password support */ ++ ++ if (hasPass) { ++ HAL_WARNING(("Setting brightness via SMI is not supported with a BIOS password")); ++ return; ++ } + + if (onAC) + writeFunction = &smi::writeACModeSetting; +@@ -309,6 +323,8 @@ + + read_backlight (TRUE); /* Fill min- & maxValue with the correct values */ + ++ check_bios_password(); /* Find out about our BIOS pass capabilities */ ++ + if (maxValue == 0) { + HAL_ERROR (("This machine don't support set brightness.")); + return -5; --- hal-0.5.11~rc2.orig/debian/patches/01_default_suspend_quirks.patch +++ hal-0.5.11~rc2/debian/patches/01_default_suspend_quirks.patch @@ -0,0 +1,138 @@ +# Description: Apply a few suspend quirks by default which are +# generally necessary on older hardware, but only if we do not have +# any quirks definition all in hal-info's FDIs. Disable video quirks +# when running a known-good video driver which does not need quirks +# and breaks with them. +# Ubuntu: https://launchpad.net/bugs/198808 +# Upstream: http://lists.freedesktop.org/archives/hal/2008-March/011223.html + +diff -Nur -x '*.orig' -x '*~' ubuntu/tools/linux/hal-system-power-hibernate-linux ubuntu.new/tools/linux/hal-system-power-hibernate-linux +--- ubuntu/tools/linux/hal-system-power-hibernate-linux 2008-03-27 17:34:15.000000000 +0100 ++++ ubuntu.new/tools/linux/hal-system-power-hibernate-linux 2008-03-27 17:37:04.000000000 +0100 +@@ -6,6 +6,40 @@ + exit 1 + } + ++# on some video drivers we must ignore video quirks, since they break ++# on them; this particularly affects Intel >= 915G and the proprietary ++# nvidia and fglrx drivers. ++if [ -d /sys/module/i915 ]; then ++ # the i915 kmod also drives the i830/i845/i855/i865 chips nowadays, but ++ # they still need quirks on at least Linux 2.6.24. ++ PRODID=`hal-get-property --udi $HAL_PROP_INFO_UDI --key system.hardware.primary_video.product` ++ if [ "$PRODID" != 13696 ] && [ "$PRODID" != 13698 ] && \ ++ [ "$PRODID" != 13687 ] && [ "$PRODID" != 9570 ] && \ ++ [ "$PRODID" != 9586 ]; then ++ NEW_INTEL=1 ++ fi ++fi ++ ++if [ "$NEW_INTEL" ] || [ -d /sys/module/nvidia ] || [ -d /sys/module/fglrx ]; ++then ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_DPMS_ON=false ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VBESTATE_RESTORE=false ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VBEMODE_RESTORE=false ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VGA_MODE_3=false ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST=false ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_RESET_BRIGHTNESS=false ++# if we do not have any explicit quirks in the hal FDIs, enable a few by ++# default which work around kernel problems and are necessary with most older ++# video drivers ++elif ! env | grep -q HAL_PROP_POWER_MANAGEMENT_QUIRK; then ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_DPMS_ON=true ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VBESTATE_RESTORE=true ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VBEMODE_RESTORE=true ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VGA_MODE_3=true ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST=true ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_RESET_BRIGHTNESS=true ++fi ++ + # Make a suitable command line argument so that the tools can do the correct + # quirks for video resume. + # Passing the quirks to the tool allows the tool to not depend on HAL for data. +diff -Nur -x '*.orig' -x '*~' ubuntu/tools/linux/hal-system-power-suspend-hybrid-linux ubuntu.new/tools/linux/hal-system-power-suspend-hybrid-linux +--- ubuntu/tools/linux/hal-system-power-suspend-hybrid-linux 2008-03-27 17:34:15.000000000 +0100 ++++ ubuntu.new/tools/linux/hal-system-power-suspend-hybrid-linux 2008-03-27 17:35:44.000000000 +0100 +@@ -14,6 +14,39 @@ + + read seconds_to_sleep + ++# on some video drivers we must ignore video quirks, since they break ++# on them; this particularly affects Intel >= 915G and the proprietary ++# nvidia and fglrx drivers. ++if [ -d /sys/module/i915 ]; then ++ # the i915 kmod also drives the i830 and i855 chips nowadays, but they ++ # still need quirks on at least Linux 2.6.24. ++ PRODID=`hal-get-property --udi $HAL_PROP_INFO_UDI --key system.hardware.primary_video.product` ++ if [ "$PRODID" != 13696 ] && [ "$PRODID" != 13698 ] && \ ++ [ "$PRODID" != 13687 ]; then ++ NEW_INTEL=1 ++ fi ++fi ++ ++if [ "$NEW_INTEL" ] || [ -d /sys/module/nvidia ] || [ -d /sys/module/fglrx ]; ++then ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_DPMS_ON=false ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VBESTATE_RESTORE=false ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VBEMODE_RESTORE=false ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VGA_MODE_3=false ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST=false ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_RESET_BRIGHTNESS=false ++# if we do not have any explicit quirks in the hal FDIs, enable a few by ++# default which work around kernel problems and are necessary with most older ++# video drivers ++elif ! env | grep -q HAL_PROP_POWER_MANAGEMENT_QUIRK; then ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_DPMS_ON=true ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VBESTATE_RESTORE=true ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VBEMODE_RESTORE=true ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VGA_MODE_3=true ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST=true ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_RESET_BRIGHTNESS=true ++fi ++ + # Make a suitable command line argument so that the tools can do the correct + # quirks for video resume. + # Passing the quirks to the tool allows the tool to not depend on HAL for data. +diff -Nur -x '*.orig' -x '*~' ubuntu/tools/linux/hal-system-power-suspend-linux ubuntu.new/tools/linux/hal-system-power-suspend-linux +--- ubuntu/tools/linux/hal-system-power-suspend-linux 2008-03-27 17:34:15.000000000 +0100 ++++ ubuntu.new/tools/linux/hal-system-power-suspend-linux 2008-03-27 17:35:44.000000000 +0100 +@@ -14,6 +14,39 @@ + + read seconds_to_sleep + ++# on some video drivers we must ignore video quirks, since they break ++# on them; this particularly affects Intel >= 915G and the proprietary ++# nvidia and fglrx drivers. ++if [ -d /sys/module/i915 ]; then ++ # the i915 kmod also drives the i830 and i855 chips nowadays, but they ++ # still need quirks on at least Linux 2.6.24. ++ PRODID=`hal-get-property --udi $HAL_PROP_INFO_UDI --key system.hardware.primary_video.product` ++ if [ "$PRODID" != 13696 ] && [ "$PRODID" != 13698 ] && \ ++ [ "$PRODID" != 13687 ]; then ++ NEW_INTEL=1 ++ fi ++fi ++ ++if [ "$NEW_INTEL" ] || [ -d /sys/module/nvidia ] || [ -d /sys/module/fglrx ]; ++then ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_DPMS_ON=false ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VBESTATE_RESTORE=false ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VBEMODE_RESTORE=false ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VGA_MODE_3=false ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST=false ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_RESET_BRIGHTNESS=false ++# if we do not have any explicit quirks in the hal FDIs, enable a few by ++# default which work around kernel problems and are necessary with most older ++# video drivers ++elif ! env | grep -q HAL_PROP_POWER_MANAGEMENT_QUIRK; then ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_DPMS_ON=true ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VBESTATE_RESTORE=true ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VBEMODE_RESTORE=true ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VGA_MODE_3=true ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST=true ++ HAL_PROP_POWER_MANAGEMENT_QUIRK_RESET_BRIGHTNESS=true ++fi ++ + # Make a suitable command line argument so that the tools can do the correct + # quirks for video resume. + # Passing the quirks to the tool allows the tool to not depend on HAL for data. --- hal-0.5.11~rc2.orig/debian/patches/23_addon_acpi.patch +++ hal-0.5.11~rc2/debian/patches/23_addon_acpi.patch @@ -0,0 +1,28 @@ +diff -aur hal-0.5.8.vanilla/hald/linux/addons/addon-acpi.c hal-0.5.8/hald/linux/addons/addon-acpi.c +--- hal-0.5.8.vanilla/hald/linux/addons/addon-acpi.c 2006-09-11 23:56:39.000000000 +0200 ++++ hal-0.5.8/hald/linux/addons/addon-acpi.c 2006-09-17 16:12:51.000000000 +0200 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -45,9 +46,14 @@ + acpi_get_event_fp_kernel (void) + { + FILE *fp = NULL; ++ struct stat sbuf; + +- fp = fopen ("/proc/acpi/event", "r"); ++ if (stat("/usr/sbin/acpid", &sbuf) == 0) { ++ HAL_DEBUG (("acpid installed, not using the kernel acpi event interface")); ++ return NULL; ++ } + ++ fp = fopen ("/proc/acpi/event", "r"); + if (fp == NULL) + HAL_ERROR (("Cannot open /proc/acpi/event: %s", strerror (errno))); + +Only in hal-0.5.8/hald/linux/addons: addon-acpi.c.orig --- hal-0.5.11~rc2.orig/debian/patches/84_memstick_bus_support.patch +++ hal-0.5.11~rc2/debian/patches/84_memstick_bus_support.patch @@ -0,0 +1,177 @@ +diff -Nur -x '*.orig' -x '*~' ubuntu/hald/linux/blockdev.c ubuntu.new/hald/linux/blockdev.c +--- ubuntu/hald/linux/blockdev.c 2008-03-17 22:25:13.000000000 +0100 ++++ ubuntu.new/hald/linux/blockdev.c 2008-03-21 12:14:59.000000000 +0100 +@@ -1180,6 +1180,12 @@ + is_hotpluggable = TRUE; + hal_device_property_set_string (d, "storage.bus", "mmc"); + break; ++ } else if (strcmp (bus, "memstick") == 0) { ++ physdev = d_it; ++ physdev_udi = udi_it; ++ is_hotpluggable = TRUE; ++ hal_device_property_set_string (d, "storage.bus", "memstick"); ++ break; + } else if (strcmp (bus, "ccw") == 0) { + physdev = d_it; + physdev_udi = udi_it; +@@ -1323,6 +1329,8 @@ + + } else if (strcmp (parent_bus, "mmc") == 0) { + hal_device_property_set_string (d, "storage.drive_type", "sd_mmc"); ++ } else if (strcmp (parent_bus, "memstick") == 0) { ++ hal_device_property_set_string (d, "storage.drive_type", "memstick"); + } else if (strcmp (parent_bus, "vio") == 0) { + char buf[256]; + const gchar *prop; +diff -Nur -x '*.orig' -x '*~' ubuntu/hald/linux/device.c ubuntu.new/hald/linux/device.c +--- ubuntu/hald/linux/device.c 2008-03-21 12:14:11.000000000 +0100 ++++ ubuntu.new/hald/linux/device.c 2008-03-21 12:15:20.000000000 +0100 +@@ -1533,6 +1533,51 @@ + + /*--------------------------------------------------------------------------------------------------------------*/ + ++ ++static HalDevice * ++memstick_host_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path) ++{ ++ HalDevice *d; ++ gint host_num; ++ const gchar *last_elem; ++ ++ d = NULL; ++ ++ if (parent_dev == NULL || parent_path == NULL) { ++ goto out; ++ } ++ ++ d = hal_device_new (); ++ hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path); ++ ++ hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev)); ++ ++ hal_device_property_set_string (d, "info.category", "memstick_host"); ++ hal_device_add_capability (d, "memstick_host"); ++ ++ hal_device_property_set_string (d, "info.product", "Memory Stick Host Adapter"); ++ ++ last_elem = hal_util_get_last_element (sysfs_path); ++ sscanf (last_elem, "memstick%d", &host_num); ++ hal_device_property_set_int (d, "memstick_host.host", host_num); ++ ++out: ++ return d; ++} ++ ++static gboolean ++memstick_host_compute_udi (HalDevice *d) ++{ ++ gchar udi[256]; ++ ++ hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi), ++ "%s_memstick_host", ++ hal_device_property_get_string (d, "info.parent")); ++ hal_device_set_udi (d, udi); ++ hal_device_property_set_string (d, "info.udi", udi); ++ return TRUE; ++} ++ + static HalDevice * + pci_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path) + { +@@ -2297,6 +2342,49 @@ + + } + ++static HalDevice * ++memstick_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path) ++{ ++ HalDevice *d; ++ const gchar *bus_id; ++ ++ if (parent_dev == NULL) { ++ d = NULL; ++ goto out; ++ } ++ ++ d = hal_device_new (); ++ hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path); ++ hal_device_property_set_string (d, "info.subsystem", "memstick"); ++ hal_device_property_set_string (d, "info.bus", "memstick"); ++ hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev)); ++ ++ hal_util_set_driver (d, "info.linux.driver", sysfs_path); ++ ++ bus_id = hal_util_get_last_element (sysfs_path); ++ ++ hal_util_set_string_from_file (d, "info.product", sysfs_path, "attr_modelname"); ++ hal_util_set_string_from_file (d, "memstick.class", sysfs_path, "class"); ++ hal_util_set_string_from_file (d, "memstick.category", sysfs_path, "category"); ++ ++out: ++ return d; ++} ++ ++static gboolean ++memstick_compute_udi (HalDevice *d) ++{ ++ gchar udi[256]; ++ ++ hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi), ++ "%s_memstick_card", ++ hal_device_property_get_string (d, "info.parent")); ++ hal_device_set_udi (d, udi); ++ hal_device_property_set_string (d, "info.udi", udi); ++ return TRUE; ++ ++} ++ + /*--------------------------------------------------------------------------------------------------------------*/ + + static HalDevice * +@@ -3964,6 +4052,16 @@ + .remove = dev_remove + }; + ++static DevHandler dev_handler_memstick_host = ++{ ++ .subsystem = "memstick_host", ++ .add = memstick_host_add, ++ .get_prober = NULL, ++ .post_probing = NULL, ++ .compute_udi = memstick_host_compute_udi, ++ .remove = dev_remove ++}; ++ + static DevHandler dev_handler_pci = { + .subsystem = "pci", + .add = pci_add, +@@ -4035,6 +4133,13 @@ + .remove = dev_remove + }; + ++static DevHandler dev_handler_memstick = { ++ .subsystem = "memstick", ++ .add = memstick_add, ++ .compute_udi = memstick_compute_udi, ++ .remove = dev_remove ++}; ++ + static DevHandler dev_handler_ieee1394 = { + .subsystem = "ieee1394", + .add = ieee1394_add, +@@ -4158,6 +4263,7 @@ + &dev_handler_pcmcia, + &dev_handler_scsi, + &dev_handler_mmc, ++ &dev_handler_memstick, + &dev_handler_sdio, + &dev_handler_ieee1394, + &dev_handler_xen, +@@ -4179,6 +4285,7 @@ + &dev_handler_tape, + &dev_handler_tape390, + &dev_handler_mmc_host, ++ &dev_handler_memstick_host, + &dev_handler_backlight, + &dev_handler_firewire, + &dev_handler_power_supply, --- hal-0.5.11~rc2.orig/debian/patches/96_uinput_device_support.patch +++ hal-0.5.11~rc2/debian/patches/96_uinput_device_support.patch @@ -0,0 +1,170 @@ +# Upstream: http://lists.freedesktop.org/archives/hal/2008-February/010838.html +# Description: Represent uinput devices, allowing us to set ACLs for it using PolicyKit/ConsoleKit. +diff -Nur -x '*.orig' -x '*~' ubuntu/fdi/policy/10osvendor/10-uinput.fdi ubuntu.new/fdi/policy/10osvendor/10-uinput.fdi +--- ubuntu/fdi/policy/10osvendor/10-uinput.fdi 1970-01-01 01:00:00.000000000 +0100 ++++ ubuntu.new/fdi/policy/10osvendor/10-uinput.fdi 2008-03-21 12:17:15.000000000 +0100 +@@ -0,0 +1,12 @@ ++ ++ ++ ++ ++ ++ access_control ++ linux.device_file ++ uinput ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' ubuntu/fdi/policy/10osvendor/Makefile.am ubuntu.new/fdi/policy/10osvendor/Makefile.am +--- ubuntu/fdi/policy/10osvendor/Makefile.am 2008-03-17 22:25:05.000000000 +0100 ++++ ubuntu.new/fdi/policy/10osvendor/Makefile.am 2008-03-21 12:17:34.000000000 +0100 +@@ -5,6 +5,7 @@ + 10-input-policy.fdi \ + 10-dockstation.fdi \ + 10-laptop-panel-mgmt-policy.fdi \ ++ 10-uinput.fdi \ + 10-power-mgmt-policy.fdi \ + 10-rfkill-switch.fdi \ + 10-tabletPCs.fdi \ +diff -Nur -x '*.orig' -x '*~' ubuntu/fdi/policy/10osvendor/Makefile.in ubuntu.new/fdi/policy/10osvendor/Makefile.in +--- ubuntu/fdi/policy/10osvendor/Makefile.in 2008-03-17 22:32:35.000000000 +0100 ++++ ubuntu.new/fdi/policy/10osvendor/Makefile.in 2008-03-21 12:23:00.000000000 +0100 +@@ -64,7 +64,7 @@ + 10-imac-backlight.fdi 10-cpufreq.fdi 10-usbcsr-mice.fdi \ + 10-omap-backlight.fdi 10-dell-laptop-brightness.fdi \ + 10-toshiba-buttons.fdi 10-ibm-buttons.fdi \ +- 20-acl-management.fdi ++ 10-uinput.fdi 20-acl-management.fdi + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +@@ -225,7 +225,7 @@ + fdidir = $(datadir)/hal/fdi/policy/10osvendor + dist_fdi_DATA = 10-input-policy.fdi 10-dockstation.fdi \ + 10-laptop-panel-mgmt-policy.fdi 10-power-mgmt-policy.fdi \ +- 10-rfkill-switch.fdi 10-tabletPCs.fdi 10-x11-input.fdi \ ++ 10-rfkill-switch.fdi 10-tabletPCs.fdi 10-uinput.fdi 10-x11-input.fdi \ + 15-storage-luks.fdi 20-storage-methods.fdi 30-wol.fdi \ + $(am__append_1) $(am__append_2) $(am__append_3) \ + $(am__append_4) $(am__append_5) $(am__append_6) \ +diff -Nur -x '*.orig' -x '*~' ubuntu/hald/linux/device.c ubuntu.new/hald/linux/device.c +--- ubuntu/hald/linux/device.c 2008-03-21 12:17:14.000000000 +0100 ++++ ubuntu.new/hald/linux/device.c 2008-03-21 12:24:32.000000000 +0100 +@@ -3886,6 +3886,44 @@ + + /*--------------------------------------------------------------------------------------------------------------*/ + ++static HalDevice * ++misc_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_patch) ++{ ++ HalDevice *d; ++ ++ d = NULL; ++ ++ if (device_file == NULL || device_file[0] == '\0') ++ goto out; ++ ++ /* only care about uinput devices */ ++ if (strcmp (hal_util_get_last_element (sysfs_path), "uinput")) ++ goto out; ++ ++ d = hal_device_new (); ++ hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path); ++ hal_device_property_set_string (d, "linux.sysfs_path_device", sysfs_path); ++ hal_device_property_set_string (d, "info.bus", "misc"); ++ hal_device_property_set_string (d, "info.parent", "/org/freedesktop/Hal/devices/computer"); ++ ++out: ++ return d; ++} ++ ++static gboolean ++misc_compute_udi (HalDevice *d) ++{ ++ gchar udi[256]; ++ ++ hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi), ++ "/org/freedesktop/Hal/devices/uinput"); ++ hal_device_set_udi (d, udi); ++ hal_device_property_set_string (d, "info.udi", udi); ++ return TRUE; ++} ++ ++/*--------------------------------------------------------------------------------------------------------------*/ ++ + static gboolean + dev_remove (HalDevice *d) + { +@@ -4250,6 +4288,14 @@ + .remove = dev_remove + }; + ++static DevHandler dev_handler_misc = ++{ ++ .subsystem = "misc", ++ .add = misc_add, ++ .compute_udi = misc_compute_udi, ++ .remove = dev_remove ++}; ++ + /*--------------------------------------------------------------------------------------------------------------*/ + + static DevHandler *dev_handlers[] = { +@@ -4293,6 +4339,7 @@ + &dev_handler_ps3_system_bus, + &dev_handler_virtio, + &dev_handler_vio, ++ &dev_handler_misc, + NULL + }; + +diff -Nur -x '*.orig' -x '*~' ubuntu/policy/Makefile.am ubuntu.new/policy/Makefile.am +--- ubuntu/policy/Makefile.am 2008-03-17 22:25:24.000000000 +0100 ++++ ubuntu.new/policy/Makefile.am 2008-03-21 12:19:33.000000000 +0100 +@@ -8,6 +8,7 @@ + org.freedesktop.hal.power-management.policy \ + org.freedesktop.hal.killswitch.policy \ + org.freedesktop.hal.dockstation.policy \ ++ org.freedesktop.hal.uinput.policy \ + org.freedesktop.hal.wol.policy + + if HAVE_ACLMGMT +diff -Nur -x '*.orig' -x '*~' ubuntu/policy/Makefile.in ubuntu.new/policy/Makefile.in +--- ubuntu/policy/Makefile.in 2008-03-17 22:32:38.000000000 +0100 ++++ ubuntu.new/policy/Makefile.in 2008-03-21 12:21:21.000000000 +0100 +@@ -52,6 +52,7 @@ + org.freedesktop.hal.killswitch.policy \ + org.freedesktop.hal.dockstation.policy \ + org.freedesktop.hal.wol.policy \ ++ org.freedesktop.hal.uinput.policy \ + org.freedesktop.hal.device-access.policy + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ +@@ -217,6 +218,7 @@ + @HAVE_POLKIT_TRUE@ org.freedesktop.hal.power-management.policy \ + @HAVE_POLKIT_TRUE@ org.freedesktop.hal.killswitch.policy \ + @HAVE_POLKIT_TRUE@ org.freedesktop.hal.dockstation.policy \ ++@HAVE_POLKIT_TRUE@ org.freedesktop.hal.uinput.policy \ + @HAVE_POLKIT_TRUE@ org.freedesktop.hal.wol.policy \ + @HAVE_POLKIT_TRUE@ $(am__append_1) + all: all-am +diff -Nur -x '*.orig' -x '*~' ubuntu/policy/org.freedesktop.hal.uinput.policy ubuntu.new/policy/org.freedesktop.hal.uinput.policy +--- ubuntu/policy/org.freedesktop.hal.uinput.policy 1970-01-01 01:00:00.000000000 +0100 ++++ ubuntu.new/policy/org.freedesktop.hal.uinput.policy 2008-03-21 12:17:15.000000000 +0100 +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ ++ Directly access the uinput control device ++ System policy prevents access to the uinput control device ++ ++ no ++ yes ++ ++ ++ --- hal-0.5.11~rc2.orig/debian/patches/02_input_spin_removed_fd.patch +++ hal-0.5.11~rc2/debian/patches/02_input_spin_removed_fd.patch @@ -0,0 +1,25 @@ +# Description: Avoid spinning on already invalidated/closed file +# descriptors in the input addon. This fixes "hal takes 100% CPU and +# breaks input device handling" on a lot of machines. +# Ubuntu: https://launchpad.net/bugs/203679 +# Upstream:http://gitweb.freedesktop.org/?p=hal.git;a=commit;h=38d16647bf66f2e26a882ccd9bb5a0273278338d +--- ubuntu/hald/linux/addons/addon-input.c 2008-03-17 22:25:12.000000000 +0100 ++++ ubuntu.new/hald/linux/addons/addon-input.c 2008-04-21 10:33:16.000000000 +0200 +@@ -210,7 +210,7 @@ + GError *gerror = NULL; + gsize read_bytes; + +- if (condition & (G_IO_HUP | G_IO_ERR)) ++ if (condition & (G_IO_HUP | G_IO_ERR | G_IO_NVAL)) + return FALSE; + + /** tbh, we can probably assume every time we read we have a whole +@@ -383,7 +383,7 @@ + + g_hash_table_insert (inputs, g_strdup(udi), channel); + g_io_add_watch_full (channel, +- G_PRIORITY_DEFAULT, G_IO_IN | G_IO_ERR | G_IO_HUP, ++ G_PRIORITY_DEFAULT, G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL, + event_io, data, (GDestroyNotify) destroy_data); + } + --- hal-0.5.11~rc2.orig/debian/patches/03_increase_helper_timeout.patch +++ hal-0.5.11~rc2/debian/patches/03_increase_helper_timeout.patch @@ -0,0 +1,14 @@ +# Description: Increase the helper timeout from 10 to 20 seconds. Some +# CD-ROMs seem to be too slow to do all the detection in 10 seconds. +# Ubuntu: https://launchpad.net/bugs/218834 +--- ubuntu/hald/hald_runner.h 2008-03-17 22:25:18.000000000 +0100 ++++ ubuntu.new/hald/hald_runner.h 2008-04-30 10:58:09.000000000 +0200 +@@ -40,7 +40,7 @@ + #define HALD_RUN_KILLED 0x4 + + /* Default sane timeout */ +-#define HAL_HELPER_TIMEOUT 10000 ++#define HAL_HELPER_TIMEOUT 20000 + + typedef void (*HalRunTerminatedCB) (HalDevice *d, guint32 exit_type, + gint return_code, gchar **error, --- hal-0.5.11~rc2.orig/debian/patches/04_read_brightness_not_actual_brightness.patch +++ hal-0.5.11~rc2/debian/patches/04_read_brightness_not_actual_brightness.patch @@ -0,0 +1,14 @@ +# Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=12891 +--- ubuntu/tools/linux/hal-system-lcd-get-brightness-linux 2007-07-26 20:00:28.000000000 +0200 ++++ ubuntu.new/tools/linux/hal-system-lcd-get-brightness-linux 2007-10-23 11:48:27.000000000 +0200 +@@ -8,8 +8,8 @@ + # (at your option) any later version. + + # we have /sys/class/backlight +-if [ -r "$HAL_PROP_LINUX_SYSFS_PATH/actual_brightness" ]; then +- value="`cat $HAL_PROP_LINUX_SYSFS_PATH/actual_brightness`" ++if [ -r "$HAL_PROP_LINUX_SYSFS_PATH/brightness" ]; then ++ value="`cat $HAL_PROP_LINUX_SYSFS_PATH/brightness`" + exit ${value} + fi + --- hal-0.5.11~rc2.orig/debian/patches/83_ssb_bus_support.patch +++ hal-0.5.11~rc2/debian/patches/83_ssb_bus_support.patch @@ -0,0 +1,69 @@ +diff -Nur -x '*.orig' -x '*~' ubuntu/hald/linux/device.c ubuntu.new/hald/linux/device.c +--- ubuntu/hald/linux/device.c 2007-10-09 19:46:59.000000000 +0200 ++++ ubuntu.new/hald/linux/device.c 2007-10-23 11:33:30.000000000 +0200 +@@ -2345,6 +2345,43 @@ + /*--------------------------------------------------------------------------------------------------------------*/ + + static HalDevice * ++ssb_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path) ++{ ++ HalDevice *d; ++ ++ d = hal_device_new (); ++ hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path); ++ hal_device_property_set_string (d, "linux.sysfs_path_device", sysfs_path); ++ hal_device_property_set_string (d, "info.bus", "ssb"); ++ if (parent_dev != NULL) { ++ hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev)); ++ } else { ++ hal_device_property_set_string (d, "info.parent", "/org/freedesktop/Hal/devices/computer"); ++ } ++ ++ hal_util_set_driver (d, "info.linux.driver", sysfs_path); ++ ++ hal_device_property_set_string (d, "ssb.bus_id", ++ hal_util_get_last_element (sysfs_path)); ++ return d; ++} ++ ++static gboolean ++ssb_compute_udi (HalDevice *d) ++{ ++ gchar udi[256]; ++ ++ hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi), ++ "/org/freedesktop/Hal/devices/ssb_%s", ++ hal_device_property_get_string (d, "xen.bus_id")); ++ hal_device_set_udi (d, udi); ++ hal_device_property_set_string (d, "info.udi", udi); ++ return TRUE; ++} ++ ++/*--------------------------------------------------------------------------------------------------------------*/ ++ ++static HalDevice * + ieee1394_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path) + { + HalDevice *d; +@@ -3588,6 +3625,13 @@ + .remove = dev_remove + }; + ++static DevHandler dev_handler_ssb = { ++ .subsystem = "ssb", ++ .add = ssb_add, ++ .compute_udi = ssb_compute_udi, ++ .remove = dev_remove ++}; ++ + /* s390 specific busses */ + static DevHandler dev_handler_ccw = { + .subsystem = "ccw", +@@ -3650,6 +3694,7 @@ + &dev_handler_mmc, + &dev_handler_ieee1394, + &dev_handler_xen, ++ &dev_handler_ssb, + &dev_handler_ccw, + &dev_handler_ccwgroup, + &dev_handler_iucv, --- hal-0.5.11~rc2.orig/doc/api/libhal/xml/libhal-doc.bottom +++ hal-0.5.11~rc2/doc/api/libhal/xml/libhal-doc.bottom @@ -0,0 +1,2 @@ + + --- hal-0.5.11~rc2.orig/doc/api/libhal/xml/tree_index.sgml +++ hal-0.5.11~rc2/doc/api/libhal/xml/tree_index.sgml @@ -0,0 +1,7 @@ + + +]> + + --- hal-0.5.11~rc2.orig/doc/api/libhal/xml/uthash.xml +++ hal-0.5.11~rc2/doc/api/libhal/xml/uthash.xml @@ -5,7 +5,7 @@ ]> -uthash +uthash 3 LIBHAL Library @@ -16,13 +16,10 @@ - + Synopsis - - - #define uthash_fatal (msg) #define uthash_bkt_malloc (sz) #define uthash_bkt_free (ptr) @@ -72,18 +69,18 @@ - + Description - + Details - -<anchor id="uthash-fatal" role="macro"/>uthash_fatal() -uthash_fatal#define uthash_fatal(msg) exit(-1) /* fatal error (out of memory,etc) */ + +uthash_fatal() +uthash_fatal#define uthash_fatal(msg) exit(-1) /* fatal error (out of memory,etc) */ @@ -94,9 +91,9 @@ - -<anchor id="uthash-bkt-malloc" role="macro"/>uthash_bkt_malloc() -uthash_bkt_malloc#define uthash_bkt_malloc(sz) malloc(sz) /* malloc fcn for UT_hash_bucket's */ + +uthash_bkt_malloc() +uthash_bkt_malloc#define uthash_bkt_malloc(sz) malloc(sz) /* malloc fcn for UT_hash_bucket's */ @@ -107,9 +104,9 @@ - -<anchor id="uthash-bkt-free" role="macro"/>uthash_bkt_free() -uthash_bkt_free#define uthash_bkt_free(ptr) free(ptr) /* free fcn for UT_hash_bucket's */ + +uthash_bkt_free() +uthash_bkt_free#define uthash_bkt_free(ptr) free(ptr) /* free fcn for UT_hash_bucket's */ @@ -120,9 +117,9 @@ - -<anchor id="uthash-tbl-malloc" role="macro"/>uthash_tbl_malloc() -uthash_tbl_malloc#define uthash_tbl_malloc(sz) malloc(sz) /* malloc fcn for UT_hash_table */ + +uthash_tbl_malloc() +uthash_tbl_malloc#define uthash_tbl_malloc(sz) malloc(sz) /* malloc fcn for UT_hash_table */ @@ -133,9 +130,9 @@ - -<anchor id="uthash-tbl-free" role="macro"/>uthash_tbl_free() -uthash_tbl_free#define uthash_tbl_free(ptr) free(ptr) /* free fcn for UT_hash_table */ + +uthash_tbl_free() +uthash_tbl_free#define uthash_tbl_free(ptr) free(ptr) /* free fcn for UT_hash_table */ @@ -146,9 +143,9 @@ - -<anchor id="uthash-noexpand-fyi" role="macro"/>uthash_noexpand_fyi() -uthash_noexpand_fyi#define uthash_noexpand_fyi(tbl) /* can be defined to log noexpand */ + +uthash_noexpand_fyi() +uthash_noexpand_fyi#define uthash_noexpand_fyi(tbl) /* can be defined to log noexpand */ @@ -159,9 +156,9 @@ - -<anchor id="uthash-expand-fyi" role="macro"/>uthash_expand_fyi() -uthash_expand_fyi#define uthash_expand_fyi(tbl) /* can be defined to log expands */ + +uthash_expand_fyi() +uthash_expand_fyi#define uthash_expand_fyi(tbl) /* can be defined to log expands */ @@ -172,23 +169,23 @@ - -<anchor id="HASH-INITIAL-NUM-BUCKETS:CAPS" role="macro"/>HASH_INITIAL_NUM_BUCKETS -HASH_INITIAL_NUM_BUCKETS#define HASH_INITIAL_NUM_BUCKETS 32 /* initial number of buckets */ + +HASH_INITIAL_NUM_BUCKETS +HASH_INITIAL_NUM_BUCKETS#define HASH_INITIAL_NUM_BUCKETS 32 /* initial number of buckets */ - -<anchor id="HASH-BKT-CAPACITY-THRESH:CAPS" role="macro"/>HASH_BKT_CAPACITY_THRESH -HASH_BKT_CAPACITY_THRESH#define HASH_BKT_CAPACITY_THRESH 10 /* expand when bucket count reaches */ + +HASH_BKT_CAPACITY_THRESH +HASH_BKT_CAPACITY_THRESH#define HASH_BKT_CAPACITY_THRESH 10 /* expand when bucket count reaches */ - -<anchor id="HASH-FIND:CAPS" role="macro"/>HASH_FIND() -HASH_FIND#define HASH_FIND(hh,head,keyptr,keylen_in,out) + +HASH_FIND() +HASH_FIND#define HASH_FIND(hh,head,keyptr,keylen_in,out) @@ -210,9 +207,9 @@ - -<anchor id="HASH-ADD:CAPS" role="macro"/>HASH_ADD() -HASH_ADD#define HASH_ADD(hh,head,fieldname,keylen_in,add) + +HASH_ADD() +HASH_ADD#define HASH_ADD(hh,head,fieldname,keylen_in,add) @@ -234,9 +231,9 @@ - -<anchor id="HASH-ADD-KEYPTR:CAPS" role="macro"/>HASH_ADD_KEYPTR() -HASH_ADD_KEYPTR#define HASH_ADD_KEYPTR(hh,head,keyptr,keylen_in,add) + +HASH_ADD_KEYPTR() +HASH_ADD_KEYPTR#define HASH_ADD_KEYPTR(hh,head,keyptr,keylen_in,add) @@ -258,9 +255,9 @@ - -<anchor id="HASH-DELETE:CAPS" role="macro"/>HASH_DELETE() -HASH_DELETE#define HASH_DELETE(hh,head,delptr) + +HASH_DELETE() +HASH_DELETE#define HASH_DELETE(hh,head,delptr) @@ -276,9 +273,9 @@ - -<anchor id="HASH-FIND-STR:CAPS" role="macro"/>HASH_FIND_STR() -HASH_FIND_STR#define HASH_FIND_STR(head,findstr,out) + +HASH_FIND_STR() +HASH_FIND_STR#define HASH_FIND_STR(head,findstr,out) @@ -294,9 +291,9 @@ - -<anchor id="HASH-ADD-STR:CAPS" role="macro"/>HASH_ADD_STR() -HASH_ADD_STR#define HASH_ADD_STR(head,strfield,add) + +HASH_ADD_STR() +HASH_ADD_STR#define HASH_ADD_STR(head,strfield,add) @@ -312,9 +309,9 @@ - -<anchor id="HASH-FIND-INT:CAPS" role="macro"/>HASH_FIND_INT() -HASH_FIND_INT#define HASH_FIND_INT(head,findint,out) + +HASH_FIND_INT() +HASH_FIND_INT#define HASH_FIND_INT(head,findint,out) @@ -330,9 +327,9 @@ - -<anchor id="HASH-ADD-INT:CAPS" role="macro"/>HASH_ADD_INT() -HASH_ADD_INT#define HASH_ADD_INT(head,intfield,add) + +HASH_ADD_INT() +HASH_ADD_INT#define HASH_ADD_INT(head,intfield,add) @@ -348,9 +345,9 @@ - -<anchor id="HASH-DEL:CAPS" role="macro"/>HASH_DEL() -HASH_DEL#define HASH_DEL(head,delptr) + +HASH_DEL() +HASH_DEL#define HASH_DEL(head,delptr) @@ -363,9 +360,9 @@ - -<anchor id="HASH-OOPS:CAPS" role="macro"/>HASH_OOPS() -HASH_OOPS#define HASH_OOPS(...) do { fprintf(stderr,__VA_ARGS__); exit(-1); } while (0) + +HASH_OOPS() +HASH_OOPS#define HASH_OOPS(...) do { fprintf(stderr,__VA_ARGS__); exit(-1); } while (0) @@ -376,9 +373,9 @@ - -<anchor id="HASH-FSCK:CAPS" role="macro"/>HASH_FSCK() -HASH_FSCK#define HASH_FSCK(head) + +HASH_FSCK() +HASH_FSCK#define HASH_FSCK(head) @@ -388,9 +385,9 @@ - -<anchor id="HASH-EMIT-KEY:CAPS" role="macro"/>HASH_EMIT_KEY() -HASH_EMIT_KEY#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen) + +HASH_EMIT_KEY() +HASH_EMIT_KEY#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen) @@ -409,15 +406,15 @@ - -<anchor id="HASH-FCN:CAPS" role="macro"/>HASH_FCN -HASH_FCN#define HASH_FCN + +HASH_FCN +HASH_FCN#define HASH_FCN - -<anchor id="HASH-BER:CAPS" role="macro"/>HASH_BER() -HASH_BER#define HASH_BER(key,keylen,num_bkts,bkt,i,j,k) + +HASH_BER() +HASH_BER#define HASH_BER(key,keylen,num_bkts,bkt,i,j,k) @@ -445,9 +442,9 @@ - -<anchor id="HASH-SAX:CAPS" role="macro"/>HASH_SAX() -HASH_SAX#define HASH_SAX(key,keylen,num_bkts,bkt,i,j,k) + +HASH_SAX() +HASH_SAX#define HASH_SAX(key,keylen,num_bkts,bkt,i,j,k) @@ -475,9 +472,9 @@ - -<anchor id="HASH-FNV:CAPS" role="macro"/>HASH_FNV() -HASH_FNV#define HASH_FNV(key,keylen,num_bkts,bkt,i,j,k) + +HASH_FNV() +HASH_FNV#define HASH_FNV(key,keylen,num_bkts,bkt,i,j,k) @@ -505,9 +502,9 @@ - -<anchor id="HASH-OAT:CAPS" role="macro"/>HASH_OAT() -HASH_OAT#define HASH_OAT(key,keylen,num_bkts,bkt,i,j,k) + +HASH_OAT() +HASH_OAT#define HASH_OAT(key,keylen,num_bkts,bkt,i,j,k) @@ -535,9 +532,9 @@ - -<anchor id="HASH-JEN-MIX:CAPS" role="macro"/>HASH_JEN_MIX() -HASH_JEN_MIX#define HASH_JEN_MIX(a,b,c) + +HASH_JEN_MIX() +HASH_JEN_MIX#define HASH_JEN_MIX(a,b,c) @@ -553,9 +550,9 @@ - -<anchor id="HASH-JEN:CAPS" role="macro"/>HASH_JEN() -HASH_JEN#define HASH_JEN(key,keylen,num_bkts,bkt,i,j,k) + +HASH_JEN() +HASH_JEN#define HASH_JEN(key,keylen,num_bkts,bkt,i,j,k) @@ -583,9 +580,9 @@ - -<anchor id="HASH-JSW:CAPS" role="macro"/>HASH_JSW() -HASH_JSW#define HASH_JSW(key,keylen,num_bkts,bkt,i,j,k) + +HASH_JSW() +HASH_JSW#define HASH_JSW(key,keylen,num_bkts,bkt,i,j,k) @@ -613,9 +610,9 @@ - -<anchor id="HASH-KEYCMP:CAPS" role="macro"/>HASH_KEYCMP() -HASH_KEYCMP#define HASH_KEYCMP(a,b,len) memcmp(a,b,len) + +HASH_KEYCMP() +HASH_KEYCMP#define HASH_KEYCMP(a,b,len) memcmp(a,b,len) @@ -632,9 +629,9 @@ - -<anchor id="HASH-FIND-IN-BKT:CAPS" role="macro"/>HASH_FIND_IN_BKT() -HASH_FIND_IN_BKT#define HASH_FIND_IN_BKT(hh,head,keyptr,keylen_in,out) + +HASH_FIND_IN_BKT() +HASH_FIND_IN_BKT#define HASH_FIND_IN_BKT(hh,head,keyptr,keylen_in,out) @@ -656,9 +653,9 @@ - -<anchor id="HASH-ADD-TO-BKT:CAPS" role="macro"/>HASH_ADD_TO_BKT() -HASH_ADD_TO_BKT#define HASH_ADD_TO_BKT(hh,head,add) + +HASH_ADD_TO_BKT() +HASH_ADD_TO_BKT#define HASH_ADD_TO_BKT(hh,head,add) @@ -674,9 +671,9 @@ - -<anchor id="HASH-DEL-IN-BKT:CAPS" role="macro"/>HASH_DEL_IN_BKT() -HASH_DEL_IN_BKT#define HASH_DEL_IN_BKT(hh,head,delptr) + +HASH_DEL_IN_BKT() +HASH_DEL_IN_BKT#define HASH_DEL_IN_BKT(hh,head,delptr) @@ -692,9 +689,9 @@ - -<anchor id="HASH-EXPAND-BUCKETS:CAPS" role="macro"/>HASH_EXPAND_BUCKETS() -HASH_EXPAND_BUCKETS#define HASH_EXPAND_BUCKETS(tbl) + +HASH_EXPAND_BUCKETS() +HASH_EXPAND_BUCKETS#define HASH_EXPAND_BUCKETS(tbl) @@ -704,9 +701,9 @@ - -<anchor id="HASH-SORT:CAPS" role="macro"/>HASH_SORT() -HASH_SORT#define HASH_SORT(head,cmpfcn) + +HASH_SORT() +HASH_SORT#define HASH_SORT(head,cmpfcn) @@ -719,9 +716,9 @@ - -<anchor id="UT-hash-bucket" role="struct"/>UT_hash_bucket -UT_hash_buckettypedef struct { + +UT_hash_bucket +UT_hash_buckettypedef struct { struct UT_hash_handle *hh_head; unsigned count; unsigned expand_mult; @@ -730,9 +727,9 @@ - -<anchor id="UT-hash-table" role="struct"/>UT_hash_table -UT_hash_tabletypedef struct { + +UT_hash_table +UT_hash_tabletypedef struct { UT_hash_bucket *buckets; unsigned num_buckets; unsigned num_items; @@ -759,9 +756,9 @@ - -<anchor id="UT-hash-handle" role="struct"/>UT_hash_handle -UT_hash_handletypedef struct { + +UT_hash_handle +UT_hash_handletypedef struct { struct UT_hash_table *tbl; void *elmt; /* ptr to enclosing element */ void *prev; /* prev element in app order */ @@ -781,6 +778,4 @@ - - --- hal-0.5.11~rc2.orig/doc/api/libhal/xml/libhal.xml +++ hal-0.5.11~rc2/doc/api/libhal/xml/libhal.xml @@ -5,7 +5,7 @@ ]> -libhal +libhal 3 LIBHAL Library @@ -16,13 +16,10 @@ - + Synopsis - - - #define DBUS_API_SUBJECT_TO_CHANGE #define LIBHAL_DEPRECATED #define LIBHAL_FREE_DBUS_ERROR (_dbus_error_) @@ -409,31 +406,31 @@ - + Description - + Details - -<anchor id="DBUS-API-SUBJECT-TO-CHANGE:CAPS" role="macro"/>DBUS_API_SUBJECT_TO_CHANGE -DBUS_API_SUBJECT_TO_CHANGE#define DBUS_API_SUBJECT_TO_CHANGE + +DBUS_API_SUBJECT_TO_CHANGE +DBUS_API_SUBJECT_TO_CHANGE#define DBUS_API_SUBJECT_TO_CHANGE - -<anchor id="LIBHAL-DEPRECATED:CAPS" role="macro"/>LIBHAL_DEPRECATED -LIBHAL_DEPRECATED#define LIBHAL_DEPRECATED + +LIBHAL_DEPRECATED +LIBHAL_DEPRECATED#define LIBHAL_DEPRECATED - -<anchor id="LIBHAL-FREE-DBUS-ERROR:CAPS" role="macro"/>LIBHAL_FREE_DBUS_ERROR() -LIBHAL_FREE_DBUS_ERROR#define LIBHAL_FREE_DBUS_ERROR(_dbus_error_) + +LIBHAL_FREE_DBUS_ERROR() +LIBHAL_FREE_DBUS_ERROR#define LIBHAL_FREE_DBUS_ERROR(_dbus_error_) @@ -443,9 +440,9 @@ - -<anchor id="LIBHAL-CHECK-LIBHALCONTEXT:CAPS" role="macro"/>LIBHAL_CHECK_LIBHALCONTEXT() -LIBHAL_CHECK_LIBHALCONTEXT#define LIBHAL_CHECK_LIBHALCONTEXT(_ctx_, _ret_) + +LIBHAL_CHECK_LIBHALCONTEXT() +LIBHAL_CHECK_LIBHALCONTEXT#define LIBHAL_CHECK_LIBHALCONTEXT(_ctx_, _ret_) Handy macro for checking whether a context is valid. @@ -458,9 +455,9 @@ what to use for return value if context is invalid - -<anchor id="LibHalPropertyType" role="enum"/>enum LibHalPropertyType -LibHalPropertyTypetypedef enum { + +enum LibHalPropertyType +LibHalPropertyTypetypedef enum { /** Used to report error condition */ LIBHAL_PROPERTY_TYPE_INVALID = DBUS_TYPE_INVALID, @@ -488,9 +485,9 @@ - -<anchor id="LibHalContext" role="typedef"/>LibHalContext -LibHalContexttypedef struct LibHalContext_s LibHalContext; + +LibHalContext +LibHalContexttypedef struct LibHalContext_s LibHalContext; Context for connection to the HAL daemon. Opaque, use the @@ -498,18 +495,18 @@ - -<anchor id="LibHalProperty" role="typedef"/>LibHalProperty -LibHalPropertytypedef struct LibHalProperty_s LibHalProperty; + +LibHalProperty +LibHalPropertytypedef struct LibHalProperty_s LibHalProperty; Represents a property. Opaque. - -<anchor id="LibHalPropertySet" role="typedef"/>LibHalPropertySet -LibHalPropertySettypedef struct LibHalPropertySet_s LibHalPropertySet; + +LibHalPropertySet +LibHalPropertySettypedef struct LibHalPropertySet_s LibHalPropertySet; Represents a set of properties. Opaque; use the @@ -517,9 +514,9 @@ - -<anchor id="LibHalIntegrateDBusIntoMainLoop" role="function"/>LibHalIntegrateDBusIntoMainLoop () -LibHalIntegrateDBusIntoMainLoopvoid (*LibHalIntegrateDBusIntoMainLoop) (LibHalContext *ctx, + +LibHalIntegrateDBusIntoMainLoop () +LibHalIntegrateDBusIntoMainLoopvoid (*LibHalIntegrateDBusIntoMainLoop) (LibHalContext *ctx, DBusConnection *dbus_connection); Type for function in application code that integrates a @@ -534,9 +531,9 @@ DBus connection to use in ctx - -<anchor id="LibHalDeviceAdded" role="function"/>LibHalDeviceAdded () -LibHalDeviceAddedvoid (*LibHalDeviceAdded) (LibHalContext *ctx, + +LibHalDeviceAdded () +LibHalDeviceAddedvoid (*LibHalDeviceAdded) (LibHalContext *ctx, const char *udi); Type for callback when a device is added. @@ -550,9 +547,9 @@ the Unique Device Id - -<anchor id="LibHalDeviceRemoved" role="function"/>LibHalDeviceRemoved () -LibHalDeviceRemovedvoid (*LibHalDeviceRemoved) (LibHalContext *ctx, + +LibHalDeviceRemoved () +LibHalDeviceRemovedvoid (*LibHalDeviceRemoved) (LibHalContext *ctx, const char *udi); Type for callback when a device is removed. @@ -566,9 +563,9 @@ the Unique Device Id - -<anchor id="LibHalDeviceNewCapability" role="function"/>LibHalDeviceNewCapability () -LibHalDeviceNewCapabilityvoid (*LibHalDeviceNewCapability) (LibHalContext *ctx, + +LibHalDeviceNewCapability () +LibHalDeviceNewCapabilityvoid (*LibHalDeviceNewCapability) (LibHalContext *ctx, const char *udi, const char *capability); @@ -586,9 +583,9 @@ capability of the device - -<anchor id="LibHalDeviceLostCapability" role="function"/>LibHalDeviceLostCapability () -LibHalDeviceLostCapabilityvoid (*LibHalDeviceLostCapability) (LibHalContext *ctx, + +LibHalDeviceLostCapability () +LibHalDeviceLostCapabilityvoid (*LibHalDeviceLostCapability) (LibHalContext *ctx, const char *udi, const char *capability); @@ -606,9 +603,9 @@ capability of the device - -<anchor id="LibHalDevicePropertyModified" role="function"/>LibHalDevicePropertyModified () -LibHalDevicePropertyModifiedvoid (*LibHalDevicePropertyModified) (LibHalContext *ctx, + +LibHalDevicePropertyModified () +LibHalDevicePropertyModifiedvoid (*LibHalDevicePropertyModified) (LibHalContext *ctx, const char *udi, const char *key, dbus_bool_t is_removed, @@ -634,9 +631,9 @@ whether or not property was added - -<anchor id="LibHalDeviceCondition" role="function"/>LibHalDeviceCondition () -LibHalDeviceConditionvoid (*LibHalDeviceCondition) (LibHalContext *ctx, + +LibHalDeviceCondition () +LibHalDeviceConditionvoid (*LibHalDeviceCondition) (LibHalContext *ctx, const char *udi, const char *condition_name, const char *condition_detail); @@ -658,9 +655,9 @@ detail of condition - -<anchor id="LibHalGlobalInterfaceLockAcquired" role="function"/>LibHalGlobalInterfaceLockAcquired () -LibHalGlobalInterfaceLockAcquiredvoid (*LibHalGlobalInterfaceLockAcquired) + +LibHalGlobalInterfaceLockAcquired () +LibHalGlobalInterfaceLockAcquiredvoid (*LibHalGlobalInterfaceLockAcquired) (LibHalContext *ctx, const char *interface_name, const char *lock_owner, @@ -683,9 +680,9 @@ number of locks on the interface - -<anchor id="LibHalGlobalInterfaceLockReleased" role="function"/>LibHalGlobalInterfaceLockReleased () -LibHalGlobalInterfaceLockReleasedvoid (*LibHalGlobalInterfaceLockReleased) + +LibHalGlobalInterfaceLockReleased () +LibHalGlobalInterfaceLockReleasedvoid (*LibHalGlobalInterfaceLockReleased) (LibHalContext *ctx, const char *interface_name, const char *lock_owner, @@ -708,9 +705,9 @@ number of locks on the interface - -<anchor id="LibHalInterfaceLockAcquired" role="function"/>LibHalInterfaceLockAcquired () -LibHalInterfaceLockAcquiredvoid (*LibHalInterfaceLockAcquired) (LibHalContext *ctx, + +LibHalInterfaceLockAcquired () +LibHalInterfaceLockAcquiredvoid (*LibHalInterfaceLockAcquired) (LibHalContext *ctx, const char *udi, const char *interface_name, const char *lock_owner, @@ -736,9 +733,9 @@ number of locks on the interface - -<anchor id="LibHalInterfaceLockReleased" role="function"/>LibHalInterfaceLockReleased () -LibHalInterfaceLockReleasedvoid (*LibHalInterfaceLockReleased) (LibHalContext *ctx, + +LibHalInterfaceLockReleased () +LibHalInterfaceLockReleasedvoid (*LibHalInterfaceLockReleased) (LibHalContext *ctx, const char *udi, const char *interface_name, const char *lock_owner, @@ -764,9 +761,9 @@ number of locks on the interface - -<anchor id="LibHalSingletonDeviceAdded" role="function"/>LibHalSingletonDeviceAdded () -LibHalSingletonDeviceAddedvoid (*LibHalSingletonDeviceAdded) (LibHalContext *ctx, + +LibHalSingletonDeviceAdded () +LibHalSingletonDeviceAddedvoid (*LibHalSingletonDeviceAdded) (LibHalContext *ctx, const char *udi, const LibHalPropertySet *properties); @@ -784,9 +781,9 @@ the device's properties - -<anchor id="LibHalSingletonDeviceRemoved" role="function"/>LibHalSingletonDeviceRemoved () -LibHalSingletonDeviceRemovedvoid (*LibHalSingletonDeviceRemoved) (LibHalContext *ctx, + +LibHalSingletonDeviceRemoved () +LibHalSingletonDeviceRemovedvoid (*LibHalSingletonDeviceRemoved) (LibHalContext *ctx, const char *udi, const LibHalPropertySet *properties); @@ -804,9 +801,9 @@ the device's properties - -<anchor id="libhal-ctx-new" role="function"/>libhal_ctx_new () -libhal_ctx_newLibHalContext* libhal_ctx_new (void); + +libhal_ctx_new () +libhal_ctx_newLibHalContext* libhal_ctx_new (void); Create a new LibHalContext @@ -815,9 +812,9 @@ Returns : a new uninitialized LibHalContext object - -<anchor id="libhal-ctx-set-cache" role="function"/>libhal_ctx_set_cache () -libhal_ctx_set_cachedbus_bool_t libhal_ctx_set_cache (LibHalContext *ctx, + +libhal_ctx_set_cache () +libhal_ctx_set_cachedbus_bool_t libhal_ctx_set_cache (LibHalContext *ctx, dbus_bool_t use_cache); Enable or disable caching. Note: Caching is not actually @@ -834,9 +831,9 @@ Returns : TRUE if cache was successfully enabled/disabled, FALSE otherwise - -<anchor id="libhal-ctx-set-dbus-connection" role="function"/>libhal_ctx_set_dbus_connection () -libhal_ctx_set_dbus_connectiondbus_bool_t libhal_ctx_set_dbus_connection (LibHalContext *ctx, + +libhal_ctx_set_dbus_connection () +libhal_ctx_set_dbus_connectiondbus_bool_t libhal_ctx_set_dbus_connection (LibHalContext *ctx, DBusConnection *conn); Set DBus connection to use to talk to hald. @@ -852,9 +849,9 @@ Returns : TRUE if connection was successfully set, FALSE otherwise - -<anchor id="libhal-ctx-get-dbus-connection" role="function"/>libhal_ctx_get_dbus_connection () -libhal_ctx_get_dbus_connectionDBusConnection* libhal_ctx_get_dbus_connection (LibHalContext *ctx); + +libhal_ctx_get_dbus_connection () +libhal_ctx_get_dbus_connectionDBusConnection* libhal_ctx_get_dbus_connection (LibHalContext *ctx); Get DBus connection used for talking to hald. @@ -866,9 +863,9 @@ Returns : DBus connection to use or NULL - -<anchor id="libhal-ctx-set-user-data" role="function"/>libhal_ctx_set_user_data () -libhal_ctx_set_user_datadbus_bool_t libhal_ctx_set_user_data (LibHalContext *ctx, + +libhal_ctx_set_user_data () +libhal_ctx_set_user_datadbus_bool_t libhal_ctx_set_user_data (LibHalContext *ctx, void *user_data); Set user data for the context. @@ -884,9 +881,9 @@ Returns : TRUE if user data was successfully set, FALSE if otherwise - -<anchor id="libhal-ctx-get-user-data" role="function"/>libhal_ctx_get_user_data () -libhal_ctx_get_user_datavoid* libhal_ctx_get_user_data (LibHalContext *ctx); + +libhal_ctx_get_user_data () +libhal_ctx_get_user_datavoid* libhal_ctx_get_user_data (LibHalContext *ctx); Get user data for the context. @@ -898,9 +895,9 @@ Returns : opaque pointer stored through libhal_ctx_set_user_data() or NULL if not set. - -<anchor id="libhal-ctx-set-device-added" role="function"/>libhal_ctx_set_device_added () -libhal_ctx_set_device_addeddbus_bool_t libhal_ctx_set_device_added (LibHalContext *ctx, + +libhal_ctx_set_device_added () +libhal_ctx_set_device_addeddbus_bool_t libhal_ctx_set_device_added (LibHalContext *ctx, LibHalDeviceAdded callback); Set the callback for when a device is added @@ -916,9 +913,9 @@ Returns : TRUE if callback was successfully set, FALSE otherwise - -<anchor id="libhal-ctx-set-device-removed" role="function"/>libhal_ctx_set_device_removed () -libhal_ctx_set_device_removeddbus_bool_t libhal_ctx_set_device_removed (LibHalContext *ctx, + +libhal_ctx_set_device_removed () +libhal_ctx_set_device_removeddbus_bool_t libhal_ctx_set_device_removed (LibHalContext *ctx, LibHalDeviceRemoved callback); Set the callback for when a device is removed. @@ -934,9 +931,9 @@ Returns : TRUE if callback was successfully set, FALSE otherwise - -<anchor id="libhal-ctx-set-device-new-capability" role="function"/>libhal_ctx_set_device_new_capability () -libhal_ctx_set_device_new_capabilitydbus_bool_t libhal_ctx_set_device_new_capability + +libhal_ctx_set_device_new_capability () +libhal_ctx_set_device_new_capabilitydbus_bool_t libhal_ctx_set_device_new_capability (LibHalContext *ctx, LibHalDeviceNewCapability callback); @@ -953,9 +950,9 @@ Returns : TRUE if callback was successfully set, FALSE otherwise - -<anchor id="libhal-ctx-set-device-lost-capability" role="function"/>libhal_ctx_set_device_lost_capability () -libhal_ctx_set_device_lost_capabilitydbus_bool_t libhal_ctx_set_device_lost_capability + +libhal_ctx_set_device_lost_capability () +libhal_ctx_set_device_lost_capabilitydbus_bool_t libhal_ctx_set_device_lost_capability (LibHalContext *ctx, LibHalDeviceLostCapability callback); @@ -972,9 +969,9 @@ Returns : TRUE if callback was successfully set, FALSE otherwise - -<anchor id="libhal-ctx-set-device-property-modified" role="function"/>libhal_ctx_set_device_property_modified () -libhal_ctx_set_device_property_modifieddbus_bool_t libhal_ctx_set_device_property_modified + +libhal_ctx_set_device_property_modified () +libhal_ctx_set_device_property_modifieddbus_bool_t libhal_ctx_set_device_property_modified (LibHalContext *ctx, LibHalDevicePropertyModified callback); @@ -991,9 +988,9 @@ Returns : TRUE if callback was successfully set, FALSE otherwise - -<anchor id="libhal-ctx-set-device-condition" role="function"/>libhal_ctx_set_device_condition () -libhal_ctx_set_device_conditiondbus_bool_t libhal_ctx_set_device_condition (LibHalContext *ctx, + +libhal_ctx_set_device_condition () +libhal_ctx_set_device_conditiondbus_bool_t libhal_ctx_set_device_condition (LibHalContext *ctx, LibHalDeviceCondition callback); Set the callback for when a device emits a condition @@ -1009,9 +1006,9 @@ Returns : TRUE if callback was successfully set, FALSE otherwise - -<anchor id="libhal-ctx-set-global-interface-lock-acquired" role="function"/>libhal_ctx_set_global_interface_lock_acquired () -libhal_ctx_set_global_interface_lock_acquireddbus_bool_t libhal_ctx_set_global_interface_lock_acquired + +libhal_ctx_set_global_interface_lock_acquired () +libhal_ctx_set_global_interface_lock_acquireddbus_bool_t libhal_ctx_set_global_interface_lock_acquired (LibHalContext *ctx, LibHalGlobalInterfaceLockAcquired callback); @@ -1028,9 +1025,9 @@ Returns : TRUE if callback was successfully set, FALSE otherwise - -<anchor id="libhal-ctx-set-global-interface-lock-released" role="function"/>libhal_ctx_set_global_interface_lock_released () -libhal_ctx_set_global_interface_lock_releaseddbus_bool_t libhal_ctx_set_global_interface_lock_released + +libhal_ctx_set_global_interface_lock_released () +libhal_ctx_set_global_interface_lock_releaseddbus_bool_t libhal_ctx_set_global_interface_lock_released (LibHalContext *ctx, LibHalGlobalInterfaceLockReleased callback); @@ -1047,9 +1044,9 @@ Returns : TRUE if callback was successfully set, FALSE otherwise - -<anchor id="libhal-ctx-set-interface-lock-acquired" role="function"/>libhal_ctx_set_interface_lock_acquired () -libhal_ctx_set_interface_lock_acquireddbus_bool_t libhal_ctx_set_interface_lock_acquired + +libhal_ctx_set_interface_lock_acquired () +libhal_ctx_set_interface_lock_acquireddbus_bool_t libhal_ctx_set_interface_lock_acquired (LibHalContext *ctx, LibHalInterfaceLockAcquired callback); @@ -1066,9 +1063,9 @@ Returns : TRUE if callback was successfully set, FALSE otherwise - -<anchor id="libhal-ctx-set-interface-lock-released" role="function"/>libhal_ctx_set_interface_lock_released () -libhal_ctx_set_interface_lock_releaseddbus_bool_t libhal_ctx_set_interface_lock_released + +libhal_ctx_set_interface_lock_released () +libhal_ctx_set_interface_lock_releaseddbus_bool_t libhal_ctx_set_interface_lock_released (LibHalContext *ctx, LibHalInterfaceLockReleased callback); @@ -1085,9 +1082,9 @@ Returns : TRUE if callback was successfully set, FALSE otherwise - -<anchor id="libhal-ctx-set-singleton-device-added" role="function"/>libhal_ctx_set_singleton_device_added () -libhal_ctx_set_singleton_device_addeddbus_bool_t libhal_ctx_set_singleton_device_added + +libhal_ctx_set_singleton_device_added () +libhal_ctx_set_singleton_device_addeddbus_bool_t libhal_ctx_set_singleton_device_added (LibHalContext *ctx, LibHalSingletonDeviceAdded callback); @@ -1104,9 +1101,9 @@ Returns : TRUE if callback was successfully set, FALSE otherwise - -<anchor id="libhal-ctx-set-singleton-device-removed" role="function"/>libhal_ctx_set_singleton_device_removed () -libhal_ctx_set_singleton_device_removeddbus_bool_t libhal_ctx_set_singleton_device_removed + +libhal_ctx_set_singleton_device_removed () +libhal_ctx_set_singleton_device_removeddbus_bool_t libhal_ctx_set_singleton_device_removed (LibHalContext *ctx, LibHalSingletonDeviceRemoved callback); @@ -1123,9 +1120,9 @@ Returns : TRUE if callback was successfully set, FALSE otherwise - -<anchor id="libhal-ctx-init" role="function"/>libhal_ctx_init () -libhal_ctx_initdbus_bool_t libhal_ctx_init (LibHalContext *ctx, + +libhal_ctx_init () +libhal_ctx_initdbus_bool_t libhal_ctx_init (LibHalContext *ctx, DBusError *error); Initialize the connection to hald. @@ -1141,9 +1138,9 @@ Returns : TRUE if initialization succeeds, FALSE otherwise - -<anchor id="libhal-ctx-shutdown" role="function"/>libhal_ctx_shutdown () -libhal_ctx_shutdowndbus_bool_t libhal_ctx_shutdown (LibHalContext *ctx, + +libhal_ctx_shutdown () +libhal_ctx_shutdowndbus_bool_t libhal_ctx_shutdown (LibHalContext *ctx, DBusError *error); Shut down a connection to hald. @@ -1159,9 +1156,9 @@ Returns : TRUE if connection successfully shut down, FALSE otherwise - -<anchor id="libhal-ctx-free" role="function"/>libhal_ctx_free () -libhal_ctx_freedbus_bool_t libhal_ctx_free (LibHalContext *ctx); + +libhal_ctx_free () +libhal_ctx_freedbus_bool_t libhal_ctx_free (LibHalContext *ctx); Free a LibHalContext resource. @@ -1173,9 +1170,9 @@ Returns : TRUE - -<anchor id="libhal-ctx-init-direct" role="function"/>libhal_ctx_init_direct () -libhal_ctx_init_directLibHalContext* libhal_ctx_init_direct (DBusError *error); + +libhal_ctx_init_direct () +libhal_ctx_init_directLibHalContext* libhal_ctx_init_direct (DBusError *error); Create an already initialized connection to hald. This function should only be used by HAL helpers. @@ -1187,9 +1184,9 @@ Returns : A pointer to an already initialized LibHalContext - -<anchor id="libhal-get-all-devices" role="function"/>libhal_get_all_devices () -libhal_get_all_deviceschar** libhal_get_all_devices (LibHalContext *ctx, + +libhal_get_all_devices () +libhal_get_all_deviceschar** libhal_get_all_devices (LibHalContext *ctx, int *num_devices, DBusError *error); @@ -1211,9 +1208,9 @@ libhal_free_string_array(). If an error occurs NULL is returned. - -<anchor id="libhal-device-exists" role="function"/>libhal_device_exists () -libhal_device_existsdbus_bool_t libhal_device_exists (LibHalContext *ctx, + +libhal_device_exists () +libhal_device_existsdbus_bool_t libhal_device_exists (LibHalContext *ctx, const char *udi, DBusError *error); @@ -1233,9 +1230,9 @@ Returns : TRUE if the device exists - -<anchor id="libhal-device-print" role="function"/>libhal_device_print () -libhal_device_printdbus_bool_t libhal_device_print (LibHalContext *ctx, + +libhal_device_print () +libhal_device_printdbus_bool_t libhal_device_print (LibHalContext *ctx, const char *udi, DBusError *error); @@ -1255,9 +1252,9 @@ Returns : TRUE if device's information could be obtained, FALSE otherwise - -<anchor id="libhal-device-property-exists" role="function"/>libhal_device_property_exists () -libhal_device_property_existsdbus_bool_t libhal_device_property_exists (LibHalContext *ctx, + +libhal_device_property_exists () +libhal_device_property_existsdbus_bool_t libhal_device_property_exists (LibHalContext *ctx, const char *udi, const char *key, DBusError *error); @@ -1281,9 +1278,9 @@ Returns : TRUE if the device exists, FALSE otherwise - -<anchor id="libhal-device-get-property-string" role="function"/>libhal_device_get_property_string () -libhal_device_get_property_stringchar* libhal_device_get_property_string (LibHalContext *ctx, + +libhal_device_get_property_string () +libhal_device_get_property_stringchar* libhal_device_get_property_string (LibHalContext *ctx, const char *udi, const char *key, DBusError *error); @@ -1309,9 +1306,9 @@ NULL if the property didn't exist or we are OOM. - -<anchor id="libhal-device-get-property-int" role="function"/>libhal_device_get_property_int () -libhal_device_get_property_intdbus_int32_t libhal_device_get_property_int (LibHalContext *ctx, + +libhal_device_get_property_int () +libhal_device_get_property_intdbus_int32_t libhal_device_get_property_int (LibHalContext *ctx, const char *udi, const char *key, DBusError *error); @@ -1335,9 +1332,9 @@ Returns : Property value (32-bit signed integer) - -<anchor id="libhal-device-get-property-uint64" role="function"/>libhal_device_get_property_uint64 () -libhal_device_get_property_uint64dbus_uint64_t libhal_device_get_property_uint64 (LibHalContext *ctx, + +libhal_device_get_property_uint64 () +libhal_device_get_property_uint64dbus_uint64_t libhal_device_get_property_uint64 (LibHalContext *ctx, const char *udi, const char *key, DBusError *error); @@ -1361,9 +1358,9 @@ Returns : Property value (64-bit unsigned integer) - -<anchor id="libhal-device-get-property-double" role="function"/>libhal_device_get_property_double () -libhal_device_get_property_doubledouble libhal_device_get_property_double (LibHalContext *ctx, + +libhal_device_get_property_double () +libhal_device_get_property_doubledouble libhal_device_get_property_double (LibHalContext *ctx, const char *udi, const char *key, DBusError *error); @@ -1387,9 +1384,9 @@ Returns : Property value (IEEE754 double precision float) - -<anchor id="libhal-device-get-property-bool" role="function"/>libhal_device_get_property_bool () -libhal_device_get_property_booldbus_bool_t libhal_device_get_property_bool (LibHalContext *ctx, + +libhal_device_get_property_bool () +libhal_device_get_property_booldbus_bool_t libhal_device_get_property_bool (LibHalContext *ctx, const char *udi, const char *key, DBusError *error); @@ -1413,9 +1410,9 @@ Returns : Property value (boolean) - -<anchor id="libhal-device-get-property-strlist" role="function"/>libhal_device_get_property_strlist () -libhal_device_get_property_strlistchar** libhal_device_get_property_strlist (LibHalContext *ctx, + +libhal_device_get_property_strlist () +libhal_device_get_property_strlistchar** libhal_device_get_property_strlist (LibHalContext *ctx, const char *udi, const char *key, DBusError *error); @@ -1442,9 +1439,9 @@ NULL if the property didn't exist or we are OOM - -<anchor id="libhal-device-set-property-string" role="function"/>libhal_device_set_property_string () -libhal_device_set_property_stringdbus_bool_t libhal_device_set_property_string (LibHalContext *ctx, + +libhal_device_set_property_string () +libhal_device_set_property_stringdbus_bool_t libhal_device_set_property_string (LibHalContext *ctx, const char *udi, const char *key, const char *value, @@ -1473,9 +1470,9 @@ exist or the property had a different type. - -<anchor id="libhal-device-set-property-int" role="function"/>libhal_device_set_property_int () -libhal_device_set_property_intdbus_bool_t libhal_device_set_property_int (LibHalContext *ctx, + +libhal_device_set_property_int () +libhal_device_set_property_intdbus_bool_t libhal_device_set_property_int (LibHalContext *ctx, const char *udi, const char *key, dbus_int32_t value, @@ -1504,9 +1501,9 @@ exist or the property had a different type. - -<anchor id="libhal-device-set-property-uint64" role="function"/>libhal_device_set_property_uint64 () -libhal_device_set_property_uint64dbus_bool_t libhal_device_set_property_uint64 (LibHalContext *ctx, + +libhal_device_set_property_uint64 () +libhal_device_set_property_uint64dbus_bool_t libhal_device_set_property_uint64 (LibHalContext *ctx, const char *udi, const char *key, dbus_uint64_t value, @@ -1535,9 +1532,9 @@ exist or the property had a different type. - -<anchor id="libhal-device-set-property-double" role="function"/>libhal_device_set_property_double () -libhal_device_set_property_doubledbus_bool_t libhal_device_set_property_double (LibHalContext *ctx, + +libhal_device_set_property_double () +libhal_device_set_property_doubledbus_bool_t libhal_device_set_property_double (LibHalContext *ctx, const char *udi, const char *key, double value, @@ -1566,9 +1563,9 @@ exist or the property had a different type. - -<anchor id="libhal-device-set-property-bool" role="function"/>libhal_device_set_property_bool () -libhal_device_set_property_booldbus_bool_t libhal_device_set_property_bool (LibHalContext *ctx, + +libhal_device_set_property_bool () +libhal_device_set_property_booldbus_bool_t libhal_device_set_property_bool (LibHalContext *ctx, const char *udi, const char *key, dbus_bool_t value, @@ -1597,9 +1594,9 @@ exist or the property had a different type. - -<anchor id="libhal-device-property-strlist-append" role="function"/>libhal_device_property_strlist_append () -libhal_device_property_strlist_appenddbus_bool_t libhal_device_property_strlist_append + +libhal_device_property_strlist_append () +libhal_device_property_strlist_appenddbus_bool_t libhal_device_property_strlist_append (LibHalContext *ctx, const char *udi, const char *key, @@ -1629,9 +1626,9 @@ exist or the property had a different type. - -<anchor id="libhal-device-property-strlist-prepend" role="function"/>libhal_device_property_strlist_prepend () -libhal_device_property_strlist_prependdbus_bool_t libhal_device_property_strlist_prepend + +libhal_device_property_strlist_prepend () +libhal_device_property_strlist_prependdbus_bool_t libhal_device_property_strlist_prepend (LibHalContext *ctx, const char *udi, const char *key, @@ -1661,9 +1658,9 @@ didn't exist or the property had a different type. - -<anchor id="libhal-device-property-strlist-remove-index" role="function"/>libhal_device_property_strlist_remove_index () -libhal_device_property_strlist_remove_indexdbus_bool_t libhal_device_property_strlist_remove_index + +libhal_device_property_strlist_remove_index () +libhal_device_property_strlist_remove_indexdbus_bool_t libhal_device_property_strlist_remove_index (LibHalContext *ctx, const char *udi, const char *key, @@ -1693,9 +1690,9 @@ exist or the property had a different type. - -<anchor id="libhal-device-property-strlist-remove" role="function"/>libhal_device_property_strlist_remove () -libhal_device_property_strlist_removedbus_bool_t libhal_device_property_strlist_remove + +libhal_device_property_strlist_remove () +libhal_device_property_strlist_removedbus_bool_t libhal_device_property_strlist_remove (LibHalContext *ctx, const char *udi, const char *key, @@ -1725,9 +1722,9 @@ exist or the property had a different type. - -<anchor id="libhal-device-remove-property" role="function"/>libhal_device_remove_property () -libhal_device_remove_propertydbus_bool_t libhal_device_remove_property (LibHalContext *ctx, + +libhal_device_remove_property () +libhal_device_remove_propertydbus_bool_t libhal_device_remove_property (LibHalContext *ctx, const char *udi, const char *key, DBusError *error); @@ -1752,9 +1749,9 @@ exist - -<anchor id="libhal-device-get-property-type" role="function"/>libhal_device_get_property_type () -libhal_device_get_property_typeLibHalPropertyType libhal_device_get_property_type (LibHalContext *ctx, + +libhal_device_get_property_type () +libhal_device_get_property_typeLibHalPropertyType libhal_device_get_property_type (LibHalContext *ctx, const char *udi, const char *key, DBusError *error); @@ -1779,22 +1776,22 @@ return if the property doesn't exist. - -<anchor id="LibHalChangeSet-s" role="struct"/>struct LibHalChangeSet_s -LibHalChangeSet_sstruct LibHalChangeSet_s; + +struct LibHalChangeSet_s +LibHalChangeSet_sstruct LibHalChangeSet_s; - -<anchor id="LibHalChangeSet" role="typedef"/>LibHalChangeSet -LibHalChangeSettypedef struct LibHalChangeSet_s LibHalChangeSet; + +LibHalChangeSet +LibHalChangeSettypedef struct LibHalChangeSet_s LibHalChangeSet; - -<anchor id="libhal-device-new-changeset" role="function"/>libhal_device_new_changeset () -libhal_device_new_changesetLibHalChangeSet* libhal_device_new_changeset (const char *udi); + +libhal_device_new_changeset () +libhal_device_new_changesetLibHalChangeSet* libhal_device_new_changeset (const char *udi); Request a new changeset object. Used for changing multiple properties at once. Useful when performance is critical and also for atomically updating several properties. @@ -1807,9 +1804,9 @@ Returns : A new changeset object or NULL on error - -<anchor id="libhal-changeset-set-property-string" role="function"/>libhal_changeset_set_property_string () -libhal_changeset_set_property_stringdbus_bool_t libhal_changeset_set_property_string + +libhal_changeset_set_property_string () +libhal_changeset_set_property_stringdbus_bool_t libhal_changeset_set_property_string (LibHalChangeSet *changeset, const char *key, const char *value); @@ -1830,9 +1827,9 @@ Returns : FALSE on OOM - -<anchor id="libhal-changeset-set-property-int" role="function"/>libhal_changeset_set_property_int () -libhal_changeset_set_property_intdbus_bool_t libhal_changeset_set_property_int (LibHalChangeSet *changeset, + +libhal_changeset_set_property_int () +libhal_changeset_set_property_intdbus_bool_t libhal_changeset_set_property_int (LibHalChangeSet *changeset, const char *key, dbus_int32_t value); @@ -1852,9 +1849,9 @@ Returns : FALSE on OOM - -<anchor id="libhal-changeset-set-property-uint64" role="function"/>libhal_changeset_set_property_uint64 () -libhal_changeset_set_property_uint64dbus_bool_t libhal_changeset_set_property_uint64 + +libhal_changeset_set_property_uint64 () +libhal_changeset_set_property_uint64dbus_bool_t libhal_changeset_set_property_uint64 (LibHalChangeSet *changeset, const char *key, dbus_uint64_t value); @@ -1875,9 +1872,9 @@ Returns : FALSE on OOM - -<anchor id="libhal-changeset-set-property-double" role="function"/>libhal_changeset_set_property_double () -libhal_changeset_set_property_doubledbus_bool_t libhal_changeset_set_property_double + +libhal_changeset_set_property_double () +libhal_changeset_set_property_doubledbus_bool_t libhal_changeset_set_property_double (LibHalChangeSet *changeset, const char *key, double value); @@ -1898,9 +1895,9 @@ Returns : FALSE on OOM - -<anchor id="libhal-changeset-set-property-bool" role="function"/>libhal_changeset_set_property_bool () -libhal_changeset_set_property_booldbus_bool_t libhal_changeset_set_property_bool (LibHalChangeSet *changeset, + +libhal_changeset_set_property_bool () +libhal_changeset_set_property_booldbus_bool_t libhal_changeset_set_property_bool (LibHalChangeSet *changeset, const char *key, dbus_bool_t value); @@ -1920,9 +1917,9 @@ Returns : FALSE on OOM - -<anchor id="libhal-changeset-set-property-strlist" role="function"/>libhal_changeset_set_property_strlist () -libhal_changeset_set_property_strlistdbus_bool_t libhal_changeset_set_property_strlist + +libhal_changeset_set_property_strlist () +libhal_changeset_set_property_strlistdbus_bool_t libhal_changeset_set_property_strlist (LibHalChangeSet *changeset, const char *key, const char **value); @@ -1943,9 +1940,9 @@ Returns : FALSE on OOM - -<anchor id="libhal-device-commit-changeset" role="function"/>libhal_device_commit_changeset () -libhal_device_commit_changesetdbus_bool_t libhal_device_commit_changeset (LibHalContext *ctx, + +libhal_device_commit_changeset () +libhal_device_commit_changesetdbus_bool_t libhal_device_commit_changeset (LibHalContext *ctx, LibHalChangeSet *changeset, DBusError *error); @@ -1965,9 +1962,9 @@ Returns : True if the changeset was committed on the daemon side - -<anchor id="libhal-device-free-changeset" role="function"/>libhal_device_free_changeset () -libhal_device_free_changesetvoid libhal_device_free_changeset (LibHalChangeSet *changeset); + +libhal_device_free_changeset () +libhal_device_free_changesetvoid libhal_device_free_changeset (LibHalChangeSet *changeset); Free a changeset. @@ -1977,9 +1974,9 @@ the changeset to free - -<anchor id="libhal-device-get-all-properties" role="function"/>libhal_device_get_all_properties () -libhal_device_get_all_propertiesLibHalPropertySet* libhal_device_get_all_properties (LibHalContext *ctx, + +libhal_device_get_all_properties () +libhal_device_get_all_propertiesLibHalPropertySet* libhal_device_get_all_properties (LibHalContext *ctx, const char *udi, DBusError *error); @@ -1999,9 +1996,9 @@ Returns : An object represent all properties. Must be freed with libhal_free_property_set(). - -<anchor id="libhal-get-all-devices-with-properties" role="function"/>libhal_get_all_devices_with_properties () -libhal_get_all_devices_with_propertiesdbus_bool_t libhal_get_all_devices_with_properties + +libhal_get_all_devices_with_properties () +libhal_get_all_devices_with_propertiesdbus_bool_t libhal_get_all_devices_with_properties (LibHalContext *ctx, int *out_num_devices, char ***out_udi, @@ -2035,9 +2032,9 @@ - -<anchor id="libhal-property-set-sort" role="function"/>libhal_property_set_sort () -libhal_property_set_sortvoid libhal_property_set_sort (LibHalPropertySet *set); + +libhal_property_set_sort () +libhal_property_set_sortvoid libhal_property_set_sort (LibHalPropertySet *set); Sort all properties according to property name. @@ -2047,9 +2044,9 @@ property-set to sort - -<anchor id="libhal-free-property-set" role="function"/>libhal_free_property_set () -libhal_free_property_setvoid libhal_free_property_set (LibHalPropertySet *set); + +libhal_free_property_set () +libhal_free_property_setvoid libhal_free_property_set (LibHalPropertySet *set); Free a property set earlier obtained with libhal_device_get_all_properties(). @@ -2059,9 +2056,9 @@ property-set to free - -<anchor id="libhal-property-set-get-num-elems" role="function"/>libhal_property_set_get_num_elems () -libhal_property_set_get_num_elemsunsigned int libhal_property_set_get_num_elems (LibHalPropertySet *set); + +libhal_property_set_get_num_elems () +libhal_property_set_get_num_elemsunsigned int libhal_property_set_get_num_elems (LibHalPropertySet *set); Get the number of properties in a property set. @@ -2073,9 +2070,9 @@ Returns : number of properties in given property set - -<anchor id="libhal-ps-get-type" role="function"/>libhal_ps_get_type () -libhal_ps_get_typeLibHalPropertyType libhal_ps_get_type (const LibHalPropertySet *set, + +libhal_ps_get_type () +libhal_ps_get_typeLibHalPropertyType libhal_ps_get_type (const LibHalPropertySet *set, const char *key); Get the type of a given property. @@ -2092,9 +2089,9 @@ LIBHAL_PROPERTY_TYPE_INVALID if property is not in the set - -<anchor id="libhal-ps-get-string" role="function"/>libhal_ps_get_string () -libhal_ps_get_stringconst char* libhal_ps_get_string (const LibHalPropertySet *set, + +libhal_ps_get_string () +libhal_ps_get_stringconst char* libhal_ps_get_string (const LibHalPropertySet *set, const char *key); Get the value of a property of type string. @@ -2112,9 +2109,9 @@ this property belongs to. NULL if property is not in the set or not a string - -<anchor id="libhal-ps-get-int32" role="function"/>libhal_ps_get_int32 () -libhal_ps_get_int32dbus_int32_t libhal_ps_get_int32 (const LibHalPropertySet *set, + +libhal_ps_get_int32 () +libhal_ps_get_int32dbus_int32_t libhal_ps_get_int32 (const LibHalPropertySet *set, const char *key); @@ -2130,9 +2127,9 @@ - -<anchor id="libhal-ps-get-uint64" role="function"/>libhal_ps_get_uint64 () -libhal_ps_get_uint64dbus_uint64_t libhal_ps_get_uint64 (const LibHalPropertySet *set, + +libhal_ps_get_uint64 () +libhal_ps_get_uint64dbus_uint64_t libhal_ps_get_uint64 (const LibHalPropertySet *set, const char *key); Get the value of a property of type unsigned integer. @@ -2148,9 +2145,9 @@ Returns : property value (64-bit unsigned integer) - -<anchor id="libhal-ps-get-double" role="function"/>libhal_ps_get_double () -libhal_ps_get_doubledouble libhal_ps_get_double (const LibHalPropertySet *set, + +libhal_ps_get_double () +libhal_ps_get_doubledouble libhal_ps_get_double (const LibHalPropertySet *set, const char *key); Get the value of a property of type double. @@ -2166,9 +2163,9 @@ Returns : property value (IEEE754 double precision float) - -<anchor id="libhal-ps-get-bool" role="function"/>libhal_ps_get_bool () -libhal_ps_get_booldbus_bool_t libhal_ps_get_bool (const LibHalPropertySet *set, + +libhal_ps_get_bool () +libhal_ps_get_booldbus_bool_t libhal_ps_get_bool (const LibHalPropertySet *set, const char *key); Get the value of a property of type bool. @@ -2184,9 +2181,9 @@ Returns : property value (bool) - -<anchor id="LibHalPropertySetIterator" role="typedef"/>LibHalPropertySetIterator -LibHalPropertySetIteratortypedef struct LibHalPropertySetIterator_s LibHalPropertySetIterator; + +LibHalPropertySetIterator +LibHalPropertySetIteratortypedef struct LibHalPropertySetIterator_s LibHalPropertySetIterator; Iterator for inspecting all properties. Do not access any members; @@ -2194,9 +2191,9 @@ - -<anchor id="libhal-psi-init" role="function"/>libhal_psi_init () -libhal_psi_initvoid libhal_psi_init (LibHalPropertySetIterator *iter, + +libhal_psi_init () +libhal_psi_initvoid libhal_psi_init (LibHalPropertySetIterator *iter, LibHalPropertySet *set); Initialize a property set iterator. @@ -2210,9 +2207,9 @@ property set to iterate over - -<anchor id="libhal-psi-has-more" role="function"/>libhal_psi_has_more () -libhal_psi_has_moredbus_bool_t libhal_psi_has_more (LibHalPropertySetIterator *iter); + +libhal_psi_has_more () +libhal_psi_has_moredbus_bool_t libhal_psi_has_more (LibHalPropertySetIterator *iter); Determine whether there are more properties to iterate over. @@ -2224,9 +2221,9 @@ Returns : TRUE if there are more properties, FALSE otherwise. - -<anchor id="libhal-psi-next" role="function"/>libhal_psi_next () -libhal_psi_nextvoid libhal_psi_next (LibHalPropertySetIterator *iter); + +libhal_psi_next () +libhal_psi_nextvoid libhal_psi_next (LibHalPropertySetIterator *iter); Advance iterator to next property. @@ -2236,9 +2233,9 @@ iterator object - -<anchor id="libhal-psi-get-type" role="function"/>libhal_psi_get_type () -libhal_psi_get_typeLibHalPropertyType libhal_psi_get_type (LibHalPropertySetIterator *iter); + +libhal_psi_get_type () +libhal_psi_get_typeLibHalPropertyType libhal_psi_get_type (LibHalPropertySetIterator *iter); Get type of property. @@ -2250,9 +2247,9 @@ Returns : the property type at the iterator's position - -<anchor id="libhal-psi-get-key" role="function"/>libhal_psi_get_key () -libhal_psi_get_keychar* libhal_psi_get_key (LibHalPropertySetIterator *iter); + +libhal_psi_get_key () +libhal_psi_get_keychar* libhal_psi_get_key (LibHalPropertySetIterator *iter); Get the key of a property. @@ -2266,9 +2263,9 @@ this property belongs to. - -<anchor id="libhal-psi-get-string" role="function"/>libhal_psi_get_string () -libhal_psi_get_stringchar* libhal_psi_get_string (LibHalPropertySetIterator *iter); + +libhal_psi_get_string () +libhal_psi_get_stringchar* libhal_psi_get_string (LibHalPropertySetIterator *iter); Get the value of a property of type string. @@ -2282,9 +2279,9 @@ this property belongs to. - -<anchor id="libhal-psi-get-int" role="function"/>libhal_psi_get_int () -libhal_psi_get_intdbus_int32_t libhal_psi_get_int (LibHalPropertySetIterator *iter); + +libhal_psi_get_int () +libhal_psi_get_intdbus_int32_t libhal_psi_get_int (LibHalPropertySetIterator *iter); Get the value of a property of type signed integer. @@ -2296,9 +2293,9 @@ Returns : property value (32-bit signed integer) - -<anchor id="libhal-psi-get-uint64" role="function"/>libhal_psi_get_uint64 () -libhal_psi_get_uint64dbus_uint64_t libhal_psi_get_uint64 (LibHalPropertySetIterator *iter); + +libhal_psi_get_uint64 () +libhal_psi_get_uint64dbus_uint64_t libhal_psi_get_uint64 (LibHalPropertySetIterator *iter); Get the value of a property of type unsigned integer. @@ -2310,9 +2307,9 @@ Returns : property value (64-bit unsigned integer) - -<anchor id="libhal-psi-get-double" role="function"/>libhal_psi_get_double () -libhal_psi_get_doubledouble libhal_psi_get_double (LibHalPropertySetIterator *iter); + +libhal_psi_get_double () +libhal_psi_get_doubledouble libhal_psi_get_double (LibHalPropertySetIterator *iter); Get the value of a property of type double. @@ -2324,9 +2321,9 @@ Returns : property value (IEEE754 double precision float) - -<anchor id="libhal-psi-get-bool" role="function"/>libhal_psi_get_bool () -libhal_psi_get_booldbus_bool_t libhal_psi_get_bool (LibHalPropertySetIterator *iter); + +libhal_psi_get_bool () +libhal_psi_get_booldbus_bool_t libhal_psi_get_bool (LibHalPropertySetIterator *iter); Get the value of a property of type bool. @@ -2338,9 +2335,9 @@ Returns : property value (bool) - -<anchor id="libhal-psi-get-strlist" role="function"/>libhal_psi_get_strlist () -libhal_psi_get_strlistchar** libhal_psi_get_strlist (LibHalPropertySetIterator *iter); + +libhal_psi_get_strlist () +libhal_psi_get_strlistchar** libhal_psi_get_strlist (LibHalPropertySetIterator *iter); Get the value of a property of type string list. @@ -2352,9 +2349,9 @@ Returns : pointer to array of strings - -<anchor id="libhal-string-array-length" role="function"/>libhal_string_array_length () -libhal_string_array_lengthunsigned int libhal_string_array_length (char **str_array); + +libhal_string_array_length () +libhal_string_array_lengthunsigned int libhal_string_array_length (char **str_array); Get the length of an array of strings. @@ -2366,9 +2363,9 @@ Returns : Number of strings in array - -<anchor id="libhal-free-string-array" role="function"/>libhal_free_string_array () -libhal_free_string_arrayvoid libhal_free_string_array (char **str_array); + +libhal_free_string_array () +libhal_free_string_arrayvoid libhal_free_string_array (char **str_array); Frees a NULL-terminated array of strings. If passed NULL, does nothing. @@ -2378,9 +2375,9 @@ the array to be freed - -<anchor id="libhal-free-string" role="function"/>libhal_free_string () -libhal_free_stringvoid libhal_free_string (char *str); + +libhal_free_string () +libhal_free_stringvoid libhal_free_string (char *str); Used to free strings returned by libhal. @@ -2390,9 +2387,9 @@ the nul-terminated sting to free - -<anchor id="libhal-new-device" role="function"/>libhal_new_device () -libhal_new_devicechar* libhal_new_device (LibHalContext *ctx, + +libhal_new_device () +libhal_new_devicechar* libhal_new_device (LibHalContext *ctx, DBusError *error); Create a new device object which will be hidden from applications @@ -2412,9 +2409,9 @@ problem. This string must be freed by the caller. - -<anchor id="libhal-device-commit-to-gdl" role="function"/>libhal_device_commit_to_gdl () -libhal_device_commit_to_gdldbus_bool_t libhal_device_commit_to_gdl (LibHalContext *ctx, + +libhal_device_commit_to_gdl () +libhal_device_commit_to_gdldbus_bool_t libhal_device_commit_to_gdl (LibHalContext *ctx, const char *temp_udi, const char *udi, DBusError *error); @@ -2449,9 +2446,9 @@ Returns : FALSE if the given unique device id is already in use. - -<anchor id="libhal-remove-device" role="function"/>libhal_remove_device () -libhal_remove_devicedbus_bool_t libhal_remove_device (LibHalContext *ctx, + +libhal_remove_device () +libhal_remove_devicedbus_bool_t libhal_remove_device (LibHalContext *ctx, const char *udi, DBusError *error); @@ -2477,9 +2474,9 @@ Returns : TRUE if the device was removed, FALSE otherwise - -<anchor id="libhal-merge-properties" role="function"/>libhal_merge_properties () -libhal_merge_propertiesdbus_bool_t libhal_merge_properties (LibHalContext *ctx, + +libhal_merge_properties () +libhal_merge_propertiesdbus_bool_t libhal_merge_properties (LibHalContext *ctx, const char *target_udi, const char *source_udi, DBusError *error); @@ -2503,9 +2500,9 @@ Returns : TRUE if the properties were merged, FALSE otherwise - -<anchor id="libhal-device-matches" role="function"/>libhal_device_matches () -libhal_device_matchesdbus_bool_t libhal_device_matches (LibHalContext *ctx, + +libhal_device_matches () +libhal_device_matchesdbus_bool_t libhal_device_matches (LibHalContext *ctx, const char *udi1, const char *udi2, const char *property_namespace, @@ -2544,9 +2541,9 @@ parameter from one device is in the other and have the same value. - -<anchor id="libhal-manager-find-device-string-match" role="function"/>libhal_manager_find_device_string_match () -libhal_manager_find_device_string_matchchar** libhal_manager_find_device_string_match + +libhal_manager_find_device_string_match () +libhal_manager_find_device_string_matchchar** libhal_manager_find_device_string_match (LibHalContext *ctx, const char *key, const char *value, @@ -2576,9 +2573,9 @@ Returns : UDI of devices; free with libhal_free_string_array() - -<anchor id="libhal-device-add-capability" role="function"/>libhal_device_add_capability () -libhal_device_add_capabilitydbus_bool_t libhal_device_add_capability (LibHalContext *ctx, + +libhal_device_add_capability () +libhal_device_add_capabilitydbus_bool_t libhal_device_add_capability (LibHalContext *ctx, const char *udi, const char *capability, DBusError *error); @@ -2602,9 +2599,9 @@ Returns : TRUE if the capability was added, FALSE if the device didn't exist - -<anchor id="libhal-device-query-capability" role="function"/>libhal_device_query_capability () -libhal_device_query_capabilitydbus_bool_t libhal_device_query_capability (LibHalContext *ctx, + +libhal_device_query_capability () +libhal_device_query_capabilitydbus_bool_t libhal_device_query_capability (LibHalContext *ctx, const char *udi, const char *capability, DBusError *error); @@ -2629,9 +2626,9 @@ Returns : TRUE if the device has the capability, otherwise FALSE - -<anchor id="libhal-find-device-by-capability" role="function"/>libhal_find_device_by_capability () -libhal_find_device_by_capabilitychar** libhal_find_device_by_capability (LibHalContext *ctx, + +libhal_find_device_by_capability () +libhal_find_device_by_capabilitychar** libhal_find_device_by_capability (LibHalContext *ctx, const char *capability, int *num_devices, DBusError *error); @@ -2655,9 +2652,9 @@ Returns : UDI of devices; free with libhal_free_string_array() - -<anchor id="libhal-device-property-watch-all" role="function"/>libhal_device_property_watch_all () -libhal_device_property_watch_alldbus_bool_t libhal_device_property_watch_all (LibHalContext *ctx, + +libhal_device_property_watch_all () +libhal_device_property_watch_alldbus_bool_t libhal_device_property_watch_all (LibHalContext *ctx, DBusError *error); Watch all devices, ie. the device_property_changed callback is @@ -2674,9 +2671,9 @@ Returns : TRUE only if the operation succeeded - -<anchor id="libhal-device-add-property-watch" role="function"/>libhal_device_add_property_watch () -libhal_device_add_property_watchdbus_bool_t libhal_device_add_property_watch (LibHalContext *ctx, + +libhal_device_add_property_watch () +libhal_device_add_property_watchdbus_bool_t libhal_device_add_property_watch (LibHalContext *ctx, const char *udi, DBusError *error); @@ -2701,9 +2698,9 @@ Returns : TRUE only if the operation succeeded - -<anchor id="libhal-device-remove-property-watch" role="function"/>libhal_device_remove_property_watch () -libhal_device_remove_property_watchdbus_bool_t libhal_device_remove_property_watch (LibHalContext *ctx, + +libhal_device_remove_property_watch () +libhal_device_remove_property_watchdbus_bool_t libhal_device_remove_property_watch (LibHalContext *ctx, const char *udi, DBusError *error); @@ -2723,9 +2720,9 @@ Returns : TRUE only if the operation succeeded - -<anchor id="libhal-device-lock" role="function"/>libhal_device_lock () -libhal_device_lockdbus_bool_t libhal_device_lock (LibHalContext *ctx, + +libhal_device_lock () +libhal_device_lockdbus_bool_t libhal_device_lock (LibHalContext *ctx, const char *udi, const char *reason_to_lock, char **reason_why_locked, @@ -2753,9 +2750,9 @@ Returns : TRUE if the lock was obtained, FALSE otherwise - -<anchor id="libhal-device-unlock" role="function"/>libhal_device_unlock () -libhal_device_unlockdbus_bool_t libhal_device_unlock (LibHalContext *ctx, + +libhal_device_unlock () +libhal_device_unlockdbus_bool_t libhal_device_unlock (LibHalContext *ctx, const char *udi, DBusError *error); @@ -2776,9 +2773,9 @@ FALSE otherwise - -<anchor id="libhal-device-rescan" role="function"/>libhal_device_rescan () -libhal_device_rescandbus_bool_t libhal_device_rescan (LibHalContext *ctx, + +libhal_device_rescan () +libhal_device_rescandbus_bool_t libhal_device_rescan (LibHalContext *ctx, const char *udi, DBusError *error); @@ -2798,9 +2795,9 @@ Returns : Whether the operation succeeded - -<anchor id="libhal-device-reprobe" role="function"/>libhal_device_reprobe () -libhal_device_reprobedbus_bool_t libhal_device_reprobe (LibHalContext *ctx, + +libhal_device_reprobe () +libhal_device_reprobedbus_bool_t libhal_device_reprobe (LibHalContext *ctx, const char *udi, DBusError *error); @@ -2820,9 +2817,9 @@ Returns : Whether the operation succeeded - -<anchor id="libhal-device-emit-condition" role="function"/>libhal_device_emit_condition () -libhal_device_emit_conditiondbus_bool_t libhal_device_emit_condition (LibHalContext *ctx, + +libhal_device_emit_condition () +libhal_device_emit_conditiondbus_bool_t libhal_device_emit_condition (LibHalContext *ctx, const char *udi, const char *condition_name, const char *condition_details, @@ -2851,9 +2848,9 @@ FALSE otherwise - -<anchor id="libhal-device-claim-interface" role="function"/>libhal_device_claim_interface () -libhal_device_claim_interfacedbus_bool_t libhal_device_claim_interface (LibHalContext *ctx, + +libhal_device_claim_interface () +libhal_device_claim_interfacedbus_bool_t libhal_device_claim_interface (LibHalContext *ctx, const char *udi, const char *interface_name, const char *introspection_xml, @@ -2883,9 +2880,9 @@ Returns : TRUE if interface was claimed, FALSE otherwise - -<anchor id="libhal-device-addon-is-ready" role="function"/>libhal_device_addon_is_ready () -libhal_device_addon_is_readydbus_bool_t libhal_device_addon_is_ready (LibHalContext *ctx, + +libhal_device_addon_is_ready () +libhal_device_addon_is_readydbus_bool_t libhal_device_addon_is_ready (LibHalContext *ctx, const char *udi, DBusError *error); @@ -2909,9 +2906,9 @@ Returns : TRUE if the HAL daemon received the message, FALSE otherwise - -<anchor id="libhal-device-singleton-addon-is-ready" role="function"/>libhal_device_singleton_addon_is_ready () -libhal_device_singleton_addon_is_readydbus_bool_t libhal_device_singleton_addon_is_ready + +libhal_device_singleton_addon_is_ready () +libhal_device_singleton_addon_is_readydbus_bool_t libhal_device_singleton_addon_is_ready (LibHalContext *ctx, const char *command_line, DBusError *error); @@ -2936,9 +2933,9 @@ Returns : TRUE if the HAL daemon received the message, FALSE otherwise - -<anchor id="libhal-device-acquire-interface-lock" role="function"/>libhal_device_acquire_interface_lock () -libhal_device_acquire_interface_lockdbus_bool_t libhal_device_acquire_interface_lock + +libhal_device_acquire_interface_lock () +libhal_device_acquire_interface_lockdbus_bool_t libhal_device_acquire_interface_lock (LibHalContext *ctx, const char *udi, const char *interface, @@ -2967,9 +2964,9 @@ Returns : TRUE iff the lock was acquired - -<anchor id="libhal-device-release-interface-lock" role="function"/>libhal_device_release_interface_lock () -libhal_device_release_interface_lockdbus_bool_t libhal_device_release_interface_lock + +libhal_device_release_interface_lock () +libhal_device_release_interface_lockdbus_bool_t libhal_device_release_interface_lock (LibHalContext *ctx, const char *udi, const char *interface, @@ -2994,9 +2991,9 @@ Returns : TRUE iff the lock was released. - -<anchor id="libhal-acquire-global-interface-lock" role="function"/>libhal_acquire_global_interface_lock () -libhal_acquire_global_interface_lockdbus_bool_t libhal_acquire_global_interface_lock + +libhal_acquire_global_interface_lock () +libhal_acquire_global_interface_lockdbus_bool_t libhal_acquire_global_interface_lock (LibHalContext *ctx, const char *interface, dbus_bool_t exclusive, @@ -3021,9 +3018,9 @@ Returns : TRUE iff the lock was acquired - -<anchor id="libhal-release-global-interface-lock" role="function"/>libhal_release_global_interface_lock () -libhal_release_global_interface_lockdbus_bool_t libhal_release_global_interface_lock + +libhal_release_global_interface_lock () +libhal_release_global_interface_lockdbus_bool_t libhal_release_global_interface_lock (LibHalContext *ctx, const char *interface, DBusError *error); @@ -3044,9 +3041,9 @@ Returns : TRUE iff the lock was released - -<anchor id="libhal-device-is-caller-locked-out" role="function"/>libhal_device_is_caller_locked_out () -libhal_device_is_caller_locked_outdbus_bool_t libhal_device_is_caller_locked_out (LibHalContext *ctx, + +libhal_device_is_caller_locked_out () +libhal_device_is_caller_locked_outdbus_bool_t libhal_device_is_caller_locked_out (LibHalContext *ctx, const char *udi, const char *interface, const char *caller, @@ -3076,9 +3073,9 @@ Returns : Whether the given caller is locked out - -<anchor id="libhal-device-is-locked-by-others" role="function"/>libhal_device_is_locked_by_others () -libhal_device_is_locked_by_othersdbus_bool_t libhal_device_is_locked_by_others (LibHalContext *ctx, + +libhal_device_is_locked_by_others () +libhal_device_is_locked_by_othersdbus_bool_t libhal_device_is_locked_by_others (LibHalContext *ctx, const char *udi, const char *interface, DBusError *error); @@ -3102,9 +3099,9 @@ Returns : If another process is holding a lock on the device - -<anchor id="libhal-device-is-caller-privileged" role="function"/>libhal_device_is_caller_privileged () -libhal_device_is_caller_privilegedchar* libhal_device_is_caller_privileged (LibHalContext *ctx, + +libhal_device_is_caller_privileged () +libhal_device_is_caller_privilegedchar* libhal_device_is_caller_privileged (LibHalContext *ctx, const char *udi, const char *action, const char *caller, @@ -3143,6 +3140,4 @@ - - --- hal-0.5.11~rc2.orig/doc/api/libhal/xml/object_index.sgml +++ hal-0.5.11~rc2/doc/api/libhal/xml/object_index.sgml @@ -0,0 +1,8 @@ + + + + + + + + --- hal-0.5.11~rc2.orig/doc/api/libhal/libhal-decl.txt +++ hal-0.5.11~rc2/doc/api/libhal/libhal-decl.txt @@ -0,0 +1,1332 @@ + +DBUS_API_SUBJECT_TO_CHANGE +#define DBUS_API_SUBJECT_TO_CHANGE + + +LIBHAL_DEPRECATED +#define LIBHAL_DEPRECATED __attribute__ ((deprecated)) + + +LIBHAL_DEPRECATED +#define LIBHAL_DEPRECATED + + +LIBHAL_FREE_DBUS_ERROR +#define LIBHAL_FREE_DBUS_ERROR(_dbus_error_) \ + do { \ + if (dbus_error_is_set(_dbus_error_)) \ + dbus_error_free (_dbus_error_); \ + } while (0) + + +LIBHAL_CHECK_LIBHALCONTEXT +#define LIBHAL_CHECK_LIBHALCONTEXT(_ctx_, _ret_) \ + do { \ + if (_ctx_ == NULL) { \ + fprintf (stderr, \ + "%s %d : LibHalContext *ctx is NULL\n", \ + __FILE__, __LINE__); \ + return _ret_; \ + } \ + } while(0) + + +LibHalPropertyType +typedef enum { + /** Used to report error condition */ + LIBHAL_PROPERTY_TYPE_INVALID = DBUS_TYPE_INVALID, + + /** Type for 32-bit signed integer property */ + LIBHAL_PROPERTY_TYPE_INT32 = DBUS_TYPE_INT32, + + /** Type for 64-bit unsigned integer property */ + LIBHAL_PROPERTY_TYPE_UINT64 = DBUS_TYPE_UINT64, + + /** Type for double precision floating point property */ + LIBHAL_PROPERTY_TYPE_DOUBLE = DBUS_TYPE_DOUBLE, + + /** Type for boolean property */ + LIBHAL_PROPERTY_TYPE_BOOLEAN = DBUS_TYPE_BOOLEAN, + + /** Type for UTF-8 string property */ + LIBHAL_PROPERTY_TYPE_STRING = DBUS_TYPE_STRING, + + /** Type for list of UTF-8 strings property */ + LIBHAL_PROPERTY_TYPE_STRLIST = ((int) (DBUS_TYPE_STRING<<8)+('l')) +} LibHalPropertyType; + + +LibHalContext +typedef struct LibHalContext_s LibHalContext; + + +LibHalProperty +typedef struct LibHalProperty_s LibHalProperty; + + +LibHalPropertySet +typedef struct LibHalPropertySet_s LibHalPropertySet; + + +LibHalIntegrateDBusIntoMainLoop +void +LibHalContext *ctx, + DBusConnection *dbus_connection + + +LibHalDeviceAdded +void +LibHalContext *ctx, + const char *udi + + +LibHalDeviceRemoved +void +LibHalContext *ctx, + const char *udi + + +LibHalDeviceNewCapability +void +LibHalContext *ctx, + const char *udi, + const char *capability + + +LibHalDeviceLostCapability +void +LibHalContext *ctx, + const char *udi, + const char *capability + + +LibHalDevicePropertyModified +void +LibHalContext *ctx, + const char *udi, + const char *key, + dbus_bool_t is_removed, + dbus_bool_t is_added + + +LibHalDeviceCondition +void +LibHalContext *ctx, + const char *udi, + const char *condition_name, + const char *condition_detail + + +LibHalGlobalInterfaceLockAcquired +void +LibHalContext *ctx, + const char *interface_name, + const char *lock_owner, + int num_locks + + +LibHalGlobalInterfaceLockReleased +void +LibHalContext *ctx, + const char *interface_name, + const char *lock_owner, + int num_locks + + +LibHalInterfaceLockAcquired +void +LibHalContext *ctx, + const char *udi, + const char *interface_name, + const char *lock_owner, + int num_locks + + +LibHalInterfaceLockReleased +void +LibHalContext *ctx, + const char *udi, + const char *interface_name, + const char *lock_owner, + int num_locks + + +LibHalSingletonDeviceAdded +void +LibHalContext *ctx, + const char *udi, + const LibHalPropertySet *properties + + +LibHalSingletonDeviceRemoved +void +LibHalContext *ctx, + const char *udi, + const LibHalPropertySet *properties + + +libhal_ctx_new +LibHalContext * +void + + +libhal_ctx_set_cache +dbus_bool_t +LibHalContext *ctx, dbus_bool_t use_cache + + +libhal_ctx_set_dbus_connection +dbus_bool_t +LibHalContext *ctx, DBusConnection *conn + + +libhal_ctx_get_dbus_connection +DBusConnection * +LibHalContext *ctx + + +libhal_ctx_set_user_data +dbus_bool_t +LibHalContext *ctx, void *user_data + + +libhal_ctx_get_user_data +void* +LibHalContext *ctx + + +libhal_ctx_set_device_added +dbus_bool_t +LibHalContext *ctx, LibHalDeviceAdded callback + + +libhal_ctx_set_device_removed +dbus_bool_t +LibHalContext *ctx, LibHalDeviceRemoved callback + + +libhal_ctx_set_device_new_capability +dbus_bool_t +LibHalContext *ctx, LibHalDeviceNewCapability callback + + +libhal_ctx_set_device_lost_capability +dbus_bool_t +LibHalContext *ctx, LibHalDeviceLostCapability callback + + +libhal_ctx_set_device_property_modified +dbus_bool_t +LibHalContext *ctx, LibHalDevicePropertyModified callback + + +libhal_ctx_set_device_condition +dbus_bool_t +LibHalContext *ctx, LibHalDeviceCondition callback + + +libhal_ctx_set_global_interface_lock_acquired +dbus_bool_t +LibHalContext *ctx, LibHalGlobalInterfaceLockAcquired callback + + +libhal_ctx_set_global_interface_lock_released +dbus_bool_t +LibHalContext *ctx, LibHalGlobalInterfaceLockReleased callback + + +libhal_ctx_set_interface_lock_acquired +dbus_bool_t +LibHalContext *ctx, LibHalInterfaceLockAcquired callback + + +libhal_ctx_set_interface_lock_released +dbus_bool_t +LibHalContext *ctx, LibHalInterfaceLockReleased callback + + +libhal_ctx_set_singleton_device_added +dbus_bool_t +LibHalContext *ctx, LibHalSingletonDeviceAdded callback + + +libhal_ctx_set_singleton_device_removed +dbus_bool_t +LibHalContext *ctx, LibHalSingletonDeviceRemoved callback + + +libhal_ctx_init +dbus_bool_t +LibHalContext *ctx, DBusError *error + + +libhal_ctx_shutdown +dbus_bool_t +LibHalContext *ctx, DBusError *error + + +libhal_ctx_free +dbus_bool_t +LibHalContext *ctx + + +libhal_ctx_init_direct +LibHalContext * +DBusError *error + + +libhal_get_all_devices +char ** +LibHalContext *ctx, int *num_devices, DBusError *error + + +libhal_device_exists +dbus_bool_t +LibHalContext *ctx, const char *udi, DBusError *error + + +libhal_device_print +dbus_bool_t +LibHalContext *ctx, const char *udi, DBusError *error + + +libhal_device_property_exists +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *key,DBusError *error + + +libhal_device_get_property_string +char * +LibHalContext *ctx,const char *udi,const char *key,DBusError *error + + +libhal_device_get_property_int +dbus_int32_t +LibHalContext *ctx,const char *udi,const char *key,DBusError *error + + +libhal_device_get_property_uint64 +dbus_uint64_t +LibHalContext *ctx,const char *udi,const char *key,DBusError *error + + +libhal_device_get_property_double +double +LibHalContext *ctx,const char *udi,const char *key,DBusError *error + + +libhal_device_get_property_bool +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *key,DBusError *error + + +libhal_device_get_property_strlist +char ** +LibHalContext *ctx,const char *udi,const char *key,DBusError *error + + +libhal_device_set_property_string +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *key,const char *value,DBusError *error + + +libhal_device_set_property_int +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *key,dbus_int32_t value,DBusError *error + + +libhal_device_set_property_uint64 +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *key,dbus_uint64_t value,DBusError *error + + +libhal_device_set_property_double +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *key,double value,DBusError *error + + +libhal_device_set_property_bool +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *key,dbus_bool_t value,DBusError *error + + +libhal_device_property_strlist_append +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *key,const char *value,DBusError *error + + +libhal_device_property_strlist_prepend +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *key,const char *value,DBusError *error + + +libhal_device_property_strlist_remove_index +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *key,unsigned int idx,DBusError *error + + +libhal_device_property_strlist_remove +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *key,const char *value,DBusError *error + + +libhal_device_remove_property +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *key,DBusError *error + + +libhal_device_get_property_type +LibHalPropertyType +LibHalContext *ctx,const char *udi,const char *key,DBusError *error + + +LibHalChangeSet_s +struct LibHalChangeSet_s; + + +LibHalChangeSet +typedef struct LibHalChangeSet_s LibHalChangeSet; + + +libhal_device_new_changeset +LibHalChangeSet * +const char *udi + + +libhal_changeset_set_property_string +dbus_bool_t +LibHalChangeSet *changeset,const char *key,const char *value + + +libhal_changeset_set_property_int +dbus_bool_t +LibHalChangeSet *changeset,const char *key,dbus_int32_t value + + +libhal_changeset_set_property_uint64 +dbus_bool_t +LibHalChangeSet *changeset,const char *key,dbus_uint64_t value + + +libhal_changeset_set_property_double +dbus_bool_t +LibHalChangeSet *changeset,const char *key,double value + + +libhal_changeset_set_property_bool +dbus_bool_t +LibHalChangeSet *changeset,const char *key,dbus_bool_t value + + +libhal_changeset_set_property_strlist +dbus_bool_t +LibHalChangeSet *changeset,const char *key,const char **value + + +libhal_device_commit_changeset +dbus_bool_t +LibHalContext *ctx,LibHalChangeSet *changeset,DBusError *error + + +libhal_device_free_changeset +void +LibHalChangeSet *changeset + + +libhal_device_get_all_properties +LibHalPropertySet * +LibHalContext *ctx,const char *udi,DBusError *error + + +libhal_get_all_devices_with_properties +dbus_bool_t +LibHalContext *ctx,int *out_num_devices,char ***out_udi,LibHalPropertySet ***out_properties,DBusError *error + + +libhal_property_set_sort +void +LibHalPropertySet *set + + +libhal_free_property_set +void +LibHalPropertySet *set + + +libhal_property_set_get_num_elems +unsigned int +LibHalPropertySet *set + + +libhal_ps_get_type +LibHalPropertyType +const LibHalPropertySet *set, const char *key + + +libhal_ps_get_string +const char * +const LibHalPropertySet *set, const char *key + + +libhal_ps_get_int32 +dbus_int32_t +const LibHalPropertySet *set, const char *key + + +libhal_ps_get_uint64 +dbus_uint64_t +const LibHalPropertySet *set, const char *key + + +libhal_ps_get_double +double +const LibHalPropertySet *set, const char *key + + +libhal_ps_get_bool +dbus_bool_t +const LibHalPropertySet *set, const char *key + + +LibHalPropertySetIterator +typedef struct LibHalPropertySetIterator_s LibHalPropertySetIterator; + + +libhal_psi_init +void +LibHalPropertySetIterator *iter, LibHalPropertySet *set + + +libhal_psi_has_more +dbus_bool_t +LibHalPropertySetIterator *iter + + +libhal_psi_next +void +LibHalPropertySetIterator *iter + + +libhal_psi_get_type +LibHalPropertyType +LibHalPropertySetIterator *iter + + +libhal_psi_get_key +char * +LibHalPropertySetIterator *iter + + +libhal_psi_get_string +char * +LibHalPropertySetIterator *iter + + +libhal_psi_get_int +dbus_int32_t +LibHalPropertySetIterator *iter + + +libhal_psi_get_uint64 +dbus_uint64_t +LibHalPropertySetIterator *iter + + +libhal_psi_get_double +double +LibHalPropertySetIterator *iter + + +libhal_psi_get_bool +dbus_bool_t +LibHalPropertySetIterator *iter + + +libhal_psi_get_strlist +char ** +LibHalPropertySetIterator *iter + + +libhal_string_array_length +unsigned int +char **str_array + + +libhal_free_string_array +void +char **str_array + + +libhal_free_string +void +char *str + + +libhal_new_device +char * +LibHalContext *ctx, DBusError *error + + +libhal_device_commit_to_gdl +dbus_bool_t +LibHalContext *ctx,const char *temp_udi,const char *udi,DBusError *error + + +libhal_remove_device +dbus_bool_t +LibHalContext *ctx,const char *udi,DBusError *error + + +libhal_merge_properties +dbus_bool_t +LibHalContext *ctx,const char *target_udi,const char *source_udi,DBusError *error + + +libhal_device_matches +dbus_bool_t +LibHalContext *ctx,const char *udi1,const char *udi2,const char *property_namespace,DBusError *error + + +libhal_manager_find_device_string_match +char ** +LibHalContext *ctx,const char *key,const char *value,int *num_devices,DBusError *error + + +libhal_device_add_capability +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *capability,DBusError *error + + +libhal_device_query_capability +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *capability,DBusError *error + + +libhal_find_device_by_capability +char ** +LibHalContext *ctx,const char *capability,int *num_devices,DBusError *error + + +libhal_device_property_watch_all +dbus_bool_t +LibHalContext *ctx,DBusError *error + + +libhal_device_add_property_watch +dbus_bool_t +LibHalContext *ctx,const char *udi,DBusError *error + + +libhal_device_remove_property_watch +dbus_bool_t +LibHalContext *ctx,const char *udi,DBusError *error + + +libhal_device_lock +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *reason_to_lock,char **reason_why_locked,DBusError *error + + +libhal_device_unlock +dbus_bool_t +LibHalContext *ctx,const char *udi,DBusError *error + + +libhal_device_rescan +dbus_bool_t +LibHalContext *ctx,const char *udi,DBusError *error + + +libhal_device_reprobe +dbus_bool_t +LibHalContext *ctx,const char *udi,DBusError *error + + +libhal_device_emit_condition +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *condition_name,const char *condition_details,DBusError *error + + +libhal_device_claim_interface +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *interface_name,const char *introspection_xml,DBusError *error + + +libhal_device_addon_is_ready +dbus_bool_t +LibHalContext *ctx, const char *udi, DBusError *error + + +libhal_device_singleton_addon_is_ready +dbus_bool_t +LibHalContext *ctx, const char *command_line, DBusError *error + + +libhal_device_acquire_interface_lock +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *interface,dbus_bool_t exclusive,DBusError *error + + +libhal_device_release_interface_lock +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *interface,DBusError *error + + +libhal_acquire_global_interface_lock +dbus_bool_t +LibHalContext *ctx,const char *interface,dbus_bool_t exclusive,DBusError *error + + +libhal_release_global_interface_lock +dbus_bool_t +LibHalContext *ctx,const char *interface,DBusError *error + + +libhal_device_is_caller_locked_out +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *interface,const char *caller,DBusError *error + + +libhal_device_is_locked_by_others +dbus_bool_t +LibHalContext *ctx,const char *udi,const char *interface,DBusError *error + + +libhal_device_is_caller_privileged +char* +LibHalContext *ctx,const char *udi,const char *action,const char *caller,DBusError *error + + +uthash_fatal +#define uthash_fatal(msg) exit(-1) /* fatal error (out of memory,etc) */ + + +uthash_bkt_malloc +#define uthash_bkt_malloc(sz) malloc(sz) /* malloc fcn for UT_hash_bucket's */ + + +uthash_bkt_free +#define uthash_bkt_free(ptr) free(ptr) /* free fcn for UT_hash_bucket's */ + + +uthash_tbl_malloc +#define uthash_tbl_malloc(sz) malloc(sz) /* malloc fcn for UT_hash_table */ + + +uthash_tbl_free +#define uthash_tbl_free(ptr) free(ptr) /* free fcn for UT_hash_table */ + + +uthash_noexpand_fyi +#define uthash_noexpand_fyi(tbl) /* can be defined to log noexpand */ + + +uthash_expand_fyi +#define uthash_expand_fyi(tbl) /* can be defined to log expands */ + + +HASH_INITIAL_NUM_BUCKETS +#define HASH_INITIAL_NUM_BUCKETS 32 /* initial number of buckets */ + + +HASH_BKT_CAPACITY_THRESH +#define HASH_BKT_CAPACITY_THRESH 10 /* expand when bucket count reaches */ + + +HASH_FIND +#define HASH_FIND(hh,head,keyptr,keylen_in,out) \ +do { \ + out=head; \ + if (head) { \ + (head)->hh.tbl->key = (char*)(keyptr); \ + (head)->hh.tbl->keylen = keylen_in; \ + HASH_FCN((head)->hh.tbl->key,(head)->hh.tbl->keylen, \ + (head)->hh.tbl->num_buckets,(head)->hh.tbl->bkt, \ + (head)->hh.tbl->i, (head)->hh.tbl->j,(head)->hh.tbl->k); \ + HASH_FIND_IN_BKT(hh, (head)->hh.tbl->buckets[ (head)->hh.tbl->bkt], \ + keyptr,keylen_in,out); \ + } \ +} while (0) + + +HASH_ADD +#define HASH_ADD(hh,head,fieldname,keylen_in,add) \ + HASH_ADD_KEYPTR(hh,head,&add->fieldname,keylen_in,add) + + +HASH_ADD_KEYPTR +#define HASH_ADD_KEYPTR(hh,head,keyptr,keylen_in,add) \ +do { \ + add->hh.next = NULL; \ + add->hh.key = (char*)keyptr; \ + add->hh.keylen = keylen_in; \ + add->hh.elmt = add; \ + if (!(head)) { \ + head = add; \ + (head)->hh.prev = NULL; \ + (head)->hh.tbl = (UT_hash_table*)uthash_tbl_malloc( \ + sizeof(UT_hash_table)); \ + if (!((head)->hh.tbl)) { uthash_fatal( "out of memory"); } \ + (head)->hh.tbl->name = #head; \ + (head)->hh.tbl->tail = &(add->hh); \ + (head)->hh.tbl->noexpand = 0; \ + (head)->hh.tbl->hash_q = 1<<16; \ + (head)->hh.tbl->num_buckets = HASH_INITIAL_NUM_BUCKETS; \ + (head)->hh.tbl->num_items = 0; \ + (head)->hh.tbl->hho = ((long)(&add->hh) - (long)(add)); \ + (head)->hh.tbl->buckets = (UT_hash_bucket*)uthash_bkt_malloc( \ + HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket)); \ + if (! (head)->hh.tbl->buckets) { uthash_fatal( "out of memory"); } \ + memset((head)->hh.tbl->buckets, 0, \ + HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket)); \ + } else { \ + (head)->hh.tbl->tail->next = add; \ + add->hh.prev = (head)->hh.tbl->tail->elmt; \ + (head)->hh.tbl->tail = &(add->hh); \ + } \ + (head)->hh.tbl->num_items++; \ + add->hh.tbl = (head)->hh.tbl; \ + (head)->hh.tbl->key = (char*)keyptr; \ + (head)->hh.tbl->keylen = keylen_in; \ + HASH_FCN((head)->hh.tbl->key,(head)->hh.tbl->keylen, \ + (head)->hh.tbl->num_buckets, \ + (head)->hh.tbl->bkt, \ + (head)->hh.tbl->i, (head)->hh.tbl->j, (head)->hh.tbl->k ); \ + HASH_ADD_TO_BKT(hh,(head)->hh.tbl->buckets[(head)->hh.tbl->bkt],add); \ + HASH_EMIT_KEY(hh,head,keyptr,keylen_in); \ + HASH_FSCK(head); \ +} while(0) + + +HASH_DELETE +#define HASH_DELETE(hh,head,delptr) \ +do { \ + if ( ((delptr)->hh.prev == NULL) && ((delptr)->hh.next == NULL) ) { \ + uthash_bkt_free((head)->hh.tbl->buckets ); \ + uthash_tbl_free((head)->hh.tbl); \ + head = NULL; \ + } else { \ + if ((delptr) == (head)->hh.tbl->tail->elmt) { \ + (head)->hh.tbl->tail = (void*)(((long)((delptr)->hh.prev)) + \ + (head)->hh.tbl->hho); \ + } \ + if ((delptr)->hh.prev) { \ + ((UT_hash_handle*)(((long)((delptr)->hh.prev)) + \ + (head)->hh.tbl->hho))->next = (delptr)->hh.next; \ + } else { \ + head = (delptr)->hh.next; \ + } \ + if ((delptr)->hh.next) { \ + ((UT_hash_handle*)(((long)((delptr)->hh.next)) + \ + (head)->hh.tbl->hho))->prev = (delptr)->hh.prev; \ + } \ + (head)->hh.tbl->key = (char*)((delptr)->hh.key); \ + (head)->hh.tbl->keylen = (delptr)->hh.keylen; \ + HASH_FCN((head)->hh.tbl->key,(head)->hh.tbl->keylen, \ + (head)->hh.tbl->num_buckets,(head)->hh.tbl->bkt, \ + (head)->hh.tbl->i,(head)->hh.tbl->j,(head)->hh.tbl->k ); \ + HASH_DEL_IN_BKT(hh,(head)->hh.tbl->buckets[(head)->hh.tbl->bkt], \ + delptr); \ + (head)->hh.tbl->num_items--; \ + } \ + HASH_FSCK(head); \ +} while (0) + + +HASH_FIND_STR +#define HASH_FIND_STR(head,findstr,out) \ + HASH_FIND(hh,head,findstr,strlen(findstr),out) + + +HASH_ADD_STR +#define HASH_ADD_STR(head,strfield,add) \ + HASH_ADD(hh,head,strfield,strlen(add->strfield),add) + + +HASH_FIND_INT +#define HASH_FIND_INT(head,findint,out) \ + HASH_FIND(hh,head,findint,sizeof(int),out) + + +HASH_ADD_INT +#define HASH_ADD_INT(head,intfield,add) \ + HASH_ADD(hh,head,intfield,sizeof(int),add) + + +HASH_DEL +#define HASH_DEL(head,delptr) \ + HASH_DELETE(hh,head,delptr) + + +HASH_OOPS +#define HASH_OOPS(...) do { fprintf(stderr,__VA_ARGS__); exit(-1); } while (0) + + +HASH_FSCK +#define HASH_FSCK(head) \ +do { \ + if (head) { \ + (head)->hh.tbl->keylen = 0; /* item counter */ \ + for( (head)->hh.tbl->bkt_i = 0; \ + (head)->hh.tbl->bkt_i < (head)->hh.tbl->num_buckets; \ + (head)->hh.tbl->bkt_i++) \ + { \ + (head)->hh.tbl->bkt_ideal = 0; /* bkt item counter */ \ + (head)->hh.tbl->hh = \ + (head)->hh.tbl->buckets[(head)->hh.tbl->bkt_i].hh_head; \ + (head)->hh.tbl->key = NULL; /* hh_prev */ \ + while ((head)->hh.tbl->hh) { \ + if ((head)->hh.tbl->key != \ + (char*)((head)->hh.tbl->hh->hh_prev)) { \ + HASH_OOPS("invalid hh_prev %x, actual %x\n", \ + (head)->hh.tbl->hh->hh_prev, \ + (head)->hh.tbl->key ); \ + } \ + (head)->hh.tbl->bkt_ideal++; \ + (head)->hh.tbl->key = (char*)((head)->hh.tbl->hh); \ + (head)->hh.tbl->hh = (head)->hh.tbl->hh->hh_next; \ + } \ + (head)->hh.tbl->keylen += (head)->hh.tbl->bkt_ideal; \ + if ((head)->hh.tbl->buckets[(head)->hh.tbl->bkt_i].count \ + != (head)->hh.tbl->bkt_ideal) { \ + HASH_OOPS("invalid bucket count %d, actual %d\n", \ + (head)->hh.tbl->buckets[(head)->hh.tbl->bkt_i].count, \ + (head)->hh.tbl->bkt_ideal); \ + } \ + } \ + if ((head)->hh.tbl->keylen != (head)->hh.tbl->num_items) { \ + HASH_OOPS("invalid hh item count %d, actual %d\n", \ + (head)->hh.tbl->num_items, (head)->hh.tbl->keylen ); \ + } \ + /* traverse hh in app order; check next/prev integrity, count */ \ + (head)->hh.tbl->keylen = 0; /* item counter */ \ + (head)->hh.tbl->key = NULL; /* app prev */ \ + (head)->hh.tbl->hh = &(head)->hh; \ + while ((head)->hh.tbl->hh) { \ + (head)->hh.tbl->keylen++; \ + if ((head)->hh.tbl->key !=(char*)((head)->hh.tbl->hh->prev)) {\ + HASH_OOPS("invalid prev %x, actual %x\n", \ + (head)->hh.tbl->hh->prev, \ + (head)->hh.tbl->key ); \ + } \ + (head)->hh.tbl->key = (head)->hh.tbl->hh->elmt; \ + (head)->hh.tbl->hh = ( (head)->hh.tbl->hh->next ? \ + (UT_hash_handle*)((long)((head)->hh.tbl->hh->next) + \ + (head)->hh.tbl->hho) \ + : NULL ); \ + } \ + if ((head)->hh.tbl->keylen != (head)->hh.tbl->num_items) { \ + HASH_OOPS("invalid app item count %d, actual %d\n", \ + (head)->hh.tbl->num_items, (head)->hh.tbl->keylen ); \ + } \ + } \ +} while (0) + + +HASH_FSCK +#define HASH_FSCK(head) + + +HASH_EMIT_KEY +#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen) \ + (head)->hh.tbl->keylen = fieldlen; \ + write(HASH_EMIT_KEYS, &((head)->hh.tbl->keylen), sizeof(int)); \ + write(HASH_EMIT_KEYS, keyptr, fieldlen); + + +HASH_EMIT_KEY +#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen) + + +HASH_FCN +#define HASH_FCN HASH_FUNCTION + + +HASH_FCN +#define HASH_FCN HASH_JEN + + +HASH_BER +#define HASH_BER(key,keylen,num_bkts,bkt,i,j,k) \ + bkt = 0; \ + while (keylen--) bkt = (bkt * 33) + *key++; \ + bkt &= (num_bkts-1); + + +HASH_SAX +#define HASH_SAX(key,keylen,num_bkts,bkt,i,j,k) \ + bkt = 0; \ + for(i=0; i < keylen; i++) \ + bkt ^= (bkt << 5) + (bkt >> 2) + key[i]; \ + bkt &= (num_bkts-1); + + +HASH_FNV +#define HASH_FNV(key,keylen,num_bkts,bkt,i,j,k) \ + bkt = 2166136261UL; \ + for(i=0; i < keylen; i++) \ + bkt = (bkt * 16777619) ^ key[i]; \ + bkt &= (num_bkts-1); + + +HASH_OAT +#define HASH_OAT(key,keylen,num_bkts,bkt,i,j,k) \ + bkt = 0; \ + for(i=0; i < keylen; i++) { \ + bkt += key[i]; \ + bkt += (bkt << 10); \ + bkt ^= (bkt >> 6); \ + } \ + bkt += (bkt << 3); \ + bkt ^= (bkt >> 11); \ + bkt += (bkt << 15); \ + bkt &= (num_bkts-1); + + +HASH_JEN_MIX +#define HASH_JEN_MIX(a,b,c) \ +{ \ + a -= b; a -= c; a ^= ( c >> 13 ); \ + b -= c; b -= a; b ^= ( a << 8 ); \ + c -= a; c -= b; c ^= ( b >> 13 ); \ + a -= b; a -= c; a ^= ( c >> 12 ); \ + b -= c; b -= a; b ^= ( a << 16 ); \ + c -= a; c -= b; c ^= ( b >> 5 ); \ + a -= b; a -= c; a ^= ( c >> 3 ); \ + b -= c; b -= a; b ^= ( a << 10 ); \ + c -= a; c -= b; c ^= ( b >> 15 ); \ +} + + +HASH_JEN +#define HASH_JEN(key,keylen,num_bkts,bkt,i,j,k) \ + bkt = 0xfeedbeef; \ + i = j = 0x9e3779b9; \ + k = keylen; \ + while (k >= 12) { \ + i += (key[0] + ( (unsigned)key[1] << 8 ) \ + + ( (unsigned)key[2] << 16 ) \ + + ( (unsigned)key[3] << 24 ) ); \ + j += (key[4] + ( (unsigned)key[5] << 8 ) \ + + ( (unsigned)key[6] << 16 ) \ + + ( (unsigned)key[7] << 24 ) ); \ + bkt += (key[8] + ( (unsigned)key[9] << 8 ) \ + + ( (unsigned)key[10] << 16 ) \ + + ( (unsigned)key[11] << 24 ) ); \ + \ + HASH_JEN_MIX(i, j, bkt); \ + \ + key += 12; \ + k -= 12; \ + } \ + bkt += keylen; \ + switch ( k ) { \ + case 11: bkt += ( (unsigned)key[10] << 24 ); \ + case 10: bkt += ( (unsigned)key[9] << 16 ); \ + case 9: bkt += ( (unsigned)key[8] << 8 ); \ + case 8: j += ( (unsigned)key[7] << 24 ); \ + case 7: j += ( (unsigned)key[6] << 16 ); \ + case 6: j += ( (unsigned)key[5] << 8 ); \ + case 5: j += key[4]; \ + case 4: i += ( (unsigned)key[3] << 24 ); \ + case 3: i += ( (unsigned)key[2] << 16 ); \ + case 2: i += ( (unsigned)key[1] << 8 ); \ + case 1: i += key[0]; \ + } \ + HASH_JEN_MIX(i, j, bkt); \ + bkt &= (num_bkts-1); + + +HASH_JSW +#define HASH_JSW(key,keylen,num_bkts,bkt,i,j,k) \ + bkt = 16777551; \ + for(i=0; i < keylen; i++) { \ + bkt = (bkt << 1 | bkt >> 31) ^ \ + *(int*)((long)( \ + "\xe9\x81\x51\xe4\x84\x9d\x32\xd9\x2d\xda\xca\x94\xa7\x85\x1e" \ + "\x28\xfe\xa3\x18\x60\x28\x45\xa6\x48\x67\xdb\xd5\xa2\x91\x4d" \ + "\x1a\x2f\x97\x37\x82\xd8\xe9\x1c\xb7\x7b\x3c\xa5\x4c\x23\x2" \ + "\x42\x85\x20\x78\x6c\x6\x67\x6f\xa5\xcb\x53\x8c\xe1\x1f\x12" \ + "\x66\xcb\xa0\xbe\x47\x59\x8\x20\xd5\x31\xd9\xdc\xcc\x27\xc3" \ + "\x4d\x8\x9f\xb3\x50\x8\x90\x4f\x1f\x20\x60\xb8\xe2\x7b\x63" \ + "\x49\xc0\x64\xc7\xaf\xc9\x81\x9c\x5f\x7d\x45\xc5\xe4\xe4\x86" \ + "\xaf\x1a\x15\x6c\x9b\xc3\x7c\xc5\x88\x2b\xf3\xd9\x72\x76\x47" \ + "\x56\xe6\x8c\xd1\x6c\x94\x41\x59\x4d\xe2\xd7\x44\x9a\x55\x5e" \ + "\xee\x9d\x7c\x8f\x21\x57\x10\x77\xf7\x4b\xd8\x7e\xc0\x4d\xba" \ + "\x1f\x96\x2a\x60\x13\xae\xab\x58\x70\xe5\x23\x62\x2b\x63\xb6" \ + "\x42\x8e\x8f\x57\xf2\xfa\x47\x37\x91\xac\x11\x3d\x9a\x85\x73" \ + "\x9e\x39\x65\xc8\xd4\x5b\xaa\x35\x72\x5f\x40\x31\x9a\xb0\xdd" \ + "\xa9\x2c\x16\xa3\x32\xef\xcb\x8c\x80\x33\x60\xd\x85\xce\x22" \ + "\x8c\x28\x6\x7f\xff\xf6\x8a\x5f\x21\x8e\xf2\xd0\xd9\x63\x66" \ + "\x22\xe8\xe6\x3\x39\xfd\x10\x69\xce\x6c\xc4\xde\xf3\x87\x56" \ + "\xc8\x4a\x31\x51\x58\xc5\x62\x30\x8e\xd\xd5\x2f\x7c\x24\xca" \ + "\xd1\x12\x1b\x3a\x3e\x95\x99\xa\x7\xc1\x83\xd0\x4f\x97\x8c" \ + "\xf1\xb0\x9c\xd8\xb9\x72\xd7\x3e\x6b\x66\x83\x8e\xe9\x86\xad" \ + "\xfa\xc2\xe\x4\xb5\x7b\x5d\x0\xbc\x47\xbe\x4\x69\xfa\xd1" \ + "\x29\x5c\x77\x38\xfc\x88\xeb\xd5\xe1\x17\x54\xf6\xe5\xb3\xae" \ + "\xc7\x14\xb6\x4b\xa6\x42\x4b\xa3\xdf\xa5\xcf\xdb\xad\xcd\x2c" \ + "\xa3\x3\x13\xc0\x42\x5d\x6e\x3c\xfe\xd8\xeb\xa7\x96\x47\x2b" \ + "\x61\xb3\x70\xc9\x6d\xff\x1a\x82\x65\xdc\x92\x4b\x1a\x52\x75" \ + "\xa5\x61\x55\x2b\xe\x7\xde\x1e\x71\xc5\x12\x34\x59\x4f\x19" \ + "\x2\x9\xb6\x5\xe6\x7b\xad\xb6\x92\xfb\x84\x32\xf1\x45\x6c" \ + "\xec\x1a\xcb\x39\x32\x2\x47\x51\xd6\xc8\x9d\xd0\xb1\xdb\xa8" \ + "\x90\x4c\x65\x5a\x77\x1f\xca\x74\x8e\x3b\xce\x76\x55\x8b\x78" \ + "\x3c\xf3\x19\x8f\xe1\xc3\xa9\x8a\xc8\xf3\x14\x30\x4e\x77\xe9" \ + "\xd5\x6a\xcb\x96\x2f\x31\x35\xff\x6b\x10\x92\xf7\xc4\x33\xb8" \ + "\x76\x35\x6\xf\x82\x1c\xfa\x1f\x92\x47\xa1\xf9\x7e\xe5\x51" \ + "\xee\x63\xaa\x9a\x38\xa3\xa1\x86\xbf\xf0\xe8\x29\xe1\x19\x83" \ + "\xff\x36\x3c\x26\x15\x89\x36\x22\x93\x41\x3e\x63\x36\x34\x4c" \ + "\xda\x18\xd4\x18\xd8\xc8\x8a\x10\x1f\x14\x4c\x7f\x79\xfc\x46" \ + "\xbb\xc8\x24\x51\xc7\xe4\xfb\xc0\x78\xb1\xe9\xac\xf1\x3d\x55" \ + "\x51\x9c\x8\xf0\xa6\x3\xcb\x91\xc6\xf4\xe2\xd4\xe5\x18\x61" \ + "\xfc\x8f\x8a\xce\x89\x33\xcd\xf\x7d\x50\xa0\x7d\x3f\xac\x49" \ + "\xe1\x71\x92\xc7\x8d\xc0\xd0\x6e\xe4\xf7\xcd\xc1\x47\x9f\x99" \ + "\xd5\x7\x20\xad\x64\xdb\xab\x44\xd4\x8\xc6\x9a\xa4\xa7\x7c" \ + "\x9b\x13\xe4\x9c\x88\xec\xc4\xcb\xe1\x3f\x5\x5\xf\xd\x3a" \ + "\x75\xed\xfa\xc0\x23\x34\x74\xfd\xca\x1c\x74\x77\x29\xc8\xb6" \ + "\xe2\xbb\xa1\xa\x2e\xae\x65\x3e\xcb\xf5\x5e\xe0\x29\x4c\xfa" \ + "\xab\x35\xea\x7\x9f\xb3\x3b\x9c\x4e\x86\xe8\x5b\x76\x11\xf1" \ + "\xbf\x7f\x73\x34\x71\x9\x2d\x2a\x60\x8f\x14\x12\xba\x26\x84" \ + "\xb9\x94\xa9\x59\x38\x25\xfd\x77\xc3\xe5\x86\xc4\x3\xda\x32" \ + "\x30\xd8\x84\x81\x83\x14\x8c\x24\xee\x51\xa9\x92\x61\xb2\xeb" \ + "\xce\xac\x34\xc1\xad\x24\x74\xce\xf9\xce\x5c\xfd\x45\x69\x1d" \ + "\xc6\xc2\xaf\x7c\x8d\x5\x52\xb5\x88\x2f\x9f\xee\x6b\x5f\xbd" \ + "\xfe\x22\x6\x47\xa2\xc8\x25\x37\x67\x44\x4c\xe\xfe\x7e\x5a" \ + "\x36\x7f\x18\x83\x8f\x82\x87\x3b\xbf\xb8\xd2\x37\xff\x52\x60" \ + "\xb5\xf3\xd\x20\x80\xcc\xb2\x7a\xdd\xc2\x94\xbc\xe3\xb1\x87" \ + "\x3e\x49\x57\xcc\xe9\x5a\xea\xb4\xe\xdf\xa6\x8f\x70\x60\x32" \ + "\xb\x7d\x74\xf5\x46\xb6\x93\xc2\x5\x92\x72\xfc\xd9\xd2\xe5" \ + "\x90\x36\x2a\xd4\xf9\x50\x33\x52\xa5\xcc\xcf\x14\x9e\xdc\x4f" \ + "\xb7\x7d\xcf\x25\xdb\xc0\x46\xdb\xea\xe\x27\xc8\x18\x40\x39" \ + "\xbd\xec\x48\xa3\xfa\x87\xa3\x18\x68\xfc\x7a\x44\xa8\xc5\x8c" \ + "\x45\x81\x70\x72\x14\x70\xf9\x40\xc8\xe7\x41\xcb\xde\xd\x4e" \ + "\x35\x4d\xcd\xe2\x40\xa3\x2e\xbb\xb7\x50\x6c\x26\xb8\xbe\x2a" \ + "\x36\x8e\x23\xb\xa\xfe\xed\xa\xe7\xa0\x16\x73\xad\x24\x51" \ + "\x7f\xda\x9d\xd7\x9f\x18\xe6\xa8\xe4\x98\xbc\x62\x77\x55\x60" \ + "\x88\x16\x25\xbf\x95\xad\xea\xe1\x87\x18\x35\x9e\x7c\x51\xee" \ + "\xc0\x80\x8b\xb8\x37\xfd\x95\xfe\x87\x15\xf4\x97\xd5\x61\x4f" \ + "\x97\xfa\xaf\x48\xd\x5b\x84\x2d\xdb\x15\xf2\xb4\x17\x4f\x41" \ + "\x31\x58\x32\x93\xc1\x52\x34\xa6\x17\xd\x56\x5\xee\xfb\xfb" \ + "\x2d\x69\x14\xbe\x24\x94\x8\xb0\xfc\x9f\x2\x95\x88\x7d\xd6" \ + "\xe7\xa4\x5b\xbb\xf2\x7d\xd8\xa5\xd2\x7c\x9\x62\x22\x5\x53" \ + "\xd0\x67\xeb\x68\xfc\x82\x80\xf\xc9\x73\x76\x36\xb8\x13\x9f" \ + "\xb1\xf1\xee\x61\x12\xe7\x5d\x75\x65\xb8\x84\x17\xb\x7b\x28" \ + "\x4c\xb7\xda\xbb" ) \ + + ( (unsigned char)key[i] * sizeof(int) )); \ + } \ + bkt &= (num_bkts-1); + + +HASH_KEYCMP +#define HASH_KEYCMP(a,b,len) memcmp(a,b,len) + + +HASH_FIND_IN_BKT +#define HASH_FIND_IN_BKT(hh,head,keyptr,keylen_in,out) \ +out = (head.hh_head) ? (head.hh_head->elmt) : NULL; \ +while (out) { \ + if (out->hh.keylen == keylen_in) { \ + if ((HASH_KEYCMP(out->hh.key,keyptr,keylen_in)) == 0) break; \ + } \ + out= (out->hh.hh_next) ? (out->hh.hh_next->elmt) : NULL; \ +} + + +HASH_ADD_TO_BKT +#define HASH_ADD_TO_BKT(hh,head,add) \ + head.count++; \ + add->hh.hh_next = head.hh_head; \ + add->hh.hh_prev = NULL; \ + if (head.hh_head) head.hh_head->hh_prev = &add->hh; \ + head.hh_head=&add->hh; \ + if (head.count >= ((head.expand_mult+1) * HASH_BKT_CAPACITY_THRESH) \ + && add->hh.tbl->noexpand != 1) { \ + HASH_EXPAND_BUCKETS(add->hh.tbl) \ + } + + +HASH_DEL_IN_BKT +#define HASH_DEL_IN_BKT(hh,head,delptr) \ + (head).count--; \ + if ((head).hh_head->elmt == delptr) { \ + (head).hh_head = delptr->hh.hh_next; \ + } \ + if (delptr->hh.hh_prev) { \ + delptr->hh.hh_prev->hh_next = delptr->hh.hh_next; \ + } \ + if (delptr->hh.hh_next) { \ + delptr->hh.hh_next->hh_prev = delptr->hh.hh_prev; \ + } + + +HASH_EXPAND_BUCKETS +#define HASH_EXPAND_BUCKETS(tbl) \ + tbl->new_buckets = (UT_hash_bucket*)uthash_bkt_malloc( \ + 2 * tbl->num_buckets * sizeof(struct UT_hash_bucket)); \ + if (!tbl->new_buckets) { uthash_fatal( "out of memory"); } \ + memset(tbl->new_buckets, 0, \ + 2 * tbl->num_buckets * sizeof(struct UT_hash_bucket)); \ + tbl->bkt_ideal= (tbl->num_items / tbl->num_buckets*2) + \ + ((tbl->num_items % (tbl->num_buckets*2)) ? 1 : 0);\ + tbl->sum_of_deltas = 0; \ + for(tbl->bkt_i = 0; tbl->bkt_i < tbl->num_buckets; tbl->bkt_i++) \ + { \ + tbl->hh = tbl->buckets[ tbl->bkt_i ].hh_head; \ + while (tbl->hh) { \ + tbl->hh_nxt = tbl->hh->hh_next; \ + tbl->key = tbl->hh->key; \ + tbl->keylen = tbl->hh->keylen; \ + HASH_FCN(tbl->key,tbl->keylen,tbl->num_buckets*2,tbl->bkt,\ + tbl->i,tbl->j,tbl->k); \ + tbl->newbkt = &(tbl->new_buckets[ tbl->bkt ]); \ + if (++(tbl->newbkt->count) > tbl->bkt_ideal) { \ + tbl->sum_of_deltas++; \ + tbl->newbkt->expand_mult = tbl->newbkt->count / \ + tbl->bkt_ideal; \ + } \ + tbl->hh->hh_prev = NULL; \ + tbl->hh->hh_next = tbl->newbkt->hh_head; \ + if (tbl->newbkt->hh_head) tbl->newbkt->hh_head->hh_prev = \ + tbl->hh; \ + tbl->newbkt->hh_head = tbl->hh; \ + tbl->hh = tbl->hh_nxt; \ + } \ + } \ + tbl->num_buckets *= 2; \ + uthash_bkt_free( tbl->buckets ); \ + tbl->buckets = tbl->new_buckets; \ + tbl->new_hash_q = (1<<16) - ((tbl->sum_of_deltas << 16) / tbl->num_items); \ + if (tbl->hash_q < (1<<15) && tbl->new_hash_q < (1<<15)) { \ + tbl->noexpand=1; \ + uthash_noexpand_fyi(tbl); \ + } \ + tbl->hash_q = tbl->new_hash_q; \ + uthash_expand_fyi(tbl); + + +HASH_SORT +#define HASH_SORT(head,cmpfcn) \ + if (head) { \ + (head)->hh.tbl->insize = 1; \ + (head)->hh.tbl->looping = 1; \ + (head)->hh.tbl->list = &((head)->hh); \ + while ((head)->hh.tbl->looping) { \ + (head)->hh.tbl->p = (head)->hh.tbl->list; \ + (head)->hh.tbl->list = NULL; \ + (head)->hh.tbl->tale = NULL; \ + (head)->hh.tbl->nmerges = 0; \ + while ((head)->hh.tbl->p) { \ + (head)->hh.tbl->nmerges++; \ + (head)->hh.tbl->q = (head)->hh.tbl->p; \ + (head)->hh.tbl->psize = 0; \ + for ( (head)->hh.tbl->i = 0; \ + (head)->hh.tbl->i < (head)->hh.tbl->insize; \ + (head)->hh.tbl->i++ ) { \ + (head)->hh.tbl->psize++; \ + (head)->hh.tbl->q = (((head)->hh.tbl->q->next) ? \ + ((void*)(((long)((head)->hh.tbl->q->next)) + \ + (head)->hh.tbl->hho)) : NULL); \ + if (! ((head)->hh.tbl->q) ) break; \ + } \ + (head)->hh.tbl->qsize = (head)->hh.tbl->insize; \ + while (((head)->hh.tbl->psize > 0) || \ + (((head)->hh.tbl->qsize > 0) && (head)->hh.tbl->q )) { \ + if ((head)->hh.tbl->psize == 0) { \ + (head)->hh.tbl->e = (head)->hh.tbl->q; \ + (head)->hh.tbl->q = (((head)->hh.tbl->q->next) ? \ + ((void*)(((long)((head)->hh.tbl->q->next)) + \ + (head)->hh.tbl->hho)) : NULL); \ + (head)->hh.tbl->qsize--; \ + } else if ( ((head)->hh.tbl->qsize == 0) || \ + !((head)->hh.tbl->q) ) { \ + (head)->hh.tbl->e = (head)->hh.tbl->p; \ + (head)->hh.tbl->p = (((head)->hh.tbl->p->next) ? \ + ((void*)(((long)((head)->hh.tbl->p->next)) + \ + (head)->hh.tbl->hho)) : NULL); \ + (head)->hh.tbl->psize--; \ + } else if (( \ + cmpfcn((head)->hh.tbl->p->elmt,(head)->hh.tbl->q->elmt)) \ + <= 0) { \ + (head)->hh.tbl->e = (head)->hh.tbl->p; \ + (head)->hh.tbl->p = (((head)->hh.tbl->p->next) ? \ + ((void*)(((long)((head)->hh.tbl->p->next)) + \ + (head)->hh.tbl->hho)) : NULL); \ + (head)->hh.tbl->psize--; \ + } else { \ + (head)->hh.tbl->e = (head)->hh.tbl->q; \ + (head)->hh.tbl->q = (((head)->hh.tbl->q->next) ? \ + ((void*)(((long)((head)->hh.tbl->q->next)) + \ + (head)->hh.tbl->hho)) : NULL); \ + (head)->hh.tbl->qsize--; \ + } \ + if ( (head)->hh.tbl->tale ) { \ + (head)->hh.tbl->tale->next = (((head)->hh.tbl->e) ? \ + ((head)->hh.tbl->e->elmt) : NULL); \ + } else { \ + (head)->hh.tbl->list = (head)->hh.tbl->e; \ + } \ + (head)->hh.tbl->e->prev = (((head)->hh.tbl->tale) ? \ + ((head)->hh.tbl->tale->elmt) : NULL); \ + (head)->hh.tbl->tale = (head)->hh.tbl->e; \ + } \ + (head)->hh.tbl->p = (head)->hh.tbl->q; \ + } \ + (head)->hh.tbl->tale->next = NULL; \ + if ( (head)->hh.tbl->nmerges <= 1 ) { \ + (head)->hh.tbl->looping=0; \ + (head)->hh.tbl->tail = (head)->hh.tbl->tale; \ + (head) = (head)->hh.tbl->list->elmt; \ + } \ + (head)->hh.tbl->insize *= 2; \ + } \ + HASH_FSCK(head); \ + } + + +UT_hash_bucket +typedef struct UT_hash_bucket { + struct UT_hash_handle *hh_head; + unsigned count; + unsigned expand_mult; +} UT_hash_bucket; + + +UT_hash_table +typedef struct UT_hash_table { + UT_hash_bucket *buckets; + unsigned num_buckets; + unsigned num_items; + int noexpand; /* when set, inhibits expansion of buckets for this hash */ + int hash_q; /* measures the evenness of the items among buckets (0-1) */ + struct UT_hash_handle *tail; /* tail hh in app order, for fast append */ + char *name; /* macro-stringified name of list head, used by libut */ + int hho; + /* scratch */ + unsigned bkt; + char *key; + size_t keylen; + int i,j,k; + /* scratch for bucket expansion */ + UT_hash_bucket *new_buckets, *newbkt; + struct UT_hash_handle *hh, *hh_nxt; + unsigned bkt_i, bkt_ideal, sum_of_deltas; + int new_hash_q; + /* scratch for sort */ + int looping,nmerges,insize,psize,qsize; + struct UT_hash_handle *p, *q, *e, *list, *tale; + +} UT_hash_table; + + +UT_hash_handle +typedef struct UT_hash_handle { + struct UT_hash_table *tbl; + void *elmt; /* ptr to enclosing element */ + void *prev; /* prev element in app order */ + void *next; /* next element in app order */ + struct UT_hash_handle *hh_prev; /* previous hh in bucket order */ + struct UT_hash_handle *hh_next; /* next hh in bucket order */ + void *key; /* ptr to enclosing struct's key */ + size_t keylen; /* enclosing struct's key len */ +} UT_hash_handle; + --- hal-0.5.11~rc2.orig/doc/api/libhal/html/libhal.devhelp2 +++ hal-0.5.11~rc2/doc/api/libhal/html/libhal.devhelp2 @@ -137,7 +137,5 @@ - - --- hal-0.5.11~rc2.orig/doc/api/libhal/html/style.css +++ hal-0.5.11~rc2/doc/api/libhal/html/style.css @@ -22,6 +22,11 @@ /* this is needed so that the local anchors are displayed below the naviagtion */ @media screen { + sup a.footnote + { + position: relative; + top: 0em ! important; + } div.refnamediv a[name], div.refsect1 a[name] { position: relative; @@ -139,10 +144,17 @@ hr { - color: #888; - background: #888; + color: #777777; + background: #777777; border: 0; height: 1px; clear: both; } +.footer +{ + padding-top: 3.5em; + color: #777777; + text-align: center; + font-size: 80%; +} --- hal-0.5.11~rc2.orig/doc/api/libhal/html/libhal.devhelp +++ hal-0.5.11~rc2/doc/api/libhal/html/libhal.devhelp @@ -137,7 +137,5 @@ - - --- hal-0.5.11~rc2.orig/doc/api/libhal/html/rn01.html +++ hal-0.5.11~rc2/doc/api/libhal/html/rn01.html @@ -1,23 +1,23 @@ - + API Reference - + - + - + - + @@ -25,7 +25,7 @@

-API Reference

+API Reference
@@ -42,5 +42,8 @@
+
+
+ Generated by GTK-Doc V1.10
--- hal-0.5.11~rc2.orig/doc/api/libhal/html/license.html +++ hal-0.5.11~rc2/doc/api/libhal/html/license.html @@ -1,29 +1,29 @@ - -Appendix A. License - + +Appendix A. License + - + - + - + - +

-Appendix A. License

+Appendix A. License

This library is free software; you can redistribute it and/or modify it under the terms of the GNU General @@ -46,13 +46,16 @@


- Free Software Foundation, Inc.
- 59 Temple Place - Suite 330
- Boston, MA 02111-1307
+ Free Software Foundation, Inc.
+ 59 Temple Place - Suite 330
+ Boston, MA 02111-1307
USA
-      

+      

+
+
+ Generated by GTK-Doc V1.10
--- hal-0.5.11~rc2.orig/doc/api/libhal/html/index.sgml +++ hal-0.5.11~rc2/doc/api/libhal/html/index.sgml @@ -1,4 +1,7 @@ + + + --- hal-0.5.11~rc2.orig/doc/api/libhal/html/libhal-libhal.html +++ hal-0.5.11~rc2/doc/api/libhal/html/libhal-libhal.html @@ -1,18 +1,18 @@ - + libhal - + - + - + @@ -23,398 +23,393 @@ - +
-

-libhal -

+

libhal

libhal
-

Synopsis

+

Synopsis

-
-
-
-#define             DBUS_API_SUBJECT_TO_CHANGE
-#define             LIBHAL_DEPRECATED
-#define             LIBHAL_FREE_DBUS_ERROR              (_dbus_error_)
-#define             LIBHAL_CHECK_LIBHALCONTEXT          (_ctx_, _ret_)
-enum                LibHalPropertyType;
-typedef             LibHalContext;
-typedef             LibHalProperty;
-typedef             LibHalPropertySet;
-void                (*LibHalIntegrateDBusIntoMainLoop)  (LibHalContext *ctx,
+#define             DBUS_API_SUBJECT_TO_CHANGE
+#define             LIBHAL_DEPRECATED
+#define             LIBHAL_FREE_DBUS_ERROR              (_dbus_error_)
+#define             LIBHAL_CHECK_LIBHALCONTEXT          (_ctx_, _ret_)
+enum                LibHalPropertyType;
+typedef             LibHalContext;
+typedef             LibHalProperty;
+typedef             LibHalPropertySet;
+void                (*LibHalIntegrateDBusIntoMainLoop)  (LibHalContext *ctx,
                                                          DBusConnection *dbus_connection);
-void                (*LibHalDeviceAdded)                (LibHalContext *ctx,
+void                (*LibHalDeviceAdded)                (LibHalContext *ctx,
                                                          const char *udi);
-void                (*LibHalDeviceRemoved)              (LibHalContext *ctx,
+void                (*LibHalDeviceRemoved)              (LibHalContext *ctx,
                                                          const char *udi);
-void                (*LibHalDeviceNewCapability)        (LibHalContext *ctx,
+void                (*LibHalDeviceNewCapability)        (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *capability);
-void                (*LibHalDeviceLostCapability)       (LibHalContext *ctx,
+void                (*LibHalDeviceLostCapability)       (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *capability);
-void                (*LibHalDevicePropertyModified)     (LibHalContext *ctx,
+void                (*LibHalDevicePropertyModified)     (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          dbus_bool_t is_removed,
                                                          dbus_bool_t is_added);
-void                (*LibHalDeviceCondition)            (LibHalContext *ctx,
+void                (*LibHalDeviceCondition)            (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *condition_name,
                                                          const char *condition_detail);
-void                (*LibHalGlobalInterfaceLockAcquired)
-                                                        (LibHalContext *ctx,
+void                (*LibHalGlobalInterfaceLockAcquired)
+                                                        (LibHalContext *ctx,
                                                          const char *interface_name,
                                                          const char *lock_owner,
                                                          int num_locks);
-void                (*LibHalGlobalInterfaceLockReleased)
-                                                        (LibHalContext *ctx,
+void                (*LibHalGlobalInterfaceLockReleased)
+                                                        (LibHalContext *ctx,
                                                          const char *interface_name,
                                                          const char *lock_owner,
                                                          int num_locks);
-void                (*LibHalInterfaceLockAcquired)      (LibHalContext *ctx,
+void                (*LibHalInterfaceLockAcquired)      (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *interface_name,
                                                          const char *lock_owner,
                                                          int num_locks);
-void                (*LibHalInterfaceLockReleased)      (LibHalContext *ctx,
+void                (*LibHalInterfaceLockReleased)      (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *interface_name,
                                                          const char *lock_owner,
                                                          int num_locks);
-void                (*LibHalSingletonDeviceAdded)       (LibHalContext *ctx,
+void                (*LibHalSingletonDeviceAdded)       (LibHalContext *ctx,
                                                          const char *udi,
-                                                         const LibHalPropertySet *properties);
-void                (*LibHalSingletonDeviceRemoved)     (LibHalContext *ctx,
+                                                         const LibHalPropertySet *properties);
+void                (*LibHalSingletonDeviceRemoved)     (LibHalContext *ctx,
                                                          const char *udi,
-                                                         const LibHalPropertySet *properties);
-LibHalContext*      libhal_ctx_new                      (void);
-dbus_bool_t         libhal_ctx_set_cache                (LibHalContext *ctx,
+                                                         const LibHalPropertySet *properties);
+LibHalContext*      libhal_ctx_new                      (void);
+dbus_bool_t         libhal_ctx_set_cache                (LibHalContext *ctx,
                                                          dbus_bool_t use_cache);
-dbus_bool_t         libhal_ctx_set_dbus_connection      (LibHalContext *ctx,
+dbus_bool_t         libhal_ctx_set_dbus_connection      (LibHalContext *ctx,
                                                          DBusConnection *conn);
-DBusConnection*     libhal_ctx_get_dbus_connection      (LibHalContext *ctx);
-dbus_bool_t         libhal_ctx_set_user_data            (LibHalContext *ctx,
+DBusConnection*     libhal_ctx_get_dbus_connection      (LibHalContext *ctx);
+dbus_bool_t         libhal_ctx_set_user_data            (LibHalContext *ctx,
                                                          void *user_data);
-void*               libhal_ctx_get_user_data            (LibHalContext *ctx);
-dbus_bool_t         libhal_ctx_set_device_added         (LibHalContext *ctx,
-                                                         LibHalDeviceAdded callback);
-dbus_bool_t         libhal_ctx_set_device_removed       (LibHalContext *ctx,
-                                                         LibHalDeviceRemoved callback);
-dbus_bool_t         libhal_ctx_set_device_new_capability
-                                                        (LibHalContext *ctx,
-                                                         LibHalDeviceNewCapability callback);
-dbus_bool_t         libhal_ctx_set_device_lost_capability
-                                                        (LibHalContext *ctx,
-                                                         LibHalDeviceLostCapability callback);
-dbus_bool_t         libhal_ctx_set_device_property_modified
-                                                        (LibHalContext *ctx,
-                                                         LibHalDevicePropertyModified callback);
-dbus_bool_t         libhal_ctx_set_device_condition     (LibHalContext *ctx,
-                                                         LibHalDeviceCondition callback);
-dbus_bool_t         libhal_ctx_set_global_interface_lock_acquired
-                                                        (LibHalContext *ctx,
-                                                         LibHalGlobalInterfaceLockAcquired callback);
-dbus_bool_t         libhal_ctx_set_global_interface_lock_released
-                                                        (LibHalContext *ctx,
-                                                         LibHalGlobalInterfaceLockReleased callback);
-dbus_bool_t         libhal_ctx_set_interface_lock_acquired
-                                                        (LibHalContext *ctx,
-                                                         LibHalInterfaceLockAcquired callback);
-dbus_bool_t         libhal_ctx_set_interface_lock_released
-                                                        (LibHalContext *ctx,
-                                                         LibHalInterfaceLockReleased callback);
-dbus_bool_t         libhal_ctx_set_singleton_device_added
-                                                        (LibHalContext *ctx,
-                                                         LibHalSingletonDeviceAdded callback);
-dbus_bool_t         libhal_ctx_set_singleton_device_removed
-                                                        (LibHalContext *ctx,
-                                                         LibHalSingletonDeviceRemoved callback);
-dbus_bool_t         libhal_ctx_init                     (LibHalContext *ctx,
-                                                         DBusError *error);
-dbus_bool_t         libhal_ctx_shutdown                 (LibHalContext *ctx,
-                                                         DBusError *error);
-dbus_bool_t         libhal_ctx_free                     (LibHalContext *ctx);
-LibHalContext*      libhal_ctx_init_direct              (DBusError *error);
-char**              libhal_get_all_devices              (LibHalContext *ctx,
+void*               libhal_ctx_get_user_data            (LibHalContext *ctx);
+dbus_bool_t         libhal_ctx_set_device_added         (LibHalContext *ctx,
+                                                         LibHalDeviceAdded callback);
+dbus_bool_t         libhal_ctx_set_device_removed       (LibHalContext *ctx,
+                                                         LibHalDeviceRemoved callback);
+dbus_bool_t         libhal_ctx_set_device_new_capability
+                                                        (LibHalContext *ctx,
+                                                         LibHalDeviceNewCapability callback);
+dbus_bool_t         libhal_ctx_set_device_lost_capability
+                                                        (LibHalContext *ctx,
+                                                         LibHalDeviceLostCapability callback);
+dbus_bool_t         libhal_ctx_set_device_property_modified
+                                                        (LibHalContext *ctx,
+                                                         LibHalDevicePropertyModified callback);
+dbus_bool_t         libhal_ctx_set_device_condition     (LibHalContext *ctx,
+                                                         LibHalDeviceCondition callback);
+dbus_bool_t         libhal_ctx_set_global_interface_lock_acquired
+                                                        (LibHalContext *ctx,
+                                                         LibHalGlobalInterfaceLockAcquired callback);
+dbus_bool_t         libhal_ctx_set_global_interface_lock_released
+                                                        (LibHalContext *ctx,
+                                                         LibHalGlobalInterfaceLockReleased callback);
+dbus_bool_t         libhal_ctx_set_interface_lock_acquired
+                                                        (LibHalContext *ctx,
+                                                         LibHalInterfaceLockAcquired callback);
+dbus_bool_t         libhal_ctx_set_interface_lock_released
+                                                        (LibHalContext *ctx,
+                                                         LibHalInterfaceLockReleased callback);
+dbus_bool_t         libhal_ctx_set_singleton_device_added
+                                                        (LibHalContext *ctx,
+                                                         LibHalSingletonDeviceAdded callback);
+dbus_bool_t         libhal_ctx_set_singleton_device_removed
+                                                        (LibHalContext *ctx,
+                                                         LibHalSingletonDeviceRemoved callback);
+dbus_bool_t         libhal_ctx_init                     (LibHalContext *ctx,
+                                                         DBusError *error);
+dbus_bool_t         libhal_ctx_shutdown                 (LibHalContext *ctx,
+                                                         DBusError *error);
+dbus_bool_t         libhal_ctx_free                     (LibHalContext *ctx);
+LibHalContext*      libhal_ctx_init_direct              (DBusError *error);
+char**              libhal_get_all_devices              (LibHalContext *ctx,
                                                          int *num_devices,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_exists                (LibHalContext *ctx,
+dbus_bool_t         libhal_device_exists                (LibHalContext *ctx,
                                                          const char *udi,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_print                 (LibHalContext *ctx,
+dbus_bool_t         libhal_device_print                 (LibHalContext *ctx,
                                                          const char *udi,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_property_exists       (LibHalContext *ctx,
+dbus_bool_t         libhal_device_property_exists       (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          DBusError *error);
-char*               libhal_device_get_property_string   (LibHalContext *ctx,
+char*               libhal_device_get_property_string   (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          DBusError *error);
-dbus_int32_t        libhal_device_get_property_int      (LibHalContext *ctx,
+dbus_int32_t        libhal_device_get_property_int      (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          DBusError *error);
-dbus_uint64_t       libhal_device_get_property_uint64   (LibHalContext *ctx,
+dbus_uint64_t       libhal_device_get_property_uint64   (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          DBusError *error);
-double              libhal_device_get_property_double   (LibHalContext *ctx,
+double              libhal_device_get_property_double   (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_get_property_bool     (LibHalContext *ctx,
+dbus_bool_t         libhal_device_get_property_bool     (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          DBusError *error);
-char**              libhal_device_get_property_strlist  (LibHalContext *ctx,
+char**              libhal_device_get_property_strlist  (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_set_property_string   (LibHalContext *ctx,
+dbus_bool_t         libhal_device_set_property_string   (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          const char *value,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_set_property_int      (LibHalContext *ctx,
+dbus_bool_t         libhal_device_set_property_int      (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          dbus_int32_t value,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_set_property_uint64   (LibHalContext *ctx,
+dbus_bool_t         libhal_device_set_property_uint64   (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          dbus_uint64_t value,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_set_property_double   (LibHalContext *ctx,
+dbus_bool_t         libhal_device_set_property_double   (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          double value,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_set_property_bool     (LibHalContext *ctx,
+dbus_bool_t         libhal_device_set_property_bool     (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          dbus_bool_t value,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_property_strlist_append
-                                                        (LibHalContext *ctx,
+dbus_bool_t         libhal_device_property_strlist_append
+                                                        (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          const char *value,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_property_strlist_prepend
-                                                        (LibHalContext *ctx,
+dbus_bool_t         libhal_device_property_strlist_prepend
+                                                        (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          const char *value,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_property_strlist_remove_index
-                                                        (LibHalContext *ctx,
+dbus_bool_t         libhal_device_property_strlist_remove_index
+                                                        (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          unsigned int idx,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_property_strlist_remove
-                                                        (LibHalContext *ctx,
+dbus_bool_t         libhal_device_property_strlist_remove
+                                                        (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          const char *value,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_remove_property       (LibHalContext *ctx,
+dbus_bool_t         libhal_device_remove_property       (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          DBusError *error);
-LibHalPropertyType  libhal_device_get_property_type     (LibHalContext *ctx,
+LibHalPropertyType  libhal_device_get_property_type     (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          DBusError *error);
-struct              LibHalChangeSet_s;
-typedef             LibHalChangeSet;
-LibHalChangeSet*    libhal_device_new_changeset         (const char *udi);
-dbus_bool_t         libhal_changeset_set_property_string
-                                                        (LibHalChangeSet *changeset,
+struct              LibHalChangeSet_s;
+typedef             LibHalChangeSet;
+LibHalChangeSet*    libhal_device_new_changeset         (const char *udi);
+dbus_bool_t         libhal_changeset_set_property_string
+                                                        (LibHalChangeSet *changeset,
                                                          const char *key,
                                                          const char *value);
-dbus_bool_t         libhal_changeset_set_property_int   (LibHalChangeSet *changeset,
+dbus_bool_t         libhal_changeset_set_property_int   (LibHalChangeSet *changeset,
                                                          const char *key,
                                                          dbus_int32_t value);
-dbus_bool_t         libhal_changeset_set_property_uint64
-                                                        (LibHalChangeSet *changeset,
+dbus_bool_t         libhal_changeset_set_property_uint64
+                                                        (LibHalChangeSet *changeset,
                                                          const char *key,
                                                          dbus_uint64_t value);
-dbus_bool_t         libhal_changeset_set_property_double
-                                                        (LibHalChangeSet *changeset,
+dbus_bool_t         libhal_changeset_set_property_double
+                                                        (LibHalChangeSet *changeset,
                                                          const char *key,
                                                          double value);
-dbus_bool_t         libhal_changeset_set_property_bool  (LibHalChangeSet *changeset,
+dbus_bool_t         libhal_changeset_set_property_bool  (LibHalChangeSet *changeset,
                                                          const char *key,
                                                          dbus_bool_t value);
-dbus_bool_t         libhal_changeset_set_property_strlist
-                                                        (LibHalChangeSet *changeset,
+dbus_bool_t         libhal_changeset_set_property_strlist
+                                                        (LibHalChangeSet *changeset,
                                                          const char *key,
                                                          const char **value);
-dbus_bool_t         libhal_device_commit_changeset      (LibHalContext *ctx,
-                                                         LibHalChangeSet *changeset,
+dbus_bool_t         libhal_device_commit_changeset      (LibHalContext *ctx,
+                                                         LibHalChangeSet *changeset,
                                                          DBusError *error);
-void                libhal_device_free_changeset        (LibHalChangeSet *changeset);
-LibHalPropertySet*  libhal_device_get_all_properties    (LibHalContext *ctx,
+void                libhal_device_free_changeset        (LibHalChangeSet *changeset);
+LibHalPropertySet*  libhal_device_get_all_properties    (LibHalContext *ctx,
                                                          const char *udi,
                                                          DBusError *error);
-dbus_bool_t         libhal_get_all_devices_with_properties
-                                                        (LibHalContext *ctx,
+dbus_bool_t         libhal_get_all_devices_with_properties
+                                                        (LibHalContext *ctx,
                                                          int *out_num_devices,
                                                          char ***out_udi,
-                                                         LibHalPropertySet ***out_properties,
+                                                         LibHalPropertySet ***out_properties,
                                                          DBusError *error);
-void                libhal_property_set_sort            (LibHalPropertySet *set);
-void                libhal_free_property_set            (LibHalPropertySet *set);
-unsigned int        libhal_property_set_get_num_elems   (LibHalPropertySet *set);
-LibHalPropertyType  libhal_ps_get_type                  (const LibHalPropertySet *set,
+void                libhal_property_set_sort            (LibHalPropertySet *set);
+void                libhal_free_property_set            (LibHalPropertySet *set);
+unsigned int        libhal_property_set_get_num_elems   (LibHalPropertySet *set);
+LibHalPropertyType  libhal_ps_get_type                  (const LibHalPropertySet *set,
                                                          const char *key);
-const char*         libhal_ps_get_string                (const LibHalPropertySet *set,
+const char*         libhal_ps_get_string                (const LibHalPropertySet *set,
                                                          const char *key);
-dbus_int32_t        libhal_ps_get_int32                 (const LibHalPropertySet *set,
+dbus_int32_t        libhal_ps_get_int32                 (const LibHalPropertySet *set,
                                                          const char *key);
-dbus_uint64_t       libhal_ps_get_uint64                (const LibHalPropertySet *set,
+dbus_uint64_t       libhal_ps_get_uint64                (const LibHalPropertySet *set,
                                                          const char *key);
-double              libhal_ps_get_double                (const LibHalPropertySet *set,
+double              libhal_ps_get_double                (const LibHalPropertySet *set,
                                                          const char *key);
-dbus_bool_t         libhal_ps_get_bool                  (const LibHalPropertySet *set,
+dbus_bool_t         libhal_ps_get_bool                  (const LibHalPropertySet *set,
                                                          const char *key);
-typedef             LibHalPropertySetIterator;
-void                libhal_psi_init                     (LibHalPropertySetIterator *iter,
-                                                         LibHalPropertySet *set);
-dbus_bool_t         libhal_psi_has_more                 (LibHalPropertySetIterator *iter);
-void                libhal_psi_next                     (LibHalPropertySetIterator *iter);
-LibHalPropertyType  libhal_psi_get_type                 (LibHalPropertySetIterator *iter);
-char*               libhal_psi_get_key                  (LibHalPropertySetIterator *iter);
-char*               libhal_psi_get_string               (LibHalPropertySetIterator *iter);
-dbus_int32_t        libhal_psi_get_int                  (LibHalPropertySetIterator *iter);
-dbus_uint64_t       libhal_psi_get_uint64               (LibHalPropertySetIterator *iter);
-double              libhal_psi_get_double               (LibHalPropertySetIterator *iter);
-dbus_bool_t         libhal_psi_get_bool                 (LibHalPropertySetIterator *iter);
-char**              libhal_psi_get_strlist              (LibHalPropertySetIterator *iter);
-unsigned int        libhal_string_array_length          (char **str_array);
-void                libhal_free_string_array            (char **str_array);
-void                libhal_free_string                  (char *str);
-char*               libhal_new_device                   (LibHalContext *ctx,
+typedef             LibHalPropertySetIterator;
+void                libhal_psi_init                     (LibHalPropertySetIterator *iter,
+                                                         LibHalPropertySet *set);
+dbus_bool_t         libhal_psi_has_more                 (LibHalPropertySetIterator *iter);
+void                libhal_psi_next                     (LibHalPropertySetIterator *iter);
+LibHalPropertyType  libhal_psi_get_type                 (LibHalPropertySetIterator *iter);
+char*               libhal_psi_get_key                  (LibHalPropertySetIterator *iter);
+char*               libhal_psi_get_string               (LibHalPropertySetIterator *iter);
+dbus_int32_t        libhal_psi_get_int                  (LibHalPropertySetIterator *iter);
+dbus_uint64_t       libhal_psi_get_uint64               (LibHalPropertySetIterator *iter);
+double              libhal_psi_get_double               (LibHalPropertySetIterator *iter);
+dbus_bool_t         libhal_psi_get_bool                 (LibHalPropertySetIterator *iter);
+char**              libhal_psi_get_strlist              (LibHalPropertySetIterator *iter);
+unsigned int        libhal_string_array_length          (char **str_array);
+void                libhal_free_string_array            (char **str_array);
+void                libhal_free_string                  (char *str);
+char*               libhal_new_device                   (LibHalContext *ctx,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_commit_to_gdl         (LibHalContext *ctx,
+dbus_bool_t         libhal_device_commit_to_gdl         (LibHalContext *ctx,
                                                          const char *temp_udi,
                                                          const char *udi,
                                                          DBusError *error);
-dbus_bool_t         libhal_remove_device                (LibHalContext *ctx,
+dbus_bool_t         libhal_remove_device                (LibHalContext *ctx,
                                                          const char *udi,
                                                          DBusError *error);
-dbus_bool_t         libhal_merge_properties             (LibHalContext *ctx,
+dbus_bool_t         libhal_merge_properties             (LibHalContext *ctx,
                                                          const char *target_udi,
                                                          const char *source_udi,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_matches               (LibHalContext *ctx,
+dbus_bool_t         libhal_device_matches               (LibHalContext *ctx,
                                                          const char *udi1,
                                                          const char *udi2,
                                                          const char *property_namespace,
                                                          DBusError *error);
-char**              libhal_manager_find_device_string_match
-                                                        (LibHalContext *ctx,
+char**              libhal_manager_find_device_string_match
+                                                        (LibHalContext *ctx,
                                                          const char *key,
                                                          const char *value,
                                                          int *num_devices,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_add_capability        (LibHalContext *ctx,
+dbus_bool_t         libhal_device_add_capability        (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *capability,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_query_capability      (LibHalContext *ctx,
+dbus_bool_t         libhal_device_query_capability      (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *capability,
                                                          DBusError *error);
-char**              libhal_find_device_by_capability    (LibHalContext *ctx,
+char**              libhal_find_device_by_capability    (LibHalContext *ctx,
                                                          const char *capability,
                                                          int *num_devices,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_property_watch_all    (LibHalContext *ctx,
+dbus_bool_t         libhal_device_property_watch_all    (LibHalContext *ctx,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_add_property_watch    (LibHalContext *ctx,
+dbus_bool_t         libhal_device_add_property_watch    (LibHalContext *ctx,
                                                          const char *udi,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_remove_property_watch (LibHalContext *ctx,
+dbus_bool_t         libhal_device_remove_property_watch (LibHalContext *ctx,
                                                          const char *udi,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_lock                  (LibHalContext *ctx,
+dbus_bool_t         libhal_device_lock                  (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *reason_to_lock,
                                                          char **reason_why_locked,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_unlock                (LibHalContext *ctx,
+dbus_bool_t         libhal_device_unlock                (LibHalContext *ctx,
                                                          const char *udi,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_rescan                (LibHalContext *ctx,
+dbus_bool_t         libhal_device_rescan                (LibHalContext *ctx,
                                                          const char *udi,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_reprobe               (LibHalContext *ctx,
+dbus_bool_t         libhal_device_reprobe               (LibHalContext *ctx,
                                                          const char *udi,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_emit_condition        (LibHalContext *ctx,
+dbus_bool_t         libhal_device_emit_condition        (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *condition_name,
                                                          const char *condition_details,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_claim_interface       (LibHalContext *ctx,
+dbus_bool_t         libhal_device_claim_interface       (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *interface_name,
                                                          const char *introspection_xml,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_addon_is_ready        (LibHalContext *ctx,
+dbus_bool_t         libhal_device_addon_is_ready        (LibHalContext *ctx,
                                                          const char *udi,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_singleton_addon_is_ready
-                                                        (LibHalContext *ctx,
+dbus_bool_t         libhal_device_singleton_addon_is_ready
+                                                        (LibHalContext *ctx,
                                                          const char *command_line,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_acquire_interface_lock
-                                                        (LibHalContext *ctx,
+dbus_bool_t         libhal_device_acquire_interface_lock
+                                                        (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *interface,
                                                          dbus_bool_t exclusive,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_release_interface_lock
-                                                        (LibHalContext *ctx,
+dbus_bool_t         libhal_device_release_interface_lock
+                                                        (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *interface,
                                                          DBusError *error);
-dbus_bool_t         libhal_acquire_global_interface_lock
-                                                        (LibHalContext *ctx,
+dbus_bool_t         libhal_acquire_global_interface_lock
+                                                        (LibHalContext *ctx,
                                                          const char *interface,
                                                          dbus_bool_t exclusive,
                                                          DBusError *error);
-dbus_bool_t         libhal_release_global_interface_lock
-                                                        (LibHalContext *ctx,
+dbus_bool_t         libhal_release_global_interface_lock
+                                                        (LibHalContext *ctx,
                                                          const char *interface,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_is_caller_locked_out  (LibHalContext *ctx,
+dbus_bool_t         libhal_device_is_caller_locked_out  (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *interface,
                                                          const char *caller,
                                                          DBusError *error);
-dbus_bool_t         libhal_device_is_locked_by_others   (LibHalContext *ctx,
+dbus_bool_t         libhal_device_is_locked_by_others   (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *interface,
                                                          DBusError *error);
-char*               libhal_device_is_caller_privileged  (LibHalContext *ctx,
+char*               libhal_device_is_caller_privileged  (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *action,
                                                          const char *caller,
@@ -422,17 +417,16 @@
-

Description

+

Description

-

Details

+

Details

-

-DBUS_API_SUBJECT_TO_CHANGE

-
#define DBUS_API_SUBJECT_TO_CHANGE 
+
DBUS_API_SUBJECT_TO_CHANGE

+
#define DBUS_API_SUBJECT_TO_CHANGE 
 

 

 
@@ -440,25 +434,23 @@
-

-LIBHAL_DEPRECATED

-
#define             LIBHAL_DEPRECATED
+

LIBHAL_DEPRECATED

+
#define             LIBHAL_DEPRECATED

-

-LIBHAL_FREE_DBUS_ERROR()

-
#define             LIBHAL_FREE_DBUS_ERROR(_dbus_error_)
+

LIBHAL_FREE_DBUS_ERROR()

+
#define             LIBHAL_FREE_DBUS_ERROR(_dbus_error_)

- + - + - + @@ -494,9 +485,8 @@
-

-enum LibHalPropertyType

-
typedef enum {
+
enum LibHalPropertyType

+
typedef enum {
         /** Used to report error condition */
 	LIBHAL_PROPERTY_TYPE_INVALID =    DBUS_TYPE_INVALID,
 
@@ -527,9 +517,8 @@
-

-LibHalContext

-
typedef struct LibHalContext_s LibHalContext;
+
LibHalContext

+
typedef struct LibHalContext_s LibHalContext;
 

 

 Context for connection to the HAL daemon. Opaque, use the
@@ -540,9 +529,8 @@
-

-LibHalProperty

-
typedef struct LibHalProperty_s LibHalProperty;
+
LibHalProperty

+
typedef struct LibHalProperty_s LibHalProperty;
 

 

 Represents a property. Opaque.

@@ -552,9 +540,8 @@
-

-LibHalPropertySet

-
typedef struct LibHalPropertySet_s LibHalPropertySet;
+
LibHalPropertySet

+
typedef struct LibHalPropertySet_s LibHalPropertySet;
 

 

 Represents a set of properties. Opaque; use the
@@ -565,9 +552,8 @@
-

-LibHalIntegrateDBusIntoMainLoop ()

-
void                (*LibHalIntegrateDBusIntoMainLoop)  (LibHalContext *ctx,
+
LibHalIntegrateDBusIntoMainLoop ()

+
void                (*LibHalIntegrateDBusIntoMainLoop)  (LibHalContext *ctx,
                                                          DBusConnection *dbus_connection);

 

 Type for function in application code that integrates a
@@ -579,12 +565,12 @@
- + - + @@ -593,9 +579,8 @@
-

-LibHalDeviceAdded ()

-
void                (*LibHalDeviceAdded)                (LibHalContext *ctx,
+
LibHalDeviceAdded ()

+
void                (*LibHalDeviceAdded)                (LibHalContext *ctx,
                                                          const char *udi);

 

 Type for callback when a device is added.

@@ -606,12 +591,12 @@
- + - + @@ -620,9 +605,8 @@
-

-LibHalDeviceRemoved ()

-
void                (*LibHalDeviceRemoved)              (LibHalContext *ctx,
+
LibHalDeviceRemoved ()

+
void                (*LibHalDeviceRemoved)              (LibHalContext *ctx,
                                                          const char *udi);

 

 Type for callback when a device is removed.

@@ -633,12 +617,12 @@
- + - + @@ -647,9 +631,8 @@
-

-LibHalDeviceNewCapability ()

-
void                (*LibHalDeviceNewCapability)        (LibHalContext *ctx,
+
LibHalDeviceNewCapability ()

+
void                (*LibHalDeviceNewCapability)        (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *capability);

 

@@ -661,17 +644,17 @@
- + - + - + @@ -680,9 +663,8 @@
-

-LibHalDeviceLostCapability ()

-
void                (*LibHalDeviceLostCapability)       (LibHalContext *ctx,
+
LibHalDeviceLostCapability ()

+
void                (*LibHalDeviceLostCapability)       (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *capability);

 

@@ -694,17 +676,17 @@
- + - + - + @@ -713,9 +695,8 @@
-

-LibHalDevicePropertyModified ()

-
void                (*LibHalDevicePropertyModified)     (LibHalContext *ctx,
+
LibHalDevicePropertyModified ()

+
void                (*LibHalDevicePropertyModified)     (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          dbus_bool_t is_removed,
@@ -729,27 +710,27 @@
- + - + - + - + - + @@ -758,9 +739,8 @@
-

-LibHalDeviceCondition ()

-
void                (*LibHalDeviceCondition)            (LibHalContext *ctx,
+
LibHalDeviceCondition ()

+
void                (*LibHalDeviceCondition)            (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *condition_name,
                                                          const char *condition_detail);

@@ -773,22 +753,22 @@
- + - + - + - + @@ -797,10 +777,9 @@
-

-LibHalGlobalInterfaceLockAcquired ()

-
void                (*LibHalGlobalInterfaceLockAcquired)
-                                                        (LibHalContext *ctx,
+
LibHalGlobalInterfaceLockAcquired ()

+
void                (*LibHalGlobalInterfaceLockAcquired)
+                                                        (LibHalContext *ctx,
                                                          const char *interface_name,
                                                          const char *lock_owner,
                                                          int num_locks);

@@ -813,22 +792,22 @@
- + - + - + - + @@ -837,10 +816,9 @@
-

-LibHalGlobalInterfaceLockReleased ()

-
void                (*LibHalGlobalInterfaceLockReleased)
-                                                        (LibHalContext *ctx,
+
LibHalGlobalInterfaceLockReleased ()

+
void                (*LibHalGlobalInterfaceLockReleased)
+                                                        (LibHalContext *ctx,
                                                          const char *interface_name,
                                                          const char *lock_owner,
                                                          int num_locks);

@@ -853,22 +831,22 @@
- + - + - + - + @@ -877,9 +855,8 @@
-

-LibHalInterfaceLockAcquired ()

-
void                (*LibHalInterfaceLockAcquired)      (LibHalContext *ctx,
+
LibHalInterfaceLockAcquired ()

+
void                (*LibHalInterfaceLockAcquired)      (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *interface_name,
                                                          const char *lock_owner,
@@ -893,27 +870,27 @@
- + - + - + - + - + @@ -922,9 +899,8 @@
-

-LibHalInterfaceLockReleased ()

-
void                (*LibHalInterfaceLockReleased)      (LibHalContext *ctx,
+
LibHalInterfaceLockReleased ()

+
void                (*LibHalInterfaceLockReleased)      (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *interface_name,
                                                          const char *lock_owner,
@@ -938,27 +914,27 @@
- + - + - + - + - + @@ -967,11 +943,10 @@
-

-LibHalSingletonDeviceAdded ()

-
void                (*LibHalSingletonDeviceAdded)       (LibHalContext *ctx,
+
LibHalSingletonDeviceAdded ()

+
void                (*LibHalSingletonDeviceAdded)       (LibHalContext *ctx,
                                                          const char *udi,
-                                                         const LibHalPropertySet *properties);

+                                                         const LibHalPropertySet *properties);

Type for callback for addon singletons when a device is added

@@ -981,17 +956,17 @@

- + - + - + @@ -1000,11 +975,10 @@
-

-LibHalSingletonDeviceRemoved ()

-
void                (*LibHalSingletonDeviceRemoved)     (LibHalContext *ctx,
+
LibHalSingletonDeviceRemoved ()

+
void                (*LibHalSingletonDeviceRemoved)     (LibHalContext *ctx,
                                                          const char *udi,
-                                                         const LibHalPropertySet *properties);

+                                                         const LibHalPropertySet *properties);

Type for callback for addon singletons when a device is added

@@ -1014,17 +988,17 @@

- + - + - + @@ -1033,9 +1007,8 @@
-

-libhal_ctx_new ()

-
LibHalContext*      libhal_ctx_new                      (void);
+

libhal_ctx_new ()

+
LibHalContext*      libhal_ctx_new                      (void);

Create a new LibHalContext

@@ -1044,7 +1017,7 @@

_dbus_error_ :

_dbus_error_ :

 @@ -468,9 +460,8 @@
-

-LIBHAL_CHECK_LIBHALCONTEXT()

-
#define             LIBHAL_CHECK_LIBHALCONTEXT(_ctx_, _ret_)
+

LIBHAL_CHECK_LIBHALCONTEXT()

+
#define             LIBHAL_CHECK_LIBHALCONTEXT(_ctx_, _ret_)

Handy macro for checking whether a context is valid.

@@ -480,12 +471,12 @@

_ctx_ :

_ctx_ :

 the context

_ret_ :

_ret_ :

 what to use for return value if context is invalid

ctx :

ctx :

 context for connection to hald

dbus_connection :

dbus_connection :

 DBus connection to use in ctx

ctx :

ctx :

 context for connection to hald

udi :

udi :

 the Unique Device Id

ctx :

ctx :

 context for connection to hald

udi :

udi :

 the Unique Device Id

ctx :

ctx :

 context for connection to hald

udi :

udi :

 the Unique Device Id

capability :

capability :

 capability of the device

ctx :

ctx :

 context for connection to hald

udi :

udi :

 the Unique Device Id

capability :

capability :

 capability of the device

ctx :

ctx :

 context for connection to hald

udi :

udi :

 the Unique Device Id

key :

key :

 name of the property that has changed

is_removed :

is_removed :

 whether or not property was removed

is_added :

is_added :

 whether or not property was added

ctx :

ctx :

 context for connection to hald

udi :

udi :

 the Unique Device Id

condition_name :

condition_name :

 name of the condition, e.g. ProcessorOverheating. Consult the HAL spec for details

condition_detail :

condition_detail :

 detail of condition

ctx :

ctx :

 context for connection to hald

interface_name :

interface_name :

 the name of the interface

lock_owner :

lock_owner :

 what service acquired the lock

num_locks :

num_locks :

 number of locks on the interface

ctx :

ctx :

 context for connection to hald

interface_name :

interface_name :

 the name of the interface

lock_owner :

lock_owner :

 what service released the lock

num_locks :

num_locks :

 number of locks on the interface

ctx :

ctx :

 context for connection to hald

udi :

udi :

 the Unique Device Id

interface_name :

interface_name :

 the name of the interface

lock_owner :

lock_owner :

 what service acquired the lock

num_locks :

num_locks :

 number of locks on the interface

ctx :

ctx :

 context for connection to hald

udi :

udi :

 the Unique Device Id

interface_name :

interface_name :

 the name of the interface

lock_owner :

lock_owner :

 what service released the lock

num_locks :

num_locks :

 number of locks on the interface

ctx :

ctx :

 context for connection to hald

udi :

udi :

 the Unique Device Id

properties :

properties :

 the device's properties

ctx :

ctx :

 context for connection to hald

udi :

udi :

 the Unique Device Id

properties :

properties :

 the device's properties
- + @@ -1052,9 +1025,8 @@
-

-libhal_ctx_set_cache ()

-
dbus_bool_t         libhal_ctx_set_cache                (LibHalContext *ctx,
+
libhal_ctx_set_cache ()

+
dbus_bool_t         libhal_ctx_set_cache                (LibHalContext *ctx,
                                                          dbus_bool_t use_cache);

 

 Enable or disable caching. Note: Caching is not actually
@@ -1066,17 +1038,17 @@
- + - + - + @@ -1085,9 +1057,8 @@
-

-libhal_ctx_set_dbus_connection ()

-
dbus_bool_t         libhal_ctx_set_dbus_connection      (LibHalContext *ctx,
+
libhal_ctx_set_dbus_connection ()

+
dbus_bool_t         libhal_ctx_set_dbus_connection      (LibHalContext *ctx,
                                                          DBusConnection *conn);

 

 Set DBus connection to use to talk to hald.

@@ -1098,17 +1069,17 @@
- + - + - + @@ -1117,9 +1088,8 @@
-

-libhal_ctx_get_dbus_connection ()

-
DBusConnection*     libhal_ctx_get_dbus_connection      (LibHalContext *ctx);
+

libhal_ctx_get_dbus_connection ()

+
DBusConnection*     libhal_ctx_get_dbus_connection      (LibHalContext *ctx);

Get DBus connection used for talking to hald.

@@ -1129,12 +1099,12 @@

- + - + @@ -1143,9 +1113,8 @@
-

-libhal_ctx_set_user_data ()

-
dbus_bool_t         libhal_ctx_set_user_data            (LibHalContext *ctx,
+
libhal_ctx_set_user_data ()

+
dbus_bool_t         libhal_ctx_set_user_data            (LibHalContext *ctx,
                                                          void *user_data);

 

 Set user data for the context.

@@ -1156,17 +1125,17 @@
- + - + - + @@ -1175,9 +1144,8 @@
-

-libhal_ctx_get_user_data ()

-
void*               libhal_ctx_get_user_data            (LibHalContext *ctx);
+

libhal_ctx_get_user_data ()

+
void*               libhal_ctx_get_user_data            (LibHalContext *ctx);

Get user data for the context.

@@ -1187,13 +1155,13 @@

- + - - + @@ -1201,10 +1169,9 @@
-

-libhal_ctx_set_device_added ()

-
dbus_bool_t         libhal_ctx_set_device_added         (LibHalContext *ctx,
-                                                         LibHalDeviceAdded callback);
+

libhal_ctx_set_device_added ()

+
dbus_bool_t         libhal_ctx_set_device_added         (LibHalContext *ctx,
+                                                         LibHalDeviceAdded callback);

Set the callback for when a device is added

@@ -1214,17 +1181,17 @@

- + - + - + @@ -1233,10 +1200,9 @@
-

-libhal_ctx_set_device_removed ()

-
dbus_bool_t         libhal_ctx_set_device_removed       (LibHalContext *ctx,
-                                                         LibHalDeviceRemoved callback);
+

libhal_ctx_set_device_removed ()

+
dbus_bool_t         libhal_ctx_set_device_removed       (LibHalContext *ctx,
+                                                         LibHalDeviceRemoved callback);

Set the callback for when a device is removed.

@@ -1246,17 +1212,17 @@

- + - + - + @@ -1265,11 +1231,10 @@
-

-libhal_ctx_set_device_new_capability ()

-
dbus_bool_t         libhal_ctx_set_device_new_capability
-                                                        (LibHalContext *ctx,
-                                                         LibHalDeviceNewCapability callback);
+

libhal_ctx_set_device_new_capability ()

+
dbus_bool_t         libhal_ctx_set_device_new_capability
+                                                        (LibHalContext *ctx,
+                                                         LibHalDeviceNewCapability callback);

Set the callback for when a device gains a new capability.

@@ -1279,17 +1244,17 @@

- + - + - + @@ -1298,11 +1263,10 @@
-

-libhal_ctx_set_device_lost_capability ()

-
dbus_bool_t         libhal_ctx_set_device_lost_capability
-                                                        (LibHalContext *ctx,
-                                                         LibHalDeviceLostCapability callback);
+

libhal_ctx_set_device_lost_capability ()

+
dbus_bool_t         libhal_ctx_set_device_lost_capability
+                                                        (LibHalContext *ctx,
+                                                         LibHalDeviceLostCapability callback);

Set the callback for when a device loses a capability

@@ -1312,17 +1276,17 @@

- + - + - + @@ -1331,11 +1295,10 @@
-

-libhal_ctx_set_device_property_modified ()

-
dbus_bool_t         libhal_ctx_set_device_property_modified
-                                                        (LibHalContext *ctx,
-                                                         LibHalDevicePropertyModified callback);
+

libhal_ctx_set_device_property_modified ()

+
dbus_bool_t         libhal_ctx_set_device_property_modified
+                                                        (LibHalContext *ctx,
+                                                         LibHalDevicePropertyModified callback);

Set the callback for when a property is modified on a device.

@@ -1345,17 +1308,17 @@

- + - + - + @@ -1364,10 +1327,9 @@
-

-libhal_ctx_set_device_condition ()

-
dbus_bool_t         libhal_ctx_set_device_condition     (LibHalContext *ctx,
-                                                         LibHalDeviceCondition callback);
+

libhal_ctx_set_device_condition ()

+
dbus_bool_t         libhal_ctx_set_device_condition     (LibHalContext *ctx,
+                                                         LibHalDeviceCondition callback);

Set the callback for when a device emits a condition

@@ -1377,17 +1339,17 @@

- + - + - + @@ -1396,11 +1358,10 @@
-

-libhal_ctx_set_global_interface_lock_acquired ()

-
dbus_bool_t         libhal_ctx_set_global_interface_lock_acquired
-                                                        (LibHalContext *ctx,
-                                                         LibHalGlobalInterfaceLockAcquired callback);
+

libhal_ctx_set_global_interface_lock_acquired ()

+
dbus_bool_t         libhal_ctx_set_global_interface_lock_acquired
+                                                        (LibHalContext *ctx,
+                                                         LibHalGlobalInterfaceLockAcquired callback);

Set the callback for when a global interface lock is acquired.

@@ -1410,17 +1371,17 @@

- + - + - + @@ -1429,11 +1390,10 @@
-

-libhal_ctx_set_global_interface_lock_released ()

-
dbus_bool_t         libhal_ctx_set_global_interface_lock_released
-                                                        (LibHalContext *ctx,
-                                                         LibHalGlobalInterfaceLockReleased callback);
+

libhal_ctx_set_global_interface_lock_released ()

+
dbus_bool_t         libhal_ctx_set_global_interface_lock_released
+                                                        (LibHalContext *ctx,
+                                                         LibHalGlobalInterfaceLockReleased callback);

Set the callback for when a global interface lock is released.

@@ -1443,17 +1403,17 @@

- + - + - + @@ -1462,11 +1422,10 @@
-

-libhal_ctx_set_interface_lock_acquired ()

-
dbus_bool_t         libhal_ctx_set_interface_lock_acquired
-                                                        (LibHalContext *ctx,
-                                                         LibHalInterfaceLockAcquired callback);
+

libhal_ctx_set_interface_lock_acquired ()

+
dbus_bool_t         libhal_ctx_set_interface_lock_acquired
+                                                        (LibHalContext *ctx,
+                                                         LibHalInterfaceLockAcquired callback);

Set the callback for when an interface lock is acquired.

@@ -1476,17 +1435,17 @@

- + - + - + @@ -1495,11 +1454,10 @@
-

-libhal_ctx_set_interface_lock_released ()

-
dbus_bool_t         libhal_ctx_set_interface_lock_released
-                                                        (LibHalContext *ctx,
-                                                         LibHalInterfaceLockReleased callback);
+

libhal_ctx_set_interface_lock_released ()

+
dbus_bool_t         libhal_ctx_set_interface_lock_released
+                                                        (LibHalContext *ctx,
+                                                         LibHalInterfaceLockReleased callback);

Set the callback for when an interface lock is released.

@@ -1509,17 +1467,17 @@

- + - + - + @@ -1528,11 +1486,10 @@
-

-libhal_ctx_set_singleton_device_added ()

-
dbus_bool_t         libhal_ctx_set_singleton_device_added
-                                                        (LibHalContext *ctx,
-                                                         LibHalSingletonDeviceAdded callback);
+

libhal_ctx_set_singleton_device_added ()

+
dbus_bool_t         libhal_ctx_set_singleton_device_added
+                                                        (LibHalContext *ctx,
+                                                         LibHalSingletonDeviceAdded callback);

Set the callback for when a singleton should handle a new device

@@ -1542,17 +1499,17 @@

- + - + - + @@ -1561,11 +1518,10 @@
-

-libhal_ctx_set_singleton_device_removed ()

-
dbus_bool_t         libhal_ctx_set_singleton_device_removed
-                                                        (LibHalContext *ctx,
-                                                         LibHalSingletonDeviceRemoved callback);
+

libhal_ctx_set_singleton_device_removed ()

+
dbus_bool_t         libhal_ctx_set_singleton_device_removed
+                                                        (LibHalContext *ctx,
+                                                         LibHalSingletonDeviceRemoved callback);

Set the callback for when a singleton should discard a device

@@ -1575,17 +1531,17 @@

- + - + - + @@ -1594,9 +1550,8 @@
-

-libhal_ctx_init ()

-
dbus_bool_t         libhal_ctx_init                     (LibHalContext *ctx,
+
libhal_ctx_init ()

+
dbus_bool_t         libhal_ctx_init                     (LibHalContext *ctx,
                                                          DBusError *error);

 

 Initialize the connection to hald.

@@ -1607,17 +1562,17 @@
- + - + - + @@ -1626,9 +1581,8 @@
-

-libhal_ctx_shutdown ()

-
dbus_bool_t         libhal_ctx_shutdown                 (LibHalContext *ctx,
+
libhal_ctx_shutdown ()

+
dbus_bool_t         libhal_ctx_shutdown                 (LibHalContext *ctx,
                                                          DBusError *error);

 

 Shut down a connection to hald.

@@ -1639,17 +1593,17 @@
- + - + - + @@ -1658,9 +1612,8 @@
-

-libhal_ctx_free ()

-
dbus_bool_t         libhal_ctx_free                     (LibHalContext *ctx);
+

libhal_ctx_free ()

+
dbus_bool_t         libhal_ctx_free                     (LibHalContext *ctx);

Free a LibHalContext resource.

@@ -1670,12 +1623,12 @@

- + - + @@ -1684,9 +1637,8 @@
-

-libhal_ctx_init_direct ()

-
LibHalContext*      libhal_ctx_init_direct              (DBusError *error);
+

libhal_ctx_init_direct ()

+
LibHalContext*      libhal_ctx_init_direct              (DBusError *error);

Create an already initialized connection to hald. This function should only be used by HAL helpers.

@@ -1696,12 +1648,12 @@

- + - + @@ -1710,9 +1662,8 @@
-

-libhal_get_all_devices ()

-
char**              libhal_get_all_devices              (LibHalContext *ctx,
+
libhal_get_all_devices ()

+
char**              libhal_get_all_devices              (LibHalContext *ctx,
                                                          int *num_devices,
                                                          DBusError *error);

 

@@ -1724,25 +1675,25 @@
- + - + - + - + @@ -1750,9 +1701,8 @@
-

-libhal_device_exists ()

-
dbus_bool_t         libhal_device_exists                (LibHalContext *ctx,
+
libhal_device_exists ()

+
dbus_bool_t         libhal_device_exists                (LibHalContext *ctx,
                                                          const char *udi,
                                                          DBusError *error);

 

@@ -1764,22 +1714,22 @@
- + - + - + - + @@ -1788,9 +1738,8 @@
-

-libhal_device_print ()

-
dbus_bool_t         libhal_device_print                 (LibHalContext *ctx,
+
libhal_device_print ()

+
dbus_bool_t         libhal_device_print                 (LibHalContext *ctx,
                                                          const char *udi,
                                                          DBusError *error);

 

@@ -1802,22 +1751,22 @@
- + - + - + - + @@ -1826,9 +1775,8 @@
-

-libhal_device_property_exists ()

-
dbus_bool_t         libhal_device_property_exists       (LibHalContext *ctx,
+
libhal_device_property_exists ()

+
dbus_bool_t         libhal_device_property_exists       (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          DBusError *error);

@@ -1841,27 +1789,27 @@
- + - + - + - + - + @@ -1870,9 +1818,8 @@
-

-libhal_device_get_property_string ()

-
char*               libhal_device_get_property_string   (LibHalContext *ctx,
+
libhal_device_get_property_string ()

+
char*               libhal_device_get_property_string   (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          DBusError *error);

@@ -1885,29 +1832,29 @@
- + - + - + - + - + @@ -1916,9 +1863,8 @@
-

-libhal_device_get_property_int ()

-
dbus_int32_t        libhal_device_get_property_int      (LibHalContext *ctx,
+
libhal_device_get_property_int ()

+
dbus_int32_t        libhal_device_get_property_int      (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          DBusError *error);

@@ -1931,27 +1877,27 @@
- + - + - + - + - + @@ -1960,9 +1906,8 @@
-

-libhal_device_get_property_uint64 ()

-
dbus_uint64_t       libhal_device_get_property_uint64   (LibHalContext *ctx,
+
libhal_device_get_property_uint64 ()

+
dbus_uint64_t       libhal_device_get_property_uint64   (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          DBusError *error);

@@ -1975,27 +1920,27 @@
- + - + - + - + - + @@ -2004,9 +1949,8 @@
-

-libhal_device_get_property_double ()

-
double              libhal_device_get_property_double   (LibHalContext *ctx,
+
libhal_device_get_property_double ()

+
double              libhal_device_get_property_double   (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          DBusError *error);

@@ -2019,27 +1963,27 @@
- + - + - + - + - + @@ -2048,9 +1992,8 @@
-

-libhal_device_get_property_bool ()

-
dbus_bool_t         libhal_device_get_property_bool     (LibHalContext *ctx,
+
libhal_device_get_property_bool ()

+
dbus_bool_t         libhal_device_get_property_bool     (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          DBusError *error);

@@ -2063,27 +2006,27 @@
- + - + - + - + - + @@ -2092,9 +2035,8 @@
-

-libhal_device_get_property_strlist ()

-
char**              libhal_device_get_property_strlist  (LibHalContext *ctx,
+
libhal_device_get_property_strlist ()

+
char**              libhal_device_get_property_strlist  (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          DBusError *error);

@@ -2107,30 +2049,30 @@
- + - + - + - + - + @@ -2139,9 +2081,8 @@
-

-libhal_device_set_property_string ()

-
dbus_bool_t         libhal_device_set_property_string   (LibHalContext *ctx,
+
libhal_device_set_property_string ()

+
dbus_bool_t         libhal_device_set_property_string   (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          const char *value,
@@ -2155,32 +2096,32 @@
- + - + - + - + - + - + @@ -2190,9 +2131,8 @@
-

-libhal_device_set_property_int ()

-
dbus_bool_t         libhal_device_set_property_int      (LibHalContext *ctx,
+
libhal_device_set_property_int ()

+
dbus_bool_t         libhal_device_set_property_int      (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          dbus_int32_t value,
@@ -2206,32 +2146,32 @@
- + - + - + - + - + - + @@ -2241,9 +2181,8 @@
-

-libhal_device_set_property_uint64 ()

-
dbus_bool_t         libhal_device_set_property_uint64   (LibHalContext *ctx,
+
libhal_device_set_property_uint64 ()

+
dbus_bool_t         libhal_device_set_property_uint64   (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          dbus_uint64_t value,
@@ -2257,32 +2196,32 @@
- + - + - + - + - + - + @@ -2292,9 +2231,8 @@
-

-libhal_device_set_property_double ()

-
dbus_bool_t         libhal_device_set_property_double   (LibHalContext *ctx,
+
libhal_device_set_property_double ()

+
dbus_bool_t         libhal_device_set_property_double   (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          double value,
@@ -2308,32 +2246,32 @@
- + - + - + - + - + - + @@ -2343,9 +2281,8 @@
-

-libhal_device_set_property_bool ()

-
dbus_bool_t         libhal_device_set_property_bool     (LibHalContext *ctx,
+
libhal_device_set_property_bool ()

+
dbus_bool_t         libhal_device_set_property_bool     (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          dbus_bool_t value,
@@ -2359,32 +2296,32 @@
- + - + - + - + - + - + @@ -2394,10 +2331,9 @@
-

-libhal_device_property_strlist_append ()

-
dbus_bool_t         libhal_device_property_strlist_append
-                                                        (LibHalContext *ctx,
+
libhal_device_property_strlist_append ()

+
dbus_bool_t         libhal_device_property_strlist_append
+                                                        (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          const char *value,
@@ -2411,32 +2347,32 @@
- + - + - + - + - + - + @@ -2446,10 +2382,9 @@
-

-libhal_device_property_strlist_prepend ()

-
dbus_bool_t         libhal_device_property_strlist_prepend
-                                                        (LibHalContext *ctx,
+
libhal_device_property_strlist_prepend ()

+
dbus_bool_t         libhal_device_property_strlist_prepend
+                                                        (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          const char *value,
@@ -2463,32 +2398,32 @@
- + - + - + - + - + - + @@ -2498,10 +2433,9 @@
-

-libhal_device_property_strlist_remove_index ()

-
dbus_bool_t         libhal_device_property_strlist_remove_index
-                                                        (LibHalContext *ctx,
+
libhal_device_property_strlist_remove_index ()

+
dbus_bool_t         libhal_device_property_strlist_remove_index
+                                                        (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          unsigned int idx,
@@ -2515,32 +2449,32 @@
- + - + - + - + - + - + @@ -2550,10 +2484,9 @@
-

-libhal_device_property_strlist_remove ()

-
dbus_bool_t         libhal_device_property_strlist_remove
-                                                        (LibHalContext *ctx,
+
libhal_device_property_strlist_remove ()

+
dbus_bool_t         libhal_device_property_strlist_remove
+                                                        (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          const char *value,
@@ -2567,32 +2500,32 @@
- + - + - + - + - + - + @@ -2602,9 +2535,8 @@
-

-libhal_device_remove_property ()

-
dbus_bool_t         libhal_device_remove_property       (LibHalContext *ctx,
+
libhal_device_remove_property ()

+
dbus_bool_t         libhal_device_remove_property       (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          DBusError *error);

@@ -2617,27 +2549,27 @@
- + - + - + - + - + @@ -2647,9 +2579,8 @@
-

-libhal_device_get_property_type ()

-
LibHalPropertyType  libhal_device_get_property_type     (LibHalContext *ctx,
+
libhal_device_get_property_type ()

+
LibHalPropertyType  libhal_device_get_property_type     (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *key,
                                                          DBusError *error);

@@ -2662,27 +2593,27 @@
- + - + - + - + - + @@ -2692,18 +2623,16 @@
-

-struct LibHalChangeSet_s

-
struct LibHalChangeSet_s;
+

struct LibHalChangeSet_s

+
struct LibHalChangeSet_s;

-

-LibHalChangeSet

-
typedef struct LibHalChangeSet_s LibHalChangeSet;
+
LibHalChangeSet

+
typedef struct LibHalChangeSet_s LibHalChangeSet;
 

 

 
@@ -2711,9 +2640,8 @@
-

-libhal_device_new_changeset ()

-
LibHalChangeSet*    libhal_device_new_changeset         (const char *udi);
+

libhal_device_new_changeset ()

+
LibHalChangeSet*    libhal_device_new_changeset         (const char *udi);

Request a new changeset object. Used for changing multiple properties at once. Useful when performance is critical and also for atomically updating several properties.

@@ -2724,12 +2652,12 @@
- + - + @@ -2738,10 +2666,9 @@
-

-libhal_changeset_set_property_string ()

-
dbus_bool_t         libhal_changeset_set_property_string
-                                                        (LibHalChangeSet *changeset,
+
libhal_changeset_set_property_string ()

+
dbus_bool_t         libhal_changeset_set_property_string
+                                                        (LibHalChangeSet *changeset,
                                                          const char *key,
                                                          const char *value);

 

@@ -2753,22 +2680,22 @@
- + - + - + - + @@ -2777,9 +2704,8 @@
-

-libhal_changeset_set_property_int ()

-
dbus_bool_t         libhal_changeset_set_property_int   (LibHalChangeSet *changeset,
+
libhal_changeset_set_property_int ()

+
dbus_bool_t         libhal_changeset_set_property_int   (LibHalChangeSet *changeset,
                                                          const char *key,
                                                          dbus_int32_t value);

 

@@ -2791,22 +2717,22 @@
- + - + - + - + @@ -2815,10 +2741,9 @@
-

-libhal_changeset_set_property_uint64 ()

-
dbus_bool_t         libhal_changeset_set_property_uint64
-                                                        (LibHalChangeSet *changeset,
+
libhal_changeset_set_property_uint64 ()

+
dbus_bool_t         libhal_changeset_set_property_uint64
+                                                        (LibHalChangeSet *changeset,
                                                          const char *key,
                                                          dbus_uint64_t value);

 

@@ -2830,22 +2755,22 @@
- + - + - + - + @@ -2854,10 +2779,9 @@
-

-libhal_changeset_set_property_double ()

-
dbus_bool_t         libhal_changeset_set_property_double
-                                                        (LibHalChangeSet *changeset,
+
libhal_changeset_set_property_double ()

+
dbus_bool_t         libhal_changeset_set_property_double
+                                                        (LibHalChangeSet *changeset,
                                                          const char *key,
                                                          double value);

 

@@ -2869,22 +2793,22 @@
- + - + - + - + @@ -2893,9 +2817,8 @@
-

-libhal_changeset_set_property_bool ()

-
dbus_bool_t         libhal_changeset_set_property_bool  (LibHalChangeSet *changeset,
+
libhal_changeset_set_property_bool ()

+
dbus_bool_t         libhal_changeset_set_property_bool  (LibHalChangeSet *changeset,
                                                          const char *key,
                                                          dbus_bool_t value);

 

@@ -2907,22 +2830,22 @@
- + - + - + - + @@ -2931,10 +2854,9 @@
-

-libhal_changeset_set_property_strlist ()

-
dbus_bool_t         libhal_changeset_set_property_strlist
-                                                        (LibHalChangeSet *changeset,
+
libhal_changeset_set_property_strlist ()

+
dbus_bool_t         libhal_changeset_set_property_strlist
+                                                        (LibHalChangeSet *changeset,
                                                          const char *key,
                                                          const char **value);

 

@@ -2946,22 +2868,22 @@
- + - + - + - + @@ -2970,10 +2892,9 @@
-

-libhal_device_commit_changeset ()

-
dbus_bool_t         libhal_device_commit_changeset      (LibHalContext *ctx,
-                                                         LibHalChangeSet *changeset,
+
libhal_device_commit_changeset ()

+
dbus_bool_t         libhal_device_commit_changeset      (LibHalContext *ctx,
+                                                         LibHalChangeSet *changeset,
                                                          DBusError *error);

 

 Commit a changeset to the daemon.

@@ -2984,22 +2905,22 @@
- + - + - + - + @@ -3008,9 +2929,8 @@
-

-libhal_device_free_changeset ()

-
void                libhal_device_free_changeset        (LibHalChangeSet *changeset);
+

libhal_device_free_changeset ()

+
void                libhal_device_free_changeset        (LibHalChangeSet *changeset);

Free a changeset.

@@ -3019,7 +2939,7 @@

Returns :

Returns :

 a new uninitialized LibHalContext object

ctx :

ctx :

 context to enable/disable cache for

use_cache :

use_cache :

 whether or not to use cache

Returns :

Returns :

 TRUE if cache was successfully enabled/disabled, FALSE otherwise

ctx :

ctx :

 context to set connection for

conn :

conn :

 DBus connection to use

Returns :

Returns :

 TRUE if connection was successfully set, FALSE otherwise

ctx :

ctx :

 context to get connection for

Returns :

Returns :

 DBus connection to use or NULL

ctx :

ctx :

 the context for the connection to hald

user_data :

user_data :

 user data

Returns :

Returns :

 TRUE if user data was successfully set, FALSE if otherwise

ctx :

ctx :

 the context for the connection to hald

Returns :

 opaque pointer stored through libhal_ctx_set_user_data() or NULL if not set. +

Returns :

 opaque pointer stored through libhal_ctx_set_user_data() or NULL if not set.

ctx :

ctx :

 the context for the connection to hald

callback :

callback :

 the function to call when a device is added

Returns :

Returns :

 TRUE if callback was successfully set, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

callback :

callback :

 the function to call when a device is removed

Returns :

Returns :

 TRUE if callback was successfully set, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

callback :

callback :

 the function to call when a device gains a new capability

Returns :

Returns :

 TRUE if callback was successfully set, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

callback :

callback :

 the function to call when a device loses a capability

Returns :

Returns :

 TRUE if callback was successfully set, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

callback :

callback :

 the function to call when a property is modified on a device

Returns :

Returns :

 TRUE if callback was successfully set, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

callback :

callback :

 the function to call when a device emits a condition

Returns :

Returns :

 TRUE if callback was successfully set, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

callback :

callback :

 the callback

Returns :

Returns :

 TRUE if callback was successfully set, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

callback :

callback :

 the callback

Returns :

Returns :

 TRUE if callback was successfully set, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

callback :

callback :

 the callback

Returns :

Returns :

 TRUE if callback was successfully set, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

callback :

callback :

 the callback

Returns :

Returns :

 TRUE if callback was successfully set, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

callback :

callback :

 the function to call when a device emits a condition

Returns :

Returns :

 TRUE if callback was successfully set, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

callback :

callback :

 the function to call when a device emits a condition

Returns :

Returns :

 TRUE if callback was successfully set, FALSE otherwise

ctx :

ctx :

 Context for connection to hald (D-BUS connection should be set with libhal_ctx_set_dbus_connection)

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if initialization succeeds, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if connection successfully shut down, FALSE otherwise

ctx :

ctx :

 pointer to a LibHalContext

Returns :

Returns :

 TRUE

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 A pointer to an already initialized LibHalContext

ctx :

ctx :

 the context for the connection to hald

num_devices :

num_devices :

 the number of devices will be stored here

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 An array of device identifiers terminated with NULL. It is the responsibility of the caller to free with -libhal_free_string_array(). If an error occurs NULL is returned. +libhal_free_string_array(). If an error occurs NULL is returned.

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique device id.

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if the device exists

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if device's information could be obtained, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique device id.

key :

key :

 name of the property

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if the device exists, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

key :

key :

 the name of the property

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 UTF8 nul-terminated string. The caller is responsible for -freeing this string with the function libhal_free_string(). Returns +freeing this string with the function libhal_free_string(). Returns NULL if the property didn't exist or we are OOM.

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

key :

key :

 name of the property

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 Property value (32-bit signed integer)

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

key :

key :

 name of the property

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 Property value (64-bit unsigned integer)

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

key :

key :

 name of the property

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 Property value (IEEE754 double precision float)

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

key :

key :

 name of the property

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 Property value (boolean)

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 unique Device Id

key :

key :

 name of the property

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 Array of pointers to UTF8 nul-terminated strings terminated by NULL. The caller is responsible for freeing this -string array with the function libhal_free_string_array(). Returns +string array with the function libhal_free_string_array(). Returns NULL if the property didn't exist or we are OOM

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

key :

key :

 name of the property

value :

value :

 value of the property; a UTF8 string

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if the property was set, FALSE if the device didn't exist or the property had a different type.

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

key :

key :

 name of the property

value :

value :

 value of the property

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if the property was set, FALSE if the device didn't exist or the property had a different type.

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

key :

key :

 name of the property

value :

value :

 value of the property

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if the property was set, FALSE if the device didn't exist or the property had a different type.

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

key :

key :

 name of the property

value :

value :

 value of the property

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if the property was set, FALSE if the device didn't exist or the property had a different type.

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

key :

key :

 name of the property

value :

value :

 value of the property

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if the property was set, FALSE if the device didn't exist or the property had a different type.

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

key :

key :

 name of the property

value :

value :

 value to append to property

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if the value was appended, FALSE if the device didn't exist or the property had a different type.

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

key :

key :

 name of the property

value :

value :

 value to prepend to property

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if the value was prepended, FALSE if the device didn't exist or the property had a different type.

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

key :

key :

 name of the property

idx :

idx :

 index of string to remove in the strlist

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if the string was removed, FALSE if the device didn't exist or the property had a different type.

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

key :

key :

 name of the property

value :

value :

 the string to remove

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if the string was removed, FALSE if the device didn't exist or the property had a different type.

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

key :

key :

 name of the property

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if the property was set, FALSE if the device didn't exist

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

key :

key :

 name of the property

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 A LibHalPropertyType. LIBHAL_PROPERTY_TYPE_INVALID is return if the property doesn't exist.

udi :

udi :

 unique device identifier

Returns :

Returns :

 A new changeset object or NULL on error

changeset :

changeset :

 the changeset

key :

key :

 key of property

value :

value :

 the value to set

Returns :

Returns :

 FALSE on OOM

changeset :

changeset :

 the changeset

key :

key :

 key of property

value :

value :

 the value to set

Returns :

Returns :

 FALSE on OOM

changeset :

changeset :

 the changeset

key :

key :

 key of property

value :

value :

 the value to set

Returns :

Returns :

 FALSE on OOM

changeset :

changeset :

 the changeset

key :

key :

 key of property

value :

value :

 the value to set

Returns :

Returns :

 FALSE on OOM

changeset :

changeset :

 the changeset

key :

key :

 key of property

value :

value :

 the value to set

Returns :

Returns :

 FALSE on OOM

changeset :

changeset :

 the changeset

key :

key :

 key of property

value :

value :

 the value to set - NULL terminated array of strings

Returns :

Returns :

 FALSE on OOM

ctx :

ctx :

 the context for the connection to hald

changeset :

changeset :

 the changeset to commit

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 True if the changeset was committed on the daemon side
- + @@ -3027,9 +2947,8 @@
-

-libhal_device_get_all_properties ()

-
LibHalPropertySet*  libhal_device_get_all_properties    (LibHalContext *ctx,
+
libhal_device_get_all_properties ()

+
LibHalPropertySet*  libhal_device_get_all_properties    (LibHalContext *ctx,
                                                          const char *udi,
                                                          DBusError *error);

 

@@ -3041,23 +2960,23 @@
- + - + - + - - + @@ -3065,13 +2984,12 @@
-

-libhal_get_all_devices_with_properties ()

-
dbus_bool_t         libhal_get_all_devices_with_properties
-                                                        (LibHalContext *ctx,
+
libhal_get_all_devices_with_properties ()

+
dbus_bool_t         libhal_get_all_devices_with_properties
+                                                        (LibHalContext *ctx,
                                                          int *out_num_devices,
                                                          char ***out_udi,
-                                                         LibHalPropertySet ***out_properties,
+                                                         LibHalPropertySet ***out_properties,
                                                          DBusError *error);

 

 Get all devices in the hal database as well as all properties for each device.
@@ -3085,32 +3003,32 @@
- + - + - - + - - + - + - + + + --- hal-0.5.11~rc2.orig/doc/api/libhal-storage/xml/libhal-storage.xml +++ hal-0.5.11~rc2/doc/api/libhal-storage/xml/libhal-storage.xml @@ -5,7 +5,7 @@ ]> -libhal-storage +libhal-storage 3 LIBHAL-STORAGE Library @@ -16,13 +16,10 @@ - + Synopsis - - - struct LibHalDrive_s; typedef LibHalDrive; struct LibHalVolume_s; @@ -125,57 +122,57 @@ - + Description - + Details - -<anchor id="LibHalDrive-s" role="struct"/>struct LibHalDrive_s -LibHalDrive_sstruct LibHalDrive_s; + +struct LibHalDrive_s +LibHalDrive_sstruct LibHalDrive_s; - -<anchor id="LibHalDrive" role="typedef"/>LibHalDrive -LibHalDrivetypedef struct LibHalDrive_s LibHalDrive; + +LibHalDrive +LibHalDrivetypedef struct LibHalDrive_s LibHalDrive; - -<anchor id="LibHalVolume-s" role="struct"/>struct LibHalVolume_s -LibHalVolume_sstruct LibHalVolume_s; + +struct LibHalVolume_s +LibHalVolume_sstruct LibHalVolume_s; - -<anchor id="LibHalVolume" role="typedef"/>LibHalVolume -LibHalVolumetypedef struct LibHalVolume_s LibHalVolume; + +LibHalVolume +LibHalVolumetypedef struct LibHalVolume_s LibHalVolume; - -<anchor id="LibHalStoragePolicy-s" role="struct"/>struct LibHalStoragePolicy_s -LibHalStoragePolicy_sstruct LibHalStoragePolicy_s; + +struct LibHalStoragePolicy_s +LibHalStoragePolicy_sstruct LibHalStoragePolicy_s; - -<anchor id="LibHalStoragePolicy" role="typedef"/>LibHalStoragePolicy -LibHalStoragePolicytypedef struct LibHalStoragePolicy_s LibHalStoragePolicy; + +LibHalStoragePolicy +LibHalStoragePolicytypedef struct LibHalStoragePolicy_s LibHalStoragePolicy; - -<anchor id="LibHalStoragePolicyIcon" role="enum"/>enum LibHalStoragePolicyIcon -LibHalStoragePolicyIcontypedef enum { + +enum LibHalStoragePolicyIcon +LibHalStoragePolicyIcontypedef enum { LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK = 0x10000, LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_IDE = 0x10001, LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_SCSI = 0x10002, @@ -262,9 +259,9 @@ - -<anchor id="LibHalStoragePolicyIconPair" role="struct"/>LibHalStoragePolicyIconPair -LibHalStoragePolicyIconPairtypedef struct { + +LibHalStoragePolicyIconPair +LibHalStoragePolicyIconPairtypedef struct { LibHalStoragePolicyIcon icon; const char *icon_path; } LibHalStoragePolicyIconPair; @@ -272,9 +269,9 @@ - -<anchor id="libhal-storage-policy-new" role="function"/>libhal_storage_policy_new () -libhal_storage_policy_newLibHalStoragePolicy* libhal_storage_policy_new (); + +libhal_storage_policy_new () +libhal_storage_policy_newLibHalStoragePolicy* libhal_storage_policy_new (); @@ -283,9 +280,9 @@ - -<anchor id="libhal-drive-from-device-file" role="function"/>libhal_drive_from_device_file () -libhal_drive_from_device_fileLibHalDrive* libhal_drive_from_device_file (LibHalContext *hal_ctx, + +libhal_drive_from_device_file () +libhal_drive_from_device_fileLibHalDrive* libhal_drive_from_device_file (LibHalContext *hal_ctx, const char *device_file); @@ -304,9 +301,9 @@ (when given e.g. /dev/sdb1) the given device file. - -<anchor id="libhal-drive-free" role="function"/>libhal_drive_free () -libhal_drive_freevoid libhal_drive_free (LibHalDrive *drive); + +libhal_drive_free () +libhal_drive_freevoid libhal_drive_free (LibHalDrive *drive); Free all resources used by a LibHalDrive object. @@ -316,9 +313,9 @@ Object to free - -<anchor id="libhal-drive-is-hotpluggable" role="function"/>libhal_drive_is_hotpluggable () -libhal_drive_is_hotpluggabledbus_bool_t libhal_drive_is_hotpluggable (LibHalDrive *drive); + +libhal_drive_is_hotpluggable () +libhal_drive_is_hotpluggabledbus_bool_t libhal_drive_is_hotpluggable (LibHalDrive *drive); @@ -330,9 +327,9 @@ - -<anchor id="libhal-drive-uses-removable-media" role="function"/>libhal_drive_uses_removable_media () -libhal_drive_uses_removable_mediadbus_bool_t libhal_drive_uses_removable_media (LibHalDrive *drive); + +libhal_drive_uses_removable_media () +libhal_drive_uses_removable_mediadbus_bool_t libhal_drive_uses_removable_media (LibHalDrive *drive); @@ -344,9 +341,9 @@ - -<anchor id="libhal-drive-is-media-detected" role="function"/>libhal_drive_is_media_detected () -libhal_drive_is_media_detecteddbus_bool_t libhal_drive_is_media_detected (LibHalDrive *drive); + +libhal_drive_is_media_detected () +libhal_drive_is_media_detecteddbus_bool_t libhal_drive_is_media_detected (LibHalDrive *drive); @@ -358,9 +355,9 @@ - -<anchor id="libhal-drive-is-media-detection-automatic" role="function"/>libhal_drive_is_media_detection_automatic () -libhal_drive_is_media_detection_automaticdbus_bool_t libhal_drive_is_media_detection_automatic + +libhal_drive_is_media_detection_automatic () +libhal_drive_is_media_detection_automaticdbus_bool_t libhal_drive_is_media_detection_automatic (LibHalDrive *drive); @@ -373,9 +370,9 @@ - -<anchor id="libhal-drive-get-size" role="function"/>libhal_drive_get_size () -libhal_drive_get_sizedbus_uint64_t libhal_drive_get_size (LibHalDrive *drive); + +libhal_drive_get_size () +libhal_drive_get_sizedbus_uint64_t libhal_drive_get_size (LibHalDrive *drive); @@ -387,9 +384,9 @@ - -<anchor id="libhal-drive-get-media-size" role="function"/>libhal_drive_get_media_size () -libhal_drive_get_media_sizedbus_uint64_t libhal_drive_get_media_size (LibHalDrive *drive); + +libhal_drive_get_media_size () +libhal_drive_get_media_sizedbus_uint64_t libhal_drive_get_media_size (LibHalDrive *drive); @@ -401,9 +398,9 @@ - -<anchor id="libhal-drive-get-partition-scheme" role="function"/>libhal_drive_get_partition_scheme () -libhal_drive_get_partition_schemeconst char* libhal_drive_get_partition_scheme (LibHalDrive *drive); + +libhal_drive_get_partition_scheme () +libhal_drive_get_partition_schemeconst char* libhal_drive_get_partition_scheme (LibHalDrive *drive); @@ -415,9 +412,9 @@ - -<anchor id="libhal-drive-no-partitions-hint" role="function"/>libhal_drive_no_partitions_hint () -libhal_drive_no_partitions_hintdbus_bool_t libhal_drive_no_partitions_hint (LibHalDrive *drive); + +libhal_drive_no_partitions_hint () +libhal_drive_no_partitions_hintdbus_bool_t libhal_drive_no_partitions_hint (LibHalDrive *drive); @@ -429,9 +426,9 @@ - -<anchor id="libhal-drive-requires-eject" role="function"/>libhal_drive_requires_eject () -libhal_drive_requires_ejectdbus_bool_t libhal_drive_requires_eject (LibHalDrive *drive); + +libhal_drive_requires_eject () +libhal_drive_requires_ejectdbus_bool_t libhal_drive_requires_eject (LibHalDrive *drive); @@ -443,9 +440,9 @@ - -<anchor id="libhal-drive-get-type" role="function"/>libhal_drive_get_type () -libhal_drive_get_typeLibHalDriveType libhal_drive_get_type (LibHalDrive *drive); + +libhal_drive_get_type () +libhal_drive_get_typeLibHalDriveType libhal_drive_get_type (LibHalDrive *drive); @@ -457,9 +454,9 @@ - -<anchor id="libhal-drive-get-bus" role="function"/>libhal_drive_get_bus () -libhal_drive_get_busLibHalDriveBus libhal_drive_get_bus (LibHalDrive *drive); + +libhal_drive_get_bus () +libhal_drive_get_busLibHalDriveBus libhal_drive_get_bus (LibHalDrive *drive); @@ -471,9 +468,9 @@ - -<anchor id="libhal-drive-get-cdrom-caps" role="function"/>libhal_drive_get_cdrom_caps () -libhal_drive_get_cdrom_capsLibHalDriveCdromCaps libhal_drive_get_cdrom_caps (LibHalDrive *drive); + +libhal_drive_get_cdrom_caps () +libhal_drive_get_cdrom_capsLibHalDriveCdromCaps libhal_drive_get_cdrom_caps (LibHalDrive *drive); @@ -485,9 +482,9 @@ - -<anchor id="libhal-drive-get-device-major" role="function"/>libhal_drive_get_device_major () -libhal_drive_get_device_majorunsigned int libhal_drive_get_device_major (LibHalDrive *drive); + +libhal_drive_get_device_major () +libhal_drive_get_device_majorunsigned int libhal_drive_get_device_major (LibHalDrive *drive); @@ -499,9 +496,9 @@ - -<anchor id="libhal-drive-get-device-minor" role="function"/>libhal_drive_get_device_minor () -libhal_drive_get_device_minorunsigned int libhal_drive_get_device_minor (LibHalDrive *drive); + +libhal_drive_get_device_minor () +libhal_drive_get_device_minorunsigned int libhal_drive_get_device_minor (LibHalDrive *drive); @@ -513,9 +510,9 @@ - -<anchor id="libhal-drive-get-type-textual" role="function"/>libhal_drive_get_type_textual () -libhal_drive_get_type_textualconst char* libhal_drive_get_type_textual (LibHalDrive *drive); + +libhal_drive_get_type_textual () +libhal_drive_get_type_textualconst char* libhal_drive_get_type_textual (LibHalDrive *drive); @@ -527,9 +524,9 @@ - -<anchor id="libhal-drive-get-device-file" role="function"/>libhal_drive_get_device_file () -libhal_drive_get_device_fileconst char* libhal_drive_get_device_file (LibHalDrive *drive); + +libhal_drive_get_device_file () +libhal_drive_get_device_fileconst char* libhal_drive_get_device_file (LibHalDrive *drive); @@ -541,9 +538,9 @@ - -<anchor id="libhal-drive-get-udi" role="function"/>libhal_drive_get_udi () -libhal_drive_get_udiconst char* libhal_drive_get_udi (LibHalDrive *drive); + +libhal_drive_get_udi () +libhal_drive_get_udiconst char* libhal_drive_get_udi (LibHalDrive *drive); @@ -555,9 +552,9 @@ - -<anchor id="libhal-drive-get-serial" role="function"/>libhal_drive_get_serial () -libhal_drive_get_serialconst char* libhal_drive_get_serial (LibHalDrive *drive); + +libhal_drive_get_serial () +libhal_drive_get_serialconst char* libhal_drive_get_serial (LibHalDrive *drive); @@ -569,9 +566,9 @@ - -<anchor id="libhal-drive-get-firmware-version" role="function"/>libhal_drive_get_firmware_version () -libhal_drive_get_firmware_versionconst char* libhal_drive_get_firmware_version (LibHalDrive *drive); + +libhal_drive_get_firmware_version () +libhal_drive_get_firmware_versionconst char* libhal_drive_get_firmware_version (LibHalDrive *drive); @@ -583,9 +580,9 @@ - -<anchor id="libhal-drive-get-model" role="function"/>libhal_drive_get_model () -libhal_drive_get_modelconst char* libhal_drive_get_model (LibHalDrive *drive); + +libhal_drive_get_model () +libhal_drive_get_modelconst char* libhal_drive_get_model (LibHalDrive *drive); @@ -597,9 +594,9 @@ - -<anchor id="libhal-drive-get-vendor" role="function"/>libhal_drive_get_vendor () -libhal_drive_get_vendorconst char* libhal_drive_get_vendor (LibHalDrive *drive); + +libhal_drive_get_vendor () +libhal_drive_get_vendorconst char* libhal_drive_get_vendor (LibHalDrive *drive); @@ -611,9 +608,9 @@ - -<anchor id="libhal-drive-get-physical-device-udi" role="function"/>libhal_drive_get_physical_device_udi () -libhal_drive_get_physical_device_udiconst char* libhal_drive_get_physical_device_udi + +libhal_drive_get_physical_device_udi () +libhal_drive_get_physical_device_udiconst char* libhal_drive_get_physical_device_udi (LibHalDrive *drive); @@ -626,9 +623,9 @@ - -<anchor id="libhal-drive-get-dedicated-icon-drive" role="function"/>libhal_drive_get_dedicated_icon_drive () -libhal_drive_get_dedicated_icon_driveconst char* libhal_drive_get_dedicated_icon_drive + +libhal_drive_get_dedicated_icon_drive () +libhal_drive_get_dedicated_icon_driveconst char* libhal_drive_get_dedicated_icon_drive (LibHalDrive *drive); @@ -641,9 +638,9 @@ - -<anchor id="libhal-drive-get-dedicated-icon-volume" role="function"/>libhal_drive_get_dedicated_icon_volume () -libhal_drive_get_dedicated_icon_volumeconst char* libhal_drive_get_dedicated_icon_volume + +libhal_drive_get_dedicated_icon_volume () +libhal_drive_get_dedicated_icon_volumeconst char* libhal_drive_get_dedicated_icon_volume (LibHalDrive *drive); @@ -656,9 +653,9 @@ - -<anchor id="libhal-drive-policy-compute-display-name" role="function"/>libhal_drive_policy_compute_display_name () -libhal_drive_policy_compute_display_namechar* libhal_drive_policy_compute_display_name + +libhal_drive_policy_compute_display_name () +libhal_drive_policy_compute_display_namechar* libhal_drive_policy_compute_display_name (LibHalDrive *drive, LibHalVolume *volume); @@ -675,9 +672,9 @@ - -<anchor id="libhal-drive-policy-default-get-mount-root" role="function"/>libhal_drive_policy_default_get_mount_root () -libhal_drive_policy_default_get_mount_rootchar* libhal_drive_policy_default_get_mount_root + +libhal_drive_policy_default_get_mount_root () +libhal_drive_policy_default_get_mount_rootchar* libhal_drive_policy_default_get_mount_root (); @@ -687,9 +684,9 @@ - -<anchor id="libhal-volume-from-device-file" role="function"/>libhal_volume_from_device_file () -libhal_volume_from_device_fileLibHalVolume* libhal_volume_from_device_file (LibHalContext *hal_ctx, + +libhal_volume_from_device_file () +libhal_volume_from_device_fileLibHalVolume* libhal_volume_from_device_file (LibHalContext *hal_ctx, const char *device_file); @@ -707,9 +704,9 @@ Get the volume object for a given device file. - -<anchor id="libhal-volume-from-mount-point" role="function"/>libhal_volume_from_mount_point () -libhal_volume_from_mount_pointLibHalVolume* libhal_volume_from_mount_point (LibHalContext *hal_ctx, + +libhal_volume_from_mount_point () +libhal_volume_from_mount_pointLibHalVolume* libhal_volume_from_mount_point (LibHalContext *hal_ctx, const char *mount_point); @@ -727,9 +724,9 @@ Get the volume object for a given mount point - -<anchor id="libhal-volume-free" role="function"/>libhal_volume_free () -libhal_volume_freevoid libhal_volume_free (LibHalVolume *volume); + +libhal_volume_free () +libhal_volume_freevoid libhal_volume_free (LibHalVolume *volume); Free all resources used by a LibHalVolume object. @@ -739,9 +736,9 @@ Object to free - -<anchor id="libhal-volume-get-size" role="function"/>libhal_volume_get_size () -libhal_volume_get_sizedbus_uint64_t libhal_volume_get_size (LibHalVolume *volume); + +libhal_volume_get_size () +libhal_volume_get_sizedbus_uint64_t libhal_volume_get_size (LibHalVolume *volume); @@ -753,9 +750,9 @@ - -<anchor id="libhal-volume-get-disc-capacity" role="function"/>libhal_volume_get_disc_capacity () -libhal_volume_get_disc_capacitydbus_uint64_t libhal_volume_get_disc_capacity (LibHalVolume *volume); + +libhal_volume_get_disc_capacity () +libhal_volume_get_disc_capacitydbus_uint64_t libhal_volume_get_disc_capacity (LibHalVolume *volume); @@ -767,9 +764,9 @@ - -<anchor id="libhal-volume-get-udi" role="function"/>libhal_volume_get_udi () -libhal_volume_get_udiconst char* libhal_volume_get_udi (LibHalVolume *volume); + +libhal_volume_get_udi () +libhal_volume_get_udiconst char* libhal_volume_get_udi (LibHalVolume *volume); @@ -781,9 +778,9 @@ - -<anchor id="libhal-volume-get-device-file" role="function"/>libhal_volume_get_device_file () -libhal_volume_get_device_fileconst char* libhal_volume_get_device_file (LibHalVolume *volume); + +libhal_volume_get_device_file () +libhal_volume_get_device_fileconst char* libhal_volume_get_device_file (LibHalVolume *volume); @@ -795,9 +792,9 @@ - -<anchor id="libhal-volume-get-device-major" role="function"/>libhal_volume_get_device_major () -libhal_volume_get_device_majorunsigned int libhal_volume_get_device_major (LibHalVolume *volume); + +libhal_volume_get_device_major () +libhal_volume_get_device_majorunsigned int libhal_volume_get_device_major (LibHalVolume *volume); @@ -809,9 +806,9 @@ - -<anchor id="libhal-volume-get-device-minor" role="function"/>libhal_volume_get_device_minor () -libhal_volume_get_device_minorunsigned int libhal_volume_get_device_minor (LibHalVolume *volume); + +libhal_volume_get_device_minor () +libhal_volume_get_device_minorunsigned int libhal_volume_get_device_minor (LibHalVolume *volume); @@ -823,9 +820,9 @@ - -<anchor id="libhal-volume-get-fstype" role="function"/>libhal_volume_get_fstype () -libhal_volume_get_fstypeconst char* libhal_volume_get_fstype (LibHalVolume *volume); + +libhal_volume_get_fstype () +libhal_volume_get_fstypeconst char* libhal_volume_get_fstype (LibHalVolume *volume); @@ -837,9 +834,9 @@ - -<anchor id="libhal-volume-get-fsversion" role="function"/>libhal_volume_get_fsversion () -libhal_volume_get_fsversionconst char* libhal_volume_get_fsversion (LibHalVolume *volume); + +libhal_volume_get_fsversion () +libhal_volume_get_fsversionconst char* libhal_volume_get_fsversion (LibHalVolume *volume); @@ -851,9 +848,9 @@ - -<anchor id="libhal-volume-get-fsusage" role="function"/>libhal_volume_get_fsusage () -libhal_volume_get_fsusageLibHalVolumeUsage libhal_volume_get_fsusage (LibHalVolume *volume); + +libhal_volume_get_fsusage () +libhal_volume_get_fsusageLibHalVolumeUsage libhal_volume_get_fsusage (LibHalVolume *volume); @@ -865,9 +862,9 @@ - -<anchor id="libhal-volume-is-mounted" role="function"/>libhal_volume_is_mounted () -libhal_volume_is_mounteddbus_bool_t libhal_volume_is_mounted (LibHalVolume *volume); + +libhal_volume_is_mounted () +libhal_volume_is_mounteddbus_bool_t libhal_volume_is_mounted (LibHalVolume *volume); @@ -879,9 +876,9 @@ - -<anchor id="libhal-volume-is-mounted-read-only" role="function"/>libhal_volume_is_mounted_read_only () -libhal_volume_is_mounted_read_onlydbus_bool_t libhal_volume_is_mounted_read_only (LibHalVolume *volume); + +libhal_volume_is_mounted_read_only () +libhal_volume_is_mounted_read_onlydbus_bool_t libhal_volume_is_mounted_read_only (LibHalVolume *volume); @@ -893,9 +890,9 @@ - -<anchor id="libhal-volume-is-partition" role="function"/>libhal_volume_is_partition () -libhal_volume_is_partitiondbus_bool_t libhal_volume_is_partition (LibHalVolume *volume); + +libhal_volume_is_partition () +libhal_volume_is_partitiondbus_bool_t libhal_volume_is_partition (LibHalVolume *volume); @@ -907,9 +904,9 @@ - -<anchor id="libhal-volume-is-disc" role="function"/>libhal_volume_is_disc () -libhal_volume_is_discdbus_bool_t libhal_volume_is_disc (LibHalVolume *volume); + +libhal_volume_is_disc () +libhal_volume_is_discdbus_bool_t libhal_volume_is_disc (LibHalVolume *volume); @@ -921,9 +918,9 @@ - -<anchor id="libhal-volume-get-partition-scheme" role="function"/>libhal_volume_get_partition_scheme () -libhal_volume_get_partition_schemeconst char* libhal_volume_get_partition_scheme (LibHalVolume *volume); + +libhal_volume_get_partition_scheme () +libhal_volume_get_partition_schemeconst char* libhal_volume_get_partition_scheme (LibHalVolume *volume); @@ -935,9 +932,9 @@ - -<anchor id="libhal-volume-get-partition-type" role="function"/>libhal_volume_get_partition_type () -libhal_volume_get_partition_typeconst char* libhal_volume_get_partition_type (LibHalVolume *volume); + +libhal_volume_get_partition_type () +libhal_volume_get_partition_typeconst char* libhal_volume_get_partition_type (LibHalVolume *volume); @@ -949,9 +946,9 @@ - -<anchor id="libhal-volume-get-partition-label" role="function"/>libhal_volume_get_partition_label () -libhal_volume_get_partition_labelconst char* libhal_volume_get_partition_label (LibHalVolume *volume); + +libhal_volume_get_partition_label () +libhal_volume_get_partition_labelconst char* libhal_volume_get_partition_label (LibHalVolume *volume); @@ -963,9 +960,9 @@ - -<anchor id="libhal-volume-get-partition-uuid" role="function"/>libhal_volume_get_partition_uuid () -libhal_volume_get_partition_uuidconst char* libhal_volume_get_partition_uuid (LibHalVolume *volume); + +libhal_volume_get_partition_uuid () +libhal_volume_get_partition_uuidconst char* libhal_volume_get_partition_uuid (LibHalVolume *volume); @@ -977,9 +974,9 @@ - -<anchor id="libhal-volume-get-partition-flags" role="function"/>libhal_volume_get_partition_flags () -libhal_volume_get_partition_flagsconst char** libhal_volume_get_partition_flags (LibHalVolume *volume); + +libhal_volume_get_partition_flags () +libhal_volume_get_partition_flagsconst char** libhal_volume_get_partition_flags (LibHalVolume *volume); @@ -991,9 +988,9 @@ - -<anchor id="libhal-volume-get-partition-number" role="function"/>libhal_volume_get_partition_number () -libhal_volume_get_partition_numberunsigned int libhal_volume_get_partition_number (LibHalVolume *volume); + +libhal_volume_get_partition_number () +libhal_volume_get_partition_numberunsigned int libhal_volume_get_partition_number (LibHalVolume *volume); @@ -1005,9 +1002,9 @@ - -<anchor id="libhal-volume-get-partition-start-offset" role="function"/>libhal_volume_get_partition_start_offset () -libhal_volume_get_partition_start_offsetdbus_uint64_t libhal_volume_get_partition_start_offset + +libhal_volume_get_partition_start_offset () +libhal_volume_get_partition_start_offsetdbus_uint64_t libhal_volume_get_partition_start_offset (LibHalVolume *volume); @@ -1020,9 +1017,9 @@ - -<anchor id="libhal-volume-get-partition-media-size" role="function"/>libhal_volume_get_partition_media_size () -libhal_volume_get_partition_media_sizedbus_uint64_t libhal_volume_get_partition_media_size + +libhal_volume_get_partition_media_size () +libhal_volume_get_partition_media_sizedbus_uint64_t libhal_volume_get_partition_media_size (LibHalVolume *volume); @@ -1035,9 +1032,9 @@ - -<anchor id="libhal-volume-get-label" role="function"/>libhal_volume_get_label () -libhal_volume_get_labelconst char* libhal_volume_get_label (LibHalVolume *volume); + +libhal_volume_get_label () +libhal_volume_get_labelconst char* libhal_volume_get_label (LibHalVolume *volume); @@ -1049,9 +1046,9 @@ - -<anchor id="libhal-volume-get-mount-point" role="function"/>libhal_volume_get_mount_point () -libhal_volume_get_mount_pointconst char* libhal_volume_get_mount_point (LibHalVolume *volume); + +libhal_volume_get_mount_point () +libhal_volume_get_mount_pointconst char* libhal_volume_get_mount_point (LibHalVolume *volume); @@ -1063,9 +1060,9 @@ - -<anchor id="libhal-volume-get-uuid" role="function"/>libhal_volume_get_uuid () -libhal_volume_get_uuidconst char* libhal_volume_get_uuid (LibHalVolume *volume); + +libhal_volume_get_uuid () +libhal_volume_get_uuidconst char* libhal_volume_get_uuid (LibHalVolume *volume); @@ -1077,9 +1074,9 @@ - -<anchor id="libhal-volume-get-storage-device-udi" role="function"/>libhal_volume_get_storage_device_udi () -libhal_volume_get_storage_device_udiconst char* libhal_volume_get_storage_device_udi + +libhal_volume_get_storage_device_udi () +libhal_volume_get_storage_device_udiconst char* libhal_volume_get_storage_device_udi (LibHalVolume *volume); @@ -1092,9 +1089,9 @@ - -<anchor id="libhal-volume-crypto-get-backing-volume-udi" role="function"/>libhal_volume_crypto_get_backing_volume_udi () -libhal_volume_crypto_get_backing_volume_udiconst char* libhal_volume_crypto_get_backing_volume_udi + +libhal_volume_crypto_get_backing_volume_udi () +libhal_volume_crypto_get_backing_volume_udiconst char* libhal_volume_crypto_get_backing_volume_udi (LibHalVolume *volume); @@ -1107,9 +1104,9 @@ - -<anchor id="libhal-volume-crypto-get-clear-volume-udi" role="function"/>libhal_volume_crypto_get_clear_volume_udi () -libhal_volume_crypto_get_clear_volume_udichar* libhal_volume_crypto_get_clear_volume_udi + +libhal_volume_crypto_get_clear_volume_udi () +libhal_volume_crypto_get_clear_volume_udichar* libhal_volume_crypto_get_clear_volume_udi (LibHalContext *hal_ctx, LibHalVolume *volume); @@ -1126,9 +1123,9 @@ - -<anchor id="libhal-volume-disc-has-audio" role="function"/>libhal_volume_disc_has_audio () -libhal_volume_disc_has_audiodbus_bool_t libhal_volume_disc_has_audio (LibHalVolume *volume); + +libhal_volume_disc_has_audio () +libhal_volume_disc_has_audiodbus_bool_t libhal_volume_disc_has_audio (LibHalVolume *volume); @@ -1140,9 +1137,9 @@ - -<anchor id="libhal-volume-disc-has-data" role="function"/>libhal_volume_disc_has_data () -libhal_volume_disc_has_datadbus_bool_t libhal_volume_disc_has_data (LibHalVolume *volume); + +libhal_volume_disc_has_data () +libhal_volume_disc_has_datadbus_bool_t libhal_volume_disc_has_data (LibHalVolume *volume); @@ -1154,9 +1151,9 @@ - -<anchor id="libhal-volume-disc-is-blank" role="function"/>libhal_volume_disc_is_blank () -libhal_volume_disc_is_blankdbus_bool_t libhal_volume_disc_is_blank (LibHalVolume *volume); + +libhal_volume_disc_is_blank () +libhal_volume_disc_is_blankdbus_bool_t libhal_volume_disc_is_blank (LibHalVolume *volume); @@ -1168,9 +1165,9 @@ - -<anchor id="libhal-volume-disc-is-rewritable" role="function"/>libhal_volume_disc_is_rewritable () -libhal_volume_disc_is_rewritabledbus_bool_t libhal_volume_disc_is_rewritable (LibHalVolume *volume); + +libhal_volume_disc_is_rewritable () +libhal_volume_disc_is_rewritabledbus_bool_t libhal_volume_disc_is_rewritable (LibHalVolume *volume); @@ -1182,9 +1179,9 @@ - -<anchor id="libhal-volume-disc-is-appendable" role="function"/>libhal_volume_disc_is_appendable () -libhal_volume_disc_is_appendabledbus_bool_t libhal_volume_disc_is_appendable (LibHalVolume *volume); + +libhal_volume_disc_is_appendable () +libhal_volume_disc_is_appendabledbus_bool_t libhal_volume_disc_is_appendable (LibHalVolume *volume); @@ -1196,9 +1193,9 @@ - -<anchor id="libhal-volume-get-disc-type" role="function"/>libhal_volume_get_disc_type () -libhal_volume_get_disc_typeLibHalVolumeDiscType libhal_volume_get_disc_type (LibHalVolume *volume); + +libhal_volume_get_disc_type () +libhal_volume_get_disc_typeLibHalVolumeDiscType libhal_volume_get_disc_type (LibHalVolume *volume); @@ -1210,9 +1207,9 @@ - -<anchor id="libhal-volume-get-msdos-part-table-type" role="function"/>libhal_volume_get_msdos_part_table_type () -libhal_volume_get_msdos_part_table_typeint libhal_volume_get_msdos_part_table_type + +libhal_volume_get_msdos_part_table_type () +libhal_volume_get_msdos_part_table_typeint libhal_volume_get_msdos_part_table_type (); @@ -1233,6 +1230,4 @@ - - --- hal-0.5.11~rc2.orig/doc/api/libhal-storage/html/libhal-storage.devhelp +++ hal-0.5.11~rc2/doc/api/libhal-storage/html/libhal-storage.devhelp @@ -83,7 +83,5 @@ - - --- hal-0.5.11~rc2.orig/doc/api/libhal-storage/html/style.css +++ hal-0.5.11~rc2/doc/api/libhal-storage/html/style.css @@ -22,6 +22,11 @@ /* this is needed so that the local anchors are displayed below the naviagtion */ @media screen { + sup a.footnote + { + position: relative; + top: 0em ! important; + } div.refnamediv a[name], div.refsect1 a[name] { position: relative; @@ -139,10 +144,17 @@ hr { - color: #888; - background: #888; + color: #777777; + background: #777777; border: 0; height: 1px; clear: both; } +.footer +{ + padding-top: 3.5em; + color: #777777; + text-align: center; + font-size: 80%; +} --- hal-0.5.11~rc2.orig/doc/api/libhal-storage/html/rn01.html +++ hal-0.5.11~rc2/doc/api/libhal-storage/html/rn01.html @@ -1,23 +1,23 @@ - + API Reference - + - + - +

changeset :

changeset :

 the changeset to free

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique id of device

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

 An object represent all properties. Must be freed with libhal_free_property_set(). +

Returns :

 An object represent all properties. Must be freed with libhal_free_property_set().

ctx :

ctx :

out_num_devices :

out_num_devices :

 Return location for number of devices

out_udi :

 Return location for array of of udi's. Caller should free this with libhal_free_string_array() when done with it. +

out_udi :

 Return location for array of of udi's. Caller should free this with libhal_free_string_array() when done with it.

out_properties :

 Return location for array of LibHalPropertySet objects. Caller should free each one of them with libhal_free_property_set() when done with it +

out_properties :

 Return location for array of LibHalPropertySet objects. Caller should free each one of them with libhal_free_property_set() when done with it

error :

error :

 Return location for error

Returns :

Returns :

 @@ -3121,9 +3039,8 @@
-

-libhal_property_set_sort ()

-
void                libhal_property_set_sort            (LibHalPropertySet *set);
+

libhal_property_set_sort ()

+
void                libhal_property_set_sort            (LibHalPropertySet *set);

Sort all properties according to property name.

@@ -3132,7 +3049,7 @@

- + @@ -3140,18 +3057,17 @@
-

-libhal_free_property_set ()

-
void                libhal_free_property_set            (LibHalPropertySet *set);
+

libhal_free_property_set ()

+
void                libhal_free_property_set            (LibHalPropertySet *set);

-Free a property set earlier obtained with libhal_device_get_all_properties().

+Free a property set earlier obtained with libhal_device_get_all_properties().

set :

set :

 property-set to sort
- + @@ -3159,9 +3075,8 @@
-

-libhal_property_set_get_num_elems ()

-
unsigned int        libhal_property_set_get_num_elems   (LibHalPropertySet *set);
+

libhal_property_set_get_num_elems ()

+
unsigned int        libhal_property_set_get_num_elems   (LibHalPropertySet *set);

Get the number of properties in a property set.

@@ -3171,12 +3086,12 @@

- + - + @@ -3185,9 +3100,8 @@
-

-libhal_ps_get_type ()

-
LibHalPropertyType  libhal_ps_get_type                  (const LibHalPropertySet *set,
+
libhal_ps_get_type ()

+
LibHalPropertyType  libhal_ps_get_type                  (const LibHalPropertySet *set,
                                                          const char *key);

 

 Get the type of a given property.

@@ -3198,18 +3112,18 @@
- + - + - - + @@ -3218,9 +3132,8 @@
-

-libhal_ps_get_string ()

-
const char*         libhal_ps_get_string                (const LibHalPropertySet *set,
+
libhal_ps_get_string ()

+
const char*         libhal_ps_get_string                (const LibHalPropertySet *set,
                                                          const char *key);

 

 Get the value of a property of type string.

@@ -3231,19 +3144,19 @@
- + - + - + @@ -3252,9 +3165,8 @@
-

-libhal_ps_get_int32 ()

-
dbus_int32_t        libhal_ps_get_int32                 (const LibHalPropertySet *set,
+
libhal_ps_get_int32 ()

+
dbus_int32_t        libhal_ps_get_int32                 (const LibHalPropertySet *set,
                                                          const char *key);

 

 
@@ -3263,17 +3175,17 @@
- + - + - + - + - + - + @@ -3316,9 +3227,8 @@
-

-libhal_ps_get_double ()

-
double              libhal_ps_get_double                (const LibHalPropertySet *set,
+
libhal_ps_get_double ()

+
double              libhal_ps_get_double                (const LibHalPropertySet *set,
                                                          const char *key);

 

 Get the value of a property of type double.

@@ -3329,17 +3239,17 @@
- + - + - + @@ -3348,9 +3258,8 @@
-

-libhal_ps_get_bool ()

-
dbus_bool_t         libhal_ps_get_bool                  (const LibHalPropertySet *set,
+
libhal_ps_get_bool ()

+
dbus_bool_t         libhal_ps_get_bool                  (const LibHalPropertySet *set,
                                                          const char *key);

 

 Get the value of a property of type bool.

@@ -3361,17 +3270,17 @@
- + - + - + @@ -3380,9 +3289,8 @@
-

-LibHalPropertySetIterator

-
typedef struct LibHalPropertySetIterator_s LibHalPropertySetIterator;
+
LibHalPropertySetIterator

+
typedef struct LibHalPropertySetIterator_s LibHalPropertySetIterator;
 

 

 Iterator for inspecting all properties. Do not access any members;
@@ -3393,10 +3301,9 @@
-

-libhal_psi_init ()

-
void                libhal_psi_init                     (LibHalPropertySetIterator *iter,
-                                                         LibHalPropertySet *set);
+

libhal_psi_init ()

+
void                libhal_psi_init                     (LibHalPropertySetIterator *iter,
+                                                         LibHalPropertySet *set);

Initialize a property set iterator.

@@ -3406,12 +3313,12 @@

- + - + @@ -3420,9 +3327,8 @@
-

-libhal_psi_has_more ()

-
dbus_bool_t         libhal_psi_has_more                 (LibHalPropertySetIterator *iter);
+

libhal_psi_has_more ()

+
dbus_bool_t         libhal_psi_has_more                 (LibHalPropertySetIterator *iter);

Determine whether there are more properties to iterate over.

@@ -3432,12 +3338,12 @@

- + - + @@ -3446,9 +3352,8 @@
-

-libhal_psi_next ()

-
void                libhal_psi_next                     (LibHalPropertySetIterator *iter);
+

libhal_psi_next ()

+
void                libhal_psi_next                     (LibHalPropertySetIterator *iter);

Advance iterator to next property.

@@ -3457,7 +3362,7 @@

set :

set :

 property-set to free

set :

set :

 property set to consider

Returns :

Returns :

 number of properties in given property set

set :

set :

 property set

key :

key :

 name of property to inspect

Returns :

 the LibHalPropertyType of the given property, +

Returns :

 the LibHalPropertyType of the given property, LIBHAL_PROPERTY_TYPE_INVALID if property is not in the set

set :

set :

 property set

key :

key :

 name of property to inspect

Returns :

Returns :

 UTF8 nul-terminated string. This pointer is only valid -until libhal_free_property_set() is invoked on the property set +until libhal_free_property_set() is invoked on the property set this property belongs to. NULL if property is not in the set or not a string

set :

set :

key :

key :

Returns :

Returns :

 @@ -3284,9 +3196,8 @@
-

-libhal_ps_get_uint64 ()

-
dbus_uint64_t       libhal_ps_get_uint64                (const LibHalPropertySet *set,
+
libhal_ps_get_uint64 ()

+
dbus_uint64_t       libhal_ps_get_uint64                (const LibHalPropertySet *set,
                                                          const char *key);

 

 Get the value of a property of type unsigned integer.

@@ -3297,17 +3208,17 @@

set :

set :

 property set

key :

key :

 name of property to inspect

Returns :

Returns :

 property value (64-bit unsigned integer)

set :

set :

 property set

key :

key :

 name of property to inspect

Returns :

Returns :

 property value (IEEE754 double precision float)

set :

set :

 property set

key :

key :

 name of property to inspect

Returns :

Returns :

 property value (bool)

iter :

iter :

 iterator object

set :

set :

 property set to iterate over

iter :

iter :

 iterator object

Returns :

Returns :

 TRUE if there are more properties, FALSE otherwise.
- + @@ -3465,9 +3370,8 @@
-

-libhal_psi_get_type ()

-
LibHalPropertyType  libhal_psi_get_type                 (LibHalPropertySetIterator *iter);
+

libhal_psi_get_type ()

+
LibHalPropertyType  libhal_psi_get_type                 (LibHalPropertySetIterator *iter);

Get type of property.

@@ -3477,12 +3381,12 @@

- + - + @@ -3491,9 +3395,8 @@
-

-libhal_psi_get_key ()

-
char*               libhal_psi_get_key                  (LibHalPropertySetIterator *iter);
+

libhal_psi_get_key ()

+
char*               libhal_psi_get_key                  (LibHalPropertySetIterator *iter);

Get the key of a property.

@@ -3503,14 +3406,14 @@

- + - + @@ -3519,9 +3422,8 @@
-

-libhal_psi_get_string ()

-
char*               libhal_psi_get_string               (LibHalPropertySetIterator *iter);
+

libhal_psi_get_string ()

+
char*               libhal_psi_get_string               (LibHalPropertySetIterator *iter);

Get the value of a property of type string.

@@ -3531,14 +3433,14 @@

- + - + @@ -3547,9 +3449,8 @@
-

-libhal_psi_get_int ()

-
dbus_int32_t        libhal_psi_get_int                  (LibHalPropertySetIterator *iter);
+

libhal_psi_get_int ()

+
dbus_int32_t        libhal_psi_get_int                  (LibHalPropertySetIterator *iter);

Get the value of a property of type signed integer.

@@ -3559,12 +3460,12 @@

- + - + @@ -3573,9 +3474,8 @@
-

-libhal_psi_get_uint64 ()

-
dbus_uint64_t       libhal_psi_get_uint64               (LibHalPropertySetIterator *iter);
+

libhal_psi_get_uint64 ()

+
dbus_uint64_t       libhal_psi_get_uint64               (LibHalPropertySetIterator *iter);

Get the value of a property of type unsigned integer.

@@ -3585,12 +3485,12 @@

- + - + @@ -3599,9 +3499,8 @@
-

-libhal_psi_get_double ()

-
double              libhal_psi_get_double               (LibHalPropertySetIterator *iter);
+

libhal_psi_get_double ()

+
double              libhal_psi_get_double               (LibHalPropertySetIterator *iter);

Get the value of a property of type double.

@@ -3611,12 +3510,12 @@

- + - + @@ -3625,9 +3524,8 @@
-

-libhal_psi_get_bool ()

-
dbus_bool_t         libhal_psi_get_bool                 (LibHalPropertySetIterator *iter);
+

libhal_psi_get_bool ()

+
dbus_bool_t         libhal_psi_get_bool                 (LibHalPropertySetIterator *iter);

Get the value of a property of type bool.

@@ -3637,12 +3535,12 @@

- + - + @@ -3651,9 +3549,8 @@
-

-libhal_psi_get_strlist ()

-
char**              libhal_psi_get_strlist              (LibHalPropertySetIterator *iter);
+

libhal_psi_get_strlist ()

+
char**              libhal_psi_get_strlist              (LibHalPropertySetIterator *iter);

Get the value of a property of type string list.

@@ -3663,12 +3560,12 @@

- + - + @@ -3677,9 +3574,8 @@
-

-libhal_string_array_length ()

-
unsigned int        libhal_string_array_length          (char **str_array);
+

libhal_string_array_length ()

+
unsigned int        libhal_string_array_length          (char **str_array);

Get the length of an array of strings.

@@ -3689,12 +3585,12 @@

- + - + @@ -3703,9 +3599,8 @@
-

-libhal_free_string_array ()

-
void                libhal_free_string_array            (char **str_array);
+

libhal_free_string_array ()

+
void                libhal_free_string_array            (char **str_array);

Frees a NULL-terminated array of strings. If passed NULL, does nothing.

@@ -3714,7 +3609,7 @@

iter :

iter :

 iterator object

iter :

iter :

 iterator object

Returns :

Returns :

 the property type at the iterator's position

iter :

iter :

 iterator object

Returns :

Returns :

 ASCII nul-terminated string. This pointer is only valid -until libhal_free_property_set() is invoked on the property set +until libhal_free_property_set() is invoked on the property set this property belongs to.

iter :

iter :

 iterator object

Returns :

Returns :

 UTF8 nul-terminated string. This pointer is only valid -until libhal_free_property_set() is invoked on the property set +until libhal_free_property_set() is invoked on the property set this property belongs to.

iter :

iter :

 iterator object

Returns :

Returns :

 property value (32-bit signed integer)

iter :

iter :

 iterator object

Returns :

Returns :

 property value (64-bit unsigned integer)

iter :

iter :

 iterator object

Returns :

Returns :

 property value (IEEE754 double precision float)

iter :

iter :

 iterator object

Returns :

Returns :

 property value (bool)

iter :

iter :

 iterator object

Returns :

Returns :

 pointer to array of strings

str_array :

str_array :

 array of strings to consider

Returns :

Returns :

 Number of strings in array
- + @@ -3722,9 +3617,8 @@
-

-libhal_free_string ()

-
void                libhal_free_string                  (char *str);
+

libhal_free_string ()

+
void                libhal_free_string                  (char *str);

Used to free strings returned by libhal.

@@ -3733,7 +3627,7 @@

str_array :

str_array :

 the array to be freed
- + @@ -3741,13 +3635,12 @@
-

-libhal_new_device ()

-
char*               libhal_new_device                   (LibHalContext *ctx,
+
libhal_new_device ()

+
char*               libhal_new_device                   (LibHalContext *ctx,
                                                          DBusError *error);

 

 Create a new device object which will be hidden from applications
-until the CommitToGdl(), ie. libhal_device_commit_to_gdl(), method
+until the CommitToGdl(), ie. libhal_device_commit_to_gdl(), method
 is called. Note that the program invoking this method needs to run
 with super user privileges.

 

@@ -3757,17 +3650,17 @@
- + - + - + @@ -3777,15 +3670,14 @@
-

-libhal_device_commit_to_gdl ()

-
dbus_bool_t         libhal_device_commit_to_gdl         (LibHalContext *ctx,
+
libhal_device_commit_to_gdl ()

+
dbus_bool_t         libhal_device_commit_to_gdl         (LibHalContext *ctx,
                                                          const char *temp_udi,
                                                          const char *udi,
                                                          DBusError *error);

 

 When a hidden device has been built using the NewDevice method,
-ie. libhal_new_device(), and the org.freedesktop.Hal.Device
+ie. libhal_new_device(), and the org.freedesktop.Hal.Device
 interface this function will commit it to the global device list.
 

 

@@ -3803,27 +3695,27 @@
- + - - + - + - + - + @@ -3832,9 +3724,8 @@
-

-libhal_remove_device ()

-
dbus_bool_t         libhal_remove_device                (LibHalContext *ctx,
+
libhal_remove_device ()

+
dbus_bool_t         libhal_remove_device                (LibHalContext *ctx,
                                                          const char *udi,
                                                          DBusError *error);

 

@@ -3852,22 +3743,22 @@
- + - + - + - + @@ -3876,9 +3767,8 @@
-

-libhal_merge_properties ()

-
dbus_bool_t         libhal_merge_properties             (LibHalContext *ctx,
+
libhal_merge_properties ()

+
dbus_bool_t         libhal_merge_properties             (LibHalContext *ctx,
                                                          const char *target_udi,
                                                          const char *source_udi,
                                                          DBusError *error);

@@ -3891,27 +3781,27 @@
- + - + - + - + - + @@ -3920,9 +3810,8 @@
-

-libhal_device_matches ()

-
dbus_bool_t         libhal_device_matches               (LibHalContext *ctx,
+
libhal_device_matches ()

+
dbus_bool_t         libhal_device_matches               (LibHalContext *ctx,
                                                          const char *udi1,
                                                          const char *udi2,
                                                          const char *property_namespace,
@@ -3946,32 +3835,32 @@
- + - + - + - + - + - + @@ -3981,10 +3870,9 @@
-

-libhal_manager_find_device_string_match ()

-
char**              libhal_manager_find_device_string_match
-                                                        (LibHalContext *ctx,
+
libhal_manager_find_device_string_match ()

+
char**              libhal_manager_find_device_string_match
+                                                        (LibHalContext *ctx,
                                                          const char *key,
                                                          const char *value,
                                                          int *num_devices,
@@ -3999,33 +3887,33 @@
- + - + - + - + - + - - + @@ -4033,9 +3921,8 @@
-

-libhal_device_add_capability ()

-
dbus_bool_t         libhal_device_add_capability        (LibHalContext *ctx,
+
libhal_device_add_capability ()

+
dbus_bool_t         libhal_device_add_capability        (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *capability,
                                                          DBusError *error);

@@ -4048,27 +3935,27 @@
- + - + - + - + - + @@ -4077,9 +3964,8 @@
-

-libhal_device_query_capability ()

-
dbus_bool_t         libhal_device_query_capability      (LibHalContext *ctx,
+
libhal_device_query_capability ()

+
dbus_bool_t         libhal_device_query_capability      (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *capability,
                                                          DBusError *error);

@@ -4093,27 +3979,27 @@
- + - + - + - + - + @@ -4122,9 +4008,8 @@
-

-libhal_find_device_by_capability ()

-
char**              libhal_find_device_by_capability    (LibHalContext *ctx,
+
libhal_find_device_by_capability ()

+
char**              libhal_find_device_by_capability    (LibHalContext *ctx,
                                                          const char *capability,
                                                          int *num_devices,
                                                          DBusError *error);

@@ -4137,28 +4022,28 @@
- + - + - + - + - - + @@ -4166,9 +4051,8 @@
-

-libhal_device_property_watch_all ()

-
dbus_bool_t         libhal_device_property_watch_all    (LibHalContext *ctx,
+
libhal_device_property_watch_all ()

+
dbus_bool_t         libhal_device_property_watch_all    (LibHalContext *ctx,
                                                          DBusError *error);

 

 Watch all devices, ie. the device_property_changed callback is
@@ -4180,17 +4064,17 @@
- + - + - + @@ -4199,9 +4083,8 @@
-

-libhal_device_add_property_watch ()

-
dbus_bool_t         libhal_device_add_property_watch    (LibHalContext *ctx,
+
libhal_device_add_property_watch ()

+
dbus_bool_t         libhal_device_add_property_watch    (LibHalContext *ctx,
                                                          const char *udi,
                                                          DBusError *error);

 

@@ -4218,22 +4101,22 @@
- + - + - + - + @@ -4242,9 +4125,8 @@
-

-libhal_device_remove_property_watch ()

-
dbus_bool_t         libhal_device_remove_property_watch (LibHalContext *ctx,
+
libhal_device_remove_property_watch ()

+
dbus_bool_t         libhal_device_remove_property_watch (LibHalContext *ctx,
                                                          const char *udi,
                                                          DBusError *error);

 

@@ -4256,22 +4138,22 @@
- + - + - + - + @@ -4280,9 +4162,8 @@
-

-libhal_device_lock ()

-
dbus_bool_t         libhal_device_lock                  (LibHalContext *ctx,
+
libhal_device_lock ()

+
dbus_bool_t         libhal_device_lock                  (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *reason_to_lock,
                                                          char **reason_why_locked,
@@ -4296,32 +4177,32 @@
- + - + - + - + - + - + @@ -4330,9 +4211,8 @@
-

-libhal_device_unlock ()

-
dbus_bool_t         libhal_device_unlock                (LibHalContext *ctx,
+
libhal_device_unlock ()

+
dbus_bool_t         libhal_device_unlock                (LibHalContext *ctx,
                                                          const char *udi,
                                                          DBusError *error);

 

@@ -4344,22 +4224,22 @@
- + - + - + - + @@ -4369,9 +4249,8 @@
-

-libhal_device_rescan ()

-
dbus_bool_t         libhal_device_rescan                (LibHalContext *ctx,
+
libhal_device_rescan ()

+
dbus_bool_t         libhal_device_rescan                (LibHalContext *ctx,
                                                          const char *udi,
                                                          DBusError *error);

 

@@ -4383,22 +4262,22 @@
- + - + - + - + @@ -4407,9 +4286,8 @@
-

-libhal_device_reprobe ()

-
dbus_bool_t         libhal_device_reprobe               (LibHalContext *ctx,
+
libhal_device_reprobe ()

+
dbus_bool_t         libhal_device_reprobe               (LibHalContext *ctx,
                                                          const char *udi,
                                                          DBusError *error);

 

@@ -4421,22 +4299,22 @@
- + - + - + - + @@ -4445,9 +4323,8 @@
-

-libhal_device_emit_condition ()

-
dbus_bool_t         libhal_device_emit_condition        (LibHalContext *ctx,
+
libhal_device_emit_condition ()

+
dbus_bool_t         libhal_device_emit_condition        (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *condition_name,
                                                          const char *condition_details,
@@ -4461,32 +4338,32 @@
- + - + - + - + - + - + @@ -4496,9 +4373,8 @@
-

-libhal_device_claim_interface ()

-
dbus_bool_t         libhal_device_claim_interface       (LibHalContext *ctx,
+
libhal_device_claim_interface ()

+
dbus_bool_t         libhal_device_claim_interface       (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *interface_name,
                                                          const char *introspection_xml,
@@ -4514,32 +4390,32 @@
- + - + - + - + - + - + @@ -4548,9 +4424,8 @@
-

-libhal_device_addon_is_ready ()

-
dbus_bool_t         libhal_device_addon_is_ready        (LibHalContext *ctx,
+
libhal_device_addon_is_ready ()

+
dbus_bool_t         libhal_device_addon_is_ready        (LibHalContext *ctx,
                                                          const char *udi,
                                                          DBusError *error);

 

@@ -4566,22 +4441,22 @@
- + - + - + - + @@ -4590,10 +4465,9 @@
-

-libhal_device_singleton_addon_is_ready ()

-
dbus_bool_t         libhal_device_singleton_addon_is_ready
-                                                        (LibHalContext *ctx,
+
libhal_device_singleton_addon_is_ready ()

+
dbus_bool_t         libhal_device_singleton_addon_is_ready
+                                                        (LibHalContext *ctx,
                                                          const char *command_line,
                                                          DBusError *error);

 

@@ -4609,22 +4483,22 @@
- + - + - + - + @@ -4633,10 +4507,9 @@
-

-libhal_device_acquire_interface_lock ()

-
dbus_bool_t         libhal_device_acquire_interface_lock
-                                                        (LibHalContext *ctx,
+
libhal_device_acquire_interface_lock ()

+
dbus_bool_t         libhal_device_acquire_interface_lock
+                                                        (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *interface,
                                                          dbus_bool_t exclusive,
@@ -4650,32 +4523,32 @@
- + - + - + - + - + - + @@ -4684,10 +4557,9 @@
-

-libhal_device_release_interface_lock ()

-
dbus_bool_t         libhal_device_release_interface_lock
-                                                        (LibHalContext *ctx,
+
libhal_device_release_interface_lock ()

+
dbus_bool_t         libhal_device_release_interface_lock
+                                                        (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *interface,
                                                          DBusError *error);

@@ -4700,27 +4572,27 @@
- + - + - + - + - + @@ -4729,10 +4601,9 @@
-

-libhal_acquire_global_interface_lock ()

-
dbus_bool_t         libhal_acquire_global_interface_lock
-                                                        (LibHalContext *ctx,
+
libhal_acquire_global_interface_lock ()

+
dbus_bool_t         libhal_acquire_global_interface_lock
+                                                        (LibHalContext *ctx,
                                                          const char *interface,
                                                          dbus_bool_t exclusive,
                                                          DBusError *error);

@@ -4745,27 +4616,27 @@
- + - + - + - + - + @@ -4774,10 +4645,9 @@
-

-libhal_release_global_interface_lock ()

-
dbus_bool_t         libhal_release_global_interface_lock
-                                                        (LibHalContext *ctx,
+
libhal_release_global_interface_lock ()

+
dbus_bool_t         libhal_release_global_interface_lock
+                                                        (LibHalContext *ctx,
                                                          const char *interface,
                                                          DBusError *error);

 

@@ -4789,22 +4659,22 @@
- + - + - + - + @@ -4813,9 +4683,8 @@
-

-libhal_device_is_caller_locked_out ()

-
dbus_bool_t         libhal_device_is_caller_locked_out  (LibHalContext *ctx,
+
libhal_device_is_caller_locked_out ()

+
dbus_bool_t         libhal_device_is_caller_locked_out  (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *interface,
                                                          const char *caller,
@@ -4831,32 +4700,32 @@
- + - + - + - + - + - + @@ -4865,9 +4734,8 @@
-

-libhal_device_is_locked_by_others ()

-
dbus_bool_t         libhal_device_is_locked_by_others   (LibHalContext *ctx,
+
libhal_device_is_locked_by_others ()

+
dbus_bool_t         libhal_device_is_locked_by_others   (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *interface,
                                                          DBusError *error);

@@ -4880,27 +4748,27 @@
- + - + - + - + - + @@ -4909,9 +4777,8 @@
-

-libhal_device_is_caller_privileged ()

-
char*               libhal_device_is_caller_privileged  (LibHalContext *ctx,
+
libhal_device_is_caller_privileged ()

+
char*               libhal_device_is_caller_privileged  (LibHalContext *ctx,
                                                          const char *udi,
                                                          const char *action,
                                                          const char *caller,
@@ -4927,47 +4794,45 @@
- + - + - + - + - + - +

str :

str :

 the nul-terminated sting to free

ctx :

ctx :

 the context for the connection to hald

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 Temporary device unique id or NULL if there was a problem. This string must be freed by the caller.

ctx :

ctx :

 the context for the connection to hald

temp_udi :

 the temporary unique device id as returned by libhal_new_device() +

temp_udi :

 the temporary unique device id as returned by libhal_new_device()

udi :

udi :

 the new unique device id.

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 FALSE if the given unique device id is already in use.

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique device id.

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if the device was removed, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

target_udi :

target_udi :

 the Unique device id of target device to merge to

source_udi :

source_udi :

 the Unique device id of device to merge from

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if the properties were merged, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

udi1 :

udi1 :

 the Unique Device Id for device 1

udi2 :

udi2 :

 the Unique Device Id for device 2

property_namespace :

property_namespace :

 the namespace for set of devices, e.g. "usb"

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if all properties starting with the given namespace parameter from one device is in the other and have the same value.

ctx :

ctx :

 the context for the connection to hald

key :

key :

 name of the property

value :

value :

 the value to match

num_devices :

num_devices :

 pointer to store number of devices

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

 UDI of devices; free with libhal_free_string_array() +

Returns :

 UDI of devices; free with libhal_free_string_array()

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

capability :

capability :

 the capability name to add

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if the capability was added, FALSE if the device didn't exist

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

capability :

capability :

 the capability name

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if the device has the capability, otherwise FALSE

ctx :

ctx :

 the context for the connection to hald

capability :

capability :

 the capability name

num_devices :

num_devices :

 pointer to store number of devices

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

 UDI of devices; free with libhal_free_string_array() +

Returns :

 UDI of devices; free with libhal_free_string_array()

ctx :

ctx :

 the context for the connection to hald

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE only if the operation succeeded

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE only if the operation succeeded

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE only if the operation succeeded

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

reason_to_lock :

reason_to_lock :

 a user-presentable reason why the device is locked.

reason_why_locked :

reason_why_locked :

 a pointer to store the reason why the device cannot be locked on failure, or NULL

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if the lock was obtained, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if the device was successfully unlocked, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique id of device

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 Whether the operation succeeded

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique id of device

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 Whether the operation succeeded

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

condition_name :

condition_name :

 user-readable name of condition

condition_details :

condition_details :

 user-readable details of condition

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if condition successfully emitted, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id

interface_name :

interface_name :

 Name of interface to claim, e.g. org.freedesktop.Hal.Device.FoobarKindOfThing

introspection_xml :

introspection_xml :

 Introspection XML containing what would be inside the interface XML tag

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if interface was claimed, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique Device Id this addon is handling

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if the HAL daemon received the message, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

command_line :

command_line :

 commandline singleton was started with

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 TRUE if the HAL daemon received the message, FALSE otherwise

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique id of device

interface :

interface :

 the intername name to lock

exclusive :

exclusive :

 whether the lock should be exclusive

error :

error :

 pointer to an initialized dbus error object for returning errors

Returns :

Returns :

 TRUE iff the lock was acquired

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique id of device

interface :

interface :

 the intername name to unlock

error :

error :

 pointer to an initialized dbus error object for returning errors

Returns :

Returns :

 TRUE iff the lock was released.

ctx :

ctx :

 the context for the connection to hald

interface :

interface :

 the intername name to lock

exclusive :

exclusive :

 whether the lock should be exclusive

error :

error :

 pointer to an initialized dbus error object for returning errors

Returns :

Returns :

 TRUE iff the lock was acquired

ctx :

ctx :

 the context for the connection to hald

interface :

interface :

 the intername name to unlock

error :

error :

 pointer to an initialized dbus error object for returning errors

Returns :

Returns :

 TRUE iff the lock was released

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique id of device

interface :

interface :

 the intername name to check

caller :

caller :

 the caller to check for

error :

error :

 pointer to an initialized dbus error object for returning errors

Returns :

Returns :

 Whether the given caller is locked out

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique id of device

interface :

interface :

 the intername name to check

error :

error :

 pointer to an initialized dbus error object for returning errors or NULL

Returns :

Returns :

 If another process is holding a lock on the device

ctx :

ctx :

 the context for the connection to hald

udi :

udi :

 the Unique id of device

action :

action :

 the action to check for

caller :

caller :

 the caller to check for

error :

error :

 pointer to an initialized dbus error object for returning errors

Returns :

Returns :

 The textual reply from PolicyKit. See the PolicyKitResult enumeration in the PolicyKit documentation for details. The caller is responsible for freeing this string with the function -libhal_free_string(). +libhal_free_string().
-
-
-
-
-
+
+
+ Generated by GTK-Doc V1.10
--- hal-0.5.11~rc2.orig/doc/api/libhal/html/index.html +++ hal-0.5.11~rc2/doc/api/libhal/html/index.html @@ -1,18 +1,19 @@ - + HAL Client Library Reference Manual - + - + - + -
+ +
@@ -21,14 +22,14 @@ David Zeuthen


-     
-   

+     
+   

Version 0.5.11rc2

-

Copyright © 2007 The HAL Authors

+

Copyright © 2007 The HAL Authors

-

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later @@ -41,10 +42,10 @@


-   The Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330,
-   Boston, MA 02111-1307,
-   USA
+   The Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330,
+   Boston, MA 02111-1307,
+   USA

@@ -67,5 +68,9 @@
Index
A. License
-
+ +
+
+ Generated by GTK-Doc V1.10
+ --- hal-0.5.11~rc2.orig/doc/api/libhal/html/ix01.html +++ hal-0.5.11~rc2/doc/api/libhal/html/ix01.html @@ -1,296 +1,299 @@ - + Index - + - - + + - + - +

-Index

+Index

D

-
DBUS_API_SUBJECT_TO_CHANGE, DBUS_API_SUBJECT_TO_CHANGE +
DBUS_API_SUBJECT_TO_CHANGE, DBUS_API_SUBJECT_TO_CHANGE

L

-
LibHalChangeSet, LibHalChangeSet +
LibHalChangeSet, LibHalChangeSet
-
LibHalChangeSet_s, struct LibHalChangeSet_s +
LibHalChangeSet_s, struct LibHalChangeSet_s
-
LibHalContext, LibHalContext +
LibHalContext, LibHalContext
-
LibHalDeviceAdded, LibHalDeviceAdded () +
LibHalDeviceAdded, LibHalDeviceAdded ()
-
LibHalDeviceCondition, LibHalDeviceCondition () +
LibHalDeviceCondition, LibHalDeviceCondition ()
-
LibHalDeviceLostCapability, LibHalDeviceLostCapability () +
LibHalDeviceLostCapability, LibHalDeviceLostCapability ()
-
LibHalDeviceNewCapability, LibHalDeviceNewCapability () +
LibHalDeviceNewCapability, LibHalDeviceNewCapability ()
-
LibHalDevicePropertyModified, LibHalDevicePropertyModified () +
LibHalDevicePropertyModified, LibHalDevicePropertyModified ()
-
LibHalDeviceRemoved, LibHalDeviceRemoved () +
LibHalDeviceRemoved, LibHalDeviceRemoved ()
-
LibHalGlobalInterfaceLockAcquired, LibHalGlobalInterfaceLockAcquired () +
LibHalGlobalInterfaceLockAcquired, LibHalGlobalInterfaceLockAcquired ()
-
LibHalGlobalInterfaceLockReleased, LibHalGlobalInterfaceLockReleased () +
LibHalGlobalInterfaceLockReleased, LibHalGlobalInterfaceLockReleased ()
-
LibHalIntegrateDBusIntoMainLoop, LibHalIntegrateDBusIntoMainLoop () +
LibHalIntegrateDBusIntoMainLoop, LibHalIntegrateDBusIntoMainLoop ()
-
LibHalInterfaceLockAcquired, LibHalInterfaceLockAcquired () +
LibHalInterfaceLockAcquired, LibHalInterfaceLockAcquired ()
-
LibHalInterfaceLockReleased, LibHalInterfaceLockReleased () +
LibHalInterfaceLockReleased, LibHalInterfaceLockReleased ()
-
LibHalProperty, LibHalProperty +
LibHalProperty, LibHalProperty
-
LibHalPropertySet, LibHalPropertySet +
LibHalPropertySet, LibHalPropertySet
-
LibHalPropertySetIterator, LibHalPropertySetIterator +
LibHalPropertySetIterator, LibHalPropertySetIterator
-
LibHalPropertyType, enum LibHalPropertyType +
LibHalPropertyType, enum LibHalPropertyType
-
LibHalSingletonDeviceAdded, LibHalSingletonDeviceAdded () +
LibHalSingletonDeviceAdded, LibHalSingletonDeviceAdded ()
-
LibHalSingletonDeviceRemoved, LibHalSingletonDeviceRemoved () +
LibHalSingletonDeviceRemoved, LibHalSingletonDeviceRemoved ()
-
libhal_acquire_global_interface_lock, libhal_acquire_global_interface_lock () +
libhal_acquire_global_interface_lock, libhal_acquire_global_interface_lock ()
-
libhal_changeset_set_property_bool, libhal_changeset_set_property_bool () +
libhal_changeset_set_property_bool, libhal_changeset_set_property_bool ()
-
libhal_changeset_set_property_double, libhal_changeset_set_property_double () +
libhal_changeset_set_property_double, libhal_changeset_set_property_double ()
-
libhal_changeset_set_property_int, libhal_changeset_set_property_int () +
libhal_changeset_set_property_int, libhal_changeset_set_property_int ()
-
libhal_changeset_set_property_string, libhal_changeset_set_property_string () +
libhal_changeset_set_property_string, libhal_changeset_set_property_string ()
-
libhal_changeset_set_property_strlist, libhal_changeset_set_property_strlist () +
libhal_changeset_set_property_strlist, libhal_changeset_set_property_strlist ()
-
libhal_changeset_set_property_uint64, libhal_changeset_set_property_uint64 () +
libhal_changeset_set_property_uint64, libhal_changeset_set_property_uint64 ()
-
LIBHAL_CHECK_LIBHALCONTEXT, LIBHAL_CHECK_LIBHALCONTEXT() +
LIBHAL_CHECK_LIBHALCONTEXT, LIBHAL_CHECK_LIBHALCONTEXT()
-
libhal_ctx_free, libhal_ctx_free () +
libhal_ctx_free, libhal_ctx_free ()
-
libhal_ctx_get_dbus_connection, libhal_ctx_get_dbus_connection () +
libhal_ctx_get_dbus_connection, libhal_ctx_get_dbus_connection ()
-
libhal_ctx_get_user_data, libhal_ctx_get_user_data () +
libhal_ctx_get_user_data, libhal_ctx_get_user_data ()
-
libhal_ctx_init, libhal_ctx_init () +
libhal_ctx_init, libhal_ctx_init ()
-
libhal_ctx_init_direct, libhal_ctx_init_direct () +
libhal_ctx_init_direct, libhal_ctx_init_direct ()
-
libhal_ctx_new, libhal_ctx_new () +
libhal_ctx_new, libhal_ctx_new ()
-
libhal_ctx_set_cache, libhal_ctx_set_cache () +
libhal_ctx_set_cache, libhal_ctx_set_cache ()
-
libhal_ctx_set_dbus_connection, libhal_ctx_set_dbus_connection () +
libhal_ctx_set_dbus_connection, libhal_ctx_set_dbus_connection ()
-
libhal_ctx_set_device_added, libhal_ctx_set_device_added () +
libhal_ctx_set_device_added, libhal_ctx_set_device_added ()
-
libhal_ctx_set_device_condition, libhal_ctx_set_device_condition () +
libhal_ctx_set_device_condition, libhal_ctx_set_device_condition ()
-
libhal_ctx_set_device_lost_capability, libhal_ctx_set_device_lost_capability () +
libhal_ctx_set_device_lost_capability, libhal_ctx_set_device_lost_capability ()
-
libhal_ctx_set_device_new_capability, libhal_ctx_set_device_new_capability () +
libhal_ctx_set_device_new_capability, libhal_ctx_set_device_new_capability ()
-
libhal_ctx_set_device_property_modified, libhal_ctx_set_device_property_modified () +
libhal_ctx_set_device_property_modified, libhal_ctx_set_device_property_modified ()
-
libhal_ctx_set_device_removed, libhal_ctx_set_device_removed () +
libhal_ctx_set_device_removed, libhal_ctx_set_device_removed ()
-
libhal_ctx_set_global_interface_lock_acquired, libhal_ctx_set_global_interface_lock_acquired () +
libhal_ctx_set_global_interface_lock_acquired, libhal_ctx_set_global_interface_lock_acquired ()
-
libhal_ctx_set_global_interface_lock_released, libhal_ctx_set_global_interface_lock_released () +
libhal_ctx_set_global_interface_lock_released, libhal_ctx_set_global_interface_lock_released ()
-
libhal_ctx_set_interface_lock_acquired, libhal_ctx_set_interface_lock_acquired () +
libhal_ctx_set_interface_lock_acquired, libhal_ctx_set_interface_lock_acquired ()
-
libhal_ctx_set_interface_lock_released, libhal_ctx_set_interface_lock_released () +
libhal_ctx_set_interface_lock_released, libhal_ctx_set_interface_lock_released ()
-
libhal_ctx_set_singleton_device_added, libhal_ctx_set_singleton_device_added () +
libhal_ctx_set_singleton_device_added, libhal_ctx_set_singleton_device_added ()
-
libhal_ctx_set_singleton_device_removed, libhal_ctx_set_singleton_device_removed () +
libhal_ctx_set_singleton_device_removed, libhal_ctx_set_singleton_device_removed ()
-
libhal_ctx_set_user_data, libhal_ctx_set_user_data () +
libhal_ctx_set_user_data, libhal_ctx_set_user_data ()
-
libhal_ctx_shutdown, libhal_ctx_shutdown () +
libhal_ctx_shutdown, libhal_ctx_shutdown ()
-
LIBHAL_DEPRECATED, LIBHAL_DEPRECATED +
LIBHAL_DEPRECATED, LIBHAL_DEPRECATED
-
libhal_device_acquire_interface_lock, libhal_device_acquire_interface_lock () +
libhal_device_acquire_interface_lock, libhal_device_acquire_interface_lock ()
-
libhal_device_addon_is_ready, libhal_device_addon_is_ready () +
libhal_device_addon_is_ready, libhal_device_addon_is_ready ()
-
libhal_device_add_capability, libhal_device_add_capability () +
libhal_device_add_capability, libhal_device_add_capability ()
-
libhal_device_add_property_watch, libhal_device_add_property_watch () +
libhal_device_add_property_watch, libhal_device_add_property_watch ()
-
libhal_device_claim_interface, libhal_device_claim_interface () +
libhal_device_claim_interface, libhal_device_claim_interface ()
-
libhal_device_commit_changeset, libhal_device_commit_changeset () +
libhal_device_commit_changeset, libhal_device_commit_changeset ()
-
libhal_device_commit_to_gdl, libhal_device_commit_to_gdl () +
libhal_device_commit_to_gdl, libhal_device_commit_to_gdl ()
-
libhal_device_emit_condition, libhal_device_emit_condition () +
libhal_device_emit_condition, libhal_device_emit_condition ()
-
libhal_device_exists, libhal_device_exists () +
libhal_device_exists, libhal_device_exists ()
-
libhal_device_free_changeset, libhal_device_free_changeset () +
libhal_device_free_changeset, libhal_device_free_changeset ()
-
libhal_device_get_all_properties, libhal_device_get_all_properties () +
libhal_device_get_all_properties, libhal_device_get_all_properties ()
-
libhal_device_get_property_bool, libhal_device_get_property_bool () +
libhal_device_get_property_bool, libhal_device_get_property_bool ()
-
libhal_device_get_property_double, libhal_device_get_property_double () +
libhal_device_get_property_double, libhal_device_get_property_double ()
-
libhal_device_get_property_int, libhal_device_get_property_int () +
libhal_device_get_property_int, libhal_device_get_property_int ()
-
libhal_device_get_property_string, libhal_device_get_property_string () +
libhal_device_get_property_string, libhal_device_get_property_string ()
-
libhal_device_get_property_strlist, libhal_device_get_property_strlist () +
libhal_device_get_property_strlist, libhal_device_get_property_strlist ()
-
libhal_device_get_property_type, libhal_device_get_property_type () +
libhal_device_get_property_type, libhal_device_get_property_type ()
-
libhal_device_get_property_uint64, libhal_device_get_property_uint64 () +
libhal_device_get_property_uint64, libhal_device_get_property_uint64 ()
-
libhal_device_is_caller_locked_out, libhal_device_is_caller_locked_out () +
libhal_device_is_caller_locked_out, libhal_device_is_caller_locked_out ()
-
libhal_device_is_caller_privileged, libhal_device_is_caller_privileged () +
libhal_device_is_caller_privileged, libhal_device_is_caller_privileged ()
-
libhal_device_is_locked_by_others, libhal_device_is_locked_by_others () +
libhal_device_is_locked_by_others, libhal_device_is_locked_by_others ()
-
libhal_device_lock, libhal_device_lock () +
libhal_device_lock, libhal_device_lock ()
-
libhal_device_matches, libhal_device_matches () +
libhal_device_matches, libhal_device_matches ()
-
libhal_device_new_changeset, libhal_device_new_changeset () +
libhal_device_new_changeset, libhal_device_new_changeset ()
-
libhal_device_print, libhal_device_print () +
libhal_device_print, libhal_device_print ()
-
libhal_device_property_exists, libhal_device_property_exists () +
libhal_device_property_exists, libhal_device_property_exists ()
-
libhal_device_property_strlist_append, libhal_device_property_strlist_append () +
libhal_device_property_strlist_append, libhal_device_property_strlist_append ()
-
libhal_device_property_strlist_prepend, libhal_device_property_strlist_prepend () +
libhal_device_property_strlist_prepend, libhal_device_property_strlist_prepend ()
-
libhal_device_property_strlist_remove, libhal_device_property_strlist_remove () +
libhal_device_property_strlist_remove, libhal_device_property_strlist_remove ()
-
libhal_device_property_strlist_remove_index, libhal_device_property_strlist_remove_index () +
libhal_device_property_strlist_remove_index, libhal_device_property_strlist_remove_index ()
-
libhal_device_property_watch_all, libhal_device_property_watch_all () +
libhal_device_property_watch_all, libhal_device_property_watch_all ()
-
libhal_device_query_capability, libhal_device_query_capability () +
libhal_device_query_capability, libhal_device_query_capability ()
-
libhal_device_release_interface_lock, libhal_device_release_interface_lock () +
libhal_device_release_interface_lock, libhal_device_release_interface_lock ()
-
libhal_device_remove_property, libhal_device_remove_property () +
libhal_device_remove_property, libhal_device_remove_property ()
-
libhal_device_remove_property_watch, libhal_device_remove_property_watch () +
libhal_device_remove_property_watch, libhal_device_remove_property_watch ()
-
libhal_device_reprobe, libhal_device_reprobe () +
libhal_device_reprobe, libhal_device_reprobe ()
-
libhal_device_rescan, libhal_device_rescan () +
libhal_device_rescan, libhal_device_rescan ()
-
libhal_device_set_property_bool, libhal_device_set_property_bool () +
libhal_device_set_property_bool, libhal_device_set_property_bool ()
-
libhal_device_set_property_double, libhal_device_set_property_double () +
libhal_device_set_property_double, libhal_device_set_property_double ()
-
libhal_device_set_property_int, libhal_device_set_property_int () +
libhal_device_set_property_int, libhal_device_set_property_int ()
-
libhal_device_set_property_string, libhal_device_set_property_string () +
libhal_device_set_property_string, libhal_device_set_property_string ()
-
libhal_device_set_property_uint64, libhal_device_set_property_uint64 () +
libhal_device_set_property_uint64, libhal_device_set_property_uint64 ()
-
libhal_device_singleton_addon_is_ready, libhal_device_singleton_addon_is_ready () +
libhal_device_singleton_addon_is_ready, libhal_device_singleton_addon_is_ready ()
-
libhal_device_unlock, libhal_device_unlock () +
libhal_device_unlock, libhal_device_unlock ()
-
libhal_find_device_by_capability, libhal_find_device_by_capability () +
libhal_find_device_by_capability, libhal_find_device_by_capability ()
-
LIBHAL_FREE_DBUS_ERROR, LIBHAL_FREE_DBUS_ERROR() +
LIBHAL_FREE_DBUS_ERROR, LIBHAL_FREE_DBUS_ERROR()
-
libhal_free_property_set, libhal_free_property_set () +
libhal_free_property_set, libhal_free_property_set ()
-
libhal_free_string, libhal_free_string () +
libhal_free_string, libhal_free_string ()
-
libhal_free_string_array, libhal_free_string_array () +
libhal_free_string_array, libhal_free_string_array ()
-
libhal_get_all_devices, libhal_get_all_devices () +
libhal_get_all_devices, libhal_get_all_devices ()
-
libhal_get_all_devices_with_properties, libhal_get_all_devices_with_properties () +
libhal_get_all_devices_with_properties, libhal_get_all_devices_with_properties ()
-
libhal_manager_find_device_string_match, libhal_manager_find_device_string_match () +
libhal_manager_find_device_string_match, libhal_manager_find_device_string_match ()
-
libhal_merge_properties, libhal_merge_properties () +
libhal_merge_properties, libhal_merge_properties ()
-
libhal_new_device, libhal_new_device () +
libhal_new_device, libhal_new_device ()
-
libhal_property_set_get_num_elems, libhal_property_set_get_num_elems () +
libhal_property_set_get_num_elems, libhal_property_set_get_num_elems ()
-
libhal_property_set_sort, libhal_property_set_sort () +
libhal_property_set_sort, libhal_property_set_sort ()
-
libhal_psi_get_bool, libhal_psi_get_bool () +
libhal_psi_get_bool, libhal_psi_get_bool ()
-
libhal_psi_get_double, libhal_psi_get_double () +
libhal_psi_get_double, libhal_psi_get_double ()
-
libhal_psi_get_int, libhal_psi_get_int () +
libhal_psi_get_int, libhal_psi_get_int ()
-
libhal_psi_get_key, libhal_psi_get_key () +
libhal_psi_get_key, libhal_psi_get_key ()
-
libhal_psi_get_string, libhal_psi_get_string () +
libhal_psi_get_string, libhal_psi_get_string ()
-
libhal_psi_get_strlist, libhal_psi_get_strlist () +
libhal_psi_get_strlist, libhal_psi_get_strlist ()
-
libhal_psi_get_type, libhal_psi_get_type () +
libhal_psi_get_type, libhal_psi_get_type ()
-
libhal_psi_get_uint64, libhal_psi_get_uint64 () +
libhal_psi_get_uint64, libhal_psi_get_uint64 ()
-
libhal_psi_has_more, libhal_psi_has_more () +
libhal_psi_has_more, libhal_psi_has_more ()
-
libhal_psi_init, libhal_psi_init () +
libhal_psi_init, libhal_psi_init ()
-
libhal_psi_next, libhal_psi_next () +
libhal_psi_next, libhal_psi_next ()
-
libhal_ps_get_bool, libhal_ps_get_bool () +
libhal_ps_get_bool, libhal_ps_get_bool ()
-
libhal_ps_get_double, libhal_ps_get_double () +
libhal_ps_get_double, libhal_ps_get_double ()
-
libhal_ps_get_int32, libhal_ps_get_int32 () +
libhal_ps_get_int32, libhal_ps_get_int32 ()
-
libhal_ps_get_string, libhal_ps_get_string () +
libhal_ps_get_string, libhal_ps_get_string ()
-
libhal_ps_get_type, libhal_ps_get_type () +
libhal_ps_get_type, libhal_ps_get_type ()
-
libhal_ps_get_uint64, libhal_ps_get_uint64 () +
libhal_ps_get_uint64, libhal_ps_get_uint64 ()
-
libhal_release_global_interface_lock, libhal_release_global_interface_lock () +
libhal_release_global_interface_lock, libhal_release_global_interface_lock ()
-
libhal_remove_device, libhal_remove_device () +
libhal_remove_device, libhal_remove_device ()
-
libhal_string_array_length, libhal_string_array_length () +
libhal_string_array_length, libhal_string_array_length ()
+
+
+ Generated by GTK-Doc V1.10
--- hal-0.5.11~rc2.orig/doc/api/libhal/libhal-decl-list.txt +++ hal-0.5.11~rc2/doc/api/libhal/libhal-decl-list.txt @@ -0,0 +1,174 @@ +
+libhal +DBUS_API_SUBJECT_TO_CHANGE +LIBHAL_DEPRECATED +LIBHAL_FREE_DBUS_ERROR +LIBHAL_CHECK_LIBHALCONTEXT +LibHalPropertyType +LibHalContext +LibHalProperty +LibHalPropertySet +LibHalIntegrateDBusIntoMainLoop +LibHalDeviceAdded +LibHalDeviceRemoved +LibHalDeviceNewCapability +LibHalDeviceLostCapability +LibHalDevicePropertyModified +LibHalDeviceCondition +LibHalGlobalInterfaceLockAcquired +LibHalGlobalInterfaceLockReleased +LibHalInterfaceLockAcquired +LibHalInterfaceLockReleased +LibHalSingletonDeviceAdded +LibHalSingletonDeviceRemoved +libhal_ctx_new +libhal_ctx_set_cache +libhal_ctx_set_dbus_connection +libhal_ctx_get_dbus_connection +libhal_ctx_set_user_data +libhal_ctx_get_user_data +libhal_ctx_set_device_added +libhal_ctx_set_device_removed +libhal_ctx_set_device_new_capability +libhal_ctx_set_device_lost_capability +libhal_ctx_set_device_property_modified +libhal_ctx_set_device_condition +libhal_ctx_set_global_interface_lock_acquired +libhal_ctx_set_global_interface_lock_released +libhal_ctx_set_interface_lock_acquired +libhal_ctx_set_interface_lock_released +libhal_ctx_set_singleton_device_added +libhal_ctx_set_singleton_device_removed +libhal_ctx_init +libhal_ctx_shutdown +libhal_ctx_free +libhal_ctx_init_direct +libhal_get_all_devices +libhal_device_exists +libhal_device_print +libhal_device_property_exists +libhal_device_get_property_string +libhal_device_get_property_int +libhal_device_get_property_uint64 +libhal_device_get_property_double +libhal_device_get_property_bool +libhal_device_get_property_strlist +libhal_device_set_property_string +libhal_device_set_property_int +libhal_device_set_property_uint64 +libhal_device_set_property_double +libhal_device_set_property_bool +libhal_device_property_strlist_append +libhal_device_property_strlist_prepend +libhal_device_property_strlist_remove_index +libhal_device_property_strlist_remove +libhal_device_remove_property +libhal_device_get_property_type +LibHalChangeSet_s +LibHalChangeSet +libhal_device_new_changeset +libhal_changeset_set_property_string +libhal_changeset_set_property_int +libhal_changeset_set_property_uint64 +libhal_changeset_set_property_double +libhal_changeset_set_property_bool +libhal_changeset_set_property_strlist +libhal_device_commit_changeset +libhal_device_free_changeset +libhal_device_get_all_properties +libhal_get_all_devices_with_properties +libhal_property_set_sort +libhal_free_property_set +libhal_property_set_get_num_elems +libhal_ps_get_type +libhal_ps_get_string +libhal_ps_get_int32 +libhal_ps_get_uint64 +libhal_ps_get_double +libhal_ps_get_bool +LibHalPropertySetIterator +libhal_psi_init +libhal_psi_has_more +libhal_psi_next +libhal_psi_get_type +libhal_psi_get_key +libhal_psi_get_string +libhal_psi_get_int +libhal_psi_get_uint64 +libhal_psi_get_double +libhal_psi_get_bool +libhal_psi_get_strlist +libhal_string_array_length +libhal_free_string_array +libhal_free_string +libhal_new_device +libhal_device_commit_to_gdl +libhal_remove_device +libhal_merge_properties +libhal_device_matches +libhal_manager_find_device_string_match +libhal_device_add_capability +libhal_device_query_capability +libhal_find_device_by_capability +libhal_device_property_watch_all +libhal_device_add_property_watch +libhal_device_remove_property_watch +libhal_device_lock +libhal_device_unlock +libhal_device_rescan +libhal_device_reprobe +libhal_device_emit_condition +libhal_device_claim_interface +libhal_device_addon_is_ready +libhal_device_singleton_addon_is_ready +libhal_device_acquire_interface_lock +libhal_device_release_interface_lock +libhal_acquire_global_interface_lock +libhal_release_global_interface_lock +libhal_device_is_caller_locked_out +libhal_device_is_locked_by_others +libhal_device_is_caller_privileged +
+ +
+uthash +uthash_fatal +uthash_bkt_malloc +uthash_bkt_free +uthash_tbl_malloc +uthash_tbl_free +uthash_noexpand_fyi +uthash_expand_fyi +HASH_INITIAL_NUM_BUCKETS +HASH_BKT_CAPACITY_THRESH +HASH_FIND +HASH_ADD +HASH_ADD_KEYPTR +HASH_DELETE +HASH_FIND_STR +HASH_ADD_STR +HASH_FIND_INT +HASH_ADD_INT +HASH_DEL +HASH_OOPS +HASH_FSCK +HASH_EMIT_KEY +HASH_FCN +HASH_BER +HASH_SAX +HASH_FNV +HASH_OAT +HASH_JEN_MIX +HASH_JEN +HASH_JSW +HASH_KEYCMP +HASH_FIND_IN_BKT +HASH_ADD_TO_BKT +HASH_DEL_IN_BKT +HASH_EXPAND_BUCKETS +HASH_SORT +UT_hash_bucket +UT_hash_table +UT_hash_handle +
+ --- hal-0.5.11~rc2.orig/doc/api/libhal/libhal-undocumented.txt +++ hal-0.5.11~rc2/doc/api/libhal/libhal-undocumented.txt @@ -0,0 +1,57 @@ +72% symbol docs coverage. +123 symbols documented. +2 symbols incomplete. +47 not documented. + + +DBUS_API_SUBJECT_TO_CHANGE +HASH_ADD +HASH_ADD_INT +HASH_ADD_KEYPTR +HASH_ADD_STR +HASH_ADD_TO_BKT +HASH_BER +HASH_BKT_CAPACITY_THRESH +HASH_DEL +HASH_DELETE +HASH_DEL_IN_BKT +HASH_EMIT_KEY +HASH_EXPAND_BUCKETS +HASH_FCN +HASH_FIND +HASH_FIND_INT +HASH_FIND_IN_BKT +HASH_FIND_STR +HASH_FNV +HASH_FSCK +HASH_INITIAL_NUM_BUCKETS +HASH_JEN +HASH_JEN_MIX +HASH_JSW +HASH_KEYCMP +HASH_OAT +HASH_OOPS +HASH_SAX +HASH_SORT +LIBHAL_DEPRECATED +LIBHAL_FREE_DBUS_ERROR +LibHalChangeSet +LibHalChangeSet_s +LibHalPropertyType (LIBHAL_PROPERTY_TYPE_INVALID, LIBHAL_PROPERTY_TYPE_INT32, LIBHAL_PROPERTY_TYPE_UINT64, LIBHAL_PROPERTY_TYPE_DOUBLE, LIBHAL_PROPERTY_TYPE_BOOLEAN, LIBHAL_PROPERTY_TYPE_STRING, LIBHAL_PROPERTY_TYPE_STRLIST) +UT_hash_bucket +UT_hash_handle +UT_hash_table +libhal_get_all_devices_with_properties (ctx, Returns) +libhal_ps_get_int32 +uthash_bkt_free +uthash_bkt_malloc +uthash_expand_fyi +uthash_fatal +uthash_noexpand_fyi +uthash_tbl_free +uthash_tbl_malloc + + +libhal:Short_Description +uthash:Long_Description +uthash:Short_Description --- hal-0.5.11~rc2.orig/doc/api/libhal-storage/libhal-storage-decl-list.txt +++ hal-0.5.11~rc2/doc/api/libhal-storage/libhal-storage-decl-list.txt @@ -0,0 +1,78 @@ +
+libhal-storage +LibHalDrive_s +LibHalDrive +LibHalVolume_s +LibHalVolume +LibHalStoragePolicy_s +LibHalStoragePolicy +LibHalStoragePolicyIcon +LibHalStoragePolicyIconPair +libhal_storage_policy_new +libhal_drive_from_device_file +libhal_drive_free +libhal_drive_is_hotpluggable +libhal_drive_uses_removable_media +libhal_drive_is_media_detected +libhal_drive_is_media_detection_automatic +libhal_drive_get_size +libhal_drive_get_media_size +libhal_drive_get_partition_scheme +libhal_drive_no_partitions_hint +libhal_drive_requires_eject +libhal_drive_get_type +libhal_drive_get_bus +libhal_drive_get_cdrom_caps +libhal_drive_get_device_major +libhal_drive_get_device_minor +libhal_drive_get_type_textual +libhal_drive_get_device_file +libhal_drive_get_udi +libhal_drive_get_serial +libhal_drive_get_firmware_version +libhal_drive_get_model +libhal_drive_get_vendor +libhal_drive_get_physical_device_udi +libhal_drive_get_dedicated_icon_drive +libhal_drive_get_dedicated_icon_volume +libhal_drive_policy_compute_display_name +libhal_drive_policy_default_get_mount_root +libhal_volume_from_device_file +libhal_volume_from_mount_point +libhal_volume_free +libhal_volume_get_size +libhal_volume_get_disc_capacity +libhal_volume_get_udi +libhal_volume_get_device_file +libhal_volume_get_device_major +libhal_volume_get_device_minor +libhal_volume_get_fstype +libhal_volume_get_fsversion +libhal_volume_get_fsusage +libhal_volume_is_mounted +libhal_volume_is_mounted_read_only +libhal_volume_is_partition +libhal_volume_is_disc +libhal_volume_get_partition_scheme +libhal_volume_get_partition_type +libhal_volume_get_partition_label +libhal_volume_get_partition_uuid +libhal_volume_get_partition_flags +libhal_volume_get_partition_number +libhal_volume_get_partition_start_offset +libhal_volume_get_partition_media_size +libhal_volume_get_label +libhal_volume_get_mount_point +libhal_volume_get_uuid +libhal_volume_get_storage_device_udi +libhal_volume_crypto_get_backing_volume_udi +libhal_volume_crypto_get_clear_volume_udi +libhal_volume_disc_has_audio +libhal_volume_disc_has_data +libhal_volume_disc_is_blank +libhal_volume_disc_is_rewritable +libhal_volume_disc_is_appendable +libhal_volume_get_disc_type +libhal_volume_get_msdos_part_table_type +
+ --- hal-0.5.11~rc2.orig/doc/api/libhal-storage/xml/libhal-storage-doc.bottom +++ hal-0.5.11~rc2/doc/api/libhal-storage/xml/libhal-storage-doc.bottom @@ -0,0 +1 @@ + --- hal-0.5.11~rc2.orig/doc/api/libhal-storage/xml/tree_index.sgml +++ hal-0.5.11~rc2/doc/api/libhal-storage/xml/tree_index.sgml @@ -0,0 +1,7 @@ + + +]> + + --- hal-0.5.11~rc2.orig/doc/api/libhal-storage/xml/object_index.sgml +++ hal-0.5.11~rc2/doc/api/libhal-storage/xml/object_index.sgml @@ -0,0 +1,8 @@ + + + + + +
- + @@ -25,7 +25,7 @@

-API Reference

+API Reference
@@ -42,5 +42,8 @@
+
+
+ Generated by GTK-Doc V1.10
--- hal-0.5.11~rc2.orig/doc/api/libhal-storage/html/libhal-storage-libhal-storage.html +++ hal-0.5.11~rc2/doc/api/libhal-storage/html/libhal-storage-libhal-storage.html @@ -1,18 +1,18 @@ - +libhal-storage - + - + - + @@ -23,141 +23,134 @@ - +
-

-libhal-storage -

+

libhal-storage

libhal-storage
-

Synopsis

+

Synopsis

-
-
-
-struct              LibHalDrive_s;
-typedef             LibHalDrive;
-struct              LibHalVolume_s;
-typedef             LibHalVolume;
-struct              LibHalStoragePolicy_s;
-typedef             LibHalStoragePolicy;
-enum                LibHalStoragePolicyIcon;
-                    LibHalStoragePolicyIconPair;
-LibHalStoragePolicy* libhal_storage_policy_new          ();
-LibHalDrive*        libhal_drive_from_device_file       (LibHalContext *hal_ctx,
+struct              LibHalDrive_s;
+typedef             LibHalDrive;
+struct              LibHalVolume_s;
+typedef             LibHalVolume;
+struct              LibHalStoragePolicy_s;
+typedef             LibHalStoragePolicy;
+enum                LibHalStoragePolicyIcon;
+                    LibHalStoragePolicyIconPair;
+LibHalStoragePolicy* libhal_storage_policy_new          ();
+LibHalDrive*        libhal_drive_from_device_file       (LibHalContext *hal_ctx,
                                                          const char *device_file);
-void                libhal_drive_free                   (LibHalDrive *drive);
-dbus_bool_t         libhal_drive_is_hotpluggable        (LibHalDrive *drive);
-dbus_bool_t         libhal_drive_uses_removable_media   (LibHalDrive *drive);
-dbus_bool_t         libhal_drive_is_media_detected      (LibHalDrive *drive);
-dbus_bool_t         libhal_drive_is_media_detection_automatic
-                                                        (LibHalDrive *drive);
-dbus_uint64_t       libhal_drive_get_size               (LibHalDrive *drive);
-dbus_uint64_t       libhal_drive_get_media_size         (LibHalDrive *drive);
-const char*         libhal_drive_get_partition_scheme   (LibHalDrive *drive);
-dbus_bool_t         libhal_drive_no_partitions_hint     (LibHalDrive *drive);
-dbus_bool_t         libhal_drive_requires_eject         (LibHalDrive *drive);
-LibHalDriveType     libhal_drive_get_type               (LibHalDrive *drive);
-LibHalDriveBus      libhal_drive_get_bus                (LibHalDrive *drive);
-LibHalDriveCdromCaps libhal_drive_get_cdrom_caps        (LibHalDrive *drive);
-unsigned int        libhal_drive_get_device_major       (LibHalDrive *drive);
-unsigned int        libhal_drive_get_device_minor       (LibHalDrive *drive);
-const char*         libhal_drive_get_type_textual       (LibHalDrive *drive);
-const char*         libhal_drive_get_device_file        (LibHalDrive *drive);
-const char*         libhal_drive_get_udi                (LibHalDrive *drive);
-const char*         libhal_drive_get_serial             (LibHalDrive *drive);
-const char*         libhal_drive_get_firmware_version   (LibHalDrive *drive);
-const char*         libhal_drive_get_model              (LibHalDrive *drive);
-const char*         libhal_drive_get_vendor             (LibHalDrive *drive);
-const char*         libhal_drive_get_physical_device_udi
-                                                        (LibHalDrive *drive);
-const char*         libhal_drive_get_dedicated_icon_drive
-                                                        (LibHalDrive *drive);
-const char*         libhal_drive_get_dedicated_icon_volume
-                                                        (LibHalDrive *drive);
-char*               libhal_drive_policy_compute_display_name
-                                                        (LibHalDrive *drive,
-                                                         LibHalVolume *volume);
-char*               libhal_drive_policy_default_get_mount_root
+void                libhal_drive_free                   (LibHalDrive *drive);
+dbus_bool_t         libhal_drive_is_hotpluggable        (LibHalDrive *drive);
+dbus_bool_t         libhal_drive_uses_removable_media   (LibHalDrive *drive);
+dbus_bool_t         libhal_drive_is_media_detected      (LibHalDrive *drive);
+dbus_bool_t         libhal_drive_is_media_detection_automatic
+                                                        (LibHalDrive *drive);
+dbus_uint64_t       libhal_drive_get_size               (LibHalDrive *drive);
+dbus_uint64_t       libhal_drive_get_media_size         (LibHalDrive *drive);
+const char*         libhal_drive_get_partition_scheme   (LibHalDrive *drive);
+dbus_bool_t         libhal_drive_no_partitions_hint     (LibHalDrive *drive);
+dbus_bool_t         libhal_drive_requires_eject         (LibHalDrive *drive);
+LibHalDriveType     libhal_drive_get_type               (LibHalDrive *drive);
+LibHalDriveBus      libhal_drive_get_bus                (LibHalDrive *drive);
+LibHalDriveCdromCaps libhal_drive_get_cdrom_caps        (LibHalDrive *drive);
+unsigned int        libhal_drive_get_device_major       (LibHalDrive *drive);
+unsigned int        libhal_drive_get_device_minor       (LibHalDrive *drive);
+const char*         libhal_drive_get_type_textual       (LibHalDrive *drive);
+const char*         libhal_drive_get_device_file        (LibHalDrive *drive);
+const char*         libhal_drive_get_udi                (LibHalDrive *drive);
+const char*         libhal_drive_get_serial             (LibHalDrive *drive);
+const char*         libhal_drive_get_firmware_version   (LibHalDrive *drive);
+const char*         libhal_drive_get_model              (LibHalDrive *drive);
+const char*         libhal_drive_get_vendor             (LibHalDrive *drive);
+const char*         libhal_drive_get_physical_device_udi
+                                                        (LibHalDrive *drive);
+const char*         libhal_drive_get_dedicated_icon_drive
+                                                        (LibHalDrive *drive);
+const char*         libhal_drive_get_dedicated_icon_volume
+                                                        (LibHalDrive *drive);
+char*               libhal_drive_policy_compute_display_name
+                                                        (LibHalDrive *drive,
+                                                         LibHalVolume *volume);
+char*               libhal_drive_policy_default_get_mount_root
                                                         ();
-LibHalVolume*       libhal_volume_from_device_file      (LibHalContext *hal_ctx,
+LibHalVolume*       libhal_volume_from_device_file      (LibHalContext *hal_ctx,
                                                          const char *device_file);
-LibHalVolume*       libhal_volume_from_mount_point      (LibHalContext *hal_ctx,
+LibHalVolume*       libhal_volume_from_mount_point      (LibHalContext *hal_ctx,
                                                          const char *mount_point);
-void                libhal_volume_free                  (LibHalVolume *volume);
-dbus_uint64_t       libhal_volume_get_size              (LibHalVolume *volume);
-dbus_uint64_t       libhal_volume_get_disc_capacity     (LibHalVolume *volume);
-const char*         libhal_volume_get_udi               (LibHalVolume *volume);
-const char*         libhal_volume_get_device_file       (LibHalVolume *volume);
-unsigned int        libhal_volume_get_device_major      (LibHalVolume *volume);
-unsigned int        libhal_volume_get_device_minor      (LibHalVolume *volume);
-const char*         libhal_volume_get_fstype            (LibHalVolume *volume);
-const char*         libhal_volume_get_fsversion         (LibHalVolume *volume);
-LibHalVolumeUsage   libhal_volume_get_fsusage           (LibHalVolume *volume);
-dbus_bool_t         libhal_volume_is_mounted            (LibHalVolume *volume);
-dbus_bool_t         libhal_volume_is_mounted_read_only  (LibHalVolume *volume);
-dbus_bool_t         libhal_volume_is_partition          (LibHalVolume *volume);
-dbus_bool_t         libhal_volume_is_disc               (LibHalVolume *volume);
-const char*         libhal_volume_get_partition_scheme  (LibHalVolume *volume);
-const char*         libhal_volume_get_partition_type    (LibHalVolume *volume);
-const char*         libhal_volume_get_partition_label   (LibHalVolume *volume);
-const char*         libhal_volume_get_partition_uuid    (LibHalVolume *volume);
-const char**        libhal_volume_get_partition_flags   (LibHalVolume *volume);
-unsigned int        libhal_volume_get_partition_number  (LibHalVolume *volume);
-dbus_uint64_t       libhal_volume_get_partition_start_offset
-                                                        (LibHalVolume *volume);
-dbus_uint64_t       libhal_volume_get_partition_media_size
-                                                        (LibHalVolume *volume);
-const char*         libhal_volume_get_label             (LibHalVolume *volume);
-const char*         libhal_volume_get_mount_point       (LibHalVolume *volume);
-const char*         libhal_volume_get_uuid              (LibHalVolume *volume);
-const char*         libhal_volume_get_storage_device_udi
-                                                        (LibHalVolume *volume);
-const char*         libhal_volume_crypto_get_backing_volume_udi
-                                                        (LibHalVolume *volume);
-char*               libhal_volume_crypto_get_clear_volume_udi
+void                libhal_volume_free                  (LibHalVolume *volume);
+dbus_uint64_t       libhal_volume_get_size              (LibHalVolume *volume);
+dbus_uint64_t       libhal_volume_get_disc_capacity     (LibHalVolume *volume);
+const char*         libhal_volume_get_udi               (LibHalVolume *volume);
+const char*         libhal_volume_get_device_file       (LibHalVolume *volume);
+unsigned int        libhal_volume_get_device_major      (LibHalVolume *volume);
+unsigned int        libhal_volume_get_device_minor      (LibHalVolume *volume);
+const char*         libhal_volume_get_fstype            (LibHalVolume *volume);
+const char*         libhal_volume_get_fsversion         (LibHalVolume *volume);
+LibHalVolumeUsage   libhal_volume_get_fsusage           (LibHalVolume *volume);
+dbus_bool_t         libhal_volume_is_mounted            (LibHalVolume *volume);
+dbus_bool_t         libhal_volume_is_mounted_read_only  (LibHalVolume *volume);
+dbus_bool_t         libhal_volume_is_partition          (LibHalVolume *volume);
+dbus_bool_t         libhal_volume_is_disc               (LibHalVolume *volume);
+const char*         libhal_volume_get_partition_scheme  (LibHalVolume *volume);
+const char*         libhal_volume_get_partition_type    (LibHalVolume *volume);
+const char*         libhal_volume_get_partition_label   (LibHalVolume *volume);
+const char*         libhal_volume_get_partition_uuid    (LibHalVolume *volume);
+const char**        libhal_volume_get_partition_flags   (LibHalVolume *volume);
+unsigned int        libhal_volume_get_partition_number  (LibHalVolume *volume);
+dbus_uint64_t       libhal_volume_get_partition_start_offset
+                                                        (LibHalVolume *volume);
+dbus_uint64_t       libhal_volume_get_partition_media_size
+                                                        (LibHalVolume *volume);
+const char*         libhal_volume_get_label             (LibHalVolume *volume);
+const char*         libhal_volume_get_mount_point       (LibHalVolume *volume);
+const char*         libhal_volume_get_uuid              (LibHalVolume *volume);
+const char*         libhal_volume_get_storage_device_udi
+                                                        (LibHalVolume *volume);
+const char*         libhal_volume_crypto_get_backing_volume_udi
+                                                        (LibHalVolume *volume);
+char*               libhal_volume_crypto_get_clear_volume_udi
                                                         (LibHalContext *hal_ctx,
-                                                         LibHalVolume *volume);
-dbus_bool_t         libhal_volume_disc_has_audio        (LibHalVolume *volume);
-dbus_bool_t         libhal_volume_disc_has_data         (LibHalVolume *volume);
-dbus_bool_t         libhal_volume_disc_is_blank         (LibHalVolume *volume);
-dbus_bool_t         libhal_volume_disc_is_rewritable    (LibHalVolume *volume);
-dbus_bool_t         libhal_volume_disc_is_appendable    (LibHalVolume *volume);
-LibHalVolumeDiscType libhal_volume_get_disc_type        (LibHalVolume *volume);
-int                 libhal_volume_get_msdos_part_table_type
+                                                         LibHalVolume *volume);
+dbus_bool_t         libhal_volume_disc_has_audio        (LibHalVolume *volume);
+dbus_bool_t         libhal_volume_disc_has_data         (LibHalVolume *volume);
+dbus_bool_t         libhal_volume_disc_is_blank         (LibHalVolume *volume);
+dbus_bool_t         libhal_volume_disc_is_rewritable    (LibHalVolume *volume);
+dbus_bool_t         libhal_volume_disc_is_appendable    (LibHalVolume *volume);
+LibHalVolumeDiscType libhal_volume_get_disc_type        (LibHalVolume *volume);
+int                 libhal_volume_get_msdos_part_table_type
                                                         ();
-

Description

+

Description

-

Details

+

Details

-

-struct LibHalDrive_s

-
struct LibHalDrive_s;
+

struct LibHalDrive_s

+
struct LibHalDrive_s;

-

-LibHalDrive

-
typedef struct LibHalDrive_s LibHalDrive;
+
LibHalDrive

+
typedef struct LibHalDrive_s LibHalDrive;
 

 

 
@@ -165,18 +158,16 @@
-

-struct LibHalVolume_s

-
struct LibHalVolume_s;
+

struct LibHalVolume_s

+
struct LibHalVolume_s;

-

-LibHalVolume

-
typedef struct LibHalVolume_s LibHalVolume;
+
LibHalVolume

+
typedef struct LibHalVolume_s LibHalVolume;
 

 

 
@@ -184,18 +175,16 @@
-

-struct LibHalStoragePolicy_s

-
struct LibHalStoragePolicy_s;
+

struct LibHalStoragePolicy_s

+
struct LibHalStoragePolicy_s;

-

-LibHalStoragePolicy

-
typedef struct LibHalStoragePolicy_s LibHalStoragePolicy;
+
LibHalStoragePolicy

+
typedef struct LibHalStoragePolicy_s LibHalStoragePolicy;
 

 

 
@@ -203,9 +192,8 @@
-

-enum LibHalStoragePolicyIcon

-
typedef enum {
+
enum LibHalStoragePolicyIcon

+
typedef enum {
 	LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK           = 0x10000,
 	LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_IDE       = 0x10001,
 	LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_SCSI      = 0x10002,
@@ -295,9 +283,8 @@
-

-LibHalStoragePolicyIconPair

-
typedef struct {
+
LibHalStoragePolicyIconPair

+
typedef struct {
 	LibHalStoragePolicyIcon icon;
 	const char *icon_path;
 } LibHalStoragePolicyIconPair;
@@ -308,16 +295,15 @@
-

-libhal_storage_policy_new ()

-
LibHalStoragePolicy* libhal_storage_policy_new          ();
+

libhal_storage_policy_new ()

+
LibHalStoragePolicy* libhal_storage_policy_new          ();

- + - + - + - +

Returns :

Returns :

 @@ -327,9 +313,8 @@
-

-libhal_drive_from_device_file ()

-
LibHalDrive*        libhal_drive_from_device_file       (LibHalContext *hal_ctx,
+
libhal_drive_from_device_file ()

+
LibHalDrive*        libhal_drive_from_device_file       (LibHalContext *hal_ctx,
                                                          const char *device_file);

 

 

@@ -340,17 +325,17 @@

hal_ctx :

hal_ctx :

 libhal context to use

device_file :

device_file :

 Name of special device file, e.g. '/dev/hdc'

Returns :

Returns :

 LibHalDrive object or NULL if it doesn't exist Get the drive object that either is (when given e.g. /dev/sdb) or contains @@ -362,9 +347,8 @@
-

-libhal_drive_free ()

-
void                libhal_drive_free                   (LibHalDrive *drive);
+

libhal_drive_free ()

+
void                libhal_drive_free                   (LibHalDrive *drive);

Free all resources used by a LibHalDrive object.

@@ -373,7 +357,7 @@

- + @@ -381,9 +365,8 @@
-

-libhal_drive_is_hotpluggable ()

-
dbus_bool_t         libhal_drive_is_hotpluggable        (LibHalDrive *drive);
+

libhal_drive_is_hotpluggable ()

+
dbus_bool_t         libhal_drive_is_hotpluggable        (LibHalDrive *drive);

@@ -391,12 +374,12 @@
- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +

drive :

drive :

 Object to free

drive :

drive :

Returns :

Returns :

 @@ -407,9 +390,8 @@
-

-libhal_drive_uses_removable_media ()

-
dbus_bool_t         libhal_drive_uses_removable_media   (LibHalDrive *drive);
+

libhal_drive_uses_removable_media ()

+
dbus_bool_t         libhal_drive_uses_removable_media   (LibHalDrive *drive);

@@ -417,12 +399,12 @@

drive :

drive :

Returns :

Returns :

 @@ -433,9 +415,8 @@
-

-libhal_drive_is_media_detected ()

-
dbus_bool_t         libhal_drive_is_media_detected      (LibHalDrive *drive);
+

libhal_drive_is_media_detected ()

+
dbus_bool_t         libhal_drive_is_media_detected      (LibHalDrive *drive);

@@ -443,12 +424,12 @@

drive :

drive :

Returns :

Returns :

 @@ -459,10 +440,9 @@
-

-libhal_drive_is_media_detection_automatic ()

-
dbus_bool_t         libhal_drive_is_media_detection_automatic
-                                                        (LibHalDrive *drive);
+

libhal_drive_is_media_detection_automatic ()

+
dbus_bool_t         libhal_drive_is_media_detection_automatic
+                                                        (LibHalDrive *drive);

@@ -470,12 +450,12 @@

drive :

drive :

Returns :

Returns :

 @@ -486,9 +466,8 @@
-

-libhal_drive_get_size ()

-
dbus_uint64_t       libhal_drive_get_size               (LibHalDrive *drive);
+

libhal_drive_get_size ()

+
dbus_uint64_t       libhal_drive_get_size               (LibHalDrive *drive);

@@ -496,12 +475,12 @@

drive :

drive :

Returns :

Returns :

 @@ -512,9 +491,8 @@
-

-libhal_drive_get_media_size ()

-
dbus_uint64_t       libhal_drive_get_media_size         (LibHalDrive *drive);
+

libhal_drive_get_media_size ()

+
dbus_uint64_t       libhal_drive_get_media_size         (LibHalDrive *drive);

@@ -522,12 +500,12 @@

drive :

drive :

Returns :

Returns :

 @@ -538,9 +516,8 @@
-

-libhal_drive_get_partition_scheme ()

-
const char*         libhal_drive_get_partition_scheme   (LibHalDrive *drive);
+

libhal_drive_get_partition_scheme ()

+
const char*         libhal_drive_get_partition_scheme   (LibHalDrive *drive);

@@ -548,12 +525,12 @@

drive :

drive :

Returns :

Returns :

 @@ -564,9 +541,8 @@
-

-libhal_drive_no_partitions_hint ()

-
dbus_bool_t         libhal_drive_no_partitions_hint     (LibHalDrive *drive);
+

libhal_drive_no_partitions_hint ()

+
dbus_bool_t         libhal_drive_no_partitions_hint     (LibHalDrive *drive);

@@ -574,12 +550,12 @@

drive :

drive :

Returns :

Returns :

 @@ -590,9 +566,8 @@
-

-libhal_drive_requires_eject ()

-
dbus_bool_t         libhal_drive_requires_eject         (LibHalDrive *drive);
+

libhal_drive_requires_eject ()

+
dbus_bool_t         libhal_drive_requires_eject         (LibHalDrive *drive);

@@ -600,12 +575,12 @@

drive :

drive :

Returns :

Returns :

 @@ -616,9 +591,8 @@
-

-libhal_drive_get_type ()

-
LibHalDriveType     libhal_drive_get_type               (LibHalDrive *drive);
+

libhal_drive_get_type ()

+
LibHalDriveType     libhal_drive_get_type               (LibHalDrive *drive);

@@ -626,12 +600,12 @@

drive :

drive :

Returns :

Returns :

 @@ -642,9 +616,8 @@
-

-libhal_drive_get_bus ()

-
LibHalDriveBus      libhal_drive_get_bus                (LibHalDrive *drive);
+

libhal_drive_get_bus ()

+
LibHalDriveBus      libhal_drive_get_bus                (LibHalDrive *drive);

@@ -652,12 +625,12 @@

drive :

drive :

Returns :

Returns :

 @@ -668,9 +641,8 @@
-

-libhal_drive_get_cdrom_caps ()

-
LibHalDriveCdromCaps libhal_drive_get_cdrom_caps        (LibHalDrive *drive);
+

libhal_drive_get_cdrom_caps ()

+
LibHalDriveCdromCaps libhal_drive_get_cdrom_caps        (LibHalDrive *drive);

@@ -678,12 +650,12 @@

drive :

drive :

Returns :

Returns :

 @@ -694,9 +666,8 @@
-

-libhal_drive_get_device_major ()

-
unsigned int        libhal_drive_get_device_major       (LibHalDrive *drive);
+

libhal_drive_get_device_major ()

+
unsigned int        libhal_drive_get_device_major       (LibHalDrive *drive);

@@ -704,12 +675,12 @@

drive :

drive :

Returns :

Returns :

 @@ -720,9 +691,8 @@
-

-libhal_drive_get_device_minor ()

-
unsigned int        libhal_drive_get_device_minor       (LibHalDrive *drive);
+

libhal_drive_get_device_minor ()

+
unsigned int        libhal_drive_get_device_minor       (LibHalDrive *drive);

@@ -730,12 +700,12 @@

drive :

drive :

Returns :

Returns :

 @@ -746,9 +716,8 @@
-

-libhal_drive_get_type_textual ()

-
const char*         libhal_drive_get_type_textual       (LibHalDrive *drive);
+

libhal_drive_get_type_textual ()

+
const char*         libhal_drive_get_type_textual       (LibHalDrive *drive);

@@ -756,12 +725,12 @@

drive :

drive :

Returns :

Returns :

 @@ -772,9 +741,8 @@
-

-libhal_drive_get_device_file ()

-
const char*         libhal_drive_get_device_file        (LibHalDrive *drive);
+

libhal_drive_get_device_file ()

+
const char*         libhal_drive_get_device_file        (LibHalDrive *drive);

@@ -782,12 +750,12 @@

drive :

drive :

Returns :

Returns :

 @@ -798,9 +766,8 @@
-

-libhal_drive_get_udi ()

-
const char*         libhal_drive_get_udi                (LibHalDrive *drive);
+

libhal_drive_get_udi ()

+
const char*         libhal_drive_get_udi                (LibHalDrive *drive);

@@ -808,12 +775,12 @@

drive :

drive :

Returns :

Returns :

 @@ -824,9 +791,8 @@
-

-libhal_drive_get_serial ()

-
const char*         libhal_drive_get_serial             (LibHalDrive *drive);
+

libhal_drive_get_serial ()

+
const char*         libhal_drive_get_serial             (LibHalDrive *drive);

@@ -834,12 +800,12 @@

drive :

drive :

Returns :

Returns :

 @@ -850,9 +816,8 @@
-

-libhal_drive_get_firmware_version ()

-
const char*         libhal_drive_get_firmware_version   (LibHalDrive *drive);
+

libhal_drive_get_firmware_version ()

+
const char*         libhal_drive_get_firmware_version   (LibHalDrive *drive);

@@ -860,12 +825,12 @@

drive :

drive :

Returns :

Returns :

 @@ -876,9 +841,8 @@
-

-libhal_drive_get_model ()

-
const char*         libhal_drive_get_model              (LibHalDrive *drive);
+

libhal_drive_get_model ()

+
const char*         libhal_drive_get_model              (LibHalDrive *drive);

@@ -886,12 +850,12 @@

drive :

drive :

Returns :

Returns :

 @@ -902,9 +866,8 @@
-

-libhal_drive_get_vendor ()

-
const char*         libhal_drive_get_vendor             (LibHalDrive *drive);
+

libhal_drive_get_vendor ()

+
const char*         libhal_drive_get_vendor             (LibHalDrive *drive);

@@ -912,12 +875,12 @@

drive :

drive :

Returns :

Returns :

 @@ -928,10 +891,9 @@
-

-libhal_drive_get_physical_device_udi ()

-
const char*         libhal_drive_get_physical_device_udi
-                                                        (LibHalDrive *drive);
+

libhal_drive_get_physical_device_udi ()

+
const char*         libhal_drive_get_physical_device_udi
+                                                        (LibHalDrive *drive);

@@ -939,12 +901,12 @@

drive :

drive :

Returns :

Returns :

 @@ -955,10 +917,9 @@
-

-libhal_drive_get_dedicated_icon_drive ()

-
const char*         libhal_drive_get_dedicated_icon_drive
-                                                        (LibHalDrive *drive);
+

libhal_drive_get_dedicated_icon_drive ()

+
const char*         libhal_drive_get_dedicated_icon_drive
+                                                        (LibHalDrive *drive);

@@ -966,12 +927,12 @@

drive :

drive :

Returns :

Returns :

 @@ -982,10 +943,9 @@
-

-libhal_drive_get_dedicated_icon_volume ()

-
const char*         libhal_drive_get_dedicated_icon_volume
-                                                        (LibHalDrive *drive);
+

libhal_drive_get_dedicated_icon_volume ()

+
const char*         libhal_drive_get_dedicated_icon_volume
+                                                        (LibHalDrive *drive);

@@ -993,12 +953,12 @@

drive :

drive :

Returns :

Returns :

 @@ -1009,11 +969,10 @@
-

-libhal_drive_policy_compute_display_name ()

-
char*               libhal_drive_policy_compute_display_name
-                                                        (LibHalDrive *drive,
-                                                         LibHalVolume *volume);
+

libhal_drive_policy_compute_display_name ()

+
char*               libhal_drive_policy_compute_display_name
+                                                        (LibHalDrive *drive,
+                                                         LibHalVolume *volume);

@@ -1021,17 +980,17 @@

drive :

drive :

volume :

volume :

Returns :

Returns :

 @@ -1042,9 +1001,8 @@
-

-libhal_drive_policy_default_get_mount_root ()

-
char*               libhal_drive_policy_default_get_mount_root
+
libhal_drive_policy_default_get_mount_root ()

+
char*               libhal_drive_policy_default_get_mount_root
                                                         ();

 

 
@@ -1052,7 +1010,7 @@
 

-
+
-
+
-
+
-
+
-
+
-
+
-
+

 
 
Returns :
Returns :

 
 
 
@@ -1062,9 +1020,8 @@
 
 

 

-

-libhal_volume_from_device_file ()

-
LibHalVolume*       libhal_volume_from_device_file      (LibHalContext *hal_ctx,
+
libhal_volume_from_device_file ()

+
LibHalVolume*       libhal_volume_from_device_file      (LibHalContext *hal_ctx,
                                                          const char *device_file);

 

 

@@ -1075,17 +1032,17 @@
 

 
 
hal_ctx :
hal_ctx :

             libhal context to use
 
 

 
device_file :
device_file :

         Name of special device file, e.g. '/dev/hda5'
 
 

 
Returns :
Returns :

              LibHalVolume object or NULL if it doesn't exist
 
  Get the volume object for a given device file.
@@ -1096,9 +1053,8 @@
 
 

 

-

-libhal_volume_from_mount_point ()

-
LibHalVolume*       libhal_volume_from_mount_point      (LibHalContext *hal_ctx,
+
libhal_volume_from_mount_point ()

+
LibHalVolume*       libhal_volume_from_mount_point      (LibHalContext *hal_ctx,
                                                          const char *mount_point);

 

 

@@ -1109,17 +1065,17 @@
 

 
 
hal_ctx :
hal_ctx :

              libhal context to use
 
 

 
mount_point :
mount_point :

          Name of mount point without terminting slash, e.g. '/media/disk'
 
 

 
Returns :
Returns :

               LibHalVolume object or NULL if it doesn't exist
 
  Get the volume object for a given mount point 
@@ -1130,9 +1086,8 @@
 
 

 

-

-libhal_volume_free ()

-
void                libhal_volume_free                  (LibHalVolume *volume);

+
libhal_volume_free ()

+
void                libhal_volume_free                  (LibHalVolume *volume);

 

 Free all resources used by a LibHalVolume object.

 

@@ -1141,7 +1096,7 @@
 

-
+
@@ -1149,9 +1104,8 @@
 

-

-libhal_volume_get_size ()

-
dbus_uint64_t       libhal_volume_get_size              (LibHalVolume *volume);

+
libhal_volume_get_size ()

+
dbus_uint64_t       libhal_volume_get_size              (LibHalVolume *volume);

 

 
 

@@ -1159,12 +1113,12 @@
 

-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+

 
 
volume :
volume :

               Object to free
 
 

 
 
 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1175,9 +1129,8 @@
 
 

 

-

-libhal_volume_get_disc_capacity ()

-
dbus_uint64_t       libhal_volume_get_disc_capacity     (LibHalVolume *volume);

+
libhal_volume_get_disc_capacity ()

+
dbus_uint64_t       libhal_volume_get_disc_capacity     (LibHalVolume *volume);

 

 
 

@@ -1185,12 +1138,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1201,9 +1154,8 @@
 
 

 

-

-libhal_volume_get_udi ()

-
const char*         libhal_volume_get_udi               (LibHalVolume *volume);

+
libhal_volume_get_udi ()

+
const char*         libhal_volume_get_udi               (LibHalVolume *volume);

 

 
 

@@ -1211,12 +1163,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1227,9 +1179,8 @@
 
 

 

-

-libhal_volume_get_device_file ()

-
const char*         libhal_volume_get_device_file       (LibHalVolume *volume);

+
libhal_volume_get_device_file ()

+
const char*         libhal_volume_get_device_file       (LibHalVolume *volume);

 

 
 

@@ -1237,12 +1188,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1253,9 +1204,8 @@
 
 

 

-

-libhal_volume_get_device_major ()

-
unsigned int        libhal_volume_get_device_major      (LibHalVolume *volume);

+
libhal_volume_get_device_major ()

+
unsigned int        libhal_volume_get_device_major      (LibHalVolume *volume);

 

 
 

@@ -1263,12 +1213,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1279,9 +1229,8 @@
 
 

 

-

-libhal_volume_get_device_minor ()

-
unsigned int        libhal_volume_get_device_minor      (LibHalVolume *volume);

+
libhal_volume_get_device_minor ()

+
unsigned int        libhal_volume_get_device_minor      (LibHalVolume *volume);

 

 
 

@@ -1289,12 +1238,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1305,9 +1254,8 @@
 
 

 

-

-libhal_volume_get_fstype ()

-
const char*         libhal_volume_get_fstype            (LibHalVolume *volume);

+
libhal_volume_get_fstype ()

+
const char*         libhal_volume_get_fstype            (LibHalVolume *volume);

 

 
 

@@ -1315,12 +1263,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1331,9 +1279,8 @@
 
 

 

-

-libhal_volume_get_fsversion ()

-
const char*         libhal_volume_get_fsversion         (LibHalVolume *volume);

+
libhal_volume_get_fsversion ()

+
const char*         libhal_volume_get_fsversion         (LibHalVolume *volume);

 

 
 

@@ -1341,12 +1288,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1357,9 +1304,8 @@
 
 

 

-

-libhal_volume_get_fsusage ()

-
LibHalVolumeUsage   libhal_volume_get_fsusage           (LibHalVolume *volume);

+
libhal_volume_get_fsusage ()

+
LibHalVolumeUsage   libhal_volume_get_fsusage           (LibHalVolume *volume);

 

 
 

@@ -1367,12 +1313,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1383,9 +1329,8 @@
 
 

 

-

-libhal_volume_is_mounted ()

-
dbus_bool_t         libhal_volume_is_mounted            (LibHalVolume *volume);

+
libhal_volume_is_mounted ()

+
dbus_bool_t         libhal_volume_is_mounted            (LibHalVolume *volume);

 

 
 

@@ -1393,12 +1338,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1409,9 +1354,8 @@
 
 

 

-

-libhal_volume_is_mounted_read_only ()

-
dbus_bool_t         libhal_volume_is_mounted_read_only  (LibHalVolume *volume);

+
libhal_volume_is_mounted_read_only ()

+
dbus_bool_t         libhal_volume_is_mounted_read_only  (LibHalVolume *volume);

 

 
 

@@ -1419,12 +1363,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1435,9 +1379,8 @@
 
 

 

-

-libhal_volume_is_partition ()

-
dbus_bool_t         libhal_volume_is_partition          (LibHalVolume *volume);

+
libhal_volume_is_partition ()

+
dbus_bool_t         libhal_volume_is_partition          (LibHalVolume *volume);

 

 
 

@@ -1445,12 +1388,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1461,9 +1404,8 @@
 
 

 

-

-libhal_volume_is_disc ()

-
dbus_bool_t         libhal_volume_is_disc               (LibHalVolume *volume);

+
libhal_volume_is_disc ()

+
dbus_bool_t         libhal_volume_is_disc               (LibHalVolume *volume);

 

 
 

@@ -1471,12 +1413,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1487,9 +1429,8 @@
 
 

 

-

-libhal_volume_get_partition_scheme ()

-
const char*         libhal_volume_get_partition_scheme  (LibHalVolume *volume);

+
libhal_volume_get_partition_scheme ()

+
const char*         libhal_volume_get_partition_scheme  (LibHalVolume *volume);

 

 
 

@@ -1497,12 +1438,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1513,9 +1454,8 @@
 
 

 

-

-libhal_volume_get_partition_type ()

-
const char*         libhal_volume_get_partition_type    (LibHalVolume *volume);

+
libhal_volume_get_partition_type ()

+
const char*         libhal_volume_get_partition_type    (LibHalVolume *volume);

 

 
 

@@ -1523,12 +1463,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1539,9 +1479,8 @@
 
 

 

-

-libhal_volume_get_partition_label ()

-
const char*         libhal_volume_get_partition_label   (LibHalVolume *volume);

+
libhal_volume_get_partition_label ()

+
const char*         libhal_volume_get_partition_label   (LibHalVolume *volume);

 

 
 

@@ -1549,12 +1488,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1565,9 +1504,8 @@
 
 

 

-

-libhal_volume_get_partition_uuid ()

-
const char*         libhal_volume_get_partition_uuid    (LibHalVolume *volume);

+
libhal_volume_get_partition_uuid ()

+
const char*         libhal_volume_get_partition_uuid    (LibHalVolume *volume);

 

 
 

@@ -1575,12 +1513,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1591,9 +1529,8 @@
 
 

 

-

-libhal_volume_get_partition_flags ()

-
const char**        libhal_volume_get_partition_flags   (LibHalVolume *volume);

+
libhal_volume_get_partition_flags ()

+
const char**        libhal_volume_get_partition_flags   (LibHalVolume *volume);

 

 
 

@@ -1601,12 +1538,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1617,9 +1554,8 @@
 
 

 

-

-libhal_volume_get_partition_number ()

-
unsigned int        libhal_volume_get_partition_number  (LibHalVolume *volume);

+
libhal_volume_get_partition_number ()

+
unsigned int        libhal_volume_get_partition_number  (LibHalVolume *volume);

 

 
 

@@ -1627,12 +1563,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1643,10 +1579,9 @@
 
 

 

-

-libhal_volume_get_partition_start_offset ()

-
dbus_uint64_t       libhal_volume_get_partition_start_offset
-                                                        (LibHalVolume *volume);

+
libhal_volume_get_partition_start_offset ()

+
dbus_uint64_t       libhal_volume_get_partition_start_offset
+                                                        (LibHalVolume *volume);

 

 
 

@@ -1654,12 +1589,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1670,10 +1605,9 @@
 
 

 

-

-libhal_volume_get_partition_media_size ()

-
dbus_uint64_t       libhal_volume_get_partition_media_size
-                                                        (LibHalVolume *volume);

+
libhal_volume_get_partition_media_size ()

+
dbus_uint64_t       libhal_volume_get_partition_media_size
+                                                        (LibHalVolume *volume);

 

 
 

@@ -1681,12 +1615,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1697,9 +1631,8 @@
 
 

 

-

-libhal_volume_get_label ()

-
const char*         libhal_volume_get_label             (LibHalVolume *volume);

+
libhal_volume_get_label ()

+
const char*         libhal_volume_get_label             (LibHalVolume *volume);

 

 
 

@@ -1707,12 +1640,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1723,9 +1656,8 @@
 
 

 

-

-libhal_volume_get_mount_point ()

-
const char*         libhal_volume_get_mount_point       (LibHalVolume *volume);

+
libhal_volume_get_mount_point ()

+
const char*         libhal_volume_get_mount_point       (LibHalVolume *volume);

 

 
 

@@ -1733,12 +1665,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1749,9 +1681,8 @@
 
 

 

-

-libhal_volume_get_uuid ()

-
const char*         libhal_volume_get_uuid              (LibHalVolume *volume);

+
libhal_volume_get_uuid ()

+
const char*         libhal_volume_get_uuid              (LibHalVolume *volume);

 

 
 

@@ -1759,12 +1690,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1775,10 +1706,9 @@
 
 

 

-

-libhal_volume_get_storage_device_udi ()

-
const char*         libhal_volume_get_storage_device_udi
-                                                        (LibHalVolume *volume);

+
libhal_volume_get_storage_device_udi ()

+
const char*         libhal_volume_get_storage_device_udi
+                                                        (LibHalVolume *volume);

 

 
 

@@ -1786,12 +1716,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1802,10 +1732,9 @@
 
 

 

-

-libhal_volume_crypto_get_backing_volume_udi ()

-
const char*         libhal_volume_crypto_get_backing_volume_udi
-                                                        (LibHalVolume *volume);

+
libhal_volume_crypto_get_backing_volume_udi ()

+
const char*         libhal_volume_crypto_get_backing_volume_udi
+                                                        (LibHalVolume *volume);

 

 
 

@@ -1813,12 +1742,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1829,11 +1758,10 @@
 
 

 

-

-libhal_volume_crypto_get_clear_volume_udi ()

-
char*               libhal_volume_crypto_get_clear_volume_udi
+
libhal_volume_crypto_get_clear_volume_udi ()

+
char*               libhal_volume_crypto_get_clear_volume_udi
                                                         (LibHalContext *hal_ctx,
-                                                         LibHalVolume *volume);

+                                                         LibHalVolume *volume);

 

 
 

@@ -1841,17 +1769,17 @@
 

 
 
hal_ctx :
hal_ctx :

 
 
 

 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1862,9 +1790,8 @@
 
 

 

-

-libhal_volume_disc_has_audio ()

-
dbus_bool_t         libhal_volume_disc_has_audio        (LibHalVolume *volume);

+
libhal_volume_disc_has_audio ()

+
dbus_bool_t         libhal_volume_disc_has_audio        (LibHalVolume *volume);

 

 
 

@@ -1872,12 +1799,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1888,9 +1815,8 @@
 
 

 

-

-libhal_volume_disc_has_data ()

-
dbus_bool_t         libhal_volume_disc_has_data         (LibHalVolume *volume);

+
libhal_volume_disc_has_data ()

+
dbus_bool_t         libhal_volume_disc_has_data         (LibHalVolume *volume);

 

 
 

@@ -1898,12 +1824,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1914,9 +1840,8 @@
 
 

 

-

-libhal_volume_disc_is_blank ()

-
dbus_bool_t         libhal_volume_disc_is_blank         (LibHalVolume *volume);

+
libhal_volume_disc_is_blank ()

+
dbus_bool_t         libhal_volume_disc_is_blank         (LibHalVolume *volume);

 

 
 

@@ -1924,12 +1849,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1940,9 +1865,8 @@
 
 

 

-

-libhal_volume_disc_is_rewritable ()

-
dbus_bool_t         libhal_volume_disc_is_rewritable    (LibHalVolume *volume);

+
libhal_volume_disc_is_rewritable ()

+
dbus_bool_t         libhal_volume_disc_is_rewritable    (LibHalVolume *volume);

 

 
 

@@ -1950,12 +1874,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1966,9 +1890,8 @@
 
 

 

-

-libhal_volume_disc_is_appendable ()

-
dbus_bool_t         libhal_volume_disc_is_appendable    (LibHalVolume *volume);

+
libhal_volume_disc_is_appendable ()

+
dbus_bool_t         libhal_volume_disc_is_appendable    (LibHalVolume *volume);

 

 
 

@@ -1976,12 +1899,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -1992,9 +1915,8 @@
 
 

 

-

-libhal_volume_get_disc_type ()

-
LibHalVolumeDiscType libhal_volume_get_disc_type        (LibHalVolume *volume);

+
libhal_volume_get_disc_type ()

+
LibHalVolumeDiscType libhal_volume_get_disc_type        (LibHalVolume *volume);

 

 
 

@@ -2002,12 +1924,12 @@
 

 
 
volume :
volume :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -2018,9 +1940,8 @@
 
 

 

-

-libhal_volume_get_msdos_part_table_type ()

-
int                 libhal_volume_get_msdos_part_table_type
+
libhal_volume_get_msdos_part_table_type ()

+
int                 libhal_volume_get_msdos_part_table_type
                                                         ();

 

 

@@ -2030,7 +1951,7 @@
 

-
+

 
 
Returns :
Returns :

               The partition type or -1 if volume is not
                        a partition or the media the volume stems from
                        isn't partition with a MS DOS style table
@@ -2042,11 +1963,9 @@
 

 

 
-

-

-

-

-

 
+

+

+          Generated by GTK-Doc V1.10

 
 
--- hal-0.5.11~rc2.orig/doc/api/libhal-storage/html/license.html
+++ hal-0.5.11~rc2/doc/api/libhal-storage/html/license.html
@@ -1,29 +1,29 @@
 
 
 
-
-Appendix A. License
-
+
+Appendix A. License
+
 
 
 
-
+
 
 
 
-
+
 
 
 
-
+
-
+
 

 

-Appendix A. License

+Appendix A. License

 

       This library is free software; you can redistribute it and/or
       modify it under the terms of the GNU General
@@ -46,13 +46,16 @@
 
       

 


-	Free Software Foundation, Inc.

-	59 Temple Place - Suite 330

-	Boston, MA 02111-1307

+	Free Software Foundation, Inc.

+	59 Temple Place - Suite 330

+	Boston, MA 02111-1307

 	USA

-      

+      

 

     

 
+

+

+          Generated by GTK-Doc V1.10

 
 
--- hal-0.5.11~rc2.orig/doc/api/libhal-storage/html/index.sgml
+++ hal-0.5.11~rc2/doc/api/libhal-storage/html/index.sgml
@@ -1,4 +1,7 @@
 
+
+
+
 
 
 
--- hal-0.5.11~rc2.orig/doc/api/libhal-storage/html/libhal-storage.devhelp2
+++ hal-0.5.11~rc2/doc/api/libhal-storage/html/libhal-storage.devhelp2
@@ -83,7 +83,5 @@
     
     
     
-    
-    
   
 
--- hal-0.5.11~rc2.orig/doc/api/libhal-storage/html/index.html
+++ hal-0.5.11~rc2/doc/api/libhal-storage/html/index.html
@@ -1,18 +1,19 @@
 
 
 
-
+
 HAL Storage Library Reference Manual
-
+
 
 
-
+
 
 
 
-
+
 
-

+
+

 

 

 

@@ -21,14 +22,14 @@
 David Zeuthen
 
 


-	    

-	  

+	    

+	  

 

 
Version 0.5.11rc2
 

-
Copyright © 2007 The HAL Authors

+
Copyright © 2007 The HAL Authors

 

-

+

 	Permission is granted to copy, distribute and/or modify this
 	document under the terms of the GNU Free
 	Documentation License, Version 1.1 or any later
@@ -41,10 +42,10 @@
 
 	

 


-	  The Free Software Foundation, Inc.,

-	  59 Temple Place - Suite 330,

-	  Boston, MA 02111-1307,

-	  USA

+	  The Free Software Foundation, Inc.,

+	  59 Temple Place - Suite 330,

+	  Boston, MA 02111-1307,

+	  USA

 	

 

       

@@ -67,5 +68,9 @@
 
Index

 
A. License

 

-

+
+

+

+          Generated by GTK-Doc V1.10

+
 
--- hal-0.5.11~rc2.orig/doc/api/libhal-storage/html/ix01.html
+++ hal-0.5.11~rc2/doc/api/libhal-storage/html/ix01.html
@@ -1,183 +1,186 @@
 
 
 
-
+
 Index
-
+
 
 
 
-
-
+
+
 
 
 
-
+
 
 
 
-
+
 

 

-Index

+Index

 

 
L

 

-
LibHalDrive, LibHalDrive
+
LibHalDrive, LibHalDrive
 

-
LibHalDrive_s, struct LibHalDrive_s
+
LibHalDrive_s, struct LibHalDrive_s
 

-
LibHalStoragePolicy, LibHalStoragePolicy
+
LibHalStoragePolicy, LibHalStoragePolicy
 

-
LibHalStoragePolicyIcon, enum LibHalStoragePolicyIcon
+
LibHalStoragePolicyIcon, enum LibHalStoragePolicyIcon
 

-
LibHalStoragePolicyIconPair, LibHalStoragePolicyIconPair
+
LibHalStoragePolicyIconPair, LibHalStoragePolicyIconPair
 

-
LibHalStoragePolicy_s, struct LibHalStoragePolicy_s
+
LibHalStoragePolicy_s, struct LibHalStoragePolicy_s
 

-
LibHalVolume, LibHalVolume
+
LibHalVolume, LibHalVolume
 

-
LibHalVolume_s, struct LibHalVolume_s
+
LibHalVolume_s, struct LibHalVolume_s
 

-
libhal_drive_free, libhal_drive_free ()
+
libhal_drive_free, libhal_drive_free ()
 

-
libhal_drive_from_device_file, libhal_drive_from_device_file ()
+
libhal_drive_from_device_file, libhal_drive_from_device_file ()
 

-
libhal_drive_get_bus, libhal_drive_get_bus ()
+
libhal_drive_get_bus, libhal_drive_get_bus ()
 

-
libhal_drive_get_cdrom_caps, libhal_drive_get_cdrom_caps ()
+
libhal_drive_get_cdrom_caps, libhal_drive_get_cdrom_caps ()
 

-
libhal_drive_get_dedicated_icon_drive, libhal_drive_get_dedicated_icon_drive ()
+
libhal_drive_get_dedicated_icon_drive, libhal_drive_get_dedicated_icon_drive ()
 

-
libhal_drive_get_dedicated_icon_volume, libhal_drive_get_dedicated_icon_volume ()
+
libhal_drive_get_dedicated_icon_volume, libhal_drive_get_dedicated_icon_volume ()
 

-
libhal_drive_get_device_file, libhal_drive_get_device_file ()
+
libhal_drive_get_device_file, libhal_drive_get_device_file ()
 

-
libhal_drive_get_device_major, libhal_drive_get_device_major ()
+
libhal_drive_get_device_major, libhal_drive_get_device_major ()
 

-
libhal_drive_get_device_minor, libhal_drive_get_device_minor ()
+
libhal_drive_get_device_minor, libhal_drive_get_device_minor ()
 

-
libhal_drive_get_firmware_version, libhal_drive_get_firmware_version ()
+
libhal_drive_get_firmware_version, libhal_drive_get_firmware_version ()
 

-
libhal_drive_get_media_size, libhal_drive_get_media_size ()
+
libhal_drive_get_media_size, libhal_drive_get_media_size ()
 

-
libhal_drive_get_model, libhal_drive_get_model ()
+
libhal_drive_get_model, libhal_drive_get_model ()
 

-
libhal_drive_get_partition_scheme, libhal_drive_get_partition_scheme ()
+
libhal_drive_get_partition_scheme, libhal_drive_get_partition_scheme ()
 

-
libhal_drive_get_physical_device_udi, libhal_drive_get_physical_device_udi ()
+
libhal_drive_get_physical_device_udi, libhal_drive_get_physical_device_udi ()
 

-
libhal_drive_get_serial, libhal_drive_get_serial ()
+
libhal_drive_get_serial, libhal_drive_get_serial ()
 

-
libhal_drive_get_size, libhal_drive_get_size ()
+
libhal_drive_get_size, libhal_drive_get_size ()
 

-
libhal_drive_get_type, libhal_drive_get_type ()
+
libhal_drive_get_type, libhal_drive_get_type ()
 

-
libhal_drive_get_type_textual, libhal_drive_get_type_textual ()
+
libhal_drive_get_type_textual, libhal_drive_get_type_textual ()
 

-
libhal_drive_get_udi, libhal_drive_get_udi ()
+
libhal_drive_get_udi, libhal_drive_get_udi ()
 

-
libhal_drive_get_vendor, libhal_drive_get_vendor ()
+
libhal_drive_get_vendor, libhal_drive_get_vendor ()
 

-
libhal_drive_is_hotpluggable, libhal_drive_is_hotpluggable ()
+
libhal_drive_is_hotpluggable, libhal_drive_is_hotpluggable ()
 

-
libhal_drive_is_media_detected, libhal_drive_is_media_detected ()
+
libhal_drive_is_media_detected, libhal_drive_is_media_detected ()
 

-
libhal_drive_is_media_detection_automatic, libhal_drive_is_media_detection_automatic ()
+
libhal_drive_is_media_detection_automatic, libhal_drive_is_media_detection_automatic ()
 

-
libhal_drive_no_partitions_hint, libhal_drive_no_partitions_hint ()
+
libhal_drive_no_partitions_hint, libhal_drive_no_partitions_hint ()
 

-
libhal_drive_policy_compute_display_name, libhal_drive_policy_compute_display_name ()
+
libhal_drive_policy_compute_display_name, libhal_drive_policy_compute_display_name ()
 

-
libhal_drive_policy_default_get_mount_root, libhal_drive_policy_default_get_mount_root ()
+
libhal_drive_policy_default_get_mount_root, libhal_drive_policy_default_get_mount_root ()
 

-
libhal_drive_requires_eject, libhal_drive_requires_eject ()
+
libhal_drive_requires_eject, libhal_drive_requires_eject ()
 

-
libhal_drive_uses_removable_media, libhal_drive_uses_removable_media ()
+
libhal_drive_uses_removable_media, libhal_drive_uses_removable_media ()
 

-
libhal_storage_policy_new, libhal_storage_policy_new ()
+
libhal_storage_policy_new, libhal_storage_policy_new ()
 

-
libhal_volume_crypto_get_backing_volume_udi, libhal_volume_crypto_get_backing_volume_udi ()
+
libhal_volume_crypto_get_backing_volume_udi, libhal_volume_crypto_get_backing_volume_udi ()
 

-
libhal_volume_crypto_get_clear_volume_udi, libhal_volume_crypto_get_clear_volume_udi ()
+
libhal_volume_crypto_get_clear_volume_udi, libhal_volume_crypto_get_clear_volume_udi ()
 

-
libhal_volume_disc_has_audio, libhal_volume_disc_has_audio ()
+
libhal_volume_disc_has_audio, libhal_volume_disc_has_audio ()
 

-
libhal_volume_disc_has_data, libhal_volume_disc_has_data ()
+
libhal_volume_disc_has_data, libhal_volume_disc_has_data ()
 

-
libhal_volume_disc_is_appendable, libhal_volume_disc_is_appendable ()
+
libhal_volume_disc_is_appendable, libhal_volume_disc_is_appendable ()
 

-
libhal_volume_disc_is_blank, libhal_volume_disc_is_blank ()
+
libhal_volume_disc_is_blank, libhal_volume_disc_is_blank ()
 

-
libhal_volume_disc_is_rewritable, libhal_volume_disc_is_rewritable ()
+
libhal_volume_disc_is_rewritable, libhal_volume_disc_is_rewritable ()
 

-
libhal_volume_free, libhal_volume_free ()
+
libhal_volume_free, libhal_volume_free ()
 

-
libhal_volume_from_device_file, libhal_volume_from_device_file ()
+
libhal_volume_from_device_file, libhal_volume_from_device_file ()
 

-
libhal_volume_from_mount_point, libhal_volume_from_mount_point ()
+
libhal_volume_from_mount_point, libhal_volume_from_mount_point ()
 

-
libhal_volume_get_device_file, libhal_volume_get_device_file ()
+
libhal_volume_get_device_file, libhal_volume_get_device_file ()
 

-
libhal_volume_get_device_major, libhal_volume_get_device_major ()
+
libhal_volume_get_device_major, libhal_volume_get_device_major ()
 

-
libhal_volume_get_device_minor, libhal_volume_get_device_minor ()
+
libhal_volume_get_device_minor, libhal_volume_get_device_minor ()
 

-
libhal_volume_get_disc_capacity, libhal_volume_get_disc_capacity ()
+
libhal_volume_get_disc_capacity, libhal_volume_get_disc_capacity ()
 

-
libhal_volume_get_disc_type, libhal_volume_get_disc_type ()
+
libhal_volume_get_disc_type, libhal_volume_get_disc_type ()
 

-
libhal_volume_get_fstype, libhal_volume_get_fstype ()
+
libhal_volume_get_fstype, libhal_volume_get_fstype ()
 

-
libhal_volume_get_fsusage, libhal_volume_get_fsusage ()
+
libhal_volume_get_fsusage, libhal_volume_get_fsusage ()
 

-
libhal_volume_get_fsversion, libhal_volume_get_fsversion ()
+
libhal_volume_get_fsversion, libhal_volume_get_fsversion ()
 

-
libhal_volume_get_label, libhal_volume_get_label ()
+
libhal_volume_get_label, libhal_volume_get_label ()
 

-
libhal_volume_get_mount_point, libhal_volume_get_mount_point ()
+
libhal_volume_get_mount_point, libhal_volume_get_mount_point ()
 

-
libhal_volume_get_msdos_part_table_type, libhal_volume_get_msdos_part_table_type ()
+
libhal_volume_get_msdos_part_table_type, libhal_volume_get_msdos_part_table_type ()
 

-
libhal_volume_get_partition_flags, libhal_volume_get_partition_flags ()
+
libhal_volume_get_partition_flags, libhal_volume_get_partition_flags ()
 

-
libhal_volume_get_partition_label, libhal_volume_get_partition_label ()
+
libhal_volume_get_partition_label, libhal_volume_get_partition_label ()
 

-
libhal_volume_get_partition_media_size, libhal_volume_get_partition_media_size ()
+
libhal_volume_get_partition_media_size, libhal_volume_get_partition_media_size ()
 

-
libhal_volume_get_partition_number, libhal_volume_get_partition_number ()
+
libhal_volume_get_partition_number, libhal_volume_get_partition_number ()
 

-
libhal_volume_get_partition_scheme, libhal_volume_get_partition_scheme ()
+
libhal_volume_get_partition_scheme, libhal_volume_get_partition_scheme ()
 

-
libhal_volume_get_partition_start_offset, libhal_volume_get_partition_start_offset ()
+
libhal_volume_get_partition_start_offset, libhal_volume_get_partition_start_offset ()
 

-
libhal_volume_get_partition_type, libhal_volume_get_partition_type ()
+
libhal_volume_get_partition_type, libhal_volume_get_partition_type ()
 

-
libhal_volume_get_partition_uuid, libhal_volume_get_partition_uuid ()
+
libhal_volume_get_partition_uuid, libhal_volume_get_partition_uuid ()
 

-
libhal_volume_get_size, libhal_volume_get_size ()
+
libhal_volume_get_size, libhal_volume_get_size ()
 

-
libhal_volume_get_storage_device_udi, libhal_volume_get_storage_device_udi ()
+
libhal_volume_get_storage_device_udi, libhal_volume_get_storage_device_udi ()
 

-
libhal_volume_get_udi, libhal_volume_get_udi ()
+
libhal_volume_get_udi, libhal_volume_get_udi ()
 

-
libhal_volume_get_uuid, libhal_volume_get_uuid ()
+
libhal_volume_get_uuid, libhal_volume_get_uuid ()
 

-
libhal_volume_is_disc, libhal_volume_is_disc ()
+
libhal_volume_is_disc, libhal_volume_is_disc ()
 

-
libhal_volume_is_mounted, libhal_volume_is_mounted ()
+
libhal_volume_is_mounted, libhal_volume_is_mounted ()
 

-
libhal_volume_is_mounted_read_only, libhal_volume_is_mounted_read_only ()
+
libhal_volume_is_mounted_read_only, libhal_volume_is_mounted_read_only ()
 

-
libhal_volume_is_partition, libhal_volume_is_partition ()
+
libhal_volume_is_partition, libhal_volume_is_partition ()
 

 

 

 
+

+

+          Generated by GTK-Doc V1.10

 
 
--- hal-0.5.11~rc2.orig/doc/api/libhal-storage/libhal-storage-decl.txt
+++ hal-0.5.11~rc2/doc/api/libhal-storage/libhal-storage-decl.txt
@@ -0,0 +1,447 @@
+
+LibHalDrive_s
+struct LibHalDrive_s;
+
+
+LibHalDrive
+typedef struct LibHalDrive_s LibHalDrive;
+
+
+LibHalVolume_s
+struct LibHalVolume_s;
+
+
+LibHalVolume
+typedef struct LibHalVolume_s LibHalVolume;
+
+
+LibHalStoragePolicy_s
+struct LibHalStoragePolicy_s;
+
+
+LibHalStoragePolicy
+typedef struct LibHalStoragePolicy_s LibHalStoragePolicy;
+
+
+LibHalStoragePolicyIcon
+typedef enum {
+	LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK           = 0x10000,
+	LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_IDE       = 0x10001,
+	LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_SCSI      = 0x10002,
+	LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_USB       = 0x10003,
+	LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_IEEE1394  = 0x10004,
+	LIBHAL_STORAGE_ICON_DRIVE_DISK                     = 0x10100,
+	LIBHAL_STORAGE_ICON_DRIVE_DISK_IDE                 = 0x10101,
+	LIBHAL_STORAGE_ICON_DRIVE_DISK_SCSI                = 0x10102,
+	LIBHAL_STORAGE_ICON_DRIVE_DISK_USB                 = 0x10103,
+	LIBHAL_STORAGE_ICON_DRIVE_DISK_IEEE1394            = 0x10104,
+	LIBHAL_STORAGE_ICON_DRIVE_CDROM                    = 0x10200,
+	LIBHAL_STORAGE_ICON_DRIVE_CDROM_IDE                = 0x10201,
+	LIBHAL_STORAGE_ICON_DRIVE_CDROM_SCSI               = 0x10202,
+	LIBHAL_STORAGE_ICON_DRIVE_CDROM_USB                = 0x10203,
+	LIBHAL_STORAGE_ICON_DRIVE_CDROM_IEEE1394           = 0x10204,
+	LIBHAL_STORAGE_ICON_DRIVE_FLOPPY                   = 0x10300,
+	LIBHAL_STORAGE_ICON_DRIVE_FLOPPY_IDE               = 0x10301,
+	LIBHAL_STORAGE_ICON_DRIVE_FLOPPY_SCSI              = 0x10302,
+	LIBHAL_STORAGE_ICON_DRIVE_FLOPPY_USB               = 0x10303,
+	LIBHAL_STORAGE_ICON_DRIVE_FLOPPY_IEEE1394          = 0x10304,
+	LIBHAL_STORAGE_ICON_DRIVE_TAPE                     = 0x10400,
+	LIBHAL_STORAGE_ICON_DRIVE_COMPACT_FLASH            = 0x10500,
+	LIBHAL_STORAGE_ICON_DRIVE_MEMORY_STICK             = 0x10600,
+	LIBHAL_STORAGE_ICON_DRIVE_SMART_MEDIA              = 0x10700,
+	LIBHAL_STORAGE_ICON_DRIVE_SD_MMC                   = 0x10800,
+	LIBHAL_STORAGE_ICON_DRIVE_CAMERA                   = 0x10900,
+	LIBHAL_STORAGE_ICON_DRIVE_PORTABLE_AUDIO_PLAYER    = 0x10a00,
+	LIBHAL_STORAGE_ICON_DRIVE_ZIP                      = 0x10b00,
+        LIBHAL_STORAGE_ICON_DRIVE_JAZ                      = 0x10c00,
+        LIBHAL_STORAGE_ICON_DRIVE_FLASH_KEY                = 0x10d00,
+
+	LIBHAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK          = 0x20000,
+	LIBHAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_IDE      = 0x20001,
+	LIBHAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_SCSI     = 0x20002,
+	LIBHAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_USB      = 0x20003,
+	LIBHAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_IEEE1394 = 0x20004,
+	LIBHAL_STORAGE_ICON_VOLUME_DISK                    = 0x20100,
+	LIBHAL_STORAGE_ICON_VOLUME_DISK_IDE                = 0x20101,
+	LIBHAL_STORAGE_ICON_VOLUME_DISK_SCSI               = 0x20102,
+	LIBHAL_STORAGE_ICON_VOLUME_DISK_USB                = 0x20103,
+	LIBHAL_STORAGE_ICON_VOLUME_DISK_IEEE1394           = 0x20104,
+	LIBHAL_STORAGE_ICON_VOLUME_CDROM                   = 0x20200,
+	LIBHAL_STORAGE_ICON_VOLUME_CDROM_IDE               = 0x20201,
+	LIBHAL_STORAGE_ICON_VOLUME_CDROM_SCSI              = 0x20202,
+	LIBHAL_STORAGE_ICON_VOLUME_CDROM_USB               = 0x20203,
+	LIBHAL_STORAGE_ICON_VOLUME_CDROM_IEEE1394          = 0x20204,
+	LIBHAL_STORAGE_ICON_VOLUME_FLOPPY                  = 0x20300,
+	LIBHAL_STORAGE_ICON_VOLUME_FLOPPY_IDE              = 0x20301,
+	LIBHAL_STORAGE_ICON_VOLUME_FLOPPY_SCSI             = 0x20302,
+	LIBHAL_STORAGE_ICON_VOLUME_FLOPPY_USB              = 0x20303,
+	LIBHAL_STORAGE_ICON_VOLUME_FLOPPY_IEEE1394         = 0x20304,
+	LIBHAL_STORAGE_ICON_VOLUME_TAPE                    = 0x20400,
+	LIBHAL_STORAGE_ICON_VOLUME_COMPACT_FLASH           = 0x20500,
+	LIBHAL_STORAGE_ICON_VOLUME_MEMORY_STICK            = 0x20600,
+	LIBHAL_STORAGE_ICON_VOLUME_SMART_MEDIA             = 0x20700,
+	LIBHAL_STORAGE_ICON_VOLUME_SD_MMC                  = 0x20800,
+	LIBHAL_STORAGE_ICON_VOLUME_CAMERA                  = 0x20900,
+	LIBHAL_STORAGE_ICON_VOLUME_PORTABLE_AUDIO_PLAYER   = 0x20a00,
+	LIBHAL_STORAGE_ICON_VOLUME_ZIP                     = 0x20b00,
+        LIBHAL_STORAGE_ICON_VOLUME_JAZ                     = 0x20c00,
+        LIBHAL_STORAGE_ICON_VOLUME_FLASH_KEY               = 0x20d00,
+
+	LIBHAL_STORAGE_ICON_DISC_CDROM                     = 0x30000,
+	LIBHAL_STORAGE_ICON_DISC_CDR                       = 0x30001,
+	LIBHAL_STORAGE_ICON_DISC_CDRW                      = 0x30002,
+	LIBHAL_STORAGE_ICON_DISC_DVDROM                    = 0x30003,
+	LIBHAL_STORAGE_ICON_DISC_DVDRAM                    = 0x30004,
+	LIBHAL_STORAGE_ICON_DISC_DVDR                      = 0x30005,
+	LIBHAL_STORAGE_ICON_DISC_DVDRW                     = 0x30006,
+	LIBHAL_STORAGE_ICON_DISC_DVDPLUSR                  = 0x30007,
+	LIBHAL_STORAGE_ICON_DISC_DVDPLUSRW                 = 0x30008,
+	LIBHAL_STORAGE_ICON_DISC_DVDPLUSRWDL               = 0x30009,
+	LIBHAL_STORAGE_ICON_DISC_BDROM                     = 0x3000a,
+	LIBHAL_STORAGE_ICON_DISC_BDR                       = 0x3000b,
+	LIBHAL_STORAGE_ICON_DISC_BDRE                      = 0x3000c,
+	LIBHAL_STORAGE_ICON_DISC_HDDVDROM                  = 0x3000d,
+	LIBHAL_STORAGE_ICON_DISC_HDDVDR                    = 0x3000e,
+	LIBHAL_STORAGE_ICON_DISC_HDDVDRW                   = 0x3000f,
+	LIBHAL_STORAGE_ICON_DISC_MRW                       = 0x30010,
+	LIBHAL_STORAGE_ICON_DISC_MRWW                      = 0x30011,
+	LIBHAL_STORAGE_ICON_DISC_MO                        = 0x30012
+} LibHalStoragePolicyIcon;
+
+
+LibHalStoragePolicyIconPair
+typedef struct {
+	LibHalStoragePolicyIcon icon;
+	const char *icon_path;
+} LibHalStoragePolicyIconPair;
+
+
+libhal_storage_policy_new
+LibHalStoragePolicy *
+void) LIBHAL_DEPRECATED;void                 libhal_storage_policy_free		    (LibHalStoragePolicy *policy) LIBHAL_DEPRECATED;void                 libhal_storage_policy_set_icon_path    (LibHalStoragePolicy *policy,LibHalStoragePolicyIcon icon,const char *path) LIBHAL_DEPRECATED;void                 libhal_storage_policy_set_icon_mapping (LibHalStoragePolicy *policy,LibHalStoragePolicyIconPair *pairs) LIBHAL_DEPRECATED;const char  	    *libhal_storage_policy_lookup_icon	    (LibHalStoragePolicy *policy,LibHalStoragePolicyIcon icon) LIBHAL_DEPRECATED;typedef enum {LIBHAL_DRIVE_BUS_UNKNOWN     = 0x00,LIBHAL_DRIVE_BUS_IDE         = 0x01,LIBHAL_DRIVE_BUS_SCSI        = 0x02,LIBHAL_DRIVE_BUS_USB         = 0x03,LIBHAL_DRIVE_BUS_IEEE1394    = 0x04,LIBHAL_DRIVE_BUS_CCW         = 0x05} LibHalDriveBus;typedef enum {LIBHAL_DRIVE_TYPE_REMOVABLE_DISK        = 0x00,LIBHAL_DRIVE_TYPE_DISK                  = 0x01,LIBHAL_DRIVE_TYPE_CDROM                 = 0x02,LIBHAL_DRIVE_TYPE_FLOPPY                = 0x03,LIBHAL_DRIVE_TYPE_TAPE                  = 0x04,LIBHAL_DRIVE_TYPE_COMPACT_FLASH         = 0x05,LIBHAL_DRIVE_TYPE_MEMORY_STICK          = 0x06,LIBHAL_DRIVE_TYPE_SMART_MEDIA           = 0x07,LIBHAL_DRIVE_TYPE_SD_MMC                = 0x08,LIBHAL_DRIVE_TYPE_CAMERA                = 0x09,LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER = 0x0a,LIBHAL_DRIVE_TYPE_ZIP                   = 0x0b,LIBHAL_DRIVE_TYPE_JAZ                   = 0x0c,LIBHAL_DRIVE_TYPE_FLASHKEY              = 0x0d,LIBHAL_DRIVE_TYPE_MO                    = 0x0e} LibHalDriveType;typedef enum {LIBHAL_DRIVE_CDROM_CAPS_CDROM       = 0x00001,LIBHAL_DRIVE_CDROM_CAPS_CDR         = 0x00002,LIBHAL_DRIVE_CDROM_CAPS_CDRW        = 0x00004,LIBHAL_DRIVE_CDROM_CAPS_DVDRAM      = 0x00008,LIBHAL_DRIVE_CDROM_CAPS_DVDROM      = 0x00010,LIBHAL_DRIVE_CDROM_CAPS_DVDR        = 0x00020,LIBHAL_DRIVE_CDROM_CAPS_DVDRW       = 0x00040,LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSR    = 0x00080,LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRW   = 0x00100,LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRDL  = 0x00200,LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL = 0x00400,LIBHAL_DRIVE_CDROM_CAPS_BDROM       = 0x00800,LIBHAL_DRIVE_CDROM_CAPS_BDR         = 0x01000,LIBHAL_DRIVE_CDROM_CAPS_BDRE        = 0x02000,LIBHAL_DRIVE_CDROM_CAPS_HDDVDROM    = 0x04000,LIBHAL_DRIVE_CDROM_CAPS_HDDVDR      = 0x08000,LIBHAL_DRIVE_CDROM_CAPS_HDDVDRW     = 0x10000,LIBHAL_DRIVE_CDROM_CAPS_MRW         = 0x20000,LIBHAL_DRIVE_CDROM_CAPS_MRWW        = 0x40000,LIBHAL_DRIVE_CDROM_CAPS_MO          = 0x80000} LibHalDriveCdromCaps;LibHalDrive         *libhal_drive_from_udi                    (LibHalContext *hal_ctx,const char *udi
+
+
+libhal_drive_from_device_file
+LibHalDrive         *
+LibHalContext *hal_ctx,const char *device_file
+
+
+libhal_drive_free
+void                 
+LibHalDrive *drive
+
+
+libhal_drive_is_hotpluggable
+dbus_bool_t          
+LibHalDrive      *drive
+
+
+libhal_drive_uses_removable_media
+dbus_bool_t          
+LibHalDrive      *drive
+
+
+libhal_drive_is_media_detected
+dbus_bool_t          
+LibHalDrive      *drive
+
+
+libhal_drive_is_media_detection_automatic
+dbus_bool_t          
+LibHalDrive      *drive
+
+
+libhal_drive_get_size
+dbus_uint64_t        
+LibHalDrive      *drive
+
+
+libhal_drive_get_media_size
+dbus_uint64_t        
+LibHalDrive      *drive
+
+
+libhal_drive_get_partition_scheme
+const char          *
+LibHalDrive      *drive
+
+
+libhal_drive_no_partitions_hint
+dbus_bool_t          
+LibHalDrive      *drive
+
+
+libhal_drive_requires_eject
+dbus_bool_t          
+LibHalDrive      *drive
+
+
+libhal_drive_get_type
+LibHalDriveType      
+LibHalDrive      *drive
+
+
+libhal_drive_get_bus
+LibHalDriveBus       
+LibHalDrive      *drive
+
+
+libhal_drive_get_cdrom_caps
+LibHalDriveCdromCaps 
+LibHalDrive      *drive
+
+
+libhal_drive_get_device_major
+unsigned int         
+LibHalDrive      *drive
+
+
+libhal_drive_get_device_minor
+unsigned int         
+LibHalDrive      *drive
+
+
+libhal_drive_get_type_textual
+const char          *
+LibHalDrive      *drive
+
+
+libhal_drive_get_device_file
+const char          *
+LibHalDrive      *drive
+
+
+libhal_drive_get_udi
+const char          *
+LibHalDrive      *drive
+
+
+libhal_drive_get_serial
+const char          *
+LibHalDrive      *drive
+
+
+libhal_drive_get_firmware_version
+const char          *
+LibHalDrive      *drive
+
+
+libhal_drive_get_model
+const char          *
+LibHalDrive      *drive
+
+
+libhal_drive_get_vendor
+const char          *
+LibHalDrive      *drive
+
+
+libhal_drive_get_physical_device_udi
+const char          *
+LibHalDrive      *drive
+
+
+libhal_drive_get_dedicated_icon_drive
+const char          *
+LibHalDrive      *drive
+
+
+libhal_drive_get_dedicated_icon_volume
+const char          *
+LibHalDrive      *drive
+
+
+libhal_drive_policy_compute_display_name
+char                *
+LibHalDrive        *drive,LibHalVolume        *volume,LibHalStoragePolicy *policy) LIBHAL_DEPRECATED;char                *libhal_drive_policy_compute_icon_name    (LibHalDrive         *drive,LibHalVolume        *volume,LibHalStoragePolicy *policy) LIBHAL_DEPRECATED;dbus_bool_t          libhal_drive_policy_is_mountable            (LibHalDrive         *drive,LibHalStoragePolicy *policy) LIBHAL_DEPRECATED;const char          *libhal_drive_policy_get_desired_mount_point (LibHalDrive         *drive,LibHalStoragePolicy *policy) LIBHAL_DEPRECATED;const char          *libhal_drive_policy_get_mount_options       (LibHalDrive         *drive,LibHalStoragePolicy *policy) LIBHAL_DEPRECATED;const char          *libhal_drive_policy_get_mount_fs            (LibHalDrive      *drive,LibHalStoragePolicy *policy) LIBHAL_DEPRECATED;char               **libhal_drive_find_all_volumes (LibHalContext *hal_ctx,LibHalDrive   *drive,int 	  *num_volumes
+
+
+libhal_drive_policy_default_get_mount_root
+char        *
+LibHalContext *hal_ctx) LIBHAL_DEPRECATED;dbus_bool_t  libhal_drive_policy_default_use_managed_keyword           (LibHalContext *hal_ctx) LIBHAL_DEPRECATED;char        *libhal_drive_policy_default_get_managed_keyword_primary   (LibHalContext *hal_ctx) LIBHAL_DEPRECATED;char        *libhal_drive_policy_default_get_managed_keyword_secondary (LibHalContext *hal_ctx) LIBHAL_DEPRECATED;typedef enum {LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM,LIBHAL_VOLUME_USAGE_PARTITION_TABLE,LIBHAL_VOLUME_USAGE_RAID_MEMBER,LIBHAL_VOLUME_USAGE_CRYPTO,LIBHAL_VOLUME_USAGE_UNKNOWN,LIBHAL_VOLUME_USAGE_OTHER} LibHalVolumeUsage;typedef enum {LIBHAL_VOLUME_DISC_TYPE_CDROM       = 0x00,LIBHAL_VOLUME_DISC_TYPE_CDR         = 0x01,LIBHAL_VOLUME_DISC_TYPE_CDRW        = 0x02,LIBHAL_VOLUME_DISC_TYPE_DVDROM      = 0x03,LIBHAL_VOLUME_DISC_TYPE_DVDRAM      = 0x04,LIBHAL_VOLUME_DISC_TYPE_DVDR        = 0x05,LIBHAL_VOLUME_DISC_TYPE_DVDRW       = 0x06,LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR    = 0x07,LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW   = 0x08,LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR_DL = 0x09,LIBHAL_VOLUME_DISC_TYPE_BDROM       = 0x0a,LIBHAL_VOLUME_DISC_TYPE_BDR         = 0x0b,LIBHAL_VOLUME_DISC_TYPE_BDRE        = 0x0c,LIBHAL_VOLUME_DISC_TYPE_HDDVDROM    = 0x0d,LIBHAL_VOLUME_DISC_TYPE_HDDVDR      = 0x0e,LIBHAL_VOLUME_DISC_TYPE_HDDVDRW     = 0x0f,LIBHAL_VOLUME_DISC_TYPE_MO          = 0x10} LibHalVolumeDiscType;LibHalVolume     *libhal_volume_from_udi                      (LibHalContext *hal_ctx,const char *udi
+
+
+libhal_volume_from_device_file
+LibHalVolume     *
+LibHalContext *hal_ctx,const char *device_file
+
+
+libhal_volume_from_mount_point
+LibHalVolume     *
+LibHalContext *hal_ctx,const char *mount_point
+
+
+libhal_volume_free
+void              
+LibHalVolume     *volume
+
+
+libhal_volume_get_size
+dbus_uint64_t     
+LibHalVolume     *volume
+
+
+libhal_volume_get_disc_capacity
+dbus_uint64_t     
+LibHalVolume     *volume
+
+
+libhal_volume_get_udi
+const char          *
+LibHalVolume     *volume
+
+
+libhal_volume_get_device_file
+const char          *
+LibHalVolume     *volume
+
+
+libhal_volume_get_device_major
+unsigned int         
+LibHalVolume     *volume
+
+
+libhal_volume_get_device_minor
+unsigned int         
+LibHalVolume     *volume
+
+
+libhal_volume_get_fstype
+const char          *
+LibHalVolume     *volume
+
+
+libhal_volume_get_fsversion
+const char          *
+LibHalVolume     *volume
+
+
+libhal_volume_get_fsusage
+LibHalVolumeUsage    
+LibHalVolume     *volume
+
+
+libhal_volume_is_mounted
+dbus_bool_t          
+LibHalVolume     *volume
+
+
+libhal_volume_is_mounted_read_only
+dbus_bool_t          
+LibHalVolume     *volume
+
+
+libhal_volume_is_partition
+dbus_bool_t          
+LibHalVolume     *volume
+
+
+libhal_volume_is_disc
+dbus_bool_t          
+LibHalVolume     *volume
+
+
+libhal_volume_get_partition_scheme
+const char          *
+LibHalVolume     *volume
+
+
+libhal_volume_get_partition_type
+const char          *
+LibHalVolume     *volume
+
+
+libhal_volume_get_partition_label
+const char          *
+LibHalVolume     *volume
+
+
+libhal_volume_get_partition_uuid
+const char          *
+LibHalVolume     *volume
+
+
+libhal_volume_get_partition_flags
+const char         **
+LibHalVolume     *volume
+
+
+libhal_volume_get_partition_number
+unsigned int         
+LibHalVolume     *volume
+
+
+libhal_volume_get_partition_start_offset
+dbus_uint64_t        
+LibHalVolume     *volume
+
+
+libhal_volume_get_partition_media_size
+dbus_uint64_t        
+LibHalVolume     *volume
+
+
+libhal_volume_get_label
+const char          *
+LibHalVolume     *volume
+
+
+libhal_volume_get_mount_point
+const char          *
+LibHalVolume     *volume
+
+
+libhal_volume_get_uuid
+const char          *
+LibHalVolume     *volume
+
+
+libhal_volume_get_storage_device_udi
+const char          *
+LibHalVolume     *volume
+
+
+libhal_volume_crypto_get_backing_volume_udi
+const char          *
+LibHalVolume     *volume
+
+
+libhal_volume_crypto_get_clear_volume_udi
+char                *
+LibHalContext    *hal_ctx, LibHalVolume *volume
+
+
+libhal_volume_disc_has_audio
+dbus_bool_t          
+LibHalVolume     *volume
+
+
+libhal_volume_disc_has_data
+dbus_bool_t          
+LibHalVolume     *volume
+
+
+libhal_volume_disc_is_blank
+dbus_bool_t          
+LibHalVolume     *volume
+
+
+libhal_volume_disc_is_rewritable
+dbus_bool_t          
+LibHalVolume     *volume
+
+
+libhal_volume_disc_is_appendable
+dbus_bool_t          
+LibHalVolume     *volume
+
+
+libhal_volume_get_disc_type
+LibHalVolumeDiscType 
+LibHalVolume     *volume
+
+
+libhal_volume_get_msdos_part_table_type
+int               
+LibHalVolume     *volume) LIBHAL_DEPRECATED;dbus_uint64_t     libhal_volume_get_msdos_part_table_start    (LibHalVolume     *volume) LIBHAL_DEPRECATED;dbus_uint64_t     libhal_volume_get_msdos_part_table_size     (LibHalVolume     *volume) LIBHAL_DEPRECATED;dbus_bool_t       libhal_volume_should_ignore 	              (LibHalVolume     *volume
+
--- hal-0.5.11~rc2.orig/doc/api/libhal-storage/libhal-storage-undocumented.txt
+++ hal-0.5.11~rc2/doc/api/libhal-storage/libhal-storage-undocumented.txt
@@ -0,0 +1,81 @@
+4% symbol docs coverage.
+3 symbols documented.
+0 symbols incomplete.
+73 not documented.
+
+
+LibHalDrive
+LibHalDrive_s
+LibHalStoragePolicy
+LibHalStoragePolicyIcon
+LibHalStoragePolicyIconPair
+LibHalStoragePolicy_s
+LibHalVolume
+LibHalVolume_s
+libhal_drive_from_device_file
+libhal_drive_get_bus
+libhal_drive_get_cdrom_caps
+libhal_drive_get_dedicated_icon_drive
+libhal_drive_get_dedicated_icon_volume
+libhal_drive_get_device_file
+libhal_drive_get_device_major
+libhal_drive_get_device_minor
+libhal_drive_get_firmware_version
+libhal_drive_get_media_size
+libhal_drive_get_model
+libhal_drive_get_partition_scheme
+libhal_drive_get_physical_device_udi
+libhal_drive_get_serial
+libhal_drive_get_size
+libhal_drive_get_type
+libhal_drive_get_type_textual
+libhal_drive_get_udi
+libhal_drive_get_vendor
+libhal_drive_is_hotpluggable
+libhal_drive_is_media_detected
+libhal_drive_is_media_detection_automatic
+libhal_drive_no_partitions_hint
+libhal_drive_policy_compute_display_name
+libhal_drive_policy_default_get_mount_root
+libhal_drive_requires_eject
+libhal_drive_uses_removable_media
+libhal_storage_policy_new
+libhal_volume_crypto_get_backing_volume_udi
+libhal_volume_crypto_get_clear_volume_udi
+libhal_volume_disc_has_audio
+libhal_volume_disc_has_data
+libhal_volume_disc_is_appendable
+libhal_volume_disc_is_blank
+libhal_volume_disc_is_rewritable
+libhal_volume_from_device_file
+libhal_volume_from_mount_point
+libhal_volume_get_device_file
+libhal_volume_get_device_major
+libhal_volume_get_device_minor
+libhal_volume_get_disc_capacity
+libhal_volume_get_disc_type
+libhal_volume_get_fstype
+libhal_volume_get_fsusage
+libhal_volume_get_fsversion
+libhal_volume_get_label
+libhal_volume_get_mount_point
+libhal_volume_get_msdos_part_table_type
+libhal_volume_get_partition_flags
+libhal_volume_get_partition_label
+libhal_volume_get_partition_media_size
+libhal_volume_get_partition_number
+libhal_volume_get_partition_scheme
+libhal_volume_get_partition_start_offset
+libhal_volume_get_partition_type
+libhal_volume_get_partition_uuid
+libhal_volume_get_size
+libhal_volume_get_storage_device_udi
+libhal_volume_get_udi
+libhal_volume_get_uuid
+libhal_volume_is_disc
+libhal_volume_is_mounted
+libhal_volume_is_mounted_read_only
+libhal_volume_is_partition
+
+
+libhal-storage:Short_Description