Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow remapping of LUNS in usbms driver to support devices that don't use lun0 for the main memory

Browse Source
This commit is contained in:
Kovid Goyal 2009-05-07 10:49:24 -07:00
parent 2ba35a8be8
commit 42b23aaf0a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/devices/usbms/device.py
View File

@ -43,7 +43,7 @@ class Device(DeviceConfig, DevicePlugin):
<match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.vendor_id" int="%(vendor_id)s"> <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.vendor_id" int="%(vendor_id)s">
<match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.product_id" int="%(product_id)s"> <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.product_id" int="%(product_id)s">
%(BCD_start)s %(BCD_start)s
<match key="@info.parent:storage.lun" int="0"> <match key="@info.parent:storage.lun" int="%(lun0)d">
<merge key="volume.label" type="string">%(main_memory)s</merge> <merge key="volume.label" type="string">%(main_memory)s</merge>
<merge key="%(app)s.mainvolume" type="string">%(deviceclass)s</merge> <merge key="%(app)s.mainvolume" type="string">%(deviceclass)s</merge>
</match> </match>
@ -57,7 +57,7 @@ class Device(DeviceConfig, DevicePlugin):
<match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.vendor_id" int="%(vendor_id)s"> <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.vendor_id" int="%(vendor_id)s">
<match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.product_id" int="%(product_id)s"> <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.product_id" int="%(product_id)s">
%(BCD_start)s %(BCD_start)s
<match key="@info.parent:storage.lun" int="1"> <match key="@info.parent:storage.lun" int="%(lun1)d">
<merge key="volume.label" type="string">%(storage_card)s</merge> <merge key="volume.label" type="string">%(storage_card)s</merge>
<merge key="%(app)s.cardvolume" type="string">%(deviceclass)s</merge> <merge key="%(app)s.cardvolume" type="string">%(deviceclass)s</merge>
</match> </match>
@ -71,7 +71,7 @@ class Device(DeviceConfig, DevicePlugin):
<match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.vendor_id" int="%(vendor_id)s"> <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.vendor_id" int="%(vendor_id)s">
<match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.product_id" int="%(product_id)s"> <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.product_id" int="%(product_id)s">
%(BCD_start)s %(BCD_start)s
<match key="@info.parent:storage.lun" int="2"> <match key="@info.parent:storage.lun" int="%(lun2)d">
<merge key="volume.label" type="string">%(storage_card)s</merge> <merge key="volume.label" type="string">%(storage_card)s</merge>
<merge key="%(app)s.cardvolume" type="string">%(deviceclass)s</merge> <merge key="%(app)s.cardvolume" type="string">%(deviceclass)s</merge>
</match> </match>
@ -81,6 +81,7 @@ class Device(DeviceConfig, DevicePlugin):
</match> </match>
</device> </device>
''' '''
FDI_LUNS = {'lun0':0, 'lun1':1, 'lun2':2}
FDI_BCD_TEMPLATE = '<match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.device_revision_bcd" int="%(bcd)s">' FDI_BCD_TEMPLATE = '<match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.device_revision_bcd" int="%(bcd)s">'
@ -100,6 +101,7 @@ class Device(DeviceConfig, DevicePlugin):
main_memory=cls.MAIN_MEMORY_VOLUME_LABEL, main_memory=cls.MAIN_MEMORY_VOLUME_LABEL,
storage_card=cls.STORAGE_CARD_VOLUME_LABEL, storage_card=cls.STORAGE_CARD_VOLUME_LABEL,
) )
fdi_base_values.update(cls.FDI_LUNS)
if cls.BCD is None: if cls.BCD is None:
fdi_base_values['BCD_start'] = '' fdi_base_values['BCD_start'] = ''
@ -342,7 +344,7 @@ class Device(DeviceConfig, DevicePlugin):
try: try:
self.open_linux() self.open_linux()
except DeviceError: except DeviceError:
time.sleep(3) time.sleep(7)
self.open_linux() self.open_linux()
if iswindows: if iswindows:
try: try: