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

IGN:Allow remapping of LUNS in usbmb 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:48:47 -07:00
parent ecdb71c88d
commit a97871b397
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ class Device(_Device):
<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>
@ -54,7 +54,7 @@ class Device(_Device):
<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>
@ -65,6 +65,7 @@ class Device(_Device):
</device> </device>
''' '''
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">'
FDI_LUNS = {'lun0':0, 'lun1':1, 'lun2':2}
def __init__(self, key='-1', log_packets=False, report_progress=None) : def __init__(self, key='-1', log_packets=False, report_progress=None) :
@ -85,6 +86,8 @@ class Device(_Device):
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'] = ''
fdi_base_values['BCD_end'] = '' fdi_base_values['BCD_end'] = ''
@ -303,7 +306,7 @@ class Device(_Device):
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: