hal/libhal-storage libhal-storage.c, 1.11, 1.12 libhal-storage.h,
1.7, 1.8
David Zeuthen
david at freedesktop.org
Wed Feb 16 10:45:21 PST 2005
Update of /cvs/hal/hal/libhal-storage
In directory gabe:/tmp/cvs-serv28059/libhal-storage
Modified Files:
libhal-storage.c libhal-storage.h
Log Message:
2005-02-16 David Zeuthen <davidz at redhat.com>
Patch from John (J5) Palmieri <johnp at redhat.com>.
* libhal-storage/libhal-storage.[ch]: Rename all functions, symbols
and defines from hal_storage to libhal_storage.
* tools/fstab-sync.c: Update for changes in libhal-storage
Index: libhal-storage.c
===================================================================
RCS file: /cvs/hal/hal/libhal-storage/libhal-storage.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- libhal-storage.c 31 Jan 2005 20:06:41 -0000 1.11
+++ libhal-storage.c 16 Feb 2005 18:45:19 -0000 1.12
@@ -65,21 +65,21 @@
*/
typedef struct IconMappingEntry_s {
- HalStoragePolicyIcon icon;
+ LibHalStoragePolicyIcon icon;
char *path;
struct IconMappingEntry_s *next;
} IconMappingEntry;
-struct HalStoragePolicy_s {
+struct LibHalStoragePolicy_s {
[...1373 lines suppressed...]
+ "/org/freedesktop/LibHal/devices/computer", volume->mount_options, MOUNT_OPTIONS_SIZE, FALSE);
mopts_collect (drive->hal_ctx, vol_mount_option_begin, sizeof (vol_mount_option_begin),
volume->udi, volume->mount_options, MOUNT_OPTIONS_SIZE, FALSE);
@@ -1621,13 +1621,13 @@
return result;
}
-const char *hal_volume_policy_get_mount_fs (HalDrive *drive, HalVolume *volume, HalStoragePolicy *policy)
+const char *libhal_volume_policy_get_mount_fs (LibHalDrive *drive, LibHalVolume *volume, LibHalStoragePolicy *policy)
{
return volume->mount_filesystem;
}
dbus_bool_t
-hal_drive_no_partitions_hint (HalDrive *drive)
+libhal_drive_no_partitions_hint (LibHalDrive *drive)
{
return drive->no_partitions_hint;
}
Index: libhal-storage.h
===================================================================
RCS file: /cvs/hal/hal/libhal-storage/libhal-storage.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- libhal-storage.h 14 Dec 2004 02:57:48 -0000 1.7
+++ libhal-storage.h 16 Feb 2005 18:45:19 -0000 1.8
@@ -41,236 +41,270 @@
*/
#ifndef DOXYGEN_SHOULD_SKIP_THIS
-struct HalDrive_s;
-typedef struct HalDrive_s HalDrive;
-struct HalVolume_s;
-typedef struct HalVolume_s HalVolume;
-struct HalStoragePolicy_s;
-typedef struct HalStoragePolicy_s HalStoragePolicy;
+struct LibHalDrive_s;
+typedef struct LibHalDrive_s LibHalDrive;
+struct LibHalVolume_s;
+typedef struct LibHalVolume_s LibHalVolume;
+struct LibHalStoragePolicy_s;
+typedef struct LibHalStoragePolicy_s LibHalStoragePolicy;
#endif /* DOXYGEN_SHOULD_SKIP_THIS */
typedef enum {
- HAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK = 0x10000,
- HAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_IDE = 0x10001,
- HAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_SCSI = 0x10002,
- HAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_USB = 0x10003,
- HAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_IEEE1394 = 0x10004,
- HAL_STORAGE_ICON_DRIVE_DISK = 0x10100,
- HAL_STORAGE_ICON_DRIVE_DISK_IDE = 0x10101,
- HAL_STORAGE_ICON_DRIVE_DISK_SCSI = 0x10102,
- HAL_STORAGE_ICON_DRIVE_DISK_USB = 0x10103,
- HAL_STORAGE_ICON_DRIVE_DISK_IEEE1394 = 0x10104,
- HAL_STORAGE_ICON_DRIVE_CDROM = 0x10200,
- HAL_STORAGE_ICON_DRIVE_CDROM_IDE = 0x10201,
- HAL_STORAGE_ICON_DRIVE_CDROM_SCSI = 0x10202,
- HAL_STORAGE_ICON_DRIVE_CDROM_USB = 0x10203,
- HAL_STORAGE_ICON_DRIVE_CDROM_IEEE1394 = 0x10204,
- HAL_STORAGE_ICON_DRIVE_FLOPPY = 0x10300,
- HAL_STORAGE_ICON_DRIVE_FLOPPY_IDE = 0x10301,
- HAL_STORAGE_ICON_DRIVE_FLOPPY_SCSI = 0x10302,
- HAL_STORAGE_ICON_DRIVE_FLOPPY_USB = 0x10303,
- HAL_STORAGE_ICON_DRIVE_FLOPPY_IEEE1394 = 0x10304,
- HAL_STORAGE_ICON_DRIVE_TAPE = 0x10400,
- HAL_STORAGE_ICON_DRIVE_COMPACT_FLASH = 0x10500,
- HAL_STORAGE_ICON_DRIVE_MEMORY_STICK = 0x10600,
- HAL_STORAGE_ICON_DRIVE_SMART_MEDIA = 0x10700,
- HAL_STORAGE_ICON_DRIVE_SD_MMC = 0x10800,
- HAL_STORAGE_ICON_DRIVE_CAMERA = 0x10900,
- HAL_STORAGE_ICON_DRIVE_PORTABLE_AUDIO_PLAYER = 0x10a00,
-/* HAL_STORAGE_ICON_DRIVE_ZIP = 0x10b00,
- HAL_STORAGE_ICON_DRIVE_JAZ = 0x10c00,*/
+ 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,*/
- HAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK = 0x20000,
- HAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_IDE = 0x20001,
- HAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_SCSI = 0x20002,
- HAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_USB = 0x20003,
- HAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_IEEE1394 = 0x20004,
- HAL_STORAGE_ICON_VOLUME_DISK = 0x20100,
- HAL_STORAGE_ICON_VOLUME_DISK_IDE = 0x20101,
- HAL_STORAGE_ICON_VOLUME_DISK_SCSI = 0x20102,
- HAL_STORAGE_ICON_VOLUME_DISK_USB = 0x20103,
- HAL_STORAGE_ICON_VOLUME_DISK_IEEE1394 = 0x20104,
- HAL_STORAGE_ICON_VOLUME_CDROM = 0x20200,
- HAL_STORAGE_ICON_VOLUME_CDROM_IDE = 0x20201,
- HAL_STORAGE_ICON_VOLUME_CDROM_SCSI = 0x20202,
- HAL_STORAGE_ICON_VOLUME_CDROM_USB = 0x20203,
- HAL_STORAGE_ICON_VOLUME_CDROM_IEEE1394 = 0x20204,
- HAL_STORAGE_ICON_VOLUME_FLOPPY = 0x20300,
- HAL_STORAGE_ICON_VOLUME_FLOPPY_IDE = 0x20301,
- HAL_STORAGE_ICON_VOLUME_FLOPPY_SCSI = 0x20302,
- HAL_STORAGE_ICON_VOLUME_FLOPPY_USB = 0x20303,
- HAL_STORAGE_ICON_VOLUME_FLOPPY_IEEE1394 = 0x20304,
- HAL_STORAGE_ICON_VOLUME_TAPE = 0x20400,
- HAL_STORAGE_ICON_VOLUME_COMPACT_FLASH = 0x20500,
- HAL_STORAGE_ICON_VOLUME_MEMORY_STICK = 0x20600,
- HAL_STORAGE_ICON_VOLUME_SMART_MEDIA = 0x20700,
- HAL_STORAGE_ICON_VOLUME_SD_MMC = 0x20800,
- HAL_STORAGE_ICON_VOLUME_CAMERA = 0x20900,
- HAL_STORAGE_ICON_VOLUME_PORTABLE_AUDIO_PLAYER = 0x20a00,
-/* HAL_STORAGE_ICON_VOLUME_ZIP = 0x10b00,
- HAL_STORAGE_ICON_VOLUME_JAZ = 0x10c00,*/
+ 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 = 0x10b00,
+ LIBHAL_STORAGE_ICON_VOLUME_JAZ = 0x10c00,*/
- HAL_STORAGE_ICON_DISC_CDROM = 0x30000,
- HAL_STORAGE_ICON_DISC_CDR = 0x30001,
- HAL_STORAGE_ICON_DISC_CDRW = 0x30002,
- HAL_STORAGE_ICON_DISC_DVDROM = 0x30003,
- HAL_STORAGE_ICON_DISC_DVDRAM = 0x30004,
- HAL_STORAGE_ICON_DISC_DVDR = 0x30005,
- HAL_STORAGE_ICON_DISC_DVDRW = 0x30006,
- HAL_STORAGE_ICON_DISC_DVDPLUSR = 0x30007,
- HAL_STORAGE_ICON_DISC_DVDPLUSRW = 0x30008
-} HalStoragePolicyIcon;
+ 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
+} LibHalStoragePolicyIcon;
typedef struct {
- HalStoragePolicyIcon icon;
+ LibHalStoragePolicyIcon icon;
const char *icon_path;
-} HalStoragePolicyIconPair;
+} LibHalStoragePolicyIconPair;
-HalStoragePolicy *hal_storage_policy_new (void);
-void hal_storage_policy_free (HalStoragePolicy *policy);
+LibHalStoragePolicy *libhal_storage_policy_new (void);
+void libhal_storage_policy_free (LibHalStoragePolicy *policy);
-void hal_storage_policy_set_icon_path (HalStoragePolicy *policy,
- HalStoragePolicyIcon icon, const char *path);
-void hal_storage_policy_set_icon_mapping (HalStoragePolicy *policy, HalStoragePolicyIconPair *pairs);
-const char *hal_storage_policy_lookup_icon (HalStoragePolicy *policy, HalStoragePolicyIcon icon);
+void libhal_storage_policy_set_icon_path (LibHalStoragePolicy *policy,
+ LibHalStoragePolicyIcon icon,
+ const char *path);
+
+void libhal_storage_policy_set_icon_mapping (LibHalStoragePolicy *policy,
+ LibHalStoragePolicyIconPair *pairs);
+const char *libhal_storage_policy_lookup_icon (LibHalStoragePolicy *policy,
+ LibHalStoragePolicyIcon icon);
typedef enum {
- HAL_DRIVE_BUS_UNKNOWN = 0x00,
- HAL_DRIVE_BUS_IDE = 0x01,
- HAL_DRIVE_BUS_SCSI = 0x02,
- HAL_DRIVE_BUS_USB = 0x03,
- HAL_DRIVE_BUS_IEEE1394 = 0x04
-} HalDriveBus;
+ 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
+} LibHalDriveBus;
typedef enum {
- HAL_DRIVE_TYPE_REMOVABLE_DISK = 0x00,
- HAL_DRIVE_TYPE_DISK = 0x01,
- HAL_DRIVE_TYPE_CDROM = 0x02,
- HAL_DRIVE_TYPE_FLOPPY = 0x03,
- HAL_DRIVE_TYPE_TAPE = 0x04,
- HAL_DRIVE_TYPE_COMPACT_FLASH = 0x05,
- HAL_DRIVE_TYPE_MEMORY_STICK = 0x06,
- HAL_DRIVE_TYPE_SMART_MEDIA = 0x07,
- HAL_DRIVE_TYPE_SD_MMC = 0x08,
- HAL_DRIVE_TYPE_CAMERA = 0x09,
- HAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER = 0x0a/*,
- HAL_DRIVE_TYPE_ZIP = 0x0b,
- HAL_DRIVE_TYPE_JAZ = 0x0c*/
-} HalDriveType;
+ 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*/
+} LibHalDriveType;
typedef enum {
- HAL_DRIVE_CDROM_CAPS_CDROM = 0x0001,
- HAL_DRIVE_CDROM_CAPS_CDR = 0x0002,
- HAL_DRIVE_CDROM_CAPS_CDRW = 0x0004,
- HAL_DRIVE_CDROM_CAPS_DVDRAM = 0x0008,
- HAL_DRIVE_CDROM_CAPS_DVDROM = 0x0010,
- HAL_DRIVE_CDROM_CAPS_DVDR = 0x0020,
- HAL_DRIVE_CDROM_CAPS_DVDRW = 0x0040,
- HAL_DRIVE_CDROM_CAPS_DVDPLUSR = 0x0080,
- HAL_DRIVE_CDROM_CAPS_DVDPLUSRW = 0x0100
-} HalDriveCdromCaps;
+ LIBHAL_DRIVE_CDROM_CAPS_CDROM = 0x0001,
+ LIBHAL_DRIVE_CDROM_CAPS_CDR = 0x0002,
+ LIBHAL_DRIVE_CDROM_CAPS_CDRW = 0x0004,
+ LIBHAL_DRIVE_CDROM_CAPS_DVDRAM = 0x0008,
+ LIBHAL_DRIVE_CDROM_CAPS_DVDROM = 0x0010,
+ LIBHAL_DRIVE_CDROM_CAPS_DVDR = 0x0020,
+ LIBHAL_DRIVE_CDROM_CAPS_DVDRW = 0x0040,
+ LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSR = 0x0080,
+ LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRW = 0x0100
+} LibHalDriveCdromCaps;
-HalDrive *hal_drive_from_udi (LibHalContext *hal_ctx, const char *udi);
-HalDrive *hal_drive_from_device_file (LibHalContext *hal_ctx, const char *device_file);
-void hal_drive_free (HalDrive *drive);
+LibHalDrive *libhal_drive_from_udi (LibHalContext *hal_ctx,
+ const char *udi);
+LibHalDrive *libhal_drive_from_device_file (LibHalContext *hal_ctx,
+ const char *device_file);
+void libhal_drive_free (LibHalDrive *drive);
-dbus_bool_t hal_drive_is_hotpluggable (HalDrive *drive);
-dbus_bool_t hal_drive_uses_removable_media (HalDrive *drive);
-dbus_bool_t hal_drive_no_partitions_hint (HalDrive *drive);
-dbus_bool_t hal_drive_requires_eject (HalDrive *drive);
-HalDriveType hal_drive_get_type (HalDrive *drive);
-HalDriveBus hal_drive_get_bus (HalDrive *drive);
-HalDriveCdromCaps hal_drive_get_cdrom_caps (HalDrive *drive);
-unsigned int hal_drive_get_device_major (HalDrive *drive);
-unsigned int hal_drive_get_device_minor (HalDrive *drive);
-const char *hal_drive_get_type_textual (HalDrive *drive);
-const char *hal_drive_get_device_file (HalDrive *drive);
-const char *hal_drive_get_udi (HalDrive *drive);
-const char *hal_drive_get_serial (HalDrive *drive);
-const char *hal_drive_get_firmware_version (HalDrive *drive);
-const char *hal_drive_get_model (HalDrive *drive);
-const char *hal_drive_get_vendor (HalDrive *drive);
-const char *hal_drive_get_physical_device_udi (HalDrive *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_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 *hal_drive_get_dedicated_icon_drive (HalDrive *drive);
-const char *hal_drive_get_dedicated_icon_volume (HalDrive *drive);
+const char *libhal_drive_get_dedicated_icon_drive (LibHalDrive *drive);
+const char *libhal_drive_get_dedicated_icon_volume (LibHalDrive *drive);
-char *hal_drive_policy_compute_display_name (HalDrive *drive, HalVolume *volume, HalStoragePolicy *policy);
-char *hal_drive_policy_compute_icon_name (HalDrive *drive, HalVolume *volume, HalStoragePolicy *policy);
+char *libhal_drive_policy_compute_display_name (LibHalDrive *drive,
+ LibHalVolume *volume,
+ LibHalStoragePolicy *policy);
+char *libhal_drive_policy_compute_icon_name (LibHalDrive *drive,
+ LibHalVolume *volume,
+ LibHalStoragePolicy *policy);
-dbus_bool_t hal_drive_policy_is_mountable (HalDrive *drive, HalStoragePolicy *policy);
-const char *hal_drive_policy_get_desired_mount_point (HalDrive *drive, HalStoragePolicy *policy);
-const char *hal_drive_policy_get_mount_options (HalDrive *drive, HalStoragePolicy *policy);
-const char *hal_drive_policy_get_mount_fs (HalDrive *drive, HalStoragePolicy *policy);
+dbus_bool_t libhal_drive_policy_is_mountable (LibHalDrive *drive,
+ LibHalStoragePolicy *policy);
+const char *libhal_drive_policy_get_desired_mount_point (LibHalDrive *drive,
+ LibHalStoragePolicy *policy);
+const char *libhal_drive_policy_get_mount_options (LibHalDrive *drive,
+ LibHalStoragePolicy *policy);
+const char *libhal_drive_policy_get_mount_fs (LibHalDrive *drive,
+ LibHalStoragePolicy *policy);
-char **hal_drive_find_all_volumes (LibHalContext *hal_ctx, HalDrive *drive, int *num_volumes);
+char **libhal_drive_find_all_volumes (LibHalContext *hal_ctx,
+ LibHalDrive *drive,
+ int *num_volumes);
-char *hal_drive_policy_default_get_mount_root (LibHalContext *hal_ctx);
-dbus_bool_t hal_drive_policy_default_use_managed_keyword (LibHalContext *hal_ctx);
-char *hal_drive_policy_default_get_managed_keyword_primary (LibHalContext *hal_ctx);
-char *hal_drive_policy_default_get_managed_keyword_secondary (LibHalContext *hal_ctx);
+char *libhal_drive_policy_default_get_mount_root (LibHalContext *hal_ctx);
+dbus_bool_t libhal_drive_policy_default_use_managed_keyword (LibHalContext *hal_ctx);
+char *libhal_drive_policy_default_get_managed_keyword_primary (LibHalContext *hal_ctx);
+char *libhal_drive_policy_default_get_managed_keyword_secondary (LibHalContext *hal_ctx);
typedef enum {
- HAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM,
- HAL_VOLUME_USAGE_PARTITION_TABLE,
- HAL_VOLUME_USAGE_RAID_MEMBER
-} HalVolumeUsage;
+ LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM,
+ LIBHAL_VOLUME_USAGE_PARTITION_TABLE,
+ LIBHAL_VOLUME_USAGE_RAID_MEMBER
+} LibHalVolumeUsage;
typedef enum {
- HAL_VOLUME_DISC_TYPE_CDROM = 0x00,
- HAL_VOLUME_DISC_TYPE_CDR = 0x01,
- HAL_VOLUME_DISC_TYPE_CDRW = 0x02,
- HAL_VOLUME_DISC_TYPE_DVDROM = 0x03,
- HAL_VOLUME_DISC_TYPE_DVDRAM = 0x04,
- HAL_VOLUME_DISC_TYPE_DVDR = 0x05,
- HAL_VOLUME_DISC_TYPE_DVDRW = 0x06,
- HAL_VOLUME_DISC_TYPE_DVDPLUSR = 0x07,
- HAL_VOLUME_DISC_TYPE_DVDPLUSRW = 0x08
-} HalVolumeDiscType;
+ 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
+} LibHalVolumeDiscType;
-HalVolume *hal_volume_from_udi (LibHalContext *hal_ctx, const char *udi);
-HalVolume *hal_volume_from_device_file (LibHalContext *hal_ctx, const char *device_file);
-void hal_volume_free (HalVolume *volume);
-dbus_uint64_t hal_volume_get_size (HalVolume *volume);
+LibHalVolume *libhal_volume_from_udi (LibHalContext *hal_ctx,
+ const char *udi);
+LibHalVolume *libhal_volume_from_device_file (LibHalContext *hal_ctx,
+ const char *device_file);
+void libhal_volume_free (LibHalVolume *volume);
+dbus_uint64_t libhal_volume_get_size (LibHalVolume *volume);
-const char *hal_volume_get_udi (HalVolume *volume);
-const char *hal_volume_get_device_file (HalVolume *volume);
-unsigned int hal_volume_get_device_major (HalVolume *volume);
-unsigned int hal_volume_get_device_minor (HalVolume *volume);
-const char *hal_volume_get_fstype (HalVolume *volume);
-const char *hal_volume_get_fsversion (HalVolume *volume);
-HalVolumeUsage hal_volume_get_fsusage (HalVolume *volume);
-dbus_bool_t hal_volume_is_mounted (HalVolume *volume);
-dbus_bool_t hal_volume_is_partition (HalVolume *volume);
-dbus_bool_t hal_volume_is_disc (HalVolume *volume);
-unsigned int hal_volume_get_partition_number (HalVolume *volume);
-const char *hal_volume_get_label (HalVolume *volume);
-const char *hal_volume_get_mount_point (HalVolume *volume);
-const char *hal_volume_get_uuid (HalVolume *volume);
-const char *hal_volume_get_storage_device_udi (HalVolume *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_partition (LibHalVolume *volume);
+dbus_bool_t libhal_volume_is_disc (LibHalVolume *volume);
+unsigned int libhal_volume_get_partition_number (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);
-dbus_bool_t hal_volume_disc_has_audio (HalVolume *volume);
-dbus_bool_t hal_volume_disc_has_data (HalVolume *volume);
-dbus_bool_t hal_volume_disc_is_blank (HalVolume *volume);
-dbus_bool_t hal_volume_disc_is_rewritable (HalVolume *volume);
-dbus_bool_t hal_volume_disc_is_appendable (HalVolume *volume);
-HalVolumeDiscType hal_volume_get_disc_type (HalVolume *volume);
-int hal_volume_get_msdos_part_table_type (HalVolume *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);
-char *hal_volume_policy_compute_size_as_string (HalVolume *volume);
+int libhal_volume_get_msdos_part_table_type (LibHalVolume *volume);
-char *hal_volume_policy_compute_display_name (HalDrive *drive, HalVolume *volume, HalStoragePolicy *policy);
-char *hal_volume_policy_compute_icon_name (HalDrive *drive, HalVolume *volume, HalStoragePolicy *policy);
+char *libhal_volume_policy_compute_size_as_string (LibHalVolume *volume);
-dbus_bool_t hal_volume_policy_should_be_visible (HalDrive *drive, HalVolume *volume, HalStoragePolicy *policy, const char *target_mount_point);
+char *libhal_volume_policy_compute_display_name (LibHalDrive *drive,
+ LibHalVolume *volume,
+ LibHalStoragePolicy *policy);
+char *libhal_volume_policy_compute_icon_name (LibHalDrive *drive,
+ LibHalVolume *volume,
+ LibHalStoragePolicy *policy);
-dbus_bool_t hal_volume_policy_is_mountable (HalDrive *drive, HalVolume *volume, HalStoragePolicy *policy);
-const char *hal_volume_policy_get_desired_mount_point (HalDrive *drive, HalVolume *volume, HalStoragePolicy *policy);
-const char *hal_volume_policy_get_mount_options (HalDrive *drive, HalVolume *volume, HalStoragePolicy *policy);
-const char *hal_volume_policy_get_mount_fs (HalDrive *drive, HalVolume *volume, HalStoragePolicy *policy);
+dbus_bool_t libhal_volume_policy_should_be_visible (LibHalDrive *drive,
+ LibHalVolume *volume,
+ LibHalStoragePolicy *policy,
+ const char *target_mount_point);
+
+dbus_bool_t libhal_volume_policy_is_mountable (LibHalDrive *drive,
+ LibHalVolume *volume,
+ LibHalStoragePolicy *policy);
+const char *libhal_volume_policy_get_desired_mount_point (LibHalDrive *drive,
+ LibHalVolume *volume,
+ LibHalStoragePolicy *policy);
+const char *libhal_volume_policy_get_mount_options (LibHalDrive *drive,
+ LibHalVolume *volume,
+ LibHalStoragePolicy *policy);
+const char *libhal_volume_policy_get_mount_fs (LibHalDrive *drive,
+ LibHalVolume *volume,
+ LibHalStoragePolicy *policy);
/** @} */
More information about the hal-commit
mailing list