hwtracker devs.xml,1.1.1.1,1.2
Damian Myerscough (damian)
fedora-extras-commits at redhat.com
Sat Sep 16 11:48:18 UTC 2006
Author: damian
Update of /cvs/devel/hwtracker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23655
Modified Files:
devs.xml
Log Message:
Updated
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1.1.1 -r 1.2 devs.xml
Index: devs.xml
===================================================================
RCS file: /cvs/devel/hwtracker/devs.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- devs.xml 22 Apr 2006 14:17:51 -0000 1.1.1.1
+++ devs.xml 16 Sep 2006 11:48:16 -0000 1.2
@@ -2,7 +2,6 @@
<Devices>
<Device udi="/org/freedesktop/Hal/devices/acpi_PWRF">
<linux.hotplug_type>4</linux.hotplug_type>
- <button.has_state>false</button.has_state>
<info.capabilities>
<options>button</options>
</info.capabilities>
@@ -13,9 +12,8 @@
<linux.acpi_type>10</linux.acpi_type>
<linux.acpi_path>/proc/acpi/button/power/PWRF</linux.acpi_path>
</Device>
- <Device udi="/org/freedesktop/Hal/devices/acpi_PWRB">
+ <Device udi="/org/freedesktop/Hal/devices/acpi_VBTN">
<linux.hotplug_type>4</linux.hotplug_type>
- <button.has_state>false</button.has_state>
<info.capabilities>
<options>button</options>
</info.capabilities>
@@ -24,11 +22,10 @@
<button.type>power</button.type>
<info.parent>/org/freedesktop/Hal/devices/computer</info.parent>
<linux.acpi_type>10</linux.acpi_type>
- <linux.acpi_path>/proc/acpi/button/power/PWRB</linux.acpi_path>
+ <linux.acpi_path>/proc/acpi/button/power/VBTN</linux.acpi_path>
</Device>
<Device udi="/org/freedesktop/Hal/devices/acpi_CPU0">
<linux.hotplug_type>4</linux.hotplug_type>
- <processor.can_throttle>true</processor.can_throttle>
<processor.number>0</processor.number>
<info.capabilities>
<options>processor</options>
@@ -39,7 +36,19 @@
<linux.acpi_type>1</linux.acpi_type>
<linux.acpi_path>/proc/acpi/processor/CPU0</linux.acpi_path>
</Device>
- <Device udi="/org/freedesktop/Hal/devices/volume_uuid_f7f62828_715d_4b89_87e4_bac2086edd75">
+ <Device udi="/org/freedesktop/Hal/devices/acpi_CPU1">
+ <linux.hotplug_type>4</linux.hotplug_type>
+ <processor.number>1</processor.number>
+ <info.capabilities>
+ <options>processor</options>
+ </info.capabilities>
+ <info.category>processor</info.category>
+ <info.product>Processor</info.product>
+ <info.parent>/org/freedesktop/Hal/devices/computer</info.parent>
+ <linux.acpi_type>1</linux.acpi_type>
+ <linux.acpi_path>/proc/acpi/processor/CPU1</linux.acpi_path>
+ </Device>
+ <Device udi="/org/freedesktop/Hal/devices/volume_uuid_3268e0ae_bbdf_40de_b038_407e485fc40b">
<volume.unmount.valid_options>
<options>lazy</options>
</volume.unmount.valid_options>
@@ -73,9 +82,9 @@
</info.interfaces>
<volume.ignore>true</volume.ignore>
<volume.partition.msdos_part_table_type>131</volume.partition.msdos_part_table_type>
- <info.product>/boot</info.product>
- <volume.size> 106896384</volume.size>
- <volume.num_blocks>208782</volume.num_blocks>
+ <info.product>/</info.product>
+ <volume.size>-1013122048</volume.size>
+ <volume.num_blocks>308399742</volume.num_blocks>
<volume.block_size>512</volume.block_size>
<volume.partition.number>1</volume.partition.number>
<info.capabilities>
@@ -84,31 +93,30 @@
</info.capabilities>
<info.category>volume</info.category>
<volume.is_partition>true</volume.is_partition>
- <volume.is_disc>false</volume.is_disc>
<volume.is_mounted>true</volume.is_mounted>
- <volume.mount_point>/boot</volume.mount_point>
- <volume.label>/boot</volume.label>
- <volume.uuid>f7f62828-715d-4b89-87e4-bac2086edd75</volume.uuid>
+ <volume.mount_point>/</volume.mount_point>
+ <volume.label>/</volume.label>
+ <volume.uuid>3268e0ae-bbdf-40de-b038-407e485fc40b</volume.uuid>
<volume.fsversion>1.0</volume.fsversion>
<volume.fsusage>filesystem</volume.fsusage>
<volume.fstype>ext3</volume.fstype>
<storage.model></storage.model>
- <block.storage_device>/org/freedesktop/Hal/devices/storage_serial_S00QJ10X467017</block.storage_device>
+ <block.storage_device>/org/freedesktop/Hal/devices/storage_serial_SATA_WDC_WD1600JS_75_WD_WCANM3446953</block.storage_device>
<block.is_volume>true</block.is_volume>
<block.minor>1</block.minor>
- <block.major>3</block.major>
- <block.device>/dev/hda1</block.device>
+ <block.major>8</block.major>
+ <block.device>/dev/sda1</block.device>
<linux.hotplug_type>3</linux.hotplug_type>
- <info.parent>/org/freedesktop/Hal/devices/storage_serial_S00QJ10X467017</info.parent>
- <linux.sysfs_path_device>/sys/block/hda/hda1</linux.sysfs_path_device>
- <linux.sysfs_path>/sys/block/hda/hda1</linux.sysfs_path>
+ <info.parent>/org/freedesktop/Hal/devices/storage_serial_SATA_WDC_WD1600JS_75_WD_WCANM3446953</info.parent>
+ <linux.sysfs_path_device>/sys/block/sda/sda1</linux.sysfs_path_device>
+ <linux.sysfs_path>/sys/block/sda/sda1</linux.sysfs_path>
</Device>
- <Device udi="/org/freedesktop/Hal/devices/volume_label_SWAP_hda2">
+ <Device udi="/org/freedesktop/Hal/devices/volume_label_SWAP_sda2">
<volume.ignore>true</volume.ignore>
<volume.partition.msdos_part_table_type>130</volume.partition.msdos_part_table_type>
- <info.product>SWAP-hda2</info.product>
- <volume.size> 1077511680</volume.size>
- <volume.num_blocks>2104515</volume.num_blocks>
+ <info.product>SWAP-sda2</info.product>
+ <volume.size> 2097446400</volume.size>
+ <volume.num_blocks>4096575</volume.num_blocks>
<volume.block_size>512</volume.block_size>
<volume.partition.number>2</volume.partition.number>
<info.capabilities>
@@ -117,372 +125,59 @@
</info.capabilities>
<info.category>volume</info.category>
<volume.is_partition>true</volume.is_partition>
- <volume.is_disc>false</volume.is_disc>
- <volume.is_mounted>false</volume.is_mounted>
<volume.mount_point></volume.mount_point>
- <volume.label>SWAP-hda2</volume.label>
+ <volume.label>SWAP-sda2</volume.label>
<volume.uuid></volume.uuid>
<volume.fsversion>2</volume.fsversion>
<volume.fsusage>other</volume.fsusage>
<volume.fstype>swap</volume.fstype>
<storage.model></storage.model>
- <block.storage_device>/org/freedesktop/Hal/devices/storage_serial_S00QJ10X467017</block.storage_device>
+ <block.storage_device>/org/freedesktop/Hal/devices/storage_serial_SATA_WDC_WD1600JS_75_WD_WCANM3446953</block.storage_device>
<block.is_volume>true</block.is_volume>
<block.minor>2</block.minor>
- <block.major>3</block.major>
- <block.device>/dev/hda2</block.device>
- <linux.hotplug_type>3</linux.hotplug_type>
- <info.parent>/org/freedesktop/Hal/devices/storage_serial_S00QJ10X467017</info.parent>
- <linux.sysfs_path_device>/sys/block/hda/hda2</linux.sysfs_path_device>
- <linux.sysfs_path>/sys/block/hda/hda2</linux.sysfs_path>
- </Device>
- <Device udi="/org/freedesktop/Hal/devices/volume_part3_size_118871746560">
- <volume.ignore>true</volume.ignore>
- <volume.partition.msdos_part_table_type>142</volume.partition.msdos_part_table_type>
- <info.product>Volume (LVM2_member)</info.product>
- <volume.size>-1387337728</volume.size>
- <volume.num_blocks>232171380</volume.num_blocks>
- <volume.block_size>512</volume.block_size>
- <volume.partition.number>3</volume.partition.number>
- <info.capabilities>
- <options>volume</options>
- <options>block</options>
- </info.capabilities>
- <info.category>volume</info.category>
- <volume.is_partition>true</volume.is_partition>
- <volume.is_disc>false</volume.is_disc>
- <volume.is_mounted>false</volume.is_mounted>
- <volume.mount_point></volume.mount_point>
- <volume.label></volume.label>
- <volume.uuid></volume.uuid>
- <volume.fsversion>LVM2 001</volume.fsversion>
- <volume.fsusage>raid</volume.fsusage>
- <volume.fstype>LVM2_member</volume.fstype>
- <storage.model></storage.model>
- <block.storage_device>/org/freedesktop/Hal/devices/storage_serial_S00QJ10X467017</block.storage_device>
- <block.is_volume>true</block.is_volume>
- <block.minor>3</block.minor>
- <block.major>3</block.major>
- <block.device>/dev/hda3</block.device>
- <linux.hotplug_type>3</linux.hotplug_type>
- <info.parent>/org/freedesktop/Hal/devices/storage_serial_S00QJ10X467017</info.parent>
- <linux.sysfs_path_device>/sys/block/hda/hda3</linux.sysfs_path_device>
- <linux.sysfs_path>/sys/block/hda/hda3</linux.sysfs_path>
- </Device>
- <Device udi="/org/freedesktop/Hal/devices/storage_serial_S00QJ10X467017">
- <volume.ignore>true</volume.ignore>
- <block.storage_device>/org/freedesktop/Hal/devices/storage_serial_S00QJ10X467017</block.storage_device>
- <storage.requires_eject>false</storage.requires_eject>
- <storage.hotpluggable>false</storage.hotpluggable>
- <info.capabilities>
- <options>storage</options>
- <options>block</options>
- </info.capabilities>
- <info.category>storage</info.category>
- <info.product>SAMSUNG SP1203N</info.product>
- <storage.removable>false</storage.removable>
- <storage.physical_device>/org/freedesktop/Hal/devices/pci_8086_24cb_ide_0_0</storage.physical_device>
- <storage.firmware_version>TL100-24</storage.firmware_version>
- <storage.serial>S00QJ10X467017</storage.serial>
- <storage.vendor></storage.vendor>
- <storage.model>SAMSUNG SP1203N</storage.model>
- <storage.drive_type>disk</storage.drive_type>
- <storage.automount_enabled_hint>true</storage.automount_enabled_hint>
- <storage.media_check_enabled>false</storage.media_check_enabled>
- <storage.no_partitions_hint>false</storage.no_partitions_hint>
- <storage.bus>ide</storage.bus>
- <block.is_volume>false</block.is_volume>
[...2023 lines suppressed...]
- <pnp.description>PCI Bus</pnp.description>
- <pnp.id>PNP0a03</pnp.id>
+ <info.product>AT DMA Controller</info.product>
+ <pnp.description>AT DMA Controller</pnp.description>
+ <pnp.id>PNP0200</pnp.id>
<info.parent>/org/freedesktop/Hal/devices/computer</info.parent>
<info.bus>pnp</info.bus>
<linux.sysfs_path_device>/sys/devices/pnp0/00:02</linux.sysfs_path_device>
<linux.sysfs_path>/sys/devices/pnp0/00:02</linux.sysfs_path>
</Device>
- <Device udi="/org/freedesktop/Hal/devices/pnp_PNP0c02_0">
+ <Device udi="/org/freedesktop/Hal/devices/pnp_PNP0c04">
<linux.subsystem>pnp</linux.subsystem>
<linux.hotplug_type>1</linux.hotplug_type>
- <info.product>General ID for reserving resources required by PnP motherboard registers. (Not device specific.)</info.product>
- <pnp.description>General ID for reserving resources required by PnP motherboard registers. (Not device specific.)</pnp.description>
- <pnp.id>PNP0c02</pnp.id>
- <info.linux.driver>system</info.linux.driver>
+ <info.product>Math Coprocessor</info.product>
+ <pnp.description>Math Coprocessor</pnp.description>
+ <pnp.id>PNP0c04</pnp.id>
<info.parent>/org/freedesktop/Hal/devices/computer</info.parent>
<info.bus>pnp</info.bus>
<linux.sysfs_path_device>/sys/devices/pnp0/00:03</linux.sysfs_path_device>
<linux.sysfs_path>/sys/devices/pnp0/00:03</linux.sysfs_path>
</Device>
- <Device udi="/org/freedesktop/Hal/devices/pnp_PNP0c02">
+ <Device udi="/org/freedesktop/Hal/devices/pnp_PNP0800">
<linux.subsystem>pnp</linux.subsystem>
<linux.hotplug_type>1</linux.hotplug_type>
- <info.product>General ID for reserving resources required by PnP motherboard registers. (Not device specific.)</info.product>
- <pnp.description>General ID for reserving resources required by PnP motherboard registers. (Not device specific.)</pnp.description>
- <pnp.id>PNP0c02</pnp.id>
- <info.linux.driver>system</info.linux.driver>
+ <info.product>AT-style speaker sound</info.product>
+ <pnp.description>AT-style speaker sound</pnp.description>
+ <pnp.id>PNP0800</pnp.id>
<info.parent>/org/freedesktop/Hal/devices/computer</info.parent>
<info.bus>pnp</info.bus>
<linux.sysfs_path_device>/sys/devices/pnp0/00:04</linux.sysfs_path_device>
<linux.sysfs_path>/sys/devices/pnp0/00:04</linux.sysfs_path>
</Device>
- <Device udi="/org/freedesktop/Hal/devices/pnp_PNP0200">
- <linux.subsystem>pnp</linux.subsystem>
- <linux.hotplug_type>1</linux.hotplug_type>
- <info.product>AT DMA Controller</info.product>
- <pnp.description>AT DMA Controller</pnp.description>
- <pnp.id>PNP0200</pnp.id>
- <info.parent>/org/freedesktop/Hal/devices/computer</info.parent>
- <info.bus>pnp</info.bus>
- <linux.sysfs_path_device>/sys/devices/pnp0/00:05</linux.sysfs_path_device>
- <linux.sysfs_path>/sys/devices/pnp0/00:05</linux.sysfs_path>
- </Device>
<Device udi="/org/freedesktop/Hal/devices/pnp_PNP0b00">
<linux.subsystem>pnp</linux.subsystem>
<linux.hotplug_type>1</linux.hotplug_type>
@@ -1903,41 +1159,8 @@
<pnp.id>PNP0b00</pnp.id>
<info.parent>/org/freedesktop/Hal/devices/computer</info.parent>
<info.bus>pnp</info.bus>
- <linux.sysfs_path_device>/sys/devices/pnp0/00:06</linux.sysfs_path_device>
- <linux.sysfs_path>/sys/devices/pnp0/00:06</linux.sysfs_path>
- </Device>
- <Device udi="/org/freedesktop/Hal/devices/pnp_PNP0800">
- <linux.subsystem>pnp</linux.subsystem>
- <linux.hotplug_type>1</linux.hotplug_type>
- <info.product>AT-style speaker sound</info.product>
- <pnp.description>AT-style speaker sound</pnp.description>
- <pnp.id>PNP0800</pnp.id>
- <info.parent>/org/freedesktop/Hal/devices/computer</info.parent>
- <info.bus>pnp</info.bus>
- <linux.sysfs_path_device>/sys/devices/pnp0/00:07</linux.sysfs_path_device>
- <linux.sysfs_path>/sys/devices/pnp0/00:07</linux.sysfs_path>
- </Device>
- <Device udi="/org/freedesktop/Hal/devices/pnp_PNP0c04">
- <linux.subsystem>pnp</linux.subsystem>
- <linux.hotplug_type>1</linux.hotplug_type>
- <info.product>Math Coprocessor</info.product>
- <pnp.description>Math Coprocessor</pnp.description>
- <pnp.id>PNP0c04</pnp.id>
- <info.parent>/org/freedesktop/Hal/devices/computer</info.parent>
- <info.bus>pnp</info.bus>
- <linux.sysfs_path_device>/sys/devices/pnp0/00:08</linux.sysfs_path_device>
- <linux.sysfs_path>/sys/devices/pnp0/00:08</linux.sysfs_path>
- </Device>
- <Device udi="/org/freedesktop/Hal/devices/pnp_PNP0700">
- <linux.subsystem>pnp</linux.subsystem>
- <linux.hotplug_type>1</linux.hotplug_type>
- <info.product>PC standard floppy disk controller</info.product>
- <pnp.description>PC standard floppy disk controller</pnp.description>
- <pnp.id>PNP0700</pnp.id>
- <info.parent>/org/freedesktop/Hal/devices/computer</info.parent>
- <info.bus>pnp</info.bus>
- <linux.sysfs_path_device>/sys/devices/pnp0/00:09</linux.sysfs_path_device>
- <linux.sysfs_path>/sys/devices/pnp0/00:09</linux.sysfs_path>
+ <linux.sysfs_path_device>/sys/devices/pnp0/00:05</linux.sysfs_path_device>
+ <linux.sysfs_path>/sys/devices/pnp0/00:05</linux.sysfs_path>
</Device>
<Device udi="/org/freedesktop/Hal/devices/pnp_PNP0501_serial_platform_0">
<linux.device_file>/dev/ttyS0</linux.device_file>
@@ -1964,44 +1187,32 @@
<info.linux.driver>serial</info.linux.driver>
<info.parent>/org/freedesktop/Hal/devices/computer</info.parent>
<info.bus>pnp</info.bus>
- <linux.sysfs_path_device>/sys/devices/pnp0/00:0a</linux.sysfs_path_device>
- <linux.sysfs_path>/sys/devices/pnp0/00:0a</linux.sysfs_path>
- </Device>
- <Device udi="/org/freedesktop/Hal/devices/pnp_PNP0401">
- <linux.subsystem>pnp</linux.subsystem>
- <linux.hotplug_type>1</linux.hotplug_type>
- <info.product>ECP printer port</info.product>
- <pnp.description>ECP printer port</pnp.description>
- <pnp.id>PNP0401</pnp.id>
- <info.linux.driver>parport_pc</info.linux.driver>
- <info.parent>/org/freedesktop/Hal/devices/computer</info.parent>
- <info.bus>pnp</info.bus>
- <linux.sysfs_path_device>/sys/devices/pnp0/00:0b</linux.sysfs_path_device>
- <linux.sysfs_path>/sys/devices/pnp0/00:0b</linux.sysfs_path>
+ <linux.sysfs_path_device>/sys/devices/pnp0/00:06</linux.sysfs_path_device>
+ <linux.sysfs_path>/sys/devices/pnp0/00:06</linux.sysfs_path>
</Device>
- <Device udi="/org/freedesktop/Hal/devices/pnp_PNP0f13">
+ <Device udi="/org/freedesktop/Hal/devices/pnp_PNP0c01">
<linux.subsystem>pnp</linux.subsystem>
<linux.hotplug_type>1</linux.hotplug_type>
- <info.product>PS/2 Port for PS/2-style Mice</info.product>
- <pnp.description>PS/2 Port for PS/2-style Mice</pnp.description>
- <pnp.id>PNP0f13</pnp.id>
- <info.linux.driver>i8042 aux</info.linux.driver>
+ <info.product>System Board</info.product>
+ <pnp.description>System Board</pnp.description>
+ <pnp.id>PNP0c01</pnp.id>
+ <info.linux.driver>system</info.linux.driver>
<info.parent>/org/freedesktop/Hal/devices/computer</info.parent>
<info.bus>pnp</info.bus>
- <linux.sysfs_path_device>/sys/devices/pnp0/00:0c</linux.sysfs_path_device>
- <linux.sysfs_path>/sys/devices/pnp0/00:0c</linux.sysfs_path>
+ <linux.sysfs_path_device>/sys/devices/pnp0/00:07</linux.sysfs_path_device>
+ <linux.sysfs_path>/sys/devices/pnp0/00:07</linux.sysfs_path>
</Device>
- <Device udi="/org/freedesktop/Hal/devices/pnp_PNP0303">
+ <Device udi="/org/freedesktop/Hal/devices/pnp_PNP0c02">
<linux.subsystem>pnp</linux.subsystem>
<linux.hotplug_type>1</linux.hotplug_type>
- <info.product>IBM Enhanced (101/102-key, PS/2 mouse support)</info.product>
- <pnp.description>IBM Enhanced (101/102-key, PS/2 mouse support)</pnp.description>
- <pnp.id>PNP0303</pnp.id>
- <info.linux.driver>i8042 kbd</info.linux.driver>
+ <info.product>General ID for reserving resources required by PnP motherboard registers. (Not device specific.)</info.product>
+ <pnp.description>General ID for reserving resources required by PnP motherboard registers. (Not device specific.)</pnp.description>
+ <pnp.id>PNP0c02</pnp.id>
+ <info.linux.driver>system</info.linux.driver>
<info.parent>/org/freedesktop/Hal/devices/computer</info.parent>
<info.bus>pnp</info.bus>
- <linux.sysfs_path_device>/sys/devices/pnp0/00:0d</linux.sysfs_path_device>
- <linux.sysfs_path>/sys/devices/pnp0/00:0d</linux.sysfs_path>
+ <linux.sysfs_path_device>/sys/devices/pnp0/00:08</linux.sysfs_path_device>
+ <linux.sysfs_path>/sys/devices/pnp0/00:08</linux.sysfs_path>
</Device>
<Device udi="/org/freedesktop/Hal/devices/computer">
<info.callouts.add>
@@ -2034,25 +1245,24 @@
<info.addons>
<options>hald-addon-acpi</options>
</info.addons>
- <system.product>PPPPPP-ABA MMMMM </system.product>
- <system.vendor>Hewlett-Packard</system.vendor>
- <smbios.chassis.type>Desktop</smbios.chassis.type>
- <smbios.chassis.manufacturer></smbios.chassis.manufacturer>
- <smbios.system.uuid>Not Present</smbios.system.uuid>
- <smbios.system.serial></smbios.system.serial>
- <smbios.system.version></smbios.system.version>
- <smbios.system.product>PPPPPP-ABA MMMMM</smbios.system.product>
- <smbios.system.manufacturer>Hewlett-Packard</smbios.system.manufacturer>
- <smbios.bios.release_date>07/25/2002</smbios.bios.release_date>
- <smbios.bios.version>3.06</smbios.bios.version>
- <smbios.bios.vendor>Phoenix Technologies, LTD</smbios.bios.vendor>
+ <system.product>PowerEdge SC430</system.product>
+ <system.vendor>Dell Inc.</system.vendor>
+ <smbios.chassis.type>Tower</smbios.chassis.type>
+ <smbios.chassis.manufacturer>Dell Inc.</smbios.chassis.manufacturer>
+ <smbios.system.uuid>44454C4C-5200-1039-8043-C8C04F38324A</smbios.system.uuid>
+ <smbios.system.serial>HR9C82J</smbios.system.serial>
+ <smbios.system.version>Not Specified</smbios.system.version>
+ <smbios.system.product>PowerEdge SC430</smbios.system.product>
+ <smbios.system.manufacturer>Dell Inc.</smbios.system.manufacturer>
+ <smbios.bios.release_date>02/06/2006</smbios.bios.release_date>
+ <smbios.bios.version>A02</smbios.bios.version>
+ <smbios.bios.vendor>Dell Inc.</smbios.bios.vendor>
<power_management.can_suspend_to_disk>true</power_management.can_suspend_to_disk>
- <power_management.can_suspend_to_ram>true</power_management.can_suspend_to_ram>
<power_management.acpi.linux.version>20060127</power_management.acpi.linux.version>
<power_management.type>acpi</power_management.type>
<system.formfactor>unknown</system.formfactor>
<system.kernel.machine>i686</system.kernel.machine>
- <system.kernel.version>2.6.16-1.2080_FC5</system.kernel.version>
+ <system.kernel.version>2.6.17-1.2157_FC5smp</system.kernel.version>
<system.kernel.name>Linux</system.kernel.name>
<info.product>Computer</info.product>
<linux.sysfs_path_device>(none)</linux.sysfs_path_device>
More information about the fedora-extras-commits
mailing list