← Back to branch summary

~javier.collado/checkbox/bug597305

« back to all changes in this revision

Viewing changes to scripts/hal_resource

  • Committer: Marc Tardif
  • Date: 2010-04-22 21:12:51 UTC
  • Revision ID: marc.tardif@canonical.com-20100422211251-ierr91s0geh9ovsc
Added support for platform floppy devices.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/hal_resource
231
231
        bus = self.bus
232
232
 
233
233
        # Ignore subsystems using parent or generated names
234
 
        if bus in ("drm", "net", "platform", "pci", "pnp", "scsi_generic",
 
234
        if bus in ("drm", "net", "pci", "pnp", "scsi_generic",
235
235
                   "scsi_host", "tty", "usb", "video4linux"):
236
236
            return None
237
237
 
 
238
        # Treat the floppy device specifically
 
239
        if bus == "platform":
 
240
            if self.driver == "floppy":
 
241
                return "Platform Device"
 
242
            else:
 
243
                return None
 
244
 
238
245
        if "usb.interface.number" in self._properties:
239
246
            return None
240
247